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

update

Browse Source
This commit is contained in:
fasiondog 2024-05-01 00:02:19 +08:00
parent 65ced11ad0
commit ff0094fd5d
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hikyuu_cpp/hikyuu/trade_manage/TradeManager.cpp
View File

@ -905,9 +905,9 @@ TradeRecord TradeManager::sell(const Datetime& datetime, const Stock& stock, pri
// 未持仓
position_map_type::iterator pos_iter = m_position.find(stock.id());
HKU_WARN_IF_RETURN(pos_iter == m_position.end(), result,
"{} {} This stock was not bought never! ({}, {:<.4f}, {}, {})", datetime,
stock.market_code(), datetime, realPrice, number, int(from));
HKU_TRACE_IF_RETURN(pos_iter == m_position.end(), result,
"{} {} This stock was not bought never! ({}, {:<.4f}, {}, {})", datetime,
stock.market_code(), datetime, realPrice, number, getSystemPartName(from));
// 根据权息调整当前持仓情况
updateWithWeight(datetime);

18
hikyuu_cpp/hikyuu/trade_sys/signal/SignalBase.cpp
View File

@ -76,24 +76,10 @@ void SignalBase::setTO(const KData& kdata) {
bool cycle = getParam<bool>("cycle");
m_cycle_start = kdata[0].datetime;
HKU_IF_RETURN(cycle, void());
const KQuery& query = kdata.getQuery();
if (query.queryType() == KQuery::DATE) {
m_cycle_end = query.endDatetime();
} else {
size_t last_pos = kdata.lastPos();
const Stock& stk = kdata.getStock();
if (last_pos + 1 >= stk.getCount(query.kType())) {
m_cycle_end = Null<Datetime>();
} else {
KRecord krecord = stk.getKRecord(last_pos + 1, query.kType());
m_cycle_end = krecord.datetime;
}
}
KData cycle_kdata = kdata.getKData(m_cycle_start, m_cycle_end);
if (!cycle) {
_calculate(cycle_kdata);
_calculate(kdata);
}
}