Skip to content

Commit a1bae40

Browse files
committed
Revert "Merge pull request #531 from bknueven/rc_spoke_enhancement"
This reverts commit 285c2fa, reversing changes made to c9eaca8.
1 parent 8c2a295 commit a1bae40

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

mpisppy/cylinders/reduced_costs_spoke.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@ def lagrangian(self, need_solution=True, warmstart=False):
139139
self.extract_and_store_reduced_costs()
140140
self.update_bounding_functions(bound)
141141
self.extract_and_store_updated_nonant_bounds(new_dual=True)
142-
else:
143-
self.extract_and_store_updated_nonant_bounds(new_dual=False)
144142
return bound
145143

146144
def extract_and_store_reduced_costs(self):
@@ -319,8 +317,6 @@ def extract_and_store_updated_nonant_bounds(self, new_dual=False):
319317
Field.NONANT_UPPER_BOUNDS,
320318
)
321319

322-
self.update_nonant_bounds()
323-
324320
def update_nonant_bounds(self):
325321
bounds_modified = 0
326322
send_buf = self.send_buffers[Field.NONANT_LOWER_BOUNDS]
@@ -354,6 +350,7 @@ def do_while_waiting_for_new_Ws(self, need_solution, warmstart=False):
354350
super().do_while_waiting_for_new_Ws(need_solution=need_solution, warmstart=False)
355351
# might as well see if a tighter upper bound has come along
356352
self.extract_and_store_updated_nonant_bounds(new_dual=False)
353+
self.update_nonant_bounds()
357354

358355
def main(self):
359356
# need the solution for ReducedCostsSpoke

0 commit comments

Comments
 (0)