openfund-maker 2.2.8__py3-none-any.whl → 2.2.9__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 +4 -1
- {openfund_maker-2.2.8.dist-info → openfund_maker-2.2.9.dist-info}/METADATA +1 -1
- {openfund_maker-2.2.8.dist-info → openfund_maker-2.2.9.dist-info}/RECORD +5 -5
- {openfund_maker-2.2.8.dist-info → openfund_maker-2.2.9.dist-info}/WHEEL +0 -0
- {openfund_maker-2.2.8.dist-info → openfund_maker-2.2.9.dist-info}/entry_points.txt +0 -0
maker/BestFVGStrategyMaker.py
CHANGED
|
@@ -38,9 +38,12 @@ class BestFVGStrategyMaker(SMCStrategyMaker):
|
|
|
38
38
|
'''
|
|
39
39
|
FixMe: bug2.2.5_1 20230502
|
|
40
40
|
检查价格是否在FVG范围内,bar_index，跳过FVG相关的三根K线，从FVG下一根的K线开始检查
|
|
41
|
+
并且满足bar_index要从struct_index之后，struct_index和FVG_index 不一定哪个大，取最晚的index。
|
|
41
42
|
'''
|
|
43
|
+
start_index = max(struct_index,fvg_index+2) #
|
|
44
|
+
|
|
42
45
|
if fvg_index is not None:
|
|
43
|
-
data = data.iloc[min(len(data),
|
|
46
|
+
data = data.iloc[min(len(data),start_index):].copy()
|
|
44
47
|
|
|
45
48
|
|
|
46
49
|
# 检查价格是否在FVG范围内,bar_index 从struct_index
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
maker/BestFVGStrategyMaker.py,sha256=
|
|
1
|
+
maker/BestFVGStrategyMaker.py,sha256=a9UfClrfzkgX6jXL2FODzANtawrmGeZ_PVeO1-tweDc,12532
|
|
2
2
|
maker/MACDStrategyMaker.py,sha256=WX8wqpF9h5W4WclN1NjZ_Bur7KFi_aMTvacfLyHzEcI,12681
|
|
3
3
|
maker/SMCStrategyMaker.py,sha256=hkDqymWnuyYDo1gTYY_uyO4H4yOwCw8NBTM9RcfLRPc,28780
|
|
4
4
|
maker/ThreeLineStrategyMaker.py,sha256=jCdyTvI9oTMixCM0tQF9D_-6ig0-bYstKuRFECE4deE,32099
|
|
@@ -9,7 +9,7 @@ maker/history_code/okxapi.py,sha256=_9G0U_o0ZC8NxaT6PqpiLgxBm9gPobC9PsFHZE1c5w0,
|
|
|
9
9
|
maker/history_code/zhen.py.bak,sha256=HNkrQbJts8G9umE9chEFsc0cLQApcM9KOVNMYPpkBXM,10918
|
|
10
10
|
maker/history_code/zhen_2.py,sha256=4IaHVtTCMSlrLGSTZrWpW2q-f7HZsUNRkW_-5QgWv24,10509
|
|
11
11
|
maker/main.py,sha256=kumgkgyYj1tVKrHTQmSx0prFs9K4i5KpvcOnqimV2eA,3805
|
|
12
|
-
openfund_maker-2.2.
|
|
13
|
-
openfund_maker-2.2.
|
|
14
|
-
openfund_maker-2.2.
|
|
15
|
-
openfund_maker-2.2.
|
|
12
|
+
openfund_maker-2.2.9.dist-info/METADATA,sha256=e62T_JqAp7JrCPPm-sDYnOy0YjWWGy0wMULeQs-X2cI,1955
|
|
13
|
+
openfund_maker-2.2.9.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
|
|
14
|
+
openfund_maker-2.2.9.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
|
|
15
|
+
openfund_maker-2.2.9.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|