Merge pull request #729 from Joao-Dionisio/delete-double-declaration

Fixes printing a solution to refer to original variables

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Add SCIP function SCIPgetSolTime and wrapper getSolTime
 ### Fixed
 - 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

src/pyscipopt/scip.pxi

@@ -572,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))

tests/test_solution.py

@@ -67,6 +67,14 @@ def test_create_solution():
     with pytest.raises(ValueError):
         scip.Solution()
 
+def test_print_soltion():
+    m = Model()
+
+    m.addVar()
+    m.optimize()
+
+    assert str(m.getSols()[0]) == "{'x1': -0.0}"
+
 if __name__ == "__main__":
     test_solution_getbest()
     test_solution_create()