test/hikyuu2
1
0
Fork 0
mirror of https://gitee.com/fasiondog/hikyuu.git synced 2024-11-30 10:59:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update se

Browse Source
This commit is contained in:
fasiondog 2024-03-30 12:38:40 +08:00
parent d545a6b1fa
commit 173ddbffeb
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hikyuu_cpp/hikyuu/trade_sys/selector/SelectorBase.cpp
View File

@ -47,15 +47,17 @@ void SelectorBase::baseCheckParam(const string& name) const {}
void SelectorBase::paramChanged() {
m_calculated = false;
m_proto_calculated = false;
}
void SelectorBase::removeAll() {
m_pro_sys_list.swap(SystemList());
m_real_sys_list.swap(SystemList());
m_pro_sys_list.clear();
m_real_sys_list.clear();
m_calculated = false;
m_proto_calculated = false;
}
void SelectorBase::reset() {
m_calculated = false;
SystemList::const_iterator iter = m_pro_sys_list.begin();
for (; iter != m_pro_sys_list.end(); ++iter) {
(*iter)->reset();
@ -63,6 +65,9 @@ void SelectorBase::reset() {
m_real_sys_list.clear();
_reset();
m_calculated = false;
m_proto_calculated = false;
}
SelectorPtr SelectorBase::clone() {
@ -81,6 +86,10 @@ SelectorPtr SelectorBase::clone() {
p->m_params = m_params;
p->m_name = m_name;
p->m_query = m_query;
p->m_proto_query = m_proto_query;
p->m_calculated = m_calculated;
p->m_proto_calculated = m_proto_calculated;
p->m_real_sys_list.reserve(m_real_sys_list.size());
for (const auto& sys : m_real_sys_list) {
@ -95,19 +104,30 @@ SelectorPtr SelectorBase::clone() {
}
void SelectorBase::calculate(const SystemList& pf_realSysList, const KQuery& query) {
HKU_IF_RETURN(m_calculated && m_query == query, void());
m_query = query;
m_real_sys_list = pf_realSysList;
// 需要依赖于运行系统，在自身运算之前完成计算
if (getParam<bool>("depend_on_proto_sys")) {
for (auto& sys : m_pro_sys_list) {
sys->run(query);
}
calculate_proto(query);
}
_calculate();
m_calculated = true;
}
void SelectorBase::calculate_proto(const KQuery& query) {
if (m_proto_query != query && !m_proto_calculated) {
for (auto& sys : m_pro_sys_list) {
sys->run(query);
}
m_proto_calculated = true;
m_proto_query = query;
}
}
void SelectorBase::addStock(const Stock& stock, const SystemPtr& protoSys) {
HKU_CHECK(!stock.isNull(), "The input stock is null!");
HKU_CHECK(protoSys, "The input stock is null!");
@ -125,6 +145,9 @@ void SelectorBase::addStock(const Stock& stock, const SystemPtr& protoSys) {
sys->reset();
sys->setStock(stock);
m_pro_sys_list.emplace_back(sys);
m_calculated = false;
m_proto_calculated = false;
}
void SelectorBase::addStockList(const StockList& stkList, const SystemPtr& protoSys) {

8
hikyuu_cpp/hikyuu/trade_sys/selector/SelectorBase.h
View File

@ -104,12 +104,18 @@ public:
/* 仅供PF调用，由PF通知其实际运行的系统列表，并启动计算 */
void calculate(const SystemList& pf_realSysList, const KQuery& query);
void calculate_proto(const KQuery& query);
private:
void initParam();
protected:
string m_name;
bool m_calculated{false}; // 是否已计算过
bool m_calculated{false}; // 是否已计算过
bool m_proto_calculated{false};
KQuery m_query;
KQuery m_proto_query;
SystemList m_pro_sys_list; // 原型系统列表
SystemList m_real_sys_list; // PF组合中实际运行的系统，有PF执行时设定，顺序与原型列表一一对应