Include objective sense in benchmark file; update charts

This commit is contained in:
2020-02-26 13:28:16 -06:00
parent 9a2dd52566
commit b609b4a0ee
3 changed files with 21 additions and 2 deletions

View File

@@ -31,7 +31,10 @@ class BenchmarkRunner:
label="Solve (%s)" % name,
collect_training_data=False)
for i in range(len(instances)):
self._push_result(results[i], solver=solver, name=name, instance=i)
self._push_result(results[i],
solver=solver,
name=name,
instance=i)
def raw_results(self):
return self.results
@@ -60,6 +63,7 @@ class BenchmarkRunner:
"Gap",
"Nodes",
"Mode",
"Sense",
])
lb = result["Lower bound"]
ub = result["Upper bound"]
@@ -73,6 +77,7 @@ class BenchmarkRunner:
"Gap": gap,
"Nodes": result["Nodes"],
"Mode": solver.mode,
"Sense": result["Sense"],
}, ignore_index=True)
groups = self.results.groupby("Instance")
best_lower_bound = groups["Lower Bound"].transform("max")

View File

@@ -94,8 +94,13 @@ class InternalSolver:
(count_fixed, count_total))
def set_model(self, model):
from pyomo.core.kernel.objective import minimize, maximize
self.model = model
self.solver.set_instance(model)
if self.solver._objective.sense == minimize:
self.sense = "min"
else:
self.sense = "max"
self.var_name_to_var = {}
for var in model.component_objects(Var):
self.var_name_to_var[var.name] = var
@@ -140,6 +145,7 @@ class GurobiSolver(InternalSolver):
"Upper bound": results["Problem"][0]["Upper bound"],
"Wallclock time": results["Solver"][0]["Wallclock time"],
"Nodes": self.solver._solver_model.getAttr("NodeCount"),
"Sense": self.sense,
}
def _load_vars(self):
@@ -179,6 +185,7 @@ class CPLEXSolver(InternalSolver):
"Upper bound": results["Problem"][0]["Upper bound"],
"Wallclock time": results["Solver"][0]["Wallclock time"],
"Nodes": 1,
"Sense": self.sense,
}
def solve_lp(self, tee=False):