test/hikyuu2
1
0
Fork 0
mirror of https://gitee.com/fasiondog/hikyuu.git synced 2024-12-03 12:27:48 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fixed demo2 run failed; 优化上下文中ktypelist为空时认为为全部K线类型

Browse Source
This commit is contained in:
fasiondog 2024-09-30 21:06:19 +08:00
parent 1fc058117e
commit ab43f81b27
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hikyuu_cpp/hikyuu/strategy/Strategy.cpp
View File

@ -23,6 +23,8 @@ std::atomic_bool Strategy::ms_keep_running = true;
void Strategy::sig_handler(int sig) { void Strategy::sig_handler(int sig) {
if (sig == SIGINT || sig == SIGTERM) { if (sig == SIGINT || sig == SIGTERM) {
ms_keep_running = false; ms_keep_running = false;
auto* scheduler = getScheduler();
scheduler->stop();
exit(0); exit(0);
} }
} }
@ -56,7 +58,7 @@ Strategy::Strategy(const vector<string>& codeList, const vector<KQuery::KType>&
Strategy::Strategy(const StrategyContext& context, const string& name, const string& config_file) Strategy::Strategy(const StrategyContext& context, const string& name, const string& config_file)
: Strategy(name, config_file) { : Strategy(name, config_file) {
_initParam(); _initParam();
m_context = m_context; m_context = context;
} }
Strategy::~Strategy() { Strategy::~Strategy() {
@ -91,7 +93,10 @@ void Strategy::_init() {
hikyuu_init(m_config_file, false, m_context); hikyuu_init(m_config_file, false, m_context);
// 对上下文中的K线类型和其预加载参数进行检查，并给出警告 // 对上下文中的K线类型和其预加载参数进行检查，并给出警告
const auto& ktypes = m_context.getKTypeList(); auto ktypes = m_context.getKTypeList();
if (ktypes.empty()) {
ktypes = KQuery::getAllKType();
}
const auto& preload_params = sm.getPreloadParameter(); const auto& preload_params = sm.getPreloadParameter();
for (const auto& ktype : ktypes) { for (const auto& ktype : ktypes) {
std::string low_ktype = ktype; std::string low_ktype = ktype;
@ -105,7 +110,6 @@ void Strategy::_init() {
} }
CLS_CHECK(!m_context.getStockCodeList().empty(), "The context does not contain any stocks!"); CLS_CHECK(!m_context.getStockCodeList().empty(), "The context does not contain any stocks!");
CLS_CHECK(!m_context.getKTypeList().empty(), "The K type list was empty!");
// 先将行情接收代理停止，以便后面加入处理函数 // 先将行情接收代理停止，以便后面加入处理函数
stopSpotAgent(); stopSpotAgent();