always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweaks

Browse Source
This commit is contained in:
Laurent Perron
2024-03-26 12:34:16 +01:00
committed by Corentin Le Molgat
parent ee2e20ce4d
commit 2d92deebea
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ortools/gurobi/environment.cc
View File

@@ -16,6 +16,7 @@
#include <mutex>
#include <string>
#include "absl/flags/flag.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/match.h"

6
ortools/linear_solver/proto_solver/gurobi_proto_solver.cc
View File

@@ -316,6 +316,9 @@ absl::StatusOr<MPSolutionResponse> GurobiSolveProto(
/*varnames=*/nullptr));
GRBenv* const model_env = GRBgetenv(gurobi_model);
RETURN_IF_GUROBI_ERROR(
GRBsetintparam(model_env, GRB_INT_PAR_OUTPUTFLAG,
request->enable_internal_solver_output()));
if (request->has_solver_specific_parameters()) {
const auto parameters_status = SetSolverSpecificParameters(
request->solver_specific_parameters(), model_env);
@@ -331,9 +334,6 @@ absl::StatusOr<MPSolutionResponse> GurobiSolveProto(
GRBsetdblparam(model_env, GRB_DBL_PAR_TIMELIMIT,
request->solver_time_limit_seconds()));
}
RETURN_IF_GUROBI_ERROR(
GRBsetintparam(model_env, GRB_INT_PAR_OUTPUTFLAG,
request->enable_internal_solver_output()));
const int variable_size = model.variable_size();
bool has_integer_variables = false;