hikyuu 2.0.9__cp312-none-win_amd64.whl → 2.1.0__cp312-none-win_amd64.whl

hikyuu/analysis/analysis.py

@@ -109,11 +109,12 @@ def analysis_sys_list(stks, query, sys_proto, keys=["累计投入本金", "当
         k = stk.get_kdata(query)
         my_sys = sys_proto.clone()
         my_sys.run(k, reset_all=True)
-        per.statistics(my_sys.tm, k[-1].datetime if len(k) > 0 else Datetime())
-        ret["证券代码"].append(stk.market_code)
-        ret["证券名称"].append(stk.name)
-        for key in keys:
-            ret[key].append(per[key])
+        if len(k) > 0:
+            per.statistics(my_sys.tm, k[-1].datetime)
+            ret["证券代码"].append(stk.market_code)
+            ret["证券名称"].append(stk.name)
+            for key in keys:
+                ret[key].append(per[key])
     return pd.DataFrame(ret)
 
 

hikyuu/data/common.py

@@ -27,7 +27,6 @@ import re
 import akshare as ak
 import pandas as pd
 import datetime
-from hikyuu.core import cpp_bytes_to_vector_float_blob
 from hikyuu.util import *
 
 
@@ -203,7 +202,7 @@ def get_china_bond10_rate(start_date="19901219"):
 def modifiy_code(code):
     if code.startswith(('0', '3')):
         return 'SZ' + code
-    if code.startswith(('4', '8')):
+    if code.startswith(('4', '8', '92')):
         return 'BJ' + code
     if code.startswith('6'):
         return 'SH' + code
@@ -244,8 +243,6 @@ def historyfinancialreader(filepath):
         cw_info = list(struct.unpack(report_pack_format, info_data))
         report_date = int(cw_info[313])  # 财务公告日期
         report_date = 19000000 + report_date if report_date > 800000 else 20000000 + report_date
-        # results.append((modifiy_code(code), report_date, cw_info))
-        # results.append((file_date, modifiy_code(code), report_date, cpp_bytes_to_vector_float_blob(info_data)))
         results.append((file_date, modifiy_code(code), report_date, info_data))
     cw_file.close()
     return results

hikyuu/draw/drawplot/matplotlib_draw.py

@@ -760,7 +760,8 @@ def sys_performance(sys, ref_stk=None):
     ref_k = ref_stk.get_kdata(sys.query)
     hku_check(len(ref_k) > 0, "The length of ref_k is zero! Maybe The query date is out of the ref-stock range!\n ref_k: {}", ref_k)
 
-    query = Query(ref_k[0].datetime.start_of_day(), ref_k[-1].datetime.start_of_day() + Seconds(1), Query.DAY)
+    query = Query(ref_k[0].datetime.start_of_day(), ref_k[-1].datetime.start_of_day() +
+                  Seconds(1), Query.DAY, recover_type=Query.EQUAL_BACKWARD)
     ref_k = ref_stk.get_kdata(query)
 
     ref_dates = ref_k.get_datetime_list()
@@ -772,7 +773,7 @@ def sys_performance(sys, ref_stk=None):
     funds_return = VALUE(funds_return)
     funds_return.name = "系统累积收益率"
     ref_return = ROCR(ref_k.close, 0)
-    ref_return.name = ref_stk.name
+    ref_return.name = f"{ref_stk.name}({ref_stk.market_code})"
 
     per = Performance()
     text = per.report(sys.tm, query.end_datetime)

hikyuu/flat/Spot.py

@@ -438,142 +438,3 @@ def SpotEnd(builder):
 
 def End(builder):
     return SpotEnd(builder)
-
-
-class SpotT(object):
-
-    # SpotT
-    def __init__(self):
-        self.market = None  # type: str
-        self.code = None  # type: str
-        self.name = None  # type: str
-        self.datetime = None  # type: str
-        self.yesterdayClose = 0.0  # type: float
-        self.open = 0.0  # type: float
-        self.high = 0.0  # type: float
-        self.low = 0.0  # type: float
-        self.close = 0.0  # type: float
-        self.amount = 0.0  # type: float
-        self.volume = 0.0  # type: float
-        self.bid1 = 0.0  # type: float
-        self.bid1Amount = 0.0  # type: float
-        self.bid2 = 0.0  # type: float
-        self.bid2Amount = 0.0  # type: float
-        self.bid3 = 0.0  # type: float
-        self.bid3Amount = 0.0  # type: float
-        self.bid4 = 0.0  # type: float
-        self.bid4Amount = 0.0  # type: float
-        self.bid5 = 0.0  # type: float
-        self.bid5Amount = 0.0  # type: float
-        self.ask1 = 0.0  # type: float
-        self.ask1Amount = 0.0  # type: float
-        self.ask2 = 0.0  # type: float
-        self.ask2Amount = 0.0  # type: float
-        self.ask3 = 0.0  # type: float
-        self.ask3Amount = 0.0  # type: float
-        self.ask4 = 0.0  # type: float
-        self.ask4Amount = 0.0  # type: float
-        self.ask5 = 0.0  # type: float
-        self.ask5Amount = 0.0  # type: float
-
-    @classmethod
-    def InitFromBuf(cls, buf, pos):
-        spot = Spot()
-        spot.Init(buf, pos)
-        return cls.InitFromObj(spot)
-
-    @classmethod
-    def InitFromPackedBuf(cls, buf, pos=0):
-        n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, pos)
-        return cls.InitFromBuf(buf, pos+n)
-
-    @classmethod
-    def InitFromObj(cls, spot):
-        x = SpotT()
-        x._UnPack(spot)
-        return x
-
-    # SpotT
-    def _UnPack(self, spot):
-        if spot is None:
-            return
-        self.market = spot.Market()
-        self.code = spot.Code()
-        self.name = spot.Name()
-        self.datetime = spot.Datetime()
-        self.yesterdayClose = spot.YesterdayClose()
-        self.open = spot.Open()
-        self.high = spot.High()
-        self.low = spot.Low()
-        self.close = spot.Close()
-        self.amount = spot.Amount()
-        self.volume = spot.Volume()
-        self.bid1 = spot.Bid1()
-        self.bid1Amount = spot.Bid1Amount()
-        self.bid2 = spot.Bid2()
-        self.bid2Amount = spot.Bid2Amount()
-        self.bid3 = spot.Bid3()
-        self.bid3Amount = spot.Bid3Amount()
-        self.bid4 = spot.Bid4()
-        self.bid4Amount = spot.Bid4Amount()
-        self.bid5 = spot.Bid5()
-        self.bid5Amount = spot.Bid5Amount()
-        self.ask1 = spot.Ask1()
-        self.ask1Amount = spot.Ask1Amount()
-        self.ask2 = spot.Ask2()
-        self.ask2Amount = spot.Ask2Amount()
-        self.ask3 = spot.Ask3()
-        self.ask3Amount = spot.Ask3Amount()
-        self.ask4 = spot.Ask4()
-        self.ask4Amount = spot.Ask4Amount()
-        self.ask5 = spot.Ask5()
-        self.ask5Amount = spot.Ask5Amount()
-
-    # SpotT
-    def Pack(self, builder):
-        if self.market is not None:
-            market = builder.CreateString(self.market)
-        if self.code is not None:
-            code = builder.CreateString(self.code)
-        if self.name is not None:
-            name = builder.CreateString(self.name)
-        if self.datetime is not None:
-            datetime = builder.CreateString(self.datetime)
-        SpotStart(builder)
-        if self.market is not None:
-            SpotAddMarket(builder, market)
-        if self.code is not None:
-            SpotAddCode(builder, code)
-        if self.name is not None:
-            SpotAddName(builder, name)
-        if self.datetime is not None:
-            SpotAddDatetime(builder, datetime)
-        SpotAddYesterdayClose(builder, self.yesterdayClose)
-        SpotAddOpen(builder, self.open)
-        SpotAddHigh(builder, self.high)
-        SpotAddLow(builder, self.low)
-        SpotAddClose(builder, self.close)
-        SpotAddAmount(builder, self.amount)
-        SpotAddVolume(builder, self.volume)
-        SpotAddBid1(builder, self.bid1)
-        SpotAddBid1Amount(builder, self.bid1Amount)
-        SpotAddBid2(builder, self.bid2)
-        SpotAddBid2Amount(builder, self.bid2Amount)
-        SpotAddBid3(builder, self.bid3)
-        SpotAddBid3Amount(builder, self.bid3Amount)
-        SpotAddBid4(builder, self.bid4)
-        SpotAddBid4Amount(builder, self.bid4Amount)
-        SpotAddBid5(builder, self.bid5)
-        SpotAddBid5Amount(builder, self.bid5Amount)
-        SpotAddAsk1(builder, self.ask1)
-        SpotAddAsk1Amount(builder, self.ask1Amount)
-        SpotAddAsk2(builder, self.ask2)
-        SpotAddAsk2Amount(builder, self.ask2Amount)
-        SpotAddAsk3(builder, self.ask3)
-        SpotAddAsk3Amount(builder, self.ask3Amount)
-        SpotAddAsk4(builder, self.ask4)
-        SpotAddAsk4Amount(builder, self.ask4Amount)
-        SpotAddAsk5(builder, self.ask5)
-        SpotAddAsk5Amount(builder, self.ask5Amount)
-        spot = SpotEnd(builder)
-        return spot

hikyuu/flat/SpotList.py

@@ -64,7 +64,7 @@ def AddSpot(builder, spot):
 def SpotListStartSpotVector(builder, numElems):
     return builder.StartVector(4, numElems, 4)
 
-def StartSpotVector(builder, numElems: int) -> int:
+def StartSpotVector(builder, numElems):
     return SpotListStartSpotVector(builder, numElems)
 
 def SpotListEnd(builder):
@@ -72,61 +72,3 @@ def SpotListEnd(builder):
 
 def End(builder):
     return SpotListEnd(builder)
-
-import hikyuu.flat.Spot
-try:
-    from typing import List
-except:
-    pass
-
-class SpotListT(object):
-
-    # SpotListT
-    def __init__(self):
-        self.spot = None  # type: List[hikyuu.flat.Spot.SpotT]
-
-    @classmethod
-    def InitFromBuf(cls, buf, pos):
-        spotList = SpotList()
-        spotList.Init(buf, pos)
-        return cls.InitFromObj(spotList)
-
-    @classmethod
-    def InitFromPackedBuf(cls, buf, pos=0):
-        n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, pos)
-        return cls.InitFromBuf(buf, pos+n)
-
-    @classmethod
-    def InitFromObj(cls, spotList):
-        x = SpotListT()
-        x._UnPack(spotList)
-        return x
-
-    # SpotListT
-    def _UnPack(self, spotList):
-        if spotList is None:
-            return
-        if not spotList.SpotIsNone():
-            self.spot = []
-            for i in range(spotList.SpotLength()):
-                if spotList.Spot(i) is None:
-                    self.spot.append(None)
-                else:
-                    spot_ = hikyuu.flat.Spot.SpotT.InitFromObj(spotList.Spot(i))
-                    self.spot.append(spot_)
-
-    # SpotListT
-    def Pack(self, builder):
-        if self.spot is not None:
-            spotlist = []
-            for i in range(len(self.spot)):
-                spotlist.append(self.spot[i].Pack(builder))
-            SpotListStartSpotVector(builder, len(self.spot))
-            for i in reversed(range(len(self.spot))):
-                builder.PrependUOffsetTRelative(spotlist[i])
-            spot = builder.EndVector()
-        SpotListStart(builder)
-        if self.spot is not None:
-            SpotListAddSpot(builder, spot)
-        spotList = SpotListEnd(builder)
-        return spotList

hikyuu/gui/HikyuuTDX.py

@@ -675,6 +675,12 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
 
     @pyqtSlot()
     def on_start_import_pushButton_clicked(self):
+        try:
+            self.saveConfig()
+        except Exception as e:
+            QMessageBox.about(self, "保存配置信息失败", str(e))
+            return
+
         config = self.getCurrentConfig()
         if config.getboolean('hdf5', 'enable') \
                 and (not os.path.lexists(config['hdf5']['dir']) or not os.path.isdir(config['hdf5']['dir'])):
@@ -686,11 +692,6 @@ class MyMainWindow(QMainWindow, Ui_MainWindow):
                  or not os.path.isdir(config['tdx']['dir'])):
             QMessageBox.about(self, "错误", "请确认通达信安装目录是否正确！")
             return
-        try:
-            self.saveConfig()
-        except Exception as e:
-            QMessageBox.about(self, "保存配置信息失败", str(e))
-            return
 
         self.import_running = True
         self.start_import_pushButton.setEnabled(False)

hikyuu/gui/data/UseTdxImportToH5Thread.py

@@ -152,7 +152,7 @@ class UseTdxImportToH5Thread(QThread):
                 hdf5_import_progress[market][ktype] = progress
                 current_progress = (hdf5_import_progress['SH'][ktype] + hdf5_import_progress['SZ'][ktype]) // 2
                 self.send_message(['IMPORT_KDATA', ktype, current_progress])
-            elif taskname == 'IMPORT_KDATA':
+            elif taskname == 'IMPORT_FINANCE':
                 self.send_message([taskname, progress])
             else:
                 self.logger.error("Unknow task: {}".format(taskname))

hikyuu/hub.py

@@ -496,7 +496,7 @@ class HubManager(metaclass=SingletonType):
         """
         abs_path = os.path.abspath(filename)  # 当前文件的绝对路径
         path_parts = pathlib.Path(abs_path).parts
-        local_base = path_parts[-4] if path_parts[-3] in ('pf', 'sys', 'ind', 'other') else path_parts[4]
+        local_base = path_parts[-4] if path_parts[-3] in ('pf', 'sys', 'ind', 'other') else path_parts[-5]
         hub_model = self._session.query(HubModel.name).filter_by(local_base=local_base).first()
         checkif(hub_model is None, local_base, HubNotFoundError)
         return hub_model.name

hikyuu/include/hikyuu/Block.h

@@ -64,14 +64,14 @@ public:
     /** 设置板块类别 */
     void category(const string& category) {
         if (!m_data)
-            m_data = shared_ptr<Data>(new Data);
+            m_data = make_shared<Data>();
         m_data->m_category = category;
     }
 
     /** 设置名称 */
     void name(const string& name) {
         if (!m_data)
-            m_data = shared_ptr<Data>(new Data);
+            m_data = make_shared<Data>();
         m_data->m_name = name;
     }
 

hikyuu/include/hikyuu/config.h

@@ -34,6 +34,9 @@
 // 启用MSVC内存泄漏检查
 #define ENABLE_MSVC_LEAK_DETECT 0
 
+// 启用内存泄漏检测，用于 linux 系统
+#define HKU_ENABLE_LEAK_DETECT 0
+
 // 启用发送用户使用信息
 #define HKU_ENABLE_SEND_FEEDBACK 1
 

hikyuu/include/hikyuu/global/agent/hikyuu/__init__.py

@@ -0,0 +1 @@
+

hikyuu/include/hikyuu/global/agent/hikyuu/flat/__init__.py

@@ -0,0 +1 @@
+

hikyuu/include/hikyuu/global/agent/spot_generated.h

@@ -8,9 +8,9 @@
 
 // Ensure the included flatbuffers.h is the same version as when this file was
 // generated, otherwise it may not be compatible.
-static_assert(FLATBUFFERS_VERSION_MAJOR == 23 &&
-              FLATBUFFERS_VERSION_MINOR == 5 &&
-              FLATBUFFERS_VERSION_REVISION == 26,
+static_assert(FLATBUFFERS_VERSION_MAJOR == 24 &&
+              FLATBUFFERS_VERSION_MINOR == 3 &&
+              FLATBUFFERS_VERSION_REVISION == 25,
              "Non-compatible flatbuffers version included");
 
 namespace hikyuu {
@@ -18,49 +18,11 @@ namespace flat {
 
 struct Spot;
 struct SpotBuilder;
-struct SpotT;
 
 struct SpotList;
 struct SpotListBuilder;
-struct SpotListT;
-
-struct SpotT : public ::flatbuffers::NativeTable {
-  typedef Spot TableType;
-  std::string market{};
-  std::string code{};
-  std::string name{};
-  std::string datetime{};
-  double yesterday_close = 0.0;
-  double open = 0.0;
-  double high = 0.0;
-  double low = 0.0;
-  double close = 0.0;
-  double amount = 0.0;
-  double volume = 0.0;
-  double bid1 = 0.0;
-  double bid1_amount = 0.0;
-  double bid2 = 0.0;
-  double bid2_amount = 0.0;
-  double bid3 = 0.0;
-  double bid3_amount = 0.0;
-  double bid4 = 0.0;
-  double bid4_amount = 0.0;
-  double bid5 = 0.0;
-  double bid5_amount = 0.0;
-  double ask1 = 0.0;
-  double ask1_amount = 0.0;
-  double ask2 = 0.0;
-  double ask2_amount = 0.0;
-  double ask3 = 0.0;
-  double ask3_amount = 0.0;
-  double ask4 = 0.0;
-  double ask4_amount = 0.0;
-  double ask5 = 0.0;
-  double ask5_amount = 0.0;
-};
 
 struct Spot FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef SpotT NativeTableType;
   typedef SpotBuilder Builder;
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_MARKET = 4,
@@ -227,9 +189,6 @@ struct Spot FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
            VerifyField<double>(verifier, VT_ASK5_AMOUNT, 8) &&
            verifier.EndTable();
   }
-  SpotT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const;
-  void UnPackTo(SpotT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const;
-  static ::flatbuffers::Offset<Spot> Pack(::flatbuffers::FlatBufferBuilder &_fbb, const SpotT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr);
 };
 
 struct SpotBuilder {
@@ -480,19 +439,7 @@ inline ::flatbuffers::Offset<Spot> CreateSpotDirect(
       ask5_amount);
 }
 
-::flatbuffers::Offset<Spot> CreateSpot(::flatbuffers::FlatBufferBuilder &_fbb, const SpotT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr);
-
-struct SpotListT : public ::flatbuffers::NativeTable {
-  typedef SpotList TableType;
-  std::vector<std::unique_ptr<hikyuu::flat::SpotT>> spot{};
-  SpotListT() = default;
-  SpotListT(const SpotListT &o);
-  SpotListT(SpotListT&&) FLATBUFFERS_NOEXCEPT = default;
-  SpotListT &operator=(SpotListT o) FLATBUFFERS_NOEXCEPT;
-};
-
 struct SpotList FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
-  typedef SpotListT NativeTableType;
   typedef SpotListBuilder Builder;
   enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
     VT_SPOT = 4
@@ -507,9 +454,6 @@ struct SpotList FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
            verifier.VerifyVectorOfTables(spot()) &&
            verifier.EndTable();
   }
-  SpotListT *UnPack(const ::flatbuffers::resolver_function_t *_resolver = nullptr) const;
-  void UnPackTo(SpotListT *_o, const ::flatbuffers::resolver_function_t *_resolver = nullptr) const;
-  static ::flatbuffers::Offset<SpotList> Pack(::flatbuffers::FlatBufferBuilder &_fbb, const SpotListT* _o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr);
 };
 
 struct SpotListBuilder {
@@ -547,160 +491,6 @@ inline ::flatbuffers::Offset<SpotList> CreateSpotListDirect(
       spot__);
 }
 
-::flatbuffers::Offset<SpotList> CreateSpotList(::flatbuffers::FlatBufferBuilder &_fbb, const SpotListT *_o, const ::flatbuffers::rehasher_function_t *_rehasher = nullptr);
-
-inline SpotT *Spot::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const {
-  auto _o = std::unique_ptr<SpotT>(new SpotT());
-  UnPackTo(_o.get(), _resolver);
-  return _o.release();
-}
-
-inline void Spot::UnPackTo(SpotT *_o, const ::flatbuffers::resolver_function_t *_resolver) const {
-  (void)_o;
-  (void)_resolver;
-  { auto _e = market(); if (_e) _o->market = _e->str(); }
-  { auto _e = code(); if (_e) _o->code = _e->str(); }
-  { auto _e = name(); if (_e) _o->name = _e->str(); }
-  { auto _e = datetime(); if (_e) _o->datetime = _e->str(); }
-  { auto _e = yesterday_close(); _o->yesterday_close = _e; }
-  { auto _e = open(); _o->open = _e; }
-  { auto _e = high(); _o->high = _e; }
-  { auto _e = low(); _o->low = _e; }
-  { auto _e = close(); _o->close = _e; }
-  { auto _e = amount(); _o->amount = _e; }
-  { auto _e = volume(); _o->volume = _e; }
-  { auto _e = bid1(); _o->bid1 = _e; }
-  { auto _e = bid1_amount(); _o->bid1_amount = _e; }
-  { auto _e = bid2(); _o->bid2 = _e; }
-  { auto _e = bid2_amount(); _o->bid2_amount = _e; }
-  { auto _e = bid3(); _o->bid3 = _e; }
-  { auto _e = bid3_amount(); _o->bid3_amount = _e; }
-  { auto _e = bid4(); _o->bid4 = _e; }
-  { auto _e = bid4_amount(); _o->bid4_amount = _e; }
-  { auto _e = bid5(); _o->bid5 = _e; }
-  { auto _e = bid5_amount(); _o->bid5_amount = _e; }
-  { auto _e = ask1(); _o->ask1 = _e; }
-  { auto _e = ask1_amount(); _o->ask1_amount = _e; }
-  { auto _e = ask2(); _o->ask2 = _e; }
-  { auto _e = ask2_amount(); _o->ask2_amount = _e; }
-  { auto _e = ask3(); _o->ask3 = _e; }
-  { auto _e = ask3_amount(); _o->ask3_amount = _e; }
-  { auto _e = ask4(); _o->ask4 = _e; }
-  { auto _e = ask4_amount(); _o->ask4_amount = _e; }
-  { auto _e = ask5(); _o->ask5 = _e; }
-  { auto _e = ask5_amount(); _o->ask5_amount = _e; }
-}
-
-inline ::flatbuffers::Offset<Spot> Spot::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const SpotT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) {
-  return CreateSpot(_fbb, _o, _rehasher);
-}
-
-inline ::flatbuffers::Offset<Spot> CreateSpot(::flatbuffers::FlatBufferBuilder &_fbb, const SpotT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) {
-  (void)_rehasher;
-  (void)_o;
-  struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const SpotT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
-  auto _market = _o->market.empty() ? 0 : _fbb.CreateString(_o->market);
-  auto _code = _o->code.empty() ? 0 : _fbb.CreateString(_o->code);
-  auto _name = _o->name.empty() ? 0 : _fbb.CreateString(_o->name);
-  auto _datetime = _o->datetime.empty() ? 0 : _fbb.CreateString(_o->datetime);
-  auto _yesterday_close = _o->yesterday_close;
-  auto _open = _o->open;
-  auto _high = _o->high;
-  auto _low = _o->low;
-  auto _close = _o->close;
-  auto _amount = _o->amount;
-  auto _volume = _o->volume;
-  auto _bid1 = _o->bid1;
-  auto _bid1_amount = _o->bid1_amount;
-  auto _bid2 = _o->bid2;
-  auto _bid2_amount = _o->bid2_amount;
-  auto _bid3 = _o->bid3;
-  auto _bid3_amount = _o->bid3_amount;
-  auto _bid4 = _o->bid4;
-  auto _bid4_amount = _o->bid4_amount;
-  auto _bid5 = _o->bid5;
-  auto _bid5_amount = _o->bid5_amount;
-  auto _ask1 = _o->ask1;
-  auto _ask1_amount = _o->ask1_amount;
-  auto _ask2 = _o->ask2;
-  auto _ask2_amount = _o->ask2_amount;
-  auto _ask3 = _o->ask3;
-  auto _ask3_amount = _o->ask3_amount;
-  auto _ask4 = _o->ask4;
-  auto _ask4_amount = _o->ask4_amount;
-  auto _ask5 = _o->ask5;
-  auto _ask5_amount = _o->ask5_amount;
-  return hikyuu::flat::CreateSpot(
-      _fbb,
-      _market,
-      _code,
-      _name,
-      _datetime,
-      _yesterday_close,
-      _open,
-      _high,
-      _low,
-      _close,
-      _amount,
-      _volume,
-      _bid1,
-      _bid1_amount,
-      _bid2,
-      _bid2_amount,
-      _bid3,
-      _bid3_amount,
-      _bid4,
-      _bid4_amount,
-      _bid5,
-      _bid5_amount,
-      _ask1,
-      _ask1_amount,
-      _ask2,
-      _ask2_amount,
-      _ask3,
-      _ask3_amount,
-      _ask4,
-      _ask4_amount,
-      _ask5,
-      _ask5_amount);
-}
-
-inline SpotListT::SpotListT(const SpotListT &o) {
-  spot.reserve(o.spot.size());
-  for (const auto &spot_ : o.spot) { spot.emplace_back((spot_) ? new hikyuu::flat::SpotT(*spot_) : nullptr); }
-}
-
-inline SpotListT &SpotListT::operator=(SpotListT o) FLATBUFFERS_NOEXCEPT {
-  std::swap(spot, o.spot);
-  return *this;
-}
-
-inline SpotListT *SpotList::UnPack(const ::flatbuffers::resolver_function_t *_resolver) const {
-  auto _o = std::unique_ptr<SpotListT>(new SpotListT());
-  UnPackTo(_o.get(), _resolver);
-  return _o.release();
-}
-
-inline void SpotList::UnPackTo(SpotListT *_o, const ::flatbuffers::resolver_function_t *_resolver) const {
-  (void)_o;
-  (void)_resolver;
-  { auto _e = spot(); if (_e) { _o->spot.resize(_e->size()); for (::flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { if(_o->spot[_i]) { _e->Get(_i)->UnPackTo(_o->spot[_i].get(), _resolver); } else { _o->spot[_i] = std::unique_ptr<hikyuu::flat::SpotT>(_e->Get(_i)->UnPack(_resolver)); }; } } else { _o->spot.resize(0); } }
-}
-
-inline ::flatbuffers::Offset<SpotList> SpotList::Pack(::flatbuffers::FlatBufferBuilder &_fbb, const SpotListT* _o, const ::flatbuffers::rehasher_function_t *_rehasher) {
-  return CreateSpotList(_fbb, _o, _rehasher);
-}
-
-inline ::flatbuffers::Offset<SpotList> CreateSpotList(::flatbuffers::FlatBufferBuilder &_fbb, const SpotListT *_o, const ::flatbuffers::rehasher_function_t *_rehasher) {
-  (void)_rehasher;
-  (void)_o;
-  struct _VectorArgs { ::flatbuffers::FlatBufferBuilder *__fbb; const SpotListT* __o; const ::flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
-  auto _spot = _o->spot.size() ? _fbb.CreateVector<::flatbuffers::Offset<hikyuu::flat::Spot>> (_o->spot.size(), [](size_t i, _VectorArgs *__va) { return CreateSpot(*__va->__fbb, __va->__o->spot[i].get(), __va->__rehasher); }, &_va ) : 0;
-  return hikyuu::flat::CreateSpotList(
-      _fbb,
-      _spot);
-}
-
 inline const hikyuu::flat::SpotList *GetSpotList(const void *buf) {
   return ::flatbuffers::GetRoot<hikyuu::flat::SpotList>(buf);
 }
@@ -731,18 +521,6 @@ inline void FinishSizePrefixedSpotListBuffer(
   fbb.FinishSizePrefixed(root);
 }
 
-inline std::unique_ptr<hikyuu::flat::SpotListT> UnPackSpotList(
-    const void *buf,
-    const ::flatbuffers::resolver_function_t *res = nullptr) {
-  return std::unique_ptr<hikyuu::flat::SpotListT>(GetSpotList(buf)->UnPack(res));
-}
-
-inline std::unique_ptr<hikyuu::flat::SpotListT> UnPackSizePrefixedSpotList(
-    const void *buf,
-    const ::flatbuffers::resolver_function_t *res = nullptr) {
-  return std::unique_ptr<hikyuu::flat::SpotListT>(GetSizePrefixedSpotList(buf)->UnPack(res));
-}
-
 }  // namespace flat
 }  // namespace hikyuu
 

hikyuu/include/hikyuu/indicator/crt/BLOCKSETNUM.h

@@ -18,14 +18,6 @@ namespace hku {
  * @return Indicator
  */
 Indicator HKU_API BLOCKSETNUM(const Block& blk, const KQuery& query);
-
-/**
- * 横向统计（返回板块股个数）
- * @param category 板块分类
- * @param name 板块名称
- * @param query 统计范围
- * @return Indicator
- */
-Indicator HKU_API BLOCKSETNUM(const string& category, const string& name, const KQuery& query);
+Indicator HKU_API BLOCKSETNUM(const Block& blk);
 
 }  // namespace hku