diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs index b4e0f9b83..b04c03ead 100644 --- a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs +++ b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs @@ -18,6 +18,7 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Collections.ObjectModel; +using System.Collections.Specialized; using System.ComponentModel; using System.Linq; using System.Reactive.Linq; @@ -33,6 +34,9 @@ namespace bts.shell.pnl { static readonly IReadOnlyList>> _filter_getters = ObjectSnapshot.property_delegates_of_type>().ToReadOnlyList(); static readonly TimeSpan _auxiliary_grid_update_throttle = TimeSpan.FromSeconds(0.2); + // delegates + static readonly Func _order_pnl_key_fn = o => new PNLKey(o.order.order.account_id(), o.order.order.security_key()); + static readonly Func _fill_pnl_key_fn = f => new PNLKey(f.account_id, f.fill.SecurityKey); readonly IBus _bus; readonly OrdersModel _orders_model; @@ -61,6 +65,7 @@ namespace bts.shell.pnl { _header_triggers = Array.Empty>(); // pause/resume (TableUpdate filtered, TableUpdate raw)? _resume; + TableUpdate _last_table = TableUpdate.mk_empty(PNLRowData.key_fn); AlternationConverter _group_background_converter = new AlternationConverter(); public PNLVM(IBus bus, OrdersModel orders_model, PNLSettings settings) @@ -375,55 +380,46 @@ namespace bts.shell.pnl { var state = PNLSettings.DefaultAuxiliaryFills; _append_key_filters(state.filters, key); _append_row_filters(state.filters, row); + // hide implicit cols state.grid = _hide_cols(state.grid, anchors); - var src = _orders_model.on_fill_tuples.Filter(ft => ft.fill.SecurityKey == row.key.security_id && ft.account_id == row.key.account_id); - return new FillsVM(_bus, _orders_model, Observable.Return(state), src, new WindowSettingsManager.DisconnectedImpl(state.grid)); + return new FillsVM( + _bus, _orders_model, Observable.Return(state), new WindowSettingsManager.DisconnectedImpl(state.grid)); } public FillsVM mk_fills_vm(PNLRowCollectionViewGroup group, ColumnKeys key) { var state = PNLSettings.DefaultAuxiliaryFills; _append_key_filters(state.filters, key); _append_group_filters(state.filters, group, anchors); - // hide all columns with implicit data (i.e., the anchors) + // hide implicit cols state.grid = _hide_cols(state.grid, anchors.WrapSubRange(0, group.level)); - return new FillsVM(_bus, _orders_model, Observable.Return(state), new WindowSettingsManager.DisconnectedImpl(state.grid)); + return new FillsVM( + _bus, _orders_model, Observable.Return(state), _visible_fills_source(), new WindowSettingsManager.DisconnectedImpl(state.grid)); } public FillsVM mk_fills_vm(PNLHeaderRowDisplay header, ColumnKeys key) { var state = fills.FillsSettings.Default(); state.grid = orderbook.OrderBookStartupData.DefaultFillsGrid.general; state.filters = new fills.FillsFilterStates(); - state.grid = _hide_cols(state.grid, anchors); + // hide implicit cols + state.grid = _hide_cols(orderbook.OrderBookStartupData.DefaultFillsGrid.general, anchors); _append_key_filters(state.filters, key); var src = _orders_model.on_fill_tuples; switch (header) { - case PNLHeaderRowDisplay.SelectedTotal: { - var filter_src = System.Reactive.Linq.ObservableExtensions.FromEventThrottle>( - cb => _selection_changed += cb, - cb => _selection_changed -= cb, - _ => predicate_factory(_selected_rows.Select(r => r.key)), - _auxiliary_grid_update_throttle) - .StartWith(() => predicate_factory(_selected_rows.Select(r => r.key))); - src = src.Filter(filter_src, FillTuple.key_fn); - } + case PNLHeaderRowDisplay.SelectedTotal: + // throttle selection changes (they have a potentially high frequency) + var filter_src = System.Reactive.Linq.ObservableExtensions.FromEventThrottle>( + cb => _selection_changed += cb, + cb => _selection_changed -= cb, + _ => _mk_selected_items_filter(_fill_pnl_key_fn), + _auxiliary_grid_update_throttle); + src = src.Filter(filter_src, FillTuple.key_fn, _mk_selected_items_filter(_fill_pnl_key_fn)); break; - case PNLHeaderRowDisplay.Total: { - var filter_src = System.Reactive.Linq.ObservableExtensions.FromEventThrottle, Func>( - cb => _updated += cb, - cb => _updated -= cb, - t => predicate_factory(t.state.Keys), - _auxiliary_grid_update_throttle) - .StartWith(() => predicate_factory(rows.Select(r => r.key))); - src = src.Filter(filter_src, FillTuple.key_fn); - } + case PNLHeaderRowDisplay.Total: + src = src.Filter(_visible_items_filter_source(_fill_pnl_key_fn), FillTuple.key_fn); break; } - return new FillsVM(_bus, _orders_model, Observable.Return(state), src, new WindowSettingsManager.DisconnectedImpl(state.grid)); - // - Func predicate_factory(IEnumerable keys) { - var key_set = new HashSet(keys); - return new Func(ft => key_set.Contains(new PNLKey(ft.account_id, ft.fill.SecurityKey))); - } + return new FillsVM( + _bus, _orders_model, Observable.Return(state), src, new WindowSettingsManager.DisconnectedImpl(state.grid)); } public OrderBookVM mk_orderbook_vm(PNLHeaderRowDisplay header, ColumnKeys key) { @@ -431,45 +427,37 @@ namespace bts.shell.pnl { _append_key_filters(filters, key); var src = _orders_model.on_order_tuples_with_root_and_piq; switch (header) { - case PNLHeaderRowDisplay.SelectedTotal: { - var filter_src = System.Reactive.Linq.ObservableExtensions.FromEventThrottle>( - cb => _selection_changed += cb, - cb => _selection_changed -= cb, - _ => predicate_factory(_selected_rows.Select(r => r.key)), - _auxiliary_grid_update_throttle); - src = src.Filter(filter_src, OrderSecurityHelper.root_pair_key_fn, predicate_factory(selected_rows.Select(r => r.key))); - } + case PNLHeaderRowDisplay.SelectedTotal: + // throttle selection changes (they have a potentially high frequency) + var filter_src = System.Reactive.Linq.ObservableExtensions.FromEventThrottle>( + cb => _selection_changed += cb, + cb => _selection_changed -= cb, + _ => _mk_selected_items_filter(_order_pnl_key_fn), + _auxiliary_grid_update_throttle); + src = src.Filter(filter_src, OrderSecurityHelper.root_pair_key_fn, _mk_selected_items_filter(_order_pnl_key_fn)); break; - case PNLHeaderRowDisplay.Total: { - var filter_src = System.Reactive.Linq.ObservableExtensions.FromEventThrottle, Func>( - cb => _updated += cb, - cb => _updated -= cb, - t => predicate_factory(t.state.Keys), - _auxiliary_grid_update_throttle) - .StartWith(() => predicate_factory(rows.Select(r => r.key))); - src = src.Filter(filter_src, OrderSecurityHelper.root_pair_key_fn, predicate_factory(selected_rows.Select(r => r.key))); - } + case PNLHeaderRowDisplay.Total: + src = src.Filter(_visible_items_filter_source(_order_pnl_key_fn), OrderSecurityHelper.root_pair_key_fn); break; } - return _mk_orderbook_vm_common(filters, Enumerable.Empty(), src); - Func predicate_factory(IEnumerable keys) { - var key_set = new HashSet(keys); - return new Func(o => key_set.Contains(new PNLKey(o.order.order.account_id(), o.order.order.security_key()))); - } + return _mk_orderbook_vm_common( + filters, Enumerable.Empty(), src); } public OrderBookVM mk_orderbook_vm(PNLRowCollectionViewGroup group, ColumnKeys key) { var filters = new orderbook.FilterStates(); _append_key_filters(filters, key); _append_group_filters(filters, group, anchors); - return _mk_orderbook_vm_common(filters, anchors.WrapSubRange(0, group.level)); + return _mk_orderbook_vm_common( + filters, anchors.WrapSubRange(0, group.level), _visible_orders_source()); } public OrderBookVM mk_orderbook_vm(PNLRowVM row, ColumnKeys key) { var filters = new orderbook.FilterStates(); _append_key_filters(filters, key); _append_row_filters(filters, row); - return _mk_orderbook_vm_common(filters, anchors.Concat(new[] { ColumnKeys.Account, ColumnKeys.Symbol, ColumnKeys.Security }).Distinct()); + return _mk_orderbook_vm_common( + filters, anchors.Concat(new[] { ColumnKeys.Account, ColumnKeys.Symbol, ColumnKeys.Security }).Distinct()); } public void set_all_expanded(bool is_expanded) => @@ -682,6 +670,14 @@ namespace bts.shell.pnl { } #endregion + static Func _mk_items_filter(IEnumerable keys, Func key_selector) { + var key_set = new HashSet(keys); + return v => key_set.Contains(key_selector(v)); + } + + Func _mk_selected_items_filter(Func key_selector) => + _mk_items_filter(_selected_rows.Select(r => r.key), key_selector); + OrderBookVM _mk_orderbook_vm_common(orderbook.FilterStates filters, IEnumerable hide_counterparts, IObservable> orders_source = null) { var state = new orderbook.OrderBookStartupData(filters, orderbook.OrderBookStartupData.default_mini_grid, use_defaults: false); state.orderbook_grid.general = _hide_cols(state.orderbook_grid.general, hide_counterparts); @@ -695,12 +691,36 @@ namespace bts.shell.pnl { return obvm; } + IObservable> _visible_fills_source() => + _orders_model.on_fill_tuples.Filter(_visible_items_filter_source(_fill_pnl_key_fn), FillTuple.key_fn); + + IObservable> _visible_orders_source() => + _orders_model.on_order_tuples_with_root_and_piq.Filter(_visible_items_filter_source(_order_pnl_key_fn), OrderSecurityHelper.root_pair_key_fn); + + IObservable> _visible_items_filter_source(Func key_selector) => + Observable.Create>(o => { + o.OnNext(_visible_items_filter_snapshot(key_selector)); + _updated += on_updated; + return Disposable.Create(() => _updated -= on_updated); + void on_updated(TableUpdate _) => + o.OnNext(_visible_items_filter_snapshot(key_selector)); + }); + + // returns a predicate that takes a snapshot of the current state, and returns true if the item's account/security pair is visible in the snapshot state. + // subsequent updates are not reflected in this predicate. + // Note: this is a necessary behavior if the predicate is used in a TableUpdate filter stream (it must always return the same value for the same item). + Func _visible_items_filter_snapshot(Func key_selector) { + var t = _last_table; + return o => t.state.ContainsKey(key_selector(o)); + } + void _update((TableUpdate filtered, TableUpdate raw) tup) { if (_is_paused) { _resume = tup; return; } var (filtered, raw) = tup; + _last_table = filtered; int old_total_row_count = total_row_count; int old_filtered_row_count = filtered_row_count; var total_pnl = total_aggregate.data; diff --git a/src/client/spark_core/Collections/Extensions/ListExtensions.cs b/src/client/spark_core/Collections/Extensions/ListExtensions.cs index be2e4ca49..486e64fcc 100644 --- a/src/client/spark_core/Collections/Extensions/ListExtensions.cs +++ b/src/client/spark_core/Collections/Extensions/ListExtensions.cs @@ -130,6 +130,9 @@ namespace bts.collections { public static IList WrapSubRange(this IList list, int start, int length) => new SubRangeWrapper(list, start, length); + public static IReadOnlyList WrapSubRangeRO(this IList list, int start, int length) => + new SubRangeWrapper(list, start, length); + public static IList WrapSkip(this IList list, int skip) => new SkipFrontWrapper(list, skip); @@ -319,9 +322,8 @@ namespace bts.collections { } public bool Contains(T item) => IndexOf(item) >= 0; public void CopyTo(T[] array, int arrayIndex) { - int i = 0; - foreach (T v in this) - array[arrayIndex + i] = v; + for (int i = 0; i < Count; i++) + array[i + arrayIndex] = _source[i + _start]; } public IEnumerator GetEnumerator() { int stop = _start + Count;