Skip to content

Commit d154074

Browse files
committed
Replace 'anccr' with 'rates' to be more generic
1 parent 556de36 commit d154074

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Classify the change according to the following categories:
3232
- `ElectricLoad` input `monthly_peaks_kw`. Can be used to scale loads_kw or doe_reference loads to monthly peaks while maintaining monthly energy.
3333
- `ElectricTariff` outputs: `demand_rate_average_series`, `energy_cost_series_before_tax`, `energy_cost_series_before_tax_bau`, `energy_rate_average_series`, `energy_rate_series`, `energy_rate_tier_limits`, `facility_demand_monthly_rate_series`, `facility_demand_monthly_rate_tier_limits`, `monthly_demand_cost_series_before_tax`, `monthly_demand_cost_series_before_tax_bau`, `monthly_energy_cost_series_before_tax`, `monthly_energy_cost_series_before_tax_bau`, `monthly_facility_demand_cost_series_before_tax`, `monthly_facility_demand_cost_series_before_tax_bau`, `monthly_fixed_cost_series_before_tax`, `monthly_fixed_cost_before_tax_bau`, `monthly_tou_demand_cost_series_before_tax`, `monthly_tou_demand_cost_series_before_tax_bau`, `tou_demand_metrics`, `tou_demand_rate_series`, `tou_demand_rate_tier_limits`.
3434
- New endpoint `/get_load_metrics` for sending a timeseries `load_profile` and getting monthly and annual energy and peak loads.
35+
- New custom table option `custom_table_rates` for endpoint `/job/generate_results_table`
3536

3637

3738
## v3.16.2

reoptjl/custom_table_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1341,7 +1341,7 @@
13411341

13421342

13431343

1344-
custom_table_anccr = [
1344+
custom_table_rates = [
13451345
#####################################################################################################
13461346
################################ Need to get the RATE NAME to appear in header ################
13471347
#####################################################################################################

reoptjl/views.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2026,8 +2026,8 @@ def get_combined_format(label, row_color, is_formula=False):
20262026
column_width = 25
20272027
columns_to_hide = set()
20282028

2029-
# Check if using custom_table_anccr - if so, hide ALL BAU columns
2030-
is_anccr_table = (custom_table == custom_table_anccr)
2029+
# Check if using custom_table_rates - if so, hide ALL BAU columns
2030+
is_anccr_table = (custom_table == custom_table_rates)
20312031

20322032
# Extract rate names for ANCCR table headers
20332033
rate_names = []
@@ -2043,7 +2043,7 @@ def get_combined_format(label, row_color, is_formula=False):
20432043
# Only proceed if there are BAU columns
20442044
if bau_columns:
20452045
if is_anccr_table:
2046-
# For custom_table_anccr, hide ALL BAU columns
2046+
# For custom_table_rates, hide ALL BAU columns
20472047
columns_to_hide.update(bau_columns)
20482048
else:
20492049
identical_bau_columns = True # Assume all BAU columns are identical unless proven otherwise
@@ -2079,11 +2079,11 @@ def get_combined_format(label, row_color, is_formula=False):
20792079
# Write scenario headers
20802080
worksheet.write('A1', 'Scenario', scenario_formats[0])
20812081

2082-
# Track non-BAU column index for rate name mapping (only for custom_table_anccr)
2082+
# Track non-BAU column index for rate name mapping (only for custom_table_rates)
20832083
non_bau_index = 0
20842084

20852085
for col_num, header in enumerate(df.columns):
2086-
# For custom_table_anccr, use rate names for non-BAU column headers
2086+
# For custom_table_rates, use rate names for non-BAU column headers
20872087
if is_anccr_table and rate_names:
20882088
if "BAU" not in header:
20892089
# This is a non-BAU column - use rate name as header

0 commit comments

Comments
 (0)