openfund-maker 2.2.5__py3-none-any.whl → 2.2.6__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- maker/BestFVGStrategyMaker.py +11 -2
- maker/SMCStrategyMaker.py +3 -2
- {openfund_maker-2.2.5.dist-info → openfund_maker-2.2.6.dist-info}/METADATA +1 -1
- {openfund_maker-2.2.5.dist-info → openfund_maker-2.2.6.dist-info}/RECORD +6 -6
- {openfund_maker-2.2.5.dist-info → openfund_maker-2.2.6.dist-info}/WHEEL +1 -1
- {openfund_maker-2.2.5.dist-info → openfund_maker-2.2.6.dist-info}/entry_points.txt +0 -0
maker/BestFVGStrategyMaker.py
CHANGED
|
@@ -27,13 +27,22 @@ class BestFVGStrategyMaker(SMCStrategyMaker):
|
|
|
27
27
|
return False
|
|
28
28
|
|
|
29
29
|
data = df.copy()
|
|
30
|
-
if struct_index is not None:
|
|
31
|
-
data = data.iloc[struct_index:]
|
|
32
30
|
|
|
33
31
|
fvg_top = fvg["top"]
|
|
34
32
|
fvg_bot = fvg["bot"]
|
|
35
33
|
fvg_index = fvg["index"]
|
|
36
34
|
|
|
35
|
+
# bug2.2.5_1，未等到折价区FVG就开单
|
|
36
|
+
# if struct_index is not None:
|
|
37
|
+
# data = data.iloc[struct_index:]
|
|
38
|
+
'''
|
|
39
|
+
FixMe: bug2.2.5_1 20230502
|
|
40
|
+
检查价格是否在FVG范围内,bar_index，跳过FVG相关的三根K线，从FVG下一根的K线开始检查
|
|
41
|
+
'''
|
|
42
|
+
if fvg_index is not None:
|
|
43
|
+
data = data.iloc[min(len(data),fvg_index+2):]
|
|
44
|
+
|
|
45
|
+
|
|
37
46
|
# 检查价格是否在FVG范围内,bar_index 从struct_index
|
|
38
47
|
if side == 'buy':
|
|
39
48
|
# 多头趋势检查最低价是否进入FVG区域
|
maker/SMCStrategyMaker.py
CHANGED
|
@@ -123,8 +123,9 @@ class SMCStrategyMaker(ThreeLineStrategyMaker):
|
|
|
123
123
|
# top: FVG的上边界价格,对应K线的最高价或最低价
|
|
124
124
|
# bot: FVG的下边界价格,对应K线的最高价或最低价
|
|
125
125
|
"""
|
|
126
|
-
|
|
127
|
-
df = data.copy().iloc[pivot_index:]
|
|
126
|
+
# bug2.2.5_1，未到折价区，计算FVG需要前一根K线
|
|
127
|
+
# df = data.copy().iloc[pivot_index:]
|
|
128
|
+
df = data.copy().iloc[max(0,pivot_index-1):]
|
|
128
129
|
|
|
129
130
|
fvg_boxes = []
|
|
130
131
|
if side == 'buy' :
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
maker/BestFVGStrategyMaker.py,sha256=
|
|
1
|
+
maker/BestFVGStrategyMaker.py,sha256=YZiHrUlQPVnlFwsfuwbgG81mrNLZDrq6nIHAjh2KQRk,12154
|
|
2
2
|
maker/MACDStrategyMaker.py,sha256=iS5HO04piKHFJxUI2e5QmicxzGeK-V1aphJSr2n_4Ac,12651
|
|
3
|
-
maker/SMCStrategyMaker.py,sha256=
|
|
3
|
+
maker/SMCStrategyMaker.py,sha256=grmQKqUj03qVhHyo24qUk8eFmPeyTqq1taYebxzSDXw,35351
|
|
4
4
|
maker/ThreeLineStrategyMaker.py,sha256=JhPfebBLEL7LIQj1YcH0j1mco1Nuocs8ceR6bjdI8qc,30517
|
|
5
5
|
maker/WickReversalStrategyMaker.py,sha256=7DqPDVJot4EM0_lSAcFAHrR9rNvkIds9KLMoDOiAHEc,17486
|
|
6
6
|
maker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -10,7 +10,7 @@ maker/main_m.py,sha256=0PzDTnuBrxfpy5WDfsIHKAzZ_7pkuvuqqeWik0vpWio,15522
|
|
|
10
10
|
maker/okxapi.py,sha256=_9G0U_o0ZC8NxaT6PqpiLgxBm9gPobC9PsFHZE1c5w0,553
|
|
11
11
|
maker/zhen.py.bak,sha256=HNkrQbJts8G9umE9chEFsc0cLQApcM9KOVNMYPpkBXM,10918
|
|
12
12
|
maker/zhen_2.py,sha256=4IaHVtTCMSlrLGSTZrWpW2q-f7HZsUNRkW_-5QgWv24,10509
|
|
13
|
-
openfund_maker-2.2.
|
|
14
|
-
openfund_maker-2.2.
|
|
15
|
-
openfund_maker-2.2.
|
|
16
|
-
openfund_maker-2.2.
|
|
13
|
+
openfund_maker-2.2.6.dist-info/METADATA,sha256=qW2yuUoP7qTjOj3cinBb7SzKzzpbRjLMPD54GgeznOg,1955
|
|
14
|
+
openfund_maker-2.2.6.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
|
|
15
|
+
openfund_maker-2.2.6.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
|
|
16
|
+
openfund_maker-2.2.6.dist-info/RECORD,,
|
|
File without changes
|