From 9b9192c7d42f5b54d53cd4e8f2c00189986b8cd0 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 12 Feb 2019 17:33:14 -0500 Subject: [PATCH] simplified initialization --- .../orders/queue_holder/QHOOrderManager.h | 21 +++++++-------- .../orders/queue_holder/QueueHolderOrder.cpp | 1 + .../orders/queue_holder/QueueHolderOrder.h | 3 ++- .../state_workers/QHOStartStateWorker.cpp | 27 +++++++++++-------- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/lib/orderman/orders/queue_holder/QHOOrderManager.h b/src/lib/orderman/orders/queue_holder/QHOOrderManager.h index a75d31f62..8563f7854 100644 --- a/src/lib/orderman/orders/queue_holder/QHOOrderManager.h +++ b/src/lib/orderman/orders/queue_holder/QHOOrderManager.h @@ -43,27 +43,26 @@ public: _target_qty(0), _n_orders(0), _orders(){ - } - void init(OrderBuilder&, - SecurityKey, + } + void init(OrderBuilder& order_builder, + SecurityKey key, api::Side side, double tick_size, - uint16_t n_orders){ + uint16_t n_orders, + Price price, + Quantity qty){ _side=side; _tick_size=tick_size; _n_orders=n_orders; - bts_assert(_orders.size()==0); _orders.reserve(n_orders); - } - void activate(OrderBuilder& order_builder, SecurityKey key){ - for(uint16_t i=0;i<_n_orders;i++){ + for(uint16_t i=0;i<_n_orders;i++){ ChildOrder child_order=order_builder.build(); _orders.emplace_back(key,child_order); } - } - void place_order(Price price, Quantity qty){ _target_price=price; - _target_qty=qty; + _target_qty=qty; + } + void place_order(){ double price_i=_target_price.value(), price_diff=_side==api::Side::SIDE_BUY?-1.0*_tick_size:_tick_size; for(SubOrder& o : _orders){ diff --git a/src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp b/src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp index fa826285d..f2cce0c4c 100644 --- a/src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp +++ b/src/lib/orderman/orders/queue_holder/QueueHolderOrder.cpp @@ -18,6 +18,7 @@ QueueHolderOrder::QueueHolderOrder() _is_succ_inited(false), _is_recovered(false), _order_def(), +_tick_size(bts::os::nan()), _order_builder(), _order_manager(), _services(nullptr), diff --git a/src/lib/orderman/orders/queue_holder/QueueHolderOrder.h b/src/lib/orderman/orders/queue_holder/QueueHolderOrder.h index e6beef0a2..c02788e98 100644 --- a/src/lib/orderman/orders/queue_holder/QueueHolderOrder.h +++ b/src/lib/orderman/orders/queue_holder/QueueHolderOrder.h @@ -94,10 +94,11 @@ private: oss << str << key(); bts_assert_msg(false, oss.str()); } -private: +private: bool _is_succ_inited; bool _is_recovered; api::orderman::OrderDefinition _order_def; + double _tick_size; OrderBuilder _order_builder; QHOOrderManager _order_manager; OrderServices *_services; diff --git a/src/lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp b/src/lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp index 3688a7792..f1063d6de 100644 --- a/src/lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp +++ b/src/lib/orderman/orders/queue_holder/state_workers/QHOStartStateWorker.cpp @@ -46,8 +46,14 @@ void QHOStartStateWorker::on_activate(Price price, _porder->_switch_state(QueueHolderOrderState::END); else { _porder->_order_builder.activate(services); - _porder->_order_manager.activate(_porder->_order_builder, - SecurityKey(_porder->_order_def.security_key())); + _porder->_order_manager.init( + _porder->_order_builder, + SecurityKey(_porder->_order_def.security_key()), + _porder->_order_def.side(), + _porder->_tick_size, + _porder->_order_def.custom_def().queue_holder().n_queue_orders(), + price, + qty); services.subscribe_to_child_updates( [this](const OrderStateUpdateEvent &os) { _porder->_on_child_order_update(os); @@ -58,7 +64,7 @@ void QHOStartStateWorker::on_activate(Price price, }); services.subscribe_to_time( [this](const bts::mercury::TimerEvent &te) { _porder->_on_time(te); }); - _porder->_order_manager.place_order(price,qty); + _porder->_order_manager.place_order(); _porder->_switch_state(QueueHolderOrderState::WAITING_FOR_FIRST_ACK); } } @@ -89,7 +95,8 @@ bool QHOStartStateWorker::_on_init_new( "QHOStartStateWorker::_on_init_new key:{} " "OrderDefinition does not have QueueHolderDefinition", _porder->key()); - _porder->_reported_state.set_last_msg("QueueHolderOrder not properly formed"); + _porder->_reported_state.set_last_msg("QueueHolderOrder not " + "properly formed"); return false; } const bts::api::Security* sec_ptr = @@ -99,21 +106,19 @@ bool QHOStartStateWorker::_on_init_new( "QHOStartStateWorker::_on_init_new key:{} " "Could not resolve sec_key:{}", _porder->key(), order_def.security_key()); - _porder->_reported_state.set_last_msg("Could not resolve Trigger Order security"); + _porder->_reported_state.set_last_msg("Could not resolve " + "Trigger Order security"); return false; } _porder->_order_def=order_def; + _porder->_tick_size=sec_ptr->contract_spec().low_tick(); const api::orderman::QueueHolderDefinition& qho_def= order_def.custom_def().queue_holder(); api::orderman::OrderDefinition child_order_def = order_def; child_order_def.mutable_custom_def()->CopyFrom(qho_def.child()); - _porder->_order_builder = OrderBuilder(_porder->key(), child_order_def, pre_os, + _porder->_order_builder = OrderBuilder(_porder->key(), + child_order_def, pre_os, qho_def.n_queue_orders()+1); - _porder->_order_manager.init( _porder->_order_builder, - SecurityKey(order_def.security_key()), - _porder->_order_def.side(), - sec_ptr->contract_spec().low_tick(), - qho_def.n_queue_orders()); LOG(OrderMan, Info, "QHOStartStateWorker::_on_init_new key:{} ", _porder->key());