PySCIPOpt 5.6.0__tar.gz → 5.7.0__tar.gz

{pyscipopt-5.6.0 → pyscipopt-5.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySCIPOpt
-Version: 5.6.0
+Version: 5.7.0
 Summary: Python interface and modeling environment for SCIP
 Home-page: https://github.com/SCIP-Interfaces/PySCIPOpt
 Author: Zuse Institute Berlin

{pyscipopt-5.6.0 → pyscipopt-5.7.0}/PySCIPOpt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySCIPOpt
-Version: 5.6.0
+Version: 5.7.0
 Summary: Python interface and modeling environment for SCIP
 Home-page: https://github.com/SCIP-Interfaces/PySCIPOpt
 Author: Zuse Institute Berlin

{pyscipopt-5.6.0 → pyscipopt-5.7.0}/PySCIPOpt.egg-info/SOURCES.txt

@@ -25,14 +25,17 @@ src/pyscipopt/nodesel.pxi
 src/pyscipopt/presol.pxi
 src/pyscipopt/pricer.pxi
 src/pyscipopt/propagator.pxi
+src/pyscipopt/py.typed
 src/pyscipopt/reader.pxi
 src/pyscipopt/relax.pxi
 src/pyscipopt/scip.c
 src/pyscipopt/scip.pxd
 src/pyscipopt/scip.pxi
+src/pyscipopt/scip.pyi
 src/pyscipopt/scip.pyx
 src/pyscipopt/sepa.pxi
 src/pyscipopt/recipes/__init__.py
+src/pyscipopt/recipes/getLocalConss.py
 src/pyscipopt/recipes/infeasibilities.py
 src/pyscipopt/recipes/nonlinear.py
 src/pyscipopt/recipes/piecewise.py
@@ -60,6 +63,7 @@ tests/test_memory.py
 tests/test_model.py
 tests/test_nlrow.py
 tests/test_node.py
+tests/test_node_methods.py
 tests/test_nodesel.py
 tests/test_nogil.py
 tests/test_nonlinear.py
@@ -69,6 +73,7 @@ tests/test_quadcons.py
 tests/test_quickprod.py
 tests/test_quicksum.py
 tests/test_reader.py
+tests/test_recipe_getLocalConss.py
 tests/test_recipe_infeasibilities.py
 tests/test_recipe_nonlinear.py
 tests/test_recipe_piecewise.py

{pyscipopt-5.6.0 → pyscipopt-5.7.0}/pyproject.toml

@@ -51,9 +51,9 @@ AARCH=$(uname -m)
 echo "------"
 echo $AARCH
 if [[ $AARCH == "aarch64" ]]; then
-    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-linux-arm.zip -O scip.zip
+    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.9.0/libscip-linux-arm.zip -O scip.zip
 else
-    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-linux.zip -O scip.zip
+    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.9.0/libscip-linux.zip -O scip.zip
 fi
 unzip scip.zip
 mv scip_install scip
@@ -67,11 +67,11 @@ before-all = '''
 #!/bin/bash
 brew install wget zlib gcc
 if [[ $CIBW_ARCHS == *"arm"* ]]; then
-    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-macos-arm.zip -O scip.zip
+    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.9.0/libscip-macos-arm.zip -O scip.zip
     export MACOSX_DEPLOYMENT_TARGET=14.0
 else
-    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-macos-intel.zip -O scip.zip
-    export MACOSX_DEPLOYMENT_TARGET=13.0
+    wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.9.0/libscip-macos-intel.zip -O scip.zip
+    export MACOSX_DEPLOYMENT_TARGET=14.0
 fi
 unzip scip.zip
 mv scip_install src/scip
@@ -84,7 +84,7 @@ repair-wheel-command = '''
         delocate-listdeps {wheel}
         delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
     else
-        export MACOSX_DEPLOYMENT_TARGET=13.0
+        export MACOSX_DEPLOYMENT_TARGET=14.0
         delocate-listdeps {wheel}
         delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}
     fi
@@ -96,7 +96,7 @@ repair-wheel-command = '''
 skip="pp* cp36* cp37*"
 before-all = [
     "choco install 7zip wget",
-    "wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.8.0/libscip-windows.zip -O scip.zip",
+    "wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.9.0/libscip-windows.zip -O scip.zip",
     "\"C:\\Program Files\\7-Zip\\7z.exe\" x \"scip.zip\" -o\"scip-test\"",
     "mv .\\scip-test\\scip_install .\\test",
     "mv .\\test .\\scip"

{pyscipopt-5.6.0 → pyscipopt-5.7.0}/setup.py

@@ -7,54 +7,63 @@ scipoptdir = os.environ.get("SCIPOPTDIR", "").strip('"')
 extra_compile_args = []
 extra_link_args = []
 
-# if SCIPOPTDIR is not set, we assume that SCIP is installed globally
+# if SCIPOPTDIR is not set, try to detect conda environment, otherwise assume global installation
 if not scipoptdir:
-    if platform.system() == "Darwin":
-        includedir = "/usr/local/include"
-        libdir = "/usr/local/lib"
+    # check if we're in a conda environment
+    conda_prefix = os.environ.get("CONDA_PREFIX", "").strip('"')
+
+    if conda_prefix and os.path.exists(os.path.join(conda_prefix, "include")):
+        includedir = os.path.join(conda_prefix, "include")
+        libdir = os.path.join(conda_prefix, "lib")
+        libname = "libscip" if platform.system() == "Windows" else "scip"
+        print(f"Detected conda environment at {conda_prefix}.")
+        print(f"Using include path {includedir}.")
+        print(f"Using library directory {libdir}.\n")
     else:
-        includedir = "."
-        libdir = "."
-    libname = "libscip" if platform.system() in ["Windows"] else "scip"
-    print("Assuming that SCIP is installed globally, because SCIPOPTDIR is undefined.\n")
+        # fall back to global installation
+        if platform.system() == "Darwin":
+            includedirs = ["/usr/local/include"]
+            libdir = "/usr/local/lib"
+        else:
+            includedirs = ["."]
+            libdir = "."
+        libname = "libscip" if platform.system() == "Windows" else "scip"
+        print("Assuming that SCIP is installed globally, because SCIPOPTDIR is undefined.\n")
 
 else:
 
     # check whether SCIP is installed in the given directory
     if os.path.exists(os.path.join(scipoptdir, "include")):
-        includedir = os.path.abspath(os.path.join(scipoptdir, "include"))
+        includedirs = [os.path.abspath(os.path.join(scipoptdir, "include"))]
     else:
-        print(f"SCIPOPTDIR={scipoptdir} does not contain an include directory; searching for include files in src or ../src directory.")
+        print("SCIPOPTDIR=%s does not contain an include directory; searching for include files in src or ../src directory.\n" % scipoptdir)
 
         if os.path.exists(os.path.join(scipoptdir, "src")):
             # SCIP seems to be installed in-place; check whether it was built using make or cmake
             if os.path.exists(os.path.join(scipoptdir, "src", "scip")):
                 # assume that SCIPOPTDIR pointed to the main source directory (make)
-                includedir = os.path.abspath(os.path.join(scipoptdir, "src"))
+                includedirs = [os.path.abspath(os.path.join(scipoptdir, "src")), os.path.abspath(os.path.join(scipoptdir, "lib/shared/include"))]
             else:
                 # assume that SCIPOPTDIR pointed to a cmake build directory; try one level up (this is just a heuristic)
                 if os.path.exists(os.path.join(scipoptdir, "..", "src", "scip")):
-                    includedir = os.path.abspath(os.path.join(scipoptdir, "..", "src"))
+                    includedirs = [os.path.abspath(os.path.join(scipoptdir, "..", "src"))]
                 else:
-                    sys.exit(f"Could neither find src/scip nor ../src/scip directory in SCIPOPTDIR={scipoptdir}. Consider installing SCIP in a separate directory.")
+                    sys.exit("Could neither find src/scip nor ../src/scip directory in SCIPOPTDIR=%s. Consider installing SCIP in a separate directory." % scipoptdir)
         else:                    
-            sys.exit(f"Could not find a src directory in SCIPOPTDIR={scipoptdir}; maybe it points to a wrong directory.")
+            sys.exit("Could not find a src directory in SCIPOPTDIR=%s; maybe it points to a wrong directory." % scipoptdir)
 
     # determine library
     if os.path.exists(os.path.join(scipoptdir, "lib", "shared", "libscip.so")):
         # SCIP seems to be created with make
         libdir = os.path.abspath(os.path.join(scipoptdir, "lib", "shared"))
         libname = "scip"
-        extra_compile_args.append("-DNO_CONFIG_HEADER")
-        # the following is a temporary hack to make it compile with SCIP/make:
-        extra_compile_args.append("-DTPI_NONE")  # if other TPIs are used, please modify
     else:
         # assume that SCIP is installed on the system
         libdir = os.path.abspath(os.path.join(scipoptdir, "lib"))
-        libname = "libscip" if platform.system() in ["Windows"] else "scip"
+        libname = "libscip" if platform.system() == "Windows" else "scip"
 
-    print(f"Using include path {includedir}.")
-    print(f"Using SCIP library {libname} at {libdir}.\n")
+    print("Using include path %s." % includedirs)
+    print("Using SCIP library %s at %s.\n" % (libname, libdir))
 
 # set runtime libraries
 if platform.system() in ["Linux", "Darwin"]:
@@ -84,7 +93,6 @@ if not os.path.exists(os.path.join(packagedir, "scip.pyx")):
 
 ext = ".pyx" if use_cython else ".c"
 
-
 on_github_actions = os.getenv('GITHUB_ACTIONS') == 'true'
 release_mode = os.getenv('RELEASE') == 'true'
 compile_with_line_tracing = on_github_actions and not release_mode    
@@ -92,8 +100,8 @@ compile_with_line_tracing = on_github_actions and not release_mode
 extensions = [
     Extension(
         "pyscipopt.scip",
-        [os.path.join(packagedir, f"scip{ext}")],
-        include_dirs=[includedir],
+        [os.path.join(packagedir, "scip%s" % ext)],
+        include_dirs=includedirs,
         library_dirs=[libdir],
         libraries=[libname],
         extra_compile_args=extra_compile_args,
@@ -110,7 +118,7 @@ with open("README.md") as f:
 
 setup(
     name="PySCIPOpt",
-    version="5.6.0",
+    version="5.7.0",
     description="Python interface and modeling environment for SCIP",
     long_description=long_description,
     long_description_content_type="text/markdown",

pyscipopt-5.7.0/src/pyscipopt/__init__.py

@@ -0,0 +1,58 @@
+from ._version import __version__
+
+# required for Python 3.8 on Windows
+import os
+if hasattr(os, 'add_dll_directory'):
+    if os.getenv('SCIPOPTDIR'):
+        os.add_dll_directory(os.path.join(os.getenv('SCIPOPTDIR').strip('"'), 'bin'))
+
+# export user-relevant objects:
+from pyscipopt.Multidict import multidict as multidict
+from pyscipopt.scip      import Model as Model
+from pyscipopt.scip      import Variable as Variable
+from pyscipopt.scip      import MatrixVariable as MatrixVariable
+from pyscipopt.scip      import Constraint as Constraint
+from pyscipopt.scip      import MatrixConstraint as MatrixConstraint
+from pyscipopt.scip      import Benders as Benders
+from pyscipopt.scip      import Benderscut as Benderscut
+from pyscipopt.scip      import Branchrule as Branchrule
+from pyscipopt.scip      import Nodesel as Nodesel
+from pyscipopt.scip      import Conshdlr as Conshdlr
+from pyscipopt.scip      import Eventhdlr as Eventhdlr
+from pyscipopt.scip      import Heur as Heur
+from pyscipopt.scip      import Presol as Presol
+from pyscipopt.scip      import Pricer as Pricer
+from pyscipopt.scip      import Prop as Prop
+from pyscipopt.scip      import Reader as Reader
+from pyscipopt.scip      import Sepa as Sepa
+from pyscipopt.scip      import LP as LP
+from pyscipopt.scip      import PY_SCIP_LPPARAM as SCIP_LPPARAM
+from pyscipopt.scip      import readStatistics as readStatistics
+from pyscipopt.scip      import Expr as Expr
+from pyscipopt.scip      import MatrixExpr as MatrixExpr
+from pyscipopt.scip      import MatrixExprCons as MatrixExprCons
+from pyscipopt.scip      import ExprCons as ExprCons
+from pyscipopt.scip      import quicksum as quicksum
+from pyscipopt.scip      import quickprod as quickprod
+from pyscipopt.scip      import exp as exp
+from pyscipopt.scip      import log as log
+from pyscipopt.scip      import sqrt as sqrt
+from pyscipopt.scip      import sin as sin
+from pyscipopt.scip      import cos as cos
+from pyscipopt.scip      import PY_SCIP_RESULT          as SCIP_RESULT
+from pyscipopt.scip      import PY_SCIP_PARAMSETTING    as SCIP_PARAMSETTING
+from pyscipopt.scip      import PY_SCIP_PARAMEMPHASIS   as SCIP_PARAMEMPHASIS
+from pyscipopt.scip      import PY_SCIP_STATUS          as SCIP_STATUS
+from pyscipopt.scip      import PY_SCIP_STAGE           as SCIP_STAGE
+from pyscipopt.scip      import PY_SCIP_NODETYPE        as SCIP_NODETYPE
+from pyscipopt.scip      import PY_SCIP_PROPTIMING      as SCIP_PROPTIMING
+from pyscipopt.scip      import PY_SCIP_PRESOLTIMING    as SCIP_PRESOLTIMING
+from pyscipopt.scip      import PY_SCIP_HEURTIMING      as SCIP_HEURTIMING
+from pyscipopt.scip      import PY_SCIP_EVENTTYPE       as SCIP_EVENTTYPE
+from pyscipopt.scip      import PY_SCIP_LOCKTYPE        as SCIP_LOCKTYPE
+from pyscipopt.scip      import PY_SCIP_LPSOLSTAT       as SCIP_LPSOLSTAT
+from pyscipopt.scip      import PY_SCIP_BRANCHDIR       as SCIP_BRANCHDIR
+from pyscipopt.scip      import PY_SCIP_BENDERSENFOTYPE as SCIP_BENDERSENFOTYPE
+from pyscipopt.scip      import PY_SCIP_ROWORIGINTYPE as SCIP_ROWORIGINTYPE
+from pyscipopt.scip      import PY_SCIP_SOLORIGIN as SCIP_SOLORIGIN
+from pyscipopt.scip      import PY_SCIP_NODETYPE as SCIP_NODETYPE

pyscipopt-5.7.0/src/pyscipopt/_version.py

@@ -0,0 +1 @@
+__version__: str = '5.7.0'

{pyscipopt-5.6.0 → pyscipopt-5.7.0}/src/pyscipopt/event.pxi

@@ -39,7 +39,7 @@ cdef class Eventhdlr:
 
 
 # local helper functions for the interface
-cdef Eventhdlr getPyEventhdlr(SCIP_EVENTHDLR* eventhdlr) noexcept with gil:
+cdef Eventhdlr getPyEventhdlr(SCIP_EVENTHDLR* eventhdlr):
     cdef SCIP_EVENTHDLRDATA* eventhdlrdata
     eventhdlrdata = SCIPeventhdlrGetData(eventhdlr)
     return <Eventhdlr>eventhdlrdata

{pyscipopt-5.6.0 → pyscipopt-5.7.0}/src/pyscipopt/expr.pxi

@@ -44,6 +44,7 @@
 # Modifying the expression directly would be a bug, given that the expression might be re-used by the user. </pre>
 include "matrix.pxi"
 
+
 def _is_number(e):
     try:
         f = float(e)
@@ -52,7 +53,8 @@ def _is_number(e):
         return False
     except TypeError: # for other types (Variable, Expr)
         return False
-        
+
+
 def _expr_richcmp(self, other, op):
     if op == 1: # <=
         if isinstance(other, Expr) or isinstance(other, GenExpr):
@@ -62,7 +64,7 @@ def _expr_richcmp(self, other, op):
         elif isinstance(other, MatrixExpr):
             return _expr_richcmp(other, self, 5)
         else:
-            raise NotImplementedError
+            raise TypeError(f"Unsupported type {type(other)}")
     elif op == 5: # >=
         if isinstance(other, Expr) or isinstance(other, GenExpr):
             return (self - other) >= 0.0
@@ -71,7 +73,7 @@ def _expr_richcmp(self, other, op):
         elif isinstance(other, MatrixExpr):
             return _expr_richcmp(other, self, 1)
         else:
-            raise NotImplementedError
+            raise TypeError(f"Unsupported type {type(other)}")
     elif op == 2: # ==
         if isinstance(other, Expr) or isinstance(other, GenExpr):
             return (self - other) == 0.0
@@ -80,7 +82,7 @@ def _expr_richcmp(self, other, op):
         elif isinstance(other, MatrixExpr):
             return _expr_richcmp(other, self, 2)
         else:
-            raise NotImplementedError
+            raise TypeError(f"Unsupported type {type(other)}")
     else:
         raise NotImplementedError("Can only support constraints with '<=', '>=', or '=='.")
 
@@ -146,7 +148,7 @@ def buildGenExprObj(expr):
         GenExprs = np.empty(expr.shape, dtype=object)
         for idx in np.ndindex(expr.shape):
             GenExprs[idx] = buildGenExprObj(expr[idx])
-        return GenExprs
+        return GenExprs.view(MatrixExpr)
 
     else:
         assert isinstance(expr, GenExpr)
@@ -201,7 +203,7 @@ cdef class Expr:
         elif isinstance(right, MatrixExpr):
             return right + left
         else:
-            raise NotImplementedError
+            raise TypeError(f"Unsupported type {type(right)}")
 
         return Expr(terms)
 
@@ -218,11 +220,14 @@ cdef class Expr:
             # TypeError: Cannot convert pyscipopt.scip.SumExpr to pyscipopt.scip.Expr
             return buildGenExprObj(self) + other
         else:
-            raise NotImplementedError
+            raise TypeError(f"Unsupported type {type(other)}")
 
         return self
 
     def __mul__(self, other):
+        if isinstance(other, MatrixExpr):
+            return other * self
+
         if _is_number(other):
             f = float(other)
             return Expr({v:f*c for v,c in self.terms.items()})
@@ -267,6 +272,19 @@ cdef class Expr:
             res *= self
         return res
 
+    def __rpow__(self, other):
+        """
+        Implements base**x as scip.exp(x * scip.log(base)).
+        Note: base must be positive.
+        """
+        if _is_number(other):
+            base = float(other)
+            if base <= 0.0:
+                raise ValueError("Base of a**x must be positive, as expression is reformulated to scip.exp(x * scip.log(a)); got %g" % base)
+            return exp(self * log(base))
+        else:
+            raise TypeError(f"Unsupported base type {type(other)} for exponentiation.")
+
     def __neg__(self):
         return Expr({v:-c for v,c in self.terms.items()})
 
@@ -334,31 +352,31 @@ cdef class ExprCons:
     def __richcmp__(self, other, op):
         '''turn it into a constraint'''
         if op == 1: # <=
-           if not self._rhs is None:
-               raise TypeError('ExprCons already has upper bound')
-           assert not self._lhs is None
+            if not self._rhs is None:
+                raise TypeError('ExprCons already has upper bound')
+            assert not self._lhs is None
 
-           if not _is_number(other):
-               raise TypeError('Ranged ExprCons is not well defined!')
+            if not _is_number(other):
+                raise TypeError('Ranged ExprCons is not well defined!')
 
-           return ExprCons(self.expr, lhs=self._lhs, rhs=float(other))
+            return ExprCons(self.expr, lhs=self._lhs, rhs=float(other))
         elif op == 5: # >=
-           if not self._lhs is None:
-               raise TypeError('ExprCons already has lower bound')
-           assert self._lhs is None
-           assert not self._rhs is None
+            if not self._lhs is None:
+                raise TypeError('ExprCons already has lower bound')
+            assert self._lhs is None
+            assert not self._rhs is None
 
-           if not _is_number(other):
-               raise TypeError('Ranged ExprCons is not well defined!')
+            if not _is_number(other):
+                raise TypeError('Ranged ExprCons is not well defined!')
 
-           return ExprCons(self.expr, lhs=float(other), rhs=self._rhs)
+            return ExprCons(self.expr, lhs=float(other), rhs=self._rhs)
         else:
-            raise TypeError
+            raise NotImplementedError("Ranged ExprCons can only support with '<=' or '>='.")
 
     def __repr__(self):
         return 'ExprCons(%s, %s, %s)' % (self.expr, self._lhs, self._rhs)
 
-    def __nonzero__(self):
+    def __bool__(self):
         '''Make sure that equality of expressions is not asserted with =='''
 
         msg = """Can't evaluate constraints as booleans.
@@ -420,6 +438,9 @@ cdef class GenExpr:
         return UnaryExpr(Operator.fabs, self)
 
     def __add__(self, other):
+        if isinstance(other, MatrixExpr):
+            return other + self
+
         left = buildGenExprObj(self)
         right = buildGenExprObj(other)
         ans = SumExpr()
@@ -475,6 +496,9 @@ cdef class GenExpr:
     #    return self
 
     def __mul__(self, other):
+        if isinstance(other, MatrixExpr):
+            return other * self
+
         left = buildGenExprObj(self)
         right = buildGenExprObj(other)
         ans = ProdExpr()
@@ -533,11 +557,24 @@ cdef class GenExpr:
 
         return ans
 
+    def __rpow__(self, other):
+        """
+        Implements base**x as scip.exp(x * scip.log(base)). 
+        Note: base must be positive.
+        """
+        if _is_number(other):
+            base = float(other)
+            if base <= 0.0:
+                raise ValueError("Base of a**x must be positive, as expression is reformulated to scip.exp(x * scip.log(a)); got %g" % base)
+            return exp(self * log(base))
+        else:
+            raise TypeError(f"Unsupported base type {type(other)} for exponentiation.")
+
     #TODO: ipow, idiv, etc
     def __truediv__(self,other):
         divisor = buildGenExprObj(other)
         # we can't divide by 0
-        if divisor.getOp() == Operator.const and divisor.number == 0.0:
+        if isinstance(divisor, GenExpr) and divisor.getOp() == Operator.const and divisor.number == 0.0:
             raise ZeroDivisionError("cannot divide by 0")
         return self * divisor**(-1)
 

{pyscipopt-5.6.0 → pyscipopt-5.7.0}/src/pyscipopt/lp.pxi

@@ -58,7 +58,8 @@ cdef class LP:
         """Adds a single column to the LP.
 
         Keyword arguments:
-        entries -- list of tuples, each tuple consists of a row index and a coefficient
+        entries -- a list of tuples; if p is the index of the new column, then each tuple (i, k) indicates that
+        A[i][p] = k, where A is the constraint matrix and k is a nonzero entry.
         obj     -- objective coefficient (default 0.0)
         lb      -- lower bound (default 0.0)
         ub      -- upper bound (default infinity)
@@ -85,7 +86,8 @@ cdef class LP:
         """Adds multiple columns to the LP.
 
         Keyword arguments:
-        entrieslist -- list containing lists of tuples, each tuple contains a coefficient and a row index
+        entrieslist -- a list of lists, where the j-th inner list contains tuples (i, k) such that A[i][p] = k,
+        where A is the constraint matrix, p is the index of the j-th new column, and k is a nonzero entry.
         objs  -- objective coefficient (default 0.0)
         lbs   -- lower bounds (default 0.0)
         ubs   -- upper bounds (default infinity)
@@ -147,7 +149,8 @@ cdef class LP:
         """Adds a single row to the LP.
 
         Keyword arguments:
-        entries -- list of tuples, each tuple contains a coefficient and a column index
+        entries -- a list of tuples; if q is the index of the new row, then each tuple (j, k) indicates that
+        A[q][j] = k, where A is the constraint matrix and k is a nonzero entry.
         lhs     -- left-hand side of the row (default 0.0)
         rhs     -- right-hand side of the row (default infinity)
         """
@@ -172,7 +175,8 @@ cdef class LP:
         """Adds multiple rows to the LP.
 
         Keyword arguments:
-        entrieslist -- list containing lists of tuples, each tuple contains a coefficient and a column index
+        entrieslist -- a list of lists, where the i-th inner list contains tuples (j, k) such that A[q][j] = k,
+        where A is the constraint matrix, q is the index of the i-th new row, and k is a nonzero entry.
         lhss        -- left-hand side of the row (default 0.0)
         rhss        -- right-hand side of the row (default infinity)
         """

pyscipopt-5.7.0/src/pyscipopt/matrix.pxi

@@ -0,0 +1,112 @@
+"""
+# TODO Cythonize things. Improve performance.
+# TODO Add tests
+"""
+
+import numpy as np
+from typing import Union
+
+
+def _is_number(e):
+    try:
+        f = float(e)
+        return True
+    except ValueError: # for malformed strings
+        return False
+    except TypeError: # for other types (Variable, Expr)
+        return False
+
+
+def _matrixexpr_richcmp(self, other, op):
+    def _richcmp(self, other, op):
+        if op == 1: # <=
+            return self.__le__(other)
+        elif op == 5: # >=
+            return self.__ge__(other)
+        elif op == 2: # ==
+            return self.__eq__(other)
+        else:
+            raise NotImplementedError("Can only support constraints with '<=', '>=', or '=='.")
+
+    if _is_number(other) or isinstance(other, Expr):
+        res = np.empty(self.shape, dtype=object)
+        res.flat = [_richcmp(i, other, op) for i in self.flat]
+
+    elif isinstance(other, np.ndarray):
+        out = np.broadcast(self, other)
+        res = np.empty(out.shape, dtype=object)
+        res.flat = [_richcmp(i, j, op) for i, j in out]
+
+    else:
+        raise TypeError(f"Unsupported type {type(other)}")
+
+    return res.view(MatrixExprCons)
+
+
+class MatrixExpr(np.ndarray):
+    def sum(self, **kwargs):
+        """
+        Based on `numpy.ndarray.sum`, but returns a scalar if `axis=None`.
+        This is useful for matrix expressions to compare with a matrix or a scalar.
+        """
+
+        if kwargs.get("axis") is None:
+            # Speed up `.sum()` #1070
+            return quicksum(self.flat)
+        return super().sum(**kwargs)
+
+    def __le__(self, other: Union[float, int, "Expr", np.ndarray, "MatrixExpr"]) -> MatrixExprCons:
+        return _matrixexpr_richcmp(self, other, 1)
+
+    def __ge__(self, other: Union[float, int, "Expr", np.ndarray, "MatrixExpr"]) -> MatrixExprCons:
+        return _matrixexpr_richcmp(self, other, 5)
+
+    def __eq__(self, other: Union[float, int, "Expr", np.ndarray, "MatrixExpr"]) -> MatrixExprCons:
+        return _matrixexpr_richcmp(self, other, 2)
+
+    def __add__(self, other):
+        return super().__add__(other).view(MatrixExpr)
+    
+    def __iadd__(self, other):
+        return super().__iadd__(other).view(MatrixExpr)
+
+    def __mul__(self, other):
+        return super().__mul__(other).view(MatrixExpr)
+
+    def __truediv__(self, other):
+        return super().__truediv__(other).view(MatrixExpr)
+    
+    def __rtruediv__(self, other):
+        return super().__rtruediv__(other).view(MatrixExpr)
+        
+    def __pow__(self, other):
+        return super().__pow__(other).view(MatrixExpr)
+    
+    def __sub__(self, other):
+        return super().__sub__(other).view(MatrixExpr)
+    
+    def __radd__(self, other):
+        return super().__radd__(other).view(MatrixExpr)
+    
+    def __rmul__(self, other):
+        return super().__rmul__(other).view(MatrixExpr)
+    
+    def __rsub__(self, other):
+        return super().__rsub__(other).view(MatrixExpr)
+
+    def __matmul__(self, other):
+        return super().__matmul__(other).view(MatrixExpr)
+
+class MatrixGenExpr(MatrixExpr):
+    pass
+
+class MatrixExprCons(np.ndarray):
+
+    def __le__(self, other: Union[float, int, np.ndarray]) -> MatrixExprCons:
+        return _matrixexpr_richcmp(self, other, 1)
+
+    def __ge__(self, other: Union[float, int, np.ndarray]) -> MatrixExprCons:
+        return _matrixexpr_richcmp(self, other, 5)
+
+    def __eq__(self, other):
+        raise NotImplementedError("Cannot compare MatrixExprCons with '=='.")

{pyscipopt-5.6.0 → pyscipopt-5.7.0}/src/pyscipopt/nodesel.pxi

@@ -87,8 +87,12 @@ cdef SCIP_RETCODE PyNodeselSelect (SCIP* scip, SCIP_NODESEL* nodesel, SCIP_NODE*
   nodeseldata = SCIPnodeselGetData(nodesel)
   PyNodesel = <Nodesel>nodeseldata
   result_dict = PyNodesel.nodeselect()
-  selected_node = <Node>(result_dict.get("selnode", None))
-  selnode[0] = selected_node.scip_node
+  selected_node = <Node>result_dict.get("selnode", None)
+  if selected_node == None:
+    selnode[0] = NULL
+  else:
+    selnode[0] = selected_node.scip_node
+  
   return SCIP_OKAY
 
 cdef int PyNodeselComp (SCIP* scip, SCIP_NODESEL* nodesel, SCIP_NODE* node1, SCIP_NODE* node2) noexcept with gil: