Merge pull request Pyomo#3234 from henriquejsfj/patch-1

Fix: Get SCIP solving time considering float number with some text
DLWoodruff · Apr 19, 2024 · bd640f8 · bd640f8
2 parents 4e8e48d + 3ce7416
commit bd640f8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pyomo/solvers/plugins/solvers/SCIPAMPL.py b/pyomo/solvers/plugins/solvers/SCIPAMPL.py
@@ -455,7 +455,7 @@ def read_scip_log(filename: str):
         solver_status = scip_lines[0][colon_position + 2 : scip_lines[0].index('\n')]
 
         solving_time = float(
-            scip_lines[1][colon_position + 2 : scip_lines[1].index('\n')]
+            scip_lines[1][colon_position + 2 : scip_lines[1].index('\n')].split(' ')[0]
         )
 
         try:

diff --git a/pyomo/solvers/tests/mip/test_scip.py b/pyomo/solvers/tests/mip/test_scip.py
@@ -106,6 +106,12 @@ def test_scip_solve_from_instance_options(self):
         results.write(filename=_out, times=False, format='json')
         self.compare_json(_out, join(currdir, "test_scip_solve_from_instance.baseline"))
 
+    def test_scip_solve_from_instance_with_reoptimization(self):
+        # Test scip with re-optimization option enabled
+        # This case changes the Scip output results which may break the results parser
+        self.scip.options['reoptimization/enable'] = True
+        self.test_scip_solve_from_instance()
+
 
 if __name__ == "__main__":
     deleteFiles = False