Fix Risk Index calculation and add data sanitization

jxx123 · Jul 25, 2023 · 547b227 · 547b227
1 parent 3053386
commit 547b227
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/simglucose/analysis/report.py b/simglucose/analysis/report.py
@@ -93,10 +93,13 @@ def percent_stats(BG, ax=None):
 
 
 def risk_index_trace(df_BG, visualize=False):
-    chunk_BG = [df_BG.iloc[i:i + 60, :] for i in range(0, len(df_BG), 60)]
+    chunk_BG = [df_BG.iloc[i:i + 20, :] for i in range(0, len(df_BG), 20)]
+
+    if len(chunk_BG[-1]) != 20:  # Remove the last chunk which is not full
+        chunk_BG.pop()
 
     fBG = [
-        np.mean(1.509 * (np.log(BG[BG > 0])**1.084 - 5.381)) for BG in chunk_BG
+        1.509 * (np.log(BG[BG > 0]).mean() ** 1.084 - 5.381) for BG in chunk_BG
     ]
 
     fBG_df = pd.concat(fBG, axis=1).transpose()