hikyuu 2.0.9__cp38-none-win_amd64.whl → 2.1.1__cp38-none-win_amd64.whl

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

hikyuu/include/hikyuu/indicator/crt/INSUM.h

@@ -23,14 +23,11 @@ Indicator HKU_API INSUM(const Block& block, const KQuery& query, const Indicator
 
 /**
  * 返回板块各成分该指标相应输出按计算类型得到的计算值.计算类型:0-累加,1-平均数,2-最大值,3-最小值.
- * @param category 板块类别
- * @param category 板块名称
- * @param query 指定范围
+ * @param block 指定板块
  * @param ind 指定指标
  * @param mode 计算类型:0-累加,1-平均数,2-最大值,3-最小值.
  * @return Indicator
  */
-Indicator HKU_API INSUM(const string& category, const string& name, const KQuery& query,
-                        const Indicator& ind, int mode);
+Indicator HKU_API INSUM(const Block& block, const Indicator& ind, int mode);
 
 }  // namespace hku

hikyuu/include/hikyuu/strategy/AccountTradeManager.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#if 0
 #include <httplib.h>
 #include "../trade_manage/TradeManagerBase.h"
 
@@ -426,4 +427,5 @@ inline TMPtr crtAccountTM(const string& name, const string& pwd) {
     return std::make_shared<AccountTradeManager>(name, pwd);
 }
 
-}  // namespace hku
+}  // namespace hku
+#endif

hikyuu/include/hikyuu/trade_sys/allocatefunds/AllocateFundsBase.h

@@ -175,11 +175,11 @@ private:                                                            \
 #define ALLOCATEFUNDS_NO_PRIVATE_MEMBER_SERIALIZATION
 #endif
 
-#define ALLOCATEFUNDS_IMP(classname)   \
-public:                                \
-    virtual AFPtr _clone() override {  \
-        return AFPtr(new classname()); \
-    }                                  \
+#define ALLOCATEFUNDS_IMP(classname)          \
+public:                                       \
+    virtual AFPtr _clone() override {         \
+        return std::make_shared<classname>(); \
+    }                                         \
     virtual SystemWeightList _allocateWeight(const Datetime&, const SystemWeightList&) override;
 
 typedef shared_ptr<AllocateFundsBase> AllocateFundsPtr;

hikyuu/include/hikyuu/trade_sys/condition/ConditionBase.h

@@ -180,7 +180,7 @@ typedef shared_ptr<ConditionBase> CNPtr;
 #define CONDITION_IMP(classname)              \
 public:                                       \
     virtual ConditionPtr _clone() {           \
-        return ConditionPtr(new classname()); \
+        return std::make_shared<classname>(); \
     }                                         \
     virtual void _calculate();
 

hikyuu/include/hikyuu/trade_sys/environment/EnvironmentBase.h

@@ -151,11 +151,11 @@ private:                                                          \
 typedef shared_ptr<EnvironmentBase> EnvironmentPtr;
 typedef shared_ptr<EnvironmentBase> EVPtr;
 
-#define ENVIRONMENT_IMP(classname)              \
-public:                                         \
-    virtual EnvironmentPtr _clone() {           \
-        return EnvironmentPtr(new classname()); \
-    }                                           \
+#define ENVIRONMENT_IMP(classname)            \
+public:                                       \
+    virtual EnvironmentPtr _clone() {         \
+        return std::make_shared<classname>(); \
+    }                                         \
     virtual void _calculate();
 
 /**

hikyuu/include/hikyuu/trade_sys/moneymanager/MoneyManagerBase.h

@@ -209,7 +209,7 @@ typedef shared_ptr<MoneyManagerBase> MMPtr;
 #define MONEY_MANAGER_IMP(classname)                                                          \
 public:                                                                                       \
     virtual MoneyManagerPtr _clone() override {                                               \
-        return MoneyManagerPtr(new classname());                                              \
+        return std::make_shared<classname>();                                                 \
     }                                                                                         \
     virtual double _getBuyNumber(const Datetime& datetime, const Stock& stock, price_t price, \
                                  price_t risk, SystemPart from) override;

hikyuu/include/hikyuu/trade_sys/profitgoal/ProfitGoalBase.h

@@ -141,7 +141,7 @@ private:                                                         \
 #define PROFITGOAL_IMP(classname)                               \
 public:                                                         \
     virtual ProfitGoalPtr _clone() override {                   \
-        return ProfitGoalPtr(new classname());                  \
+        return std::make_shared<classname>();                   \
     }                                                           \
     virtual price_t getGoal(const Datetime&, price_t) override; \
     virtual void _calculate() override;

hikyuu/include/hikyuu/trade_sys/selector/SelectorBase.h

@@ -61,6 +61,20 @@ public:
      */
     void addStockList(const StockList& stkList, const SystemPtr& protoSys);
 
+    /**
+     * 直接加入已有系统策略示例
+     * @note 应该已经绑定 stock
+     * @param sys
+     */
+    void addSystem(const SYSPtr& sys);
+
+    /**
+     * 直接加入已有系统策略示例
+     * @note 应该已经绑定 stock
+     * @param sys
+     */
+    void addSystemList(const SystemList& sys);
+
     /**
      * @brief 获取原型系统列表
      * @return const SystemList&
@@ -101,9 +115,18 @@ public:
 
     virtual bool isMatchAF(const AFPtr& af) = 0;
 
+    /** 用于逻辑运算的子类中添加原型系统，一般不需要子类实现 */
+    virtual void _addSystem(const SYSPtr& sys) {}
+
+    /** 用于逻辑运算的子类中添加原型系统，一般不需要子类实现 */
+    virtual void _removeAll() {}
+
     /* 仅供PF调用，由PF通知其实际运行的系统列表，并启动计算 */
     void calculate(const SystemList& pf_realSysList, const KQuery& query);
 
+    /* 仅供PF调用，建立实际系统到原型系统映射 */
+    virtual void bindRealToProto(const SYSPtr& real, const SYSPtr& proto) {}
+
     void calculate_proto(const KQuery& query);
 
 private:
@@ -175,7 +198,7 @@ private:                                                       \
 #define SELECTOR_IMP(classname)                                   \
 public:                                                           \
     virtual SelectorPtr _clone() override {                       \
-        return SelectorPtr(new classname());                      \
+        return std::make_shared<classname>();                     \
     }                                                             \
     virtual SystemWeightList getSelected(Datetime date) override; \
     virtual bool isMatchAF(const AFPtr& af) override;             \

hikyuu/include/hikyuu/trade_sys/selector/build_in.h

@@ -11,6 +11,7 @@
 
 #include "crt/SE_Fixed.h"
 #include "crt/SE_MultiFactor.h"
+#include "crt/SE_Operator.h"
 #include "crt/SE_Signal.h"
 
 #endif /* TRADE_SYS_SELECTOR_BUILD_IN_H_ */

hikyuu/include/hikyuu/trade_sys/selector/crt/SE_Fixed.h

@@ -15,20 +15,23 @@ namespace hku {
 
 /**
  * @brief 固定选择器，每天都选择指定的交易系统
+ * @param weight 固定权重
  * @return SelectorPtr
  * @ingroup Selector
  */
-SelectorPtr HKU_API SE_Fixed();
+SelectorPtr HKU_API SE_Fixed(double weight = 1.0);
 
 /**
  * @brief 固定选择器，每天都选择指定的交易系统
  * @details 对指定的每个股票以原型系统创建相应的交易系统
  * @param stock_list 指定的股票列表
  * @param sys 原型系统
+ * @param weight 固定权重
  * @return SelectorPtr
  * @ingroup Selector
  */
-SelectorPtr HKU_API SE_Fixed(const StockList& stock_list, const SystemPtr& sys);
+SelectorPtr HKU_API SE_Fixed(const StockList& stock_list, const SystemPtr& sys,
+                             double weight = 1.0);
 
 } /* namespace hku */
 

hikyuu/include/hikyuu/trade_sys/selector/crt/SE_MultiFactor.h

@@ -24,9 +24,7 @@ SelectorPtr HKU_API SE_MultiFactor(const MFPtr& mf, int topn = 10);
 /**
  * 基于 MultiFactor 选股算法
  * @param src_inds 原始因子公式
- * @param stks 证券列表
- * @param query 查询条件
- * @param topn 只选取时间截面中前 topn 个系统
+ * @param topn 只选取时间截面中前 topn 个系统，小于等于0时代表不限制
  * @param ic_n ic 对应的 ic_n 日收益率
  * @param ic_rolling_n 计算滚动 IC （即 IC 的 n 日移动平均）周期
  * @param ref_stk 参照对比证券，未指定时，默认使用 sh000300 沪深300指数
@@ -34,8 +32,7 @@ SelectorPtr HKU_API SE_MultiFactor(const MFPtr& mf, int topn = 10);
  * @return SelectorPtr
  * @ingroup Selector
  */
-SelectorPtr HKU_API SE_MultiFactor(const IndicatorList& src_inds, const StockList& stks,
-                                   const KQuery& query, int topn = 10, int ic_n = 5,
+SelectorPtr HKU_API SE_MultiFactor(const IndicatorList& src_inds, int topn = 10, int ic_n = 5,
                                    int ic_rolling_n = 120, const Stock& ref_stk = Stock(),
                                    const string& mode = "MF_ICIRWeight");
 

hikyuu/include/hikyuu/trade_sys/selector/crt/SE_Operator.h

@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2024 hikyuu.org
+ *
+ *  Created on: 2024-05-27
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "../SelectorBase.h"
+
+namespace hku {
+
+HKU_API SelectorPtr operator+(const SelectorPtr& se1, const SelectorPtr& se2);
+HKU_API SelectorPtr operator-(const SelectorPtr& se1, const SelectorPtr& se2);
+HKU_API SelectorPtr operator*(const SelectorPtr& se1, const SelectorPtr& se2);
+HKU_API SelectorPtr operator/(const SelectorPtr& se1, const SelectorPtr& se2);
+
+inline SelectorPtr operator&(const SelectorPtr& se1, const SelectorPtr& se2) {
+    return se1 * se2;
+}
+
+inline SelectorPtr operator|(const SelectorPtr& se1, const SelectorPtr& se2) {
+    return se1 + se2;
+}
+
+HKU_API SelectorPtr operator+(const SelectorPtr& se, double value);
+inline SelectorPtr operator+(double value, const SelectorPtr& se) {
+    return se + value;
+}
+
+HKU_API SelectorPtr operator-(const SelectorPtr& se, double value);
+HKU_API SelectorPtr operator-(double value, const SelectorPtr& se);
+
+HKU_API SelectorPtr operator*(const SelectorPtr& se, double value);
+inline SelectorPtr operator*(double value, const SelectorPtr& se) {
+    return se * value;
+}
+
+HKU_API SelectorPtr operator/(const SelectorPtr& se, double value);
+HKU_API SelectorPtr operator/(double value, const SelectorPtr& se);
+
+}  // namespace hku

hikyuu/include/hikyuu/trade_sys/selector/imp/FixedSelector.h

@@ -19,6 +19,7 @@ class FixedSelector : public SelectorBase {
 
 public:
     FixedSelector();
+    FixedSelector(double weight);
     virtual ~FixedSelector();
 };
 

hikyuu/include/hikyuu/trade_sys/selector/imp/MultiFactorSelector.h

@@ -25,18 +25,25 @@ public:
     virtual bool isMatchAF(const AFPtr& af) override;
     virtual void _calculate() override;
 
+    void setIndicators(const IndicatorList& inds) {
+        HKU_ASSERT(!inds.empty());
+        m_inds = inds;
+    }
+
 private:
+    IndicatorList m_inds;
     MFPtr m_mf;
     unordered_map<Stock, SYSPtr> m_stk_sys_dict;
 
     //============================================
-// 序列化支持
-//============================================
+    // 序列化支持
+    //============================================
 #if HKU_SUPPORT_SERIALIZATION
     friend class boost::serialization::access;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int version) {
         ar& BOOST_SERIALIZATION_BASE_OBJECT_NVP(SelectorBase);
+        ar& BOOST_SERIALIZATION_NVP(m_inds);
         ar& BOOST_SERIALIZATION_NVP(m_mf);
     }
 #endif

hikyuu/include/hikyuu/trade_sys/selector/imp/OperatorAddSelector.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright (c) 2024 hikyuu.org
+ *
+ *  Created on: 2024-05-27
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "OperatorSelector.h"
+
+namespace hku {
+
+class HKU_API OperatorAddSelector : public OperatorSelector {
+    OPERATOR_SELECTOR_IMP(OperatorAddSelector, "SE_Add")
+    OPERATOR_SELECTOR_SERIALIZATION
+};
+
+}  // namespace hku

hikyuu/include/hikyuu/trade_sys/selector/imp/OperatorAddValueSelector.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright (c) 2024 hikyuu.org
+ *
+ *  Created on: 2024-05-27
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "OperatorValueSelector.h"
+
+namespace hku {
+
+class HKU_API OperatorAddValueSelector : public OperatorValueSelector {
+    OPERATOR_VALUE_SELECTOR_IMP(OperatorAddValueSelector, "SE_AddValue")
+    OPERATOR_VALUE_SELECTOR_SERIALIZATION
+};
+
+}  // namespace hku

hikyuu/include/hikyuu/trade_sys/selector/imp/OperatorDivSelector.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright (c) 2024 hikyuu.org
+ *
+ *  Created on: 2024-05-27
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "OperatorSelector.h"
+
+namespace hku {
+
+class HKU_API OperatorDivSelector : public OperatorSelector {
+    OPERATOR_SELECTOR_IMP(OperatorDivSelector, "SE_Div")
+    OPERATOR_SELECTOR_SERIALIZATION
+};
+
+}  // namespace hku

hikyuu/include/hikyuu/trade_sys/selector/imp/OperatorDivValueSelector.h

@@ -0,0 +1,19 @@
+/*
+ *  Copyright (c) 2024 hikyuu.org
+ *
+ *  Created on: 2024-05-27
+ *      Author: fasiondog
+ */
+
+#pragma once
+
+#include "OperatorValueSelector.h"
+
+namespace hku {
+
+class HKU_API OperatorDivValueSelector : public OperatorValueSelector {
+    OPERATOR_VALUE_SELECTOR_IMP(OperatorDivValueSelector, "SE_DivValue")
+    OPERATOR_VALUE_SELECTOR_SERIALIZATION
+};
+
+}  // namespace hku