Merge pull request Pyomo#3691 from anatoliy-kuznetsov/scip-nodes

Add reporting of SCIP node count to solver results

Author: mrmundt

pyomo/solvers/plugins/solvers/SCIPAMPL.py

@@ -255,6 +255,7 @@ def _postsolve(self):
 
                     results.solver.time = log_dict['solving_time']
                     results.solver.gap = log_dict['gap']
+                    results.solver.node_count = log_dict['solving_nodes']
                     results.solver.primal_bound = log_dict['primal_bound']
                     results.solver.dual_bound = log_dict['dual_bound']
 

pyomo/solvers/tests/mip/test_scip_log_data.py

@@ -198,11 +198,29 @@ def test_scip_some_more():
     list_extra_data_expected = [
         (),  # problem_lp_unbounded(),
         (),  # problem_lp_infeasible(),
-        ('Time', 'Gap', 'Primal bound', 'Dual bound'),  # problem_lp_optimal(),
+        (
+            'Time',
+            'Gap',
+            'Node count',
+            'Primal bound',
+            'Dual bound',
+        ),  # problem_lp_optimal(),
         (),  # problem_milp_unbounded(),
         (),  # problem_milp_infeasible(),
-        ('Time', 'Gap', 'Primal bound', 'Dual bound'),  # problem_milp_optimal(),
-        ('Time', 'Gap', 'Primal bound', 'Dual bound'),  # problem_milp_feasible()
+        (
+            'Time',
+            'Gap',
+            'Node count',
+            'Primal bound',
+            'Dual bound',
+        ),  # problem_milp_optimal(),
+        (
+            'Time',
+            'Gap',
+            'Node count',
+            'Primal bound',
+            'Dual bound',
+        ),  # problem_milp_feasible()
     ]
 
     # **************************************************************************