-
Notifications
You must be signed in to change notification settings - Fork 24
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix #432 #447
Fix #432 #447
Conversation
scout/ecm_prep.py
Outdated
@@ -5900,7 +5905,7 @@ def fill_mkts(self, msegs, msegs_cpl, convert_data, tsv_data_init, opts, | |||
# Pull TSV scaling fractions and shapes | |||
tsv_scale_fracs, tsv_shapes = self.gen_tsv_facts( | |||
tsv_data, mskeys, bldg_sect, convert_data, opts, | |||
cost_energy_meas) | |||
cost_energy_meas, save_shp_warn) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
save_shp_warn
appears to always be an empty list here, why initialize it above and why pass it in this method?
scout/ecm_prep.py
Outdated
@@ -6547,7 +6553,7 @@ def gen_tsv_facts( | |||
updated_tsv_fracs, updated_tsv_shapes = self.apply_tsv( | |||
load_fact, ash_czone_wts, eplus_bldg_wts, cost_fact_hourly, | |||
carbon_fact_hourly, mskeys, bldg_sect, eu, opts, cost_yr_map, | |||
carb_yr_map) | |||
carb_yr_map, save_shp_warn) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Similar comment to above, this looks like it will always be passed as an empty list.
scout/ecm_prep.py
Outdated
def apply_tsv(self, load_fact, ash_cz_wts, eplus_bldg_wts, | ||
cost_fact_hourly, carbon_fact_hourly, mskeys, bldg_sect, | ||
eu, opts, cost_yr_map, carb_yr_map): | ||
eu, opts, cost_yr_map, carb_yr_map, save_shp_warn): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it would make sense to initialize save_shp_warn
in this method instead of having as an argument, as it does not appear to be returned or updated anywhere outside of apply_tsv
.
Initializing as an empty list would work before for bldg in eplus_bldg_wts.keys():
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That list stores previous warnings generated within apply_tsv
to avoid duplication of warning messages. (The list is appended to here.) If it's re-initialized each time apply_tsv
is run, that history of warning messages would be removed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
compare_bugfix_save-warns.pptx Checking the differences in the CI vs. master, the change it results looks reasonable. I limited the chillers measure baseline market to just large office, so its baseline (thick red) went down while savings look to be about the same (more visible with new y axis scaling), against as I'd expect since large office was the only savings shape assessed for that measure. For pool pumps, the baseline stays the same but savings increase as my changes applied the relative savings shapes from pool heaters and pumps in CSV to each of pool heaters and pool pumps (separate end uses in Scout). Before none of those savings were being pulled in. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. Do you think we should update our integration test config file to include the --verbose
flag? (https://github.com/trynthink/scout/blob/master/tests/integration_testing/integration_test.yml)
We could, although I think the end result will be lots of other messages being spit out (including, e.g., notifications of cost conversions or missing segments) that aren't very necessary or helpful – changes in the overall results should be sufficient to flag issues. So I'd vote for keeping without verbose. |
Savings shape warnings are now stored within the measure handyvars attribute to retain warning history across multiple microsegment loops.
dae260a
to
717dbb9
Compare
verbose
user option being true.