py-ewr 2.3.9__py3-none-any.whl → 2.4.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- py_ewr/data_inputs.py +6 -6
- py_ewr/evaluate_EWRs.py +168 -221
- py_ewr/model_metadata/EWR_Sitelist_FIRM_20250718.csv +11 -2
- py_ewr/observed_handling.py +22 -5
- py_ewr/parameter_metadata/ewr_calc_config.json +8 -0
- py_ewr/parameter_metadata/objective_reference.csv +911 -776
- py_ewr/parameter_metadata/parameter_sheet.csv +3249 -3325
- py_ewr/scenario_handling.py +7 -6
- py_ewr/summarise_results.py +1 -1
- {py_ewr-2.3.9.dist-info → py_ewr-2.4.0.dist-info}/METADATA +20 -20
- py_ewr-2.4.0.dist-info/RECORD +19 -0
- {py_ewr-2.3.9.dist-info → py_ewr-2.4.0.dist-info}/WHEEL +1 -1
- py_ewr-2.3.9.dist-info/RECORD +0 -19
- {py_ewr-2.3.9.dist-info → py_ewr-2.4.0.dist-info}/licenses/LICENSE +0 -0
- {py_ewr-2.3.9.dist-info → py_ewr-2.4.0.dist-info}/top_level.txt +0 -0
py_ewr/data_inputs.py
CHANGED
|
@@ -433,7 +433,7 @@ def get_barrage_level_gauges()-> dict:
|
|
|
433
433
|
dict: dictionary of level gauges associated with each barrage.
|
|
434
434
|
"""
|
|
435
435
|
|
|
436
|
-
level_barrage_gauges = {'
|
|
436
|
+
level_barrage_gauges = {'A4260524': ['A4260527','A4261133', 'A4260524', 'A4260574', 'A4260575' ],
|
|
437
437
|
'A4260633' : ['A4260633','A4261209', 'A4261165']}
|
|
438
438
|
|
|
439
439
|
return level_barrage_gauges
|
|
@@ -466,7 +466,7 @@ def get_vic_level_gauges()-> list:
|
|
|
466
466
|
|
|
467
467
|
|
|
468
468
|
def get_cllmm_gauges()->list:
|
|
469
|
-
return ["A4261002", "
|
|
469
|
+
return ["A4261002", "A4260524", "A4260633"]
|
|
470
470
|
|
|
471
471
|
|
|
472
472
|
def get_gauges(category: str, ewr_table_path: str = None) -> set:
|
|
@@ -556,7 +556,7 @@ def get_obj_mapping(
|
|
|
556
556
|
obj_ref_path (str) = file path to objective mapping csv. If Not, default objective_reference.csv inside EWR tool is selected
|
|
557
557
|
'''
|
|
558
558
|
param_sheet_cols = [
|
|
559
|
-
'PlanningUnitName', 'LTWPShortName', 'SWSDLName', 'State', 'Gauge', 'Code', '
|
|
559
|
+
'PlanningUnitName', 'LTWPShortName', 'SWSDLName', 'State', 'Gauge', 'Code', 'EcoObj'
|
|
560
560
|
]
|
|
561
561
|
|
|
562
562
|
if not objective_reference_path:
|
|
@@ -571,13 +571,13 @@ def get_obj_mapping(
|
|
|
571
571
|
|
|
572
572
|
# Split 'EnvObj' by '+' and explode to long format
|
|
573
573
|
longform_ewr = okay_EWRs_sub.assign(
|
|
574
|
-
EnvObj=okay_EWRs_sub['
|
|
574
|
+
EnvObj=okay_EWRs_sub['EcoObj'].str.split('+')
|
|
575
575
|
).explode('EnvObj').drop_duplicates()
|
|
576
576
|
|
|
577
577
|
merged_df = longform_ewr.merge(
|
|
578
578
|
obj_ref,
|
|
579
|
-
left_on= ['LTWPShortName', 'PlanningUnitName', 'Gauge', 'Code', '
|
|
580
|
-
right_on=['LTWPShortName', 'PlanningUnitName', 'Gauge', 'Code', '
|
|
579
|
+
left_on= ['LTWPShortName', 'PlanningUnitName', 'Gauge', 'Code', 'EcoObj', 'SWSDLName', 'State'],
|
|
580
|
+
right_on=['LTWPShortName', 'PlanningUnitName', 'Gauge', 'Code', 'EcoObj', 'SWSDLName', 'State'],
|
|
581
581
|
how='left'
|
|
582
582
|
)
|
|
583
583
|
|