diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index efa89c423..507e6cb37 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -16,7 +16,9 @@ _n_legs(legs.size()), _n_quoting_legs(_calc_n_quoting_legs(legs)), _order_def(order_def), _reported_state(){ - LOG(OrderMan, Info, "SpreaderBookkeepingData.cons started key: {} n_legs: {}", spreader_order_key.value(), _n_legs); + LOG(OrderMan, Info, "SpreaderBookkeepingData.cons started " + "key: {} n_legs: {}", + spreader_order_key.value(), _n_legs); _leg_prop_data.reserve(_n_legs), _books.reserve(_n_legs), _quoter_order_builders.reserve(_n_legs); @@ -29,23 +31,48 @@ _reported_state(){ for (const auto& lpd_iter : legs){ _leg_prop_data.push_back(lpd_iter); const LegPropertyData& leg_property_data = _leg_prop_data.back(); - _books.emplace_back(lpd_iter.leg_security_key()); - _quoter_order_builders.emplace_back(spreader_order_key, leg_property_data.quoter_order_definition(), spreader_pao_services, 10); - _hedger_order_builders.emplace_back(spreader_order_key, leg_property_data.hedger_order_definition(), spreader_pao_services, 10); - ChildOrder empty_order; - _quoter_child_order_states.emplace_back (empty_order,leg_property_data.leg_security_key(),_is_live,true); - _quoters.emplace_back(spreader_manager, leg_property_data, _n_legs, _quoter_child_order_states.back()); + _books.emplace_back(lpd_iter.leg_security_key()); + _hedger_order_builders.emplace_back( + spreader_order_key, + leg_property_data.hedger_order_definition(), + spreader_pao_services, + 10); + ChildOrder empty_order; _h_managers.emplace_back(spreader_manager,leg_property_data,_is_live), _unhedged_deltas.emplace_back(); + SpreaderChildOrderState* q_child_order=nullptr; + SpreaderOrderBuilder* q_order_builder=nullptr; + SingleLegQuoter* quoter=nullptr; + //if(leg_property_data.is_active_quoting()) + { + _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()); + _quoters.emplace_back(spreader_manager, + leg_property_data, + _n_legs, + _quoter_child_order_states.back()); + quoter=&(_quoters.back()); + } _leg_data.emplace_back(leg_property_data, - _quoters.back(), - _quoter_order_builders.back(), + quoter, + q_order_builder, _hedger_order_builders.back(), _h_managers.back(), - _quoter_child_order_states.back(), + q_child_order, _books.back(), _unhedged_deltas.back()); - bts_assert (_sec_key_to_index.find(leg_property_data.security_key()) == _sec_key_to_index.end()); + bts_assert (_sec_key_to_index.find(leg_property_data.security_key()) + == _sec_key_to_index.end()); _sec_key_to_index.insert(std::pair(leg_property_data.security_key(), leg_property_data.leg_index())); } LOG(OrderMan, Info, "SpreaderBookkeepingData.cons completed key: {} n_legs: {}", spreader_order_key.value(), _n_legs); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp index 872409ba6..18ada7bf9 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp @@ -4,11 +4,11 @@ namespace bts{ namespace orderman{ SpreaderLegData::SpreaderLegData (const LegPropertyData& leg_property_data, - SingleLegQuoter& quoter, - SpreaderOrderBuilder& quoter_order_builder, + SingleLegQuoter* quoter, + SpreaderOrderBuilder* quoter_order_builder, SpreaderOrderBuilder& hedger_order_builder, HedgerManager& hedger_manager, - SpreaderChildOrderState& quoter_child_order_state, + SpreaderChildOrderState* quoter_child_order_state, Book& book, UnhedgedDelta& unhedged_delta) : diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index 243c59c61..9de3325c3 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -26,21 +26,21 @@ class SpreaderLegData { private: const LegPropertyData& _leg_property_data; - SingleLegQuoter& _quoter; - SpreaderOrderBuilder& _quoter_order_builder; + SingleLegQuoter* const _quoter; + SpreaderOrderBuilder* const _quoter_order_builder; SpreaderOrderBuilder& _hedger_order_builder; - SpreaderChildOrderState& _quoter_child_order_state; + SpreaderChildOrderState* const _quoter_child_order_state; HedgerManager& _hedger_manager; Book& _book; UnhedgedDelta& _unhedged_delta; md::IntPrice _settlement_price; public: SpreaderLegData (const LegPropertyData& leg_property_data, - SingleLegQuoter& quoter, - SpreaderOrderBuilder& quoter_order_builder, + SingleLegQuoter* quoter, + SpreaderOrderBuilder* quoter_order_builder, SpreaderOrderBuilder& hedger_order_builder, HedgerManager& hedger_manager, - SpreaderChildOrderState& quoter_child_order_state, + SpreaderChildOrderState* quoter_child_order_state, Book& book, UnhedgedDelta& unhedged_delta); SpreaderLegData() = delete; @@ -60,10 +60,10 @@ public: return _leg_property_data; } SingleLegQuoter& quoter() { - return _quoter; + return *_quoter; } const SingleLegQuoter& quoter() const { - return _quoter; + return *_quoter; } const bts::orderman::Book& book () const { return _book; @@ -75,16 +75,19 @@ public: return !os::is_nan(_settlement_price.price()); } SpreaderChildOrderState& order_update_message () { - return _quoter_child_order_state; + return *_quoter_child_order_state; + } + const SpreaderChildOrderState& order_update_message () const { + return *_quoter_child_order_state; } bts::orderman::OrderKey key() { - return _quoter_child_order_state.order_key(); + return order_update_message().order_key(); } bts::orderman::OrderKey order_key() { - return _quoter_child_order_state.order_key(); + return order_update_message().order_key(); } SpreaderOrderBuilder& quoter_order_builder() { - return _quoter_order_builder; + return *_quoter_order_builder; } SpreaderOrderBuilder& hedger_order_builder() { return _hedger_order_builder; @@ -107,8 +110,9 @@ public: void total_fills (Quantity& out_quantity, Price& out_price) const{ Price qp, hp; - Quantity qq, hq; - _quoter_child_order_state.total_fills(qq, qp); + Quantity qq, hq; + 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); }