Allowing the spokes xhatxbar and ph_ob to use variable probability and deleting it in the other spokes

Author: AymericPCLegros

Diff for: examples/distr/distr_admm_cylinders.py

@@ -1,5 +1,3 @@
-# Copyright 2020 by B. Knueven, D. Mildebrath, C. Muir, J-P Watson, and D.L. Woodruff
-# This software is distributed under the 3-clause BSD License.
 # general example driver for distr with cylinders
 import mpisppy.utils.admm_ph as admm_ph
 import distr
@@ -99,14 +97,14 @@ def main():
 
     # FWPH spoke
     if cfg.fwph:
+        print("May not give the expected result due to variable probability")
         fw_spoke = vanilla.fwph_spoke(*beans, scenario_creator_kwargs=scenario_creator_kwargs)
 
     # Standard Lagrangian bound spoke
     if cfg.lagrangian:
         lagrangian_spoke = vanilla.lagrangian_spoke(*beans,
                                               scenario_creator_kwargs=scenario_creator_kwargs,
-                                              rho_setter = None,
-                                              variable_probability=variable_probability)
+                                              rho_setter = None)
 
 
     # ph outer bounder spoke
@@ -142,7 +140,7 @@ def main():
         wheel.write_tree_solution('distr_full_solution')
 
     if global_rank == 0:
-        best_objective = wheel.spcomm.BestInnerBound * len(all_scenario_names)
+        best_objective = wheel.spcomm.BestInnerBound
         print(f"{best_objective=}")
 
 

Diff for: mpisppy/utils/cfg_vanilla.py

@@ -512,7 +512,8 @@ def xhatxbar_spoke(
         all_scenario_names,
         scenario_creator_kwargs=None,
         variable_probability=None,
-        ph_extensions=None
+        ph_extensions=None,
+        all_nodenames=None,
 ):
     xhatxbar_dict = _Xhat_Eval_spoke_foundation(
         XhatXbarInnerBound,
@@ -522,6 +523,7 @@ def xhatxbar_spoke(
         all_scenario_names,
         scenario_creator_kwargs=scenario_creator_kwargs,
         ph_extensions=ph_extensions,
+        all_nodenames=all_nodenames,
     )
 
     xhatxbar_dict["opt_kwargs"]["options"]['bundles_per_rank'] = 0  # no bundles for xhat
@@ -702,7 +704,8 @@ def ph_ob_spoke(
     all_scenario_names,
     scenario_creator_kwargs=None,
     rho_setter=None,
-    all_nodenames = None,
+    all_nodenames=None,
+    variable_probability=None,
 ):
     shoptions = shared_options(cfg)
     ph_ob_spoke = {
@@ -715,7 +718,8 @@ def ph_ob_spoke(
             "scenario_creator_kwargs": scenario_creator_kwargs,
             'scenario_denouement': scenario_denouement,
             "rho_setter": rho_setter,
-            "all_nodenames": all_nodenames
+            "all_nodenames": all_nodenames,
+            "variable_probability": variable_probability,
         }
     }
     if cfg.ph_ob_rho_rescale_factors_json is not None: