hikyuu 2.1.5__cp38-none-win_amd64.whl → 2.2.0__cp38-none-win_amd64.whl

hikyuu/analysis/analysis.py

@@ -31,6 +31,11 @@ def combinate_ind_analysis(
     :param list keys: 输出 Performance 统计项
     :rtype: pd.DataFrame
     '''
+    if not keys:
+        for key in keys:
+            if not Performance.exist(key):
+                raise Exception(f'Invalid key: {key}')
+
     pers = inner_combinate_ind_analysis(stk, query, tm, sys, buy_inds, sell_inds, n)
 
     if not keys:
@@ -75,6 +80,11 @@ def combinate_ind_analysis_multi(
     :param int n: 买入信号组合时的周期
     :param list keys: 输出 Performance 统计项
     '''
+    if not keys:
+        for key in keys:
+            if not Performance.exist(key):
+                raise Exception(f'Invalid key: {key}')
+
     if isinstance(stks, Block):
         blks = stks
     else:
@@ -95,6 +105,11 @@ def combinate_ind_analysis_multi(
 
 
 def analysis_sys_list(stks, query, sys_proto, keys=["累计投入本金", "当前总资产", "现金余额", "未平仓头寸净值", "赢利交易比例%", "赢利交易数", "亏损交易数"]):
+    if not keys:
+        for key in keys:
+            if not Performance.exist(key):
+                raise Exception(f'Invalid key: {key}')
+
     names = ["证券代码", "证券名称"]
     names.extend(keys)
     ret = {}
@@ -119,6 +134,11 @@ def analysis_sys_list(stks, query, sys_proto, keys=["累计投入本金", "当
 
 
 def analysis_sys_list_multi(stks, query, sys_proto, keys=["累计投入本金", "当前总资产", "现金余额", "未平仓头寸净值", "赢利交易比例%", "赢利交易数", "亏损交易数"]):
+    if not keys:
+        for key in keys:
+            if not Performance.exist(key):
+                raise Exception(f'Invalid key: {key}')
+
     out = inner_analysis_sys_list(stks, query, sys_proto)
     if not keys:
         ret = out

hikyuu/data/common.py

@@ -91,7 +91,7 @@ def get_stktype_list(quotations=None):
 
 
 @hku_catch(ret=[], trace=True)
-@timeout(120)
+@timeout(30)
 def get_stk_code_name_list(market: str) -> list:
     """
     获取指定证券交易所股票代码与名称列表
@@ -128,7 +128,7 @@ def get_stk_code_name_list(market: str) -> list:
 
 
 @hku_catch(ret=[], trace=True)
-@timeout(120)
+@timeout(60)
 def get_index_code_name_list() -> list:
     """
     获取所有股票指数代码名称列表
@@ -191,7 +191,7 @@ def get_new_holidays():
 
 
 @hku_catch(ret=[], trace=True)
-@timeout(120)
+@timeout(60)
 def get_china_bond10_rate(start_date="19901219"):
     """获取中国国债收益率10年"""
     bond_zh_us_rate_df = ak.bond_zh_us_rate(start_date)

hikyuu/data/mysql_upgrade/0023.sql

@@ -0,0 +1,4 @@
+DELETE FROM `hku_base`.`stkweight`;
+alter table `hku_base`.`stkweight` add `suogu` DOUBLE not null default 0;
+ALTER TABLE `hku_base`.`stkweight` AUTO_INCREMENT = 1;
+UPDATE `hku_base`.`version` set `version` = 23;

hikyuu/data/pytdx_weight_to_mysql.py

@@ -51,7 +51,7 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
         cur.execute(
             "select id, stockid, date, countAsGift, countForSell, priceForSell, \
                     bonus, countOfIncreasement, totalCount, \
-                    freeCount from `hku_base`.`stkweight` where stockid=%s \
+                    freeCount, suogu from `hku_base`.`stkweight` where stockid=%s \
                     order by date desc limit 1" % stockid
         )
         a = [x for x in cur.fetchall()]
@@ -79,10 +79,6 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
                     if xdxr['songzhuangu'] is not None:
                         new_last_db_weight[3] = 10000 * xdxr['songzhuangu']
                         update_last_db_weight = True
-                    if xdxr['suogu'] is not None:
-                        # etf 扩股
-                        new_last_db_weight[3] += 100000 * (xdxr['suogu']-1)
-                        update_last_db_weight = True
                     if xdxr['peigu'] is not None:
                         new_last_db_weight[4] = 10000 * xdxr['peigu']
                         update_last_db_weight = True
@@ -100,26 +96,27 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
                         new_last_db_weight[9] = xdxr['panhouliutong']
                         update_last_db_weight = True
                         last_free_count = new_last_db_weight[9]
+                    if xdxr['suogu'] is not None:
+                        # etf 扩缩股
+                        new_last_db_weight[10] = xdxr['suogu']
+                        update_last_db_weight = True
                     continue
                 if date not in records:
-                    songzhuangu = 10000 * xdxr['songzhuangu'] if xdxr['songzhuangu'] is not None else 0
-                    songzhuangu += 100000 * (xdxr['suogu']-1) if xdxr['suogu'] is not None else 0
                     records[date] = [
                         stockid,
                         date,
-                        songzhuangu,  # countAsGift
+                        10000 * xdxr['songzhuangu'] if xdxr['songzhuangu'] is not None else 0,  # countAsGift
                         10000 * xdxr['peigu'] if xdxr['peigu'] is not None else 0,  # countForSell
                         1000 * xdxr['peigujia'] if xdxr['peigujia'] is not None else 0,  # priceForSell
                         1000 * xdxr['fenhong'] if xdxr['fenhong'] is not None else 0,  # bonus
                         0,  # countOfIncreasement, pytdx 不区分送股和转增股，统一记在送股
                         xdxr['houzongguben'] if xdxr['houzongguben'] is not None else last_total_count,  # totalCount
-                        xdxr['panhouliutong'] if xdxr['panhouliutong'] is not None else last_free_count  # freeCount
+                        xdxr['panhouliutong'] if xdxr['panhouliutong'] is not None else last_free_count,  # freeCount
+                        xdxr["suogu"] if xdxr["suogu"] is not None else 0
                     ]
                 else:
                     if xdxr['songzhuangu'] is not None:
                         records[date][2] = 10000 * xdxr['songzhuangu']
-                    if xdxr['suogu'] is not None:
-                        records[date][2] += 100000 * (xdxr['suogu']-1)
                     if xdxr['peigu'] is not None:
                         records[date][3] = 10000 * xdxr['peigu']
                     if xdxr['peigujia'] is not None:
@@ -130,6 +127,8 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
                         records[date][7] = xdxr['houzongguben']
                     if xdxr['panhouliutong'] is not None:
                         records[date][8] = xdxr['panhouliutong']
+                    if xdxr['suogu'] is not None:
+                        records[date][9] = xdxr['suogu']
                 if xdxr['houzongguben'] is not None:
                     last_total_count = xdxr['houzongguben']
                 if xdxr['panhouliutong'] is not None:
@@ -144,8 +143,8 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
             x = new_last_db_weight
             cur.execute(
                 "UPDATE `hku_base`.`stkweight` SET countAsGift=%s, countForSell=%s, priceForSell=%s, \
-                    bonus=%s, totalCount=%s, freeCount=%s \
-                    where id=%s" % (x[3], x[4], x[5], x[6], x[8], x[9], x[0])
+                    bonus=%s, totalCount=%s, freeCount=%s, suogu=%s \
+                    where id=%s" % (x[3], x[4], x[5], x[6], x[8], x[9], x[10], x[0])
             )
             connect.commit()
             cur.close()
@@ -154,8 +153,8 @@ def pytdx_import_weight_to_mysql(pytdx_api, connect, market):
             cur = connect.cursor()
             cur.executemany(
                 "INSERT INTO `hku_base`.`stkweight` (stockid, date, countAsGift, \
-                             countForSell, priceForSell, bonus, countOfIncreasement, totalCount, freeCount) \
-                             VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s)", [x for x in records.values()]
+                countForSell, priceForSell, bonus, countOfIncreasement, totalCount, freeCount, suogu) \
+                VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)", [x for x in records.values()]
             )
             connect.commit()
             cur.close()

hikyuu/data/pytdx_weight_to_sqlite.py

@@ -48,7 +48,7 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
         a = cur.execute(
             "select id, stockid, date, countAsGift, countForSell, priceForSell, \
                     bonus, countOfIncreasement, totalCount, \
-                    freeCount from stkweight where stockid=%s \
+                    freeCount, suogu from stkweight where stockid=%s \
                     order by date desc limit 1" % stockid
         )
         a = [x for x in a]
@@ -76,10 +76,6 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
                     if xdxr['songzhuangu'] is not None:
                         new_last_db_weight[3] = int(10000 * xdxr['songzhuangu'])
                         update_last_db_weight = True
-                    if xdxr['suogu'] is not None:
-                        # etf 扩股
-                        new_last_db_weight[3] += int(100000 * (xdxr['suogu']-1))
-                        update_last_db_weight = True
                     if xdxr['peigu'] is not None:
                         new_last_db_weight[4] = int(10000 * xdxr['peigu'])
                         update_last_db_weight = True
@@ -97,14 +93,16 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
                         new_last_db_weight[9] = round(xdxr['panhouliutong'])
                         update_last_db_weight = True
                         last_free_count = new_last_db_weight[9]
+                    if xdxr['suogu'] is not None:
+                        # etf 扩股
+                        new_last_db_weight[10] = xdxr['suogu']
+                        update_last_db_weight = True
                     continue
                 if date not in records:
-                    songzhuangu = int(10000 * xdxr['songzhuangu']) if xdxr['songzhuangu'] is not None else 0
-                    songzhuangu += int(100000 * (xdxr['suogu']-1)) if xdxr['suogu'] is not None else 0
                     records[date] = [
                         stockid,
                         date,
-                        songzhuangu,  # countForGift
+                        int(10000 * xdxr['songzhuangu']) if xdxr['songzhuangu'] is not None else 0,  # countForGift
                         int(10000 * xdxr['peigu']) if xdxr['peigu'] is not None else 0,  # countForSell
                         int(1000 * xdxr['peigujia']) if xdxr['peigujia'] is not None else 0,  # priceForSell
                         int(1000 * xdxr['fenhong']) if xdxr['fenhong'] is not None else 0,  # bonus
@@ -112,13 +110,12 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
                         round(xdxr['houzongguben'])
                         if xdxr['houzongguben'] is not None else last_total_count,  # totalCount
                         round(xdxr['panhouliutong'])
-                        if xdxr['panhouliutong'] is not None else last_free_count  # freeCount
+                        if xdxr['panhouliutong'] is not None else last_free_count,  # freeCount
+                        xdxr["suogu"] if xdxr["suogu"] is not None else 0
                     ]
                 else:
                     if xdxr['songzhuangu'] is not None:
                         records[date][2] = int(10000 * xdxr['songzhuangu'])
-                    if xdxr['suogu'] is not None:
-                        records[date][2] += int(100000 * (xdxr['suogu']-1))
                     if xdxr['peigu'] is not None:
                         records[date][3] = int(10000 * xdxr['peigu'])
                     if xdxr['peigujia'] is not None:
@@ -129,6 +126,8 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
                         records[date][7] = round(xdxr['houzongguben'])
                     if xdxr['panhouliutong'] is not None:
                         records[date][8] = round(xdxr['panhouliutong'])
+                    if xdxr['suogu'] is not None:
+                        records[date][9] = xdxr['suogu']
                 if xdxr['houzongguben'] is not None:
                     last_total_count = round(xdxr['houzongguben'])
                 if xdxr['panhouliutong'] is not None:
@@ -143,8 +142,8 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
             x = new_last_db_weight
             cur.execute(
                 "UPDATE StkWeight SET countAsGift=%s, countForSell=%s, priceForSell=%s, \
-                    bonus=%s, totalCount=%s, freeCount=%s \
-                    where id=%s" % (x[3], x[4], x[5], x[6], x[8], x[9], x[0])
+                    bonus=%s, totalCount=%s, freeCount=%s, suogu=%s \
+                    where id=%s" % (x[3], x[4], x[5], x[6], x[8], x[9], x[10], x[0])
             )
             connect.commit()
             cur.close()
@@ -153,8 +152,8 @@ def pytdx_import_weight_to_sqlite(pytdx_api, connect, market):
             cur = connect.cursor()
             cur.executemany(
                 "INSERT INTO StkWeight(stockid, date, countAsGift, \
-                             countForSell, priceForSell, bonus, countOfIncreasement, totalCount, freeCount) \
-                             VALUES (?,?,?,?,?,?,?,?,?)", [x for x in records.values()]
+                             countForSell, priceForSell, bonus, countOfIncreasement, totalCount, freeCount, suogu) \
+                             VALUES (?,?,?,?,?,?,?,?,?,?)", [x for x in records.values()]
             )
             connect.commit()
             cur.close()

hikyuu/data/sqlite_upgrade/0024.sql

@@ -0,0 +1,22 @@
+BEGIN TRANSACTION;
+DROP TABLE `stkWeight`;
+CREATE TABLE "stkWeight" (
+	id INTEGER NOT NULL, 
+	stockid INTEGER, 
+	date INTEGER, 
+	"countAsGift" INTEGER, 
+	"countForSell" INTEGER, 
+	"priceForSell" INTEGER, 
+	bonus INTEGER, 
+	"countOfIncreasement" INTEGER, 
+	"totalCount" INTEGER, 
+	"freeCount" INTEGER, 
+    "suogu" NUMBER,
+	PRIMARY KEY (id AUTOINCREMENT),
+	 FOREIGN KEY(stockid) REFERENCES "Stock" (stockid)
+);
+CREATE INDEX "ix_stkWeight_stockid" ON "stkWeight" (stockid);
+CREATE INDEX "ix_stkWeight_date" ON "stkWeight" (date);
+CREATE INDEX "ix_stkWeight" ON "stkWeight" (stockid, date);
+UPDATE `version` set `version` = 24;
+COMMIT;

hikyuu/gui/HikyuuTDX.py

@@ -267,8 +267,6 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
 
         current_dir = os.path.dirname(__file__)
         self.setWindowIcon(QIcon("{}/hikyuu.ico".format(current_dir)))
-        # self.setFixedSize(self.width(), self.height())
-        self.import_status_label.setText('')
         self.import_detail_textEdit.clear()
         self.reset_progress_bar()
         self.day_start_dateEdit.setMinimumDate(datetime.date(1990, 12, 19))
@@ -703,6 +701,9 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
         self.start_import_pushButton.setEnabled(False)
         self.reset_progress_bar()
 
+        if config.getboolean('weight', 'enable', fallback=False):
+            self.hdf5_weight_label.setText("正在导入")
+
         self.import_status_label.setText("正在启动任务....")
         QApplication.processEvents()
 

hikyuu/gui/data/ImportHistoryFinanceTask.py

@@ -115,6 +115,13 @@ class ImportHistoryFinanceTask:
                         old_md5 = hashlib.md5(f.read()).hexdigest()
                     if old_md5 != item['hash']:
                         self.download_file(item)
+                    else:
+                        # 不管是否有变化，都导入一次，以便切换引擎时可以导入
+                        shutil.unpack_archive(dest_file, extract_dir=self.dest_dir)
+                        filename = item['filename']
+                        filename = f'{self.dest_dir}/{filename[0:-4]}.dat'
+                        self.import_to_db(filename)
+                        hku_info(f"Import finance file: {filename}")
                 count += 1
                 self.queue.put([self.task_name, None, None, int(100 * count / self.total_count), self.total_count])
             except Exception as e:

hikyuu/gui/data/ImportWeightToSqliteTask.py

@@ -91,8 +91,8 @@ class ImportWeightToSqliteTask:
             hku_check(api.connect(self.host, self.port), "failed connect pytdx {}:{}!", self.host, self.port)
 
             if self.cmd == 'weight':
-                count = pytdx_import_weight(api, connect, self.market)
-                self.logger.info("导入 {} 权息记录数: {}".format(self.market, count))
+                total_count = pytdx_import_weight(api, connect, self.market)
+                self.logger.info("导入 {} 权息记录数: {}".format(self.market, total_count))
                 self.queue.put([self.msg_name, '导入权息数据完毕!', 0, 0, f'{self.market} {total_count}'])
             elif self.cmd == 'finance':
                 self.queue.put([self.msg_name, f'下载通达信当前财务信息({self.market})...', 0, 0, 0])

hikyuu/gui/data/MainWindow.py

@@ -653,7 +653,7 @@ class Ui_MainWindow(object):
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入深证分时数据：</p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入权息数据数：</p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">导入完毕！</p></body></html>"))
-        self.import_status_label.setText(_translate("MainWindow", "import_status_label"))
+        self.import_status_label.setText(_translate("MainWindow", "请勿盘中导入！"))
         self.sched_import_pushButton.setText(_translate("MainWindow", "启动定时导入"))
         self.label_40.setText(_translate("MainWindow", "导入执行时间："))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "执行导入"))

hikyuu/include/hikyuu/StockWeight.h

@@ -20,13 +20,13 @@ namespace hku {
 class HKU_API StockWeight {
 public:
     /** 默认构造函数，返回Null<StockWeight>() */
-    StockWeight();
+    StockWeight() = default;
 
     explicit StockWeight(const Datetime& datetime);
 
     StockWeight(const Datetime& datetime, price_t countAsGift, price_t countForSell,
                 price_t priceForSell, price_t bonus, price_t increasement, price_t totalCount,
-                price_t freeCount);
+                price_t freeCount, price_t suogu);
 
     /** 权息日期 */
     Datetime datetime() const {
@@ -68,15 +68,21 @@ public:
         return m_freeCount;
     }
 
+    /** 扩缩股比例 */
+    price_t suogu() const {
+        return m_suogu;
+    }
+
 private:
-    Datetime m_datetime;     // 权息日期
-    price_t m_countAsGift;   // 每10股送X股
-    price_t m_countForSell;  // 每10股配X股
-    price_t m_priceForSell;  // 配股价
-    price_t m_bonus;         // 每10股红利
-    price_t m_increasement;  // 每10股转增X股
-    price_t m_totalCount;    // 总股本（万股）
-    price_t m_freeCount;     // 流通股（万股）
+    Datetime m_datetime;         // 权息日期
+    price_t m_countAsGift{0.};   // 每10股送X股
+    price_t m_countForSell{0.};  // 每10股配X股
+    price_t m_priceForSell{0.};  // 配股价
+    price_t m_bonus{0.};         // 每10股红利
+    price_t m_increasement{0.};  // 每10股转增X股
+    price_t m_totalCount{0.};    // 总股本（万股）
+    price_t m_freeCount{0.};     // 流通股（万股）
+    price_t m_suogu{0.};         // 扩缩股比例
 };
 
 /** @ingroup StockManage */

hikyuu/include/hikyuu/analysis/analysis_sys.h

@@ -13,20 +13,20 @@
 
 namespace hku {
 
-struct HKU_API AnalysisSystemWithBlockOut {
+struct HKU_API AnalysisSystemOutput {
     string market_code;  ///< 证券代码
     string name;         ///< 证券名称
     PriceList values;    ///< 统计各项指标值
 
-    AnalysisSystemWithBlockOut() = default;
-    AnalysisSystemWithBlockOut(const AnalysisSystemWithBlockOut& other) = default;
-    AnalysisSystemWithBlockOut(AnalysisSystemWithBlockOut&& rv)
+    AnalysisSystemOutput() = default;
+    AnalysisSystemOutput(const AnalysisSystemOutput& other) = default;
+    AnalysisSystemOutput(AnalysisSystemOutput&& rv)
     : market_code(std::move(rv.market_code)),
       name(std::move(rv.name)),
       values(std::move(rv.values)) {}
 
-    AnalysisSystemWithBlockOut& operator=(const AnalysisSystemWithBlockOut&) = default;
-    AnalysisSystemWithBlockOut& operator=(AnalysisSystemWithBlockOut&& rv) {
+    AnalysisSystemOutput& operator=(const AnalysisSystemOutput&) = default;
+    AnalysisSystemOutput& operator=(AnalysisSystemOutput&& rv) {
         HKU_IF_RETURN(this == &rv, *this);
         market_code = std::move(rv.market_code);
         name = std::move(rv.name);
@@ -35,12 +35,42 @@ struct HKU_API AnalysisSystemWithBlockOut {
     }
 };
 
-vector<AnalysisSystemWithBlockOut> HKU_API analysisSystemList(const SystemList& sys_list,
-                                                              const StockList& stk_list,
-                                                              const KQuery& query);
+/**
+ * 统计所有指定系统策略, 系统列表中的每一个系统都应该是独立的系统实例
+ * @note 系统实例列表和证券列表是一一对应，不是两两组合
+ * @param sys_list 系统策略实例列表
+ * @param stk_list 证券列表，须与系统策略列表一一对应
+ * @param query 查询条件
+ * @return vector<AnalysisSystemOutput>
+ */
+vector<AnalysisSystemOutput> HKU_API analysisSystemList(const SystemList& sys_list,
+                                                        const StockList& stk_list,
+                                                        const KQuery& query);
+
+/**
+ * 以指定的 stock 统计执行所有的系统策略
+ * @param sys_list 系统策略思路列表，每一个都应是单独的实例
+ * @param stk 指定证券
+ * @param query 查询条件
+ * @return vector<AnalysisSystemOutput>
+ */
+vector<AnalysisSystemOutput> HKU_API analysisSystemList(const SystemList& sys_list,
+                                                        const Stock& stk, const KQuery& query);
 
-vector<AnalysisSystemWithBlockOut> HKU_API analysisSystemList(const StockList& stk_list,
-                                                              const KQuery& query,
-                                                              const SystemPtr& pro_sys);
+/**
+ * 以指定的 stock 统计执行所有的系统策略，并按指定的统计项返回统计项最高或最低的系统实例及其统计值
+ * @param sys_list 系统策略思路列表，每一个都应是单独的实例
+ * @param stk 指定证券
+ * @param query 查询条件
+ * @param sort_key Performance 中的统计项名称，按该统计项返回
+ * @param sort_mode 0 为取统计最高值的系统，其他值为取统计最低值的系统
+ * @return std::pair<double, SYSPtr>
+ */
+std::pair<double, SYSPtr> HKU_API findOptimalSystem(const SystemList& sys_list, const Stock& stk,
+                                                    const KQuery& query, const string& sort_key,
+                                                    int sort_mode = 0);
 
+std::pair<double, SYSPtr> HKU_API findOptimalSystemMulti(const SystemList& sys_list,
+                                                         const Stock& stk, const KQuery& query,
+                                                         const string& sort_key, int sort_mode = 0);
 }  // namespace hku

hikyuu/include/hikyuu/data_driver/base_info/table/StockWeightTable.h

@@ -16,8 +16,8 @@
 namespace hku {
 
 class StockWeightTable {
-    TABLE_BIND9(StockWeightTable, stkweight, stockid, date, countAsGift, countForSell, priceForSell,
-                bonus, countOfIncreasement, totalCount, freeCount)
+    TABLE_BIND10(StockWeightTable, stkweight, stockid, date, countAsGift, countForSell,
+                 priceForSell, bonus, countOfIncreasement, totalCount, freeCount, suogu)
 
 public:
     uint64_t stockid{0};
@@ -29,11 +29,12 @@ public:
     double countOfIncreasement{0.};
     double totalCount{0.};
     double freeCount{0.};
+    double suogu{0.};
 };
 
 struct StockWeightTableView {
-    TABLE_BIND9(StockWeightTableView, stkweight, market_code, date, countAsGift, countForSell,
-                priceForSell, bonus, countOfIncreasement, totalCount, freeCount)
+    TABLE_BIND10(StockWeightTableView, stkweight, market_code, date, countAsGift, countForSell,
+                 priceForSell, bonus, countOfIncreasement, totalCount, freeCount, suogu)
     string market_code;
     uint64_t date{0};
     double countAsGift{0.};
@@ -43,6 +44,7 @@ struct StockWeightTableView {
     double countOfIncreasement{0.};
     double totalCount{0.};
     double freeCount{0.};
+    double suogu{0.0};
 };
 
 }  // namespace hku

hikyuu/include/hikyuu/global/agent/SpotAgent.h

@@ -125,12 +125,11 @@ private:
     enum STATUS m_status = WAITING;      // 当前内部状态
     std::atomic_bool m_stop = true;      // 结束代理工作标识
 
-    int m_revTimeout = 100;            // 连接数据服务超时时长（毫秒）
-    size_t m_batch_count = 0;          // 记录本次批次接收的数据数量
-    std::thread m_receiveThread;       // 数据接收线程
-    std::unique_ptr<ThreadPool> m_tg;  // 数据处理任务线程池
-    size_t m_work_num = 1;             // 数据处理任务线程池线程数
-    vector<std::future<void>> m_process_task_list;
+    int m_revTimeout = 100;                         // 连接数据服务超时时长（毫秒）
+    std::thread m_receiveThread;                    // 数据接收线程
+    std::unique_ptr<ThreadPool> m_tg;               // 数据处理任务线程池
+    size_t m_work_num = 1;                          // 数据处理任务线程池线程数
+    std::unique_ptr<ThreadPool> m_receive_data_tg;  // 数据接收任务组
 
     bool m_print = true;   // 是否打印连接信息
     string m_server_addr;  // 服务器地址

hikyuu/include/hikyuu/indicator/crt/IC.h

@@ -18,23 +18,24 @@ namespace hku {
  * @param query 查询条件
  * @param ref_stk 参照证券，默认 sh000300 沪深300
  * @param n 时间窗口 (对应 n 日收益率)
+ * @param spearman 使用 spearman 相关系数，否则为 pearson
  * @return Indicator
  * @ingroup Indicator
  */
 Indicator HKU_API IC(const StockList& stks, const KQuery& query,
-                     const Stock& ref_stk = getStock("sh000300"), int n = 1);
+                     const Stock& ref_stk = getStock("sh000300"), int n = 1, bool spearman = true);
 
 Indicator HKU_API IC(const Block& blk, const KQuery& query,
-                     const Stock& ref_stk = getStock("sh000300"), int n = 1);
+                     const Stock& ref_stk = getStock("sh000300"), int n = 1, bool spearman = true);
 
 inline Indicator IC(const Indicator& ind, const StockList& stks, const KQuery& query,
-                    const Stock& ref_stk = getStock("sh000300"), int n = 1) {
-    return IC(stks, query, ref_stk, n)(ind);
+                    const Stock& ref_stk = getStock("sh000300"), int n = 1, bool spearman = true) {
+    return IC(stks, query, ref_stk, n, spearman)(ind);
 }
 
 inline Indicator IC(const Indicator& ind, const Block& blk, const KQuery& query,
-                    const Stock& ref_stk = getStock("sh000300"), int n = 1) {
-    return IC(blk, query, ref_stk, n)(ind);
+                    const Stock& ref_stk = getStock("sh000300"), int n = 1, bool spearman = true) {
+    return IC(blk, query, ref_stk, n, spearman)(ind);
 }
 
 }  // namespace hku

hikyuu/include/hikyuu/indicator/crt/ICIR.h

@@ -22,12 +22,14 @@ namespace hku {
  * @param ref_stk 参照证券，默认 sh000300 沪深300
  * @param n IC对应的N日收益率
  * @param rolling_n 滚动时间窗口
+ * @param spearman 使用 spearman 相关系数，否则为 pearson
  * @return Indicator
  * @ingroup Indicator
  */
 inline Indicator ICIR(const Indicator& ind, const StockList& stks, const KQuery& query,
-                      const Stock& ref_stk = getStock("sh000300"), int n = 1, int rolling_n = 120) {
-    Indicator ic = IC(ind, stks, query, ref_stk, n);
+                      const Stock& ref_stk = getStock("sh000300"), int n = 1, int rolling_n = 120,
+                      bool spearman = true) {
+    Indicator ic = IC(ind, stks, query, ref_stk, n, spearman);
     Indicator x = MA(ic, rolling_n) / STDEV(ic, rolling_n);
     x.name("ICIR");
     x.setParam<int>("n", n);
@@ -36,8 +38,9 @@ inline Indicator ICIR(const Indicator& ind, const StockList& stks, const KQuery&
 }
 
 inline Indicator ICIR(const Indicator& ind, const Block& blk, const KQuery& query,
-                      const Stock& ref_stk = getStock("sh000300"), int n = 1, int rolling_n = 120) {
-    Indicator ic = IC(ind, blk, query, ref_stk, n);
+                      const Stock& ref_stk = getStock("sh000300"), int n = 1, int rolling_n = 120,
+                      bool spearman = true) {
+    Indicator ic = IC(ind, blk, query, ref_stk, n, spearman);
     Indicator x = MA(ic, rolling_n) / STDEV(ic, rolling_n);
     x.name("ICIR");
     x.setParam<int>("n", n);

hikyuu/include/hikyuu/indicator/imp/IIc.h

@@ -14,7 +14,7 @@ namespace hku {
 class IIc : public IndicatorImp {
 public:
     IIc();
-    IIc(const StockList& stks, const KQuery& query, int n, const Stock& ref_stk);
+    IIc(const StockList& stks, const KQuery& query, int n, const Stock& ref_stk, bool spearman);
     virtual ~IIc();
 
     virtual void _checkParam(const string& name) const override;

hikyuu/include/hikyuu/serialization/StockWeight_serialization.h

@@ -26,6 +26,7 @@ void save(Archive& ar, const hku::StockWeight& record, unsigned int version) {
     hku::price_t increasement = record.increasement();
     hku::price_t totalCount = record.totalCount();
     hku::price_t freeCount = record.freeCount();
+    hku::price_t suogu = record.suogu();
     ar& BOOST_SERIALIZATION_NVP(datetime);
     ar& BOOST_SERIALIZATION_NVP(countAsGift);
     ar& BOOST_SERIALIZATION_NVP(countForSell);
@@ -34,13 +35,14 @@ void save(Archive& ar, const hku::StockWeight& record, unsigned int version) {
     ar& BOOST_SERIALIZATION_NVP(increasement);
     ar& BOOST_SERIALIZATION_NVP(totalCount);
     ar& BOOST_SERIALIZATION_NVP(freeCount);
+    ar& BOOST_SERIALIZATION_NVP(suogu);
 }
 
 template <class Archive>
 void load(Archive& ar, hku::StockWeight& record, unsigned int version) {
     hku::uint64_t datetime;
     hku::price_t countAsGift, countForSell, priceForSell, bonus;
-    hku::price_t increasement, totalCount, freeCount;
+    hku::price_t increasement, totalCount, freeCount, suogu;
     ar& BOOST_SERIALIZATION_NVP(datetime);
     ar& BOOST_SERIALIZATION_NVP(countAsGift);
     ar& BOOST_SERIALIZATION_NVP(countForSell);
@@ -49,8 +51,9 @@ void load(Archive& ar, hku::StockWeight& record, unsigned int version) {
     ar& BOOST_SERIALIZATION_NVP(increasement);
     ar& BOOST_SERIALIZATION_NVP(totalCount);
     ar& BOOST_SERIALIZATION_NVP(freeCount);
+    ar& BOOST_SERIALIZATION_NVP(suogu);
     record = hku::StockWeight(hku::Datetime(datetime), countAsGift, countForSell, priceForSell,
-                              bonus, increasement, totalCount, freeCount);
+                              bonus, increasement, totalCount, freeCount, suogu);
 }
 }  // namespace serialization
 }  // namespace boost