Skip to content

Commit c39a1cd

Browse files
committed
Revert "disable prox for one iteration after enforcing integers"
This reverts commit c6f41cb.
1 parent 7f0ba37 commit c39a1cd

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

mpisppy/extensions/integer_relax_then_enforce.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ def pre_iter0(self):
3131
for s in self.opt.local_scenarios.values():
3232
self.integer_relaxer.apply_to(s)
3333
self._integers_relaxed = True
34-
self._reenable_prox = False
3534

3635
def _unrelax_integers(self):
3736
for sub in self.opt.local_subproblems.values():
@@ -46,14 +45,8 @@ def _unrelax_integers(self):
4645
for v in vlist:
4746
subproblem_solver.update_var(v)
4847
self._integers_relaxed = False
49-
if not self.opt.prox_disabled:
50-
self.opt._disable_prox()
51-
self._reenable_prox = True
5248

5349
def miditer(self):
54-
if self._reenable_prox:
55-
self.opt._reenable_prox()
56-
self._reenable_prox = False
5750
if not self._integers_relaxed:
5851
return
5952
# time is running out

0 commit comments

Comments
 (0)