diff --git a/src/client/spark/Orders/OrderTypeVMs/LeanOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/LeanOrderVM.cs index 0e6ecff14..9f61bc4ff 100644 --- a/src/client/spark/Orders/OrderTypeVMs/LeanOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/LeanOrderVM.cs @@ -25,14 +25,14 @@ namespace mbts.spark cross_threshold = new InlineUserProperty( new bts.spark.QuantityMeasure() { Ratio = 1.0, Absolute = 1}, false); max_chase_ticks = new InlineUserProperty(2, false); - detach_on_toward = new InlineUserProperty(true, false); + trade_toward_behavior = new InlineUserProperty(LeanOrderDefinition.Types.OnToward.Cancel, 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; + public readonly InlineUserProperty trade_toward_behavior; } class LeanOrderVM : OrderTypeVMBase, IHierarchicalOrderTypeVM, IDisposable @@ -47,7 +47,7 @@ namespace mbts.spark public bts.spark.QuantityMeasure cross_threshold { get; set; } = new bts.spark.QuantityMeasure() { Ratio = 1.0, Absolute = 1 }; public uint max_chase_ticks { get; set; } = 2; - public bool detach_on_toward { get; set; } = true; + public LeanOrderDefinition.Types.OnToward trade_toward_behavior { get; set; } = LeanOrderDefinition.Types.OnToward.Cancel; public LeanOrderVM(OrdersModel model, IObservable security_md_source) : this(model, security_md_source, security_md_source.Select(smd => @@ -80,10 +80,10 @@ namespace mbts.spark max_chase_ticks = p.max_chase_ticks.value; RaisePropertyChanged(nameof(max_chase_ticks)); } - if (p.detach_on_toward.force_override) + if (p.trade_toward_behavior.force_override) { - detach_on_toward = p.detach_on_toward.value; - RaisePropertyChanged(nameof(detach_on_toward)); + trade_toward_behavior = p.trade_toward_behavior.value; + RaisePropertyChanged(nameof(trade_toward_behavior)); } _inline_props = p; _validate(); @@ -102,11 +102,13 @@ namespace mbts.spark var i = factory.lean_order(); i.CrossThreshold = cross_threshold; i.MaxChaseTicks = max_chase_ticks; - i.DetachOnToward = detach_on_toward; + i.TradeTowardBehavior = trade_toward_behavior; child_order.assign_to(i.Child); value.Lean = i; } - } + } + + public IEnumerable trade_toward_types => EnumHelper.get_values_except(); public ICollection child_order_types { diff --git a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml index 909f7483c..8084859c9 100644 --- a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml +++ b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml @@ -235,7 +235,8 @@ Max Chase Ticks - Detach on Toward + On Toward + Child cross_threshold = lean_def.cross_threshold(); me->max_chase_ticks = lean_def.max_chase_ticks(); - me->detach_on_toward = lean_def.detach_on_toward(); + me->trade_toward_behavior = lean_def.trade_toward_behavior(); } void LeanOrder::payup(const md::PriceSize&, const bts::orderman::BookUpdateEvent& book, uint32_t cross_ticks /*= 0*/) @@ -96,6 +96,33 @@ void LeanOrder::paydown(const md::PriceSize&, const bts::orderman::BookUpdateEve report_state(); } +void LeanOrder::choose_trade_toward_behavior(const md::PriceSize& opposite) +{ + switch (me->trade_toward_behavior) + { + case LeanOrderDefinition_OnToward_CANCEL: + { + cancel_child(); + transition(ORDER_STATUS_CANCELED); + report_state(); + } + break; + case LeanOrderDefinition_OnToward_DETACH: + { + detach(); + } + break; + case LeanOrderDefinition_OnToward_REPRICE: + { + me->opposite_at_inception = opposite; + } + break; + case LeanOrderDefinition_OnToward_NO_CHANGE: + default: + break; + } +} + void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) { switch (this_state().status()) @@ -122,12 +149,7 @@ 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()) - { - if(me->detach_on_toward) - detach(); - else - me->opposite_at_inception = opposite; //we don't want to detach so look at next level - } + choose_trade_toward_behavior(opposite); else if(opposite.price() > me->opposite_at_inception.price()) payup(opposite, book); //you missed, payup/join else @@ -140,12 +162,7 @@ void LeanOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) { const auto& opposite = book.book.side(api::Side::SIDE_BUY)[0]; if(opposite.price() > me->opposite_at_inception.price()) - { - if(me->detach_on_toward) - detach(); - else - me->opposite_at_inception = opposite; - } + choose_trade_toward_behavior(opposite); else if(opposite.price() < me->opposite_at_inception.price()) paydown(opposite, book); else diff --git a/src/lib/orderman/orders/book_algos/LeanOrder.h b/src/lib/orderman/orders/book_algos/LeanOrder.h index f5471e0c5..bf9ff062c 100644 --- a/src/lib/orderman/orders/book_algos/LeanOrder.h +++ b/src/lib/orderman/orders/book_algos/LeanOrder.h @@ -26,6 +26,7 @@ protected: private: 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; + void choose_trade_toward_behavior(const md::PriceSize& opposite); private: struct PImpl; diff --git a/src/lib/orderman/orders/book_algos/TopOrder.cpp b/src/lib/orderman/orders/book_algos/TopOrder.cpp index a45a96504..fd25ea8fb 100644 --- a/src/lib/orderman/orders/book_algos/TopOrder.cpp +++ b/src/lib/orderman/orders/book_algos/TopOrder.cpp @@ -80,6 +80,33 @@ void TopOrder::on_book_update(const bts::orderman::BookUpdateEvent& book) { case ORDER_STATUS_INACTIVE: { + Quantity thresh = SpreaderUtils::_quantity_threshold(me->top_threshold, Quantity(this_state().quantity())); + if(definition().side() == api::SIDE_BUY) + { + const auto& same = book.book.side(api::Side::SIDE_BUY)[0]; + if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) + { + if(same.size() <= thresh.value()) + { + transition(ORDER_STATUS_CANCELED); + report_state(); + return; + } + } + } + else + { + const auto& same = book.book.side(api::Side::SIDE_SELL)[0]; + if(securities::test_price_equality(this_state().price(), same.price(), tick_size())) + { + if(same.size() <= thresh.value()) + { + transition(ORDER_STATUS_CANCELED); + report_state(); + return; + } + } + } activate_child(Price(this_state().price()), Quantity(this_state().quantity())); transition(ORDER_STATUS_WORKING); report_state();