From fef5ae4aff3043814db96037fae44cc9839ce52a Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Sat, 23 Feb 2019 23:59:09 -0500 Subject: [PATCH] Adhering spreader to bts::api::SyntheticContract::PriceCalc (from the old one) --- .../orders/spreader_orders/SpreaderOrder.cpp | 4 ++-- .../spreader/LegPropertyData.h | 7 +++++-- .../spreader/SpreaderBookkeepingData.cpp | 2 +- .../spreader/SpreaderLegData.h | 4 ++-- .../spreader_orders/spreader/SpreaderUtils.h | 4 ++-- .../spreader_orders/tests/spreader_tests.cpp | 20 +++++++++---------- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index bdfdd7aa1..be6e2a953 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -469,7 +469,7 @@ bool SpreaderOrder::_contains_net_change_leg(){ for (size_t l_idx = 0; l_idx < _bookkeeping_data().n_legs(); l_idx++){ const LegPropertyData& leg_data = _bookkeeping_data().get_leg_data(l_idx).leg_property_data(); - if(leg_data.leg_md_calc()==bts::spark::LegSpreaderParams::NET_CHANGE) + if(leg_data.is_net_change()) return true; } return false; @@ -479,7 +479,7 @@ Price SpreaderOrder::_compute_effective_price (Price input_price){ if(_contains_net_change_leg()){ for (size_t l_idx = 0; l_idx < _bookkeeping_data().n_legs(); l_idx++){ const SpreaderLegData& leg_data = _bookkeeping_data().get_leg_data(l_idx); - if(leg_data.leg_property_data().leg_md_calc()==bts::spark::LegSpreaderParams::NET_CHANGE){ + if(leg_data.leg_property_data().is_net_change()){ if (!leg_data.settlement_populated()) return Price(os::nan()); else diff --git a/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h b/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h index f054f9eeb..218b0d59c 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/LegPropertyData.h @@ -34,8 +34,11 @@ public: double size_multiplier() const { return _leg_contract.quantity(); } double tick_size() const { return _leg_contract.security().contract_spec().low_tick(); } bool is_active_quoting() const {return _leg_params.is_active_quoting();} - bts::spark::LegSpreaderParams::LegMarketDataCalculation leg_md_calc() const { - return _leg_params.leg_md_calc(); + bts::api::SyntheticContract::PriceCalc price_calc() const{ + return bts::api::SyntheticContract::PRICECALC_STANDARD; + } + bool is_net_change() const{ + return price_calc()==bts::api::SyntheticContract::PRICECALC_NET_CHANGE; } bts::spark::LegSpreaderParams::MarketDataType md_type() const { return _leg_params.market_data_type(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp index 4150aadda..50635595f 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp @@ -82,7 +82,7 @@ void SpreaderBookkeepingData::total_fills (Quantity& out_quantity, leg_normalized_qty=std::abs(leg_normalized_qty); // this is because the spreader fill qty = min(across all legs) fills = leg_normalized_qty < fills ? leg_normalized_qty : fills; - if(leg_data.leg_property_data().leg_md_calc()==bts::spark::LegSpreaderParams::NET_CHANGE) + if(leg_data.leg_property_data().is_net_change()) // TODO, filled size is missing avg_price += (leg_fill_price.value()-leg_data.settlement_price().value()) * leg_data.leg_property_data().price_multiplier(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h index e5a3cd79e..25620eafa 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderLegData.h @@ -163,7 +163,7 @@ public: _settlement_price, _leg_property_data.tick_size(), _leg_property_data.md_type(), - bts::spark::LegSpreaderParams::BOOK, + _leg_property_data.price_calc(), _book); } void update_settlement_price(md::IntPrice price){ @@ -172,7 +172,7 @@ public: _settlement_price, _leg_property_data.tick_size(), _leg_property_data.md_type(), - bts::spark::LegSpreaderParams::BOOK, + _leg_property_data.price_calc(), _book); } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index 95630d57d..64290dbab 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -169,7 +169,7 @@ public: md::IntPrice settlement_price, double tick_size, bts::spark::LegSpreaderParams::MarketDataType md_type, - bts::spark::LegSpreaderParams::LegMarketDataCalculation leg_calc, + bts::api::SyntheticContract::PriceCalc leg_calc, Book& target){ SecurityKey target_key=target.security_key(); if(md_type==bts::spark::LegSpreaderParams::DIRECT){ @@ -198,7 +198,7 @@ public: target.bid()=source.bid(); target.ask()=source.ask(); } - if(leg_calc==bts::spark::LegSpreaderParams::NET_CHANGE){ + if(leg_calc==bts::api::SyntheticContract::PRICECALC_NET_CHANGE){ if(settlement_price.is_nan()){ empty_out_book(target.bid(),0,target.n_levels()); empty_out_book(target.ask(),0,target.n_levels()); diff --git a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp index 5cdc73b77..2d167ef36 100644 --- a/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp +++ b/src/lib/orderman/orders/spreader_orders/tests/spreader_tests.cpp @@ -3231,7 +3231,7 @@ TEST_CASE ("simple book addition", "[spreader]"){ md::IntPrice_from_double<7>(1999.0), 1.0, bts::spark::LegSpreaderParams::DIRECT, - bts::spark::LegSpreaderParams::BOOK, + bts::api::SyntheticContract::PRICECALC_STANDARD, out_book); validate_book(out_book, @@ -3256,7 +3256,7 @@ TEST_CASE ("simple book addition", "[spreader]"){ md::IntPrice_from_double<7>(1999.0), 1.0, bts::spark::LegSpreaderParams::DIRECT, - bts::spark::LegSpreaderParams::BOOK, + bts::api::SyntheticContract::PRICECALC_STANDARD, out_book); validate_book(out_book, @@ -3281,7 +3281,7 @@ TEST_CASE ("simple book addition", "[spreader]"){ md::IntPrice_from_double<7>(1999.0), 1.0, bts::spark::LegSpreaderParams::DIRECT, - bts::spark::LegSpreaderParams::NET_CHANGE, + bts::api::SyntheticContract::PRICECALC_NET_CHANGE, out_book); validate_book(out_book, @@ -3306,7 +3306,7 @@ TEST_CASE ("simple book addition", "[spreader]"){ md::INT_NAN, 1.0, bts::spark::LegSpreaderParams::DIRECT, - bts::spark::LegSpreaderParams::NET_CHANGE, + bts::api::SyntheticContract::PRICECALC_NET_CHANGE, out_book); validate_book(out_book, @@ -3331,7 +3331,7 @@ TEST_CASE ("simple book addition", "[spreader]"){ md::IntPrice_from_double<7>(1999.0), 1.0, bts::spark::LegSpreaderParams::MERGED, - bts::spark::LegSpreaderParams::BOOK, + bts::api::SyntheticContract::PRICECALC_STANDARD, out_book); validate_book(out_book, @@ -3356,7 +3356,7 @@ TEST_CASE ("simple book addition", "[spreader]"){ md::IntPrice_from_double<7>(1999.0), 1.0, bts::spark::LegSpreaderParams::MERGED, - bts::spark::LegSpreaderParams::NET_CHANGE, + bts::api::SyntheticContract::PRICECALC_NET_CHANGE, out_book); validate_book(out_book, @@ -3407,7 +3407,7 @@ TEST_CASE ("random book addition", "[spreader]"){ md::IntPrice_from_double<7>(settlement_price), 1.0, bts::spark::LegSpreaderParams::DIRECT, - bts::spark::LegSpreaderParams::BOOK, + bts::api::SyntheticContract::PRICECALC_STANDARD, out_book); validate_book(out_book, key, @@ -3434,7 +3434,7 @@ TEST_CASE ("random book addition", "[spreader]"){ md::IntPrice_from_double<7>(settlement_price), 1.0, bts::spark::LegSpreaderParams::DIRECT, - bts::spark::LegSpreaderParams::NET_CHANGE, + bts::api::SyntheticContract::PRICECALC_NET_CHANGE, out_book); validate_book(out_book, key, @@ -3461,7 +3461,7 @@ TEST_CASE ("random book addition", "[spreader]"){ md::IntPrice_from_double<7>(settlement_price), 1.0, bts::spark::LegSpreaderParams::MERGED, - bts::spark::LegSpreaderParams::BOOK, + bts::api::SyntheticContract::PRICECALC_STANDARD, out_book); validate_book(out_book, key, @@ -3490,7 +3490,7 @@ TEST_CASE ("random book addition", "[spreader]"){ md::IntPrice_from_double<7>(settlement_price), 1.0, bts::spark::LegSpreaderParams::MERGED, - bts::spark::LegSpreaderParams::NET_CHANGE, + bts::api::SyntheticContract::PRICECALC_NET_CHANGE, out_book); validate_book(out_book, key,