From c58c2905bda23e1b68274767539fce4ada1ee319 Mon Sep 17 00:00:00 2001 From: "Xuechen (Jerry) Lei" Date: Tue, 19 Nov 2024 14:26:31 -0800 Subject: [PATCH] replace nan with untested --- .../ExteriorLightingControlDaylightOff.py | 4 ++-- ...ightingControlOccupancySensingReduction.py | 4 ++-- ...ngOnlyTerminalBoxCoolingAirflowSetpoint.py | 4 ++-- ...gOnlyTerminalBoxDeadbandAirflowSetpoint.py | 4 ++-- ...ngOnlyTerminalBoxHeatingAirflowSetpoint.py | 4 ++-- constrain/library/G36MinOAwEconomizer.py | 2 +- constrain/library/G36MinOAwoEconomizer.py | 4 ++-- constrain/library/G36OutputChangeRateLimit.py | 4 ++-- ...ReheatTerminalBoxCoolingAirflowSetpoint.py | 4 ++-- ...eheatTerminalBoxDeadbandAirflowSetpoint.py | 4 ++-- ...ReheatTerminalBoxHeatingAirflowSetpoint.py | 6 ++--- ...6ReheatTerminalBoxHeatingCoilLowerBound.py | 2 +- ...G36ReheatTerminalBoxHeatingCoilTracking.py | 4 ++-- .../G36SupplyAirTemperatureSetpoint.py | 2 +- .../G36TerminalBoxCoolingMinimumAirflow.py | 6 ++--- .../G36TerminalBoxVAVDamperTracking.py | 2 +- ...InteriorLightingControlAutomaticFullOff.py | 4 ++-- ...emOccupiedStandbyVentilationZoneControl.py | 2 +- constrain/library/demand_control_vent.py | 4 ++-- .../heat_pump_supplemental_heat_lockout.py | 2 +- .../UserProvidedVerificationItem1.py | 2 +- .../UserProvidedVerificationItem_Beta.py | 2 +- .../api/data/custom_lib_aio/custom_lib_all.py | 4 ++-- tests/test_demand_control_vent.py | 8 +++---- ...terior_lighting_control_daylighting_off.py | 8 +++---- ...ing_control_occupancy_sensing_reduction.py | 4 ++-- ...ngOnlyTerminalBoxCoolingAirflowSetpoint.py | 2 +- ...gOnlyTerminalBoxDeadbandAirflowSetpoint.py | 2 +- ...ngOnlyTerminalBoxHeatingAirflowSetpoint.py | 8 +++---- tests/test_g36_MinOAwEconomizer.py | 4 +++- tests/test_g36_MinOAwoEconomizer.py | 8 +++---- tests/test_g36_OutputChangeRateLimit.py | 4 ++-- ...ReheatTerminalBoxCoolingAirflowSetpoint.py | 2 +- ...eheatTerminalBoxDeadbandAirflowSetpoint.py | 14 ++++++++++- ...ReheatTerminalBoxHeatingAirflowSetpoint.py | 6 ++--- ..._ReheatTerminalBoxHeatingCoilLowerBound.py | 2 +- ...36_ReheatTerminalBoxHeatingCoilTracking.py | 24 +++++++++++++++++-- .../test_g36_SupplyAirTemperatureSetpoint.py | 2 +- .../test_g36_TerminalBoxVAVDamperTracking.py | 8 +++++-- ...36_Terminal_Box_Cooling_Minimum_Airflow.py | 2 +- ...ior_lighting_control_automatic_full_off.py | 4 ++-- ...cupied_standby_ventilation_zone_control.py | 4 ++-- 42 files changed, 117 insertions(+), 79 deletions(-) diff --git a/constrain/library/ExteriorLightingControlDaylightOff.py b/constrain/library/ExteriorLightingControlDaylightOff.py index 596b4aaa..d2673cd0 100644 --- a/constrain/library/ExteriorLightingControlDaylightOff.py +++ b/constrain/library/ExteriorLightingControlDaylightOff.py @@ -1,5 +1,5 @@ """ -ASHRAE 90.1-2022 +ASHRAE 90.1-2022 ### Description Section 9.4.1.4.b Daylight OFF control @@ -69,7 +69,7 @@ def daylight_off(self, data): else: return False else: - return np.nan + return "Untested" def verify(self): self.result = self.df.apply(lambda d: self.daylight_off(d), axis=1) diff --git a/constrain/library/ExteriorLightingControlOccupancySensingReduction.py b/constrain/library/ExteriorLightingControlOccupancySensingReduction.py index 3a0f4d84..a3e5eb07 100644 --- a/constrain/library/ExteriorLightingControlOccupancySensingReduction.py +++ b/constrain/library/ExteriorLightingControlOccupancySensingReduction.py @@ -1,5 +1,5 @@ """ -ASHRAE 90.1-2022 +ASHRAE 90.1-2022 ### Description Section 9.4.1.4.e Occupancy-sensing light reduction control @@ -59,7 +59,7 @@ def occupancy_sensing_reduction(self, data): else: check = False else: - check = np.nan # untested + check = "Untested" if data["o"] >= data["tol_o"]: self.last_reported_occupancy = data.name diff --git a/constrain/library/G36CoolingOnlyTerminalBoxCoolingAirflowSetpoint.py b/constrain/library/G36CoolingOnlyTerminalBoxCoolingAirflowSetpoint.py index b3845cfa..2556172c 100644 --- a/constrain/library/G36CoolingOnlyTerminalBoxCoolingAirflowSetpoint.py +++ b/constrain/library/G36CoolingOnlyTerminalBoxCoolingAirflowSetpoint.py @@ -50,7 +50,7 @@ class G36CoolingOnlyTerminalBoxCoolingAirflowSetpoint(RuleCheckBase): def setpoint_in_range(self, operation_mode, zone_state, v_cool_max, v_min, v_spt): if zone_state.lower().strip() != "cooling": - return np.nan + return "Untested" match operation_mode.strip().lower(): case "occupied": cooling_maximum = v_cool_max @@ -63,7 +63,7 @@ def setpoint_in_range(self, operation_mode, zone_state, v_cool_max, v_min, v_spt cooling_minimum = 0 case _: print("invalid operation mode value") - return np.nan + return "Untested" if cooling_minimum <= v_spt <= cooling_maximum: return True diff --git a/constrain/library/G36CoolingOnlyTerminalBoxDeadbandAirflowSetpoint.py b/constrain/library/G36CoolingOnlyTerminalBoxDeadbandAirflowSetpoint.py index 9b3f4a64..158dbd3a 100644 --- a/constrain/library/G36CoolingOnlyTerminalBoxDeadbandAirflowSetpoint.py +++ b/constrain/library/G36CoolingOnlyTerminalBoxDeadbandAirflowSetpoint.py @@ -45,7 +45,7 @@ class G36CoolingOnlyTerminalBoxDeadbandAirflowSetpoint(RuleCheckBase): def setpoint_at_minimum(self, operation_mode, zone_state, v_min, v_spt, v_spt_tol): if zone_state.lower().strip() != "deadband": - return np.nan + return "Untested" match operation_mode.strip().lower(): case "occupied": dbmin = v_min @@ -53,7 +53,7 @@ def setpoint_at_minimum(self, operation_mode, zone_state, v_min, v_spt, v_spt_to dbmin = 0 case _: print("invalid operation mode value") - return np.nan + return "Untested" if abs(v_spt - dbmin) <= v_spt_tol: return True diff --git a/constrain/library/G36CoolingOnlyTerminalBoxHeatingAirflowSetpoint.py b/constrain/library/G36CoolingOnlyTerminalBoxHeatingAirflowSetpoint.py index 8b0872b9..c28698fb 100644 --- a/constrain/library/G36CoolingOnlyTerminalBoxHeatingAirflowSetpoint.py +++ b/constrain/library/G36CoolingOnlyTerminalBoxHeatingAirflowSetpoint.py @@ -60,7 +60,7 @@ def setpoint_in_range( self, operation_mode, zone_state, v_cool_max, v_heat_max, v_min, v_spt ): if zone_state.lower().strip() != "heating": - return np.nan + return "Untested" match operation_mode.strip().lower(): case "occupied": heating_max = v_heat_max @@ -73,7 +73,7 @@ def setpoint_in_range( heating_min = 0 case _: print("invalid operation mode value") - return np.nan + return "Untested" if heating_min <= v_spt <= heating_max: return True diff --git a/constrain/library/G36MinOAwEconomizer.py b/constrain/library/G36MinOAwEconomizer.py index e0082e69..a94e91f8 100644 --- a/constrain/library/G36MinOAwEconomizer.py +++ b/constrain/library/G36MinOAwEconomizer.py @@ -78,7 +78,7 @@ def ts_verify_logic(self, t): else: return False else: - return np.nan + return "Untested" def verify(self): self.result = self.df.apply(lambda t: self.ts_verify_logic(t), axis=1) diff --git a/constrain/library/G36MinOAwoEconomizer.py b/constrain/library/G36MinOAwoEconomizer.py index a208f4a7..fdaa5395 100644 --- a/constrain/library/G36MinOAwoEconomizer.py +++ b/constrain/library/G36MinOAwoEconomizer.py @@ -87,9 +87,9 @@ def ts_verify_logic(self, t): else: return False else: - return np.nan + return "Untested" else: - return np.nan + return "Untested" def add_timers(self): low_timer_list = [] diff --git a/constrain/library/G36OutputChangeRateLimit.py b/constrain/library/G36OutputChangeRateLimit.py index 206d7115..58514752 100644 --- a/constrain/library/G36OutputChangeRateLimit.py +++ b/constrain/library/G36OutputChangeRateLimit.py @@ -36,7 +36,7 @@ class G36OutputChangeRateLimit(RuleCheckBase): def change_rate_check(self, cur, prev, cur_time, prev_time): if prev is None: - return np.nan + return "Untested" time_delta = cur_time - prev_time min_change = time_delta.total_seconds() / 60 allowable_change = min_change * cur["max_rate_of_change_per_min"] @@ -53,7 +53,7 @@ def verify(self): first_flag = True for cur_time, cur in self.df.iterrows(): if first_flag: - self.result.loc[cur_time] = np.nan + self.result.loc[cur_time] = "Untested" first_flag = False else: self.result.loc[cur_time] = self.change_rate_check( diff --git a/constrain/library/G36ReheatTerminalBoxCoolingAirflowSetpoint.py b/constrain/library/G36ReheatTerminalBoxCoolingAirflowSetpoint.py index ef0b0576..936e8b14 100644 --- a/constrain/library/G36ReheatTerminalBoxCoolingAirflowSetpoint.py +++ b/constrain/library/G36ReheatTerminalBoxCoolingAirflowSetpoint.py @@ -74,7 +74,7 @@ def setpoint_in_range( dat_min_spt, ): if zone_state.lower().strip() != "cooling": - return np.nan + return "Untested" if dat > dat_min_spt and heating_coil_command > heating_coil_command_tol: return False match operation_mode.strip().lower(): @@ -89,7 +89,7 @@ def setpoint_in_range( cooling_minimum = 0 case _: print("invalid operation mode value") - return np.nan + return "Untested" if cooling_minimum <= v_spt <= cooling_maximum: return True diff --git a/constrain/library/G36ReheatTerminalBoxDeadbandAirflowSetpoint.py b/constrain/library/G36ReheatTerminalBoxDeadbandAirflowSetpoint.py index b49db145..82ec96bb 100644 --- a/constrain/library/G36ReheatTerminalBoxDeadbandAirflowSetpoint.py +++ b/constrain/library/G36ReheatTerminalBoxDeadbandAirflowSetpoint.py @@ -68,7 +68,7 @@ def setpoint_at_minimum( dat_min_spt, ): if zone_state.lower().strip() != "deadband": - return np.nan + return "Untested" if dat > dat_min_spt and heating_coil_command > heating_coil_command_tol: return False match operation_mode.strip().lower(): @@ -78,7 +78,7 @@ def setpoint_at_minimum( dbmin = 0 case _: print("invalid operation mode value") - return np.nan + return "Untested" if abs(v_spt - dbmin) <= v_spt_tol: return True diff --git a/constrain/library/G36ReheatTerminalBoxHeatingAirflowSetpoint.py b/constrain/library/G36ReheatTerminalBoxHeatingAirflowSetpoint.py index 25cca064..33c707d0 100644 --- a/constrain/library/G36ReheatTerminalBoxHeatingAirflowSetpoint.py +++ b/constrain/library/G36ReheatTerminalBoxHeatingAirflowSetpoint.py @@ -98,7 +98,7 @@ def setpoint_in_range( dat_spt, ): if zone_state.lower().strip() != "heating": - return np.nan + return "Untested" match operation_mode.strip().lower(): case "occupied": @@ -115,7 +115,7 @@ def setpoint_in_range( heating_min = v_cool_max case _: print("invalid operation mode value") - return np.nan + return "Untested" if 0 < heating_loop_output <= 50: if ( @@ -130,7 +130,7 @@ def setpoint_in_range( if dat > room_temp + 3 and heating_min <= v_spt <= heating_max: return True else: - return np.nan + return "Untested" def verify(self): self.result = self.df.apply( diff --git a/constrain/library/G36ReheatTerminalBoxHeatingCoilLowerBound.py b/constrain/library/G36ReheatTerminalBoxHeatingCoilLowerBound.py index bd53c903..d0cc8a0c 100644 --- a/constrain/library/G36ReheatTerminalBoxHeatingCoilLowerBound.py +++ b/constrain/library/G36ReheatTerminalBoxHeatingCoilLowerBound.py @@ -41,7 +41,7 @@ class G36ReheatTerminalBoxHeatingCoilLowerBound(RuleCheckBase): def heating_coil_working(self, operation_mode, heating_coil_command, dat): if operation_mode.lower().strip() != "occupied": - return np.nan + return "Untested" if dat >= 10: return True else: diff --git a/constrain/library/G36ReheatTerminalBoxHeatingCoilTracking.py b/constrain/library/G36ReheatTerminalBoxHeatingCoilTracking.py index 8e50b862..608ad7b5 100644 --- a/constrain/library/G36ReheatTerminalBoxHeatingCoilTracking.py +++ b/constrain/library/G36ReheatTerminalBoxHeatingCoilTracking.py @@ -62,7 +62,7 @@ def verify(self): self.result = pd.Series(index=self.df.index) for cur_time, cur in self.df.iterrows(): if cur["operation_mode"].strip().lower() != "heating": - result_flag = np.nan + result_flag = "Untested" err_start_time = None err_time = 0 else: @@ -80,7 +80,7 @@ def verify(self): if err_time == 0: result_flag = True elif err_time <= 1: - result_flag = np.nan + result_flag = "Untested" elif err_time > 1: if ( cur["dat"] - cur["dat_spt"] >= cur["dat_tracking_tol"] diff --git a/constrain/library/G36SupplyAirTemperatureSetpoint.py b/constrain/library/G36SupplyAirTemperatureSetpoint.py index 1d58352b..cac21100 100644 --- a/constrain/library/G36SupplyAirTemperatureSetpoint.py +++ b/constrain/library/G36SupplyAirTemperatureSetpoint.py @@ -71,7 +71,7 @@ def supply_air_temperature_setpoint(self, data): data["t_max"] - data["min_clg_sa_t_sp"] ) / (data["oa_t_min"] - data["oa_t_max"]) + data["t_max"] if sa_t_sp == -999: - return np.nan + return "Untested" if abs(sa_t_sp - data["sa_t_sp_ac"]) < data["sa_sp_tol"]: return True else: diff --git a/constrain/library/G36TerminalBoxCoolingMinimumAirflow.py b/constrain/library/G36TerminalBoxCoolingMinimumAirflow.py index 1e5a5ad2..f34cc979 100644 --- a/constrain/library/G36TerminalBoxCoolingMinimumAirflow.py +++ b/constrain/library/G36TerminalBoxCoolingMinimumAirflow.py @@ -61,9 +61,9 @@ def setpoint_at_minimum_when_dat_high( room_temp, ): if zone_state.lower().strip() != "cooling": - return np.nan + return "Untested" if ahu_sat_spt <= room_temp: - return np.nan + return "Untested" match operation_mode.strip().lower(): case "occupied": airflowmin = v_min @@ -71,7 +71,7 @@ def setpoint_at_minimum_when_dat_high( airflowmin = 0 case _: print("invalid operation mode value") - return np.nan + return "Untested" if v_spt - v_spt_tol > airflowmin: return False diff --git a/constrain/library/G36TerminalBoxVAVDamperTracking.py b/constrain/library/G36TerminalBoxVAVDamperTracking.py index e9dd67bc..45b964b1 100644 --- a/constrain/library/G36TerminalBoxVAVDamperTracking.py +++ b/constrain/library/G36TerminalBoxVAVDamperTracking.py @@ -67,7 +67,7 @@ def verify(self): if err_time == 0: result_flag = True elif err_time <= 1: - result_flag = np.nan + result_flag = "Untested" elif err_time > 1: if ( cur["v"] - cur["v_spt"] >= cur["v_tracking_tol"] diff --git a/constrain/library/InteriorLightingControlAutomaticFullOff.py b/constrain/library/InteriorLightingControlAutomaticFullOff.py index 3ac1e8c3..605c4965 100644 --- a/constrain/library/InteriorLightingControlAutomaticFullOff.py +++ b/constrain/library/InteriorLightingControlAutomaticFullOff.py @@ -1,5 +1,5 @@ """ -ASHRAE 90.1-2022 +ASHRAE 90.1-2022 ### Description Section 9.4.1.1.h Automatic full OFF control @@ -73,7 +73,7 @@ def daylight_off(self, data): else: check = False else: - check = np.nan + check = "Untested" # update last identified occupancy flag if applicable if data["o"] >= data["tol_o"]: diff --git a/constrain/library/MZSystemOccupiedStandbyVentilationZoneControl.py b/constrain/library/MZSystemOccupiedStandbyVentilationZoneControl.py index df35213e..38c5b436 100644 --- a/constrain/library/MZSystemOccupiedStandbyVentilationZoneControl.py +++ b/constrain/library/MZSystemOccupiedStandbyVentilationZoneControl.py @@ -61,7 +61,7 @@ def occupied_standby_ventilation_zontrol_control(self, data): return False else: self.last_non_standby_mode_requested_m_oa = data["m_oa_requested_by_system"] - return np.nan + return "Untested" def verify(self): self.result = self.df.apply( diff --git a/constrain/library/demand_control_vent.py b/constrain/library/demand_control_vent.py index d7b58e42..2dd624e3 100644 --- a/constrain/library/demand_control_vent.py +++ b/constrain/library/demand_control_vent.py @@ -20,14 +20,14 @@ def verify(self): ] # filter out data when economizer isn't enabled if len(df_filtered) == 0: - self.bool_result = np.nan + self.bool_result = "Untested" self.msg = ( "There is no samples with economizer off and AHU on, result: untested" ) else: corr, p_value = pearsonr(df_filtered["no_of_occ"], df_filtered["v_oa"]) if p_value > 0.05: - self.bool_result = np.nan + self.bool_result = "Untested" self.msg = "correlation p value too large, result: untested" else: if corr >= 0.3: diff --git a/constrain/library/heat_pump_supplemental_heat_lockout.py b/constrain/library/heat_pump_supplemental_heat_lockout.py index e15ddf97..91975b9e 100644 --- a/constrain/library/heat_pump_supplemental_heat_lockout.py +++ b/constrain/library/heat_pump_supplemental_heat_lockout.py @@ -20,6 +20,6 @@ def heating_coil_verification(self, data): def verify(self): self.df["C_op"] = self.df["C_ref"] * self.df["C_t_mod"] * self.df["C_ff_mod"] - self.df["result"] = np.nan + self.df["result"] = "Untested" self.df = self.df.apply(lambda r: self.heating_coil_verification(r), axis=1) self.result = self.df["result"] diff --git a/tests/api/data/custom_lib/UserProvidedVerificationItem1.py b/tests/api/data/custom_lib/UserProvidedVerificationItem1.py index 280c72ec..174f113b 100644 --- a/tests/api/data/custom_lib/UserProvidedVerificationItem1.py +++ b/tests/api/data/custom_lib/UserProvidedVerificationItem1.py @@ -13,7 +13,7 @@ def automatic_oa_damper_check(self, data): else: return True else: - return np.nan + return "Untested" def verify(self): self.result = self.df.apply(lambda d: self.automatic_oa_damper_check(d), axis=1) diff --git a/tests/api/data/custom_lib/UserProvidedVerificationItem_Beta.py b/tests/api/data/custom_lib/UserProvidedVerificationItem_Beta.py index 6a222b72..195498c6 100644 --- a/tests/api/data/custom_lib/UserProvidedVerificationItem_Beta.py +++ b/tests/api/data/custom_lib/UserProvidedVerificationItem_Beta.py @@ -13,7 +13,7 @@ def automatic_oa_damper_check(self, data): else: return True else: - return np.nan + return "Untested" def verify(self): self.result = self.df.apply(lambda d: self.automatic_oa_damper_check(d), axis=1) diff --git a/tests/api/data/custom_lib_aio/custom_lib_all.py b/tests/api/data/custom_lib_aio/custom_lib_all.py index 83299256..7f939dc9 100644 --- a/tests/api/data/custom_lib_aio/custom_lib_all.py +++ b/tests/api/data/custom_lib_aio/custom_lib_all.py @@ -356,7 +356,7 @@ def automatic_oa_damper_check(self, data): else: return True else: - return np.nan + return "Untested" def verify(self): self.result = self.df.apply(lambda d: self.automatic_oa_damper_check(d), axis=1) @@ -374,7 +374,7 @@ def automatic_oa_damper_check(self, data): else: return True else: - return np.nan + return "Untested" def verify(self): self.result = self.df.apply(lambda d: self.automatic_oa_damper_check(d), axis=1) diff --git a/tests/test_demand_control_vent.py b/tests/test_demand_control_vent.py index 6be8557e..1bc7540b 100644 --- a/tests/test_demand_control_vent.py +++ b/tests/test_demand_control_vent.py @@ -55,7 +55,7 @@ def test_dcv_no_eco_good_time(self): "DemandControlVentilation", df ) self.assertTrue( - verification_obj.check_bool() is np.nan, + verification_obj.check_bool() == "Untested", verification_obj.check_detail()["Message"], ) @@ -81,7 +81,7 @@ def test_dcv_no_ahu_good_time(self): "DemandControlVentilation", df ) self.assertTrue( - verification_obj.check_bool() is np.nan, + verification_obj.check_bool() == "Untested", verification_obj.check_detail()["Message"], ) @@ -107,7 +107,7 @@ def test_dcv_no_good_time(self): "DemandControlVentilation", df ) self.assertTrue( - verification_obj.check_bool() is np.nan, + verification_obj.check_bool() == "Untested", verification_obj.check_detail()["Message"], ) @@ -133,7 +133,7 @@ def test_dcv_high_p(self): "DemandControlVentilation", df ) self.assertTrue( - verification_obj.check_bool() is np.nan, + verification_obj.check_bool() == "Untested", verification_obj.check_detail()["Message"], ) diff --git a/tests/test_exterior_lighting_control_daylighting_off.py b/tests/test_exterior_lighting_control_daylighting_off.py index 1c07ccb8..475f5e6a 100644 --- a/tests/test_exterior_lighting_control_daylighting_off.py +++ b/tests/test_exterior_lighting_control_daylighting_off.py @@ -27,7 +27,7 @@ def test_exterior_lighting_control_occupancy_sensing_reduction_fail(self): [True, 0.1, 1, 1], ] df = pd.DataFrame(data, columns=points, index=timestamp) - expected_results = pd.Series([np.nan, np.nan, False]) + expected_results = pd.Series(["Untested", "Untested", False]) verification_obj = run_test_verification_with_data( "ExteriorLightingControlDaylightOff", df ) @@ -54,7 +54,7 @@ def test_exterior_lighting_control_occupancy_sensing_reduction_pass(self): [True, 0.1, 1, 0], ] df = pd.DataFrame(data, columns=points, index=timestamp) - expected_results = pd.Series([np.nan, np.nan, True]) + expected_results = pd.Series(["Untested", "Untested", True]) verification_obj = run_test_verification_with_data( "ExteriorLightingControlDaylightOff", df ) @@ -81,7 +81,7 @@ def test_exterior_lighting_control_occupancy_sensing_reduction_fail_daylight(sel [False, 1, 1, 0.1], ] df = pd.DataFrame(data, columns=points, index=timestamp) - expected_results = pd.Series([np.nan, np.nan, False]) + expected_results = pd.Series(["Untested", "Untested", False]) verification_obj = run_test_verification_with_data( "ExteriorLightingControlDaylightOff", df ) @@ -108,7 +108,7 @@ def test_exterior_lighting_control_occupancy_sensing_reduction_pass_daylight(sel [False, 1, 1, 0], ] df = pd.DataFrame(data, columns=points, index=timestamp) - expected_results = pd.Series([np.nan, np.nan, True]) + expected_results = pd.Series(["Untested", "Untested", True]) verification_obj = run_test_verification_with_data( "ExteriorLightingControlDaylightOff", df ) diff --git a/tests/test_exterior_lighting_control_occupancy_sensing_reduction.py b/tests/test_exterior_lighting_control_occupancy_sensing_reduction.py index 0c4128c7..c5bb31e8 100644 --- a/tests/test_exterior_lighting_control_occupancy_sensing_reduction.py +++ b/tests/test_exterior_lighting_control_occupancy_sensing_reduction.py @@ -49,7 +49,7 @@ def test_exterior_lighting_control_occupancy_sensing_reduction_pass(self): [0.05, 300, 0.1], ] df = pd.DataFrame(data, columns=points, index=timestamp) - expected_results = pd.Series([np.nan, np.nan, True]) + expected_results = pd.Series(["Untested", "Untested", True]) verification_obj = run_test_verification_with_data( "ExteriorLightingControlOccupancySensingReduction", df ) @@ -75,7 +75,7 @@ def test_exterior_lighting_control_occupancy_sensing_reduction_fail(self): [0.05, 701, 0.1], ] df = pd.DataFrame(data, columns=points, index=timestamp) - expected_results = pd.Series([np.nan, np.nan, False]) + expected_results = pd.Series(["Untested", "Untested", False]) verification_obj = run_test_verification_with_data( "ExteriorLightingControlOccupancySensingReduction", df ) diff --git a/tests/test_g36_CoolingOnlyTerminalBoxCoolingAirflowSetpoint.py b/tests/test_g36_CoolingOnlyTerminalBoxCoolingAirflowSetpoint.py index 0de6fe9b..f803a0c5 100644 --- a/tests/test_g36_CoolingOnlyTerminalBoxCoolingAirflowSetpoint.py +++ b/tests/test_g36_CoolingOnlyTerminalBoxCoolingAirflowSetpoint.py @@ -24,7 +24,7 @@ def test_g36_cooling_only_terminal_box_cooling_airflow_setpoint(self): ] expected_results = pd.Series( - [np.nan, True, False, False, True, True, False, True] + ["Untested", True, False, False, True, True, False, True] ) df = pd.DataFrame(data, columns=points) diff --git a/tests/test_g36_CoolingOnlyTerminalBoxDeadbandAirflowSetpoint.py b/tests/test_g36_CoolingOnlyTerminalBoxDeadbandAirflowSetpoint.py index 5267a961..bc4fed40 100644 --- a/tests/test_g36_CoolingOnlyTerminalBoxDeadbandAirflowSetpoint.py +++ b/tests/test_g36_CoolingOnlyTerminalBoxDeadbandAirflowSetpoint.py @@ -25,7 +25,7 @@ def test_g36_cooling_only_terminal_box_deadband_airflow_setpoint(self): ] expected_results = pd.Series( - [np.nan, np.nan, False, True, True, False, True, False, True] + ["Untested", "Untested", False, True, True, False, True, False, True] ) df = pd.DataFrame(data, columns=points) diff --git a/tests/test_g36_CoolingOnlyTerminalBoxHeatingAirflowSetpoint.py b/tests/test_g36_CoolingOnlyTerminalBoxHeatingAirflowSetpoint.py index df8ea14d..5b3c5aad 100644 --- a/tests/test_g36_CoolingOnlyTerminalBoxHeatingAirflowSetpoint.py +++ b/tests/test_g36_CoolingOnlyTerminalBoxHeatingAirflowSetpoint.py @@ -35,17 +35,17 @@ def test_cooling_only_terminal_box_heating_airflow_setpoint(self): expected_results = pd.Series( [ - np.nan, - np.nan, + "Untested", + "Untested", True, False, False, - np.nan, + "Untested", False, True, True, True, - np.nan, + "Untested", ] ) diff --git a/tests/test_g36_MinOAwEconomizer.py b/tests/test_g36_MinOAwEconomizer.py index 108f6b5c..2117e70c 100644 --- a/tests/test_g36_MinOAwEconomizer.py +++ b/tests/test_g36_MinOAwEconomizer.py @@ -37,7 +37,9 @@ def test_minoa_economizer_pass_untest_fail(self): list(run_test_verification_with_data("G36MinOAwEconomizer", df).result) ) - expected_results = pd.Series([True, np.nan, np.nan, False, False, False]) + expected_results = pd.Series( + [True, "Untested", "Untested", False, False, False] + ) self.assertTrue(results.equals(expected_results)) diff --git a/tests/test_g36_MinOAwoEconomizer.py b/tests/test_g36_MinOAwoEconomizer.py index f25a3eb1..6feb7bf9 100644 --- a/tests/test_g36_MinOAwoEconomizer.py +++ b/tests/test_g36_MinOAwoEconomizer.py @@ -37,7 +37,7 @@ def test_minoa_wo_economizer_pass_untested_low(self): [20, 24, 100, 0, 1600, 2000, "occupied"], ] - expected_results = pd.Series([np.nan, np.nan, True, True, np.nan]) + expected_results = pd.Series(["Untested", "Untested", True, True, "Untested"]) df = pd.DataFrame(data, columns=points, index=timestamp) @@ -73,7 +73,7 @@ def test_minoa_wo_economizer_fail_untested_low(self): [20, 24, 0, 20, 1600, 2000, "occupied"], ] - expected_results = pd.Series([np.nan, np.nan, False, False, np.nan]) + expected_results = pd.Series(["Untested", "Untested", False, False, "Untested"]) df = pd.DataFrame(data, columns=points, index=timestamp) @@ -109,7 +109,7 @@ def test_minoa_wo_economizer_pass_untested_high(self): [20, 24, 100, 0, 2600, 2000, "occupied"], ] - expected_results = pd.Series([np.nan, np.nan, True, True, np.nan]) + expected_results = pd.Series(["Untested", "Untested", True, True, "Untested"]) df = pd.DataFrame(data, columns=points, index=timestamp) @@ -145,7 +145,7 @@ def test_minoa_wo_economizer_fail_untested_high(self): [20, 24, 0, 20, 2600, 2000, "occupied"], ] - expected_results = pd.Series([np.nan, np.nan, True, False, np.nan]) + expected_results = pd.Series(["Untested", "Untested", True, False, "Untested"]) df = pd.DataFrame(data, columns=points, index=timestamp) diff --git a/tests/test_g36_OutputChangeRateLimit.py b/tests/test_g36_OutputChangeRateLimit.py index 415c2a87..d5d10775 100644 --- a/tests/test_g36_OutputChangeRateLimit.py +++ b/tests/test_g36_OutputChangeRateLimit.py @@ -29,7 +29,7 @@ def test_output_change_rate_pass(self): list(run_test_verification_with_data("G36OutputChangeRateLimit", df).result) ) - expected_results = pd.Series([np.nan, True, True, True, True, True]) + expected_results = pd.Series(["Untested", True, True, True, True, True]) self.assertTrue(results.equals(expected_results)) @@ -51,7 +51,7 @@ def test_output_change_rate_fail(self): list(run_test_verification_with_data("G36OutputChangeRateLimit", df).result) ) - expected_results = pd.Series([np.nan, True, True, True, True, False]) + expected_results = pd.Series(["Untested", True, True, True, True, False]) self.assertTrue(results.equals(expected_results)) diff --git a/tests/test_g36_ReheatTerminalBoxCoolingAirflowSetpoint.py b/tests/test_g36_ReheatTerminalBoxCoolingAirflowSetpoint.py index 70fd694b..ae378a80 100644 --- a/tests/test_g36_ReheatTerminalBoxCoolingAirflowSetpoint.py +++ b/tests/test_g36_ReheatTerminalBoxCoolingAirflowSetpoint.py @@ -36,7 +36,7 @@ def test_g36_reheat_terminal_box_cooling_airflow_setpoint(self): ] expected_results = pd.Series( - [np.nan, True, False, False, True, True, False, True, True, False] + ["Untested", True, False, False, True, True, False, True, True, False] ) df = pd.DataFrame(data, columns=points) diff --git a/tests/test_g36_ReheatTerminalBoxDeadbandAirflowSetpoint.py b/tests/test_g36_ReheatTerminalBoxDeadbandAirflowSetpoint.py index 7b18f306..64e50504 100644 --- a/tests/test_g36_ReheatTerminalBoxDeadbandAirflowSetpoint.py +++ b/tests/test_g36_ReheatTerminalBoxDeadbandAirflowSetpoint.py @@ -37,7 +37,19 @@ def test_g36_cooling_only_terminal_box_deadband_airflow_setpoint(self): ] expected_results = pd.Series( - [np.nan, np.nan, False, True, True, False, True, False, True, True, False] + [ + "Untested", + "Untested", + False, + True, + True, + False, + True, + False, + True, + True, + False, + ] ) df = pd.DataFrame(data, columns=points) diff --git a/tests/test_g36_ReheatTerminalBoxHeatingAirflowSetpoint.py b/tests/test_g36_ReheatTerminalBoxHeatingAirflowSetpoint.py index b8ff8007..1d33f119 100644 --- a/tests/test_g36_ReheatTerminalBoxHeatingAirflowSetpoint.py +++ b/tests/test_g36_ReheatTerminalBoxHeatingAirflowSetpoint.py @@ -42,12 +42,12 @@ def test_cooling_only_terminal_box_heating_airflow_setpoint(self): expected_results = pd.Series( [ - np.nan, - np.nan, + "Untested", + "Untested", False, False, False, - np.nan, + "Untested", False, True, False, diff --git a/tests/test_g36_ReheatTerminalBoxHeatingCoilLowerBound.py b/tests/test_g36_ReheatTerminalBoxHeatingCoilLowerBound.py index 63eb7b8c..56562105 100644 --- a/tests/test_g36_ReheatTerminalBoxHeatingCoilLowerBound.py +++ b/tests/test_g36_ReheatTerminalBoxHeatingCoilLowerBound.py @@ -28,7 +28,7 @@ def test_g36_reheat_terminal_box_heating_coil_lower_bound(self): ] expected_results = pd.Series( - [True, True, False, True, np.nan, np.nan, np.nan, np.nan] + [True, True, False, True, "Untested", "Untested", "Untested", "Untested"] ) df = pd.DataFrame(data, columns=points) diff --git a/tests/test_g36_ReheatTerminalBoxHeatingCoilTracking.py b/tests/test_g36_ReheatTerminalBoxHeatingCoilTracking.py index 0ca1b4c5..dc53c0ed 100644 --- a/tests/test_g36_ReheatTerminalBoxHeatingCoilTracking.py +++ b/tests/test_g36_ReheatTerminalBoxHeatingCoilTracking.py @@ -46,7 +46,17 @@ def test_g36_reheat_terminal_box_heating_coil_tracking0(self): ] expected_results = pd.Series( - [True, True, True, np.nan, np.nan, False, True, np.nan, np.nan] + [ + True, + True, + True, + "Untested", + "Untested", + False, + True, + "Untested", + "Untested", + ] ) df = pd.DataFrame(data, columns=points, index=timestamp) @@ -96,7 +106,17 @@ def test_g36_reheat_terminal_box_heating_coil_tracking1(self): ] expected_results = pd.Series( - [True, True, np.nan, np.nan, False, False, True, np.nan, np.nan] + [ + True, + True, + "Untested", + "Untested", + False, + False, + True, + "Untested", + "Untested", + ] ) df = pd.DataFrame(data, columns=points, index=timestamp) diff --git a/tests/test_g36_SupplyAirTemperatureSetpoint.py b/tests/test_g36_SupplyAirTemperatureSetpoint.py index f67309ac..42e0c8c6 100644 --- a/tests/test_g36_SupplyAirTemperatureSetpoint.py +++ b/tests/test_g36_SupplyAirTemperatureSetpoint.py @@ -69,7 +69,7 @@ def test_heating_cooling(self): False, True, False, - np.nan, + "Untested", ] ) self.assertTrue(results.equals(expected_results)) diff --git a/tests/test_g36_TerminalBoxVAVDamperTracking.py b/tests/test_g36_TerminalBoxVAVDamperTracking.py index 532eb494..5f16c1cc 100644 --- a/tests/test_g36_TerminalBoxVAVDamperTracking.py +++ b/tests/test_g36_TerminalBoxVAVDamperTracking.py @@ -34,7 +34,9 @@ def test_g36_terminal_box_vav_damper_tracking0(self): [99.5, 1000, 1100, 50], ] - expected_results = pd.Series([True, True, True, np.nan, np.nan, False, True]) + expected_results = pd.Series( + [True, True, True, "Untested", "Untested", False, True] + ) df = pd.DataFrame(data, columns=points, index=timestamp) @@ -72,7 +74,9 @@ def test_g36_terminal_box_vav_damper_tracking1(self): [0, 1300, 1100, 50], ] - expected_results = pd.Series([True, True, np.nan, np.nan, np.nan, False, True]) + expected_results = pd.Series( + [True, True, "Untested", "Untested", "Untested", False, True] + ) df = pd.DataFrame(data, columns=points, index=timestamp) diff --git a/tests/test_g36_Terminal_Box_Cooling_Minimum_Airflow.py b/tests/test_g36_Terminal_Box_Cooling_Minimum_Airflow.py index 71eae74d..97636fbf 100644 --- a/tests/test_g36_Terminal_Box_Cooling_Minimum_Airflow.py +++ b/tests/test_g36_Terminal_Box_Cooling_Minimum_Airflow.py @@ -33,7 +33,7 @@ def test_g36_terminal_box_cooling_minimum_airflow(self): ] expected_results = pd.Series( - [np.nan, np.nan, False, True, True, False, True, False, True] + ["Untested", "Untested", False, True, True, False, True, False, True] ) df = pd.DataFrame(data, columns=points) diff --git a/tests/test_interior_lighting_control_automatic_full_off.py b/tests/test_interior_lighting_control_automatic_full_off.py index 43e6f5b4..d3ceac52 100644 --- a/tests/test_interior_lighting_control_automatic_full_off.py +++ b/tests/test_interior_lighting_control_automatic_full_off.py @@ -50,7 +50,7 @@ def test_interior_lighting_control_automatic_full_off_fail(self): [0.05, 50, 500, 0.1], ] df = pd.DataFrame(data, columns=points, index=timestamp) - expected_results = pd.Series([np.nan, np.nan, False]) + expected_results = pd.Series(["Untested", "Untested", False]) verification_obj = run_test_verification_with_data( "InteriorLightingControlAutomaticFullOff", df ) @@ -77,7 +77,7 @@ def test_interior_lighting_control_automatic_full_off_pass(self): [0.05, 9, 500, 0.1], ] df = pd.DataFrame(data, columns=points, index=timestamp) - expected_results = pd.Series([np.nan, np.nan, True]) + expected_results = pd.Series(["Untested", "Untested", True]) verification_obj = run_test_verification_with_data( "InteriorLightingControlAutomaticFullOff", df ) diff --git a/tests/test_mz_system_occupied_standby_ventilation_zone_control.py b/tests/test_mz_system_occupied_standby_ventilation_zone_control.py index 6191a186..05f97b32 100644 --- a/tests/test_mz_system_occupied_standby_ventilation_zone_control.py +++ b/tests/test_mz_system_occupied_standby_ventilation_zone_control.py @@ -26,7 +26,7 @@ def test_occupied_standby_ventilation_zontrol_control_fail(self): [True, 0.5, 0.5], ] df = pd.DataFrame(data, columns=points, index=timestamp) - expected_results = pd.Series([np.nan, False, True]) + expected_results = pd.Series(["Untested", False, True]) verification_obj = run_test_verification_with_data( "MZSystemOccupiedStandbyVentilationZoneControl", df ) @@ -52,7 +52,7 @@ def test_occupied_standby_ventilation_zontrol_control_pass(self): [True, 0.5, 0.25], ] df = pd.DataFrame(data, columns=points, index=timestamp) - expected_results = pd.Series([np.nan, True, True]) + expected_results = pd.Series(["Untested", True, True]) verification_obj = run_test_verification_with_data( "MZSystemOccupiedStandbyVentilationZoneControl", df )