Fix PER, rerun notebooks

camirmas · May 12, 2023 · 1a6f378 · 1a6f378
1 parent af12ce3
commit 1a6f378
Show file tree

Hide file tree

Showing 4 changed files with 660 additions and 744 deletions.
diff --git a/REStats/models/wind_dir.py b/REStats/models/wind_dir.py
@@ -8,13 +8,13 @@
 def calc_persistence(wind_dir, steps=1):
     per = np.empty(len(wind_dir))
 
-    t = 0
+    t = 1
     while t < len(wind_dir) - steps:
-        per[t : t + steps] = wind_dir[t]
+        per[t : t + steps] = wind_dir[t - 1]
 
         t += steps
 
-    per = per[: len(wind_dir) - 1]
+    per = per[1 : len(wind_dir)]
 
     per_rmse = circular_rmse(wind_dir[1:], per)
     per_rmse_rel = per_rmse / circular_mean(wind_dir[1:]) * 100

diff --git a/REStats/models/wind_speed.py b/REStats/models/wind_speed.py
@@ -49,13 +49,13 @@ def backtest(v_train, v_test, idata_wb=None, steps=1):
 def calc_persistence(v_test, steps=1):
     per = np.empty(len(v_test))
 
-    t = 0
+    t = 1
     while t < len(v_test) - steps:
-        per[t : t + steps] = v_test[t]
+        per[t : t + steps] = v_test[t - 1]
 
         t += steps
 
-    per = per[: len(v_test) - 1]
+    per = per[1 : len(v_test)]
 
     per_rmse = mean_squared_error(v_test[1:], per, squared=False)
     per_rmse_rel = per_rmse / v_test[1:].mean() * 100

diff --git a/REStats/notebooks/forecast.ipynb b/REStats/notebooks/forecast.ipynb