Merge pull request #14 from rte-france/xpress_indicator_ct

Add support for indicator constraints in XPRESS interface
rte-france · Sep 3, 2024 · 4bbfa56 · 4bbfa56
2 parents 1309d12 + 9931912
commit 4bbfa56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ortools/xpress/parse_header_xpress.py b/ortools/xpress/parse_header_xpress.py
@@ -113,7 +113,7 @@ def __init__(self):
                                      "XPRSgetmipsol", "XPRSchgbounds", "XPRSchgobj", "XPRSchgcoef", "XPRSchgmcoef",
                                      "XPRSchgrhs", "XPRSchgrhsrange", "XPRSchgrowtype", "XPRSaddcbmessage", "XPRSsetcbmessage",
                                      "XPRSaddmipsol", "XPRSaddcbintsol", "XPRSremovecbintsol",
-                                     "XPRSinterrupt", "XPRSlpoptimize", "XPRSmipoptimize"}
+                                     "XPRSinterrupt", "XPRSlpoptimize", "XPRSmipoptimize", "XPRSsetindicators"}
         self.__missing_required_functions = self.__required_functions
         self.__XPRSprob_section = False
 

diff --git a/patch.py b/patch.py
@@ -38,7 +38,7 @@
 
 # add the USE_SIRIUS configuration flag in deps.cmake
 full_patch.append(Addition(
-    Path.cwd()/'cmake'/'deps.cmake',
+    Path.cwd()/'cmake'/'system_deps.cmake',
     '''
 if(USE_CPLEX)
   find_package(CPLEX REQUIRED)