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

Updape glpk_interface.cc

Browse Source
This commit is contained in:
Corentin Le Molgat
2021-08-27 10:23:27 +02:00
parent 4346301bee
commit a8e738517d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ortools/linear_solver/glpk_interface.cc
View File

@@ -31,6 +31,7 @@
#include "ortools/base/integral_types.h"
#include "ortools/base/logging.h"
#include "ortools/base/timer.h"
#include "ortools/glpk/glpk_env_deleter.h"
#include "ortools/linear_solver/linear_solver.h"
extern "C" {
@@ -211,6 +212,9 @@ class GLPKInterface : public MPSolverInterface {
// Creates a LP/MIP instance with the specified name and minimization objective.
GLPKInterface::GLPKInterface(MPSolver* const solver, bool mip)
: MPSolverInterface(solver), lp_(nullptr), mip_(mip) {
// Make sure glp_free_env() is called at the exit of the current thread.
SetupGlpkEnvAutomaticDeletion();
lp_ = glp_create_prob();
glp_set_prob_name(lp_, solver_->name_.c_str());
glp_set_obj_dir(lp_, GLP_MIN);
@@ -673,7 +677,8 @@ int64_t GLPKInterface::iterations() const {
if (!mip_ && CheckSolutionIsSynchronized()) {
return lpx_get_int_parm(lp_, LPX_K_ITCNT);
}
#elif GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION >= 53
#elif (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION >= 53) || \
GLP_MAJOR_VERSION >= 5
if (!mip_ && CheckSolutionIsSynchronized()) {
return glp_get_it_cnt(lp_);
}