openfund-maker 2.2.4__py3-none-any.whl → 2.2.6__py3-none-any.whl

maker/BestFVGStrategyMaker.py

@@ -27,13 +27,22 @@ class BestFVGStrategyMaker(SMCStrategyMaker):
             return False
         
         data = df.copy()
-        if struct_index is not None:
-            data = data.iloc[struct_index:]
 
         fvg_top = fvg["top"]
         fvg_bot = fvg["bot"]
         fvg_index = fvg["index"]
         
+        # bug2.2.5_1，未等到折价区FVG就开单
+        # if struct_index is not None:
+        #     data = data.iloc[struct_index:]
+        '''
+            FixMe: bug2.2.5_1 20230502 
+            检查价格是否在FVG范围内,bar_index，跳过FVG相关的三根K线，从FVG下一根的K线开始检查
+        '''
+        if fvg_index is not None:
+            data = data.iloc[min(len(data),fvg_index+2):]
+        
+        
         # 检查价格是否在FVG范围内,bar_index 从struct_index
         if side == 'buy':
             # 多头趋势检查最低价是否进入FVG区域

maker/SMCStrategyMaker.py

@@ -123,8 +123,9 @@ class SMCStrategyMaker(ThreeLineStrategyMaker):
                 # top: FVG的上边界价格,对应K线的最高价或最低价
                 # bot: FVG的下边界价格,对应K线的最高价或最低价
         """
-
-        df = data.copy().iloc[pivot_index:]
+        # bug2.2.5_1，未到折价区，计算FVG需要前一根K线
+        # df = data.copy().iloc[pivot_index:]
+        df = data.copy().iloc[max(0,pivot_index-1):] 
    
         fvg_boxes = []
         if side == 'buy' :

{openfund_maker-2.2.4.dist-info → openfund_maker-2.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openfund-maker
-Version: 2.2.4
+Version: 2.2.6
 Summary: Openfund-maker.
 Requires-Python: >=3.9,<4.0
 Classifier: Programming Language :: Python :: 3

{openfund_maker-2.2.4.dist-info → openfund_maker-2.2.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
-maker/BestFVGStrategyMaker.py,sha256=Mis9Tgn2ERtMG4uM8ppeshg8pHTnFN6pFs5b5vGJQfE,11798
+maker/BestFVGStrategyMaker.py,sha256=YZiHrUlQPVnlFwsfuwbgG81mrNLZDrq6nIHAjh2KQRk,12154
 maker/MACDStrategyMaker.py,sha256=iS5HO04piKHFJxUI2e5QmicxzGeK-V1aphJSr2n_4Ac,12651
-maker/SMCStrategyMaker.py,sha256=16AEM_SKZ48xhESYeK_lhPrgsH6WW-MuEFhNC187peI,35226
+maker/SMCStrategyMaker.py,sha256=grmQKqUj03qVhHyo24qUk8eFmPeyTqq1taYebxzSDXw,35351
 maker/ThreeLineStrategyMaker.py,sha256=JhPfebBLEL7LIQj1YcH0j1mco1Nuocs8ceR6bjdI8qc,30517
 maker/WickReversalStrategyMaker.py,sha256=7DqPDVJot4EM0_lSAcFAHrR9rNvkIds9KLMoDOiAHEc,17486
 maker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10,7 +10,7 @@ maker/main_m.py,sha256=0PzDTnuBrxfpy5WDfsIHKAzZ_7pkuvuqqeWik0vpWio,15522
 maker/okxapi.py,sha256=_9G0U_o0ZC8NxaT6PqpiLgxBm9gPobC9PsFHZE1c5w0,553
 maker/zhen.py.bak,sha256=HNkrQbJts8G9umE9chEFsc0cLQApcM9KOVNMYPpkBXM,10918
 maker/zhen_2.py,sha256=4IaHVtTCMSlrLGSTZrWpW2q-f7HZsUNRkW_-5QgWv24,10509
-openfund_maker-2.2.4.dist-info/METADATA,sha256=pcTozEkOMViQdVJGZK_NNy3CQObVRDphggHpUHjbT9I,1955
-openfund_maker-2.2.4.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-openfund_maker-2.2.4.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
-openfund_maker-2.2.4.dist-info/RECORD,,
+openfund_maker-2.2.6.dist-info/METADATA,sha256=qW2yuUoP7qTjOj3cinBb7SzKzzpbRjLMPD54GgeznOg,1955
+openfund_maker-2.2.6.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+openfund_maker-2.2.6.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
+openfund_maker-2.2.6.dist-info/RECORD,,