Skip to content

Commit

Permalink
Adding Alpha moniker for the feature EPA 2.0 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
craigmaloney committed Nov 25, 2020
1 parent e314ecd commit 0c621e2
Show file tree
Hide file tree
Showing 7 changed files with 1,686 additions and 1,686 deletions.
10 changes: 5 additions & 5 deletions tests/data/two_stage_ert/thermostat_example_certification.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
product_id,sw_version,metric,filter,region,statistic,season,value
test_product,2.0.0,percent_savings_baseline_percentile,tau_cvrmse_savings_p01,national_weighted_mean,lower_bound_95,heating,6.95
test_product,2.0.0,percent_savings_baseline_percentile,tau_cvrmse_savings_p01,national_weighted_mean,lower_bound_95,cooling,17.83
test_product,2.0.0,percent_savings_baseline_percentile,tau_cvrmse_savings_p01,national_weighted_mean,q20,heating,7.39
test_product,2.0.0,percent_savings_baseline_percentile,tau_cvrmse_savings_p01,national_weighted_mean,q20,cooling,18.94
test_product,2.0.0,rhu_30F_to_45F,tau_cvrmse_savings_p01,all,upper_bound_95,heating,0.04
test_product,2.0.0a1,percent_savings_baseline_percentile,tau_cvrmse_savings_p01,national_weighted_mean,lower_bound_95,heating,6.95
test_product,2.0.0a1,percent_savings_baseline_percentile,tau_cvrmse_savings_p01,national_weighted_mean,lower_bound_95,cooling,16.60
test_product,2.0.0a1,percent_savings_baseline_percentile,tau_cvrmse_savings_p01,national_weighted_mean,q20,heating,7.39
test_product,2.0.0a1,percent_savings_baseline_percentile,tau_cvrmse_savings_p01,national_weighted_mean,q20,cooling,17.35
test_product,2.0.0a1,rhu_30F_to_45F,tau_cvrmse_savings_p01,all,upper_bound_95,heating,0.04
1,670 changes: 835 additions & 835 deletions tests/data/two_stage_ert/thermostat_example_stats.csv

Large diffs are not rendered by default.

1,676 changes: 838 additions & 838 deletions tests/data/two_stage_ert/thermostat_example_stats_advanced.csv

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tests/fixtures/single_stage.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def core_cooling_day_set_type_5(thermostat_type_5):
def metrics_type_1_data():

# this data comes from a script in scripts/test_data_generation.ipynb
data = [{'sw_version': '2.0.0',
data = [{'sw_version': '2.0.0a1',
'ct_identifier': '8465829e-df0d-449e-97bf-96317c24dec3',
'heat_type': 'heat_pump_electric_backup',
'heat_stage': 'single_stage',
Expand Down Expand Up @@ -202,7 +202,7 @@ def metrics_type_1_data():
'core_cooling_days_mean_outdoor_temperature': 79.8426321875,
'core_mean_indoor_temperature': 73.95971753003002,
'core_mean_outdoor_temperature': 79.8426321875},
{'sw_version': '2.0.0',
{'sw_version': '2.0.0a1',
'ct_identifier': '8465829e-df0d-449e-97bf-96317c24dec3',
'heat_type': 'heat_pump_electric_backup',
'heat_stage': 'single_stage',
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/two_stage.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def core_cooling_day_set_hpeb_2_hp_2_entire(thermostat_hpeb_2_hp_2):
@pytest.fixture(scope="session")
def metrics_hpeb_2_hp_2_data():

data = [{'sw_version': '2.0.0',
data = [{'sw_version': '2.0.0a1',
'ct_identifier': 'c61badb0e0c0a7e06932de804af43111',
'heat_type': 'heat_pump_electric_backup',
'heat_stage': 'two_stage',
Expand Down Expand Up @@ -96,7 +96,7 @@ def metrics_hpeb_2_hp_2_data():
'core_cooling_days_mean_outdoor_temperature': 74.37230553125,
'core_mean_indoor_temperature': 71.86122395833334,
'core_mean_outdoor_temperature': 74.37230553125},
{'sw_version': '2.0.0',
{'sw_version': '2.0.0a1',
'ct_identifier': 'c61badb0e0c0a7e06932de804af43111',
'heat_type': 'heat_pump_electric_backup',
'heat_stage': 'two_stage',
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/two_stage_ert.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def core_cooling_day_set_ert_hpeb_2_hp_2_entire(thermostat_ert_hpeb_2_hp_2):

@pytest.fixture(scope="session")
def metrics_ert_hpeb_2_hp_2_data():
data = [{'sw_version': '2.0.0',
data = [{'sw_version': '2.0.0a1',
'ct_identifier': 'c61badb0e0c0a7e06932de804af43111',
'heat_type': 'heat_pump_electric_backup',
'heat_stage': 'two_stage',
Expand Down Expand Up @@ -95,7 +95,7 @@ def metrics_ert_hpeb_2_hp_2_data():
'core_cooling_days_mean_outdoor_temperature': 74.44325500000001,
'core_mean_indoor_temperature': 71.87575995807128,
'core_mean_outdoor_temperature': 74.44325500000001},
{'sw_version': '2.0.0',
{'sw_version': '2.0.0a1',
'ct_identifier': 'c61badb0e0c0a7e06932de804af43111',
'heat_type': 'heat_pump_electric_backup',
'heat_stage': 'two_stage',
Expand Down
4 changes: 2 additions & 2 deletions thermostat/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
VERSION = (2, 0, 0)
VERSION = "2.0.0a1"


def get_version():
return '{}.{}.{}'.format(VERSION[0], VERSION[1], VERSION[2])
return VERSION


# This try/except clause is a hack to make the get_version method work for the
Expand Down

0 comments on commit 0c621e2

Please sign in to comment.