use XPRSmipoptimize and XPRSlpoptimize instead of XPRSminim and XPRSm…

…axim (#114) * use XPRSmipoptimize and XPRSlpoptimize instead of XPRSminim and XPRSmaxim * clean xpress/environment files * accept changes: empty char* parameter for XPRS*optimize
rte-france · Nov 17, 2023 · 2505eab · 2505eab
1 parent d47c2ee
commit 2505eab
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/ortools/linear_solver/xpress_interface.cc b/ortools/linear_solver/xpress_interface.cc
@@ -1912,16 +1912,10 @@ MPSolver::ResultStatus XpressInterface::Solve(MPSolverParameters const& param) {
 
   int xpress_stat = 0;
   if (mMip) {
-    if (this->maximize_)
-      status = XPRSmaxim(mLp, "g");
-    else
-      status = XPRSminim(mLp, "g");
+    status = XPRSmipoptimize(mLp,"");
     XPRSgetintattrib(mLp, XPRS_MIPSTATUS, &xpress_stat);
   } else {
-    if (this->maximize_)
-      status = XPRSmaxim(mLp, "");
-    else
-      status = XPRSminim(mLp, "");
+    status = XPRSlpoptimize(mLp,"");
     XPRSgetintattrib(mLp, XPRS_LPSTATUS, &xpress_stat);
   }
 

diff --git a/ortools/xpress/environment.cc b/ortools/xpress/environment.cc
@@ -92,8 +92,8 @@ std::function<int(XPRSprob prob, int nrows, const int rowind[], const char rowty
 std::function<int(XPRSprob prob, void (XPRS_CC *f_intsol)(XPRSprob cbprob, void* cbdata), void* p, int priority)> XPRSaddcbintsol = nullptr;
 std::function<int(XPRSprob prob, void (XPRS_CC *f_intsol)(XPRSprob cbprob, void* cbdata), void* p)> XPRSremovecbintsol = nullptr;
 std::function<int(XPRSprob prob, void (XPRS_CC *f_message)(XPRSprob cbprob, void* cbdata, const char* msg, int msglen, int msgtype), void* p, int priority)> XPRSaddcbmessage = nullptr;
-std::function<int(XPRSprob prob, const char* flags)> XPRSminim = nullptr;
-std::function<int(XPRSprob prob, const char* flags)> XPRSmaxim = nullptr;
+std::function<int(XPRSprob prob, const char* flags)> XPRSlpoptimize = nullptr;
+std::function<int(XPRSprob prob, const char* flags)> XPRSmipoptimize = nullptr;
 
 absl::Status LoadXpressFunctions(DynamicLibrary* xpress_dynamic_library) {
   // This was generated with the parse_header_xpress.py script.
@@ -156,8 +156,9 @@ absl::Status LoadXpressFunctions(DynamicLibrary* xpress_dynamic_library) {
   xpress_dynamic_library->GetFunction(&XPRSaddcbintsol, "XPRSaddcbintsol");
   xpress_dynamic_library->GetFunction(&XPRSremovecbintsol, "XPRSremovecbintsol");
   xpress_dynamic_library->GetFunction(&XPRSaddcbmessage, "XPRSaddcbmessage");
-  xpress_dynamic_library->GetFunction(&XPRSminim, "XPRSminim");
-  xpress_dynamic_library->GetFunction(&XPRSmaxim, "XPRSmaxim");
+  xpress_dynamic_library->GetFunction(&XPRSlpoptimize, "XPRSlpoptimize");
+  xpress_dynamic_library->GetFunction(&XPRSmipoptimize, "XPRSmipoptimize");
+
 
   auto notFound = xpress_dynamic_library->FunctionsNotFound();
   if (!notFound.empty()) {

diff --git a/ortools/xpress/environment.h b/ortools/xpress/environment.h
@@ -491,8 +491,8 @@ extern std::function<int(XPRSprob prob, int nrows, const int rowind[], const cha
 extern std::function<int(XPRSprob prob, void (XPRS_CC *f_intsol)(XPRSprob cbprob, void* cbdata), void* p, int priority)> XPRSaddcbintsol;
 extern std::function<int(XPRSprob prob, void (XPRS_CC *f_intsol)(XPRSprob cbprob, void* cbdata), void* p)> XPRSremovecbintsol;
 extern std::function<int(XPRSprob prob, void (XPRS_CC *f_message)(XPRSprob cbprob, void* cbdata, const char* msg, int msglen, int msgtype), void* p, int priority)> XPRSaddcbmessage;
-extern std::function<int(XPRSprob prob, const char* flags)> XPRSminim;
-extern std::function<int(XPRSprob prob, const char* flags)> XPRSmaxim;
+extern std::function<int(XPRSprob prob, const char* flags)> XPRSlpoptimize;
+extern std::function<int(XPRSprob prob, const char* flags)> XPRSmipoptimize;
 
 }  // namespace operations_research