#update

hezhangke · Aug 1, 2020 · 87b1548 · 87b1548
1 parent 9d28160
commit 87b1548
Show file tree

Hide file tree

Showing 134 changed files with 392 additions and 466 deletions.
diff --git a/EXAMPLE/4_回测实盘交易/回测/股票回测/基于QAMARKET的回测/backtest.py b/EXAMPLE/4_回测实盘交易/回测/股票回测/基于QAMARKET的回测/backtest.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2016-2019 yutiansut/QUANTAXIS
+# Copyright (c) 2016-2020 yutiansut/QUANTAXIS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/EXAMPLE/4_回测实盘交易/回测/股票回测/多季度选股择时回测.py b/EXAMPLE/4_回测实盘交易/回测/股票回测/多季度选股择时回测.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2016-2019 yutiansut/QUANTAXIS
+# Copyright (c) 2016-2020 yutiansut/QUANTAXIS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/EXAMPLE/4_回测实盘交易/回测/股票回测/简易回测/simplebacktest.py b/EXAMPLE/4_回测实盘交易/回测/股票回测/简易回测/simplebacktest.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2016-2019 yutiansut/QUANTAXIS
+# Copyright (c) 2016-2020 yutiansut/QUANTAXIS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/EXAMPLE/4_回测实盘交易/回测/股票回测/超级简化版回测/simplebacktest.py b/EXAMPLE/4_回测实盘交易/回测/股票回测/超级简化版回测/simplebacktest.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2016-2019 yutiansut/QUANTAXIS
+# Copyright (c) 2016-2020 yutiansut/QUANTAXIS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/EXAMPLE/test_backtest/backtest_debug.py b/EXAMPLE/test_backtest/backtest_debug.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2016-2019 yutiansut/QUANTAXIS
+# Copyright (c) 2016-2020 yutiansut/QUANTAXIS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2019 yutiansut/QUANTAXIS
+Copyright (c) 2016-2020 yutiansut/QUANTAXIS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/QUANTAXIS/QAARP/QAAccount.py b/QUANTAXIS/QAARP/QAAccount.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2016-2019 yutiansut/QUANTAXIS
+# Copyright (c) 2016-2020 yutiansut/QUANTAXIS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/QUANTAXIS/QAARP/QAAccountPro.py b/QUANTAXIS/QAARP/QAAccountPro.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2016-2019 yutiansut/QUANTAXIS
+# Copyright (c) 2016-2020 yutiansut/QUANTAXIS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

diff --git a/QUANTAXIS/QAARP/QAPortfolio.py b/QUANTAXIS/QAARP/QAPortfolio.py
@@ -2,7 +2,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2016-2019 yutiansut/QUANTAXIS
+# Copyright (c) 2016-2020 yutiansut/QUANTAXIS
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -186,7 +186,6 @@ def init_hold_table(self):
     def init_hold(self):
         return self.init_hold_table.groupby('code').sum()
 
-
     @property
     def cash_available(self):
         return self.cash[-1]
@@ -504,14 +503,16 @@ def get_cash(self):
         return sum(
             [account.cash_available for account in self.accounts.values()]
         )
+
     def hold_table(self, datetime=None):
         """返回每个acc的hold
-        
+
         Keyword Arguments:
             datetime {[type]} -- [description] (default: {None})
         """
         return pd.concat(
-            [account.hold_table(datetime).reset_index().assign(account_cookie= account.account_cookie) for account in self.accounts.values()]
+            [account.hold_table(datetime).reset_index().assign(
+                account_cookie=account.account_cookie) for account in self.accounts.values()]
         ).set_index(['code', 'account_cookie']).sort_index()
 
     @property
@@ -530,7 +531,6 @@ def daily_hold(self):
             .groupby('date').sum().assign(account_cookie=self.portfolio_cookie)\
             .reset_index().set_index(['date', 'account_cookie'])
 
-
     @property
     def daily_frozen(self):
         return pd.concat([account.daily_frozen for account in list(self.accounts.values())], axis=1).sum(axis=1)
@@ -797,12 +797,10 @@ def daily_hold(self):
             .groupby('date').sum().assign(account_cookie=self.account_cookie)\
             .reset_index().set_index(['date', 'account_cookie'])
 
-
     @property
     def daily_frozen(self):
         return pd.concat([account.daily_frozen for account in self.accounts], axis=1, sort=False).sum(axis=1)
 
-
     @property
     def trade(self):
         return pd.concat([item.trade for item in self.accounts], sort=False).groupby(level=0).sum()\