Merge branch 'lstm_pipeline' of hf.co:spaces/smartbuildings/smart-buildings into lstm_pipeline

dashboard.py

@@ -176,6 +176,15 @@ def update_status_boxes(df, fault):
             """,
                 unsafe_allow_html=True,
             )
+        elif fault[i] == 0:
+            rtu_placeholders[i]["box"].markdown(
+                f"""
+            <div style='background-color:#447F80;padding:3px;border-radius:5px;margin-bottom:10px'>
+                <h4 style='color:black;text-align:center;'>RTU{i+1}</h4>
+            </div>
+            """,
+                unsafe_allow_html=True,
+            )
 
 
 # Zones
@@ -307,17 +316,21 @@ with row1_col3:
 
 
 def fault_table_update(fault, df_faults, current_stat, df_time):
-    if fault[i] == 1 and current_stat[i] == False:
-        df_faults.loc[len(df_faults)] = [
-            df_time,
-            f"RTU_0{i+1}_fan/damper_fault - Start",
-        ]
-        current_stat[i] = True
-
-    if fault[i] == 0 and current_stat[i] == True:
-        df_faults.loc[len(df_faults)] = [df_time, f"RTU_0{i+1}_fan/damper_fault - End"]
-        current_stat[i] = False
-    fault_placeholder["dataframe"].dataframe(df_faults)
+    for i in range(4):
+        if fault[i] == 1 and current_stat[i] == False:
+            df_faults.loc[len(df_faults)] = [
+                df_time,
+                f"RTU_0{i+1}_fan/damper_fault - Start",
+            ]
+            current_stat[i] = True
+
+        if fault[i] == 0 and current_stat[i] == True:
+            df_faults.loc[len(df_faults)] = [
+                df_time,
+                f"RTU_0{i+1}_fan/damper_fault - End",
+            ]
+            current_stat[i] = False
+        fault_placeholder["dataframe"].dataframe(df_faults)
 
 
 # Details
@@ -500,7 +513,7 @@ while True:
                 fault_3,
                 fault_4,
             ) = rtu_anomalizers[1].pipeline(
-                df_new1, df_trans1, rtu_data_pipeline.scaler1
+                df_new2, df_trans2, rtu_data_pipeline.scaler2
             )
         if not vav_1_df_new is None:
             (

src/rtu/RTUAnomalizer1.py

@@ -211,9 +211,9 @@ class RTUAnomalizer1:
             self.fault_1 = 1
         else:
             self.fault_1 = 0
-        rtu_2_dist = np.array(self.distance_list).T[1]>0.5 #rtu_2_threshold
+        rtu_2_dist = np.array(self.distance_list).T[1]>2.5 #rtu_2_threshold
         rtu_2_dist = [int(x) for x in rtu_2_dist]
-        if sum(rtu_2_dist)>0.05*60: # 80% of the 60 min window
+        if sum(rtu_2_dist)>0.8*60: # 80% of the 60 min window
             self.fault_2 = 1
         else:
             self.fault_2 = 0
@@ -245,7 +245,7 @@ class RTUAnomalizer1:
             self.resid_pca_list,
             dist,
             np.array(self.distance_list[30:]).T[0]>1, #rtu_1_threshold
-            np.array(self.distance_list[30:]).T[1]>0.5, #rtu_2_threshold
+            np.array(self.distance_list[30:]).T[1]>2.5, #rtu_2_threshold
             self.fault_1,
             self.fault_2
         )

src/rtu/RTUAnomalizer2.py

@@ -211,7 +211,7 @@ class RTUAnomalizer2:
             self.fault_1 = 1
         else:
             self.fault_1 = 0
-        rtu_2_dist = np.array(self.distance_list).T[1]>1.5 #rtu_4_threshold
+        rtu_2_dist = np.array(self.distance_list).T[1]>1 #rtu_4_threshold
         rtu_2_dist = [int(x) for x in rtu_2_dist]
         if sum(rtu_2_dist)>0.8*60: # 80% of the 60 min window
             self.fault_2 = 1
@@ -245,7 +245,7 @@ class RTUAnomalizer2:
             self.resid_pca_list,
             dist,
             np.array(self.distance_list[30:]).T[0]>1.5, #rtu_3_threshold
-            np.array(self.distance_list[30:]).T[1]>1.5, #rtu_4_threshold
+            np.array(self.distance_list[30:]).T[1]>1, #rtu_4_threshold
             self.fault_1,
             self.fault_2
         )