openfund-maker 1.0.11__py3-none-any.whl → 1.0.12__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/ThreeLineOrderBot.py +3 -3
- {openfund_maker-1.0.11.dist-info → openfund_maker-1.0.12.dist-info}/METADATA +1 -1
- {openfund_maker-1.0.11.dist-info → openfund_maker-1.0.12.dist-info}/RECORD +5 -5
- {openfund_maker-1.0.11.dist-info → openfund_maker-1.0.12.dist-info}/WHEEL +0 -0
- {openfund_maker-1.0.11.dist-info → openfund_maker-1.0.12.dist-info}/entry_points.txt +0 -0
maker/ThreeLineOrderBot.py
CHANGED
|
@@ -368,7 +368,7 @@ class ThreeLineOrdergBot:
|
|
|
368
368
|
# 计算斜率，【正】表示两线距离扩张，【负】表示两线距离收缩
|
|
369
369
|
df['slope'] = df['diff'].abs().diff().round(6)
|
|
370
370
|
|
|
371
|
-
self.logger.debug(f"{symbol}: slopes = {df['slope'].iloc[-6:-1]} ")
|
|
371
|
+
self.logger.debug(f"{symbol}: slopes = {df['slope'].iloc[-6:-1].round(6)} ")
|
|
372
372
|
# 检查最后两个斜率是否都为负
|
|
373
373
|
# 取slopes最新的第2个和第3个值进行判断
|
|
374
374
|
return all(slope < 0 for slope in df['slope'].iloc[-3:-1])
|
|
@@ -476,8 +476,8 @@ class ThreeLineOrdergBot:
|
|
|
476
476
|
self.logger.debug(f"{symbol} 当前没有金叉死叉，以快线趋势为准。！")
|
|
477
477
|
|
|
478
478
|
|
|
479
|
-
if not is_bullish_trend and not is_bearish_trend :
|
|
480
|
-
self.logger.info(f"{symbol} 当前是震荡趋势（平），不挂单！！")
|
|
479
|
+
if (not is_bullish_trend and not is_bearish_trend) or direction == -1 :
|
|
480
|
+
self.logger.info(f"{symbol} 当前是震荡趋势（平），不挂单！！direction={direction}")
|
|
481
481
|
return
|
|
482
482
|
|
|
483
483
|
'''
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
maker/ThreeLineOrderBot.py,sha256=
|
|
1
|
+
maker/ThreeLineOrderBot.py,sha256=e-4QfGCm9BvXgqB14yr6Az-HEiMvvX7CZPfsFOlQd8E,24125
|
|
2
2
|
maker/WickReversalOrderBot.py,sha256=Oc6wChdWu39lfWh3NRHM8BqvaRIYDNZiDR6PDnE9XUM,17374
|
|
3
3
|
maker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
4
4
|
maker/config.py,sha256=YPxghO5i0vgRg9Cja8kGj9O7pgSbbtzOgf3RexqXXwY,1188
|
|
@@ -7,7 +7,7 @@ maker/main_m.py,sha256=0PzDTnuBrxfpy5WDfsIHKAzZ_7pkuvuqqeWik0vpWio,15522
|
|
|
7
7
|
maker/okxapi.py,sha256=_9G0U_o0ZC8NxaT6PqpiLgxBm9gPobC9PsFHZE1c5w0,553
|
|
8
8
|
maker/zhen.py.bak,sha256=HNkrQbJts8G9umE9chEFsc0cLQApcM9KOVNMYPpkBXM,10918
|
|
9
9
|
maker/zhen_2.py,sha256=4IaHVtTCMSlrLGSTZrWpW2q-f7HZsUNRkW_-5QgWv24,10509
|
|
10
|
-
openfund_maker-1.0.
|
|
11
|
-
openfund_maker-1.0.
|
|
12
|
-
openfund_maker-1.0.
|
|
13
|
-
openfund_maker-1.0.
|
|
10
|
+
openfund_maker-1.0.12.dist-info/METADATA,sha256=HLtb6_bnOynwvErWbyu2fHqE3pJO9WLwRayX0_ElcUs,1966
|
|
11
|
+
openfund_maker-1.0.12.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
|
|
12
|
+
openfund_maker-1.0.12.dist-info/entry_points.txt,sha256=gKMytICEKcMRFQDFkHZLnIpID7UQFoTIM_xcpiiV6Ns,50
|
|
13
|
+
openfund_maker-1.0.12.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|