diff --git a/src/client/spark/Orders/OrderTypeVMs/LeanOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/LeanOrderVM.cs index daa526f83..0e6ecff14 100644 --- a/src/client/spark/Orders/OrderTypeVMs/LeanOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/LeanOrderVM.cs @@ -24,13 +24,15 @@ namespace mbts.spark this.child_order_types = new InlineUserProperty>(child_order_types, true); cross_threshold = new InlineUserProperty( new bts.spark.QuantityMeasure() { Ratio = 1.0, Absolute = 1}, false); - max_chase_ticks = new InlineUserProperty(10, false); + max_chase_ticks = new InlineUserProperty(2, false); + detach_on_toward = new InlineUserProperty(true, false); } public readonly InlineUserProperty selected_child_order_type; public readonly InlineUserProperty> child_order_types; public readonly InlineUserProperty cross_threshold; public readonly InlineUserProperty max_chase_ticks; + public readonly InlineUserProperty detach_on_toward; } class LeanOrderVM : OrderTypeVMBase, IHierarchicalOrderTypeVM, IDisposable @@ -44,7 +46,8 @@ namespace mbts.spark IDisposable _dispose, _child_order_errors_sub; public bts.spark.QuantityMeasure cross_threshold { get; set; } = new bts.spark.QuantityMeasure() { Ratio = 1.0, Absolute = 1 }; - public uint max_chase_ticks { get; set; } = 10; + public uint max_chase_ticks { get; set; } = 2; + public bool detach_on_toward { get; set; } = true; public LeanOrderVM(OrdersModel model, IObservable security_md_source) : this(model, security_md_source, security_md_source.Select(smd => @@ -77,6 +80,11 @@ namespace mbts.spark max_chase_ticks = p.max_chase_ticks.value; RaisePropertyChanged(nameof(max_chase_ticks)); } + if (p.detach_on_toward.force_override) + { + detach_on_toward = p.detach_on_toward.value; + RaisePropertyChanged(nameof(detach_on_toward)); + } _inline_props = p; _validate(); }) @@ -94,6 +102,7 @@ namespace mbts.spark var i = factory.lean_order(); i.CrossThreshold = cross_threshold; i.MaxChaseTicks = max_chase_ticks; + i.DetachOnToward = detach_on_toward; child_order.assign_to(i.Child); value.Lean = i; } diff --git a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml index 2813ef607..909f7483c 100644 --- a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml +++ b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml @@ -222,6 +222,8 @@ + + @@ -233,9 +235,10 @@ Max Chase Ticks - Child + Detach on Toward + Child services->report_state(merged_state); } -void BookAlgo::payup(const md::PriceSize& opposite, uint32_t cross_ticks) +void BookAlgo::payup(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) { double new_price = opposite.price() + me->tick_size * cross_ticks; me->child.update(Price(new_price), Quantity(this_state().quantity())); report_state(); } -void BookAlgo::paydown(const md::PriceSize& opposite, uint32_t cross_ticks) +void BookAlgo::paydown(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) { double new_price = opposite.price() - me->tick_size * cross_ticks; me->child.update(Price(new_price), Quantity(this_state().quantity())); diff --git a/src/lib/orderman/orders/book_algos/BookAlgo.h b/src/lib/orderman/orders/book_algos/BookAlgo.h index 94bb13af0..7c01878a0 100644 --- a/src/lib/orderman/orders/book_algos/BookAlgo.h +++ b/src/lib/orderman/orders/book_algos/BookAlgo.h @@ -42,8 +42,8 @@ protected: virtual void transition(api::orderman::OrderStatus new_state, std::string = ""); virtual void report_state(); - virtual void payup(const md::PriceSize&, uint32_t cross_ticks = 0); - virtual void paydown(const md::PriceSize&, uint32_t cross_ticks = 0); + virtual void payup(const md::PriceSize&, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks = 0); + virtual void paydown(const md::PriceSize&, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks = 0); void detach(bts::api::orderman::OrderStatus status_after_detach = bts::api::orderman::ORDER_STATUS_CANCELED); private: struct PImpl; diff --git a/src/lib/orderman/orders/book_algos/LeanOrder.cpp b/src/lib/orderman/orders/book_algos/LeanOrder.cpp index 66433afd3..8a1883a94 100644 --- a/src/lib/orderman/orders/book_algos/LeanOrder.cpp +++ b/src/lib/orderman/orders/book_algos/LeanOrder.cpp @@ -12,12 +12,15 @@ using namespace api::orderman; struct LeanOrder::PImpl { - PImpl() {} + PImpl() : cross_threshold(), max_chase_ticks(0), detach_on_toward(false), opposite_at_inception(), num_chases(0) + {} spark::QuantityMeasure cross_threshold; uint32_t max_chase_ticks; + bool detach_on_toward; md::PriceSize opposite_at_inception; + uint32_t num_chases; }; @@ -34,25 +37,40 @@ void LeanOrder::setup_child(const api::orderman::OrderDefinition& this_def, cons me->cross_threshold = lean_def.cross_threshold(); me->max_chase_ticks = lean_def.max_chase_ticks(); + me->detach_on_toward = lean_def.detach_on_toward(); } -void LeanOrder::payup(const md::PriceSize& opposite, uint32_t cross_ticks) +void LeanOrder::payup(const md::PriceSize&, const bts::orderman::BookUpdateEvent& book, uint32_t cross_ticks /*= 0*/) { - double new_price = opposite.price() + tick_size() * cross_ticks; + double new_price = me->opposite_at_inception.price() + tick_size() * cross_ticks; double limit = me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; if(new_price <= limit) update_child(Price(new_price), Quantity(this_state().quantity())); else { - update_child(Price(limit), Quantity(this_state().quantity())); + update_child(Price(limit), Quantity(this_state().quantity())); detach(); - } + return; + } + + const bts::orderman::BookSide& sellbook = book.book.side(api::Side::SIDE_SELL); + for(const auto& i : sellbook) + { + me->opposite_at_inception = i; + if(me->opposite_at_inception.price() > new_price) + break; + } + if(me->opposite_at_inception.price() <= new_price) + detach(); + me->num_chases += cross_ticks+1; + if(me->num_chases >= me->max_chase_ticks) + detach(); report_state(); } -void LeanOrder::paydown(const md::PriceSize& opposite, uint32_t cross_ticks) +void LeanOrder::paydown(const md::PriceSize&, const bts::orderman::BookUpdateEvent& book, uint32_t cross_ticks /*= 0*/) { - double new_price = opposite.price() - tick_size() * cross_ticks; + double new_price = me->opposite_at_inception.price() - tick_size() * cross_ticks; double limit = me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; if(new_price >= limit) update_child(Price(new_price), Quantity(this_state().quantity())); @@ -60,11 +78,24 @@ void LeanOrder::paydown(const md::PriceSize& opposite, uint32_t cross_ticks) { update_child(Price(limit), Quantity(this_state().quantity())); detach(); - } + return; + } + + const bts::orderman::BookSide& buybook = book.book.side(api::Side::SIDE_BUY); + for(const auto& i : buybook) + { + me->opposite_at_inception = i; + if(me->opposite_at_inception.price() < new_price) + break; + } + if(me->opposite_at_inception.price() >= new_price) + detach(); + me->num_chases += cross_ticks+1; + if(me->num_chases >= me->max_chase_ticks) + detach(); report_state(); } - void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) { switch (this_state().status()) @@ -91,26 +122,36 @@ void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) { const auto& opposite = book.book.side(api::Side::SIDE_SELL)[0]; if(opposite.price() < me->opposite_at_inception.price()) - me->opposite_at_inception = opposite; //your lucky day, try to get luckier + { + if(me->detach_on_toward) + detach(); + else + me->opposite_at_inception = opposite; //we don't want to detach so look at next level + } else if(opposite.price() > me->opposite_at_inception.price()) - payup(opposite); //you missed, payup + payup(opposite, book); //you missed, payup/join else { if(opposite.size() <= thresh.value()) - payup(opposite); + payup(opposite, book); } } else { const auto& opposite = book.book.side(api::Side::SIDE_BUY)[0]; if(opposite.price() > me->opposite_at_inception.price()) - me->opposite_at_inception = opposite; + { + if(me->detach_on_toward) + detach(); + else + me->opposite_at_inception = opposite; + } else if(opposite.price() < me->opposite_at_inception.price()) - paydown(opposite); + paydown(opposite, book); else { if(opposite.size() <= thresh.value()) - paydown(opposite); + paydown(opposite, book); } } } diff --git a/src/lib/orderman/orders/book_algos/LeanOrder.h b/src/lib/orderman/orders/book_algos/LeanOrder.h index e6318f9b6..f5471e0c5 100644 --- a/src/lib/orderman/orders/book_algos/LeanOrder.h +++ b/src/lib/orderman/orders/book_algos/LeanOrder.h @@ -24,8 +24,8 @@ protected: api::orderman::OrderState&, api::orderman::OrderDefinition*) override; void on_book_update(const bts::orderman::BookUpdateEvent&) override; private: - void payup(const md::PriceSize& opposite, uint32_t cross_ticks = 0) override; - void paydown(const md::PriceSize& opposite, uint32_t cross_ticks = 0) override; + void payup(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks = 0) override; + void paydown(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks = 0) override; private: struct PImpl; diff --git a/src/lib/orderman/orders/book_algos/TickOrder.cpp b/src/lib/orderman/orders/book_algos/TickOrder.cpp index b1aa04781..105d74084 100644 --- a/src/lib/orderman/orders/book_algos/TickOrder.cpp +++ b/src/lib/orderman/orders/book_algos/TickOrder.cpp @@ -43,7 +43,7 @@ void TickOrder::setup_child(const api::orderman::OrderDefinition& this_def, cons me->detach_on_toward = tick_def.detach_on_toward(); } -void TickOrder::payup(const md::PriceSize& opposite, uint32_t cross_ticks) +void TickOrder::payup(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) { double new_price = opposite.price() + tick_size() * cross_ticks; double limit = me->opposite_at_inception.price() + tick_size() * me->max_chase_ticks; @@ -57,7 +57,7 @@ void TickOrder::payup(const md::PriceSize& opposite, uint32_t cross_ticks) report_state(); } -void TickOrder::paydown(const md::PriceSize& opposite, uint32_t cross_ticks) +void TickOrder::paydown(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) { double new_price = opposite.price() - tick_size() * cross_ticks; double limit = me->opposite_at_inception.price() - tick_size() * me->max_chase_ticks; @@ -127,11 +127,11 @@ void TickOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) me->opposite_at_inception = opposite; } else if(opposite.price() > me->opposite_at_inception.price()) - payup(opposite, me->cross_ticks); + payup(opposite, book, me->cross_ticks); else { if(opposite.size() <= thresh.value()) - payup(opposite, me->cross_ticks); + payup(opposite, book, me->cross_ticks); } } else @@ -145,11 +145,11 @@ void TickOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) me->opposite_at_inception = opposite; } else if(opposite.price() < me->opposite_at_inception.price()) - paydown(opposite, me->cross_ticks); + paydown(opposite, book, me->cross_ticks); else { if(opposite.size() <= thresh.value()) - paydown(opposite, me->cross_ticks); + paydown(opposite, book, me->cross_ticks); } } } diff --git a/src/lib/orderman/orders/book_algos/TickOrder.h b/src/lib/orderman/orders/book_algos/TickOrder.h index e0d260b1d..82679d93c 100644 --- a/src/lib/orderman/orders/book_algos/TickOrder.h +++ b/src/lib/orderman/orders/book_algos/TickOrder.h @@ -24,8 +24,8 @@ protected: api::orderman::OrderState&, api::orderman::OrderDefinition*) override; void on_book_update(const bts::orderman::BookUpdateEvent&) override; private: - void payup(const md::PriceSize& opposite, uint32_t cross_ticks) override; - void paydown(const md::PriceSize& opposite, uint32_t cross_ticks) override; + void payup(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) override; + void paydown(const md::PriceSize& opposite, const bts::orderman::BookUpdateEvent&, uint32_t cross_ticks) override; private: struct PImpl;