Merge branch 'master' into sb/edit_test_branch_probing_lp

CHANGELOG.md

@@ -5,9 +5,14 @@
 - Add SCIP functions SCIPchgCoefLinear, SCIPaddCoefLinear and SCIPdelCoefLinear
 - Add SCIP function SCIPgetSolTime and wrapper getSolTime
 ### Fixed
+- Pricer plugin fundamental callbacks now raise an error if not implemented
+- Brachrule plugin fundamental callbacks now raise an error if not implemented
+- Fixed segmentation fault when accessing the Solution class directly
+- Changed getSols so that it prints solutions in terms of the original variables
 ### Changed
 - Improved error message when using < or > instead of <= or >=
 ### Removed
+- Removed double declaration of SCIPfindEventhdlr
 
 ## 4.3.0 - 2023-03-17
 ### Added
@@ -18,7 +23,6 @@
 
 ### Fixed
 ### Changed
-- Pricer plugin fundamental callbacks now raise an error if not implemented
 ### Removed
 - Removed function rowGetNNonz
 

README.md

@@ -1,8 +1,7 @@
 PySCIPOpt
 =========
 
-This project provides an interface from Python to the [SCIP Optimization
-Suite](https://www.scipopt.org/). Please review [SCIP's license restrictions](https://scipopt.org/index.php#license) before installing PySCIPOpt.
+This project provides an interface from Python to the [SCIP Optimization Suite](https://www.scipopt.org/). Starting from v8.0.3, SCIP uses the [Apache2.0](https://www.apache.org/licenses/LICENSE-2.0) license. If you plan to use an earlier version of SCIP, please review [SCIP's license restrictions](https://scipopt.org/index.php#license).
 
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/PySCIPOpt/Lobby)
 [![PySCIPOpt on PyPI](https://img.shields.io/pypi/v/pyscipopt.svg)](https://pypi.python.org/pypi/pyscipopt)

src/pyscipopt/branchrule.pxi

@@ -25,18 +25,17 @@ cdef class Branchrule:
 
     def branchexeclp(self, allowaddcons):
         '''executes branching rule for fractional LP solution'''
-        # this method needs to be implemented by the user
-        return {}
+        raise NotImplementedError("branchexeclp() is a fundamental callback and should be implemented in the derived "
+                                  "class")
 
     def branchexecext(self, allowaddcons):
         '''executes branching rule for external branching candidates '''
-        # this method needs to be implemented by the user
-        return {}
+        raise NotImplementedError("branchexecext() is a fundamental callback and should be implemented in the derived class")
 
     def branchexecps(self, allowaddcons):
         '''executes branching rule for not completely fixed pseudo solution '''
         # this method needs to be implemented by the user
-        return {}
+        raise NotImplementedError("branchexecps() is a fundamental callback and should be implemented in the derived class")
 
 
 

src/pyscipopt/scip.pxd

@@ -874,7 +874,6 @@ cdef extern from "scip/scip.h":
                                       SCIP_RETCODE (*eventdelete) (SCIP* scip, SCIP_EVENTHDLR* eventhdlr, SCIP_EVENTDATA** eventdata),
                                       SCIP_RETCODE (*eventexec) (SCIP* scip, SCIP_EVENTHDLR* eventhdlr, SCIP_EVENT* event, SCIP_EVENTDATA* eventdata),
                                       SCIP_EVENTHDLRDATA* eventhdlrdata)
-    SCIP_EVENTHDLR* SCIPfindEventhdlr(SCIP* scip, const char* name)
     SCIP_EVENTHDLRDATA* SCIPeventhdlrGetData(SCIP_EVENTHDLR* eventhdlr)
 
     # Variable pricer plugin

src/pyscipopt/scip.pxi

@@ -535,11 +535,16 @@ cdef class NLRow:
 cdef class Solution:
     """Base class holding a pointer to corresponding SCIP_SOL"""
 
+    # We are raising an error here to avoid creating a solution without an associated model. See Issue #625
+    def __init__(self, raise_error = False):
+        if not raise_error:
+            raise ValueError("To create a solution you should use the createSol method of the Model class.")
+
     @staticmethod
     cdef create(SCIP* scip, SCIP_SOL* scip_sol):
         if scip == NULL:
             raise Warning("cannot create Solution with SCIP* == NULL")
-        sol = Solution()
+        sol = Solution(True)
         sol.sol = scip_sol
         sol.scip = scip
         return sol
@@ -567,8 +572,8 @@ cdef class Solution:
 
         vals = {}
         self._checkStage("SCIPgetSolVal")
-        for i in range(SCIPgetNVars(self.scip)):
-            scip_var = SCIPgetVars(self.scip)[i]
+        for i in range(SCIPgetNOrigVars(self.scip)):
+            scip_var = SCIPgetOrigVars(self.scip)[i]
 
             # extract name
             cname = bytes(SCIPvarGetName(scip_var))