From 0ad1f73293d46d710d12ed8734a496deea7ee2fb Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 30 May 2018 13:30:02 -0400 Subject: [PATCH] pr edit: add working_orders to OrdersModel --- src/client/spark/Orders/OrdersModel.cs | 37 ++++++++----------- .../Spark/Shell/CVOrderBook/CVOrderBookVM.cs | 4 +- .../view/Spark/Shell/OrderBook/OrderBookVM.cs | 4 +- .../Shell/OrderBook/OrderBookView.xaml.cs | 1 - .../Spark/Shell/OrderBook/OrderBookWindow.cs | 6 +-- 5 files changed, 20 insertions(+), 32 deletions(-) diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index aee1412b8..7ecda28c1 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -32,6 +32,7 @@ namespace mbts.spark { _spreader = spreader; _error = error; on_orders = _service.subscribei_orders().Table().Replay(1).RefCount(); + working_orders = on_orders.Scan(new HashSet(), (worders, table) => _update_order_set(worders, table, o => o.is_active())).Replay(1).RefCount(); on_fills = _service.subscribei_fills().Table().Replay(1).RefCount(); _activity = new OrderActivitySummarizer(bus, on_orders); on_fill_tuples = FillTupleSource.create_observable(bus.subscribe(SparkTags.SecuritiesTag), on_orders, on_fills); @@ -50,6 +51,7 @@ namespace mbts.spark { public IObservable> on_orders { get; } public IObservable> on_fills { get; } public IObservable> on_fill_tuples { get; } + public IObservable> working_orders { get; } public IObservable> on_security_orders(uint security) => _security_orders_demuxer.subscribe(security).Table(); @@ -112,6 +114,19 @@ namespace mbts.spark { public void Dispose() => Disposable.dispose(ref _dispose); + + static HashSet _update_order_set(HashSet target, TableUpdate table, Func where) { + var clone = new HashSet(target); + foreach (var o in table.removed) { + if (where(o)) + clone.Remove(o); + } + foreach (var o in table.added) { + if (where(o)) + clone.Add(o); + } + return clone; + } } // usinig new OrdersModel extensions to reduce the amount of code change needed to switch uis over to the new OrdersModel, @@ -154,15 +169,6 @@ namespace mbts.spark { .Select(t => t.state.Any(kv => kv.Value.is_active())) .StartWith(false); - public static IObservable> working_bids(this IObservable> orders_source) => - orders_source.Scan(new HashSet(), (wbids, table) => _update_order_key_set(wbids, table, o => o.is_active() && o.side() == Side.Buy)); - - public static IObservable> working_asks(this IObservable> orders_source) => - orders_source.Scan(new HashSet(), (wasks, table) => _update_order_key_set(wasks, table, o => o.is_active() && o.side() == Side.Sell)); - - public static IObservable> working_orders(this IObservable> orders_source) => - orders_source.Scan(new HashSet(), (worders, table) => _update_order_key_set(worders, table, o => o.is_active())); - public static async Task order_from_key(this OrdersModel orders_model, uint order_key) { (var tu, var success) = await orders_model.on_orders.FirstAsyncTask(t => t.state.ContainsKey(order_key), TimeSpan.FromSeconds(3)); if (success && tu.state.TryGetValue(order_key, out OrderRecordImmutable rec)) { @@ -203,18 +209,5 @@ namespace mbts.spark { } return false; } - - static HashSet _update_order_key_set(HashSet target, TableUpdate table, Func where) { - var clone = new HashSet(target); - foreach (var o in table.removed) { - if (where(o)) - clone.Remove(o.Key); - } - foreach (var o in table.added) { - if (where(o)) - clone.Add(o.Key); - } - return clone; - } } } \ No newline at end of file diff --git a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookVM.cs b/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookVM.cs index c7d513e14..a8b6c197d 100644 --- a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookVM.cs +++ b/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookVM.cs @@ -59,10 +59,9 @@ namespace mbts.spark { SetMap missing_security_orders = new SetMap(); IReadOnlyDictionary security_dict = new Dictionary(); - orders_source = model.on_orders; _dispose = Disposable.Create( bus.subscribe(SparkTags.SecuritiesTag).ObserveOnDispatcher().Subscribe(on_securities), - orders_source.ObserveOnDispatcher().Subscribe(on_orders), + model.on_orders.ObserveOnDispatcher().Subscribe(on_orders), columns); void on_orders(TableUpdate table) { @@ -165,7 +164,6 @@ namespace mbts.spark { public CVOrderBookRowVM current_row { get => _current_row.Value; set => _current_row.Value = value ?? _selected_rows.FirstOrDefault(); } public OrderRecordImmutable? current_order => current_row?.order; public IEnumerable selected_orders => _selected_rows.Select(r => r.order); - public IObservable> orders_source { get; } public bool try_get_order(uint key, out OrderRecordImmutable order) => _orders_cache.TryGetValue(key, out order); diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs index 5cff71e15..ceedf672a 100644 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs +++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookVM.cs @@ -106,8 +106,7 @@ namespace mbts.spark { _current_row = backing(nameof(current_row)); var securities_sequence = _bus.subscribe(SparkTags.SecuritiesTag); - orders_source = _model.on_orders; - var orders_with_found_securities_sub = orders_source + var orders_with_found_securities_sub = _model.on_orders .Sample(TimeSpan.FromMilliseconds(333)) .CombineLatest(securities_sequence, (order_list, security_dict) => { @@ -427,7 +426,6 @@ namespace mbts.spark { public OrderRecordImmutable? current_order => current_row?.order; public ObservableCollection selected_rows => _selected_rows; public IEnumerable selected_orders => _selected_rows.Select(r => r.order); - public IObservable> orders_source { get; } #region Filters public IDataGridColumnPersistentFilter price_filter { get; } = new DoubleMinMax(r => r.price, nameof(OrderBookRowVM.price)); diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml.cs index 3a9c26ec4..4e0577ed4 100644 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml.cs +++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml.cs @@ -13,7 +13,6 @@ namespace mbts.spark { // OrderRecordImmutable? current_order { get; } IEnumerable selected_orders { get; } - IObservable> orders_source { get; } // void on_sorting(DIYGridSortingEventArgs e); List get_sorting_states(); diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs index 3407e2745..c22b1e6f5 100644 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs @@ -74,17 +74,17 @@ namespace mbts.spark { ); _cancel_buy_orders_command = SparkCommands.CancelBuyOrders.complete( - _vm.orders_source.working_bids(), + _model.working_orders.Select(os => os.Where(o => o.side() == Side.Buy).Select(o => o.Key)), wbids => wbids.Any() ); _cancel_sell_orders_command = SparkCommands.CancelSellOrders.complete( - _vm.orders_source.working_asks(), + _model.working_orders.Select(os => os.Where(o => o.side() == Side.Sell).Select(o => o.Key)), wasks => wasks.Any() ); _cancel_all_orders_command = SparkCommands.CancelOrders.complete( - _vm.orders_source.working_orders(), + _model.working_orders.Select(os => os.Select(o => o.Key)), worders => worders.Any() );