diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 2907ba125..0ab694189 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -41,6 +41,7 @@ _reported_state(){ _quoter_order_builders.back(), _hedger_order_builders.back(), _h_managers.back().hedgers(), + _h_managers.back(), _quoter_child_order_states.back(), _books.back(), _unhedged_deltas.back()); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index 695e149c7..212bf3f5b 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -55,7 +55,17 @@ public: return _child_order.is_active(); } bts::orderman::OrderKey order_key() const { - return _is_live ? _child_order.key() : _test_only_order_key; + if (_is_live){ + if(is_active()) + return _child_order.key(); + else{ + LOG(OrderMan, Error, "OrderKey::order_key() is an illegal " + "when inactive"); + return OrderKey(0); + } + } + else + return _test_only_order_key; } api::orderman::OrderStatus status () const { return _status; @@ -121,7 +131,8 @@ public: bts_assert(!_is_live || e.key == order_key()); bts_assert(e.filled_quantity >= _filled_quantity.value()); _status = e.status; - _last_filled_quantity = Quantity(e.filled_quantity - _filled_quantity.value()); + _last_filled_quantity = Quantity(e.filled_quantity + - _filled_quantity.value()); _last_filled_price = Price(e.last_price); _last_reported_order_price=Price(e.price); SpreaderUtils::compute_average_price(_filled_price, @@ -169,7 +180,8 @@ public: } void cancel_order(){ bts_assert(_n_cancel_orders == 0); - LOG(OrderMan, Info, "SpreaderChildOrderState::cancel_order order_key: {} is_quoting: {} sec_key: {} live: {} ", + LOG(OrderMan, Info, "SpreaderChildOrderState::cancel_order order_key: {} " + "is_quoting: {} sec_key: {} live: {} ", order_key().value(), _is_quoting, _sec_key, _is_live); _n_cancel_orders++; if (_is_live) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp index ceb595573..6cab43811 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp @@ -8,6 +8,7 @@ SpreaderLegData::SpreaderLegData (const LegPropertyData& leg_property_data, SpreaderOrderBuilder& quoter_order_builder, SpreaderOrderBuilder& hedger_order_builder, std::vector& hedger_data_vector, + HedgerManager& hedger_manager, SpreaderChildOrderState& quoter_child_order_state, Book& book, UnhedgedDelta& unhedged_delta) @@ -17,7 +18,8 @@ _quoter(quoter), _quoter_order_builder (quoter_order_builder), _hedger_order_builder (hedger_order_builder), _quoter_child_order_state (quoter_child_order_state), -_hedger_data_vector (hedger_data_vector), +_hedger_data_vector (hedger_data_vector), +_hedger_manager(hedger_manager), _book(book), _unhedged_delta(unhedged_delta), _settlement_price(md::INT_NAN) @@ -31,6 +33,7 @@ _quoter_order_builder(other._quoter_order_builder), _hedger_order_builder(other._hedger_order_builder), _quoter_child_order_state (other._quoter_child_order_state), _hedger_data_vector (other._hedger_data_vector), +_hedger_manager(other._hedger_manager), _book(other._book), _unhedged_delta(other._unhedged_delta){ bts_assert (false); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index 89c3393c1..ee7d6392d 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -2,6 +2,7 @@ #include "LegPropertyData.h" #include "SingleLegQuoter.h" #include "SingleFillHedger.h" +#include "lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h" #include "SpreaderChildOrderState.h" #include "lib/orderman/actors/order_manager/OrderBuilder.h" #include "lib/orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.h" @@ -29,7 +30,8 @@ private: SpreaderOrderBuilder& _quoter_order_builder; SpreaderOrderBuilder& _hedger_order_builder; SpreaderChildOrderState& _quoter_child_order_state; - std::vector& _hedger_data_vector; + std::vector& _hedger_data_vector; + HedgerManager& _hedger_manager; Book& _book; UnhedgedDelta& _unhedged_delta; md::IntPrice _settlement_price; @@ -39,6 +41,7 @@ public: SpreaderOrderBuilder& quoter_order_builder, SpreaderOrderBuilder& hedger_order_builder, std::vector& hedger_data_vector, + HedgerManager& hedger_manager, SpreaderChildOrderState& quoter_child_order_state, Book& book, UnhedgedDelta& unhedged_delta); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h index c62000b1b..6e7ad57cb 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/hedger/HedgerManager.h @@ -21,6 +21,28 @@ public: SingleFillHedger& get_hedger(); std::vector& hedgers(){ return _hedgers; + } + SingleFillHedger* find_hedger_from_orderkey(OrderKey order_key){ + for (SingleFillHedger& hedger : _hedgers) + if (hedger.order_state().order_key() == order_key) + return &hedger; + return nullptr; + } + void update_book (const Book& book, trace::CorID& cid){ + for (SingleFillHedger& hedger : _hedgers) + hedger.on_book(book, cid); + } + void udpate_time(const bts::TimeStamp& ts){ + for (SingleFillHedger& hedger : _hedgers) + hedger.on_time(ts); + } + void cancel_hedges(){ + for (SingleFillHedger& hedger : _hedgers) + hedger.cancel_hedge(); + } + void terminate_hedges(){ + for (SingleFillHedger& hedger : _hedgers) + hedger.terminate(); } };