Merge branch 'dev' of github.com:iSoron/miplearn into dev

master
Alinson S. Xavier 5 years ago
commit fb006a7880
No known key found for this signature in database
GPG Key ID: A796166E4E218E02

@ -76,6 +76,14 @@ class BenchmarkRunner:
for (solver_name, solver) in self.solvers.items(): for (solver_name, solver) in self.solvers.items():
solver.fit(training_instances) solver.fit(training_instances)
def _compute_gap(self, ub, lb):
# solver did not find a solution and/or bound, use maximum gap possible
if lb is None or ub is None or lb * ub < 0:
return 1.0
else:
# divide by max(abs(ub),abs(lb)) to ensure gap <= 1
return (ub - lb) / max(abs(ub), abs(lb))
def _push_result(self, result, solver, solver_name, instance): def _push_result(self, result, solver, solver_name, instance):
if self.results is None: if self.results is None:
self.results = pd.DataFrame( self.results = pd.DataFrame(
@ -85,12 +93,12 @@ class BenchmarkRunner:
"Instance", "Instance",
] ]
) )
lb = result["Lower bound"]
ub = result["Upper bound"]
result["Solver"] = solver_name result["Solver"] = solver_name
result["Instance"] = instance result["Instance"] = instance
result["Gap"] = (ub - lb) / lb result["Gap"] = self._compute_gap(
ub=result["Lower bound"],
lb=result["Upper bound"],
)
result["Mode"] = solver.mode result["Mode"] = solver.mode
self.results = self.results.append(pd.DataFrame([result])) self.results = self.results.append(pd.DataFrame([result]))

Loading…
Cancel
Save