Merge branch 'master' into SCIP10

Author: Joao-Dionisio

CHANGELOG.md

@@ -2,9 +2,13 @@
 
 ## Unreleased
 ### Added
+- More support for AND-Constraints
 - Added support for knapsack constraints
 - Added isPositive(), isNegative(), isFeasLE(), isFeasLT(), isFeasGE(), isFeasGT(), isHugeValue(), and tests
 - Added SCIP_LOCKTYPE, addVarLocksType(), getNLocksDown(), getNLocksUp(), getNLocksDownType(), getNLocksUpType(), and tests
+- Added addMatrixConsIndicator(), and tests
+- Added SCIPvarMarkRelaxationOnly, SCIPvarIsRelaxationOnly, SCIPvarMarkDeletable, SCIPvarIsDeletable, and tests
+- Wrapped SCIPgetNLPBranchCands
 - Wrapped SCIPprintStatisticsJson
 - Added 4 new events: TYPECHANGED, IMPLTYPECHANGED, DUALBOUNDIMPROVED, GAPUPDATED.
 - Support for new implied integrality
@@ -13,6 +17,7 @@
 ### Fixed
 - Raised an error when an expression is used when a variable is required
 ### Changed
+- MatrixExpr.sum() now supports axis arguments and can return either a scalar or MatrixExpr depending on the result dimensions
 ### Removed
 
 ## 5.5.0 - 2025.05.06

INSTALL.md

@@ -26,7 +26,7 @@ If installing SCIP from source or using PyPI with a python and operating system
 you need to specify the install location using the environment variable
 `SCIPOPTDIR`:
 
--   on Linux and OS X:\
+-   on Linux and MacOS:\
     `export SCIPOPTDIR=<path_to_install_dir>`
 -   on Windows:\
     `set SCIPOPTDIR=<path_to_install_dir>` (**cmd**, **Cmder**, **WSL**)\
@@ -45,8 +45,9 @@ contains the corresponding header files:
         > nlpi
         > ...
 
-Please note that some Mac configurations require adding the library installation path to `DYLD_LIBRARY_PATH` when using a locally installed version of SCIP.
+On MacOS, to ensure that the SCIP dynamic library can be located at runtime by PySCIPOpt, you should add your SCIP installation path to the ``DYLD_LIBRARY_PATH`` environment variable by running:
 
+`export DYLD_LIBRARY_PATH="<path_to_install_dir>/lib:$DYLD_LIBRARY_PATH"`
 
 When building SCIP from source using Windows it is highly recommended to use the [Anaconda Python
 Platform](https://www.anaconda.com/).
@@ -75,7 +76,7 @@ at runtime by adjusting your `PATH` environment variable:
 
 -   on Windows: `set PATH=%PATH%;%SCIPOPTDIR%\bin`
 
-On Linux and OS X this is encoded in the generated PySCIPOpt library and
+On Linux and MacOS this is encoded in the generated PySCIPOpt library and
 therefore not necessary.
 
 Building everything from source

docs/build.rst

@@ -100,6 +100,15 @@ For Linux and MacOS systems set the variable with the following command:
 
   export SCIPOPTDIR=<path_to_install_dir>
 
+.. note::
+
+  For macOS users, to ensure that the SCIP dynamic library can be found at runtime by PySCIPOpt,
+  you should add your SCIP installation path to the ``DYLD_LIBRARY_PATH`` environment variable by running:
+
+  .. code-block::
+
+    export DYLD_LIBRARY_PATH="<path_to_install_dir>/lib:$DYLD_LIBRARY_PATH"
+
 For Windows use the following command:
 
 .. code-block:: bash

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)
         """

src/pyscipopt/matrix.pxi

@@ -17,8 +17,13 @@ def _is_number(e):
 
 class MatrixExpr(np.ndarray):
     def sum(self, **kwargs):
-        return super().sum(**kwargs).item()
-    
+        """
+        Based on `numpy.ndarray.sum`, but returns a scalar if the result is a single value.
+        This is useful for matrix expressions where the sum might reduce to a single value.
+        """
+        res = super().sum(**kwargs)
+        return res if res.size > 1 else res.item()
+
     def __le__(self, other: Union[float, int, Variable, np.ndarray, 'MatrixExpr']) -> np.ndarray:
 
         expr_cons_matrix = np.empty(self.shape, dtype=object)

src/pyscipopt/scip.pxd

@@ -840,6 +840,10 @@ cdef extern from "scip/scip.h":
     void SCIPvarSetData(SCIP_VAR* var, SCIP_VARDATA* vardata)
     SCIP_VARDATA* SCIPvarGetData(SCIP_VAR* var)
     SCIP_Real SCIPvarGetAvgSol(SCIP_VAR* var)
+    void SCIPvarMarkRelaxationOnly(SCIP_VAR* var)
+    SCIP_Bool SCIPvarIsRelaxationOnly(SCIP_VAR* var)
+    void SCIPvarMarkDeletable(SCIP_VAR* var)
+    SCIP_Bool SCIPvarIsDeletable(SCIP_VAR* var)
     SCIP_Real SCIPgetVarPseudocost(SCIP* scip, SCIP_VAR* var, SCIP_BRANCHDIR dir)
     SCIP_Real SCIPvarGetCutoffSum(SCIP_VAR* var, SCIP_BRANCHDIR dir)
     SCIP_Longint SCIPvarGetNBranchings(SCIP_VAR* var, SCIP_BRANCHDIR dir)
@@ -1710,6 +1714,13 @@ cdef extern from "scip/cons_and.h":
                                          SCIP_Bool dynamic,
                                          SCIP_Bool removable,
                                          SCIP_Bool stickingatnode)
+    int          SCIPgetNVarsAnd(SCIP* scip, SCIP_CONS* cons)
+    SCIP_VAR**   SCIPgetVarsAnd(SCIP* scip, SCIP_CONS* cons)
+    SCIP_VAR*    SCIPgetResultantAnd(SCIP* scip, SCIP_CONS* cons)
+    SCIP_Bool    SCIPisAndConsSorted(SCIP* scip, SCIP_CONS* cons)
+    SCIP_RETCODE SCIPsortAndCons(SCIP* scip, SCIP_CONS* cons)
+    SCIP_RETCODE SCIPchgAndConsCheckFlagWhenUpgr(SCIP* scip, SCIP_CONS* cons, SCIP_Bool flag)
+    SCIP_RETCODE SCIPchgAndConsRemovableFlagWhenUpgr(SCIP* scip, SCIP_CONS* cons, SCIP_Bool flag)
 
 cdef extern from "scip/cons_or.h":
     SCIP_RETCODE SCIPcreateConsOr(SCIP* scip,