conditional quotes are not pulled until after 5 secs of the condition
This commit is contained in:
1 parent
d9b37efbbd
commit
8673f366d7
6 files changed
+37
-12
No files matched your search
@@ -52,6 +52,7 @@ private:
|
||||
Quantity quantity) {
|
||||
_child_order_state.place_order(price,
|
||||
quantity,
|
||||
_spreader.current_time(),
|
||||
_fill_trace);
|
||||
}
|
||||
void _modify_order (Price new_price){
|
||||
|
||||
@@ -177,11 +177,16 @@ void SingleLegQuoter::_compute_price_quantity(Price& price,
|
||||
bool SingleLegQuoter::_apply_quote_entry_params(
|
||||
Price new_price,
|
||||
Quantity new_quantity){
|
||||
return SpreaderUtils::conditional_quoting(
|
||||
new_price,
|
||||
new_quantity,
|
||||
_this_leg_data.leg_index(),
|
||||
_spreader);
|
||||
bool working_and_new = is_active_order() &&
|
||||
ms_diff(
|
||||
_spreader.current_time(),
|
||||
_price_quantity_state.order_state().order_place_time())
|
||||
<= 5000;
|
||||
return working_and_new ? true : SpreaderUtils::conditional_quoting(
|
||||
new_price,
|
||||
new_quantity,
|
||||
_this_leg_data.leg_index(),
|
||||
_spreader);
|
||||
}
|
||||
void SingleLegQuoter::_adjust_for_hidden_order(Price& price,
|
||||
Quantity& quantity){
|
||||
|
||||
@@ -169,8 +169,13 @@ private:
|
||||
bool _target_reached(){
|
||||
return _price_quantity_state.target_reached();
|
||||
}
|
||||
void _place_order (Price price, Quantity quantity, const PerfTrace &trace = PerfTrace()) {
|
||||
_child_order_state.place_order(price, quantity,trace);
|
||||
void _place_order (Price price,
|
||||
Quantity quantity,
|
||||
const PerfTrace &trace) {
|
||||
_child_order_state.place_order(price,
|
||||
quantity,
|
||||
_spreader.current_time(),
|
||||
trace);
|
||||
}
|
||||
void _modify_order (Price price, Quantity quantity, PerfTrace &trace) {
|
||||
_child_order_state.modify_order(price, quantity, trace);
|
||||
|
||||
@@ -20,7 +20,10 @@ _filled_price(src._filled_price),
|
||||
_filled_quantity(src._filled_quantity),
|
||||
_last_filled_price(src._last_filled_price),
|
||||
_last_reported_order_price(src._last_reported_order_price),
|
||||
_last_filled_quantity(src._last_filled_quantity)
|
||||
_last_filled_quantity(src._last_filled_quantity),
|
||||
_out_price(src._out_price),
|
||||
_out_quantity(src._out_quantity),
|
||||
_order_place_time(src._order_place_time)
|
||||
{ }
|
||||
SpreaderChildOrderState::SpreaderChildOrderState (bts::orderman::ChildOrder& child_order,
|
||||
SecurityKey sec_key,
|
||||
@@ -50,6 +53,7 @@ void SpreaderChildOrderState::_init_running_values(){
|
||||
_last_filled_quantity = Quantity(0);
|
||||
_out_price = Price(0);
|
||||
_out_quantity = Quantity(0);
|
||||
_order_place_time=bts::TimeStamp();
|
||||
}
|
||||
void SpreaderChildOrderState::re_init(){
|
||||
SpreaderUtils::compute_average_price(_base_price, _base_quantity,
|
||||
|
||||
@@ -33,6 +33,7 @@ private:
|
||||
Quantity _last_filled_quantity;
|
||||
Price _out_price;
|
||||
Quantity _out_quantity;
|
||||
bts::TimeStamp _order_place_time;
|
||||
public:
|
||||
// constructors ///////////////////
|
||||
///////////////////////////////////
|
||||
@@ -93,6 +94,9 @@ public:
|
||||
Quantity out_quantity () const {
|
||||
return _out_quantity;
|
||||
}
|
||||
bts::TimeStamp order_place_time() const{
|
||||
return _order_place_time;
|
||||
}
|
||||
// init ///////////////////
|
||||
///////////////////////////
|
||||
// zero's out base values
|
||||
@@ -125,9 +129,11 @@ public:
|
||||
/////////////////////////////////////
|
||||
void place_order(Price price,
|
||||
Quantity quantity,
|
||||
const PerfTrace & trace = PerfTrace()){
|
||||
bts::TimeStamp curr_time,
|
||||
const PerfTrace& trace){
|
||||
_out_price = price;
|
||||
_out_quantity = quantity;
|
||||
_order_place_time=curr_time;
|
||||
bts_assert(_n_place_orders == 0);
|
||||
_n_place_orders++;
|
||||
LOG(OrderMan, Info, "SpreaderChildOrderState::place_order "
|
||||
|
||||
@@ -47,7 +47,9 @@ TEST_CASE ("quoter price quantity state", "[spreader]")
|
||||
REQUIRE (s.out_price() == Price (0.0));
|
||||
REQUIRE (s.out_quantity() == Quantity (0));
|
||||
// set out price and quantity
|
||||
order.place_order(Price (-0.35), Quantity (123));
|
||||
PerfTrace dont_care;
|
||||
bts::TimeStamp ts;
|
||||
order.place_order(Price (-0.35), Quantity (123),ts,dont_care);
|
||||
REQUIRE (s.target_spread_price() == Price (-1.0));
|
||||
REQUIRE (s.target_leg_quantity() == Quantity (200));
|
||||
REQUIRE (s.aggregated_filled_quantity() == Quantity (25));
|
||||
@@ -100,7 +102,9 @@ TEST_CASE ("quoter price quantity state", "[spreader]")
|
||||
s.add_hedged_reduction (Quantity(5));
|
||||
s.add_hedged_reduction (Quantity(15));
|
||||
// set out values
|
||||
order_2.place_order (Price(1), Quantity (50));
|
||||
PerfTrace dont_care;
|
||||
bts::TimeStamp ts;
|
||||
order_2.place_order (Price(1), Quantity (50),ts,dont_care);
|
||||
REQUIRE (s.target_spread_price() == Price (-1.0));
|
||||
REQUIRE (s.target_leg_quantity() == Quantity (200));
|
||||
REQUIRE (s.aggregated_filled_quantity() == Quantity (40));
|
||||
@@ -121,7 +125,7 @@ TEST_CASE ("quoter price quantity state", "[spreader]")
|
||||
on_order_update (order_2, api::orderman::OrderStatus::ORDER_STATUS_WORKING, Quantity (10), Price (2000));
|
||||
s.add_hedged_reduction (Quantity(3));
|
||||
s.add_hedged_reduction (Quantity(7));
|
||||
order_2.place_order (Price(0.75), Quantity (50));
|
||||
order_2.place_order (Price(0.75), Quantity (50),ts,dont_care);
|
||||
REQUIRE (s.target_spread_price() == Price (-1.0));
|
||||
REQUIRE (s.target_leg_quantity() == Quantity (200));
|
||||
REQUIRE (s.aggregated_filled_quantity() == Quantity (10));
|
||||
|
||||
Reference in new issue
Block a user