ruff clean examples

Author: bknueven

examples/acopf3/ACtree.py

@@ -149,11 +149,9 @@ def __init__(self, Parent, TreeInfo, ScenarioList, Name, CondProb, acstream):
             self.kids = []
             if self.stage < TreeInfo.NumStages:
                 bf = TreeInfo.BFs[self.stage-1]
-                snstr = "_sn"+str(self.sn)
                 self.sn += 1 # serial number for non-leaf, non-ROOT nodes
             else:
                 bf = 1  # leaf node
-                snstr = ""
             for b in range(bf):
                 # divide up the scenario list
                 plist = self.ScenarioList # typing aid

examples/acopf3/ccopf_multistage.py

@@ -54,10 +54,10 @@ def FixGaussian(minutes, acstream, mu, sigma):
 #======= end repair functions =====
 
 def _md_dict(epath):
-    p = str(egret.__path__)
-    l = p.find("'")
-    r = p.find("'", l+1)
-    egretrootpath = p[l+1:r]
+    path = str(egret.__path__)
+    left = path.find("'")
+    right = path.find("'", left+1)
+    egretrootpath = path[left+1:right]
     if epath[0] != os.sep:
         test_case = os.path.join(egretrootpath, epath)
     else:
@@ -259,9 +259,10 @@ def scenario_denouement(rank, scenario_name, scenario):
 
         print("GEN: %4s PG:" % gen, end="")
 
+        previous_val = None
         for stage in stages:
             current_val = pyo.value(getattr(scenario, "stage_models_"+str(stage)).pg[gen])
-            if stage == stages[0]:
+            if previous_val is None:
                 print("%6.2f -->> " % current_val, end=" ")
             else:
                 print("%6.2f" % (current_val-previous_val), end=" ")
@@ -270,9 +271,10 @@ def scenario_denouement(rank, scenario_name, scenario):
 
         print("GEN: %4s QG:" % gen, end="")
 
+        previous_val = None
         for stage in stages:
             current_val = pyo.value(getattr(scenario, "stage_models_"+str(stage)).qg[gen])
-            if stage == stages[0]:
+            if previous_val is None:
                 print("%6.2f -->> " % current_val, end=" ")
             else:
                 print("%6.2f" % (current_val-previous_val), end=" ")

examples/aircond/aircond_cylinders.py

@@ -98,7 +98,7 @@ def make_nodenames_balanced(BFs, leaf_nodes=False, root = True):
         0, 1, 2, ..., BFs[0], 0_0, 0_1, ..., 0_BFs[1], 1_0, 1_1, ... ,
         1_BFs[1], ... , BFs[0]_BFs[1], ... , BFs[0]...BFs[-2]
     """
-    if leaf_nodes == False:
+    if not leaf_nodes:
         BFs = BFs[:-1] # exclude leaf nodes
 
     # Constructs all nodenames
@@ -153,7 +153,7 @@ def _parse_args():
                          domain=bool,
                          default=False)    
     # special "proper" bundle arguments
-    parser = pickle_bundle.pickle_bundle_parser(cfg)
+    pickle_bundle.pickle_bundle_config(cfg)
 
     cfg.add_to_config("EF_directly",
                          description="Solve the EF directly instead of using cylinders (default False)",
@@ -208,15 +208,13 @@ def main():
         all_scenario_names = [f"Bundle_{bn*bsize}_{(bn+1)*bsize-1}" for bn in range(numbuns)]
         refmodule = aircondB
         primal_rho_setter = None
-        dual_rho_setter = None
         global_toc("WARNING: not using rho setters with proper bundles")
 
     else:
         ScenCount = np.prod(BFs)
         all_scenario_names = [f"scen{i}" for i in range(ScenCount)] #Scens are 0-based
         refmodule = aircond
         primal_rho_setter = refmodule.primal_rho_setter
-        dual_rho_setter = refmodule.dual_rho_setter
 
     xhat_scenario_dict = make_node_scenario_dict_balanced(BFs)
     all_nodenames = list(xhat_scenario_dict.keys())

examples/aircond/aircond_seqsampling.py

@@ -23,19 +23,10 @@ def main(cfg):
         results (dict): the solution, gap confidence interval and T 
     """
     refmodelname = "mpisppy.tests.examples.aircond"
-    scenario_creator = aircond.scenario_creator
 
     BFs = cfg.branching_factors
     num_scens = np.prod(BFs)
 
-    scenario_creator_kwargs = {"num_scens" : num_scens,
-                               "branching_factors": BFs,
-                               "mu_dev": cfg.mu_dev,
-                               "sigma_dev": cfg.sigma_dev,
-                               "start_ups": cfg.start_ups,
-                               "start_seed": cfg.seed,
-                               }
-    
     scenario_names = ['Scenario' + str(i) for i in range(num_scens)]
 
     xhat_gen_kwargs = {"scenario_names": scenario_names,
@@ -108,7 +99,7 @@ def _parse_args():
     if cfg.BM_vs_BPL is None:
         raise RuntimeError("--BM-vs-BPL must be given.")
     if cfg.BM_vs_BPL != "BM" and cfg.BM_vs_BPL != "BPL":
-        raise RuntimeError(f"--BM-vs-BPL must be BM or BPL (you gave {args.BM_vs_BMPL})")
+        raise RuntimeError(f"--BM-vs-BPL must be BM or BPL (you gave {cfg.BM_vs_BPL})")
 
     return cfg
 

examples/aircond/bundle_pickler.py

@@ -27,7 +27,7 @@
 def _parse_args():
     cfg = config.Config()
     cfg.multistage()
-    pickle_bundle.pickle_bundle_parser(cfg)
+    pickle_bundle.pickle_bundle_config(cfg)
     aircondB.inparser_adder(cfg)
     cfg.parse_command_line("bundle_pickler for aircond")
 
@@ -51,8 +51,6 @@ def main():
 
     bsize = int(cfg.scenarios_per_bundle)
     numbuns = ScenCount // bsize
-    # we won't actually use all names
-    all_bundle_names = [f"Bundle_{bn*bsize}_{(bn+1)*bsize-1}" for bn in range(numbuns)]
 
     if numbuns < n_proc:
         raise RuntimeError(

examples/battery/battery.py

@@ -23,7 +23,7 @@
 import mpisppy.scenario_tree as stree
 
 def scenario_creator(
-    scenario_name, solar_filname=None, use_LP=False, lam=None,
+    scenario_name, solar_filename=None, use_LP=False, lam=None,
 ):
     """
     Args:
@@ -80,7 +80,8 @@ def big_M_constraint_rule(model, t):
         + data['disc'] * pyo.quicksum(model.q) + lam * model.z[0],
         sense=pyo.minimize)
 
-    fscr = lambda model: pyo.dot_product(data['rev'], model.y)
+    def fscr(model):
+        return pyo.dot_product(data["rev"], model.y)
     model.first_stage_cost = pyo.Expression(rule=fscr)
 
     model._mpisppy_node_list = [

examples/distr/distr_admm_cylinders.py

@@ -16,10 +16,10 @@
 from mpisppy.utils import config
 import mpisppy.utils.cfg_vanilla as vanilla
 from mpisppy import MPI
-global_rank = MPI.COMM_WORLD.Get_rank()
-
 import time
 
+global_rank = MPI.COMM_WORLD.Get_rank()
+
 write_solution = False
 
 def _parse_args():
@@ -169,4 +169,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()

examples/distr/distr_data.py

@@ -14,6 +14,10 @@
 # First there is a hard wired data_set, then there is a scalable dataset
 
 # Hardwired data sets
+import json
+import re
+import numpy as np
+
 
 def inter_region_dict_creator(num_scens):
     """Creates the oriented arcs between the regions, with their capacities and costs. \n
@@ -184,7 +188,6 @@ def _is_partition(L, *lists):
 
     return region_dict
 
-import json
 if __name__ == "__main__":
     #creating the json files
     for num_scens in range(2,5):
@@ -206,9 +209,6 @@ def _is_partition(L, *lists):
 ########################################################################################################################
 # Scalable datasets
 
-import re
-import numpy as np
-
 def parse_node_name(name):
     """ decomposes the name, for example "DC1_2 gives" "DC",1,2
     Args:
@@ -413,4 +413,4 @@ def scalable_region_dict_creator(scenario_name, all_nodes_dict=None, cfg=None, d
                     arc = (node_1, node_2)
                     _intra_arc_creator(region_dict, node_1, node_2, cfg, arc, arc_params, my_seed=count, intra=True)
                     count += 1
-    return region_dict
+    return region_dict

examples/farmer/farmer_cylinders.py

@@ -91,7 +91,6 @@ def main():
         "crops_multiplier": crops_multiplier,
         'sense': pyo.minimize
     }
-    scenario_names = [f"Scenario{i+1}" for i in range(num_scen)]
 
     # Things needed for vanilla cylinders
     beans = (cfg, scenario_creator, scenario_denouement, all_scenario_names)

examples/farmer/farmer_ef.py

@@ -80,6 +80,8 @@ def main_with_cfg():
         results = solver.solve(tee=True)
     else:
         results = solver.solve(ef, tee=True, symbolic_solver_labels=True,)
+    if not pyo.check_optimal_termination(results):
+        print("Warning: solver reported non-optimal termination status")
 
     return ef
 

examples/farmer/farmer_lshapedhub.py

@@ -95,10 +95,6 @@ def main():
     # FWPH spoke
     if fwph:
         fw_spoke = vanilla.fwph_spoke(*beans, scenario_creator_kwargs=scenario_creator_kwargs)
-
-    # xhat looper bound spoke -- any scenario will do for
-    # lshaped (they're all the same)
-    xhat_scenario_dict = {"ROOT": all_scenario_names[0]}
 
     if xhatlshaped:
         xhatlshaped_spoke = vanilla.xhatlshaped_spoke(*beans, scenario_creator_kwargs=scenario_creator_kwargs)

examples/farmer/farmer_rho_demo.py

@@ -75,7 +75,6 @@ def main():
 
     cfg = _parse_args()
 
-    num_scen = cfg.num_scens
     crops_multiplier = cfg.crops_mult
     rho_setter = None  # non-grad rho setter?
 
@@ -99,7 +98,6 @@ def main():
         'use_integer': False,
         "crops_multiplier": crops_multiplier,
     }
-    scenario_names = [f"Scenario{i+1}" for i in range(num_scen)]
 
     # Things needed for vanilla cylinders
     beans = (cfg, scenario_creator, scenario_denouement, all_scenario_names)

examples/farmer/farmer_seqsampling.py

@@ -88,7 +88,6 @@ def main(cfg):
         results (dict): the solution, gap confidence interval and T 
     """
     refmodelname = "farmer"
-    scenario_creator = farmer.scenario_creator
 
     scen_count = cfg.num_scens
     assert cfg.EF_solver_name is not None

examples/farmer/from_pysp/abstract.py

@@ -29,7 +29,7 @@ def _print_usage():
     if not solver_avail:
         print(f"Cannot find solver {solver_name}")
         sys.exit()
-except:
+except Exception:
     print(f"Cannot find solver {solver_name}")
     _print_usage()
     sys.exit()

examples/farmer/from_pysp/concrete_ampl.py

@@ -25,7 +25,7 @@ def _print_usage():
     if not solver_avail:
         print(f"Cannot find solver {sys.argv[1]}")
         sys.exit()
-except:
+except Exception:
     print(f"Cannot find solver {sys.argv[1]}")
     _print_usage()
     sys.exit()

examples/farmer/schur_complement.py

@@ -11,6 +11,7 @@
 import logging
 from mpisppy import MPI
 import sys
+import pyomo.environ as pyo
 
 
 if MPI.COMM_WORLD.Get_rank() == 0:
@@ -36,6 +37,8 @@ def solve_with_extensive_form(scen_count):
                            scenario_creator=farmer.scenario_creator,
                            scenario_creator_kwargs=scenario_kwargs)
     results = opt.solve_extensive_form()
+    if not pyo.check_optimal_termination(results):
+        print("Warning: solver reported non-optimal termination status")
     opt.report_var_values_at_rank0()
     return opt
 
@@ -53,6 +56,8 @@ def solve_with_sc(scen_count, linear_solver=None):
                              scenario_creator=farmer.scenario_creator,
                              scenario_creator_kwargs=scenario_kwargs)
     results = opt.solve()
+    if not pyo.check_optimal_termination(results):
+        print("Warning: solver reported non-optimal termination status")
     opt.report_var_values_at_rank0()
     return opt
 

examples/generic_tester.py

@@ -54,13 +54,13 @@
 def egret_avail():
     try:
         import egret
-    except:
+    except Exception:
         return False
 
-    p = str(egret.__path__)
-    l = p.find("'")
-    r = p.find("'", l+1)
-    egretrootpath = p[l+1:r]
+    path = str(egret.__path__)
+    left = path.find("'")
+    right = path.find("'", left+1)
+    egretrootpath = path[left+1:right]
 
     egret_thirdparty_path = os.path.join(egretrootpath, "thirdparty")
     if os.path.exists(os.path.join(egret_thirdparty_path, "pglib-opf-master")):

examples/netdes/netdes_ef.py

@@ -34,6 +34,8 @@ def main():
         scenario_creator_kwargs={"path": path},
     )
     results = ef.solve_extensive_form(tee=True)
+    if not pyo.check_optimal_termination(results):
+        print("Warning: solver reported non-optimal termination status")
     print("Netdes objective value:", pyo.value(ef.ef.EF_Obj))
 
 if __name__=="__main__":

examples/run_all.py

@@ -45,13 +45,13 @@
 def egret_avail():
     try:
         import egret
-    except:
+    except Exception:
         return False
 
-    p = str(egret.__path__)
-    l = p.find("'")
-    r = p.find("'", l+1)
-    egretrootpath = p[l+1:r]
+    path = str(egret.__path__)
+    left = path.find("'")
+    right = path.find("'", left+1)
+    egretrootpath = path[left+1:right]
 
     egret_thirdparty_path = os.path.join(egretrootpath, "thirdparty")
     if os.path.exists(os.path.join(egret_thirdparty_path, "pglib-opf-master")):
@@ -106,6 +106,8 @@ def time_one(ID, dirname, progname, np, argstring):
         if (i % 2) == 0:
             foo = i * i
             bar = str(i)+"!"
+    del foo
+    del bar
     finish = dt.now()
     refsecs = (finish-start).total_seconds()
 

examples/sizes/sizes.py

@@ -20,7 +20,7 @@ def scenario_creator(scenario_name, scenario_count=None):
     datadir = os.sep.join((sizes_dir, f"SIZES{scenario_count}"))
     try:
         fname = datadir + os.sep + scenario_name + ".dat"
-    except:
+    except Exception:
         print("FAIL: datadir=", datadir, " scenario_name=", scenario_name)
 
     model = ref.model.create_instance(fname)
@@ -57,7 +57,7 @@ def inparser_adder(cfg):
 def kw_creator(cfg):
     # (for Amalgamator): linked to the scenario_creator and inparser_adder
     if cfg.num_scens not in (3, 10):
-        raise RuntimeError(f"num_scen must the 3 or 10; was {num_scen}")    
+        raise RuntimeError(f"num_scen must the 3 or 10; was {cfg.num_scen}")    
     kwargs = {"scenario_count": cfg.num_scens}
     return kwargs
 

examples/sizes/sizes_demo.py

@@ -16,6 +16,7 @@
 from mpisppy.extensions.extension import MultiExtension
 from mpisppy.extensions.fixer import Fixer
 from mpisppy.extensions.mipgapper import Gapper
+from mpisppy.extensions.avgminmaxer import MinMaxAvg
 from mpisppy.extensions.wtracker_extension import Wtracker_extension
 from sizes import scenario_creator, \
                   scenario_denouement, \

examples/sizes/sizes_ef.py

@@ -25,8 +25,8 @@
     scenario_creator,
     scenario_creator_kwargs={"scenario_count": ScenCount},
 )
-if 'persistent' in options["solver_name"]:
+if 'persistent' in solver.name: 
     solver.set_instance(ef, symbolic_solver_labels=True)
 solver.options["mipgap"] = 0.0001
-results = solver.solve(ef, tee=options["verbose"])
-print('EF objective value:', pyo.value(ef.EF_Obj))
+results = solver.solve(ef, tee=True)
+print('EF objective value:', pyo.value(ef.EF_Obj))