pr edit: add working_orders to OrdersModel

This commit is contained in:
John Colvin committed 2018-05-30 13:30:02 -04:00
1 parent 9514a10c27
commit 0ad1f73293
5 files changed
+20 -32

No files matched your search

+15 -22
View File
@@ -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<OrderRecordImmutable>(), (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<TableUpdate<OrderRecordImmutable, uint>> on_orders { get; }
public IObservable<TableUpdate<FillImmutable, string>> on_fills { get; }
public IObservable<ITableUpdateTransform<FillTuple, string>> on_fill_tuples { get; }
public IObservable<HashSet<OrderRecordImmutable>> working_orders { get; }
public IObservable<TableUpdate<OrderRecordImmutable, uint>> 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<OrderRecordImmutable> _update_order_set(HashSet<OrderRecordImmutable> target, TableUpdate<OrderRecordImmutable, uint> table, Func<OrderRecordImmutable, bool> where) {
var clone = new HashSet<OrderRecordImmutable>(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<HashSet<uint>> working_bids(this IObservable<TableUpdate<OrderRecordImmutable, uint>> orders_source) =>
orders_source.Scan(new HashSet<uint>(), (wbids, table) => _update_order_key_set(wbids, table, o => o.is_active() && o.side() == Side.Buy));
public static IObservable<HashSet<uint>> working_asks(this IObservable<TableUpdate<OrderRecordImmutable, uint>> orders_source) =>
orders_source.Scan(new HashSet<uint>(), (wasks, table) => _update_order_key_set(wasks, table, o => o.is_active() && o.side() == Side.Sell));
public static IObservable<HashSet<uint>> working_orders(this IObservable<TableUpdate<OrderRecordImmutable, uint>> orders_source) =>
orders_source.Scan(new HashSet<uint>(), (worders, table) => _update_order_key_set(worders, table, o => o.is_active()));
public static async Task<OrderRecordImmutable?> 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<uint> _update_order_key_set(HashSet<uint> target, TableUpdate<OrderRecordImmutable, uint> table, Func<OrderRecordImmutable, bool> where) {
var clone = new HashSet<uint>(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;
}
}
}
@@ -59,10 +59,9 @@ namespace mbts.spark {
SetMap<uint, uint> missing_security_orders = new SetMap<uint, uint>();
IReadOnlyDictionary<uint, SecurityMD> security_dict = new Dictionary<uint, SecurityMD>();
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<OrderRecordImmutable, uint> 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<OrderRecordImmutable> selected_orders => _selected_rows.Select(r => r.order);
public IObservable<TableUpdate<OrderRecordImmutable, uint>> orders_source { get; }
public bool try_get_order(uint key, out OrderRecordImmutable order) =>
_orders_cache.TryGetValue(key, out order);
@@ -106,8 +106,7 @@ namespace mbts.spark {
_current_row = backing<OrderBookRowVM>(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<OrderBookRowVM> selected_rows => _selected_rows;
public IEnumerable<OrderRecordImmutable> selected_orders => _selected_rows.Select(r => r.order);
public IObservable<TableUpdate<OrderRecordImmutable, uint>> orders_source { get; }
#region Filters
public IDataGridColumnPersistentFilter<OrderBookRowVM, DoubleMinMaxState> price_filter { get; } = new DoubleMinMax<OrderBookRowVM>(r => r.price, nameof(OrderBookRowVM.price));
@@ -13,7 +13,6 @@ namespace mbts.spark {
//
OrderRecordImmutable? current_order { get; }
IEnumerable<OrderRecordImmutable> selected_orders { get; }
IObservable<TableUpdate<OrderRecordImmutable, uint>> orders_source { get; }
//
void on_sorting(DIYGridSortingEventArgs e);
List<SortingCriteria> get_sorting_states();
@@ -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()
);