From 1f6794ea4121593695c6b20843dc3011598cc8b8 Mon Sep 17 00:00:00 2001 From: binz <123@123.com> Date: Sun, 2 Jun 2024 20:06:56 +0800 Subject: [PATCH] =?UTF-8?q?Bug:=20=E4=BF=AE=E6=AD=A3exclued=5Flist?= =?UTF-8?q?=E7=9A=84=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91=EF=BC=8C=E5=85=88?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BB=A5=E4=BA=A4?= =?UTF-8?q?=E6=98=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- trader.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/trader.py b/trader.py index b6c451f..d500e6c 100644 --- a/trader.py +++ b/trader.py @@ -307,6 +307,8 @@ class Trader(Account): # 异常强制卖出 for stock in last_position.index: if stock in force_exclude: + if stock_status.loc[stock] in [0,2,5,7]: + continue sell_list.append(stock) force_sell_num = len(sell_list) # 按照反向排名逐个卖出 @@ -420,9 +422,11 @@ class Trader(Account): # 异常强制卖出 for stock in last_margin_list: if stock in force_exclude: + if stock_status.loc[stock] in [0,2,5,7]: + continue sell_list.append(stock) - force_sell_num = len(sell_list) + for stock in factor.loc[last_margin_list].sort_values(ascending=self.ascending).index.values[::-1]: if len(sell_list) >= int(max_sell_num * margin_ratio) + force_sell_num + 1: break