From f5bda117973db94055ff2dbd06b701f7c08a5648 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 8 Jun 2020 12:05:15 -0500 Subject: [PATCH] quantity conversion in orderbook for dj --- .../Trading/AlgoStudio/VM/AlgoDefinitionVM.cs | 8 ++ .../AlgoEditorGridView.xaml | 44 ++++++++- .../Trading/OrderBook/OrderBookColumns.cs | 10 +- .../Trading/OrderBook/OrderBookRowVM.cs | 91 +++++++++++++++---- .../Modules/Trading/OrderBook/OrderBookVM.cs | 13 ++- .../Trading/OrderBook/View/OrderBookView.xaml | 2 +- src/client/spark/Orders/AlgoParamVM.cs | 14 ++- .../spark/Orders/OrderTypeVMs/IOrderTypeVM.cs | 2 + .../Orders/OrderTypeVMs/OrderTypeVMFactory.cs | 2 + src/client/spark/Orders/OrderUtils.cs | 4 +- .../Security/ISecurityAuxiliaryDataModel.cs | 4 + src/client/spark_api/utils/MathUtils.cs | 3 + 12 files changed, 161 insertions(+), 36 deletions(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs index dd8563fa0..a898b5b33 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs @@ -236,12 +236,20 @@ namespace mbts.spark { get => algo_root; set => algo_root = value; } + IAlgoVM IAlgoParamVM.display_value { + get => algo_root; + set => algo_root = value; + } bool IAlgoParamVM.has_value => _algo_root != null; bool IAlgoParamVM.is_enabled { get; set; } = true; object IAlgoParamVM.value { get => algo_root; set => algo_root = (IAlgoVM)value; } + object IAlgoParamVM.display_value { + get => algo_root; + set => algo_root = (IAlgoVM)value; + } AlgoParamPermissions _permissions = AlgoParamPermissions.ReadWrite; AlgoParamPermissions IAlgoParamVM.permissions { get => _permissions; set => _permissions = value; } diff --git a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml index cabe66d50..b5e0f0cb5 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml +++ b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoEditorGridView.xaml @@ -199,18 +199,30 @@ Grid.Column="1" HorizontalAlignment="Center" Foreground="{u:BTSColor MarketData.bid}" - Text="{Binding DataContext.bbo.bid_size, RelativeSource={RelativeSource AncestorType=usp:AlgoEditorGridView}}" ToolTip="Best Bid Size" - /> + > + + + + + + + + > + + + + + + + @@ -272,6 +284,14 @@ + + + + + + @@ -360,6 +380,22 @@ /> + + + + + + + + + + + + + + diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index f7ff1d482..a8a862232 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -597,19 +597,19 @@ namespace mbts.spark { public class SizeColumn : OrderbookColumnBase, IRenderColumn { public SizeColumn(IDataGridColumnPersistentFilter filter) - : base(Columns.Size, "Qty", r => r.quantity.ToString(), DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax, _wrap_comparer(r => r.quantity)) { } + : base(Columns.Size, "Qty", r => r.display_quantity.ToString(), DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax, _wrap_comparer(r => r.quantity)) { } public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => - CellRender.draw_text(dc, _get_glyph_context(row), font_size, row.quantity.ToString(), position, row_height, + CellRender.draw_text(dc, _get_glyph_context(row), font_size, row.display_quantity.ToString(), position, row_height, RenderUtils.get_side_brush(row), null, horizontal_alignment, VerticalAlignment.Center, DefaultCellPadding); } public class FilledColumn : OrderbookColumnBase, IRenderColumn { public FilledColumn(IDataGridColumnPersistentFilter filter) - : base(Columns.Filled, "Filled Qty", r => r.filled_quantity.ToString(), DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax, _wrap_comparer(r => r.filled_quantity)) { } + : base(Columns.Filled, "Filled Qty", r => r.display_filled_quantity.ToString(), DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax, _wrap_comparer(r => r.filled_quantity)) { } public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => - CellRender.draw_text(dc, _get_glyph_context(row), font_size, row.filled_quantity.ToString(), position, row_height, + CellRender.draw_text(dc, _get_glyph_context(row), font_size, row.display_filled_quantity.ToString(), position, row_height, RenderUtils.get_side_brush(row), null, horizontal_alignment, VerticalAlignment.Center, DefaultCellPadding); } @@ -1163,7 +1163,7 @@ namespace mbts.spark { public override FrameworkElement view_factory() { var tick_up_down = new TickUpDownNullableUIntCommit(); - tick_up_down.SetBinding(TickUpDownNullableUIntCommit.SourceValueProperty, nameof(OrderBookRowVM.prospective_quantity)); + tick_up_down.SetBinding(TickUpDownNullableUIntCommit.SourceValueProperty, nameof(OrderBookRowVM.prospective_display_quantity)); tick_up_down.SetBinding(TickUpDownNullableUIntCommit.OnCommitProperty, nameof(OrderBookRowVM.modify_order_quantity_andor_price)); tick_up_down.InputBindings.Add(_create_keyinput_binding(Key.Enter, nameof(OrderBookRowVM.modify_order_quantity_andor_price))); tick_up_down.InputBindings.Add(_create_keyinput_binding(Key.Escape, nameof(OrderBookRowVM.revert_prospective_order_quantity_andor_price))); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 38c8e7e13..0d00ee449 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -29,7 +29,9 @@ namespace mbts.spark { int _depth_level; SecurityImmutable? _security => order_tuple.order.security; // for mini-ob - uint _prospective_quantity; + DisplayQuantityMultiplier _prospective_qty_translator_backing; + uint _display_qty_divisor_backing; + bool _display_qty_divisor_dirty = true; double _prospective_price; Action _on_selection_changed; @@ -37,7 +39,6 @@ namespace mbts.spark { _owner = owner; this.order_tuple = order_tuple; _is_expanded = is_expanded; - prospective_quantity = this.quantity; prospective_price = this.price; _on_selection_changed = on_selection_changed; } @@ -94,14 +95,18 @@ namespace mbts.spark { public string last_price_text => _fmt_price(last_price); public string avg_price_text => _fmt_price(avg_price); public uint quantity => order.quantity(); + public uint display_quantity => quantity.safe_divide(_display_qty_divisor); public uint filled_quantity => order.filled(); + public uint display_filled_quantity => filled_quantity.safe_divide(_display_qty_divisor); public string last_msg => order.last_msg(); + // piq public uint piq => order_tuple.order.piq ?? uint.MaxValue; - public string piq_text => piq == uint.MaxValue ? string.Empty : piq.ToString(); + public string piq_text => piq == uint.MaxValue ? string.Empty : piq.safe_divide(_display_qty_divisor).ToString(); + public bool is_non_terminal => order.is_non_terminal(); public bool is_attachable { get => _is_attachable; set => SetVisual(ref _is_attachable, value); } public bool is_detachable { get => _is_detachable; set => SetVisual(ref _is_detachable, value); } - public string filled_status_desc => order.filled_status_description(security.spec_or_default()); + public string filled_status_desc => order.filled_status_description(security.spec_or_default(), _display_qty_divisor); // Root Algo public CustomOrderDefinition.CustomOneofCase root_algo_order_type => order_tuple.root.algo.value.CustomCase; @@ -129,12 +134,12 @@ namespace mbts.spark { } } public uint prospective_quantity { - get => _prospective_quantity; - set { - if (Set(ref _prospective_quantity, value)) { - RaisePropertyChanged(nameof(is_qty_dirty)); - } - } + get => _prospective_qty_translator.actual_value; + set => _prospective_qty_translator.actual_value = value; + } + public uint prospective_display_quantity { + get => _prospective_qty_translator.display_value; + set => _prospective_qty_translator.display_value = value; } public double prospective_price { get => _prospective_price; @@ -224,6 +229,29 @@ namespace mbts.spark { } } + uint _display_qty_divisor { + get { + _sync_display_qty_if_dirty(); + return _display_qty_divisor_backing; + } + } + + IDisplayTranslator _prospective_qty_translator { + get { + if (_prospective_qty_translator_backing == null) { + _prospective_qty_translator_backing = new DisplayQuantityMultiplier { + conversion_data = new QuantityConversionData(_display_qty_divisor, QuantityConversionData.OpType.DivideActual), + actual_value = quantity + }; + _prospective_qty_translator.value_changed += () => + RaisePropertyChanged(nameof(is_qty_dirty)); + } else { + _sync_display_qty_if_dirty(); + } + return _prospective_qty_translator_backing; + } + } + #region IHierarchicalRow bool IHierarchicalRow.is_parent => is_parent; bool IHierarchicalRow.is_expanded => is_expanded; @@ -267,22 +295,35 @@ namespace mbts.spark { if ((Columns.OrderType & dirty) != 0) RaisePropertyChanged(nameof(order_type), nameof(order_metadata)); // quantity - if ((Columns.Size & dirty) != 0) { - RaisePropertyChanged(nameof(quantity), nameof(is_qty_dirty)); - // we need to update the prospective_quantity here b/c an update could have come in while the row was in edit mode - // via the Mini OB update column mechanism (vs the EditableQty column) - // prospecive price does not need to be updated in the same manner b/c if the price is changed, the whole - // row will no longer match the filter - prospective_quantity = quantity; - } // price if ((Columns.Price & dirty) != 0) { RaisePropertyChanged(nameof(price)); RaisePropertyChanged(nameof(is_price_dirty)); } // security - if ((Columns.Security & dirty) != 0) - RaisePropertyChanged(nameof(security), nameof(security_text)); + if ((Columns.Security & dirty) != 0) { + _display_qty_divisor_dirty = true; + RaisePropertyChanged( + // security props + nameof(security), + nameof(security_text), + // qty props + nameof(display_quantity), + nameof(prospective_quantity), + nameof(prospective_display_quantity), + nameof(is_qty_dirty), + // + nameof(piq_text), + nameof(display_filled_quantity)); + } + if ((Columns.Size & dirty) != 0) { + RaisePropertyChanged(nameof(quantity), nameof(display_quantity)); + if (_prospective_qty_translator_backing != null) + _prospective_qty_translator_backing.actual_value = quantity; + } + if ((Columns.Filled & dirty) != 0) { + RaisePropertyChanged(nameof(filled_quantity), nameof(display_filled_quantity)); + } // badge fill if (old_order_tuple.order.meta?.badge_color != order_tuple.order.meta?.badge_color) { // invalidate by setting to null (will be re-instantiated in the public getter) @@ -359,6 +400,15 @@ namespace mbts.spark { security.Value.ContractSpec.format(v) : Math.Round(v, _unknown_security_price_num_fractional_digits, MidpointRounding.AwayFromZero).ToString(_unknown_security_price_format_string); + void _sync_display_qty_if_dirty() { + if (_display_qty_divisor_dirty) { + _display_qty_divisor_dirty = false; + _display_qty_divisor_backing = _owner.get_display_qty_divisor(security); + if (_prospective_qty_translator_backing != null) + _prospective_qty_translator_backing.conversion_data = new QuantityConversionData(_display_qty_divisor_backing, QuantityConversionData.OpType.DivideActual); + } + } + void RaisePropertyChanged(params string[] props) { var pc = PropertyChanged; if (pc == null) @@ -397,6 +447,7 @@ namespace mbts.spark { Columns.LastMessage | Columns.Piq, filled_status_desc_mask = + Columns.Security | Columns.Filled | Columns.AvgFilled | Columns.Status; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 9de3b520d..6d3a42da8 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -639,6 +639,9 @@ namespace mbts.spark { public OrderMetadata get_metadata(OrderBookRowVM row) => _model.factory.get_metadata(row.order.actual_order_type()); + internal uint get_display_qty_divisor(SecurityImmutable? security) => + _model.security_auxiliary_model.get_display_quantity_divisor(security); + internal void show_order_modify(OrderBookRowVM row) => _bus.post(SparkTags.ShowModifyOrderTag, row.order_key); @@ -798,7 +801,7 @@ namespace mbts.spark { readonly Property _is_dirty; IRaiseCanExecuteChangedCommand _payup_bid_cmd, _payup_ask_cmd; IAlgoParamVM _price_param; - IAlgoParamVM _size_param; + AlgoParamVM _size_param; AlgoParamPermissions _price_permissions = AlgoParamPermissions.ReadOnly | AlgoParamPermissions.Write, _size_permissions = AlgoParamPermissions.ReadOnly | AlgoParamPermissions.Write; @@ -835,7 +838,9 @@ namespace mbts.spark { _price_param = null; _size_param = null; } else { - _size_param = new AlgoParamVM("size", "Size", owner._selected_params_mon.size) { + _size_param = new AlgoParamVM("size", "Size", owner._selected_params_mon.size, EqualityComparer.Default, + to_display_value: v => v.HasValue ? v.Value / display_quantity_divisor : v, + from_display_value: v => v.HasValue ? v.Value * display_quantity_divisor : v) { permissions = _size_permissions & _param_permissions }; var price_param = new AlgoParamVM("price", "Price", owner._selected_params_mon.price, spec?.tick_equality_comparer() ?? MathUtils.epsilon_eq_comparer) { @@ -878,10 +883,11 @@ namespace mbts.spark { get => _security_md; set { if (Set(ref _security_md, value)) { - RaisePropertyChanged(nameof(security), nameof(spec)); + RaisePropertyChanged(nameof(security), nameof(spec), nameof(display_quantity_divisor)); bbo.security_md = value; _payup_bid_cmd.RaiseCanExecuteChanged(); _payup_ask_cmd.RaiseCanExecuteChanged(); + _size_param?.refresh_display_value(); } } } @@ -903,6 +909,7 @@ namespace mbts.spark { public AlgoDefinitionVM algo_vm { get; } public IReadOnlyObservableCollection param_rows { get; } public BBOVM bbo { get; } + public uint display_quantity_divisor => _owner.get_display_qty_divisor(security); public ICommand send_order { get; } public ICommand payup_bid_cmd => _payup_bid_cmd; public ICommand payup_ask_cmd => _payup_ask_cmd; diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml index b8291ba7b..7374d5712 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml @@ -101,7 +101,7 @@ - + @ diff --git a/src/client/spark/Orders/AlgoParamVM.cs b/src/client/spark/Orders/AlgoParamVM.cs index cc7a43a2a..d5744dd5b 100644 --- a/src/client/spark/Orders/AlgoParamVM.cs +++ b/src/client/spark/Orders/AlgoParamVM.cs @@ -10,6 +10,7 @@ namespace mbts.spark { class AlgoParamVM : IAlgoParamVM, INotifyPropertyChanged, ITemplateSelectorKey { readonly IEqualityComparer _comparer; readonly string _template_key; + readonly Func _to_display_value, _from_display_value; AlgoParamPermissions _permissions; bool _is_enabled, _has_value; T _committed_value, _value; @@ -20,13 +21,15 @@ namespace mbts.spark { public AlgoParamVM(string id, string display_name, T value, string template_key = null) : this(id, display_name, value, EqualityComparer.Default, template_key) { } - public AlgoParamVM(string id, string display_name, T value, IEqualityComparer comparer, string template_key = null) { + public AlgoParamVM(string id, string display_name, T value, IEqualityComparer comparer, string template_key = null, Func to_display_value = null, Func from_display_value = null) { this.id = id; this.display_name = display_name; _value = value; _committed_value = value; _comparer = comparer; _template_key = template_key; + _to_display_value = to_display_value; + _from_display_value = from_display_value; } public event PropertyChangedEventHandler PropertyChanged; @@ -43,6 +46,10 @@ namespace mbts.spark { _toggle_is_dirty(); } } + public T display_value { + get => _to_display_value == null ? value : _to_display_value(value); + set => this.value = _from_display_value == null ? value : _from_display_value(value); + } public AlgoParamPermissions permissions { get => _permissions; set { @@ -54,6 +61,7 @@ namespace mbts.spark { public bool has_value { get => _has_value; set => _set(ref _has_value, value); } public bool is_dirty { get; private set; } object IAlgoParamVM.value { get => value; set => this.value = (T)value; } + object IAlgoParamVM.display_value { get => display_value; set => display_value = (T)value; } string ITemplateSelectorKey.key => _template_key; @@ -64,6 +72,9 @@ namespace mbts.spark { } } + public void refresh_display_value() => + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(display_value))); + public IObservable subscribe_value() { return Observable.Create(o => { o.OnNext(_value); @@ -113,6 +124,7 @@ namespace mbts.spark { value_changed(_value, _value = new_value); } PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(value))); + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(display_value))); } void _toggle_is_dirty() { diff --git a/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs b/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs index 5934c8ba4..fd4a0e546 100644 --- a/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs @@ -70,6 +70,7 @@ namespace mbts.spark { string id { get; } string display_name { get; } object value { get; set; } + object display_value { get; set; } bool is_enabled { get; set; } bool is_dirty { get; } bool has_value { get; } @@ -81,6 +82,7 @@ namespace mbts.spark { interface IAlgoParamVM : IAlgoParamVM { event PropertyChange value_changed; new T value { get; set; } + new T display_value { get; set; } } interface IAlgoSelector : IAlgoParamVM, IObserver<(IReadOnlyDictionary algo_data, AlgoKey? default_algo)> { diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index 4243de0be..da6bf4ddb 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -985,8 +985,10 @@ namespace mbts.spark { #region IAlgoParamVM IAlgoVM IAlgoParamVM.value { get => selected_algo; set => selected_algo = value; } + IAlgoVM IAlgoParamVM.display_value { get => selected_algo; set => selected_algo = value; } event PropertyChange IAlgoParamVM.value_changed { add => selected_algo_changed += value; remove => selected_algo_changed -= value; } object IAlgoParamVM.value { get => selected_algo; set => selected_algo = (IAlgoVM)value; } + object IAlgoParamVM.display_value { get => selected_algo; set => selected_algo = (IAlgoVM)value; } bool IAlgoParamVM.has_value => _algo != null; // changing child algos is not allowed, so an algo selector is never dirty bool IAlgoParamVM.is_dirty => false; diff --git a/src/client/spark/Orders/OrderUtils.cs b/src/client/spark/Orders/OrderUtils.cs index 298b0878b..d0929710b 100644 --- a/src/client/spark/Orders/OrderUtils.cs +++ b/src/client/spark/Orders/OrderUtils.cs @@ -240,8 +240,8 @@ namespace mbts.spark { public static string price_quantity_description(double price, uint quantity, ContractSpecificationImmutable spec) => new StringBuilderEx(quantity.ToString(), " @ ", spec.format(price) ?? price.ToString("#0.00##")).ToString(); - public static string filled_status_description(this OrderRecordImmutable order, ContractSpecificationImmutable spec) { - var sb = new StringBuilderEx("filled ", order.filled().ToString()); + public static string filled_status_description(this OrderRecordImmutable order, ContractSpecificationImmutable spec, uint display_qty_divisor = 1) { + var sb = new StringBuilderEx("filled ", order.filled().safe_divide(display_qty_divisor).ToString()); if (order.filled() > 0) sb.Add(" @ ", spec.format(order.avg_price())); sb.Add(", ", camel_to_title_case(order.status().ToString(), TextCapitalizationFormat.NoCaps)); diff --git a/src/client/spark/Security/ISecurityAuxiliaryDataModel.cs b/src/client/spark/Security/ISecurityAuxiliaryDataModel.cs index e1df37700..800f00033 100644 --- a/src/client/spark/Security/ISecurityAuxiliaryDataModel.cs +++ b/src/client/spark/Security/ISecurityAuxiliaryDataModel.cs @@ -1,4 +1,5 @@ using bts.api; +using bts.utils; using mbts.config; using System.Collections.Generic; using System.ComponentModel.Composition; @@ -33,6 +34,9 @@ namespace mbts.spark { } static class SecurityAuxiliaryDataModelExtensions { + public static uint get_display_quantity(this ISecurityAuxiliaryDataModel model, SecurityImmutable? security, uint actual_qty) => + actual_qty.safe_divide(model.get_display_quantity_divisor(security)); + public static uint get_display_quantity_divisor(this ISecurityAuxiliaryDataModel model, SecurityImmutable? security) => security.HasValue ? model.get_auxiliary_data(security.Value)?.quantity_divisor ?? 1 : 1; } diff --git a/src/client/spark_api/utils/MathUtils.cs b/src/client/spark_api/utils/MathUtils.cs index ffa6ebe26..56185893d 100644 --- a/src/client/spark_api/utils/MathUtils.cs +++ b/src/client/spark_api/utils/MathUtils.cs @@ -129,6 +129,9 @@ namespace bts.utils { return value; } + public static uint safe_divide(this uint value, uint divisor) => + divisor == 0 ? value : value / divisor; + /// /// Adds to the modulos result if negative. ///