Updating with abbreviations

tests/fixtures/two_stage.py

@@ -10,9 +10,18 @@
 
 import pytest
 
+''' Abbreviations used in this file:
+
+    XX - Heating system type: fu (furnace), hp (heat pump),  er (electric resistance), ot (other)
+    XX - Cooling system type: ce (central), hp (heat pump), 
+
+    YY - backup: eb (electric backup), ne (non electric backup, df (dual fuel), na (N/A)
+
+    Z - speed: 1 (single stage), 2 (two stage), v (variable)
+'''
 
 @pytest.fixture(scope="session", params=["../data/two_stage/metadata_furnace_or_boiler_two_stage_central_two_stage.csv"])
-def thermostat_furnace_or_boiler_two_stage_central_two_stage(request):
+def thermostat_fu_2_ce_2(request):
     thermostats = from_csv(get_data_path(request.param))
     return next(thermostats)
 
@@ -22,26 +31,26 @@ def thermostat_furnace_or_boiler_two_stage_none_single_stage(request):
     return next(thermostats)
 
 @pytest.fixture(scope="session", params=["../data/two_stage/metadata_heat_pump_electric_backup_two_stage_heat_pump_two_stage.csv"])
-def thermostat_heat_pump_electric_backup_two_stage_heat_pump_two_stage(request):
+def thermostat_hpeb_2_hp_2(request):
     thermostats = from_csv(get_data_path(request.param))
     return next(thermostats)
 
 @pytest.fixture(scope="session", params=["../data/two_stage/metadata_none_two_stage_heat_pump_two_stage.csv"])
-def thermostat_none_two_stage_heat_pump_two_stage(request):
+def thermostat_na_2_hp_2(request):
     thermostats = from_csv(get_data_path(request.param))
     return next(thermostats)
 
 @pytest.fixture(scope="session")
-def core_heating_day_set_heat_pump_electric_backup_two_stage_heat_pump_two_stage_entire(thermostat_heat_pump_electric_backup_two_stage_heat_pump_two_stage):
-    return thermostat_heat_pump_electric_backup_two_stage_heat_pump_two_stage.get_core_heating_days(method="entire_dataset")[0]
+def core_heating_day_set_hpeb_2_hp_2_entire(thermostat_hpeb_2_hp_2):
+    return thermostat_hpeb_2_hp_2.get_core_heating_days(method="entire_dataset")[0]
 
 @pytest.fixture(scope="session")
-def core_cooling_day_set_heat_pump_electric_backup_two_stage_heat_pump_two_stage_entire(thermostat_heat_pump_electric_backup_two_stage_heat_pump_two_stage):
-    return thermostat_heat_pump_electric_backup_two_stage_heat_pump_two_stage.get_core_cooling_days(method="entire_dataset")[0]
+def core_cooling_day_set_hpeb_2_hp_2_entire(thermostat_hpeb_2_hp_2):
+    return thermostat_hpeb_2_hp_2.get_core_cooling_days(method="entire_dataset")[0]
 
 
 @pytest.fixture(scope="session")
-def metrics_heat_pump_electric_backup_two_stage_heat_pump_two_stage_data():
+def metrics_hpeb_2_hp_2_data():
 
     data = [{'sw_version': '2.0.0',
 	'ct_identifier': 'c61badb0e0c0a7e06932de804af43111',

tests/fixtures/two_stage_ert.py

@@ -10,38 +10,47 @@
 
 import pytest
 
+''' Abbreviations used in this file:
+
+    XX - Heating system type: fu (furnace), hp (heat pump),  er (electric resistance), ot (other)
+    XX - Cooling system type: ce (central), hp (heat pump), 
+
+    YY - backup: eb (electric backup), ne (non electric backup, df (dual fuel), na (N/A)
+
+    Z - speed: 1 (single stage), 2 (two stage), v (variable)
+'''
 
 @pytest.fixture(scope="session", params=["../data/two_stage_ert/metadata_furnace_or_boiler_two_stage_central_two_stage.csv"])
-def thermostat_ert_furnace_or_boiler_two_stage_central_two_stage(request):
+def thermostat_ert_fu_2_ce_2(request):
     thermostats = from_csv(get_data_path(request.param))
     return next(thermostats)
 
 @pytest.fixture(scope="session", params=["../data/two_stage_ert/metadata_furnace_or_boiler_two_stage_none_single_stage.csv"])
-def thermostat_ert_furnace_or_boiler_two_stage_none_single_stage(request):
+def thermostat_ert_fu_2_na_1(request):
     thermostats = from_csv(get_data_path(request.param))
     return next(thermostats)
 
 @pytest.fixture(scope="session", params=["../data/two_stage_ert/metadata_heat_pump_electric_backup_two_stage_heat_pump_two_stage.csv"])
-def thermostat_ert_heat_pump_electric_backup_two_stage_heat_pump_two_stage(request):
+def thermostat_ert_hpeb_2_hp_2(request):
     thermostats = from_csv(get_data_path(request.param))
     return next(thermostats)
 
 @pytest.fixture(scope="session", params=["../data/two_stage_ert/metadata_none_two_stage_heat_pump_two_stage.csv"])
-def thermostat_ert_none_two_stage_heat_pump_two_stage(request):
+def thermostat_ert_na_2_hp_2(request):
     thermostats = from_csv(get_data_path(request.param))
     return next(thermostats)
 
 @pytest.fixture(scope="session")
-def core_heating_day_set_ert_heat_pump_electric_backup_two_stage_heat_pump_two_stage_entire(thermostat_ert_heat_pump_electric_backup_two_stage_heat_pump_two_stage):
-    return thermostat_ert_heat_pump_electric_backup_two_stage_heat_pump_two_stage.get_core_heating_days(method="entire_dataset")[0]
+def core_heating_day_set_ert_hpeb_2_hp_2_entire(thermostat_ert_hpeb_2_hp_2):
+    return thermostat_ert_hpeb_2_hp_2.get_core_heating_days(method="entire_dataset")[0]
 
 @pytest.fixture(scope="session")
-def core_cooling_day_set_ert_heat_pump_electric_backup_two_stage_heat_pump_two_stage_entire(thermostat_ert_heat_pump_electric_backup_two_stage_heat_pump_two_stage):
-    return thermostat_ert_heat_pump_electric_backup_two_stage_heat_pump_two_stage.get_core_cooling_days(method="entire_dataset")[0]
+def core_cooling_day_set_ert_hpeb_2_hp_2_entire(thermostat_ert_hpeb_2_hp_2):
+    return thermostat_ert_hpeb_2_hp_2.get_core_cooling_days(method="entire_dataset")[0]
 
 
 @pytest.fixture(scope="session")
-def metrics_ert_heat_pump_electric_backup_two_stage_heat_pump_two_stage_data():
+def metrics_ert_hpeb_2_hp_2_data():
     data = [{'sw_version': '2.0.0',
 	'ct_identifier': 'c61badb0e0c0a7e06932de804af43111',
 	'heat_type': 'heat_pump_electric_backup',