updated(src): Update functions and models with new windowed function.

AndresLaverdeMarin · Sep 5, 2022 · ca3bf02 · ca3bf02
1 parent 2620acd
commit ca3bf02
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/src/data/Li_et_al_processed_data.py b/src/data/Li_et_al_processed_data.py
@@ -39,14 +39,15 @@ def _create_trip_windows(windows_size: int, list_dfs: list) -> list:
     final_list = []
     for df in list_dfs:
         size = windows_size + 1
-        list_of_dfs = [df.iloc[i : i + size - 1, :] for i in range(0, len(df), size)]
+        list_of_dfs = [df.iloc[i - 1: i + size - 2, :] for i in range(1, len(df) + 1, size-1)]
         for trip in list_of_dfs:
             if len(trip) == windows_size:
                 final_list.extend([trip])
 
     return final_list
 
 
+
 def read(path, scaler_path, window_size):
     """
     Parameters

diff --git a/src/data/processed_data.py b/src/data/processed_data.py
@@ -39,7 +39,7 @@ def _create_trip_windows(windows_size: int, list_dfs: list) -> list:
     final_list = []
     for df in list_dfs:
         size = windows_size + 1
-        list_of_dfs = [df.iloc[i : i + size - 1, :] for i in range(0, len(df), size)]
+        list_of_dfs = [df.iloc[i - 1: i + size - 2, :] for i in range(1, len(df) + 1, size-1)]
         for trip in list_of_dfs:
             if len(trip) == windows_size:
                 final_list.extend([trip])
@@ -126,3 +126,9 @@ def read(path, scaler_path, window_size):
     X = np.array([scaler.transform(X_tot[i]) for i in range(0, len(X_tot))])
 
     return X, y
+
+
+if __name__ == "__main__":
+    X, y = read(f"../../data/AstaZero_driver_{1}.csv", "../final_models/scaler_biLSTM_5s.pkl", 5)
+
+
diff --git a/src/final_models/Li_et_al_LSTM_5s.h5 b/src/final_models/Li_et_al_LSTM_5s.h5
diff --git a/src/final_models/biLSTM_5s.h5 b/src/final_models/biLSTM_5s.h5
diff --git a/src/final_models/scaler_Li_et_al_LSTM_5s.pkl b/src/final_models/scaler_Li_et_al_LSTM_5s.pkl