From 12f7c91e3096186d8a3f24a53b4bb1898eef55b0 Mon Sep 17 00:00:00 2001
From: binz <123@123.com>
Date: Sat, 1 Jun 2024 16:32:51 +0800
Subject: [PATCH] =?UTF-8?q?Update:=20=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=90=8D=E5=BC=82=E5=B8=B8=E6=A3=80=E6=B5=8B=20(#11)=EF=BC=9B?=
 =?UTF-8?q?=20Update:=20=E4=BF=AE=E6=94=B9SpreadBacktest=E7=B1=BB=E5=90=8D?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spread_backtest.py | 2 +-
 trader.py          | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/spread_backtest.py b/spread_backtest.py
index 86aaaa4..bf2c999 100644
--- a/spread_backtest.py
+++ b/spread_backtest.py
@@ -8,7 +8,7 @@ from rich import print as rprint
 from rich.table import Table
 
 
-class Spread_Backtest():
+class SpreadBacktest():
     def __init__(
         self, 
         trader: Trader
diff --git a/trader.py b/trader.py
index 8f580cf..1bac6b2 100644
--- a/trader.py
+++ b/trader.py
@@ -36,6 +36,7 @@ class Trader(Account):
         exclude_list (list):                额外的剔除列表，会优先满足该剔除列表中的条件，之后再进行正常的调仓
             - abnormal: 异常公告剔除，包含中止上市、立案调查、警示函等异常情况的剔除
             - report: 财报同比下降50%以上剔除
+        account (Account):                  账户设置，account.Account
     """
     def __init__(self, 
                  signal: Dict[str, pd.DataFrame]=None,
@@ -57,9 +58,10 @@ class Trader(Account):
                      '2023-08-28': (0, 0.0005)
                  },
                  exclude_list: list=[],
+                 account: dict={},
                  **kwargs) -> None:
         # 初始化账户
-        super().__init__(**kwargs.get('account', {}))
+        super().__init__(account)
         if isinstance(signal, dict):
             self.signal = signal
             if 'close' in signal:
@@ -71,6 +73,8 @@ class Trader(Account):
         # --------------------
         # 参数检验
         # --------------------
+        if len(kwargs) > 0:
+            raise ValueError(f"Unexpected keyword argument '{','.join(kwargs.keys())}'")
         # interval
         self.interval = []
         for s in signal: