all roundings go to one place now
This commit is contained in:
1 parent
5978ebe865
commit
335faa121f
4 files changed
+27
-22
No files matched your search
@@ -79,7 +79,7 @@ void SingleLegQuoter::one_time_activate(Price price, Quantity quantity)
|
||||
{
|
||||
if (_active_quoting)
|
||||
{
|
||||
Quantity this_leg_quantity = Quantity (SpreaderUtils::get_leg_quantity_from_spreader_quantity (_this_leg_data, quantity));
|
||||
Quantity this_leg_quantity = SpreaderUtils::get_leg_quantity_from_spreader_quantity (_this_leg_data, quantity);
|
||||
LOG(OrderMan, Info, "SingleLegQuoter::one_time_activate {} price: {} spread quantity: {} leg quantity: {}", _log_prefix(), price.value(), quantity.value(), this_leg_quantity.value());
|
||||
_worker->update_spreader_order (price, this_leg_quantity);
|
||||
}
|
||||
@@ -109,7 +109,7 @@ void SingleLegQuoter::update_order_price_quantity(Price price, Quantity quantity
|
||||
{
|
||||
if (_active_quoting)
|
||||
{
|
||||
Quantity this_leg_quantity = Quantity (SpreaderUtils::get_leg_quantity_from_spreader_quantity (_this_leg_data, quantity));
|
||||
Quantity this_leg_quantity = SpreaderUtils::get_leg_quantity_from_spreader_quantity (_this_leg_data, quantity);
|
||||
LOG(OrderMan, Info, "SingleLegQuoter::update_order_price_quantity {} price: {} spread quantity: {} leg quantity: {}", _log_prefix(), price.value(), quantity.value(), this_leg_quantity.value());
|
||||
_worker->update_spreader_order (price, this_leg_quantity);
|
||||
}
|
||||
@@ -145,8 +145,8 @@ Price SingleLegQuoter::driver_price (size_t leg_idx) const
|
||||
}
|
||||
void SingleLegQuoter::_incorporate_other_leg_fill (size_t leg_index, Quantity filled_quantity)
|
||||
{
|
||||
double this_leg_reduction_d = SpreaderUtils::get_equivelant_size (_spreader.get_leg_data(leg_index), filled_quantity, _this_leg_data);
|
||||
_price_quantity_state.add_hedged_reduction (Quantity (this_leg_reduction_d));
|
||||
Quantity this_leg_reduction = SpreaderUtils::get_leg_quantity_from_another_leg_quantity (_spreader.get_leg_data(leg_index), filled_quantity, _this_leg_data);
|
||||
_price_quantity_state.add_hedged_reduction (this_leg_reduction);
|
||||
}
|
||||
void SingleLegQuoter::_compute_price_quantity(Price& price, Quantity& quantity)
|
||||
{
|
||||
|
||||
@@ -503,20 +503,18 @@ public:
|
||||
// so if we get an N lot fill in l2, we send a hedge on l1
|
||||
// sized s1 * N / s2
|
||||
////////////////////////general functions
|
||||
static double get_equivelant_size (const LegPropertyData& source_leg, Quantity source_leg_quantity,
|
||||
const LegPropertyData& target_leg)
|
||||
static Quantity get_leg_quantity_from_another_leg_quantity (const LegPropertyData& source_leg, Quantity source_leg_quantity,
|
||||
const LegPropertyData& target_leg)
|
||||
{
|
||||
double rv = std::abs(target_leg.size_multiplier () * source_leg_quantity.value () / source_leg.size_multiplier ());
|
||||
rv = std::round(rv);
|
||||
return rv;
|
||||
return Quantity(_round_leg_qty_computed_from_another_leg_qty(rv));
|
||||
}
|
||||
// given the quantity of the spreader order, determines the quantity
|
||||
// of the leg
|
||||
static double get_leg_quantity_from_spreader_quantity(const LegPropertyData& leg, Quantity spreader_order_quantity)
|
||||
static Quantity get_leg_quantity_from_spreader_quantity(const LegPropertyData& leg, Quantity spreader_order_quantity)
|
||||
{
|
||||
double rv = std::abs (leg.size_multiplier () * spreader_order_quantity.value());
|
||||
rv = std::round (rv);
|
||||
return rv;
|
||||
return Quantity (_round_leg_qty_computed_from_spreader_qty (rv));
|
||||
}
|
||||
// finds the average weighted price and total quantity
|
||||
// from 2 prices and qty's pair
|
||||
@@ -561,9 +559,8 @@ public:
|
||||
const LegPropertyData& quote_filled_leg, Price quote_fill_price, Quantity quote_fill_quantity,
|
||||
const LegPropertyData& hedge_leg, Price& out_hedge_price, Quantity& out_hedge_quantity)
|
||||
{
|
||||
double out_hedge_quantity_d = std::abs(quote_fill_quantity.value() * (hedge_leg.size_multiplier() / quote_filled_leg.size_multiplier()));
|
||||
out_hedge_quantity_d = std::round(out_hedge_quantity_d);
|
||||
out_hedge_quantity = Quantity (out_hedge_quantity_d);
|
||||
// for ratio spreads hedge sizes are simply rounded off (the fraction can be a setting)
|
||||
out_hedge_quantity = get_leg_quantity_from_another_leg_quantity (quote_filled_leg, quote_fill_quantity, hedge_leg);
|
||||
double out_hedge_price_d = (spread_price.value() - quote_fill_price.value() * quote_filled_leg.price_multiplier())/hedge_leg.price_multiplier();
|
||||
out_hedge_price_d = bts::securities::raw_round_to_quote_price (out_hedge_price_d, hedge_leg.tick_size(), hedge_leg.trading_side());
|
||||
out_hedge_price = Price(out_hedge_price_d);
|
||||
@@ -646,7 +643,7 @@ public:
|
||||
Price& out_hedge_price, Quantity& out_hedge_quantity)
|
||||
{
|
||||
out_hedge_price = Price(bts::securities::raw_round_to_quote_price (driver_price.value(), hedge_leg.tick_size(), hedge_leg.trading_side()));
|
||||
out_hedge_quantity = Quantity (get_equivelant_size (quote_filled_leg, quote_fill_quantity, hedge_leg));
|
||||
out_hedge_quantity = get_leg_quantity_from_another_leg_quantity (quote_filled_leg, quote_fill_quantity, hedge_leg);
|
||||
}
|
||||
|
||||
/**********************************************************************/
|
||||
@@ -671,12 +668,20 @@ public:
|
||||
static uint32_t _round_hedge_target(double hedge_qty)
|
||||
{
|
||||
// hedge target is always rounded up, to be more
|
||||
// conservative when looking for the hedge qty
|
||||
// conservative when looking for the hedge qty
|
||||
return _round_quantity(hedge_qty, true);
|
||||
}
|
||||
static uint32_t _round_quoting_qty(double quote_qty)
|
||||
{
|
||||
return _round_quantity(quote_qty, false);
|
||||
return _round_quantity(quote_qty, false);
|
||||
}
|
||||
static uint32_t _round_leg_qty_computed_from_spreader_qty (double qty)
|
||||
{
|
||||
return static_cast<uint32_t>(std::round(qty));
|
||||
}
|
||||
static uint32_t _round_leg_qty_computed_from_another_leg_qty (double qty)
|
||||
{
|
||||
return static_cast<uint32_t>(std::round(qty));
|
||||
}
|
||||
/**********************************************************************/
|
||||
/**************************debugging helpers***************************/
|
||||
|
||||
+1
-1
@@ -143,7 +143,7 @@ void SpreaderWorkingStateWorker::on_check_termination()
|
||||
bool SpreaderWorkingStateWorker::_is_leg_filled (size_t leg_idx) const
|
||||
{
|
||||
const SpreaderLegData& leg_data = _spreader->_bookkeeping_data().get_leg_data(leg_idx);
|
||||
Quantity leg_target_qty = Quantity(SpreaderUtils::get_leg_quantity_from_spreader_quantity (leg_data.leg_property_data(), _spreader->_bookkeeping_data().quantity()));
|
||||
Quantity leg_target_qty = SpreaderUtils::get_leg_quantity_from_spreader_quantity (leg_data.leg_property_data(), _spreader->_bookkeeping_data().quantity());
|
||||
return leg_data.total_fills().value() >= leg_target_qty.value();
|
||||
}
|
||||
}}
|
||||
@@ -142,8 +142,8 @@ TEST_CASE ("test_leg_quantity_normalization", "[spreader]")
|
||||
LegSpreaderParams lsp;
|
||||
fill_leg_spreader_params (lsp, 1.0, true, qp);
|
||||
LegPropertyData leg_prop_data (0, leg, lsp, api::Side::SIDE_BUY);
|
||||
double calc_value = SpreaderUtils::get_leg_quantity_from_spreader_quantity (leg_prop_data, Quantity (spr_qty)),
|
||||
expected_value = std::round(std::abs(leg_mult * spr_qty));
|
||||
Quantity calc_value = SpreaderUtils::get_leg_quantity_from_spreader_quantity (leg_prop_data, Quantity (spr_qty)),
|
||||
expected_value = Quantity(static_cast<uint32_t> (std::round(std::abs(leg_mult * spr_qty))));
|
||||
bts_assert (calc_value == expected_value);
|
||||
}
|
||||
for (int i = 0; i < n_runs; i++)
|
||||
@@ -163,8 +163,8 @@ TEST_CASE ("test_leg_quantity_normalization", "[spreader]")
|
||||
fill_leg_spreader_params (lsp_2, 1.0, true, qp_2);
|
||||
LegPropertyData leg_prop_data_1 (0, leg_1, lsp_1, api::Side::SIDE_BUY);
|
||||
LegPropertyData leg_prop_data_2 (1, leg_2, lsp_2, api::Side::SIDE_BUY);
|
||||
double calc_value = SpreaderUtils::get_equivelant_size (leg_prop_data_1, Quantity(leg_qty), leg_prop_data_2),
|
||||
expected_value = std::round(std::abs(leg_qty * leg_mult_2 / leg_mult_1));
|
||||
Quantity calc_value = SpreaderUtils::get_leg_quantity_from_another_leg_quantity (leg_prop_data_1, Quantity(leg_qty), leg_prop_data_2),
|
||||
expected_value = Quantity(static_cast<uint32_t> (std::round(std::abs(leg_qty * leg_mult_2 / leg_mult_1))));
|
||||
bts_assert (calc_value == expected_value);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user