Hardened code to notify on erroneous interval datafiles. Changed equi…

…v_runtime to runtime_equiv
EPAENERGYSTAR · Aug 3, 2020 · b6a2b5c · b6a2b5c
1 parent 9f56f6e
commit b6a2b5c
Show file tree

Hide file tree

Showing 53 changed files with 3,161 additions and 3,130 deletions.
diff --git a/docs/data_files.rst b/docs/data_files.rst
@@ -47,7 +47,6 @@ Columns
 ============================ ================================ ======= ===========
 Name                         Data Format                      Units   Description
 ---------------------------- -------------------------------- ------- -----------
-:code:`thermostat_id`        string                           N/A     Uniquely identifying marker for the thermostat.
 :code:`datetime`             YYYY-MM-DD hh:mm:ss (ISO-8601)   N/A     Date and time of this set of readings.
 :code:`cool_runtime_stg1`    decimal or integer               minutes Hourly runtime of cooling equipment (all units).
 :code:`cool_runtime_stg2`    decimal or integer               minutes Hourly runtime of cooling equipment second stage (two-stage units only).

diff --git a/scripts/thermostat_converter.py b/scripts/thermostat_converter.py
@@ -7,8 +7,8 @@
 
 FIELDNAMES = [
         'datetime',
-        'cool_runtime_stg1', 'cool_runtime_stg2', 'cool_equiv_runtime',
-        'heat_runtime_stg1', 'heat_runtime_stg2', 'heat_equiv_runtime',
+        'cool_runtime_stg1', 'cool_runtime_stg2', 'cool_runtime_equiv',
+        'heat_runtime_stg1', 'heat_runtime_stg2', 'heat_runtime_equiv',
         'emergency_heat_runtime',
         'auxiliary_heat_runtime',
         'temp_in',
@@ -47,7 +47,7 @@ def main():
                         else:
                             cool_runtime = None
                         current_row['cool_runtime_stg1'] = cool_runtime
-                        current_row['cool_equiv_runtime'] = None
+                        current_row['cool_runtime_equiv'] = None
 
                         current_row['heat_runtime_stg2'] = None
 
@@ -57,7 +57,7 @@ def main():
                         else:
                             heat_runtime = None
                         current_row['heat_runtime_stg1'] = heat_runtime
-                        current_row['heat_equiv_runtime'] = None
+                        current_row['heat_runtime_equiv'] = None
 
                         header = 'auxiliary_heat_runtime_%02d' % hour
                         current_row['auxiliary_heat_runtime'] = row[header]

diff --git a/tests/data/thermostat_04fa68f1-12c4-45ab-a924-a19c51c8a72b.csv b/tests/data/thermostat_04fa68f1-12c4-45ab-a924-a19c51c8a72b.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,38.166666666666664,,,0.0,0.0,63.0
 2011-01-01 01:00:00,0.0,,,38.166666666666664,,,0.0,,65.0
 2011-01-01 02:00:00,0.0,,,38.166666666666664,,,0.0,4.0,61.5

diff --git a/tests/data/thermostat_064ec4bc-5317-4ab1-a1e7-a214d1acd74a.csv b/tests/data/thermostat_064ec4bc-5317-4ab1-a1e7-a214d1acd74a.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.25,,,,,,,,68.0
 2011-01-01 01:00:00,0.25,,,,,,,,65.5
 2011-01-01 02:00:00,0.25,,,,,,,,67.0

diff --git a/tests/data/thermostat_1ab401c3-8588-4568-b012-e5d22941edad.csv b/tests/data/thermostat_1ab401c3-8588-4568-b012-e5d22941edad.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,28.458333333333332,,,,,63.0
 2011-01-01 01:00:00,0.0,,,28.458333333333332,,,,,69.0
 2011-01-01 02:00:00,0.0,,,28.458333333333332,,,,,67.0

diff --git a/tests/data/thermostat_2d3b385b-1ed1-4658-b551-5728a213f03d.csv b/tests/data/thermostat_2d3b385b-1ed1-4658-b551-5728a213f03d.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,31.375,,,,,66.5
 2011-01-01 01:00:00,0.0,,,31.375,,,,,67.0
 2011-01-01 02:00:00,0.0,,,31.375,,,,,

diff --git a/tests/data/thermostat_2f3852ae-efbe-42f0-8100-6f6183baeede.csv b/tests/data/thermostat_2f3852ae-efbe-42f0-8100-6f6183baeede.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,,,,0.0,0.0,65.5
 2011-01-01 01:00:00,0.0,,,,,,0.0,,65.5
 2011-01-01 02:00:00,0.0,,,,,,,10.0,68.5

diff --git a/tests/data/thermostat_3766e958-03ec-4d96-83c2-7eeb87c74c90.csv b/tests/data/thermostat_3766e958-03ec-4d96-83c2-7eeb87c74c90.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,22.708333333333332,,,,,
 2011-01-01 01:00:00,0.0,,,22.708333333333332,,,,,66.0
 2011-01-01 02:00:00,0.0,,,22.708333333333332,,,,,64.0

diff --git a/tests/data/thermostat_3d7310ca-ef32-470a-a2aa-a18d7740ed07.csv b/tests/data/thermostat_3d7310ca-ef32-470a-a2aa-a18d7740ed07.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,,,,59.25,,,,,70.5
 2011-01-01 01:00:00,,,,59.25,,,,,66.0
 2011-01-01 02:00:00,,,,59.25,,,,,69.5

diff --git a/tests/data/thermostat_4b82fc6c-9beb-4d64-b5bf-3d9b85003273.csv b/tests/data/thermostat_4b82fc6c-9beb-4d64-b5bf-3d9b85003273.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,60.0,,,,,
 2011-01-01 01:00:00,0.0,,,60.0,,,,,64.5
 2011-01-01 02:00:00,0.0,,,60.0,,,,,

diff --git a/tests/data/thermostat_54aeb85f-aa8c-4e32-afb7-4617c08446a5.csv b/tests/data/thermostat_54aeb85f-aa8c-4e32-afb7-4617c08446a5.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,,,,,,23.5
 2011-01-01 01:00:00,0.0,,,,,,,,21.0
 2011-01-01 02:00:00,0.0,,,,,,,,18.0

diff --git a/tests/data/thermostat_566eed02-e92f-4ce8-afc2-8d224dc6c61e.csv b/tests/data/thermostat_566eed02-e92f-4ce8-afc2-8d224dc6c61e.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,,,,58.208333333333336,,,,,
 2011-01-01 01:00:00,,,,58.208333333333336,,,,,61.0
 2011-01-01 02:00:00,,,,58.208333333333336,,,,,68.0

diff --git a/tests/data/thermostat_582b15ff-3ae3-4c05-b401-5e6b3bb96688.csv b/tests/data/thermostat_582b15ff-3ae3-4c05-b401-5e6b3bb96688.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,44.25,,,0.0,0.0,66.0
 2011-01-01 01:00:00,0.0,,,44.25,,,0.0,4.0,67.5
 2011-01-01 02:00:00,0.0,,,44.25,,,0.0,0.0,69.0

diff --git a/tests/data/thermostat_8465829e-df0d-449e-97bf-96317c24dec3.csv b/tests/data/thermostat_8465829e-df0d-449e-97bf-96317c24dec3.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,57.25,,,0.0,0.0,63.5
 2011-01-01 01:00:00,0.0,,,57.25,,,0.0,14.0,68.0
 2011-01-01 02:00:00,0.0,,,57.25,,,0.0,21.0,65.5

diff --git a/tests/data/thermostat_879b43f2-a02d-499a-9d3a-f44cdc78c2ae.csv b/tests/data/thermostat_879b43f2-a02d-499a-9d3a-f44cdc78c2ae.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,,,,57.5,,,,,61.5
 2011-01-01 01:00:00,,,,57.5,,,,,68.0
 2011-01-01 02:00:00,,,,57.5,,,,,

diff --git a/tests/data/thermostat_8850a9e0-b917-40ab-bb94-e03286575d73.csv b/tests/data/thermostat_8850a9e0-b917-40ab-bb94-e03286575d73.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,,,,60.0,,,,,61.0
 2011-01-01 01:00:00,,,,60.0,,,,,67.5
 2011-01-01 02:00:00,,,,60.0,,,,,

diff --git a/tests/data/thermostat_959325a4-3347-4b43-aa24-2f1bd55195ee.csv b/tests/data/thermostat_959325a4-3347-4b43-aa24-2f1bd55195ee.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,13.125,,,,,67.5
 2011-01-01 01:00:00,0.0,,,13.125,,,,,66.0
 2011-01-01 02:00:00,0.0,,,13.125,,,,,65.5

diff --git a/tests/data/thermostat_9a168b59-6d9c-4b1d-a8af-2a765afbed92.csv b/tests/data/thermostat_9a168b59-6d9c-4b1d-a8af-2a765afbed92.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,,,,60.0,,,,,64.5
 2011-01-01 01:00:00,,,,60.0,,,,,
 2011-01-01 02:00:00,,,,60.0,,,,,67.0

diff --git a/tests/data/thermostat_a16d8fd5-95c9-41d7-a29e-86ef5adb9893.csv b/tests/data/thermostat_a16d8fd5-95c9-41d7-a29e-86ef5adb9893.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,36.25,,,,,61.0
 2011-01-01 01:00:00,0.0,,,36.25,,,,,68.5
 2011-01-01 02:00:00,0.0,,,36.25,,,,,66.5

diff --git a/tests/data/thermostat_a2889532-7fb0-4e63-a85b-7fbcbe0f7fe0.csv b/tests/data/thermostat_a2889532-7fb0-4e63-a85b-7fbcbe0f7fe0.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,,,,,,38.0
 2011-01-01 01:00:00,0.0,,,,,,,,35.5
 2011-01-01 02:00:00,0.0,,,,,,,,38.0

diff --git a/tests/data/thermostat_a59238c1-9e4b-4ae7-80ff-9c5de4152bd8.csv b/tests/data/thermostat_a59238c1-9e4b-4ae7-80ff-9c5de4152bd8.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,,,,,,,,,64.0
 2011-01-01 01:00:00,,,,,,,,,63.5
 2011-01-01 02:00:00,,,,,,,,,60.5

diff --git a/tests/data/thermostat_a7ed7c85-dc4c-4041-acb3-b42139fa5ecb.csv b/tests/data/thermostat_a7ed7c85-dc4c-4041-acb3-b42139fa5ecb.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,,,,55.958333333333336,,,,,63.0
 2011-01-01 01:00:00,,,,55.958333333333336,,,,,66.0
 2011-01-01 02:00:00,,,,55.958333333333336,,,,,62.5

diff --git a/tests/data/thermostat_b2a305d1-9df1-4387-a89c-d702f6a9ba3e.csv b/tests/data/thermostat_b2a305d1-9df1-4387-a89c-d702f6a9ba3e.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,28.5,,,0.0,0.0,63.5
 2011-01-01 01:00:00,0.0,,,28.5,,,0.0,0.0,63.0
 2011-01-01 02:00:00,0.0,,,28.5,,,0.0,0.0,67.5

diff --git a/tests/data/thermostat_b5c68765-4c68-4ff9-98ae-5a2da9a5e517.csv b/tests/data/thermostat_b5c68765-4c68-4ff9-98ae-5a2da9a5e517.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,24.583333333333332,,,,,61.0
 2011-01-01 01:00:00,0.0,,,24.583333333333332,,,,,64.0
 2011-01-01 02:00:00,0.0,,,24.583333333333332,,,,,

diff --git a/tests/data/thermostat_c19345f4-14c9-4aee-9abc-5a9c67016586.csv b/tests/data/thermostat_c19345f4-14c9-4aee-9abc-5a9c67016586.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,36.0,,,0.0,0.0,67.0
 2011-01-01 01:00:00,0.0,,,36.0,,,0.0,0.0,63.5
 2011-01-01 02:00:00,0.0,,,36.0,,,0.0,,65.0

diff --git a/tests/data/thermostat_d28b18d0-4dc0-4010-ae3e-58ab19b5fd61.csv b/tests/data/thermostat_d28b18d0-4dc0-4010-ae3e-58ab19b5fd61.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,,,,,,51.0
 2011-01-01 01:00:00,0.0,,,,,,,,51.0
 2011-01-01 02:00:00,0.0,,,,,,,,49.5

diff --git a/tests/data/thermostat_d36e20f2-e6bb-4caf-9d53-6183b7c08fe1.csv b/tests/data/thermostat_d36e20f2-e6bb-4caf-9d53-6183b7c08fe1.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,57.25,,,0.0,0.0,67.0
 2011-01-01 01:00:00,0.0,,,57.25,,,0.0,,66.5
 2011-01-01 02:00:00,0.0,,,57.25,,,0.0,8.0,

diff --git a/tests/data/thermostat_da25834c-3c93-4dda-902e-58e986f5e8f5.csv b/tests/data/thermostat_da25834c-3c93-4dda-902e-58e986f5e8f5.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,29.791666666666668,,,,,67.0
 2011-01-01 01:00:00,0.0,,,29.791666666666668,,,,,65.5
 2011-01-01 02:00:00,0.0,,,29.791666666666668,,,,,65.5

diff --git a/tests/data/thermostat_e44e30f7-4937-45dd-84f5-b9f78f77ce3a.csv b/tests/data/thermostat_e44e30f7-4937-45dd-84f5-b9f78f77ce3a.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,,,,,,42.5
 2011-01-01 01:00:00,0.0,,,,,,,,40.0
 2011-01-01 02:00:00,0.0,,,,,,,,38.5

diff --git a/tests/data/thermostat_e5a25daa-c774-48cf-b112-057ebedda3c2.csv b/tests/data/thermostat_e5a25daa-c774-48cf-b112-057ebedda3c2.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,32.75,,,0.0,0.0,
 2011-01-01 01:00:00,0.0,,,32.75,,,0.0,40.0,65.5
 2011-01-01 02:00:00,0.0,,,32.75,,,0.0,0.0,65.0

diff --git a/tests/data/thermostat_e787b7a4-d09e-4bb0-b9b1-95032d44199e.csv b/tests/data/thermostat_e787b7a4-d09e-4bb0-b9b1-95032d44199e.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,29.708333333333332,,,,,68.0
 2011-01-01 01:00:00,0.0,,,29.708333333333332,,,,,66.0
 2011-01-01 02:00:00,0.0,,,29.708333333333332,,,,,62.0

diff --git a/tests/data/thermostat_e839fe3c-b4af-43a8-bcd4-209241f1612c.csv b/tests/data/thermostat_e839fe3c-b4af-43a8-bcd4-209241f1612c.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,13.875,,,,,64.0
 2011-01-01 01:00:00,0.0,,,13.875,,,,,64.5
 2011-01-01 02:00:00,0.0,,,13.875,,,,,66.5

diff --git a/tests/data/thermostat_eab16216-83c6-42ec-96f0-ee523c159966.csv b/tests/data/thermostat_eab16216-83c6-42ec-96f0-ee523c159966.csv
@@ -1,4 +1,4 @@
-datetime,cool_runtime_stg1,cool_runtime_stg2,cool_equiv_runtime,heat_runtime_stg1,heat_runtime_stg2,heat_equiv_runtime,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
+datetime,cool_runtime_stg1,cool_runtime_stg2,cool_runtime_equiv,heat_runtime_stg1,heat_runtime_stg2,heat_runtime_equiv,emergency_heat_runtime,auxiliary_heat_runtime,temp_in
 2011-01-01 00:00:00,0.0,,,30.5,,,,,66.5
 2011-01-01 01:00:00,0.0,,,30.5,,,,,63.0
 2011-01-01 02:00:00,0.0,,,30.5,,,,,67.0

diff --git a/tests/data/thermostat_example_certification.csv b/tests/data/thermostat_example_certification.csv
@@ -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,26.64
+test_product,2.0.0,percent_savings_baseline_percentile,tau_cvrmse_savings_p01,national_weighted_mean,lower_bound_95,heating,20.17
 test_product,2.0.0,percent_savings_baseline_percentile,tau_cvrmse_savings_p01,national_weighted_mean,lower_bound_95,cooling,44.36
-test_product,2.0.0,percent_savings_baseline_percentile,tau_cvrmse_savings_p01,national_weighted_mean,q20,heating,22.47
+test_product,2.0.0,percent_savings_baseline_percentile,tau_cvrmse_savings_p01,national_weighted_mean,q20,heating,19.83
 test_product,2.0.0,percent_savings_baseline_percentile,tau_cvrmse_savings_p01,national_weighted_mean,q20,cooling,38.44
-test_product,2.0.0,rhu_30F_to_45F,tau_cvrmse_savings_p01,all,upper_bound_95,heating,0.11
+test_product,2.0.0,rhu_30F_to_45F,tau_cvrmse_savings_p01,all,upper_bound_95,heating,0.09