From 953bea03cdf2d6085b6b3cd79bf274320f33ad72 Mon Sep 17 00:00:00 2001
From: David Brazda <davidbrazda61@gmail.com>
Date: Fri, 18 Oct 2024 13:26:56 +0200
Subject: [PATCH] drag

---
 setup.py                |  2 +-
 ttools/vbtindicators.py | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 9785130..7331e43 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='ttools',
-    version='0.2.7',
+    version='0.2.8',
     packages=find_packages(),
     install_requires=[
         'vectorbtpro',
diff --git a/ttools/vbtindicators.py b/ttools/vbtindicators.py
index 3ccefff..650026d 100644
--- a/ttools/vbtindicators.py
+++ b/ttools/vbtindicators.py
@@ -20,7 +20,7 @@ def substitute_anchor(wrapper: ArrayWrapper, anchor: tp.Optional[tp.FrequencyLik
     return wrapper.get_index_grouper(anchor).get_group_lens()
 
 @jit(nopython=True)
-def vwap_cum(high, low, close, volume, group_lens):
+def vwap_cum(high, low, close, volume, group_lens, drag):
     #anchor based grouping - prepare group indexes
     group_end_idxs = np.cumsum(group_lens)
     group_start_idxs = group_end_idxs - group_lens
@@ -33,6 +33,7 @@ def vwap_cum(high, low, close, volume, group_lens):
     #iterate over groups
     for group in range(len(group_lens)):
         from_i = group_start_idxs[group]
+        from_i = max(0, from_i - drag)
         to_i = group_end_idxs[group]
         nom_cumsum = 0
         denum_cumsum = 0
@@ -47,13 +48,15 @@ def vwap_cum(high, low, close, volume, group_lens):
     return out
 
 """
-cumulative anchored vwap indicator on HLCC4 price
+cumulative anchored vwap indicator on HLCC4 price, anchor = "D", "h", or "min" ...
+drag = 0 - overlap with previous group. takes into account last N elements from previous group
+when calculating (simulating v2realbot logic)
 """
 IND_CUVWAP = vbt.IF(
     class_name='CUVWAP',
     module_name='ttools',
     input_names=['high', 'low', 'close', 'volume'],
-    param_names=['anchor'],
+    param_names=['anchor', "drag"],
     output_names=['vwap']
 ).with_apply_func(vwap_cum,
                 takes_1d=True,
@@ -61,6 +64,7 @@ IND_CUVWAP = vbt.IF(
                     anchor=dict(template=RepFunc(substitute_anchor)),
                 ),
                 anchor="D",
+                drag=0
                 )
 
 def register_custom_inds(indicator_name: str = None, if_exists: str ="skip"):