fixing naming per code review

Author: bknueven

Diff for: examples/netdes/netdes_cylinders.py

@@ -24,7 +24,7 @@ def _parse_args():
     cfg.ph_args()
     cfg.fwph_args()
     cfg.lagrangian_args()
-    cfg.subgradient_args()
+    cfg.subgradient_ob_args()
     cfg.xhatshuffle_args()
     cfg.slammax_args()
     cfg.cross_scenario_cuts_args()
@@ -50,7 +50,7 @@ def main():
     xhatlooper = cfg.xhatlooper
     xhatshuffle = cfg.xhatshuffle
     lagrangian = cfg.lagrangian
-    subgradient = cfg.subgradient
+    subgradient_ob = cfg.subgradient_ob
     slammax = cfg.slammax
     cross_scenario_cuts = cfg.cross_scenario_cuts
 
@@ -94,7 +94,7 @@ def main():
                                               scenario_creator_kwargs=scenario_creator_kwargs,
                                               rho_setter = None)
 
-    if subgradient:
+    if subgradient_ob:
         subgradient_spoke = vanilla.subgradient_spoke(*beans,
                                               scenario_creator_kwargs=scenario_creator_kwargs,
                                               rho_setter = None)
@@ -125,7 +125,7 @@ def main():
         list_of_spoke_dict.append(fw_spoke)
     if lagrangian:
         list_of_spoke_dict.append(lagrangian_spoke)
-    if subgradient:
+    if subgradient_ob:
         list_of_spoke_dict.append(subgradient_spoke)
     if xhatlooper:
         list_of_spoke_dict.append(xhatlooper_spoke)

Diff for: examples/sslp/sslp_cylinders.py

@@ -30,7 +30,7 @@ def _parse_args():
     cfg.fwph_args()
     cfg.lagrangian_args()
     cfg.xhatshuffle_args()
-    cfg.subgradient_args()
+    cfg.subgradient_ob_args()
     cfg.reduced_costs_args()
     cfg.coeff_rho_args()
     cfg.integer_relax_then_enforce_args()
@@ -54,7 +54,7 @@ def main():
     xhatlooper = cfg.xhatlooper
     xhatshuffle = cfg.xhatshuffle
     lagrangian = cfg.lagrangian
-    subgradient = cfg.subgradient
+    subgradient_ob = cfg.subgradient_ob
     reduced_costs = cfg.reduced_costs
 
     if cfg.default_rho is None:
@@ -107,7 +107,7 @@ def main():
         lagrangian_spoke = vanilla.lagrangian_spoke(*beans,
                                               scenario_creator_kwargs=scenario_creator_kwargs,
                                               rho_setter = None)
-    if subgradient:
+    if subgradient_ob:
         subgradient_spoke = vanilla.subgradient_spoke(*beans,
                                               scenario_creator_kwargs=scenario_creator_kwargs,
                                               rho_setter = None)
@@ -133,7 +133,7 @@ def main():
         list_of_spoke_dict.append(fw_spoke)
     if lagrangian:
         list_of_spoke_dict.append(lagrangian_spoke)
-    if subgradient:
+    if subgradient_ob:
         list_of_spoke_dict.append(subgradient_spoke)
     if xhatlooper:
         list_of_spoke_dict.append(xhatlooper_spoke)

Diff for: mpisppy/generic_cylinders.py

@@ -62,14 +62,14 @@ def _parse_args(m):
     cfg.two_sided_args()
     cfg.ph_args()
     cfg.aph_args()
-    cfg.sub_args()
+    cfg.subgradient_args()
     cfg.fixer_args()    
     cfg.integer_relax_then_enforce_args()
     cfg.gapper_args()    
     cfg.fwph_args()
     cfg.lagrangian_args()
     cfg.ph_ob_args()
-    cfg.subgradient_args()
+    cfg.subgradient_ob_args()
     cfg.xhatshuffle_args()
     cfg.xhatxbar_args()
     cfg.converger_args()
@@ -144,7 +144,7 @@ def _do_decomp(module, cfg, scenario_creator, scenario_creator_kwargs, scenario_
                                    rho_setter = rho_setter,
                                    all_nodenames = all_nodenames,
                                    )
-    elif cfg.SUB:
+    elif cfg.SUBGRAD:
         # Vanilla Subgradient hub
         hub_dict = vanilla.subgradient_hub(
                        *beans,
@@ -265,7 +265,7 @@ def _do_decomp(module, cfg, scenario_creator, scenario_creator_kwargs, scenario_
 
 
     # subgradient outer bound spoke
-    if cfg.subgradient:
+    if cfg.subgradient_ob:
         subgradient_spoke = vanilla.subgradient_spoke(*beans,
                                           scenario_creator_kwargs=scenario_creator_kwargs,
                                           rho_setter = rho_setter,
@@ -314,7 +314,7 @@ def _do_decomp(module, cfg, scenario_creator, scenario_creator_kwargs, scenario_
         list_of_spoke_dict.append(lagrangian_spoke)
     if cfg.ph_ob:
         list_of_spoke_dict.append(ph_ob_spoke)
-    if cfg.subgradient:
+    if cfg.subgradient_ob:
         list_of_spoke_dict.append(subgradient_spoke)
     if cfg.xhatshuffle:
         list_of_spoke_dict.append(xhatshuffle_spoke)

Diff for: mpisppy/utils/config.py

@@ -420,9 +420,9 @@ def aph_args(self):
                             domain=float,
                             default=0.01)
 
-    def sub_args(self):
+    def subgradient_args(self):
 
-        self.add_to_config(name="SUB",
+        self.add_to_config(name="SUBGRAD",
                            description="Use subgradient hub instead of PH (default False)",
                            domain=bool,
                            default=False)
@@ -636,7 +636,7 @@ def lagranger_args(self):
                             default=None)
 
 
-    def subgradient_args(self):
+    def subgradient_ob_args(self):
 
         self.add_to_config('subgradient',
                               description="have a subgradient spoke",