Skip to content

Commit c600440

Browse files
committed
fixing naming per code review
1 parent 7c8423e commit c600440

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Diff for: examples/netdes/netdes_cylinders.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def _parse_args():
2424
cfg.ph_args()
2525
cfg.fwph_args()
2626
cfg.lagrangian_args()
27-
cfg.subgradient_args()
27+
cfg.subgradient_bounder_args()
2828
cfg.xhatshuffle_args()
2929
cfg.slammax_args()
3030
cfg.cross_scenario_cuts_args()

Diff for: examples/sslp/sslp_cylinders.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def _parse_args():
3030
cfg.fwph_args()
3131
cfg.lagrangian_args()
3232
cfg.xhatshuffle_args()
33-
cfg.subgradient_args()
33+
cfg.subgradient_bounder_args()
3434
cfg.reduced_costs_args()
3535
cfg.coeff_rho_args()
3636
cfg.integer_relax_then_enforce_args()

Diff for: mpisppy/generic_cylinders.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ def _parse_args(m):
6262
cfg.two_sided_args()
6363
cfg.ph_args()
6464
cfg.aph_args()
65-
cfg.sub_args()
65+
cfg.subgradient_args()
6666
cfg.fixer_args()
6767
cfg.integer_relax_then_enforce_args()
6868
cfg.gapper_args()
6969
cfg.fwph_args()
7070
cfg.lagrangian_args()
7171
cfg.ph_ob_args()
72-
cfg.subgradient_args()
72+
cfg.subgradient_bounder_args()
7373
cfg.xhatshuffle_args()
7474
cfg.xhatxbar_args()
7575
cfg.converger_args()
@@ -144,7 +144,7 @@ def _do_decomp(module, cfg, scenario_creator, scenario_creator_kwargs, scenario_
144144
rho_setter = rho_setter,
145145
all_nodenames = all_nodenames,
146146
)
147-
elif cfg.SUB:
147+
elif cfg.SUBGRAD:
148148
# Vanilla Subgradient hub
149149
hub_dict = vanilla.subgradient_hub(
150150
*beans,

Diff for: mpisppy/utils/config.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -420,9 +420,9 @@ def aph_args(self):
420420
domain=float,
421421
default=0.01)
422422

423-
def sub_args(self):
423+
def subgradient_args(self):
424424

425-
self.add_to_config(name="SUB",
425+
self.add_to_config(name="SUBGRAD",
426426
description="Use subgradient hub instead of PH (default False)",
427427
domain=bool,
428428
default=False)
@@ -636,7 +636,7 @@ def lagranger_args(self):
636636
default=None)
637637

638638

639-
def subgradient_args(self):
639+
def subgradient_bounder_args(self):
640640

641641
self.add_to_config('subgradient',
642642
description="have a subgradient spoke",

0 commit comments

Comments
 (0)