open-fdd 0.1.7__py3-none-any.whl → 0.1.9__py3-none-any.whl

open_fdd/chiller_plant/faults/fault_condition_two.py

@@ -0,0 +1,100 @@
+import pandas as pd
+
+from open_fdd.core.base_fault import BaseFaultCondition
+from open_fdd.core.components import FaultInputColumn, InstanceAttribute
+from open_fdd.core.mixins import FaultConditionMixin
+
+INPUT_COLS = [
+    FaultInputColumn(
+        name="flow_col",
+        constant_form="FLOW_COL",
+        description="Flow meter reading",
+        unit="GPM",
+        required=True,
+        type=str,
+    ),
+    FaultInputColumn(
+        name="pump_speed_col",
+        constant_form="PUMP_SPEED_COL",
+        description="Pump speed",
+        unit="%",
+        required=True,
+        type=str,
+    ),
+]
+
+FAULT_PARAMS = [
+    InstanceAttribute(
+        name="flow_error_threshold",
+        constant_form="FLOW_ERROR_THRESHOLD",
+        description="Flow error threshold",
+        unit="GPM",
+        type=float,
+        range=(0.0, 1000.0),
+    ),
+    InstanceAttribute(
+        name="pump_speed_percent_max",
+        constant_form="PUMP_SPEED_PERCENT_MAX",
+        description="Maximum pump speed percentage",
+        unit="%",
+        type=float,
+        range=(0.0, 1.0),
+    ),
+    InstanceAttribute(
+        name="pump_speed_percent_err_thres",
+        constant_form="PUMP_SPEED_PERCENT_ERR_THRES",
+        description="Pump speed error threshold",
+        unit="%",
+        type=float,
+        range=(0.0, 1.0),
+    ),
+]
+
+
+class FaultConditionTwo(BaseFaultCondition, FaultConditionMixin):
+    """
+    Class provides the definitions for Fault Condition 2.
+    Primary chilled water flow is too high with the chilled water pump running at high speed.
+
+    py -3.12 -m pytest open_fdd/tests/chiller/test_chiller_fc2.py -rP -s
+    """
+
+    input_columns = INPUT_COLS
+    fault_params = FAULT_PARAMS
+    equation_string = (
+        "fc2_flag = 1 if (FLOW > εFM) and (PUMPSPD >= PUMPSPD_max - εPUMPSPD) "
+        "for N consecutive values else 0 \n"
+    )
+    description_string = "Fault Condition 2: Primary chilled water flow is too high with the pump running at high speed \n"
+    error_string = "One or more required columns are missing or None \n"
+
+    @FaultConditionMixin._handle_errors
+    def apply(self, df: pd.DataFrame) -> pd.DataFrame:
+        self._apply_common_checks(df)
+
+        # Get column values using accessor methods
+        flow_col = self.get_input_column("flow_col")
+        pump_speed_col = self.get_input_column("pump_speed_col")
+
+        # Get parameter values using accessor methods
+        flow_error_threshold = self.get_param("flow_error_threshold")
+        pump_speed_percent_max = self.get_param("pump_speed_percent_max")
+        pump_speed_percent_err_thres = self.get_param("pump_speed_percent_err_thres")
+
+        # Check analog outputs are floats only
+        columns_to_check = [pump_speed_col]
+        self._apply_analog_checks(df, columns_to_check)
+
+        # Perform checks
+        flow_check = df[flow_col] < flow_error_threshold
+        pump_check = (
+            df[pump_speed_col] >= pump_speed_percent_max - pump_speed_percent_err_thres
+        )
+
+        # Combined condition check
+        combined_check = flow_check & pump_check
+
+        # Set fault flag
+        self._set_fault_flag(df, combined_check, "fc2_flag")
+
+        return df

open_fdd/tests/ahu/test_ahu_fc1.py

@@ -1,9 +1,9 @@
 import pandas as pd
 import pytest
+
 from open_fdd.air_handling_unit.faults import FaultConditionOne
 from open_fdd.air_handling_unit.faults.helper_utils import HelperUtils
-from open_fdd.air_handling_unit.faults.fault_condition import MissingColumnError
-
+from open_fdd.core.exceptions import MissingColumnError
 
 # Constants
 TEST_VFD_ERR_THRESHOLD = 0.05

open_fdd/tests/ahu/test_ahu_fc10.py

@@ -1,5 +1,6 @@
 import pandas as pd
 import pytest
+
 from open_fdd.air_handling_unit.faults import FaultConditionTen
 from open_fdd.air_handling_unit.faults.helper_utils import HelperUtils
 

open_fdd/tests/ahu/test_ahu_fc11.py

@@ -1,9 +1,9 @@
 import pandas as pd
 import pytest
-from open_fdd.air_handling_unit.faults import (
-    FaultConditionEleven,
-)
+
+from open_fdd.air_handling_unit.faults import FaultConditionEleven
 from open_fdd.air_handling_unit.faults.helper_utils import HelperUtils
+from open_fdd.core.exceptions import MissingColumnError
 
 """
 To see print statements in pytest run with:
@@ -13,24 +13,20 @@ OAT Temp too low for 100% cooling in OS3
 """
 
 # Constants
-TEST_DELTA_SUPPLY_FAN = 2.0
-TEST_OAT_DEGF_ERR_THRES = 5.0
-TEST_SUPPLY_DEGF_ERR_THRES = 2.0
-TEST_SAT_SP_COL = "supply_air_sp_temp"
+TEST_OUTDOOR_DEGF_ERR_THRES = 5.0
+TEST_MIX_DEGF_ERR_THRES = 2.0
 TEST_OAT_COL = "out_air_temp"
-TEST_COOLING_COIL_SIG_COL = "cooling_sig_col"
-TEST_MIX_AIR_DAMPER_COL = "economizer_sig_col"
+TEST_MAT_COL = "mix_air_temp"
+TEST_ECONOMIZER_SIG_COL = "economizer_sig_col"
 ROLLING_WINDOW_SIZE = 5
 
 # Initialize FaultConditionEleven with a dictionary
 fault_condition_params = {
-    "DELTA_T_SUPPLY_FAN": TEST_DELTA_SUPPLY_FAN,
-    "OUTDOOR_DEGF_ERR_THRES": TEST_OAT_DEGF_ERR_THRES,
-    "SUPPLY_DEGF_ERR_THRES": TEST_SUPPLY_DEGF_ERR_THRES,
-    "SAT_SETPOINT_COL": TEST_SAT_SP_COL,
+    "OUTDOOR_DEGF_ERR_THRES": TEST_OUTDOOR_DEGF_ERR_THRES,
+    "MIX_DEGF_ERR_THRES": TEST_MIX_DEGF_ERR_THRES,
     "OAT_COL": TEST_OAT_COL,
-    "COOLING_SIG_COL": TEST_COOLING_COIL_SIG_COL,
-    "ECONOMIZER_SIG_COL": TEST_MIX_AIR_DAMPER_COL,
+    "MAT_COL": TEST_MAT_COL,
+    "ECONOMIZER_SIG_COL": TEST_ECONOMIZER_SIG_COL,
     "TROUBLESHOOT_MODE": False,
     "ROLLING_WINDOW_SIZE": ROLLING_WINDOW_SIZE,
 }
@@ -42,19 +38,17 @@ class TestFaultConditionEleven:
 
     def no_fault_df_no_econ(self) -> pd.DataFrame:
         data = {
-            TEST_SAT_SP_COL: [55, 55, 55, 55, 55, 55],
             TEST_OAT_COL: [56, 56, 56, 56, 56, 56],
-            TEST_COOLING_COIL_SIG_COL: [0.11, 0.11, 0.11, 0.11, 0.11, 0.11],
-            TEST_MIX_AIR_DAMPER_COL: [0.99, 0.99, 0.99, 0.99, 0.99, 0.99],
+            TEST_MAT_COL: [56, 56, 56, 56, 56, 56],
+            TEST_ECONOMIZER_SIG_COL: [0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
         }
         return pd.DataFrame(data)
 
     def fault_df_in_econ(self) -> pd.DataFrame:
         data = {
-            TEST_SAT_SP_COL: [55, 55, 55, 55, 55, 55],
             TEST_OAT_COL: [44, 44, 44, 44, 44, 44],
-            TEST_COOLING_COIL_SIG_COL: [0.11, 0.11, 0.11, 0.11, 0.11, 0.11],
-            TEST_MIX_AIR_DAMPER_COL: [0.99, 0.99, 0.99, 0.99, 0.99, 0.99],
+            TEST_MAT_COL: [56, 56, 56, 56, 56, 56],
+            TEST_ECONOMIZER_SIG_COL: [1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
         }
         return pd.DataFrame(data)
 
@@ -79,17 +73,16 @@ class TestFaultOnInt:
 
     def fault_df_on_output_int(self) -> pd.DataFrame:
         data = {
-            TEST_SAT_SP_COL: [55, 55, 55, 55, 55, 55],
             TEST_OAT_COL: [44, 44, 44, 44, 44, 44],
-            TEST_COOLING_COIL_SIG_COL: [11, 11, 11, 11, 11, 11],  # Incorrect type
-            TEST_MIX_AIR_DAMPER_COL: [0.99, 0.99, 0.99, 0.99, 0.99, 0.99],
+            TEST_MAT_COL: [56, 56, 56, 56, 56, 56],
+            TEST_ECONOMIZER_SIG_COL: [1, 1, 1, 1, 1, 1],  # Incorrect type
         }
         return pd.DataFrame(data)
 
     def test_fault_on_int(self):
         with pytest.raises(
             TypeError,
-            match=HelperUtils().float_int_check_err(TEST_COOLING_COIL_SIG_COL),
+            match=HelperUtils().float_int_check_err(TEST_ECONOMIZER_SIG_COL),
         ):
             fc11.apply(self.fault_df_on_output_int())
 
@@ -98,17 +91,16 @@ class TestFaultOnFloatGreaterThanOne:
 
     def fault_df_on_output_greater_than_one(self) -> pd.DataFrame:
         data = {
-            TEST_SAT_SP_COL: [55, 55, 55, 55, 55, 55],
             TEST_OAT_COL: [44, 44, 44, 44, 44, 44],
-            TEST_COOLING_COIL_SIG_COL: [1.1, 1.2, 1.1, 1.3, 1.1, 1.2],  # Values > 1.0
-            TEST_MIX_AIR_DAMPER_COL: [0.99, 0.99, 0.99, 0.99, 0.99, 0.99],
+            TEST_MAT_COL: [56, 56, 56, 56, 56, 56],
+            TEST_ECONOMIZER_SIG_COL: [1.1, 1.2, 1.1, 1.3, 1.1, 1.2],  # Values > 1.0
         }
         return pd.DataFrame(data)
 
     def test_fault_on_float_greater_than_one(self):
         with pytest.raises(
             TypeError,
-            match=HelperUtils().float_max_check_err(TEST_COOLING_COIL_SIG_COL),
+            match=HelperUtils().float_max_check_err(TEST_ECONOMIZER_SIG_COL),
         ):
             fc11.apply(self.fault_df_on_output_greater_than_one())
 
@@ -117,17 +109,16 @@ class TestFaultOnMixedTypes:
 
     def fault_df_on_mixed_types(self) -> pd.DataFrame:
         data = {
-            TEST_SAT_SP_COL: [55, 55, 55, 55, 55, 55],
             TEST_OAT_COL: [44, 44, 44, 44, 44, 44],
-            TEST_COOLING_COIL_SIG_COL: [1.1, 0.55, 1.2, 1.3, 0.55, 1.1],  # Mixed types
-            TEST_MIX_AIR_DAMPER_COL: [0.99, 0.99, 0.99, 0.99, 0.99, 0.99],
+            TEST_MAT_COL: [56, 56, 56, 56, 56, 56],
+            TEST_ECONOMIZER_SIG_COL: [1.1, 0.55, 1.2, 1.3, 0.55, 1.1],  # Mixed types
         }
         return pd.DataFrame(data)
 
     def test_fault_on_mixed_types(self):
         with pytest.raises(
             TypeError,
-            match=HelperUtils().float_max_check_err(TEST_COOLING_COIL_SIG_COL),
+            match=HelperUtils().float_max_check_err(TEST_ECONOMIZER_SIG_COL),
         ):
             fc11.apply(self.fault_df_on_mixed_types())
 

open_fdd/tests/ahu/test_ahu_fc12.py

@@ -1,9 +1,9 @@
 import pandas as pd
 import pytest
-from open_fdd.air_handling_unit.faults import (
-    FaultConditionTwelve,
-)
+
+from open_fdd.air_handling_unit.faults import FaultConditionTwelve
 from open_fdd.air_handling_unit.faults.helper_utils import HelperUtils
+from open_fdd.core.exceptions import MissingColumnError
 
 """
 To see print statements in pytest run with:
@@ -16,9 +16,11 @@ SAT too high should be less than MAT. OS3 & OS4
 TEST_DELTA_SUPPLY_FAN = 2.0
 TEST_MIX_DEGF_ERR_THRES = 2.0
 TEST_SUPPLY_DEGF_ERR_THRES = 2.0
+TEST_OUTDOOR_DEGF_ERR_THRES = 5.0
 TEST_AHU_MIN_OA_DPR = 0.2
 TEST_SAT_COL = "supply_air_temp"
 TEST_MAT_COL = "mix_air_temp"
+TEST_OAT_COL = "out_air_temp"
 TEST_COOLING_COIL_SIG_COL = "cooling_sig_col"
 TEST_MIX_AIR_DAMPER_COL = "economizer_sig_col"
 ROLLING_WINDOW_SIZE = 5
@@ -28,9 +30,11 @@ fault_condition_params = {
     "DELTA_T_SUPPLY_FAN": TEST_DELTA_SUPPLY_FAN,
     "MIX_DEGF_ERR_THRES": TEST_MIX_DEGF_ERR_THRES,
     "SUPPLY_DEGF_ERR_THRES": TEST_SUPPLY_DEGF_ERR_THRES,
+    "OUTDOOR_DEGF_ERR_THRES": TEST_OUTDOOR_DEGF_ERR_THRES,
     "AHU_MIN_OA_DPR": TEST_AHU_MIN_OA_DPR,
     "SAT_COL": TEST_SAT_COL,
     "MAT_COL": TEST_MAT_COL,
+    "OAT_COL": TEST_OAT_COL,
     "COOLING_SIG_COL": TEST_COOLING_COIL_SIG_COL,
     "ECONOMIZER_SIG_COL": TEST_MIX_AIR_DAMPER_COL,
     "TROUBLESHOOT_MODE": False,
@@ -44,8 +48,9 @@ class TestFaultConditionTwelve:
 
     def no_fault_df_no_econ(self) -> pd.DataFrame:
         data = {
-            TEST_SAT_COL: [55, 55, 55, 55, 55, 55],
-            TEST_MAT_COL: [56, 56, 56, 56, 56, 56],
+            TEST_SAT_COL: [55.0, 55.0, 55.0, 55.0, 55.0, 55.0],
+            TEST_MAT_COL: [56.0, 56.0, 56.0, 56.0, 56.0, 56.0],
+            TEST_OAT_COL: [50.0, 50.0, 50.0, 50.0, 50.0, 50.0],
             TEST_COOLING_COIL_SIG_COL: [0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
             TEST_MIX_AIR_DAMPER_COL: [
                 TEST_AHU_MIN_OA_DPR,
@@ -60,8 +65,9 @@ class TestFaultConditionTwelve:
 
     def fault_df_in_econ_plus_mech(self) -> pd.DataFrame:
         data = {
-            TEST_SAT_COL: [66, 66, 66, 66, 66, 66],
-            TEST_MAT_COL: [56, 56, 56, 56, 56, 56],
+            TEST_SAT_COL: [66.0, 66.0, 66.0, 66.0, 66.0, 66.0],
+            TEST_MAT_COL: [56.0, 56.0, 56.0, 56.0, 56.0, 56.0],
+            TEST_OAT_COL: [50.0, 50.0, 50.0, 50.0, 50.0, 50.0],
             TEST_COOLING_COIL_SIG_COL: [0.50, 0.50, 0.50, 0.50, 0.50, 0.50],
             TEST_MIX_AIR_DAMPER_COL: [0.99, 0.99, 0.99, 0.99, 0.99, 0.99],
         }
@@ -69,9 +75,38 @@ class TestFaultConditionTwelve:
 
     def fault_df_in_mech_clg(self) -> pd.DataFrame:
         data = {
-            TEST_SAT_COL: [66, 66, 66, 66, 66, 66],
-            TEST_MAT_COL: [56, 56, 56, 56, 56, 56],
-            TEST_COOLING_COIL_SIG_COL: [0.99, 0.99, 0.99, 0.99, 0.99, 0.99],
+            TEST_SAT_COL: [
+                66.0,
+                66.0,
+                66.0,
+                66.0,
+                66.0,
+                66.0,
+            ],  # SAT much higher than MAT
+            TEST_MAT_COL: [
+                52.0,
+                52.0,
+                52.0,
+                52.0,
+                52.0,
+                52.0,
+            ],  # Lower MAT to make fault more apparent
+            TEST_OAT_COL: [
+                75.0,
+                75.0,
+                75.0,
+                75.0,
+                75.0,
+                75.0,
+            ],  # Hot outside conditions
+            TEST_COOLING_COIL_SIG_COL: [
+                0.99,
+                0.99,
+                0.99,
+                0.99,
+                0.99,
+                0.99,
+            ],  # Full mechanical cooling
             TEST_MIX_AIR_DAMPER_COL: [
                 TEST_AHU_MIN_OA_DPR,
                 TEST_AHU_MIN_OA_DPR,
@@ -79,7 +114,7 @@ class TestFaultConditionTwelve:
                 TEST_AHU_MIN_OA_DPR,
                 TEST_AHU_MIN_OA_DPR,
                 TEST_AHU_MIN_OA_DPR,
-            ],
+            ],  # Minimum OA position
         }
         return pd.DataFrame(data)
 
@@ -113,10 +148,11 @@ class TestFaultOnInt:
 
     def fault_df_on_output_int(self) -> pd.DataFrame:
         data = {
-            TEST_SAT_COL: [55, 55, 55, 55, 55, 55],
-            TEST_MAT_COL: [56, 56, 56, 56, 56, 56],
+            TEST_SAT_COL: [55.0, 55.0, 55.0, 55.0, 55.0, 55.0],
+            TEST_MAT_COL: [56.0, 56.0, 56.0, 56.0, 56.0, 56.0],
+            TEST_OAT_COL: [50.0, 50.0, 50.0, 50.0, 50.0, 50.0],
             TEST_COOLING_COIL_SIG_COL: [0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
-            TEST_MIX_AIR_DAMPER_COL: [11, 11, 11, 11, 11, 11],  # Incorrect type
+            TEST_MIX_AIR_DAMPER_COL: [1, 1, 1, 1, 1, 1],  # Incorrect type
         }
         return pd.DataFrame(data)
 
@@ -131,8 +167,9 @@ class TestFaultOnFloatGreaterThanOne:
 
     def fault_df_on_output_greater_than_one(self) -> pd.DataFrame:
         data = {
-            TEST_SAT_COL: [55, 55, 55, 55, 55, 55],
-            TEST_MAT_COL: [56, 56, 56, 56, 56, 56],
+            TEST_SAT_COL: [55.0, 55.0, 55.0, 55.0, 55.0, 55.0],
+            TEST_MAT_COL: [56.0, 56.0, 56.0, 56.0, 56.0, 56.0],
+            TEST_OAT_COL: [50.0, 50.0, 50.0, 50.0, 50.0, 50.0],
             TEST_COOLING_COIL_SIG_COL: [0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
             TEST_MIX_AIR_DAMPER_COL: [1.1, 1.2, 1.1, 1.3, 1.1, 1.2],  # Values > 1.0
         }
@@ -149,8 +186,9 @@ class TestFaultOnMixedTypes:
 
     def fault_df_on_mixed_types(self) -> pd.DataFrame:
         data = {
-            TEST_SAT_COL: [55, 55, 55, 55, 55, 55],
-            TEST_MAT_COL: [56, 56, 56, 56, 56, 56],
+            TEST_SAT_COL: [55.0, 55.0, 55.0, 55.0, 55.0, 55.0],
+            TEST_MAT_COL: [56.0, 56.0, 56.0, 56.0, 56.0, 56.0],
+            TEST_OAT_COL: [50.0, 50.0, 50.0, 50.0, 50.0, 50.0],
             TEST_COOLING_COIL_SIG_COL: [0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
             TEST_MIX_AIR_DAMPER_COL: [1.1, 0.55, 1.2, 1.3, 0.55, 1.1],  # Mixed types
         }

open_fdd/tests/ahu/test_ahu_fc13.py

@@ -1,9 +1,9 @@
 import pandas as pd
 import pytest
-from open_fdd.air_handling_unit.faults import (
-    FaultConditionThirteen,
-)
+
+from open_fdd.air_handling_unit.faults import FaultConditionThirteen
 from open_fdd.air_handling_unit.faults.helper_utils import HelperUtils
+from open_fdd.core.exceptions import MissingColumnError
 
 """
 To see print statements in pytest run with:
@@ -14,21 +14,28 @@ SAT too high in full cooling. OS3 & OS4
 
 # Constants
 TEST_SUPPLY_DEGF_ERR_THRES = 2.0
+TEST_MIX_DEGF_ERR_THRES = 2.0
+TEST_OUTDOOR_DEGF_ERR_THRES = 5.0
 TEST_AHU_MIN_OA_DPR = 0.2
 TEST_SAT_COL = "supply_air_temp"
 TEST_SAT_SP_COL = "supply_air_sp_temp"
 TEST_COOLING_COIL_SIG_COL = "cooling_sig_col"
 TEST_MIX_AIR_DAMPER_COL = "economizer_sig_col"
 ROLLING_WINDOW_SIZE = 5
+TEST_OAT_COL = "out_air_temp"
+TEST_MAT_COL = "mix_air_temp"
+TEST_ECONOMIZER_SIG_COL = "economizer_sig_col"
 
 # Initialize FaultConditionThirteen with a dictionary
 fault_condition_params = {
-    "SUPPLY_DEGF_ERR_THRES": TEST_SUPPLY_DEGF_ERR_THRES,
-    "AHU_MIN_OA_DPR": TEST_AHU_MIN_OA_DPR,
     "SAT_COL": TEST_SAT_COL,
-    "SAT_SETPOINT_COL": TEST_SAT_SP_COL,
+    "SAT_SP_COL": TEST_SAT_SP_COL,
     "COOLING_SIG_COL": TEST_COOLING_COIL_SIG_COL,
-    "ECONOMIZER_SIG_COL": TEST_MIX_AIR_DAMPER_COL,
+    "ECONOMIZER_SIG_COL": TEST_ECONOMIZER_SIG_COL,
+    "SUPPLY_DEGF_ERR_THRES": TEST_SUPPLY_DEGF_ERR_THRES,
+    "MIX_DEGF_ERR_THRES": TEST_MIX_DEGF_ERR_THRES,
+    "OUTDOOR_DEGF_ERR_THRES": TEST_OUTDOOR_DEGF_ERR_THRES,
+    "AHU_MIN_OA_DPR": TEST_AHU_MIN_OA_DPR,
     "TROUBLESHOOT_MODE": False,
     "ROLLING_WINDOW_SIZE": ROLLING_WINDOW_SIZE,
 }
@@ -58,7 +65,7 @@ class TestFaultConditionThirteen:
         data = {
             TEST_SAT_COL: [66, 66, 66, 66, 66, 66],
             TEST_SAT_SP_COL: [56, 56, 56, 56, 56, 56],
-            TEST_COOLING_COIL_SIG_COL: [0.50, 0.50, 0.50, 0.50, 0.50, 0.50],
+            TEST_COOLING_COIL_SIG_COL: [0.99, 0.99, 0.99, 0.99, 0.99, 0.99],
             TEST_MIX_AIR_DAMPER_COL: [0.99, 0.99, 0.99, 0.99, 0.99, 0.99],
         }
         return pd.DataFrame(data)

open_fdd/tests/ahu/test_ahu_fc14.py

@@ -1,9 +1,9 @@
 import pandas as pd
 import pytest
-from open_fdd.air_handling_unit.faults import (
-    FaultConditionFourteen,
-)
+
+from open_fdd.air_handling_unit.faults import FaultConditionFourteen
 from open_fdd.air_handling_unit.faults.helper_utils import HelperUtils
+from open_fdd.core.exceptions import MissingColumnError
 
 """
 To see print statements in pytest run with:
@@ -16,6 +16,8 @@ Temp drop across inactive clg coil in OS1 & OS2
 TEST_DELTA_SUPPLY_FAN = 2.0
 TEST_COIL_TEMP_ENTER_ERR_THRES = 1.0
 TEST_COIL_TEMP_LEAVE_ERR_THRES = 1.0
+TEST_MIX_DEGF_ERR_THRES = 2.0
+TEST_OUTDOOR_DEGF_ERR_THRES = 5.0
 TEST_AHU_MIN_OA_DPR = 0.2
 TEST_CLG_COIL_ENTER_TEMP_COL = "clg_enter_air_temp"
 TEST_CLG_COIL_LEAVE_TEMP_COL = "clg_leave_air_temp"
@@ -23,6 +25,8 @@ TEST_CLG_COIL_CMD_COL = "cooling_sig_col"
 TEST_HTG_COIL_CMD_COL = "heating_sig_col"
 TEST_MIX_AIR_DAMPER_COL = "economizer_sig_col"
 TEST_SUPPLY_VFD_SPEED_COL = "supply_vfd_speed"
+TEST_OAT_COL = "out_air_temp"
+TEST_MAT_COL = "mix_air_temp"
 ROLLING_WINDOW_SIZE = 5
 
 # Initialize FaultConditionFourteen with a dictionary
@@ -30,6 +34,8 @@ fault_condition_params = {
     "DELTA_T_SUPPLY_FAN": TEST_DELTA_SUPPLY_FAN,
     "COIL_TEMP_ENTER_ERR_THRES": TEST_COIL_TEMP_ENTER_ERR_THRES,
     "COIL_TEMP_LEAV_ERR_THRES": TEST_COIL_TEMP_LEAVE_ERR_THRES,
+    "MIX_DEGF_ERR_THRES": TEST_MIX_DEGF_ERR_THRES,
+    "OUTDOOR_DEGF_ERR_THRES": TEST_OUTDOOR_DEGF_ERR_THRES,
     "AHU_MIN_OA_DPR": TEST_AHU_MIN_OA_DPR,
     "CLG_COIL_ENTER_TEMP_COL": TEST_CLG_COIL_ENTER_TEMP_COL,
     "CLG_COIL_LEAVE_TEMP_COL": TEST_CLG_COIL_LEAVE_TEMP_COL,
@@ -37,6 +43,8 @@ fault_condition_params = {
     "HEATING_SIG_COL": TEST_HTG_COIL_CMD_COL,
     "ECONOMIZER_SIG_COL": TEST_MIX_AIR_DAMPER_COL,
     "SUPPLY_VFD_SPEED_COL": TEST_SUPPLY_VFD_SPEED_COL,
+    "OAT_COL": TEST_OAT_COL,
+    "MAT_COL": TEST_MAT_COL,
     "TROUBLESHOOT_MODE": False,
     "ROLLING_WINDOW_SIZE": ROLLING_WINDOW_SIZE,
 }

open_fdd/tests/ahu/test_ahu_fc15.py

@@ -1,9 +1,9 @@
 import pandas as pd
 import pytest
-from open_fdd.air_handling_unit.faults import (
-    FaultConditionFifteen,
-)
+
+from open_fdd.air_handling_unit.faults import FaultConditionFifteen
 from open_fdd.air_handling_unit.faults.helper_utils import HelperUtils
+from open_fdd.core.exceptions import MissingColumnError
 
 """
 To see print statements in pytest run with:
@@ -16,6 +16,9 @@ Temp rise across inactive htg coil in OS2, OS3, & OS4
 TEST_DELTA_SUPPLY_FAN = 2.0
 TEST_COIL_TEMP_ENTER_ERR_THRES = 1.0
 TEST_COIL_TEMP_LEAVE_ERR_THRES = 1.0
+TEST_SUPPLY_DEGF_ERR_THRES = 2.0
+TEST_MIX_DEGF_ERR_THRES = 2.0
+TEST_OUTDOOR_DEGF_ERR_THRES = 5.0
 TEST_AHU_MIN_OA_DPR = 0.2
 TEST_HTG_COIL_ENTER_TEMP_COL = "htg_enter_air_temp"
 TEST_HTG_COIL_LEAVE_TEMP_COL = "htg_leave_air_temp"
@@ -24,21 +27,29 @@ TEST_HTG_COIL_CMD_COL = "heating_sig_col"
 TEST_MIX_AIR_DAMPER_COL = "economizer_sig_col"
 TEST_SUPPLY_VFD_SPEED_COL = "supply_vfd_speed"
 ROLLING_WINDOW_SIZE = 5
+TEST_OAT_COL = "out_air_temp"
+TEST_MAT_COL = "mix_air_temp"
+TEST_ECONOMIZER_SIG_COL = "economizer_sig_col"
 
 # Initialize FaultConditionFifteen with a dictionary
 fault_condition_params = {
     "DELTA_SUPPLY_FAN": TEST_DELTA_SUPPLY_FAN,
     "COIL_TEMP_ENTER_ERR_THRES": TEST_COIL_TEMP_ENTER_ERR_THRES,
     "COIL_TEMP_LEAV_ERR_THRES": TEST_COIL_TEMP_LEAVE_ERR_THRES,
+    "SUPPLY_DEGF_ERR_THRES": TEST_SUPPLY_DEGF_ERR_THRES,
+    "MIX_DEGF_ERR_THRES": TEST_MIX_DEGF_ERR_THRES,
+    "OUTDOOR_DEGF_ERR_THRES": TEST_OUTDOOR_DEGF_ERR_THRES,
     "AHU_MIN_OA_DPR": TEST_AHU_MIN_OA_DPR,
     "HTG_COIL_ENTER_TEMP_COL": TEST_HTG_COIL_ENTER_TEMP_COL,
     "HTG_COIL_LEAVE_TEMP_COL": TEST_HTG_COIL_LEAVE_TEMP_COL,
     "COOLING_SIG_COL": TEST_CLG_COIL_CMD_COL,
     "HEATING_SIG_COL": TEST_HTG_COIL_CMD_COL,
-    "ECONOMIZER_SIG_COL": TEST_MIX_AIR_DAMPER_COL,
+    "ECONOMIZER_SIG_COL": TEST_ECONOMIZER_SIG_COL,
     "SUPPLY_VFD_SPEED_COL": TEST_SUPPLY_VFD_SPEED_COL,
     "TROUBLESHOOT_MODE": False,
     "ROLLING_WINDOW_SIZE": ROLLING_WINDOW_SIZE,
+    "OAT_COL": TEST_OAT_COL,
+    "MAT_COL": TEST_MAT_COL,
 }
 
 fc15 = FaultConditionFifteen(fault_condition_params)

open_fdd/tests/ahu/test_ahu_fc16.py

@@ -1,10 +1,9 @@
 import pandas as pd
 import pytest
+
 from open_fdd.air_handling_unit.faults import FaultConditionSixteen
-from open_fdd.air_handling_unit.faults.fault_condition import (
-    InvalidParameterError,
-    MissingColumnError,
-)
+from open_fdd.air_handling_unit.faults.helper_utils import HelperUtils
+from open_fdd.core.exceptions import InvalidParameterError, MissingColumnError
 
 """
 To see print statements in pytest run with:
@@ -21,11 +20,16 @@ TEST_ERV_EFFICIENCY_MAX_COOLING = 0.6
 TEST_OAT_LOW_THRESHOLD = 32.0
 TEST_OAT_HIGH_THRESHOLD = 80.0
 TEST_OAT_RAT_DELTA_THRES = 15.0
+TEST_MIX_DEGF_ERR_THRES = 2.0
+TEST_OUTDOOR_DEGF_ERR_THRES = 5.0
 TEST_ERV_OAT_ENTER_COL = "erv_oat_enter"
 TEST_ERV_OAT_LEAVING_COL = "erv_oat_leaving"
 TEST_ERV_EAT_ENTER_COL = "erv_eat_enter"
 TEST_ERV_EAT_LEAVING_COL = "erv_eat_leaving"
 TEST_SUPPLY_VFD_SPEED_COL = "supply_vfd_speed"
+TEST_OAT_COL = "out_air_temp"
+TEST_MAT_COL = "mix_air_temp"
+TEST_ECONOMIZER_SIG_COL = "economizer_sig_col"
 ROLLING_WINDOW_SIZE = 1
 
 # Initialize FaultConditionSixteen with a dictionary
@@ -37,11 +41,16 @@ fault_condition_params = {
     "OAT_LOW_THRESHOLD": TEST_OAT_LOW_THRESHOLD,
     "OAT_HIGH_THRESHOLD": TEST_OAT_HIGH_THRESHOLD,
     "OAT_RAT_DELTA_MIN": TEST_OAT_RAT_DELTA_THRES,
+    "MIX_DEGF_ERR_THRES": TEST_MIX_DEGF_ERR_THRES,
+    "OUTDOOR_DEGF_ERR_THRES": TEST_OUTDOOR_DEGF_ERR_THRES,
     "ERV_OAT_ENTER_COL": TEST_ERV_OAT_ENTER_COL,
     "ERV_OAT_LEAVING_COL": TEST_ERV_OAT_LEAVING_COL,
     "ERV_EAT_ENTER_COL": TEST_ERV_EAT_ENTER_COL,
     "ERV_EAT_LEAVING_COL": TEST_ERV_EAT_LEAVING_COL,
     "SUPPLY_VFD_SPEED_COL": TEST_SUPPLY_VFD_SPEED_COL,
+    "OAT_COL": TEST_OAT_COL,
+    "MAT_COL": TEST_MAT_COL,
+    "ECONOMIZER_SIG_COL": TEST_ECONOMIZER_SIG_COL,
     "TROUBLESHOOT_MODE": False,
     "ROLLING_WINDOW_SIZE": ROLLING_WINDOW_SIZE,
 }
@@ -144,7 +153,7 @@ class TestFaultOnInvalidParams:
                     "SUPPLY_VFD_SPEED_COL": TEST_SUPPLY_VFD_SPEED_COL,
                 }
             )
-        assert "should be a float" in str(excinfo.value)
+        assert "should be of type float" in str(excinfo.value)
 
     def test_invalid_efficiency_value(self):
         """Test that InvalidParameterError is raised if efficiency values are out of 0.0 - 1.0 range."""
@@ -165,7 +174,7 @@ class TestFaultOnInvalidParams:
                     "SUPPLY_VFD_SPEED_COL": TEST_SUPPLY_VFD_SPEED_COL,
                 }
             )
-        assert "should be a float between 0.0 and 1.0" in str(excinfo.value)
+        assert "should be between 0.0 and 1.0" in str(excinfo.value)
 
 
 class TestFaultOnMissingColumns:

open_fdd/tests/ahu/test_ahu_fc2.py

@@ -1,5 +1,6 @@
 import pandas as pd
 import pytest
+
 from open_fdd.air_handling_unit.faults import FaultConditionTwo
 from open_fdd.air_handling_unit.faults.helper_utils import HelperUtils
 

open_fdd/tests/ahu/test_ahu_fc3.py

@@ -1,5 +1,6 @@
 import pandas as pd
 import pytest
+
 from open_fdd.air_handling_unit.faults import FaultConditionThree
 from open_fdd.air_handling_unit.faults.helper_utils import HelperUtils
 

open_fdd/tests/ahu/test_ahu_fc4.py

@@ -1,8 +1,10 @@
+from datetime import datetime, timezone
+
 import pandas as pd
 import pytest
+
 from open_fdd.air_handling_unit.faults import FaultConditionFour
 from open_fdd.air_handling_unit.faults.helper_utils import HelperUtils
-from datetime import datetime, timezone
 
 """
 To see print statements in pytest run with:

open_fdd/tests/ahu/test_ahu_fc5.py

@@ -1,5 +1,6 @@
 import pandas as pd
 import pytest
+
 from open_fdd.air_handling_unit.faults import FaultConditionFive
 from open_fdd.air_handling_unit.faults.helper_utils import HelperUtils
 

open_fdd/tests/ahu/test_ahu_fc6.py

@@ -1,5 +1,6 @@
 import pandas as pd
 import pytest
+
 from open_fdd.air_handling_unit.faults import FaultConditionSix
 from open_fdd.air_handling_unit.faults.helper_utils import HelperUtils