Skip to content

Commit 91f6f56

Browse files
Merge pull request #1286 from NREL/mobile-home-artifacts
Break out Mobile Home in CI comparison plots
2 parents cb33581 + 13a290a commit 91f6f56

File tree

2 files changed

+15
-27
lines changed

2 files changed

+15
-27
lines changed

.github/workflows/config.yml

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -281,37 +281,25 @@ jobs:
281281
pip install plotly
282282
pip install kaleido
283283
284-
mkdir test/base_results/comparisons
285-
286-
mkdir test/base_results/comparisons/baseline
287-
288-
mkdir test/base_results/comparisons/baseline/annual
289-
290-
python test/compare.py -a samples -b base_results/baseline/annual -f samples -e test/base_results/comparisons/baseline/annual
291-
292-
python test/compare.py -a results -b base_results/baseline/annual -f results/baseline/annual -e test/base_results/comparisons/baseline/annual
293-
python test/compare.py -a results -af sum -ac build_existing_model.geometry_building_type_recs -x results_output_building_type_sum.csv -b base_results/baseline/annual -f results/baseline/annual -e test/base_results/comparisons/baseline/annual
294-
295-
python test/compare.py -a visualize -dc build_existing_model.geometry_building_type_recs -x results_output_building_type.html -b base_results/baseline/annual -f results/baseline/annual -e test/base_results/comparisons/baseline/annual
296-
# python test/compare.py -a visualize -dc build_existing_model.geometry_foundation_type -x results_output_foundation_type.html -b base_results/baseline/annual -f results/baseline/annual -e test/base_results/comparisons/baseline/annual
297-
# python test/compare.py -a visualize -dc build_existing_model.census_region -x results_output_cr.html -b base_results/baseline/annual -f results/baseline/annual -e test/base_results/comparisons/baseline/annual
298-
# python test/compare.py -a visualize -dc build_existing_model.geometry_building_type_recs -ac build_existing_model.census_region -af sum -x results_output_cr_sum.html -b base_results/baseline/annual -f results/baseline/annual -e test/base_results/comparisons/baseline/annual
284+
# baseline annual
285+
mkdir -p test/base_results/comparisons/baseline/annual
286+
python test/compare.py -a samples -b base_results/baseline/annual -f samples -e test/base_results/comparisons/baseline/annual # base_samples.csv, feature_samples.csv
287+
python test/compare.py -a results -b base_results/baseline/annual -f results/baseline/annual -e test/base_results/comparisons/baseline/annual # results_characteristics.csv, results_output.csv
288+
python test/compare.py -a results -af sum -ac build_existing_model.geometry_building_type_recs -x results_output_building_type_sum.csv -b base_results/baseline/annual -f results/baseline/annual -e test/base_results/comparisons/baseline/annual # results_output_building_type_sum.csv
289+
python test/compare.py -a visualize -dc build_existing_model.geometry_building_type_recs -x results_output_building_type.html -b base_results/baseline/annual -f results/baseline/annual -e test/base_results/comparisons/baseline/annual # *.html
299290
291+
# baseline timeseries
300292
mkdir test/base_results/comparisons/baseline/timeseries
301-
302-
python test/compare.py -a timeseries -b base_results/baseline/timeseries -f results/baseline/timeseries -e test/base_results/comparisons/baseline/timeseries
303-
304-
mkdir test/base_results/comparisons/upgrades
305-
306-
mkdir test/base_results/comparisons/upgrades/annual
307-
308-
python test/compare.py -a results -b base_results/upgrades/annual -f results/upgrades/annual -e test/base_results/comparisons/upgrades/annual
293+
python test/compare.py -a timeseries -b base_results/baseline/timeseries -f results/baseline/timeseries -e test/base_results/comparisons/baseline/timeseries # cvrmse_nmbe_*.csv
309294
310-
python test/compare.py -a visualize -x results_output.html -b base_results/upgrades/annual -f results/upgrades/annual -e test/base_results/comparisons/upgrades/annual
295+
# upgrades annual
296+
mkdir -p test/base_results/comparisons/upgrades/annual
297+
python test/compare.py -a results -b base_results/upgrades/annual -f results/upgrades/annual -e test/base_results/comparisons/upgrades/annual # results_output.csv
298+
python test/compare.py -a visualize -x results_output.html -b base_results/upgrades/annual -f results/upgrades/annual -e test/base_results/comparisons/upgrades/annual # *.html
311299
300+
# upgrades timeseries
312301
mkdir test/base_results/comparisons/upgrades/timeseries
313-
314-
python test/compare.py -a timeseries -b base_results/upgrades/timeseries -f results/upgrades/timeseries -e test/base_results/comparisons/upgrades/timeseries
302+
python test/compare.py -a timeseries -b base_results/upgrades/timeseries -f results/upgrades/timeseries -e test/base_results/comparisons/upgrades/timeseries # cvrmse_nmbe_*.csv
315303
316304
- name: Upload comparisons
317305
uses: actions/upload-artifact@v4

test/compare.py

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

1313

1414
enum_maps = {'build_existing_model.geometry_building_type_recs': {'Single-Family Detached': 'SFD',
15-
'Mobile Home': 'SFD',
15+
'Mobile Home': 'MH',
1616
'Single-Family Attached': 'SFA',
1717
'Multi-Family with 2 - 4 Units': 'MF',
1818
'Multi-Family with 5+ Units': 'MF'} }

0 commit comments

Comments
 (0)