From 0cd3a1a55e7544c5bda52ac1e02dec14f6547da3 Mon Sep 17 00:00:00 2001 From: Matthew-Signorotti Date: Tue, 22 Mar 2022 13:56:44 -0700 Subject: [PATCH] Remove remnants of parameter scen_name_list of ScenarioNode.__init__ (#229) --- examples/acopf3/ccopf_multistage.py | 1 - examples/battery/battery.py | 2 +- examples/farmer/afarmer.py | 1 - examples/farmer/farmer.py | 1 - examples/hydro/hydro.py | 4 ---- examples/sslp/sslp.py | 2 +- examples/uc/uc_funcs.py | 1 - mpisppy/scenario_tree.py | 13 +------------ mpisppy/tests/examples/afarmer.py | 1 - mpisppy/tests/examples/aircond.py | 3 --- mpisppy/tests/examples/apl1p.py | 3 +-- mpisppy/tests/examples/delme_aircond_submodels.py | 3 --- mpisppy/tests/examples/farmer.py | 1 - mpisppy/tests/examples/gbd/gbd.py | 1 - mpisppy/tests/examples/hydro/hydro.py | 4 ---- mpisppy/tests/examples/uc/uc_funcs.py | 1 - mpisppy/utils/pysp_model/pysp_model.py | 1 - mpisppy/utils/sputils.py | 2 +- paperruns/larger_uc/uc_funcs.py | 1 - 19 files changed, 5 insertions(+), 41 deletions(-) diff --git a/examples/acopf3/ccopf_multistage.py b/examples/acopf3/ccopf_multistage.py index f550ef220..99f8e2da3 100644 --- a/examples/acopf3/ccopf_multistage.py +++ b/examples/acopf3/ccopf_multistage.py @@ -219,7 +219,6 @@ def aggregate_ramping_rule(m): cond_prob=enode.CondProb, stage=stage, cost_expression=inst.stage_models[stage].obj, - scen_name_list=enode.ScenarioList, nonant_list=[inst.stage_models[stage].pg, inst.stage_models[stage].qg], scen_model=inst, parent_name=parent_name)) diff --git a/examples/battery/battery.py b/examples/battery/battery.py index 9152de890..c8283826d 100644 --- a/examples/battery/battery.py +++ b/examples/battery/battery.py @@ -79,7 +79,7 @@ def big_M_constraint_rule(model, t): model._mpisppy_node_list = [ stree.ScenarioNode(name='ROOT', cond_prob=1., stage=1, - cost_expression=model.first_stage_cost, scen_name_list=None, + cost_expression=model.first_stage_cost, nonant_list=[model.y], scen_model=model) ] diff --git a/examples/farmer/afarmer.py b/examples/farmer/afarmer.py index 3571ab851..e3394e34c 100644 --- a/examples/farmer/afarmer.py +++ b/examples/farmer/afarmer.py @@ -86,7 +86,6 @@ def scenario_creator( cond_prob=1.0, stage=1, cost_expression=model.FirstStageCost, - scen_name_list=None, # Deprecated? nonant_list=[model.DevotedAcreage], scen_model=model, ) diff --git a/examples/farmer/farmer.py b/examples/farmer/farmer.py index 85159025b..b9f3beba5 100644 --- a/examples/farmer/farmer.py +++ b/examples/farmer/farmer.py @@ -74,7 +74,6 @@ def scenario_creator( cond_prob=1.0, stage=1, cost_expression=model.FirstStageCost, - scen_name_list=None, # Deprecated? nonant_list=[model.DevotedAcreage], scen_model=model, ) diff --git a/examples/hydro/hydro.py b/examples/hydro/hydro.py index bbe32d017..fbf90a14c 100644 --- a/examples/hydro/hydro.py +++ b/examples/hydro/hydro.py @@ -157,7 +157,6 @@ def MakeAllScenarioTreeNodes(model, bf): 1.0, 1, model.StageCost[1], - None, [model.Pgt[1], model.Pgh[1], model.PDns[1], @@ -169,7 +168,6 @@ def MakeAllScenarioTreeNodes(model, bf): 1.0/bf, 2, model.StageCost[2], - None, [model.Pgt[2], model.Pgh[2], model.PDns[2], @@ -191,7 +189,6 @@ def MakeNodesforScen(model, BFs, scennum): 1.0, 1, model.StageCost[1], - None, [model.Pgt[1], model.Pgh[1], model.PDns[1], @@ -201,7 +198,6 @@ def MakeNodesforScen(model, BFs, scennum): 1.0/BFs[0], 2, model.StageCost[2], - None, [model.Pgt[2], model.Pgh[2], model.PDns[2], diff --git a/examples/sslp/sslp.py b/examples/sslp/sslp.py index 69948d5a9..03cec074d 100644 --- a/examples/sslp/sslp.py +++ b/examples/sslp/sslp.py @@ -28,7 +28,7 @@ def scenario_creator(scenario_name, data_dir=None): # now attach the one and only tree node (ROOT is a reserved word) model._mpisppy_node_list = [ scenario_tree.ScenarioNode( - "ROOT", 1.0, 1, model.FirstStageCost, None, [model.FacilityOpen], model + "ROOT", 1.0, 1, model.FirstStageCost, [model.FacilityOpen], model ) ] return model diff --git a/examples/uc/uc_funcs.py b/examples/uc/uc_funcs.py index 62ffefc0b..02dc4476e 100644 --- a/examples/uc/uc_funcs.py +++ b/examples/uc/uc_funcs.py @@ -88,7 +88,6 @@ def pysp2_callback(scenario_name, scenario_count=None, path=None, 1.0, 1, instance.StageCost["Stage_1"], #"Stage_1" hardcodes the commitments in all time periods - None, [instance.UnitOn], instance, [instance.UnitStart, instance.UnitStop, instance.StartupIndicator], diff --git a/mpisppy/scenario_tree.py b/mpisppy/scenario_tree.py index 93ad6bc67..58627c897 100644 --- a/mpisppy/scenario_tree.py +++ b/mpisppy/scenario_tree.py @@ -53,8 +53,6 @@ class ScenarioNode: cond_prob (float): conditional probability stage (int): stage number (root is 1) cost_expression (pyo Expression or Var): stage cost - scen_name_list (str): OPTIONAL scenario names at the node - just for debugging and reporting; not really used as of Dec 31 nonant_list (list of pyo Var, Vardata or slices): the Vars that require nonanticipativity at the node (might not be a list) scen_model (pyo concrete model): the (probably not 'a') concrete model @@ -67,7 +65,7 @@ class ScenarioNode: nonant_vardata(list of vardata objects): vardatas to blend x_bar_list(list of floats): bound by index to nonant_vardata """ - def __init__(self, name, cond_prob, stage, cost_expression, scen_name_list, + def __init__(self, name, cond_prob, stage, cost_expression, nonant_list, scen_model, nonant_ef_suppl_list=None, parent_name=None): """Initialize a ScenarioNode object. Assume most error detection is @@ -96,12 +94,3 @@ def __init__(self, name, cond_prob, stage, cost_expression, scen_name_list, self.nonant_ef_suppl_list) else: self.nonant_ef_suppl_vardata_list = [] - @property - def scen_name_list(self): - """ DLW Jan 2019: I am thinking we will not have the nodes know this. - The scenarios will know what nodes they are in, and that might be enough. - This is a big changes from PySP 1.0; 2.0 relies on reduction to get x-bar - """ - raise RuntimeError ("The scen name list for a node is not maintained.") - - diff --git a/mpisppy/tests/examples/afarmer.py b/mpisppy/tests/examples/afarmer.py index 934d1756a..056b7d30a 100644 --- a/mpisppy/tests/examples/afarmer.py +++ b/mpisppy/tests/examples/afarmer.py @@ -86,7 +86,6 @@ def scenario_creator( cond_prob=1.0, stage=1, cost_expression=model.FirstStageCost, - scen_name_list=None, # Deprecated? nonant_list=[model.DevotedAcreage], scen_model=model, ) diff --git a/mpisppy/tests/examples/aircond.py b/mpisppy/tests/examples/aircond.py index 140eae9ae..e763c0a69 100644 --- a/mpisppy/tests/examples/aircond.py +++ b/mpisppy/tests/examples/aircond.py @@ -264,7 +264,6 @@ def MakeNodesforScen(model,nodenames,branching_factors,starting_stage=1): cond_prob=1.0, stage=stage, cost_expression=model.stage_models[stage].StageObjective, - scen_name_list=None, # Not maintained nonant_list=nonant_list, scen_model=model, nonant_ef_suppl_list = nonant_ef_suppl_list @@ -277,7 +276,6 @@ def MakeNodesforScen(model,nodenames,branching_factors,starting_stage=1): cond_prob=1.0, stage=stage, cost_expression=model.stage_models[stage].StageObjective, - scen_name_list=None, # Not maintained nonant_list=nonant_list, scen_model=model, nonant_ef_suppl_list = nonant_ef_suppl_list, @@ -291,7 +289,6 @@ def MakeNodesforScen(model,nodenames,branching_factors,starting_stage=1): cond_prob=1.0/branching_factors[stage-starting_stage-1], stage=stage, cost_expression=model.stage_models[stage].StageObjective, - scen_name_list=None, # Not maintained nonant_list=nonant_list, scen_model=model, nonant_ef_suppl_list = nonant_ef_suppl_list, diff --git a/mpisppy/tests/examples/apl1p.py b/mpisppy/tests/examples/apl1p.py index 00ef5708d..ea40718ca 100644 --- a/mpisppy/tests/examples/apl1p.py +++ b/mpisppy/tests/examples/apl1p.py @@ -159,7 +159,6 @@ def scenario_creator(sname, num_scens=None): cond_prob=1.0, stage=1, cost_expression=model.Total_Cost_Objective, - scen_name_list=None, # Deprecated? nonant_list=[model.CapacityGenerators], scen_model=model, ) @@ -254,4 +253,4 @@ def xhat_generator_apl1p(scenario_names, solvername="gurobi", solver_options=Non stochastic_sampling=False) res = apl1p_pb.run() - print(res) \ No newline at end of file + print(res) diff --git a/mpisppy/tests/examples/delme_aircond_submodels.py b/mpisppy/tests/examples/delme_aircond_submodels.py index b7ed0bdff..26fdf029f 100644 --- a/mpisppy/tests/examples/delme_aircond_submodels.py +++ b/mpisppy/tests/examples/delme_aircond_submodels.py @@ -198,7 +198,6 @@ def MakeNodesforScen(model,nodenames,branching_factors,starting_stage=1): cond_prob=1.0, stage=stage, cost_expression=model.stage_models[stage].StageObjective, - scen_name_list=None, # Not maintained nonant_list=nonant_list, scen_model=model, nonant_ef_suppl_list = [model.stage_models[stage].Inventory], @@ -211,7 +210,6 @@ def MakeNodesforScen(model,nodenames,branching_factors,starting_stage=1): cond_prob=1.0, stage=stage, cost_expression=model.stage_models[stage].StageObjective, - scen_name_list=None, # Not maintained nonant_list=nonant_list, scen_model=model, nonant_ef_suppl_list = [model.stage_models[stage].Inventory], @@ -225,7 +223,6 @@ def MakeNodesforScen(model,nodenames,branching_factors,starting_stage=1): cond_prob=1.0/branching_factors[stage-starting_stage-1], stage=stage, cost_expression=model.stage_models[stage].StageObjective, - scen_name_list=None, # Not maintained nonant_list=nonant_list, scen_model=model, nonant_ef_suppl_list = [model.stage_models[stage].Inventory], diff --git a/mpisppy/tests/examples/farmer.py b/mpisppy/tests/examples/farmer.py index f02e39925..c1fd402ad 100644 --- a/mpisppy/tests/examples/farmer.py +++ b/mpisppy/tests/examples/farmer.py @@ -78,7 +78,6 @@ def scenario_creator( cond_prob=1.0, stage=1, cost_expression=model.FirstStageCost, - scen_name_list=None, # Deprecated? nonant_list=[model.DevotedAcreage], scen_model=model, ) diff --git a/mpisppy/tests/examples/gbd/gbd.py b/mpisppy/tests/examples/gbd/gbd.py index 40018dfaf..61acbf2ba 100644 --- a/mpisppy/tests/examples/gbd/gbd.py +++ b/mpisppy/tests/examples/gbd/gbd.py @@ -180,7 +180,6 @@ def scenario_creator(sname, num_scens=None): cond_prob=1.0, stage=1, cost_expression=model.obj, - scen_name_list=None, # Deprecated? nonant_list=[model.x], scen_model=model, ) diff --git a/mpisppy/tests/examples/hydro/hydro.py b/mpisppy/tests/examples/hydro/hydro.py index ba7da97ec..b4325bd0c 100644 --- a/mpisppy/tests/examples/hydro/hydro.py +++ b/mpisppy/tests/examples/hydro/hydro.py @@ -157,7 +157,6 @@ def MakeAllScenarioTreeNodes(model, bf): 1.0, 1, model.StageCost[1], - None, [model.Pgt[1], model.Pgh[1], model.PDns[1], @@ -169,7 +168,6 @@ def MakeAllScenarioTreeNodes(model, bf): 1.0/bf, 2, model.StageCost[2], - None, [model.Pgt[2], model.Pgh[2], model.PDns[2], @@ -191,7 +189,6 @@ def MakeNodesforScen(model, BFs, scennum): 1.0, 1, model.StageCost[1], - None, [model.Pgt[1], model.Pgh[1], model.PDns[1], @@ -201,7 +198,6 @@ def MakeNodesforScen(model, BFs, scennum): 1.0/BFs[0], 2, model.StageCost[2], - None, [model.Pgt[2], model.Pgh[2], model.PDns[2], diff --git a/mpisppy/tests/examples/uc/uc_funcs.py b/mpisppy/tests/examples/uc/uc_funcs.py index 6d9c4b30c..0fb9bf7f2 100644 --- a/mpisppy/tests/examples/uc/uc_funcs.py +++ b/mpisppy/tests/examples/uc/uc_funcs.py @@ -67,7 +67,6 @@ def pysp2_callback(scenario_name): 1.0, 1, instance.StageCost["Stage_1"], #"Stage_1" hardcodes the commitments in all time periods - None, [instance.UnitOn], instance, [instance.UnitStart, instance.UnitStop, instance.StartupIndicator], diff --git a/mpisppy/utils/pysp_model/pysp_model.py b/mpisppy/utils/pysp_model/pysp_model.py index 0e66e80c2..adf737728 100644 --- a/mpisppy/utils/pysp_model/pysp_model.py +++ b/mpisppy/utils/pysp_model/pysp_model.py @@ -152,7 +152,6 @@ def scenario_creator_callback(self, scenario_name, **kwargs): cond_prob=node.conditional_probability, stage=node._mpisppy_stage, cost_expression=node._mpisppy_cost_expression, - scen_name_list=None, nonant_list=node._mpisppy_nonant_list, scen_model=None, nonant_ef_suppl_list=node._mpisppy_nonant_ef_suppl_list, diff --git a/mpisppy/utils/sputils.py b/mpisppy/utils/sputils.py index b8890e6fe..a0a8bfe29 100644 --- a/mpisppy/utils/sputils.py +++ b/mpisppy/utils/sputils.py @@ -808,7 +808,7 @@ def attach_root_node(model, firstobj, varlist, nonant_ef_suppl_list=None): attaches a list consisting of one scenario node to the model """ model._mpisppy_node_list = [ - scenario_tree.ScenarioNode("ROOT",1.0,1,firstobj, None, varlist, model, + scenario_tree.ScenarioNode("ROOT", 1.0, 1, firstobj, varlist, model, nonant_ef_suppl_list = nonant_ef_suppl_list) ] diff --git a/paperruns/larger_uc/uc_funcs.py b/paperruns/larger_uc/uc_funcs.py index 96190024b..dafc108e5 100644 --- a/paperruns/larger_uc/uc_funcs.py +++ b/paperruns/larger_uc/uc_funcs.py @@ -70,7 +70,6 @@ def pysp2_callback(scenario_name, path=None, scenario_count=None): 1.0, 1, instance.StageCost["Stage_1"], #"Stage_1" hardcodes the commitments in all time periods - None, [instance.UnitOn], instance, [instance.UnitStart, instance.UnitStop, instance.StartupIndicator],