Merge pull request #43 from joshyattridge/increase_speed_of_previous_…

…high_low Increase speed of previous high low function
joshyattridge · May 25, 2024 · eb9d9f0 · eb9d9f0
2 parents 26dd012 + f4f2c0d
commit eb9d9f0
Show file tree

Hide file tree

Showing 9 changed files with 51,477 additions and 68 deletions.
diff --git a/smartmoneyconcepts/smc.py b/smartmoneyconcepts/smc.py
@@ -710,32 +710,32 @@ def previous_high_low(cls, ohlc: DataFrame, time_frame: str = "1D") -> Series:
         broken_high = np.zeros(len(ohlc), dtype=np.int32)
         broken_low = np.zeros(len(ohlc), dtype=np.int32)
 
+        resampled_ohlc = ohlc.resample(time_frame).agg(
+            {
+                "open": "first",
+                "high": "max",
+                "low": "min",
+                "close": "last",
+                "volume": "sum",
+            }
+        ).dropna()
+
         currently_broken_high = False
         currently_broken_low = False
         last_broken_time = None
         for i in range(len(ohlc)):
-            resampled_ohlc = (
-                ohlc[:i]
-                .resample(time_frame)
-                .agg(
-                    {
-                        "open": "first",
-                        "high": "max",
-                        "low": "min",
-                        "close": "last",
-                        "volume": "sum",
-                    }
-                )
-            )
-            if len(resampled_ohlc) >= 1:
-                if last_broken_time != resampled_ohlc.index[-1]:
-                    currently_broken_high = False
-                    currently_broken_low = False
-                    last_broken_time = resampled_ohlc.index[-1]
             # remove rows with nan values (ignoring weekends)
-            resampled_ohlc = resampled_ohlc.dropna()
-            previous_high[i] = resampled_ohlc["high"].iloc[-2] if len(resampled_ohlc) > 1 else np.nan
-            previous_low[i] = resampled_ohlc["low"].iloc[-2] if len(resampled_ohlc) > 1 else np.nan
+            resampled_previous_index = np.where(
+                resampled_ohlc.index < ohlc.index[i]
+            )[0]
+            if len(resampled_previous_index) <= 1:
+                previous_high[i] = np.nan
+                previous_low[i] = np.nan
+                continue
+            resampled_previous_index = resampled_previous_index[-1]
+
+            previous_high[i] = resampled_ohlc["high"].iloc[resampled_previous_index] 
+            previous_low[i] = resampled_ohlc["low"].iloc[resampled_previous_index]
             currently_broken_high = ohlc["high"].iloc[i] > previous_high[i] or currently_broken_high
             currently_broken_low = ohlc["low"].iloc[i] < previous_low[i] or currently_broken_low
             broken_high[i] = 1 if currently_broken_high else 0

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -59,7 +59,7 @@ def previous_high_low_result_data():
     test_instrument = "EURUSD"
     return pd.read_csv(
         os.path.join(
-            "tests/test_data", test_instrument, "previous_high_low_result_data.csv"
+            "tests/test_data", test_instrument, "previous_high_low_result_data_4h.csv"
         )
     )
 

diff --git a/.../EURUSD/previous_high_low_result_data.csv → ...RUSD/previous_high_low_result_data_1D.csv b/.../EURUSD/previous_high_low_result_data.csv → ...RUSD/previous_high_low_result_data_1D.csv