Merge branch 'master' into gh-pages-custom

.travis.yml

@@ -74,22 +74,22 @@ jobs:
     script: cd testing && make build_jm_image && make test_twozone_apartment_hydronic
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 matplotlib==3.3.4 requests==2.25.1
-    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_office_simple_air_travis ARG="-s test_peak_heat_day,test_typical_heat_day"
+    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_office_simple_air ARG="-s test_peak_heat_day,test_typical_heat_day"
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 matplotlib==3.3.4 requests==2.25.1
-    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_office_simple_air_travis ARG="-s test_peak_cool_day,test_typical_cool_day,test_mix_day"
+    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_office_simple_air ARG="-s test_peak_cool_day,test_typical_cool_day,test_mix_day"
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 matplotlib==3.3.4 requests==2.25.1
-    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_office_simple_air_travis ARG="-s API"
+    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_office_simple_air ARG="-s API"
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 matplotlib==3.3.4 requests==2.25.1
-    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_residential_hydronic_travis ARG="-s test_peak_heat_day,test_shoulder"
+    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_residential_hydronic ARG="-s test_peak_heat_day,test_shoulder"
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 matplotlib==3.3.4 requests==2.25.1
-    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_residential_hydronic_travis ARG="-s test_typical_heat_day,test_summer"
+    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_residential_hydronic ARG="-s test_typical_heat_day,test_summer"
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 matplotlib==3.3.4 requests==2.25.1
-    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_residential_hydronic_travis ARG="-s API"
+    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_residential_hydronic ARG="-s API"
   - python: 2.7
     install: pip install --upgrade pip && pip install pandas==0.24.2 numpy==1.16.6 matplotlib==2.1.1 requests==2.18.4
     script: cd testing && make test_python2

releasenotes.md

@@ -14,6 +14,9 @@ Released on xx/xx/xxxx.
 - Correct typo in design documentation about connecting inputs to overwrite blocks in wrapper model. This is for [#601](/~https://github.com/ibpsa/project1-boptest/issues/601).
 - Add Git LFS configuration in the ``testing/Dockerfile`` image used in tests and compilation. This is for [#613](/~https://github.com/ibpsa/project1-boptest/issues/613).
 - Correct typo in documentation for ``multizone_office_simple_air``, cooling setback temperature changed from 12 to 30. This is for [#605](/~https://github.com/ibpsa/project1-boptest/issues/605).
+- Modify unit tests for test case scenarios to only simulate two days after warmup instead of the whole two-week scenario. This is for [#576](/~https://github.com/ibpsa/project1-boptest/issues/576).
+- Fix unit tests for possible false passes in certain test cases. This is for [#620](/~https://github.com/ibpsa/project1-boptest/issues/620).
+
 
 ## BOPTEST v0.5.0
 

testing/makefile

@@ -87,17 +87,7 @@ generate_testcase_data:
 # Tests
 ###############################################################################
 
-# Generic test for all testcases except testcase1 and testcase2 to run on travis
-test_%_travis:
-# Compile testcase model
-	make compile_testcase_model TESTCASE=$*
-# Build and deploy testcase image
-	cd .. && TESTCASE=$* docker-compose up -d
-	python sleep10.py
-# Run testcase tests
-	cd .. && python testing/test_$*.py $(ARG)
-
-# Generic test for all testcases except testcase1 and testcase2 to run locally with cleanup
+# Generic test for all testcases except testcase1 and testcase2
 test_%:
 # Compile testcase model
 	make compile_testcase_model TESTCASE=$*

testing/references/bestest_air/kpis_mix_day_constant.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.04285096369996293
-emis_tot,0.8888363250098191
-ener_tot,3.1790567504061285
-idis_tot,1222.9881103295345
+ener_tot,0.4222469400271584
+time_rat,6.0097990488564524e-05
+emis_tot,0.09515120738815497
+idis_tot,174.3554814494978
+pele_tot,0.006655594855514412
+tdis_tot,0.7102950802470053
+pgas_tot,0.0812251385508509
+cost_tot,0.00322660321473935
 pdih_tot,
-pele_tot,0.023048425265457306
-pgas_tot,0.11652264230246608
-tdis_tot,5.749206702446115
-time_rat,9.129844677161354e-06

testing/references/bestest_air/kpis_mix_day_dynamic.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.05622459741828569
-emis_tot,0.8888363250098191
-ener_tot,3.1790567504061285
-idis_tot,1222.9881103295345
+ener_tot,0.4222469400271584
+time_rat,6.0097990488564524e-05
+emis_tot,0.09515120738815497
+idis_tot,174.3554814494978
+pele_tot,0.006655594855514412
+tdis_tot,0.7102950802470053
+pgas_tot,0.0812251385508509
+cost_tot,0.004190988877976548
 pdih_tot,
-pele_tot,0.023048425265457306
-pgas_tot,0.11652264230246608
-tdis_tot,5.749206702446115
-time_rat,9.129844677161354e-06

testing/references/bestest_air/kpis_mix_day_highly_dynamic.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.014828198796154875
-emis_tot,0.8888363250098191
-ener_tot,3.1790567504061285
-idis_tot,1222.9881103295345
+ener_tot,0.4222469400271584
+time_rat,6.0097990488564524e-05
+emis_tot,0.09515120738815497
+idis_tot,174.3554814494978
+pele_tot,0.006655594855514412
+tdis_tot,0.7102950802470053
+pgas_tot,0.0812251385508509
+cost_tot,0.002165469089068335
 pdih_tot,
-pele_tot,0.023048425265457306
-pgas_tot,0.11652264230246608
-tdis_tot,5.749206702446115
-time_rat,9.129844677161354e-06

testing/references/bestest_air/kpis_peak_cool_day_constant.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.12080360595264815
-emis_tot,1.4660607643577486
-ener_tot,2.2256115350441203
-idis_tot,1224.5455487890551
-pdih_tot,
-pele_tot,0.033208984363209786
+ener_tot,0.20399279217934863
+time_rat,3.319831358061896e-05
+emis_tot,0.13057140865546424
+idis_tot,174.8046557530558
+pele_tot,0.02320257434871638
+tdis_tot,0.9207415648608128
 pgas_tot,0.02172986726139404
-tdis_tot,7.670197889647596
-time_rat,6.3067053632299154e-06
+cost_tot,0.010663208327213266
+pdih_tot,

testing/references/bestest_air/kpis_peak_cool_day_dynamic.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.1502884354581411
-emis_tot,1.4660607643577486
-ener_tot,2.2256115350441203
-idis_tot,1224.5455487890551
-pdih_tot,
-pele_tot,0.033208984363209786
+ener_tot,0.20399279217934863
+time_rat,3.319831358061896e-05
+emis_tot,0.13057140865546424
+idis_tot,174.8046557530558
+pele_tot,0.02320257434871638
+tdis_tot,0.9207415648608128
 pgas_tot,0.02172986726139404
-tdis_tot,7.670197889647596
-time_rat,6.3067053632299154e-06
+cost_tot,0.014527259857100301
+pdih_tot,

testing/references/bestest_air/kpis_peak_cool_day_highly_dynamic.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.06767527916565627
-emis_tot,1.4660607643577486
-ener_tot,2.2256115350441203
-idis_tot,1224.5455487890551
-pdih_tot,
-pele_tot,0.033208984363209786
+ener_tot,0.20399279217934863
+time_rat,3.319831358061896e-05
+emis_tot,0.13057140865546424
+idis_tot,174.8046557530558
+pele_tot,0.02320257434871638
+tdis_tot,0.9207415648608128
 pgas_tot,0.02172986726139404
-tdis_tot,7.670197889647596
-time_rat,6.3067053632299154e-06
+cost_tot,0.006876426916906536
+pdih_tot,

testing/references/bestest_air/kpis_peak_heat_day_constant.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.02271071531663671
-emis_tot,0.785590772991245
-ener_tot,3.7227262062358055
-idis_tot,1221.6529527806554
+ener_tot,0.6172181832528102
+time_rat,3.357516394721138e-05
+emis_tot,0.11299404997779623
+idis_tot,174.68399070767845
+pele_tot,0.0007751034678093416
+tdis_tot,0.9978626465009404
+pgas_tot,0.08919861900474872
+cost_tot,0.0019085229233816378
 pdih_tot,
-pele_tot,0.010216143907980911
-pgas_tot,0.12133848299596474
-tdis_tot,5.687288484421467
-time_rat,6.402185990635098e-06

testing/references/bestest_air/kpis_peak_heat_day_dynamic.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.02730719968271573
-emis_tot,0.785590772991245
-ener_tot,3.7227262062358055
-idis_tot,1221.6529527806554
+ener_tot,0.6172181832528102
+time_rat,3.357516394721138e-05
+emis_tot,0.11299404997779623
+idis_tot,174.68399070767845
+pele_tot,0.0007751034678093416
+tdis_tot,0.9978626465009404
+pgas_tot,0.08919861900474872
+cost_tot,0.0019040601731802088
 pdih_tot,
-pele_tot,0.010216143907980911
-pgas_tot,0.12133848299596474
-tdis_tot,5.687288484421467
-time_rat,6.402185990635098e-06

testing/references/bestest_air/kpis_peak_heat_day_highly_dynamic.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.0157791922893377
-emis_tot,0.785590772991245
-ener_tot,3.7227262062358055
-idis_tot,1221.6529527806554
+ener_tot,0.6172181832528102
+time_rat,3.357516394721138e-05
+emis_tot,0.11299404997779623
+idis_tot,174.68399070767845
+pele_tot,0.0007751034678093416
+tdis_tot,0.9978626465009404
+pgas_tot,0.08919861900474872
+cost_tot,0.0018211863406660074
 pdih_tot,
-pele_tot,0.010216143907980911
-pgas_tot,0.12133848299596474
-tdis_tot,5.687288484421467
-time_rat,6.402185990635098e-06

testing/references/bestest_air/kpis_typical_cool_day_constant.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.060000857394410245
-emis_tot,0.7271412991788654
-ener_tot,1.0987890062452197
-idis_tot,1223.63528599402
+ener_tot,0.13304291458620154
+time_rat,2.981172253688177e-05
+emis_tot,0.08804530614006925
+idis_tot,174.80260641380252
+pele_tot,0.010442423846550494
+tdis_tot,0.4434948309857248
+pgas_tot,2.0758111568064324e-05
+cost_tot,0.007265205098395619
 pdih_tot,
-pele_tot,0.01534656819750315
-pgas_tot,7.472904421504899e-05
-tdis_tot,4.302088382526185
-time_rat,6.27554017169775e-06

testing/references/bestest_air/kpis_typical_cool_day_dynamic.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.10181629117723215
-emis_tot,0.7271412991788654
-ener_tot,1.0987890062452197
-idis_tot,1223.63528599402
+ener_tot,0.13304291458620154
+time_rat,2.981172253688177e-05
+emis_tot,0.08804530614006925
+idis_tot,174.80260641380252
+pele_tot,0.010442423846550494
+tdis_tot,0.4434948309857248
+pgas_tot,2.0758111568064324e-05
+cost_tot,0.009370880922164619
 pdih_tot,
-pele_tot,0.01534656819750315
-pgas_tot,7.472904421504899e-05
-tdis_tot,4.302088382526185
-time_rat,6.27554017169775e-06

testing/references/bestest_air/kpis_typical_cool_day_highly_dynamic.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.03509465919408118
-emis_tot,0.7271412991788654
-ener_tot,1.0987890062452197
-idis_tot,1223.63528599402
+ener_tot,0.13304291458620154
+time_rat,2.981172253688177e-05
+emis_tot,0.08804530614006925
+idis_tot,174.80260641380252
+pele_tot,0.010442423846550494
+tdis_tot,0.4434948309857248
+pgas_tot,2.0758111568064324e-05
+cost_tot,0.0041449650472483186
 pdih_tot,
-pele_tot,0.01534656819750315
-pgas_tot,7.472904421504899e-05
-tdis_tot,4.302088382526185
-time_rat,6.27554017169775e-06

testing/references/bestest_air/kpis_typical_heat_day_constant.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.03227754090877119
-emis_tot,0.7149597223461439
-ener_tot,2.6890679490357052
-idis_tot,1223.8727563474288
+ener_tot,0.5392750146403066
+time_rat,3.33647554119428e-05
+emis_tot,0.09873686770264668
+idis_tot,174.35501362967065
+pele_tot,0.0008218404708821759
+tdis_tot,0.9774824590395372
+pgas_tot,0.09253558910973295
+cost_tot,0.001668788635678517
 pdih_tot,
-pele_tot,0.01736527156539468
-pgas_tot,0.10365373407961484
-tdis_tot,5.553726456270887
-time_rat,6.359147231570179e-06

testing/references/bestest_air/kpis_typical_heat_day_dynamic.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.04095911790911401
-emis_tot,0.7149597223461439
-ener_tot,2.6890679490357052
-idis_tot,1223.8727563474288
+ener_tot,0.5392750146403066
+time_rat,3.33647554119428e-05
+emis_tot,0.09873686770264668
+idis_tot,174.35501362967065
+pele_tot,0.0008218404708821759
+tdis_tot,0.9774824590395372
+pgas_tot,0.09253558910973295
+cost_tot,0.0016728538904391623
 pdih_tot,
-pele_tot,0.01736527156539468
-pgas_tot,0.10365373407961484
-tdis_tot,5.553726456270887
-time_rat,6.359147231570179e-06

testing/references/bestest_air/kpis_typical_heat_day_highly_dynamic.csv

@@ -1,10 +1,10 @@
 keys,value
-cost_tot,0.01410911655850778
-emis_tot,0.7149597223461439
-ener_tot,2.6890679490357052
-idis_tot,1223.8727563474288
+ener_tot,0.5392750146403066
+time_rat,3.33647554119428e-05
+emis_tot,0.09873686770264668
+idis_tot,174.35501362967065
+pele_tot,0.0008218404708821759
+tdis_tot,0.9774824590395372
+pgas_tot,0.09253558910973295
+cost_tot,0.001549451388048314
 pdih_tot,
-pele_tot,0.01736527156539468
-pgas_tot,0.10365373407961484
-tdis_tot,5.553726456270887
-time_rat,6.359147231570179e-06