Skip to content

Commit 73f071b

Browse files
committed
don't include cutoff (for now), but leave some breadcrumbs
1 parent 0cfa254 commit 73f071b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Diff for: mpisppy/opt/fwph.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,9 @@ def SDM(self, model_name):
280280
- scen_mip._mpisppy_model.xbars[ndn_i]._value))
281281

282282
cutoff = pyo.value(qp._mpisppy_model.mip_obj_in_qp) + pyo.value(qp.recourse_cost)
283-
#if self.options["fwph_include_cutoff"]:
284-
if True:
285-
# TODO: add lookup table for absolute cutoff option
286-
self.options["iterk_solver_options"]["MIPABSCUTOFF"] = cutoff
283+
# TODO: add lookup table for absolute cutoff option
284+
# if self.options.get("fwph_include_cutoff", False):
285+
# self.options["iterk_solver_options"]["MIPABSCUTOFF"] = cutoff
287286
# tbmipsolve = time.time()
288287
# Algorithm 2 line 5
289288
self.solve_one(
@@ -294,8 +293,9 @@ def SDM(self, model_name):
294293
tee=teeme,
295294
verbose=verbose,
296295
)
296+
# TODO: handle case when there's no solution under the cutoff gracefully
297297
# TODO: fixme for maxmimization / larger objectives
298-
self.options["iterk_solver_options"]["MIPABSCUTOFF"] = 1e40
298+
# self.options["iterk_solver_options"]["MIPABSCUTOFF"] = 1e40
299299
# tmipsolve = time.time() - tbmipsolve
300300

301301
# Algorithm 2 lines 6--8

0 commit comments

Comments
 (0)