Adhering spreader to bts::api::SyntheticContract::PriceCalc (from the old one)

This commit is contained in:
Taha Afzal committed 2019-02-23 23:59:09 -05:00
1 parent 2c9e83c6f0
commit fef5ae4aff
6 files changed
+22 -19

No files matched your search

@@ -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
@@ -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();
@@ -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();
@@ -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);
}
@@ -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());
@@ -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,