openfund-taker 1.0.13__py3-none-any.whl → 1.0.14__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.
- {openfund_taker-1.0.13.dist-info → openfund_taker-1.0.14.dist-info}/METADATA +1 -1
- {openfund_taker-1.0.13.dist-info → openfund_taker-1.0.14.dist-info}/RECORD +5 -5
- taker/MultiAssetNewTradingBot.py +2 -2
- {openfund_taker-1.0.13.dist-info → openfund_taker-1.0.14.dist-info}/WHEEL +0 -0
- {openfund_taker-1.0.13.dist-info → openfund_taker-1.0.14.dist-info}/entry_points.txt +0 -0
@@ -1,4 +1,4 @@
|
|
1
|
-
taker/MultiAssetNewTradingBot.py,sha256=
|
1
|
+
taker/MultiAssetNewTradingBot.py,sha256=KLwSZmrrrMX78pFlbZz51j3C_i7wZtQF8kjbEAIWzEM,35044
|
2
2
|
taker/MultiAssetOldTradingBot.py,sha256=uBh_BxglvcbaHIsWHM7GI9Qa_QjzsxXaXJAAWEOMO5c,15315
|
3
3
|
taker/ThreeLineTradingBot.py,sha256=oXIoQ8z9AzKzk0z13d0ufj2KGBOk5iHJTJNZQRDKA5U,20625
|
4
4
|
taker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
@@ -9,7 +9,7 @@ taker/chua_ok_all.py,sha256=2XnZM6QdB3juSE1pqQIJyh2x1XuhlTlnBKNA3owlJ9E,15267
|
|
9
9
|
taker/chua_ok_bot.py,sha256=9SW0ujhi6PfN4yR1JZ9NaA37HtnXJ2QAWUfW52NG68w,13109
|
10
10
|
taker/config.py,sha256=YPxghO5i0vgRg9Cja8kGj9O7pgSbbtzOgf3RexqXXwY,1188
|
11
11
|
taker/main.py,sha256=8cLWzEvQDeELbY5Av7JqkEyYbaNqSbAbVl1tQHXzU8s,1954
|
12
|
-
openfund_taker-1.0.
|
13
|
-
openfund_taker-1.0.
|
14
|
-
openfund_taker-1.0.
|
15
|
-
openfund_taker-1.0.
|
12
|
+
openfund_taker-1.0.14.dist-info/METADATA,sha256=-24dsmCAqfnFGh9mZVYMe4qzQRqWYpbYM6iFHsPUQKc,7503
|
13
|
+
openfund_taker-1.0.14.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
|
14
|
+
openfund_taker-1.0.14.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
|
15
|
+
openfund_taker-1.0.14.dist-info/RECORD,,
|
taker/MultiAssetNewTradingBot.py
CHANGED
@@ -168,8 +168,8 @@ class MultiAssetNewTradingBot:
|
|
168
168
|
self.logger.debug(f"{symbol}: slopes = \n{df[['ema','sma','diff','slope','flag']].iloc[-6:-1]} ")
|
169
169
|
# 检查最后两个斜率是否都为负
|
170
170
|
# 取slopes最新的第2个和第3个值进行判断
|
171
|
-
|
172
|
-
return all(slope
|
171
|
+
# 20250213 因为有持仓,因此判定条件更严谨,只有收缩才平仓
|
172
|
+
return all(slope < 0.0 for slope in df['slope'].iloc[-3:-1])
|
173
173
|
|
174
174
|
# 定义根据均线斜率判断 K 线方向的函数: 0 空 1 多 -1 平
|
175
175
|
|
File without changes
|
File without changes
|