Merge pull request #390 from jinyan1214/master

Clean pyrecodes files, small improvement of pyrecodes and residual demand plots

Author: fmckenna

modules/Workflow/whale/main.py

@@ -3193,6 +3193,13 @@ def aggregate_results(  # noqa: C901, PLR0912, PLR0915
                         # parse decision variable data into a DataFrame
                         dv_data_i = pd.DataFrame(dv_data_i)
 
+                        # Convert cost from loss ratio to monetary value
+                        replacement_cost = GI_data_i_det.get('ReplacementCost', 1.0)
+                        for col in dv_data_i.columns:
+                            if col.startswith('Cost'):
+                                dv_data_i[col] = (
+                                    dv_data_i[col] * replacement_cost
+                                )
                         # get a list of dv types
                         dv_types = np.unique(
                             [col.split('-')[0] for col in dv_data_i.columns]

modules/performREC/pyrecodes/CMakeLists.txt

@@ -1,5 +1,5 @@
-simcenter_add_python_script(SCRIPT __init__.py)
+# simcenter_add_python_script(SCRIPT __init__.py)
 simcenter_add_python_script(SCRIPT run_pyrecodes.py)
-add_subdirectory(rewet_API)
-add_subdirectory(residual_demand_API)
+# add_subdirectory(rewet_API)
+# add_subdirectory(residual_demand_API)
 # add_subdirectory(rewet_result)