new version

scipopt · Dec 12, 2023 · d7ce949 · d7ce949
1 parent b2c902f
commit d7ce949
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 8 deletions.
diff --git a/.github/actions/setup-scipoptsuite-action/action.yml b/.github/actions/setup-scipoptsuite-action/action.yml
@@ -4,7 +4,7 @@ inputs:
   version:
     description: "SCIPOptSuite version to install"
     required: true
-    default: "8.0.0"
+    default: "8.1.0"
 
 runs:
   using: "composite"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,10 +6,14 @@
 ### Changed
 ### Removed
 
+## v0.3.0
+### Update
+* update to PySCIPOpt 4.4.0, SCIP 8.1.0 and GCG 3.5.5
+
 ## v0.2.0
 ### Added
 * method getMastervars in class Model
-+ method getOrigvars in class GCGMasterModel
+* method getOrigvars in class GCGMasterModel
 
 ## v0.1.4
 ### Changed

diff --git a/INSTALL.md b/INSTALL.md
@@ -19,7 +19,8 @@ Note that the latest PyGCGOpt version is usually only compatible with the latest
 
 |SCIP| PySCIPOpt | GCG | PyGCGOpt
 |----|----|----|----|
-8.0 | 4.0 | 3.5.x | 0.1.x |
+8.1 | 4.4 | 3.5.5 | 0.3.0 |
+8.0 | 4.0 | 3.5.0 | 0.1.0 |
 7.0 | 3.x | - | - |
 6.0 | 2.x | - | - |
 5.0 | 1.4, 1.3 | - | - |

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
 build==0.7.0
 Cython==0.29.35
 wheel==0.40.0
+pyscipopt==4.4.0
diff --git a/setup.py b/setup.py
@@ -121,7 +121,7 @@
     ext_modules=extensions,
     install_requires=[
         'wheel',
-        'pyscipopt>=4.0.0'
+        'pyscipopt>=4.4.0'
     ],
     packages=['pygcgopt'],
     package_dir={'pygcgopt': packagedir},

diff --git a/src/pygcgopt/__init__.py b/src/pygcgopt/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.2.1'
+__version__ = '0.3.0'
 
 # required for Python 3.8 on Windows
 import os

diff --git a/src/pygcgopt/gcg.pxd b/src/pygcgopt/gcg.pxd
@@ -1,16 +1,35 @@
-from pyscipopt.scip cimport SCIP, SCIP_RETCODE, SCIP_RESULT, SCIP_Bool, SCIP_Real, FILE, SCIP_CONS, SCIP_VAR, SCIP_PARAMSETTING, SCIP_SOL
+from pyscipopt.scip cimport SCIP, SCIP_RESULT, SCIP_Bool, SCIP_Real, FILE, SCIP_CONS, SCIP_VAR, SCIP_PARAMSETTING, SCIP_SOL
 
 from libcpp cimport bool
 from libcpp.vector cimport vector
 from libcpp.string cimport string
 from libcpp.pair cimport pair
 
-
 cdef extern from "limits.h":
     cdef int INT_MAX
 
 
 cdef extern from "gcg/gcg.h":
+    ctypedef enum SCIP_RETCODE:
+        SCIP_OKAY               =   1
+        SCIP_ERROR              =   0
+        SCIP_NOMEMORY           =  -1
+        SCIP_READERROR          =  -2
+        SCIP_WRITEERROR         =  -3
+        SCIP_NOFILE             =  -4
+        SCIP_FILECREATEERROR    =  -5
+        SCIP_LPERROR            =  -6
+        SCIP_NOPROBLEM          =  -7
+        SCIP_INVALIDCALL        =  -8
+        SCIP_INVALIDDATA        =  -9
+        SCIP_INVALIDRESULT      = -10
+        SCIP_PLUGINNOTFOUND     = -11
+        SCIP_PARAMETERUNKNOWN   = -12
+        SCIP_PARAMETERWRONGTYPE = -13
+        SCIP_PARAMETERWRONGVAL  = -14
+        SCIP_KEYALREADYEXISTING = -15
+        SCIP_MAXDEPTHLEVEL      = -16
+
     void GCGprintVersion(SCIP* scip, FILE* file)
     SCIP_RETCODE GCGprintStatistics(SCIP* scip, FILE* file)
     SCIP_RETCODE GCGtransformProb(SCIP* scip)

diff --git a/src/pygcgopt/gcg.pyx b/src/pygcgopt/gcg.pyx
@@ -2,7 +2,7 @@
 
 from pyscipopt.scip import PY_SCIP_CALL
 from pyscipopt.scip cimport Model as SCIPModel
-from pyscipopt.scip cimport Variable, Constraint, Solution, SCIP_RESULT, SCIP_DIDNOTRUN, SCIPgetStage, SCIP_STAGE, SCIP_STAGE_PRESOLVED, SCIP_OKAY, SCIPvarSetData, SCIPgetBestSol
+from pyscipopt.scip cimport Variable, Constraint, Solution, SCIP_RESULT, SCIP_DIDNOTRUN, SCIPgetStage, SCIP_STAGE, SCIP_STAGE_PRESOLVED, SCIPvarSetData, SCIPgetBestSol
 
 from cpython cimport Py_INCREF, Py_DECREF