From cc07e28aca7dbca8394ed1679b736eb66710bcef Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 9 Jan 2019 16:42:45 -0500 Subject: [PATCH] quoters, child orders and order builders are only created for quoting legs --- .../orders/spreader_orders/SpreaderOrder.cpp | 1 + .../spreader/SpreaderBookkeepingData.cpp | 28 +++++++++---------- .../spreader/SpreaderLegData.h | 20 +++++++++---- .../SpreaderStartStateWorker.cpp | 11 +++++--- .../spreader_orders/tests/tests_common.h | 6 ++-- 5 files changed, 39 insertions(+), 27 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index b93adcbc7..2a8cf7664 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -89,6 +89,7 @@ void SpreaderOrder::setup_new_quoter_order(size_t leg_index){ LOG(OrderMan, Info, "SpreaderOrder.setup_new_quoter_order key:{} leg:{}", key().value(), leg_index); SpreaderLegData& leg_data = _bookkeeping_data().get_leg_data(leg_index); + bts_assert(leg_data.leg_property_data().is_active_quoting()); bts::orderman::ChildOrder child_order = leg_data.quoter_order_builder().build(); leg_data.order_update_message().re_init(child_order); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index d0abe97b9..b7f584fa2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -43,26 +43,24 @@ _reported_state(){ SpreaderChildOrderState* q_child_order=nullptr; SpreaderOrderBuilder* q_order_builder=nullptr; SingleLegQuoter* quoter=nullptr; - { - _quoter_child_order_states.emplace_back ( - empty_order, - leg_property_data.leg_security_key(), - _is_live, - true); - q_child_order=&(_quoter_child_order_states.back()); - _quoter_order_builders.emplace_back( - spreader_order_key, - leg_property_data.quoter_order_definition(), - spreader_pao_services, - 10); - q_order_builder=&(_quoter_order_builders.back()); - } if(leg_property_data.is_active_quoting()){ + _quoter_order_builders.emplace_back( + spreader_order_key, + leg_property_data.quoter_order_definition(), + spreader_pao_services, + 10); + q_order_builder=&(_quoter_order_builders.back()); + _quoter_child_order_states.emplace_back ( + empty_order, + leg_property_data.leg_security_key(), + _is_live, + true); + q_child_order=&(_quoter_child_order_states.back()); _quoters.emplace_back(spreader_manager, leg_property_data, _n_legs, _quoter_child_order_states.back()); - quoter=&(_quoters.back()); + quoter=&(_quoters.back()); } _leg_data.emplace_back(leg_property_data, quoter, diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index 6b6af7252..08fc10bfe 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -78,15 +78,21 @@ public: return !os::is_nan(_settlement_price.price()); } SpreaderChildOrderState& order_update_message () { + //bts_assert(_is_quoting); + if(!_is_quoting) + bts_assert(false); return *_quoter_child_order_state; } const SpreaderChildOrderState& order_update_message () const { + //bts_assert(_is_quoting); + if(!_is_quoting) + bts_assert(false); return *_quoter_child_order_state; } - bts::orderman::OrderKey key() { + bts::orderman::OrderKey key() const { return order_update_message().order_key(); } - bts::orderman::OrderKey order_key() { + bts::orderman::OrderKey order_key() const { return order_update_message().order_key(); } SpreaderOrderBuilder& quoter_order_builder() { @@ -112,10 +118,12 @@ public: // the fills - across the quoter and all the hedgers void total_fills (Quantity& out_quantity, Price& out_price) const{ - Price qp, hp; - Quantity qq, hq; - const auto& quoting_order = order_update_message(); - quoting_order.total_fills(qq, qp); + Price qp=Price(0), hp; + Quantity qq=Quantity(0), hq; + if(_is_quoting){ + const auto& quoting_order = order_update_message(); + quoting_order.total_fills(qq, qp); + } _hedger_manager.total_fills(hq,hp); SpreaderUtils::compute_average_price(qp,qq,hp,hq,out_price,out_quantity); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp index adc4108e2..cf36e031f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp @@ -74,16 +74,19 @@ void SpreaderStartStateWorker::on_activate(Price price, // 2. activate order builders for (size_t l_idx = 0; l_idx < _spreader->_bookkeeping_data().n_legs(); l_idx++) { - SpreaderLegData& leg_data = _spreader->_bookkeeping_data().get_leg_data(l_idx); - leg_data.quoter_order_builder().activate(order_services); + SpreaderLegData& leg_data = _spreader->_bookkeeping_data().get_leg_data(l_idx); leg_data.hedger_order_builder().activate(order_services); + if(leg_data.leg_property_data().is_active_quoting()) + leg_data.quoter_order_builder().activate(order_services); } // 3. create orders for (size_t l_idx = 0; l_idx < _spreader->_bookkeeping_data_ptr->n_legs(); l_idx++) { SpreaderLegData& leg_data = _spreader->_bookkeeping_data().get_leg_data(l_idx); - bts::orderman::ChildOrder child_order = leg_data.quoter_order_builder().build(); - leg_data.order_update_message().re_init(child_order); + if(leg_data.leg_property_data().is_active_quoting()){ + bts::orderman::ChildOrder child_order = leg_data.quoter_order_builder().build(); + leg_data.order_update_message().re_init(child_order); + } } if(order_services.is_live()) { diff --git a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h index a7764b1b2..c49eaa767 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/tests_common.h +++ b/src/lib/orderman/orders/spreader_orders/tests/tests_common.h @@ -559,8 +559,10 @@ void set_spreader_orders (SpreaderOrder& spreader, double* leg_1_bid_prices, uin leg_2_bid_prices, leg_2_bid_sizes, leg_2_ask_prices, leg_2_ask_sizes, true); spreader.test_only_on_book_update (bts::orderman::BookUpdateEvent(book_leg_2,trace::CorID())); - spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_1_fills), Price (leg_1_filled_price)); - spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_2_fills), Price (leg_2_filled_price)); + if(leg_data_1.leg_property_data().is_active_quoting()) + spreader.test_only_on_child_order_update (leg_data_1.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_1_fills), Price (leg_1_filled_price)); + if(leg_data_2.leg_property_data().is_active_quoting()) + spreader.test_only_on_child_order_update (leg_data_2.order_key(), api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (leg_2_fills), Price (leg_2_filled_price)); } /**********************************************************************/ /******************************misc************************************/