From bc279ea1b18f1ca29b8aca9b21e97f34471ca67f Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 3 Aug 2018 15:22:35 -0400 Subject: [PATCH 001/126] SPARK-1534 mview - show synthetic future-leg working orders in future's row --- .../Market/MarketView/MarketViewRow.cs | 8 +-- src/client/spark/Orders/OrdersModel.cs | 60 +++++++++++++++++++ 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs index 2d782efa7..784dbf53b 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs @@ -78,7 +78,7 @@ namespace mbts.spark { _animation.AnimationsChanged += on_animations_changed; void on_animations_changed() => RaisePropertyChanged(nameof(animations)); _dispose = Disposable.Create( - _orders_model.on_security_orders(security.Id).OnDispatcher().Subscribe(_on_orders), + _orders_model.on_security_root_orders(security.Id).OnDispatcher().Subscribe(_on_orders), _position.OnDispatcher().Subscribe(v => _animation.animate_position(v.newval > v.oldval)), _inside_bids.OnDispatcher().Subscribe(v => _animation.animate_working_bids_inside(v.newval)), _inside_asks.OnDispatcher().Subscribe(v => _animation.animate_working_asks_inside(v.newval)), @@ -250,9 +250,6 @@ namespace mbts.spark { public int position => _position; public void add_order(OrderRecordImmutable o) { - // This is a market data form - not an orders form - so just show data for root/non-child orders. - if (o.has_parent()) - return; switch (o.side()) { case Side.Buy: _position += (int)o.filled(); @@ -274,9 +271,6 @@ namespace mbts.spark { } public void remove_order(OrderRecordImmutable o) { - // This is a market data form - not an orders form - so just show data for root/non-child orders. - if (o.has_parent()) - return; switch (o.side()) { case Side.Buy: _position -= (int)o.filled(); diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index e3f8020bd..d20872f77 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -2,6 +2,7 @@ using bts.api.core; using bts.api.orderman; using bts.spark; +using mbts.collections; using mbts.spark.utilities; using mbts.utils; using System; @@ -173,6 +174,60 @@ namespace mbts.spark { .Select(t => t.state.Any(kv => kv.Value.is_active())) .StartWith(false); + public static IObservable> on_security_root_orders(this OrdersModel orders_model, uint security_key) => + orders_model.on_security_orders(security_key).Scan(new RootOrderData(), (rod, table) => { + // ** using HashSet/List pairs, rather than a Dictionary, because TableUpdateTransform calls for IReadOnlyLists, while Dictionary.Values only implements IReadOnlyCollection. + // (this way, we avoid copying both added/removed Dictionary.Values to new Lists at the end, see comment at bottom of method if this is unclear) ** + var added_root_keys = new HashSet(); + var added_roots = new List(); + var removed_root_keys = new HashSet(); + var removed_roots = new List(); + foreach (var o in table.removed) { + if (rod.last_update.state.ContainsKey(o.Key)) { + // order was a root, needs to be removed + removed_roots.Add(o); + if (table.state.TryGetValue(o.Key, out OrderRecordImmutable newval)) { + // order was changed, if its an actual root, or its parent isn't present, the newval needs to be added + if (!newval.has_parent() || !table.state.ContainsKey(o.ParentKey)) { + added_roots.Add(newval); + added_root_keys.Add(o.Key); + } + } else if (rod.parent_to_children.try_lookup(o.Key, out ISet children)) { + // order has left some orphans behind, any children that haven't been removed (i.e. still exist in table.state) are now roots + foreach (uint ck in children) { + if (table.state.TryGetValue(ck, out OrderRecordImmutable child)) { + added_roots.Add(child); + added_root_keys.Add(ck); + } + } + } + } + } + foreach (var o in table.added) { + if (added_root_keys.Contains(o.Key)) + continue; + if (rod.parent_to_children.try_lookup(o.Key, out ISet children)) { + // children were previously functioning as roots, need to remove them + foreach (uint ck in children) { + if (rod.last_update.state.TryGetValue(ck, out OrderRecordImmutable child)) + removed_roots.Add(child); + } + } + if (o.has_parent()) { + rod.parent_to_children.add(o.ParentKey, o.Key); + if (table.state.ContainsKey(o.ParentKey)) { + // not a root order + continue; + } + } + added_roots.Add(o); + } + // ** [continue comment at top of method] this call would otherwise be: + // rod.last_update = rod.last_update.update(removed_dict.Values.ToList(), added_dict.Values.ToList(), o => o.Key) ** + rod.last_update = rod.last_update.update(removed_roots, added_roots, o => o.Key); + return rod; + }).Select(r => r.last_update); + 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)) { @@ -213,5 +268,10 @@ namespace mbts.spark { } return false; } + + class RootOrderData { + public readonly SetMap parent_to_children = new SetMap(); + public TableUpdateTransform last_update { get; set; } = new TableUpdateTransform(); + } } } \ No newline at end of file From ee69892006e74034134a271054d316fa502e4beb Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 3 Aug 2018 15:50:16 -0400 Subject: [PATCH 002/126] SPARK-1534 - (fix previous commit) --- src/client/spark/Orders/OrdersModel.cs | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index d20872f77..3532eddc0 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -188,19 +188,28 @@ namespace mbts.spark { removed_roots.Add(o); if (table.state.TryGetValue(o.Key, out OrderRecordImmutable newval)) { // order was changed, if its an actual root, or its parent isn't present, the newval needs to be added - if (!newval.has_parent() || !table.state.ContainsKey(o.ParentKey)) { + if (!o.has_parent() || !table.state.ContainsKey(o.ParentKey)) { added_roots.Add(newval); added_root_keys.Add(o.Key); } - } else if (rod.parent_to_children.try_lookup(o.Key, out ISet children)) { - // order has left some orphans behind, any children that haven't been removed (i.e. still exist in table.state) are now roots - foreach (uint ck in children) { - if (table.state.TryGetValue(ck, out OrderRecordImmutable child)) { - added_roots.Add(child); - added_root_keys.Add(ck); + } else { + // order was indeed removed, not just changed - if it has a parent, remove its corresponding child-entry + if (o.has_parent()) { + rod.parent_to_children.remove(o.ParentKey, o.Key); + } + if (rod.parent_to_children.try_lookup(o.Key, out ISet children)) { + // order has left some orphans behind, any children that haven't been removed (i.e. still exist in table.state) are now roots + foreach (uint ck in children) { + if (table.state.TryGetValue(ck, out OrderRecordImmutable child)) { + added_roots.Add(child); + added_root_keys.Add(ck); + } } } } + } else if (!table.state.ContainsKey(o.Key)) { + // order was indeed removed, not just changed - if it has a parent, remove its corresponding child-entry + rod.parent_to_children.remove(o.ParentKey, o.Key); } } foreach (var o in table.added) { From b59158ea437766826081f7115e78d64ab242e4a2 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 6 Aug 2018 09:57:35 -0500 Subject: [PATCH 003/126] Orderbook rows are now collapsed by default; Orders in Error status can be recreated --- release_notes.txt | 3 +++ .../spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs | 2 +- src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/release_notes.txt b/release_notes.txt index 7ca461b79..118bc4730 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,3 +1,6 @@ +1.1.9 +- Orderbook: Orders in Error status can now be recreated +- Orderbook: Orders containing child orders will now be collapsed by default. 1.1.8 - Enabled wild cards in risk management UI - Fixed spreader order updates diff --git a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs b/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs index 40887578d..c058f92a4 100644 --- a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs +++ b/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs @@ -88,7 +88,7 @@ namespace mbts.spark { } // _visible = backing(nameof(is_visible), true); - _expanded = backing(nameof(is_expanded), true); + _expanded = backing(nameof(is_expanded), false); _depth_level = backing(nameof(depth_level), () => { int i = 0; var curr = this; diff --git a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs index b3ed798c8..ae12cb058 100644 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookWindow.cs @@ -128,7 +128,7 @@ namespace mbts.spark { } private bool _passes_recreate_search_criteria(OrderRecordImmutable record) { - return record.status() == OrderStatus.Canceled + return (record.status() == OrderStatus.Canceled || record.status() == OrderStatus.Error) && !record.has_parent() && record.State.Quantity > record.State.FilledQuantity; } From 78be34cdd346608ce84e386dd2dd89a5c39ac3c2 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 6 Aug 2018 16:32:09 -0500 Subject: [PATCH 004/126] adding Symbol column to the Orderbook; column filter is a regex at the moment, which is not ideal --- .../view/Controls/DIYGrid/Columns/ColumnBase.cs | 2 ++ .../Spark/Shell/CVOrderBook/CVOrderBookColumns.cs | 13 +++++++++++++ .../Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs | 7 +++++++ .../Spark/Shell/OrderBook/OrderBookView.xaml.cs | 2 +- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index eab4451fc..f5c576504 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -19,6 +19,7 @@ namespace mbts.ui.controls { SecurityKey = 90, Side = 47, Size = 48, + Symbol = 48, Time = 100, TimeInForce = 47, TradeKey = 76, @@ -39,6 +40,7 @@ namespace mbts.ui.controls { SecurityKey = "Security Key", Side = "Side", Size = "Qty", + Symbol = "Symbol", TimeInForce = "TIF", TradeKey = "Trade Key", User = "User", diff --git a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs b/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs index 505115545..e3057d6a4 100644 --- a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs +++ b/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs @@ -54,6 +54,18 @@ namespace mbts.spark { EqualityComparer.Create(s => s.Id), SecurityHelper.Comparer.InstanceImmutable ))); + // symbol + Add(symbol_column = new SimpleTextColumn( + Columns.Symbol, + DefaultColumnHeaders.Symbol, + nameof(CVOrderBookRowVM.symbol), + r => r.symbol.value, + DefaultColumnWidths.Symbol, + new RegexFilterVM( + r => r.symbol.value, + value_path(nameof(CVOrderBookRowVM.symbol)) + ), + DataGridFilterKnownTemplates.DiscreteValues)); // time_created Add(time_created_column = new TimeCreatedColumn( new TimeFilterVM(r => r.time_created.value, value_path(nameof(OrderBookRowVM.time_created))))); @@ -238,6 +250,7 @@ namespace mbts.spark { public event Action filter_changed; public SecurityColumn security_column { get; } + public SimpleTextColumn symbol_column { get; } public TimeCreatedColumn time_created_column { get; } public LastChangeTimeColumn last_change_column { get; } public SimpleTextColumn user_column { get; } diff --git a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs b/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs index c058f92a4..e7434adca 100644 --- a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs +++ b/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs @@ -22,6 +22,7 @@ namespace mbts.spark { readonly ObservantCommand _show_order_modify_cmd; OrderRecordImmutable _order; SecurityImmutable? _security; + string _symbol; CVOrderBookRowVM _parent; CVOrderBookVM.BranchFilterSource _branch_filter_source; IDisposable _branch_filter_sub; @@ -31,6 +32,7 @@ namespace mbts.spark { IOrderBookCellStore _security_key_store; IOrderBookCellStore _security_store; IOrderBookCellStore _exchange_store; + IOrderBookCellStore _symbol_store; // Def IOrderBookCellStore _order_type_store; IOrderBookCellStore _side_store; @@ -54,11 +56,13 @@ namespace mbts.spark { _model = model; _order = record; _security = s; + _symbol = _security.HasValue ? _security.Value.Symbol : null; // cells _security_store = CellFactory.create_nullable(this, _book_vm.columns.security_column, nameof(security), r => r._security, r => r._security_store, v => v.HasValue ? v.Value.ToString() : "unknown security"); _security_key_store = CellFactory.create(this, _book_vm.columns.security_key_column, nameof(security_key), r => r._order.security_key(), r => r._security_key_store); _parent_order_key_store = CellFactory.create(this, _book_vm.columns.parent_key_column, nameof(parent_order_key), r => r._order.ParentKey, r => r._parent_order_key_store); _order_key_store = CellFactory.create(this, _book_vm.columns.order_key_column, nameof(order_key), r => r._order.Key, r => r._order_key_store); + _symbol_store = CellFactory.create(this, _book_vm.columns.symbol_column, nameof(symbol), r => r._symbol, r => r._symbol_store, v => !String.IsNullOrEmpty(v) ? v : "unknown symbol"); _time_created_store = CellFactory.create(this, _book_vm.columns.time_created_column, nameof(time_created), r => r._order.created(), r => r._time_created_store, format_date); _user_store = CellFactory.create(this, _book_vm.columns.user_column, nameof(user), r => _order.user(), r => r._user_store); _account_store = CellFactory.create(this, _book_vm.columns.account_column, nameof(account), r => r._order.account(), r => r._account_store); @@ -120,6 +124,7 @@ namespace mbts.spark { public IOrderBookCell security_key => _security_key_store.current; public IOrderBookCell security => _security_store.current; public IOrderBookCell exchange => _exchange_store.current; + public IOrderBookCell symbol => _symbol_store.current; // Def public IOrderBookCell order_type => _order_type_store.current; public IOrderBookCell side => _side_store.current; @@ -190,6 +195,7 @@ namespace mbts.spark { yield return _price_store; yield return _avg_price_store; yield return _last_price_store; + yield return _symbol_store; } } @@ -282,6 +288,7 @@ namespace mbts.spark { case Columns.ParentKey: return row._parent_order_key_store; case Columns.SecurityKey: return row._security_key_store; case Columns.Security: return row._security_store; + case Columns.Symbol: return row._symbol_store; case Columns.Exchange: return row._exchange_store; case Columns.OrderType: return row._order_type_store; case Columns.Side: return row._side_store; 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 4e0577ed4..a26899d1d 100644 --- a/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml.cs +++ b/src/client/spark/view/Spark/Shell/OrderBook/OrderBookView.xaml.cs @@ -20,7 +20,7 @@ namespace mbts.spark { } internal partial class OrderBookView : UserControl { - public enum Columns { Security, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey } + public enum Columns { Security, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey, Symbol } public const string SubTypeFilterTemplateKey = "SubTypeFilterTemplate", ExpandCollapseToggleStyleKey = "ExpandCollapseToggleStyle", From 1f7f091a51b7f30cd6edcc072978ed3e6842e101 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 6 Aug 2018 17:27:17 -0500 Subject: [PATCH 005/126] Adding Last Hour hyperlink which sets the Begin time in Period mode to the Now - 1 hour --- .../DataGridEx/Filters/Views/TimeFilterControl.xaml | 9 ++++++--- .../DataGridEx/Filters/Views/TimeFilterControl.xaml.cs | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/Views/TimeFilterControl.xaml b/src/client/spark/view/Controls/DataGridEx/Filters/Views/TimeFilterControl.xaml index 74e626253..0c91a5ba1 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/Views/TimeFilterControl.xaml +++ b/src/client/spark/view/Controls/DataGridEx/Filters/Views/TimeFilterControl.xaml @@ -42,9 +42,12 @@ From - - (Set Anytime) - + + + (Set Anytime) + (Set Last Hour) + + ("ClearBeginLink"); var clear_end_time = this.assert_template_child("ClearEndLink"); + var set_last_hour = this.assert_template_child("SetLastHourLink"); clear_begin_time.Command = new DelegateCommand(() => Begin = default); clear_end_time.Command = new DelegateCommand(() => End = default); + set_last_hour.Command = new DelegateCommand(() => Begin = TimeTextTuple.FromDateTime(DateTime.Now.AddHours(-1))); } class TimeFilterErrorAdorner : NotifyDataErrorAdorner, IDisposable { From 85581ebf414f84eb1add700b9a3d113d2884ec87 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 7 Aug 2018 09:48:44 -0500 Subject: [PATCH 006/126] Symbol Column filter is now a Discrete values; added new column to saved filter settings --- .../spark/Modules/Trading/OrderBookWindowFactory.cs | 2 ++ .../Spark/Shell/CVOrderBook/CVOrderBookColumns.cs | 11 +++++++---- .../view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs | 4 +--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBookWindowFactory.cs b/src/client/spark/Modules/Trading/OrderBookWindowFactory.cs index 4c2f7521a..f8244ca10 100644 --- a/src/client/spark/Modules/Trading/OrderBookWindowFactory.cs +++ b/src/client/spark/Modules/Trading/OrderBookWindowFactory.cs @@ -87,6 +87,8 @@ namespace bts.shell { public string security_regex; [ProtoMember(19)] public api.orderman.OrderSubType[] order_sub_types; + [ProtoMember(20)] + public string[] symbols; } } } \ No newline at end of file diff --git a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs b/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs index e3057d6a4..4d63b4395 100644 --- a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs +++ b/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookColumns.cs @@ -55,13 +55,14 @@ namespace mbts.spark { SecurityHelper.Comparer.InstanceImmutable ))); // symbol - Add(symbol_column = new SimpleTextColumn( + Add(symbol_column = new SimpleTextColumn( Columns.Symbol, DefaultColumnHeaders.Symbol, nameof(CVOrderBookRowVM.symbol), r => r.symbol.value, DefaultColumnWidths.Symbol, - new RegexFilterVM( + DiscreteValuesFilterVM.Create( + mbts.co2.UserSymbol.get_all().Select(u => u.symbol).Distinct().ToList(), r => r.symbol.value, value_path(nameof(CVOrderBookRowVM.symbol)) ), @@ -235,6 +236,7 @@ namespace mbts.spark { status_column.filter.load_state(fs.statuses); last_message_column.filter.load_state(fs.exchange_message_regex); last_change_column.filter.load_state(fs.last_change); + symbol_column.filter.load_state(fs.symbols); } if (startup_data?.sort_criteria is List lsc) { foreach (var sc in lsc) @@ -250,7 +252,7 @@ namespace mbts.spark { public event Action filter_changed; public SecurityColumn security_column { get; } - public SimpleTextColumn symbol_column { get; } + public SimpleTextColumn symbol_column { get; } public TimeCreatedColumn time_created_column { get; } public LastChangeTimeColumn last_change_column { get; } public SimpleTextColumn user_column { get; } @@ -292,7 +294,8 @@ namespace mbts.spark { statuses = status_column.filter.get_state(), exchange_message_regex = last_message_column.filter.get_state(), last_change = last_change_column.filter.get_state(), - security_criteria = security_column.filter.get_state() + security_criteria = security_column.filter.get_state(), + symbols = symbol_column.filter.get_state() }; public void Dispose() { diff --git a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs b/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs index e7434adca..f454172f4 100644 --- a/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs +++ b/src/client/spark/view/Spark/Shell/CVOrderBook/CVOrderBookRowVM.cs @@ -22,7 +22,6 @@ namespace mbts.spark { readonly ObservantCommand _show_order_modify_cmd; OrderRecordImmutable _order; SecurityImmutable? _security; - string _symbol; CVOrderBookRowVM _parent; CVOrderBookVM.BranchFilterSource _branch_filter_source; IDisposable _branch_filter_sub; @@ -56,13 +55,12 @@ namespace mbts.spark { _model = model; _order = record; _security = s; - _symbol = _security.HasValue ? _security.Value.Symbol : null; // cells _security_store = CellFactory.create_nullable(this, _book_vm.columns.security_column, nameof(security), r => r._security, r => r._security_store, v => v.HasValue ? v.Value.ToString() : "unknown security"); _security_key_store = CellFactory.create(this, _book_vm.columns.security_key_column, nameof(security_key), r => r._order.security_key(), r => r._security_key_store); _parent_order_key_store = CellFactory.create(this, _book_vm.columns.parent_key_column, nameof(parent_order_key), r => r._order.ParentKey, r => r._parent_order_key_store); _order_key_store = CellFactory.create(this, _book_vm.columns.order_key_column, nameof(order_key), r => r._order.Key, r => r._order_key_store); - _symbol_store = CellFactory.create(this, _book_vm.columns.symbol_column, nameof(symbol), r => r._symbol, r => r._symbol_store, v => !String.IsNullOrEmpty(v) ? v : "unknown symbol"); + _symbol_store = CellFactory.create(this, _book_vm.columns.symbol_column, nameof(symbol), r => r._security.HasValue ? _security.Value.Symbol : "unknown symbol", r => r._symbol_store); _time_created_store = CellFactory.create(this, _book_vm.columns.time_created_column, nameof(time_created), r => r._order.created(), r => r._time_created_store, format_date); _user_store = CellFactory.create(this, _book_vm.columns.user_column, nameof(user), r => _order.user(), r => r._user_store); _account_store = CellFactory.create(this, _book_vm.columns.account_column, nameof(account), r => r._order.account(), r => r._account_store); From e792f3a6973fb4d9f930f311026dc6b2bb6de606 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 7 Aug 2018 10:08:24 -0500 Subject: [PATCH 007/126] updating notes --- release_notes.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/release_notes.txt b/release_notes.txt index 118bc4730..4406b31aa 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,6 +1,9 @@ 1.1.9 - Orderbook: Orders in Error status can now be recreated - Orderbook: Orders containing child orders will now be collapsed by default. +- Orderbook: Symbol column added to allow for filtering based on group symbol +- Time filters now have a quick Set Last Hour hyperlink which will set the Period Begin filter to (Now - 1 hour) + 1.1.8 - Enabled wild cards in risk management UI - Fixed spreader order updates From 2240b3a85dda436a8055cdf35d806ec91a65e107 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 7 Aug 2018 10:10:02 -0500 Subject: [PATCH 008/126] Updating version under which new features will reside --- release_notes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release_notes.txt b/release_notes.txt index 4406b31aa..f3b36ff0b 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,4 +1,4 @@ -1.1.9 +1.1.10 - Orderbook: Orders in Error status can now be recreated - Orderbook: Orders containing child orders will now be collapsed by default. - Orderbook: Symbol column added to allow for filtering based on group symbol From 56feb8fdd36d801276125e2b9a6016f8f3addbbf Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 8 Aug 2018 14:25:44 -0400 Subject: [PATCH 009/126] trigger exit condition --- src/lib/api/services/OrderService.proto | 10 ++- .../sparkd/orderman/orders/TriggerOrder.cpp | 80 +++++++++++++++++-- .../sparkd/orderman/orders/TriggerOrder.h | 8 +- 3 files changed, 88 insertions(+), 10 deletions(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 46db8373b..9c670d159 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -357,7 +357,7 @@ message TriggerCondition{ oneof trigger{ AbsolutePriceTrigger absolute_price_trigger = 20; TrailingTrigger trailing_trigger = 30; - } + } } // Trigger Action //////////////////////////////////// ////////////////////////////////////////////////////// @@ -371,4 +371,12 @@ message TriggerAction{ TriggerPayupPrice payup = 20; double price = 30; } +} +// Trigger Exit Condition //////////////////////////// +////////////////////////////////////////////////////// +message TriggerExitCondition{ + bool enabled = 10; + uint32 timeout_seconds=20; + bool conditional_cancel=30; + bool reenter_order=40; } \ No newline at end of file diff --git a/src/server/sparkd/orderman/orders/TriggerOrder.cpp b/src/server/sparkd/orderman/orders/TriggerOrder.cpp index c5d1d2721..63b977505 100644 --- a/src/server/sparkd/orderman/orders/TriggerOrder.cpp +++ b/src/server/sparkd/orderman/orders/TriggerOrder.cpp @@ -5,6 +5,7 @@ #include "server/sparkd/orderman/events/BookUpdateEvent.h" #include "server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/domain_model/Security.h" +#include "server/sparkd/mercury/events/TimerEvent.h" #include "lib/os/os.h" #include #include @@ -29,6 +30,8 @@ struct TriggerOrder::PImpl { bool is_cxled; bool is_recovered; bool is_succ_inited; + bts::TimeStamp child_order_time; + bts::TimeStamp now_time; PImpl() : services(nullptr), @@ -64,6 +67,7 @@ void TriggerOrder::on_init_new(const api::orderman::OrderDefinition& order_def, break; case State::WAITING_FOR_TRIGGER: case State::STEADY: + case State::WAITING_FOR_CANCEL_ACK: case State::END: std::ostringstream oss; oss << "TriggerOrder::on_init_new key:" << key() << "state:" << _state; @@ -88,6 +92,7 @@ void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord& rec, break; case State::WAITING_FOR_TRIGGER: case State::STEADY: + case State::WAITING_FOR_CANCEL_ACK: case State::END: std::ostringstream oss; oss << "TriggerOrder::on_init_recovered key:" << key() << "state:" << _state; @@ -112,16 +117,19 @@ void TriggerOrder::on_activate(Price price, me->order_builder.activate(services); me->child_order=me->order_builder.build(); services.child_updates.sub(key(), - [this](const OrderStateUpdateEvent& os) + [this](const OrderStateUpdateEvent& os) { this->_on_child_order_update (os);}); services.book_updates.sub(SecurityKey(me->order_def.security_key()), [this](const BookUpdateEvent& bk_event) { this->_on_book_update (bk_event);}); + services.time_change.sub([this](const bts::mercury::TimerEvent& te) + {_on_time(te);}); _switch_state(State::WAITING_FOR_TRIGGER); } break; case State::WAITING_FOR_TRIGGER: case State::STEADY: + case State::WAITING_FOR_CANCEL_ACK: case State::END:{ std::ostringstream oss; oss << "TriggerOrder::on_activate key:" << key() << "state:" << _state; @@ -152,6 +160,13 @@ void TriggerOrder::on_update(Price price, me->state.set_last_msg("Trigger order can not be modified after the trigger has been hit"); _report_state(); break; + case State::WAITING_FOR_CANCEL_ACK: + // if we need to send another order it will take effect + // the next time around + me->state.set_price(price.value()); + me->state.set_quantity(qty.value()); + _report_state(); + break; case State::END: LOG(OrderMan, Warn, "TriggerOrder::on_update key:{} state:{}", key(),_state); @@ -173,24 +188,29 @@ void TriggerOrder::on_cancel(TickToTradeCorID){ _switch_state(State::END); break; case State::STEADY: - me->child_order.cancel(); - _switch_state(State::END); + _cancel_order(); break; - case State::END: + case State::WAITING_FOR_CANCEL_ACK: + case State::END: break; } } void TriggerOrder::_on_book_update(const BookUpdateEvent& b_event){ switch (_state){ - case State::WAITING_FOR_TRIGGER: - if(b_event.key().value()==me->order_def.security_key()){ + case State::WAITING_FOR_TRIGGER: + if(b_event.key().value()==me->order_def.security_key()){ me->book=b_event.book; _observe_market_once(); _analyze_trigger(); } break; case State::START: - case State::STEADY: + case State::STEADY: + // TODO: if conditional cancelling is true this + // needs to evaluate and cancel + if(/*cancel on trigger &&*/!_trigger_met()) + _cancel_order(); + case State::WAITING_FOR_CANCEL_ACK: case State::END: break; } @@ -207,11 +227,37 @@ void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent& o_ev){ if(SpreaderUtils::order_in_terminal_state(o_ev.state.status())) _switch_state(State::END); break; + case State::WAITING_FOR_CANCEL_ACK: + // TODO: if final state + // if cancelled and is_cxl is true to to end + // else, if its filled, go to end + // else go to waiting for trigger case State::END: break; } } } +void TriggerOrder::_on_time(const bts::mercury::TimerEvent& te){ + me->now_time=te.ts; + switch (_state){ + case State::STEADY:{ + int64_t time_diff = ms_diff (me->now_time, me->child_order_time); + if(time_diff > 10000) + _cancel_order(); + // need to see, if time has elapsed + // if it has, cancel the child + // and mark completed + break; + } + case State::START: + case State::WAITING_FOR_TRIGGER: + case State::WAITING_FOR_CANCEL_ACK: + // TODO: if its taking too long go + // end state + case State::END: + break; + } +} bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition& order_def, const PreActivationOrderServices& pre_os){ me->order_def=order_def; @@ -269,6 +315,9 @@ void TriggerOrder::_switch_state(State new_state){ case State::STEADY: bts_assert(_state==State::WAITING_FOR_TRIGGER); break; + case State::WAITING_FOR_CANCEL_ACK: + bts_assert(_state==State::STEADY); + break; case State::END: bts_assert(_state!=State::END); break; @@ -285,12 +334,23 @@ void TriggerOrder::_analyze_trigger(){ const md::PriceSize* obs_md=_observed_market(); if((me->trigger_above_market && _gr_than_eq(obs_md->price(),trigger_price)) || (!me->trigger_above_market && _gr_than_eq(trigger_price,obs_md->price()))){ + me->child_order_time=me->now_time; me->child_order.activate(Price(_child_order_price()), - Quantity(me->state.quantity())); + Quantity(me->state.quantity())); _switch_state(State::STEADY); } } } +bool TriggerOrder::_trigger_met(){ + if(me->market_observed_once){ + double trigger_price=_trigger_price(); + const md::PriceSize* obs_md=_observed_market(); + if (obs_md!=nullptr) + return (me->trigger_above_market && _gr_than_eq(obs_md->price(),trigger_price)) || + (!me->trigger_above_market && _gr_than_eq(trigger_price,obs_md->price())); + } + return false; +} api::orderman::OrderStatus TriggerOrder::_status() const{ switch(_state){ // will only be called once the order @@ -351,6 +411,10 @@ double TriggerOrder::_trigger_price() const{ double TriggerOrder::_child_order_price() const{ return me->order_def.custom_def().trigger().trigger_action().price(); } +void TriggerOrder::_cancel_order(){ + me->child_order.cancel(); + _switch_state(State::WAITING_FOR_CANCEL_ACK); +} bool TriggerOrder::_activated() const{ return me->services!=nullptr; } diff --git a/src/server/sparkd/orderman/orders/TriggerOrder.h b/src/server/sparkd/orderman/orders/TriggerOrder.h index b32a6e56e..625620913 100644 --- a/src/server/sparkd/orderman/orders/TriggerOrder.h +++ b/src/server/sparkd/orderman/orders/TriggerOrder.h @@ -6,6 +6,7 @@ namespace bts { namespace api {namespace orderman {class OrderDefinition;}} +namespace mercury {class TimerEvent;} namespace md {class PriceSize;} namespace orderman { @@ -20,7 +21,8 @@ private: START=0, WAITING_FOR_TRIGGER=1, STEADY=2, - END=3 + WAITING_FOR_CANCEL_ACK=3, + END=4 }; public: TriggerOrder(); @@ -40,6 +42,7 @@ private: // callbacks from book and child order udpates void _on_book_update(const BookUpdateEvent&); void _on_child_order_update(OrderStateUpdateEvent const&); + void _on_time (const bts::mercury::TimerEvent&); private: // called from init_new bool _on_init_new(const api::orderman::OrderDefinition& order_def, @@ -47,6 +50,8 @@ private: void _report_state(); void _switch_state(State new_state); void _analyze_trigger(); + // tells if the trigger condition exists currently or not + bool _trigger_met(); api::orderman::OrderStatus _status() const; void _compute_state(); // for non trailing trigger prices, we need a @@ -61,6 +66,7 @@ private: double _trigger_price() const; // this is in the trigger action double _child_order_price() const; + void _cancel_order(); bool _activated() const; bool _gr_than_eq(double p1, double p2) const; private: From 6cc1b38358b7a93f9aaef14aec7931595ba55e08 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 8 Aug 2018 17:28:30 -0400 Subject: [PATCH 010/126] Update release notes --- release_notes.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/release_notes.txt b/release_notes.txt index 7ca461b79..f4c343e40 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,3 +1,7 @@ +1.1.20 +- Update CME market data handler for price precision extension. + https://www.cmegroup.com/confluence/display/EPICSANDBOX/Price+Precision+Extension + 1.1.8 - Enabled wild cards in risk management UI - Fixed spreader order updates From 595048b778949e94c22462d02e9e3fcf84e6a4d7 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 9 Aug 2018 10:00:23 -0400 Subject: [PATCH 011/126] Ready to test --- .../sparkd/orderman/orders/TriggerOrder.cpp | 30 ++++++++++------- .../sparkd/orderman/orders/TriggerOrder.h | 33 ++++++++++++++----- 2 files changed, 43 insertions(+), 20 deletions(-) diff --git a/src/server/sparkd/orderman/orders/TriggerOrder.cpp b/src/server/sparkd/orderman/orders/TriggerOrder.cpp index 63b977505..a0cdb870f 100644 --- a/src/server/sparkd/orderman/orders/TriggerOrder.cpp +++ b/src/server/sparkd/orderman/orders/TriggerOrder.cpp @@ -22,6 +22,7 @@ struct TriggerOrder::PImpl { OrderBuilder order_builder; ChildOrder child_order; Book book; + CancelMode cancel_mode; // this tells that when the order is placed // initially, if the trigger price above the // market (trigger_condition's chosen market) @@ -40,6 +41,7 @@ struct TriggerOrder::PImpl { child_state(), child_order(), book(), + cancel_mode(CancelMode::none), market_observed_once(false), is_cxled(false), is_recovered(false), @@ -180,6 +182,7 @@ void TriggerOrder::on_cancel(TickToTradeCorID){ LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", key(),_state); me->is_cxled=true; + me->cancel_mode=CancelMode::external; switch (_state){ case State::START: _switch_state(State::END); @@ -188,7 +191,7 @@ void TriggerOrder::on_cancel(TickToTradeCorID){ _switch_state(State::END); break; case State::STEADY: - _cancel_order(); + _cancel_order(CancelMode::external); break; case State::WAITING_FOR_CANCEL_ACK: case State::END: @@ -209,7 +212,7 @@ void TriggerOrder::_on_book_update(const BookUpdateEvent& b_event){ // TODO: if conditional cancelling is true this // needs to evaluate and cancel if(/*cancel on trigger &&*/!_trigger_met()) - _cancel_order(); + _cancel_order(CancelMode::trigger); case State::WAITING_FOR_CANCEL_ACK: case State::END: break; @@ -224,14 +227,19 @@ void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent& o_ev){ break; case State::STEADY: me->child_state=o_ev.state; - if(SpreaderUtils::order_in_terminal_state(o_ev.state.status())) + if(SpreaderUtils::order_in_terminal_state(o_ev.state.status())){ + if(SpreaderUtils::order_in_cancelled_state(o_ev.state.status())) + me->cancel_mode=CancelMode::unoliscited; _switch_state(State::END); + } break; case State::WAITING_FOR_CANCEL_ACK: - // TODO: if final state - // if cancelled and is_cxl is true to to end - // else, if its filled, go to end - // else go to waiting for trigger + me->child_state=o_ev.state; + if(SpreaderUtils::order_in_terminal_state(o_ev.state.status())) + _switch_state(State::END); + //TODO:if we need to reenter, we need + // to do something here + break; case State::END: break; } @@ -243,10 +251,7 @@ void TriggerOrder::_on_time(const bts::mercury::TimerEvent& te){ case State::STEADY:{ int64_t time_diff = ms_diff (me->now_time, me->child_order_time); if(time_diff > 10000) - _cancel_order(); - // need to see, if time has elapsed - // if it has, cancel the child - // and mark completed + _cancel_order(CancelMode::trigger); break; } case State::START: @@ -411,7 +416,8 @@ double TriggerOrder::_trigger_price() const{ double TriggerOrder::_child_order_price() const{ return me->order_def.custom_def().trigger().trigger_action().price(); } -void TriggerOrder::_cancel_order(){ +void TriggerOrder::_cancel_order(CancelMode cancel_mode){ + me->cancel_mode=cancel_mode; me->child_order.cancel(); _switch_state(State::WAITING_FOR_CANCEL_ACK); } diff --git a/src/server/sparkd/orderman/orders/TriggerOrder.h b/src/server/sparkd/orderman/orders/TriggerOrder.h index 625620913..a7f0f702c 100644 --- a/src/server/sparkd/orderman/orders/TriggerOrder.h +++ b/src/server/sparkd/orderman/orders/TriggerOrder.h @@ -17,13 +17,30 @@ class PreActivationOrderServices; class TriggerOrder : public Order { private: - enum State{ - START=0, - WAITING_FOR_TRIGGER=1, - STEADY=2, - WAITING_FOR_CANCEL_ACK=3, - END=4 - }; + +enum State{ + START=0, + WAITING_FOR_TRIGGER=1, + STEADY=2, + WAITING_FOR_CANCEL_ACK=3, + END=4 +}; +// this is the ways a child order +// can be cancelled +enum CancelMode{ + // no cancelled, initial value + none=0, + // meaning the trigger order + // itself cancelled it because + // of time or conditional reasons + trigger, + // the trigger order is itself cancelled + // through the cancel call + external, + // the child order gets cancelled because + // of unknown reasons + unoliscited, +}; public: TriggerOrder(); ~TriggerOrder(); @@ -66,7 +83,7 @@ private: double _trigger_price() const; // this is in the trigger action double _child_order_price() const; - void _cancel_order(); + void _cancel_order(CancelMode cancel_mode); bool _activated() const; bool _gr_than_eq(double p1, double p2) const; private: From 0e639d3c50ec36a61c4814e121ad422ec5423d62 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 9 Aug 2018 10:31:31 -0400 Subject: [PATCH 012/126] added exit condition to trigger proto --- src/lib/api/services/OrderService.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 9c670d159..e8b5b6b0f 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -85,7 +85,7 @@ message TickOrderDefinition {uint32 tick_offset_on_deploy = 1; spark.QuantityMe message LeanOrderDefinition {spark.QuantityMeasure cross_threshold = 1; uint32 max_chase_ticks = 2; CustomOrderDefinition child = 3; } message JoinOrderDefinition {uint32 tick_offset_on_deploy = 1; spark.QuantityMeasure join_threshold = 2; bool enable_hedge = 3; CustomOrderDefinition hedge = 4; int32 hedge_ticks = 5; CustomOrderDefinition child = 6;} message TopOrderDefinition {uint32 watch_level_tick_offset = 1; spark.QuantityMeasure top_threshold = 2; bool enable_hedge = 3; CustomOrderDefinition hedge = 4; int32 hedge_ticks = 5; CustomOrderDefinition child = 6;} -message TriggerOrderDefinition {TriggerCondition trigger_condition=1; TriggerAction trigger_action=2; CustomOrderDefinition child=3;} +message TriggerOrderDefinition {TriggerCondition trigger_condition=1; TriggerAction trigger_action=2; CustomOrderDefinition child=3;TriggerExitCondition exit_condition=4;} message OrderRecord { uint32 key = 1 [(bts.api.key)=true]; From 0584dee4cbf78df4bcf8415a7b39ee8673a842bc Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 9 Aug 2018 10:43:38 -0400 Subject: [PATCH 013/126] iceberg can now handle completed - 0 state --- src/server/sparkd/orderman/orders/IcebergOrder.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/server/sparkd/orderman/orders/IcebergOrder.cpp b/src/server/sparkd/orderman/orders/IcebergOrder.cpp index 4a4a9749e..dce412438 100644 --- a/src/server/sparkd/orderman/orders/IcebergOrder.cpp +++ b/src/server/sparkd/orderman/orders/IcebergOrder.cpp @@ -209,7 +209,6 @@ void IcebergOrder::report_state() { void IcebergOrder::merge_states(api::orderman::OrderState const &iceberg_state, api::orderman::OrderState const &child_state, api::orderman::OrderState *merged) { - bts_assert(child_state.filled_quantity()); auto child_order_fills = child_state.filled_quantity(); auto child_order_avg_price = child_state.avg_price(); auto child_order_last_price = child_state.last_price(); @@ -254,7 +253,6 @@ void IcebergOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { break; case ORDER_STATUS_COMPLETED: { - if (me->child.state.filled_quantity() > 0) { api::orderman::OrderState merged_state; merge_states(me->state, me->child.state, &merged_state); me->state = merged_state; @@ -263,11 +261,6 @@ void IcebergOrder::on_child_order_update(OrderStateUpdateEvent const &ev) { send_next_child_order(); else transition(ORDER_STATUS_COMPLETED); - } else { - me->child.clear(); - transition(ORDER_STATUS_ERROR, - "Child order completed without fills"); - } break; } From 816910a649c36e1462127032b19288def12f0446 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 9 Aug 2018 12:41:16 -0400 Subject: [PATCH 014/126] better end conditon reporting --- .../sparkd/orderman/orders/TriggerOrder.cpp | 51 +++++++++---------- .../sparkd/orderman/orders/TriggerOrder.h | 5 +- .../spreader_orders/spreader/SpreaderUtils.h | 3 ++ 3 files changed, 28 insertions(+), 31 deletions(-) diff --git a/src/server/sparkd/orderman/orders/TriggerOrder.cpp b/src/server/sparkd/orderman/orders/TriggerOrder.cpp index a0cdb870f..02e79a87c 100644 --- a/src/server/sparkd/orderman/orders/TriggerOrder.cpp +++ b/src/server/sparkd/orderman/orders/TriggerOrder.cpp @@ -28,7 +28,6 @@ struct TriggerOrder::PImpl { // market (trigger_condition's chosen market) bool trigger_above_market; bool market_observed_once; - bool is_cxled; bool is_recovered; bool is_succ_inited; bts::TimeStamp child_order_time; @@ -43,7 +42,6 @@ struct TriggerOrder::PImpl { book(), cancel_mode(CancelMode::none), market_observed_once(false), - is_cxled(false), is_recovered(false), is_succ_inited(false){ } @@ -181,7 +179,6 @@ void TriggerOrder::on_crack(TickToTradeCorID){ void TriggerOrder::on_cancel(TickToTradeCorID){ LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", key(),_state); - me->is_cxled=true; me->cancel_mode=CancelMode::external; switch (_state){ case State::START: @@ -208,11 +205,7 @@ void TriggerOrder::_on_book_update(const BookUpdateEvent& b_event){ } break; case State::START: - case State::STEADY: - // TODO: if conditional cancelling is true this - // needs to evaluate and cancel - if(/*cancel on trigger &&*/!_trigger_met()) - _cancel_order(CancelMode::trigger); + case State::STEADY: //conditional exit will be done here case State::WAITING_FOR_CANCEL_ACK: case State::END: break; @@ -227,22 +220,18 @@ void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent& o_ev){ break; case State::STEADY: me->child_state=o_ev.state; - if(SpreaderUtils::order_in_terminal_state(o_ev.state.status())){ - if(SpreaderUtils::order_in_cancelled_state(o_ev.state.status())) - me->cancel_mode=CancelMode::unoliscited; + if(SpreaderUtils::order_in_terminal_state(o_ev.state.status())) _switch_state(State::END); - } break; case State::WAITING_FOR_CANCEL_ACK: me->child_state=o_ev.state; if(SpreaderUtils::order_in_terminal_state(o_ev.state.status())) _switch_state(State::END); - //TODO:if we need to reenter, we need - // to do something here break; case State::END: break; } + _report_state(); //fills } } void TriggerOrder::_on_time(const bts::mercury::TimerEvent& te){ @@ -256,9 +245,7 @@ void TriggerOrder::_on_time(const bts::mercury::TimerEvent& te){ } case State::START: case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_CANCEL_ACK: - // TODO: if its taking too long go - // end state + case State::WAITING_FOR_CANCEL_ACK: // can timeout here case State::END: break; } @@ -363,19 +350,29 @@ api::orderman::OrderStatus TriggerOrder::_status() const{ case State::START: case State::WAITING_FOR_TRIGGER: case State::STEADY: + case State::WAITING_FOR_CANCEL_ACK: return api::orderman::OrderStatus::ORDER_STATUS_WORKING; - case State::END: - if(me->is_cxled || - SpreaderUtils::order_in_cancelled_state(me->child_state.status())) - return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; - else if(!me->is_succ_inited) + case State::END: + if(!me->is_succ_inited) return api::orderman::OrderStatus::ORDER_STATUS_ERROR; - else - return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; - default: - bts_assert(false); - return api::orderman::OrderStatus::ORDER_STATUS_INACTIVE; + else{ + if (SpreaderUtils::order_in_error_state(me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_ERROR; + else if (SpreaderUtils::order_in_completed_state(me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + else if (SpreaderUtils::order_in_cancelled_state(me->child_state.status())){ + switch (me->cancel_mode){ + case CancelMode::none: //this means an unscolicted child cxl + case CancelMode::external: + return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + case CancelMode::trigger: + return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + } + } + } } + bts_assert(false); + return api::orderman::OrderStatus::ORDER_STATUS_INACTIVE; } void TriggerOrder::_compute_state(){ if (!me->is_recovered){ diff --git a/src/server/sparkd/orderman/orders/TriggerOrder.h b/src/server/sparkd/orderman/orders/TriggerOrder.h index a7f0f702c..cfcabddeb 100644 --- a/src/server/sparkd/orderman/orders/TriggerOrder.h +++ b/src/server/sparkd/orderman/orders/TriggerOrder.h @@ -36,10 +36,7 @@ enum CancelMode{ trigger, // the trigger order is itself cancelled // through the cancel call - external, - // the child order gets cancelled because - // of unknown reasons - unoliscited, + external }; public: TriggerOrder(); diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderUtils.h b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderUtils.h index e78e581af..ab50ad0e1 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderUtils.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderUtils.h @@ -88,6 +88,9 @@ public: order_status == api::orderman::OrderStatus::ORDER_STATUS_PENDING_WORKING; return !un_acked; } + static bool order_in_completed_state (bts::api::orderman::OrderStatus order_status){ + return order_status == api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + } static bool order_in_cancelled_state (bts::api::orderman::OrderStatus order_status){ return order_status == api::orderman::OrderStatus::ORDER_STATUS_CANCELED; } From 4458b8ad687874b1150d16cfa226efbc6fc59547 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 9 Aug 2018 13:38:45 -0400 Subject: [PATCH 015/126] Removed WAITING_FOR_CXL_ACK the diff bw prod and this is pretty small now --- .../sparkd/orderman/orders/TriggerOrder.cpp | 72 ++++++++----------- .../sparkd/orderman/orders/TriggerOrder.h | 3 +- 2 files changed, 29 insertions(+), 46 deletions(-) diff --git a/src/server/sparkd/orderman/orders/TriggerOrder.cpp b/src/server/sparkd/orderman/orders/TriggerOrder.cpp index 02e79a87c..be65f1903 100644 --- a/src/server/sparkd/orderman/orders/TriggerOrder.cpp +++ b/src/server/sparkd/orderman/orders/TriggerOrder.cpp @@ -5,7 +5,6 @@ #include "server/sparkd/orderman/events/BookUpdateEvent.h" #include "server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderUtils.h" #include "lib/domain_model/Security.h" -#include "server/sparkd/mercury/events/TimerEvent.h" #include "lib/os/os.h" #include #include @@ -28,6 +27,7 @@ struct TriggerOrder::PImpl { // market (trigger_condition's chosen market) bool trigger_above_market; bool market_observed_once; + bool is_cxled; bool is_recovered; bool is_succ_inited; bts::TimeStamp child_order_time; @@ -42,6 +42,7 @@ struct TriggerOrder::PImpl { book(), cancel_mode(CancelMode::none), market_observed_once(false), + is_cxled(false), is_recovered(false), is_succ_inited(false){ } @@ -67,7 +68,6 @@ void TriggerOrder::on_init_new(const api::orderman::OrderDefinition& order_def, break; case State::WAITING_FOR_TRIGGER: case State::STEADY: - case State::WAITING_FOR_CANCEL_ACK: case State::END: std::ostringstream oss; oss << "TriggerOrder::on_init_new key:" << key() << "state:" << _state; @@ -92,7 +92,6 @@ void TriggerOrder::on_init_recovered(const api::orderman::OrderRecord& rec, break; case State::WAITING_FOR_TRIGGER: case State::STEADY: - case State::WAITING_FOR_CANCEL_ACK: case State::END: std::ostringstream oss; oss << "TriggerOrder::on_init_recovered key:" << key() << "state:" << _state; @@ -117,7 +116,7 @@ void TriggerOrder::on_activate(Price price, me->order_builder.activate(services); me->child_order=me->order_builder.build(); services.child_updates.sub(key(), - [this](const OrderStateUpdateEvent& os) + [this](const OrderStateUpdateEvent& os) { this->_on_child_order_update (os);}); services.book_updates.sub(SecurityKey(me->order_def.security_key()), [this](const BookUpdateEvent& bk_event) @@ -129,7 +128,6 @@ void TriggerOrder::on_activate(Price price, break; case State::WAITING_FOR_TRIGGER: case State::STEADY: - case State::WAITING_FOR_CANCEL_ACK: case State::END:{ std::ostringstream oss; oss << "TriggerOrder::on_activate key:" << key() << "state:" << _state; @@ -160,13 +158,6 @@ void TriggerOrder::on_update(Price price, me->state.set_last_msg("Trigger order can not be modified after the trigger has been hit"); _report_state(); break; - case State::WAITING_FOR_CANCEL_ACK: - // if we need to send another order it will take effect - // the next time around - me->state.set_price(price.value()); - me->state.set_quantity(qty.value()); - _report_state(); - break; case State::END: LOG(OrderMan, Warn, "TriggerOrder::on_update key:{} state:{}", key(),_state); @@ -179,6 +170,7 @@ void TriggerOrder::on_crack(TickToTradeCorID){ void TriggerOrder::on_cancel(TickToTradeCorID){ LOG(OrderMan, Info, "TriggerOrder::on_cancel key:{} state:{}", key(),_state); + me->is_cxled=true; me->cancel_mode=CancelMode::external; switch (_state){ case State::START: @@ -190,15 +182,14 @@ void TriggerOrder::on_cancel(TickToTradeCorID){ case State::STEADY: _cancel_order(CancelMode::external); break; - case State::WAITING_FOR_CANCEL_ACK: - case State::END: + case State::END: break; } } void TriggerOrder::_on_book_update(const BookUpdateEvent& b_event){ switch (_state){ - case State::WAITING_FOR_TRIGGER: - if(b_event.key().value()==me->order_def.security_key()){ + case State::WAITING_FOR_TRIGGER: + if(b_event.key().value()==me->order_def.security_key()){ me->book=b_event.book; _observe_market_once(); _analyze_trigger(); @@ -206,7 +197,6 @@ void TriggerOrder::_on_book_update(const BookUpdateEvent& b_event){ break; case State::START: case State::STEADY: //conditional exit will be done here - case State::WAITING_FOR_CANCEL_ACK: case State::END: break; } @@ -223,15 +213,11 @@ void TriggerOrder::_on_child_order_update(const OrderStateUpdateEvent& o_ev){ if(SpreaderUtils::order_in_terminal_state(o_ev.state.status())) _switch_state(State::END); break; - case State::WAITING_FOR_CANCEL_ACK: - me->child_state=o_ev.state; - if(SpreaderUtils::order_in_terminal_state(o_ev.state.status())) - _switch_state(State::END); - break; case State::END: + me->child_state=o_ev.state; break; } - _report_state(); //fills + _report_state(); } } void TriggerOrder::_on_time(const bts::mercury::TimerEvent& te){ @@ -239,13 +225,12 @@ void TriggerOrder::_on_time(const bts::mercury::TimerEvent& te){ switch (_state){ case State::STEADY:{ int64_t time_diff = ms_diff (me->now_time, me->child_order_time); - if(time_diff > 10000) + if(time_diff > 10000) //TODO:get from order param _cancel_order(CancelMode::trigger); break; } case State::START: case State::WAITING_FOR_TRIGGER: - case State::WAITING_FOR_CANCEL_ACK: // can timeout here case State::END: break; } @@ -307,9 +292,6 @@ void TriggerOrder::_switch_state(State new_state){ case State::STEADY: bts_assert(_state==State::WAITING_FOR_TRIGGER); break; - case State::WAITING_FOR_CANCEL_ACK: - bts_assert(_state==State::STEADY); - break; case State::END: bts_assert(_state!=State::END); break; @@ -326,9 +308,8 @@ void TriggerOrder::_analyze_trigger(){ const md::PriceSize* obs_md=_observed_market(); if((me->trigger_above_market && _gr_than_eq(obs_md->price(),trigger_price)) || (!me->trigger_above_market && _gr_than_eq(trigger_price,obs_md->price()))){ - me->child_order_time=me->now_time; me->child_order.activate(Price(_child_order_price()), - Quantity(me->state.quantity())); + Quantity(me->state.quantity())); _switch_state(State::STEADY); } } @@ -350,23 +331,26 @@ api::orderman::OrderStatus TriggerOrder::_status() const{ case State::START: case State::WAITING_FOR_TRIGGER: case State::STEADY: - case State::WAITING_FOR_CANCEL_ACK: return api::orderman::OrderStatus::ORDER_STATUS_WORKING; case State::END: if(!me->is_succ_inited) return api::orderman::OrderStatus::ORDER_STATUS_ERROR; - else{ - if (SpreaderUtils::order_in_error_state(me->child_state.status())) - return api::orderman::OrderStatus::ORDER_STATUS_ERROR; - else if (SpreaderUtils::order_in_completed_state(me->child_state.status())) - return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; - else if (SpreaderUtils::order_in_cancelled_state(me->child_state.status())){ - switch (me->cancel_mode){ - case CancelMode::none: //this means an unscolicted child cxl - case CancelMode::external: - return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; - case CancelMode::trigger: - return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + else{ + if (!SpreaderUtils::order_in_terminal_state(me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_WORKING; + else{ + if (SpreaderUtils::order_in_error_state(me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_ERROR; + else if (SpreaderUtils::order_in_completed_state(me->child_state.status())) + return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + else if (SpreaderUtils::order_in_cancelled_state(me->child_state.status())){ + switch (me->cancel_mode){ + case CancelMode::none: //this means an unscolicted child cxl + case CancelMode::external: + return api::orderman::OrderStatus::ORDER_STATUS_CANCELED; + case CancelMode::trigger: + return api::orderman::OrderStatus::ORDER_STATUS_COMPLETED; + } } } } @@ -416,7 +400,7 @@ double TriggerOrder::_child_order_price() const{ void TriggerOrder::_cancel_order(CancelMode cancel_mode){ me->cancel_mode=cancel_mode; me->child_order.cancel(); - _switch_state(State::WAITING_FOR_CANCEL_ACK); + _switch_state(State::END); } bool TriggerOrder::_activated() const{ return me->services!=nullptr; diff --git a/src/server/sparkd/orderman/orders/TriggerOrder.h b/src/server/sparkd/orderman/orders/TriggerOrder.h index cfcabddeb..829ef088e 100644 --- a/src/server/sparkd/orderman/orders/TriggerOrder.h +++ b/src/server/sparkd/orderman/orders/TriggerOrder.h @@ -22,8 +22,7 @@ enum State{ START=0, WAITING_FOR_TRIGGER=1, STEADY=2, - WAITING_FOR_CANCEL_ACK=3, - END=4 + END=3 }; // this is the ways a child order // can be cancelled From ee908f2fb8ea0ccb83f5d1c65e3f54c5efaf6f2c Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 9 Aug 2018 14:21:44 -0400 Subject: [PATCH 016/126] added payup proto to Trigger --- src/lib/CMakeDeps.cmake | 2 +- src/lib/api/services/OrderService.proto | 33 ++++++++++++++++--------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 109794b7b..fc06362b7 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cpp_config.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cpp_config.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/quickbus_cfg.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;metrics/metrics.cpp;metrics/system_metrics.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cpp_config.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cpp_config.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/quickbus_cfg.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp) \ No newline at end of file diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index e8b5b6b0f..38288b6fc 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -335,48 +335,59 @@ enum TriggerType{ STOP = 0; INVERSE_STOP = 1; } +// this is the maket the trigger order +// watches for the trigger condition enum TriggerPriceType{ BID = 0; ASK = 1; - LAST_TRADE_PRICE = 2; + LAST_TRADE_PRICE = 2; //unused->assert } message TriggerQuantity{ spark.QuantityMeasure quantity_measure = 10; uint32 threshold_quantity = 20; } -message AbsolutePriceTrigger{ +message AbsolutePriceTrigger{ // we can leave out qty for now - TriggerQuantity trigger_quantity = 10; + TriggerQuantity trigger_quantity = 10; //unused } message TrailingTrigger{ TriggerType trigger_type = 10; int32 number_of_ticks = 20; } -message TriggerCondition{ +message TriggerCondition{ TriggerPriceType price_type = 10; oneof trigger{ AbsolutePriceTrigger absolute_price_trigger = 20; - TrailingTrigger trailing_trigger = 30; + TrailingTrigger trailing_trigger = 30; //unused } } // Trigger Action //////////////////////////////////// ////////////////////////////////////////////////////// +// if TriggerAction.orderprice is payup +// then the payup price will be calc'ed +// with respect to this price message TriggerPayupPrice{ - TriggerPriceType price_type = 10; - int32 payup_ticks = 20; + enum TriggerPayupPriceType{ + BID = 0; + ASK = 1; + LAST_TRADE_PRICE = 2; //unused + TRIGGER=3; + } + TriggerPriceType price_type = 10; // defunct + TriggerPayupPriceType payup_price_type = 15; + int32 payup_ticks = 20; } message TriggerAction{ - uint32 security_id = 10; + uint32 security_id = 10; //unused oneof orderprice{ TriggerPayupPrice payup = 20; double price = 30; - } + } } // Trigger Exit Condition //////////////////////////// ////////////////////////////////////////////////////// message TriggerExitCondition{ bool enabled = 10; - uint32 timeout_seconds=20; + uint32 timeout_seconds=20; //seconds bool conditional_cancel=30; - bool reenter_order=40; } \ No newline at end of file From 0a7ef4a4cd7aa2e18aa6f7ecc1ae114ef96daf83 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 9 Aug 2018 15:53:52 -0500 Subject: [PATCH 017/126] Adding Expand/Collapse All to the OrderBook tool-well area (and right click menu) --- src/client/spark/Images/Icons.cs | 1 + src/client/spark/Images/Vector/Icons.xaml | 13 +++++++++++++ .../view/Spark/Shell/CVOrderBook/CVOrderBookVM.cs | 13 +++++++++++++ .../spark/view/Spark/Shell/OrderBook/OrderBookVM.cs | 5 ++++- .../Spark/Shell/OrderBook/OrderBookView.xaml.cs | 1 + .../view/Spark/Shell/OrderBook/OrderBookWindow.cs | 10 ++++++++-- 6 files changed, 40 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs index 49359e894..6f9e15f97 100644 --- a/src/client/spark/Images/Icons.cs +++ b/src/client/spark/Images/Icons.cs @@ -107,6 +107,7 @@ namespace mbts.ui public static ImageSource Tetris { get { return (DrawingImage)_resources["Tetris"]; } } public static ImageSource ViewSettings => (DrawingImage)_resources["ViewSettings"]; public static ImageSource Wrench { get { return (DrawingImage)_resources["Wrench"]; } } + public static ImageSource UpArrow { get { return (DrawingImage)_resources["UpArrow"]; } } public static ImageSource Support => (DrawingImage)_resources["SupportIcon"]; } diff --git a/src/client/spark/Images/Vector/Icons.xaml b/src/client/spark/Images/Vector/Icons.xaml index 4ea28281e..361931d1a 100644 --- a/src/client/spark/Images/Vector/Icons.xaml +++ b/src/client/spark/Images/Vector/Icons.xaml @@ -753,6 +753,19 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> + + + + + + + + + + - - - - - - - - + + + netstandard2.0 + Blue Trading Systems + Blue Trading Systems + Spark + + true + x64 + AnyCPU + true + + 1.0.0 + 7.2 + + + + + + + + + + + + + + + + + + + + + From 0ad1103f786ea22ae5d7f8d645f2ca0804a13c13 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 14 Aug 2018 11:31:06 -0500 Subject: [PATCH 030/126] requesting a sanity check here --- src/client/spark/view/Controls/Badge.cs | 46 +++++++++++++++++++ .../spark/view/Spark/Ladder/LadderOrderVM.cs | 11 +++++ .../view/Spark/Ladder/LadderOrdersHost.cs | 5 ++ 3 files changed, 62 insertions(+) diff --git a/src/client/spark/view/Controls/Badge.cs b/src/client/spark/view/Controls/Badge.cs index 143c6db5a..609511f4c 100644 --- a/src/client/spark/view/Controls/Badge.cs +++ b/src/client/spark/view/Controls/Badge.cs @@ -25,9 +25,11 @@ namespace mbts.ui.controls { DefaultFontSize = 10, DefaultWidth = 63; // ** public static readonly FontFamily DefaultFontFamily = new FontFamily("Consolas"); + public static readonly bool DefaultIsExchangeOrder = false; readonly GlyphContentRect _gcr = new GlyphContentRect(); Brush _background, _foreground, _border_brush; + bool _is_exchange_order, _is_multiple_orders_at_level; static Badge() { DefaultStyleKeyProperty.OverrideMetadata(typeof(Badge), new FrameworkPropertyMetadata(typeof(Badge))); @@ -166,6 +168,8 @@ namespace mbts.ui.controls { _border_brush = BorderBrush; _gcr.font_size = FontSize; _gcr.text_lines = TextLines; + _is_exchange_order = IsExchangeOrder; + _is_multiple_orders_at_level = IsMultipleOrdersAtLevel; _gcr.glyph_context = GlyphContext.create(FontFamily, FontWeight); } @@ -190,6 +194,26 @@ namespace mbts.ui.controls { public static readonly DependencyProperty CornerRadiusProperty = WPFHelper.create_dp(nameof(CornerRadius), DefaultCornerRadius); + public bool IsExchangeOrder { + get { return (bool)GetValue(IsExchangeOrderProperty); } + set { SetValue(IsExchangeOrderProperty, value); } + } + + public static readonly DependencyProperty IsExchangeOrderProperty = + WPFHelper.create_dp(nameof(IsExchangeOrder), DefaultIsExchangeOrder); + + public static readonly DependencyProperty IsMultipleOrdersAtLevelProperty = + WPFHelper.create_dp( + nameof(IsMultipleOrdersAtLevel), + FrameworkPropertyMetadataOptions.AffectsRender, + (b, v) => b._is_multiple_orders_at_level = v, + false); + + public bool IsMultipleOrdersAtLevel { + get { return (bool)GetValue(IsMultipleOrdersAtLevelProperty); } + set { SetValue(IsMultipleOrdersAtLevelProperty, value); } + } + protected override Size ArrangeOverride(Size finalSize) => finalSize; protected override Size MeasureOverride(Size availableSize) { @@ -202,9 +226,31 @@ namespace mbts.ui.controls { double border_thickness = BorderThickness.Top; var pen = new Pen(BorderBrush, border_thickness); dc.DrawRoundedRectangle(Background, pen, new Rect(0, border_thickness, _gcr.layout_size.Width, _gcr.layout_size.Height), CornerRadius, CornerRadius); + if (IsExchangeOrder) { + // for the y-component, since we start the RoundedRectangle at border_thickness, we have to include that in our y pos start position as well. + dc.DrawEllipse(Brushes.Black, new Pen(Brushes.Black, border_thickness), new Point(_gcr.layout_size.Width - 2 * border_thickness - CornerRadius, 0 + border_thickness + 2 * border_thickness + CornerRadius), 2, 2); + } + if (IsMultipleOrdersAtLevel) { + _draw_triangle( + new Point(_gcr.layout_size.Width - (border_thickness - CornerRadius + 2), _gcr.layout_size.Height - 5), // top right + new Point(_gcr.layout_size.Width - (border_thickness - CornerRadius + 2), _gcr.layout_size.Height), // bottom right + new Point(_gcr.layout_size.Width - (border_thickness - CornerRadius + 2) - 5, _gcr.layout_size.Height), // bottom left + Brushes.IndianRed + ); + } var gr = _gcr.glyph_run; if (gr != null) dc.DrawGlyphRun(_foreground, gr); + + void _draw_triangle(Point p1, Point p2, Point p3, Brush b) { + var sg = new StreamGeometry(); + using (var sgc = sg.Open()) { + sgc.BeginFigure(p1, true, true); + sgc.PolyLineTo(new Point[] { p2, p3 }, true, true); + } + //sg.Freeze(); + dc.DrawGeometry(b, new Pen(b, 1), sg); + } } } diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 4ab0a8dbb..fcafca19b 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -35,6 +35,7 @@ namespace mbts.spark { readonly Property _font_weight; readonly Property _font_size; readonly Property _foreground, _background, _hoverbackground, _border; + readonly Property _is_exchange_order, _is_multiple_orders_at_same_level; readonly Property _summary, _description; IObservable _bs; LadderSettings.BadgeStyle _current_badge_style; @@ -62,6 +63,8 @@ namespace mbts.spark { _border = backing(nameof(border), _color_bg_brush); _summary = backing(nameof(summary), string.Empty); _description = backing(nameof(description), string.Empty); + _is_exchange_order = backing(nameof(is_exchage_order), false); + _is_multiple_orders_at_same_level = backing(nameof(is_multiple_orders_at_same_level), false); FontFamily get_font_family(LadderSettings s) => new FontFamily(s.orders_column.font_family); FontWeight get_font_weight(LadderSettings s) => ui.utility.text.TextUtils.from_open_type_weight_safe(s.orders_column.font_weight); double get_font_size(LadderSettings s) => s.orders_column.font_size; @@ -96,6 +99,10 @@ namespace mbts.spark { working_quantity = _parent_and_child_not_sharing_slot().Select(order => order.working_quantity()).Sum(); quantity = _parent_and_child_not_sharing_slot().Select(order => order.State.Quantity).Sum(); + // TODO: call the appropriate taha-provided function in the future + is_exchage_order = true; + is_multiple_orders_at_same_level = _orders.Count > 1; + if (_orders.Count > 0) { summary = _orders.Values.Select(order => order.short_description(_parent.security.ContractSpec)).Aggregate((s1, s2) => $"{s1}{Environment.NewLine}{Environment.NewLine}{s2}"); @@ -140,6 +147,7 @@ namespace mbts.spark { IEnumerable _parent_and_child_not_sharing_slot() => _orders.Values.Where(o => !_orders.ContainsKey(o.ParentKey)); public IReadOnlyList text_lines { get; private set; } + public bool has_parent => _orders.Values.Any( order => order.has_parent()); public bool has_phantom_price => !double.IsNaN(_phantom_price); @@ -161,6 +169,9 @@ namespace mbts.spark { public Brush border { get => _border.Value; private set => _border.Value = value; } public string summary { get => _summary.Value; private set => _summary.Value = value; } public string description { get => _description.Value; private set => _description.Value = value; } + public bool is_exchage_order { get => _is_exchange_order.Value; private set => _is_exchange_order.Value = value; } + public bool is_multiple_orders_at_same_level { get => _is_multiple_orders_at_same_level.Value; private set => _is_multiple_orders_at_same_level.Value = value; } + public IEnumerable orders => _orders.Values; void _cancel_order() { diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index 3abbb66a9..41f5a8ca0 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -7,6 +7,7 @@ using System.ComponentModel; using System.Linq; using System.Windows; using System.Windows.Controls; +using System.Windows.Data; using System.Windows.Input; using System.Windows.Media; @@ -108,6 +109,10 @@ namespace mbts.spark { Badge mkbadge(LadderOrderVM order) { Badge b = new Badge(); + var binding = new Binding(); + binding.Source = order; + binding.Path = new PropertyPath("is_multiple_orders_at_same_level"); + b.SetBinding(Badge.IsMultipleOrdersAtLevelProperty, binding); b.DataContext = order; // Hook up the style from xaml b.Style = this.TryFindResource(typeof(Badge)) as Style; From 13940c659b80a20649915f543ab9eaf10e13171e Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 14 Aug 2018 15:05:02 -0400 Subject: [PATCH 031/126] comments --- src/server/sparkd/orderman/orders/TriggerOrder.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/server/sparkd/orderman/orders/TriggerOrder.cpp b/src/server/sparkd/orderman/orders/TriggerOrder.cpp index f53011593..5516b0465 100644 --- a/src/server/sparkd/orderman/orders/TriggerOrder.cpp +++ b/src/server/sparkd/orderman/orders/TriggerOrder.cpp @@ -16,13 +16,18 @@ struct TriggerOrder::PImpl { OrderServices *services; api::orderman::OrderDefinition order_def; double tick_size; + // true if timeout_exit is enabled bool timeout_exit; uint32_t timeout_secs; + // true position cond exit is enabled bool price_cond_exit; api::orderman::OrderState state; + // child state copied directly from the + // child order udpate callback api::orderman::OrderState child_state; OrderBuilder order_builder; ChildOrder child_order; + // true if child order has been placed once bool order_placed; Book book; CancelMode cancel_mode; @@ -30,6 +35,8 @@ struct TriggerOrder::PImpl { // initially, if the trigger price above the // market (trigger_condition's chosen market) bool trigger_above_market; + // true is non 0 market corresponding + // to the trigger market is obs'ed once bool market_observed_once; bool is_recovered; bool is_succ_inited; @@ -168,8 +175,6 @@ void TriggerOrder::on_update(Price price, _report_state(); break; case State::END: - LOG(OrderMan, Warn, "TriggerOrder::on_update key:{} state:{}", - key(),_state); break; } } From 197b6e85bd1c8cb590ee26001e68d128b7dd9e9e Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 14 Aug 2018 16:44:29 -0400 Subject: [PATCH 032/126] Quiet websocketpp.transport errors --- src/server/sparkd/http/WebServer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index b4d9d3ec1..5343d3d31 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -77,6 +77,7 @@ namespace http { _server.set_http_handler(bind(&ServerState::on_http, this, ::_1)); // Turn off logging _server.clear_access_channels(websocketpp::log::alevel::all); + _server.clear_error_channels(websocketpp::log::alevel::all); run(); } From 8ab9943834bcd1258dffb5a916d504087505400c Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 14 Aug 2018 15:48:28 -0500 Subject: [PATCH 033/126] SPARK-1557 and most of SPARK-1553 --- src/client/spark/view/Controls/Badge.cs | 52 ++++++++++++------- .../spark/view/Spark/Ladder/LadderOrderVM.cs | 12 +++-- .../view/Spark/Ladder/LadderOrdersHost.cs | 4 -- .../spark/view/Spark/Ladder/LadderView.xaml | 2 + 4 files changed, 44 insertions(+), 26 deletions(-) diff --git a/src/client/spark/view/Controls/Badge.cs b/src/client/spark/view/Controls/Badge.cs index 609511f4c..57bdd1217 100644 --- a/src/client/spark/view/Controls/Badge.cs +++ b/src/client/spark/view/Controls/Badge.cs @@ -2,6 +2,7 @@ using mbts.spark; using mbts.ui.utility.text; using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Globalization; using System.Windows; @@ -25,7 +26,9 @@ namespace mbts.ui.controls { DefaultFontSize = 10, DefaultWidth = 63; // ** public static readonly FontFamily DefaultFontFamily = new FontFamily("Consolas"); - public static readonly bool DefaultIsExchangeOrder = false; + + // I am thinking that depending on how people have different ladder windows configured, the vertex points may be at different positions + static ConcurrentDictionary<(Point p1, Point p2, Point p3), StreamGeometry> _sg_cache = new ConcurrentDictionary<(Point p1, Point p2, Point p3), StreamGeometry>(); readonly GlyphContentRect _gcr = new GlyphContentRect(); Brush _background, _foreground, _border_brush; @@ -200,7 +203,16 @@ namespace mbts.ui.controls { } public static readonly DependencyProperty IsExchangeOrderProperty = - WPFHelper.create_dp(nameof(IsExchangeOrder), DefaultIsExchangeOrder); + WPFHelper.create_dp( + nameof(IsExchangeOrder), + FrameworkPropertyMetadataOptions.AffectsRender, + (b, v) => b._is_exchange_order = v, + false); + + public bool IsMultipleOrdersAtLevel { + get { return (bool)GetValue(IsMultipleOrdersAtLevelProperty); } + set { SetValue(IsMultipleOrdersAtLevelProperty, value); } + } public static readonly DependencyProperty IsMultipleOrdersAtLevelProperty = WPFHelper.create_dp( @@ -209,11 +221,6 @@ namespace mbts.ui.controls { (b, v) => b._is_multiple_orders_at_level = v, false); - public bool IsMultipleOrdersAtLevel { - get { return (bool)GetValue(IsMultipleOrdersAtLevelProperty); } - set { SetValue(IsMultipleOrdersAtLevelProperty, value); } - } - protected override Size ArrangeOverride(Size finalSize) => finalSize; protected override Size MeasureOverride(Size availableSize) { @@ -224,17 +231,21 @@ namespace mbts.ui.controls { protected override void OnRender(DrawingContext dc) { base.OnRender(dc); double border_thickness = BorderThickness.Top; - var pen = new Pen(BorderBrush, border_thickness); + Pen pen; + (pen = new Pen(BorderBrush, border_thickness)).Freeze(); dc.DrawRoundedRectangle(Background, pen, new Rect(0, border_thickness, _gcr.layout_size.Width, _gcr.layout_size.Height), CornerRadius, CornerRadius); + if (IsExchangeOrder) { // for the y-component, since we start the RoundedRectangle at border_thickness, we have to include that in our y pos start position as well. - dc.DrawEllipse(Brushes.Black, new Pen(Brushes.Black, border_thickness), new Point(_gcr.layout_size.Width - 2 * border_thickness - CornerRadius, 0 + border_thickness + 2 * border_thickness + CornerRadius), 2, 2); + (pen = new Pen(Brushes.Black, border_thickness)).Freeze(); + dc.DrawEllipse(Brushes.Black, pen, new Point(_gcr.layout_size.Width - 2 * border_thickness - CornerRadius, 0 + border_thickness + 2 * border_thickness + CornerRadius), 2, 2); } + if (IsMultipleOrdersAtLevel) { _draw_triangle( - new Point(_gcr.layout_size.Width - (border_thickness - CornerRadius + 2), _gcr.layout_size.Height - 5), // top right - new Point(_gcr.layout_size.Width - (border_thickness - CornerRadius + 2), _gcr.layout_size.Height), // bottom right - new Point(_gcr.layout_size.Width - (border_thickness - CornerRadius + 2) - 5, _gcr.layout_size.Height), // bottom left + new Point(_gcr.layout_size.Width - (2 * border_thickness - CornerRadius), _gcr.layout_size.Height - 5), // top right + new Point(_gcr.layout_size.Width - (2 * border_thickness - CornerRadius), _gcr.layout_size.Height), // bottom right + new Point(_gcr.layout_size.Width - (2 * border_thickness - CornerRadius) - 5, _gcr.layout_size.Height), // bottom left Brushes.IndianRed ); } @@ -243,13 +254,18 @@ namespace mbts.ui.controls { dc.DrawGlyphRun(_foreground, gr); void _draw_triangle(Point p1, Point p2, Point p3, Brush b) { - var sg = new StreamGeometry(); - using (var sgc = sg.Open()) { - sgc.BeginFigure(p1, true, true); - sgc.PolyLineTo(new Point[] { p2, p3 }, true, true); + var key = (p1, p2, p3); + if (!_sg_cache.TryGetValue(key, out StreamGeometry sg)) { + sg = new StreamGeometry(); + using (var sgc = sg.Open()) { + sgc.BeginFigure(p1, true, true); + sgc.PolyLineTo(new Point[] { p2, p3 }, true, true); + } + sg.Freeze(); + _sg_cache[key] = sg; } - //sg.Freeze(); - dc.DrawGeometry(b, new Pen(b, 1), sg); + (pen = new Pen(b, 1)).Freeze(); + dc.DrawGeometry(b, pen, sg); } } } diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index fcafca19b..1106b06d4 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -63,7 +63,7 @@ namespace mbts.spark { _border = backing(nameof(border), _color_bg_brush); _summary = backing(nameof(summary), string.Empty); _description = backing(nameof(description), string.Empty); - _is_exchange_order = backing(nameof(is_exchage_order), false); + _is_exchange_order = backing(nameof(is_exchange_order), false); _is_multiple_orders_at_same_level = backing(nameof(is_multiple_orders_at_same_level), false); FontFamily get_font_family(LadderSettings s) => new FontFamily(s.orders_column.font_family); FontWeight get_font_weight(LadderSettings s) => ui.utility.text.TextUtils.from_open_type_weight_safe(s.orders_column.font_weight); @@ -99,8 +99,8 @@ namespace mbts.spark { working_quantity = _parent_and_child_not_sharing_slot().Select(order => order.working_quantity()).Sum(); quantity = _parent_and_child_not_sharing_slot().Select(order => order.State.Quantity).Sum(); - // TODO: call the appropriate taha-provided function in the future - is_exchage_order = true; + // TODO: call the appropriate taha-provided function for is_exchange_order in the future + is_exchange_order = taha_function_stub(); is_multiple_orders_at_same_level = _orders.Count > 1; if (_orders.Count > 0) @@ -109,6 +109,10 @@ namespace mbts.spark { description = _orders.Values.Select(order => order.full_description(_parent.security)).Aggregate((s1, s2) => $"{s1}{Environment.NewLine}{Environment.NewLine}{s2}"); } _set_badge_text(); + + bool taha_function_stub() { + return true; + } } private void _set_badge_text() { @@ -169,7 +173,7 @@ namespace mbts.spark { public Brush border { get => _border.Value; private set => _border.Value = value; } public string summary { get => _summary.Value; private set => _summary.Value = value; } public string description { get => _description.Value; private set => _description.Value = value; } - public bool is_exchage_order { get => _is_exchange_order.Value; private set => _is_exchange_order.Value = value; } + public bool is_exchange_order { get => _is_exchange_order.Value; private set => _is_exchange_order.Value = value; } public bool is_multiple_orders_at_same_level { get => _is_multiple_orders_at_same_level.Value; private set => _is_multiple_orders_at_same_level.Value = value; } public IEnumerable orders => _orders.Values; diff --git a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs index 41f5a8ca0..a2d2821e5 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrdersHost.cs @@ -109,10 +109,6 @@ namespace mbts.spark { Badge mkbadge(LadderOrderVM order) { Badge b = new Badge(); - var binding = new Binding(); - binding.Source = order; - binding.Path = new PropertyPath("is_multiple_orders_at_same_level"); - b.SetBinding(Badge.IsMultipleOrdersAtLevelProperty, binding); b.DataContext = order; // Hook up the style from xaml b.Style = this.TryFindResource(typeof(Badge)) as Style; diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml b/src/client/spark/view/Spark/Ladder/LadderView.xaml index 3f5f82027..23c5456db 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml @@ -451,6 +451,8 @@ + + From 289f9259bba108fdd7d9d79fd4bab1d6062bd2ff Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 14 Aug 2018 15:58:03 -0500 Subject: [PATCH 034/126] I think this will come in handy one day for testing --- src/client/spark/view/Extensions/RandomExtensions.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/client/spark/view/Extensions/RandomExtensions.cs b/src/client/spark/view/Extensions/RandomExtensions.cs index 189c1a217..a6176537f 100644 --- a/src/client/spark/view/Extensions/RandomExtensions.cs +++ b/src/client/spark/view/Extensions/RandomExtensions.cs @@ -14,6 +14,9 @@ namespace mbts.ui { return random.NextDouble() * (maxValue - minValue) + minValue; } + public static bool NextBool(this Random random, int truePercentage = 50) { + return random.NextDouble() < (truePercentage / 100.0); + } } From 0687fbb30a9617a2163f5f52b027ade34adcfba6 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 14 Aug 2018 17:29:35 -0500 Subject: [PATCH 035/126] SPARK-1558 --- src/client/spark/view/Controls/Badge.cs | 24 ++++++++++++++++++- .../spark/view/Spark/Ladder/LadderOrderVM.cs | 5 +++- .../spark/view/Spark/Ladder/LadderView.xaml | 1 + 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Controls/Badge.cs b/src/client/spark/view/Controls/Badge.cs index 57bdd1217..938595425 100644 --- a/src/client/spark/view/Controls/Badge.cs +++ b/src/client/spark/view/Controls/Badge.cs @@ -32,7 +32,7 @@ namespace mbts.ui.controls { readonly GlyphContentRect _gcr = new GlyphContentRect(); Brush _background, _foreground, _border_brush; - bool _is_exchange_order, _is_multiple_orders_at_level; + bool _is_exchange_order, _is_multiple_orders_at_level, _is_hedge_order; static Badge() { DefaultStyleKeyProperty.OverrideMetadata(typeof(Badge), new FrameworkPropertyMetadata(typeof(Badge))); @@ -173,6 +173,7 @@ namespace mbts.ui.controls { _gcr.text_lines = TextLines; _is_exchange_order = IsExchangeOrder; _is_multiple_orders_at_level = IsMultipleOrdersAtLevel; + _is_hedge_order = IsHedgeOrder; _gcr.glyph_context = GlyphContext.create(FontFamily, FontWeight); } @@ -221,6 +222,18 @@ namespace mbts.ui.controls { (b, v) => b._is_multiple_orders_at_level = v, false); + public bool IsHedgeOrder { + get { return (bool)GetValue(IsHedgeOrderProperty); } + set { SetValue(IsHedgeOrderProperty, value); } + } + + public static readonly DependencyProperty IsHedgeOrderProperty = + WPFHelper.create_dp( + nameof(IsHedgeOrder), + FrameworkPropertyMetadataOptions.AffectsRender, + (b, v) => b._is_hedge_order = v, + false); + protected override Size ArrangeOverride(Size finalSize) => finalSize; protected override Size MeasureOverride(Size availableSize) { @@ -249,6 +262,15 @@ namespace mbts.ui.controls { Brushes.IndianRed ); } + + if (IsHedgeOrder) { + (pen = new Pen(Brushes.Black, border_thickness)).Freeze(); + dc.DrawLine(pen, + new Point(2 * border_thickness, 0 + 2 * border_thickness), + new Point(2 * border_thickness, _gcr.layout_size.Height) + ); + } + var gr = _gcr.glyph_run; if (gr != null) dc.DrawGlyphRun(_foreground, gr); diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 1106b06d4..3d9340574 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -35,7 +35,7 @@ namespace mbts.spark { readonly Property _font_weight; readonly Property _font_size; readonly Property _foreground, _background, _hoverbackground, _border; - readonly Property _is_exchange_order, _is_multiple_orders_at_same_level; + readonly Property _is_exchange_order, _is_multiple_orders_at_same_level, _is_hedge_order; readonly Property _summary, _description; IObservable _bs; LadderSettings.BadgeStyle _current_badge_style; @@ -65,6 +65,7 @@ namespace mbts.spark { _description = backing(nameof(description), string.Empty); _is_exchange_order = backing(nameof(is_exchange_order), false); _is_multiple_orders_at_same_level = backing(nameof(is_multiple_orders_at_same_level), false); + _is_hedge_order = backing(nameof(is_hedge_order), false); FontFamily get_font_family(LadderSettings s) => new FontFamily(s.orders_column.font_family); FontWeight get_font_weight(LadderSettings s) => ui.utility.text.TextUtils.from_open_type_weight_safe(s.orders_column.font_weight); double get_font_size(LadderSettings s) => s.orders_column.font_size; @@ -102,6 +103,7 @@ namespace mbts.spark { // TODO: call the appropriate taha-provided function for is_exchange_order in the future is_exchange_order = taha_function_stub(); is_multiple_orders_at_same_level = _orders.Count > 1; + is_hedge_order = _orders.All(o => o.Value.sub_type() == OrderSubType.HedgingLeg); if (_orders.Count > 0) { @@ -175,6 +177,7 @@ namespace mbts.spark { public string description { get => _description.Value; private set => _description.Value = value; } public bool is_exchange_order { get => _is_exchange_order.Value; private set => _is_exchange_order.Value = value; } public bool is_multiple_orders_at_same_level { get => _is_multiple_orders_at_same_level.Value; private set => _is_multiple_orders_at_same_level.Value = value; } + public bool is_hedge_order { get => _is_hedge_order.Value; private set => _is_hedge_order.Value = value; } public IEnumerable orders => _orders.Values; diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml b/src/client/spark/view/Spark/Ladder/LadderView.xaml index 23c5456db..7521f3a9d 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml @@ -453,6 +453,7 @@ + From 7db6591d22104d2dfdac60b0029db71f2a56b2e2 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 15 Aug 2018 11:25:28 -0400 Subject: [PATCH 036/126] fix _DISABLE_EXTENDED_ALIGNED_STORAGE issue with 15.8.0 msvc compiler --- src/lib/md/test/Co2TestInstrument.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/md/test/Co2TestInstrument.cpp b/src/lib/md/test/Co2TestInstrument.cpp index 4b6cd929c..06d037b1c 100644 --- a/src/lib/md/test/Co2TestInstrument.cpp +++ b/src/lib/md/test/Co2TestInstrument.cpp @@ -1,4 +1,4 @@ -#ifndef NO_CPP0X +#define _DISABLE_EXTENDED_ALIGNED_STORAGE #include "Co2TestInstrument.h" #include "lib/md/MemorySegmentUtils.h" @@ -50,4 +50,3 @@ MDConsumerHandle Co2TestInstrument::consumer() { Co2TestInstrument::~Co2TestInstrument() { } }}//namespace -#endif From 743348448453e975b3735de8f7af197650168c14 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 15 Aug 2018 13:12:31 -0400 Subject: [PATCH 037/126] Fix for the condition when the quoter filled price != order price --- .../orders/spreader_orders/SpreaderOrder.cpp | 27 ++++++++++++++----- .../orders/spreader_orders/SpreaderOrder.h | 1 + .../spreader/SpreaderChildOrderState.cpp | 2 ++ .../spreader/SpreaderChildOrderState.h | 7 ++++- .../spreader/quoter/QuoteDriverSetHistory.cpp | 7 ++++- .../SpreaderWorkingStateWorker.cpp | 7 ++--- 6 files changed, 37 insertions(+), 14 deletions(-) diff --git a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp index d31427dd8..c04f4fa62 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -110,8 +110,8 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ #endif Quantity filled_qty = Quantity (ord_ev.state.filled_quantity()); - Price last_price = Price(ord_ev.state.last_price()); - LOG(OrderMan, Diag, "SpreaderOrder::_on_child_order_update key: {} sec_key: {} order_key: {} status: {} filled_qty: {} last_price: {} msg: {}", key(), sec_key, order_key, status, filled_qty, last_price, ord_ev.state.last_msg ()); + Price last_price = Price(ord_ev.state.last_price()), + order_price=Price(ord_ev.state.price()); if (!SpreaderUtils::order_acknowledged(status)){ LOG(OrderMan, Diag, "SpreaderOrder::_on_child_order_update, unack'ed callback for key: {} sec_key: {} order_key: {} status: {} ignoring", key(), sec_key, order_key, status); bts_assert(filled_qty.value() == 0); @@ -121,8 +121,14 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ if (leg_data_ptr != nullptr){ SpreaderLegData& leg_data = *leg_data_ptr; ChildOrderError order_error = _get_order_error (ord_ev, leg_data.quoter().expecting_cancel_update()); - LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update quoter order key: {} sec_key: {} order_key: {} status: {} filled_qty: {} last_price: {} msg: {} child_order_error: {}", - key(), sec_key, order_key, status, filled_qty, last_price, ord_ev.state.last_msg (), static_cast(order_error)); + LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update quoter order " + "key:{} sec_key:{} state:{} order_key:{} status:{} " + "filled_qty:{} price:{} last_price:{} " + "msg:{} child_order_error:{}", + key(), sec_key, + static_cast(_state_worker->state()), order_key, status, + filled_qty, order_price, last_price, + ord_ev.state.last_msg(), static_cast(order_error)); leg_data.order_update_message().on_order_update(ord_ev); if (order_error == ChildOrderError::NONE){ if (leg_data.order_update_message().last_update_filled_quantity().value() > 0) @@ -138,8 +144,14 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ SingleFillHedger* hedger = _bookkeeping_data().find_hedger_from_orderkey(order_key); if (hedger != nullptr){ ChildOrderError order_error = _get_order_error (ord_ev, hedger->expecting_cancel_update()); - LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update hedger order: key: {} sec_key: {} order_key: {} status: {} filled_qty: {} last_price: {} msg: {} child_order_error: {}", - key(), sec_key, order_key, status, filled_qty, last_price, ord_ev.state.last_msg (), static_cast(order_error)); + LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update hedger " + "key:{} sec_key:{} state:{} order_key:{} status:{} " + "filled_qty:{} price:{} last_price:{} " + "msg:{} child_order_error:{}", + key(), sec_key, + static_cast(_state_worker->state()), order_key, status, + filled_qty, order_price, last_price, + ord_ev.state.last_msg (), static_cast(order_error)); hedger->order_state().on_order_update(ord_ev); if (order_error == ChildOrderError::NONE) _state_worker->on_hedger_order_update (*hedger); @@ -273,6 +285,7 @@ void SpreaderOrder::_send_hedge(size_t hedge_leg_index, void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index, Price fill_price, double fill_quantity, + Price quote_order_price, size_t hedge_leg_index, Price& hedge_price, double& hedge_quantity){ @@ -288,7 +301,7 @@ void SpreaderOrder::_compute_hedge_price_quantity(size_t filled_leg_index, computed_hedge_price, hedge_quantity); else{ - const QuoteLegDriver& driver_data = filled_leg_data.quoter().driver_data(fill_price, hedge_leg_index); + const QuoteLegDriver& driver_data = filled_leg_data.quoter().driver_data(quote_order_price, hedge_leg_index); SpreaderUtils::compute_hedge_price_size_n_legs (filled_leg_data.leg_property_data(), fill_price, fill_quantity, diff --git a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h index 5498384aa..f80cee486 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/SpreaderOrder.h @@ -173,6 +173,7 @@ private: void _compute_hedge_price_quantity(size_t filled_leg_index, Price filled_price, double filled_quantity, + Price order_price, size_t hedged_leg_index, Price& hedge_price, double& hedge_quantity); diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp index 2a0d2ce88..5eb5926b0 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp @@ -19,6 +19,7 @@ _status(src._status), _filled_price(src._filled_price), _filled_quantity(src._filled_quantity), _last_filled_price(src._last_filled_price), +_last_reported_order_price(src._last_reported_order_price), _last_filled_quantity(src._last_filled_quantity) { } SpreaderChildOrderState::SpreaderChildOrderState (bts::orderman::ChildOrder& child_order, @@ -45,6 +46,7 @@ void SpreaderChildOrderState::_init_running_values(){ _filled_price = Price(0); _filled_quantity = Quantity (0); _last_filled_price = Price(0); + _last_reported_order_price=Price(0); _last_filled_quantity = Quantity(0); _out_price = Price(0); _out_quantity = Quantity(0); diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h index abad4c0cb..316ac66e1 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.h @@ -29,6 +29,7 @@ private: Price _filled_price; Quantity _filled_quantity; Price _last_filled_price; + Price _last_reported_order_price; Quantity _last_filled_quantity; Price _out_price; Quantity _out_quantity; @@ -54,9 +55,12 @@ public: } // if the last fill was a status change // this will be zero - Price last_update_filled_price () const { + Price last_update_filled_price() const { return _last_filled_price; } + Price last_reported_order_price() const{ + return _last_reported_order_price; + } // if the last fill was a status change // this will be zero Quantity last_update_filled_quantity () const { @@ -109,6 +113,7 @@ public: _status = e.state.status(); _last_filled_quantity = Quantity(e.state.filled_quantity() - _filled_quantity.value()); _last_filled_price = Price(e.state.last_price()); + _last_reported_order_price=Price(e.state.price()); SpreaderUtils::compute_average_price(_filled_price, _filled_quantity, _last_filled_price, diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp b/src/server/sparkd/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp index fa544e151..64d249fda 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp @@ -43,7 +43,12 @@ const QuoteDriverSet* QuoteDriverSetHistory::_find_driver_set(Price quote_price) _tick_size)) if (rv==nullptr||d.quote_seq_no()>rv->quote_seq_no()) rv=&d; - return rv!=nullptr ? rv:_latest(); + if (rv==nullptr){ + LOG(OrderMan, Warn, "QuoteDriverSetHistory::_find_driver_set " + "could not find driver:{}",quote_price); + rv=_latest(); + } + return rv; } const QuoteLegDriver* QuoteDriverSetHistory::find_driver(Price quote_price, size_t leg_index) const{ diff --git a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp index f6c60f95b..305ad44f9 100644 --- a/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp +++ b/src/server/sparkd/orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp @@ -92,11 +92,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, // ii. not send a hedge on leg_2 since its already filled // however doing the above would mess up the leg ratio's so we are preffering // getting overfilled - SpreaderChildOrderState& order_update_message = leg_data.order_update_message(); - LOG(OrderMan, Info, "SpreaderWorkingStateWorker::on_quoter_order_fill order: key: {} order_key: {} status: {} filled_qty: {} last_price: {}", - _spreader->key(), order_update_message.order_key(), order_update_message.status(), - order_update_message.last_update_filled_quantity(), - order_update_message.last_update_filled_price()); + SpreaderChildOrderState& order_update_message = leg_data.order_update_message(); bts_assert (order_update_message.last_update_filled_quantity().value() > 0); for (size_t q_idx = 0; q_idx < _spreader->_bookkeeping_data().n_legs(); q_idx++){ if (q_idx != leg_data.leg_property_data().leg_index()){ @@ -106,6 +102,7 @@ void SpreaderWorkingStateWorker::on_quoter_order_fill(SpreaderLegData& leg_data, _spreader->_compute_hedge_price_quantity(leg_data.leg_property_data().leg_index(), order_update_message.last_update_filled_price(), order_update_message.last_update_filled_quantity().value(), + order_update_message.last_reported_order_price(), q_idx, hedge_price, hedge_qty); From b12fb8c175453e321a2cf048b2aaf9a816aece27 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 15 Aug 2018 17:28:30 +0000 Subject: [PATCH 038/126] Implemented Jake's note on spread leg last px. --- .../orderman/actors/ExecutionGateway.cpp | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/server/sparkd/orderman/actors/ExecutionGateway.cpp b/src/server/sparkd/orderman/actors/ExecutionGateway.cpp index 97104015c..ef3fb07c7 100644 --- a/src/server/sparkd/orderman/actors/ExecutionGateway.cpp +++ b/src/server/sparkd/orderman/actors/ExecutionGateway.cpp @@ -203,11 +203,10 @@ void ExecutionGateway::on_exe_report( data->side = api::Side(msg.get()); if (msg.has()) data->time_in_force = - api::orderman::TimeInForce(msg.get()); + api::orderman::TimeInForce(msg.get()); else data->time_in_force = api::orderman::TIME_IN_FORCE_UNDEFINED; - - + data->order_type = api::orderman::NativeOrderType(msg.get()); data->order_status = @@ -218,14 +217,9 @@ void ExecutionGateway::on_exe_report( : api::orderman::MANUAL_ORDER_INDICATOR_YES; str_to(msg.get(), &data->exchange_order_id); - if (msg.has()) { - if (data->leg_security) - data->price = securities::decode_exchange_price( - *data->leg_security, Price(msg.get())); - else - data->price = securities::decode_exchange_price( - *sec, Price(msg.get())); - } + if (msg.has()) + data->price = securities::decode_exchange_price( + *sec, Price(msg.get())); else data->price = Price(os::nan()); @@ -239,18 +233,19 @@ void ExecutionGateway::on_exe_report( data->quantity = Quantity(msg.get()); else data->quantity = Quantity(0); - + data->filled_quantity = Quantity(msg.get()); data->last_shares = msg.has() ? Quantity(msg.get()) : Quantity(0); + auto last_px_sec = data->leg_security? data->leg_security:sec; data->last_price = msg.has() ? securities::decode_exchange_price( - *sec, Price(msg.get())) + *last_px_sec, Price(msg.get())) : Price(0); data->avg_price = msg.has() ? securities::decode_exchange_price( - *sec, Price(msg.get())) + *last_px_sec, Price(msg.get())) : Price(0); if (msg.has()) str_to(msg.get(), &data->exchange_fill_id); From 11211f463322e3bbb94e3b14101440b5a97733d7 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 15 Aug 2018 14:45:32 -0500 Subject: [PATCH 039/126] PnL - Pennies are back --- src/client/spark/view/Spark/PAndL/PAndLView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/view/Spark/PAndL/PAndLView.xaml b/src/client/spark/view/Spark/PAndL/PAndLView.xaml index 6eac65091..1ba3817a1 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLView.xaml +++ b/src/client/spark/view/Spark/PAndL/PAndLView.xaml @@ -19,7 +19,7 @@ - + From d0e0b2088cc69ed26440363a36510f542f868cc9 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 16 Aug 2018 10:33:53 -0500 Subject: [PATCH 040/126] cpp maintenance --- src/lib/config/defaults/cpp_config.conf | 51 +++++++++++++++---------- tools/cpp_helper/Generate-Cpps-reqs.ps1 | 2 +- tools/cpp_helper/Generate-Cpps.ps1 | 2 +- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/src/lib/config/defaults/cpp_config.conf b/src/lib/config/defaults/cpp_config.conf index 1e2f217d6..f33116c61 100644 --- a/src/lib/config/defaults/cpp_config.conf +++ b/src/lib/config/defaults/cpp_config.conf @@ -357,9 +357,6 @@ CppConfig cpp_entry { key: "BSW" value: 136 } cpp_entry { key: "BTC" value: 5 } cpp_entry { key: "BTT" value: 50 } - cpp_entry { key: "BU2" value: 20000 } - cpp_entry { key: "BU3" value: 30000 } - cpp_entry { key: "BU5" value: 50000 } cpp_entry { key: "BUC" value: 42000 } cpp_entry { key: "BUS" value: 20 } cpp_entry { key: "BUW" value: 20 } @@ -448,6 +445,7 @@ CppConfig cpp_entry { key: "DBB" value: 1000 } cpp_entry { key: "DBI" value: 1000 } cpp_entry { key: "DBL" value: 100 } + cpp_entry { key: "DBR" value: 1000 } cpp_entry { key: "DBT" value: 100 } cpp_entry { key: "DC" value: 2000 } cpp_entry { key: "DCB" value: 1000 } @@ -461,12 +459,13 @@ CppConfig cpp_entry { key: "DDO" value: 1000 } cpp_entry { key: "DEB" value: 744 } cpp_entry { key: "DEN" value: 250 } - cpp_entry { key: "DEP" value: 264 } + cpp_entry { key: "DEP" value: 276 } cpp_entry { key: "DES" value: 1000 } cpp_entry { key: "DFL" value: 100 } cpp_entry { key: "DFT" value: 100 } cpp_entry { key: "DG2" value: 100 } cpp_entry { key: "DG3" value: 100 } + cpp_entry { key: "DGH" value: 1000 } cpp_entry { key: "DGI" value: 100 } cpp_entry { key: "DGS" value: 100 } cpp_entry { key: "DGT" value: 100 } @@ -476,11 +475,17 @@ CppConfig cpp_entry { key: "DIH" value: 2500 } cpp_entry { key: "DJR" value: 100 } cpp_entry { key: "DKR" value: 1000 } + cpp_entry { key: "DMB" value: 100 } + cpp_entry { key: "DOB" value: 1000 } + cpp_entry { key: "DOP" value: 1000 } + cpp_entry { key: "DRB" value: 1000 } cpp_entry { key: "DRS" value: 100 } cpp_entry { key: "DSD" value: 1000 } cpp_entry { key: "DSE" value: 1000 } + cpp_entry { key: "DSG" value: 1000 } cpp_entry { key: "DSI" value: 1000 } cpp_entry { key: "DSM" value: 1000 } + cpp_entry { key: "DUA" value: 6350 } cpp_entry { key: "DUP" value: 1000 } cpp_entry { key: "DVE" value: 200 } cpp_entry { key: "DVT" value: 200 } @@ -498,7 +503,6 @@ CppConfig cpp_entry { key: "EAE" value: 5 } cpp_entry { key: "EAF" value: 1000 } cpp_entry { key: "EAW" value: 80 } - cpp_entry { key: "EB" value: 2500 } cpp_entry { key: "EBE" value: 1000 } cpp_entry { key: "ECD" value: 125000 } cpp_entry { key: "ECK" value: 4000000 } @@ -550,7 +554,6 @@ CppConfig cpp_entry { key: "EWG" value: 1000 } cpp_entry { key: "EWN" value: 1000 } cpp_entry { key: "EXR" value: 350000 } - cpp_entry { key: "F1E" value: 1000 } cpp_entry { key: "F1U" value: 1000 } cpp_entry { key: "F3" value: 1000 } cpp_entry { key: "FAL" value: 5 } @@ -612,6 +615,7 @@ CppConfig cpp_entry { key: "GDK" value: 2000 } cpp_entry { key: "GDL" value: 1000 } cpp_entry { key: "GE" value: 2500 } + cpp_entry { key: "GES" value: 1000 } cpp_entry { key: "GF" value: 500 } cpp_entry { key: "GFC" value: 1000 } cpp_entry { key: "GFT" value: 500 } @@ -621,8 +625,11 @@ CppConfig cpp_entry { key: "GKS" value: 1000 } cpp_entry { key: "GLB" value: 2500 } cpp_entry { key: "GLI" value: 100 } + cpp_entry { key: "GNB" value: 1000 } cpp_entry { key: "GNF" value: 440 } cpp_entry { key: "GNL" value: 80 } + cpp_entry { key: "GNO" value: 1000 } + cpp_entry { key: "GNS" value: 1000 } cpp_entry { key: "GOC" value: 7450 } cpp_entry { key: "GPS" value: 100 } cpp_entry { key: "GSI" value: 42000 } @@ -705,7 +712,7 @@ CppConfig cpp_entry { key: "IPT" value: 10 } cpp_entry { key: "IS" value: 5000 } cpp_entry { key: "ITB" value: 744 } - cpp_entry { key: "ITP" value: 264 } + cpp_entry { key: "ITP" value: 276 } cpp_entry { key: "IW" value: 5000 } cpp_entry { key: "J4L" value: 80 } cpp_entry { key: "J7" value: 6250000 } @@ -716,7 +723,7 @@ CppConfig cpp_entry { key: "JFB" value: 1000 } cpp_entry { key: "JFC" value: 1000 } cpp_entry { key: "JKM" value: 10000 } - cpp_entry { key: "JML" value: 40 } + cpp_entry { key: "JML" value: 440 } cpp_entry { key: "JNC" value: 1000 } cpp_entry { key: "JNG" value: 10000 } cpp_entry { key: "JNL" value: 80 } @@ -783,6 +790,7 @@ CppConfig cpp_entry { key: "MAB" value: 1000 } cpp_entry { key: "MAC" value: 833 } cpp_entry { key: "MAE" value: 100 } + cpp_entry { key: "MAF" value: 10 } cpp_entry { key: "MAS" value: 100 } cpp_entry { key: "MB" value: 1000 } cpp_entry { key: "MBB" value: 100000 } @@ -804,6 +812,7 @@ CppConfig cpp_entry { key: "ME" value: 42000 } cpp_entry { key: "MEB" value: 100 } cpp_entry { key: "MEE" value: 100 } + cpp_entry { key: "MEF" value: 10 } cpp_entry { key: "MEL" value: 840 } cpp_entry { key: "MEO" value: 100 } cpp_entry { key: "MEW" value: 100 } @@ -873,7 +882,6 @@ CppConfig cpp_entry { key: "MXL" value: 5 } cpp_entry { key: "MXR" value: 35000 } cpp_entry { key: "N1B" value: 1000 } - cpp_entry { key: "N1E" value: 1000 } cpp_entry { key: "N1U" value: 1000 } cpp_entry { key: "N3L" value: 80 } cpp_entry { key: "N3P" value: 80 } @@ -894,7 +902,7 @@ CppConfig cpp_entry { key: "NFG" value: 1000 } cpp_entry { key: "NFN" value: 2500 } cpp_entry { key: "NFO" value: 5 } - cpp_entry { key: "NG" value: 100 } + cpp_entry { key: "NG" value: 10000 } cpp_entry { key: "NGT" value: 10000 } cpp_entry { key: "NHH" value: 5000 } cpp_entry { key: "NHN" value: 2500 } @@ -1046,6 +1054,7 @@ CppConfig cpp_entry { key: "REB" value: 1000 } cpp_entry { key: "REX" value: 100 } cpp_entry { key: "RF" value: 125000 } + cpp_entry { key: "RGF" value: 349860 } cpp_entry { key: "RGI" value: 1000 } cpp_entry { key: "RGT" value: 50 } cpp_entry { key: "RHB" value: 1000 } @@ -1071,7 +1080,7 @@ CppConfig cpp_entry { key: "SBT" value: 5000 } cpp_entry { key: "SD" value: 1000 } cpp_entry { key: "SDA" value: 250 } - cpp_entry { key: "SDD" value: 1680 } + cpp_entry { key: "SDD" value: 1840 } cpp_entry { key: "SDG" value: 250 } cpp_entry { key: "SDI" value: 1000 } cpp_entry { key: "SDM" value: 100 } @@ -1087,6 +1096,7 @@ CppConfig cpp_entry { key: "SG" value: 250 } cpp_entry { key: "SGB" value: 1000 } cpp_entry { key: "SGE" value: 42000 } + cpp_entry { key: "SGF" value: 1000 } cpp_entry { key: "SGG" value: 1000 } cpp_entry { key: "SGT" value: 250 } cpp_entry { key: "SI" value: 5000 } @@ -1103,7 +1113,7 @@ CppConfig cpp_entry { key: "SP" value: 250 } cpp_entry { key: "SR1" value: 4167 } cpp_entry { key: "SR3" value: 2500 } - cpp_entry { key: "SRT" value: 1680 } + cpp_entry { key: "SRT" value: 1840 } cpp_entry { key: "SSI" value: 1000 } cpp_entry { key: "SSP" value: 5000 } cpp_entry { key: "SSW" value: 1000 } @@ -1114,28 +1124,27 @@ CppConfig cpp_entry { key: "STY" value: 1000 } cpp_entry { key: "SU" value: 250 } cpp_entry { key: "SUT" value: 250 } - cpp_entry { key: "T01" value: 800 } - cpp_entry { key: "T02" value: 800 } - cpp_entry { key: "T03" value: 800 } - cpp_entry { key: "T06" value: 800 } - cpp_entry { key: "T07" value: 800 } cpp_entry { key: "T08" value: 800 } cpp_entry { key: "T09" value: 800 } cpp_entry { key: "T10" value: 800 } cpp_entry { key: "T13" value: 800 } - cpp_entry { key: "T1E" value: 1000 } + cpp_entry { key: "T14" value: 800 } + cpp_entry { key: "T15" value: 800 } + cpp_entry { key: "T16" value: 800 } + cpp_entry { key: "T17" value: 800 } cpp_entry { key: "T1U" value: 1000 } cpp_entry { key: "T20" value: 800 } + cpp_entry { key: "T21" value: 800 } + cpp_entry { key: "T22" value: 800 } cpp_entry { key: "T23" value: 800 } cpp_entry { key: "T24" value: 800 } - cpp_entry { key: "T25" value: 800 } - cpp_entry { key: "T26" value: 800 } cpp_entry { key: "T27" value: 800 } + cpp_entry { key: "T28" value: 800 } + cpp_entry { key: "T29" value: 800 } cpp_entry { key: "T2B" value: 1000 } cpp_entry { key: "T2D" value: 1000 } cpp_entry { key: "T2M" value: 100 } cpp_entry { key: "T30" value: 800 } - cpp_entry { key: "T31" value: 800 } cpp_entry { key: "T3B" value: 1000 } cpp_entry { key: "T3L" value: 80 } cpp_entry { key: "T4B" value: 1000 } diff --git a/tools/cpp_helper/Generate-Cpps-reqs.ps1 b/tools/cpp_helper/Generate-Cpps-reqs.ps1 index bcdf10e21..056fbb24f 100644 --- a/tools/cpp_helper/Generate-Cpps-reqs.ps1 +++ b/tools/cpp_helper/Generate-Cpps-reqs.ps1 @@ -14,7 +14,7 @@ $known_good = @{ "HO" = 42000 "LE" = 400 "M6E" = 125 - "NG" = 100 + "NG" = 10000 "NQ" = 20 "QM" = 500 "RB" = 42000 diff --git a/tools/cpp_helper/Generate-Cpps.ps1 b/tools/cpp_helper/Generate-Cpps.ps1 index 77ec00238..a7a71a1fe 100644 --- a/tools/cpp_helper/Generate-Cpps.ps1 +++ b/tools/cpp_helper/Generate-Cpps.ps1 @@ -32,4 +32,4 @@ Remove-Item $csv_save_path -Force # You can now copy the output file to defaults assuming all looks good # Copy-Item .\cpp_config.conf ..\..\src\lib\config\defaults\ -Force -# Remove-Item cpp-config.conf \ No newline at end of file +# Remove-Item cpp_config.conf \ No newline at end of file From b4908ac15522662a4407b24bf890dfcb9d65470c Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 16 Aug 2018 14:02:01 -0500 Subject: [PATCH 041/126] the great cpp fixup --- src/lib/config/defaults/cpp_config.conf | 48 ++++++++++++------------ tools/cpp_helper/Generate-Cpps-reqs.ps1 | 49 +++++++++---------------- 2 files changed, 42 insertions(+), 55 deletions(-) diff --git a/src/lib/config/defaults/cpp_config.conf b/src/lib/config/defaults/cpp_config.conf index f33116c61..0f4fb61f8 100644 --- a/src/lib/config/defaults/cpp_config.conf +++ b/src/lib/config/defaults/cpp_config.conf @@ -62,11 +62,11 @@ CppConfig cpp_entry { key: "5Y" value: 42000 } cpp_entry { key: "5ZN" value: 2500 } cpp_entry { key: "63" value: 1000 } - cpp_entry { key: "6A" value: 1000 } - cpp_entry { key: "6B" value: 625 } + cpp_entry { key: "6A" value: 100000 } + cpp_entry { key: "6B" value: 62500 } cpp_entry { key: "6C" value: 100000 } - cpp_entry { key: "6E" value: 1250 } - cpp_entry { key: "6J" value: 1250 } + cpp_entry { key: "6E" value: 125000 } + cpp_entry { key: "6J" value: 12500000 } cpp_entry { key: "6L" value: 100000 } cpp_entry { key: "6M" value: 500000 } cpp_entry { key: "6N" value: 100000 } @@ -662,7 +662,7 @@ CppConfig cpp_entry { key: "HB" value: 2500 } cpp_entry { key: "HE" value: 400 } cpp_entry { key: "HET" value: 400 } - cpp_entry { key: "HG" value: 5000 } + cpp_entry { key: "HG" value: 25000 } cpp_entry { key: "HG0" value: 25000 } cpp_entry { key: "HGS" value: 25000 } cpp_entry { key: "HGT" value: 25000 } @@ -700,20 +700,20 @@ CppConfig cpp_entry { key: "IBE" value: 1000 } cpp_entry { key: "IBS" value: 1000 } cpp_entry { key: "IBV" value: 1 } - cpp_entry { key: "IC" value: 5000 } + cpp_entry { key: "IC" value: 50 } cpp_entry { key: "ICI" value: 1000 } cpp_entry { key: "IDL" value: 5 } - cpp_entry { key: "IH" value: 5000 } + cpp_entry { key: "IH" value: 50 } cpp_entry { key: "ILB" value: 1750 } cpp_entry { key: "ILS" value: 1000000 } cpp_entry { key: "IN" value: 2500 } - cpp_entry { key: "IP" value: 5000 } + cpp_entry { key: "IP" value: 50 } cpp_entry { key: "IPO" value: 10 } cpp_entry { key: "IPT" value: 10 } - cpp_entry { key: "IS" value: 5000 } + cpp_entry { key: "IS" value: 50 } cpp_entry { key: "ITB" value: 744 } cpp_entry { key: "ITP" value: 276 } - cpp_entry { key: "IW" value: 5000 } + cpp_entry { key: "IW" value: 50 } cpp_entry { key: "J4L" value: 80 } cpp_entry { key: "J7" value: 6250000 } cpp_entry { key: "JA" value: 1000 } @@ -751,8 +751,8 @@ CppConfig cpp_entry { key: "K5" value: 20 } cpp_entry { key: "K5K" value: 20 } cpp_entry { key: "K5N" value: 20 } - cpp_entry { key: "KE" value: 5000 } - cpp_entry { key: "KET" value: 5000 } + cpp_entry { key: "KE" value: 50 } + cpp_entry { key: "KET" value: 50 } cpp_entry { key: "KQ" value: 20 } cpp_entry { key: "KQK" value: 20 } cpp_entry { key: "KQN" value: 20 } @@ -785,7 +785,7 @@ CppConfig cpp_entry { key: "M5F" value: 10 } cpp_entry { key: "M6A" value: 10000 } cpp_entry { key: "M6B" value: 6250 } - cpp_entry { key: "M6E" value: 125 } + cpp_entry { key: "M6E" value: 12500 } cpp_entry { key: "MAA" value: 100 } cpp_entry { key: "MAB" value: 1000 } cpp_entry { key: "MAC" value: 833 } @@ -803,7 +803,7 @@ CppConfig cpp_entry { key: "MCC" value: 1000 } cpp_entry { key: "MCD" value: 10000 } cpp_entry { key: "MCT" value: 80 } - cpp_entry { key: "MCX" value: 5000 } + cpp_entry { key: "MCX" value: 50 } cpp_entry { key: "MDB" value: 100 } cpp_entry { key: "MDD" value: 5 } cpp_entry { key: "MDL" value: 80 } @@ -839,7 +839,7 @@ CppConfig cpp_entry { key: "MJN" value: 100 } cpp_entry { key: "MJP" value: 25 } cpp_entry { key: "MJY" value: 1250000 } - cpp_entry { key: "MKC" value: 1000 } + cpp_entry { key: "MKC" value: 10 } cpp_entry { key: "MLD" value: 80 } cpp_entry { key: "MM" value: 1000 } cpp_entry { key: "MME" value: 100 } @@ -876,7 +876,7 @@ CppConfig cpp_entry { key: "MTI" value: 80 } cpp_entry { key: "MTS" value: 100 } cpp_entry { key: "MUD" value: 100 } - cpp_entry { key: "MWE" value: 5000 } + cpp_entry { key: "MWE" value: 50 } cpp_entry { key: "MX" value: 1000 } cpp_entry { key: "MXB" value: 35000 } cpp_entry { key: "MXL" value: 5 } @@ -1077,7 +1077,7 @@ CppConfig cpp_entry { key: "RY" value: 125000 } cpp_entry { key: "RYA" value: 42000 } cpp_entry { key: "S1U" value: 1000 } - cpp_entry { key: "SBT" value: 5000 } + cpp_entry { key: "SBT" value: 50 } cpp_entry { key: "SD" value: 1000 } cpp_entry { key: "SDA" value: 250 } cpp_entry { key: "SDD" value: 1840 } @@ -1265,7 +1265,7 @@ CppConfig cpp_entry { key: "WHD" value: 1000 } cpp_entry { key: "WMB" value: 1000 } cpp_entry { key: "WMD" value: 1000 } - cpp_entry { key: "WMK" value: 5000 } + cpp_entry { key: "WMK" value: 50 } cpp_entry { key: "WMR" value: 1000 } cpp_entry { key: "WNC" value: 1000 } cpp_entry { key: "WNT" value: 1000 } @@ -1292,13 +1292,13 @@ CppConfig cpp_entry { key: "XAV" value: 100 } cpp_entry { key: "XAY" value: 100 } cpp_entry { key: "XBT" value: 100 } - cpp_entry { key: "XC" value: 1000 } + cpp_entry { key: "XC" value: 10 } cpp_entry { key: "XER" value: 1000 } cpp_entry { key: "XET" value: 100 } cpp_entry { key: "XFT" value: 250 } cpp_entry { key: "XH" value: 2500 } cpp_entry { key: "XIT" value: 100 } - cpp_entry { key: "XK" value: 1000 } + cpp_entry { key: "XK" value: 10 } cpp_entry { key: "XKT" value: 100 } cpp_entry { key: "XPP" value: 80 } cpp_entry { key: "XPT" value: 100 } @@ -1307,7 +1307,7 @@ CppConfig cpp_entry { key: "XRT" value: 250 } cpp_entry { key: "XUT" value: 100 } cpp_entry { key: "XVT" value: 100 } - cpp_entry { key: "XW" value: 1000 } + cpp_entry { key: "XW" value: 10 } cpp_entry { key: "XX" value: 2500 } cpp_entry { key: "XYT" value: 100 } cpp_entry { key: "YF" value: 42000 } @@ -1372,7 +1372,7 @@ CppConfig cpp_entry { key: "ZC9906" value: 1000 } cpp_entry { key: "ZC9909" value: 1000 } cpp_entry { key: "ZC9912" value: 1000 } - cpp_entry { key: "ZCT" value: 5000 } + cpp_entry { key: "ZCT" value: 50 } cpp_entry { key: "ZD0030" value: 1000 } cpp_entry { key: "ZD9112" value: 1000 } cpp_entry { key: "ZD9115" value: 1000 } @@ -1401,12 +1401,12 @@ CppConfig cpp_entry { key: "ZMT" value: 100 } cpp_entry { key: "ZN" value: 1000 } cpp_entry { key: "ZNC" value: 25 } - cpp_entry { key: "ZO" value: 5000 } + cpp_entry { key: "ZO" value: 50 } cpp_entry { key: "ZQ" value: 4167 } cpp_entry { key: "ZR" value: 2000 } cpp_entry { key: "ZS" value: 50 } cpp_entry { key: "ZT" value: 2000 } cpp_entry { key: "ZW" value: 50 } - cpp_entry { key: "ZWT" value: 5000 } + cpp_entry { key: "ZWT" value: 50 } } } diff --git a/tools/cpp_helper/Generate-Cpps-reqs.ps1 b/tools/cpp_helper/Generate-Cpps-reqs.ps1 index 056fbb24f..07d324706 100644 --- a/tools/cpp_helper/Generate-Cpps-reqs.ps1 +++ b/tools/cpp_helper/Generate-Cpps-reqs.ps1 @@ -1,36 +1,23 @@ $known_good = @{ - "6A" = 1000 - "6B" = 625 - "6D" = 1000 - "6E" = 1250 - "6J" = 1250 - "CL" = 1000 - "EMD" = 100 - "ES" = 50 - "GC" = 100 - "GE" = 2500 - "HE" = 400 - "HG" = 5000 - "HO" = 42000 - "LE" = 400 - "M6E" = 125 - "NG" = 10000 - "NQ" = 20 - "QM" = 500 - "RB" = 42000 - "RTY" = 50 - "SI" = 5000 - "VX" = 1000 - "YI" = 10 - "YM" = 5 - "ZB" = 1000 + "IC" = 50 + "IH" = 50 + "IP" = 50 + "IS" = 50 + "IW" = 50 + "KE" = 50 + "KET" = 50 + "MCX" = 50 + "MKC" = 10 + "MWE" = 50 + "SBT" = 50 + "WMK" = 50 + "XC" = 10 + "XK" = 10 + "XW" = 10 "ZC" = 50 - "ZF" = 1000 - "ZL" = 600 - "ZM" = 100 - "ZN" = 1000 - "ZQ" = 4167 + "ZO" = 50 "ZS" = 50 - "ZT" = 2000 "ZW" = 50 + "ZCT" = 50 + "ZWT" = 50 } \ No newline at end of file From 3812783b29e4f7c8fdfd094b602953a0d18b356c Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Thu, 16 Aug 2018 15:36:02 -0400 Subject: [PATCH 042/126] added logs in TriggerOrder to caputure initial md state --- src/server/sparkd/orderman/orders/TriggerOrder.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/server/sparkd/orderman/orders/TriggerOrder.cpp b/src/server/sparkd/orderman/orders/TriggerOrder.cpp index c5d1d2721..62098f1a3 100644 --- a/src/server/sparkd/orderman/orders/TriggerOrder.cpp +++ b/src/server/sparkd/orderman/orders/TriggerOrder.cpp @@ -251,6 +251,12 @@ bool TriggerOrder::_on_init_new(const api::orderman::OrderDefinition& order_def, const auto* sec_ptr = pre_os.sec_db.resolve(SecurityKey(order_def.security_key())); me->tick_size=std::min(sec_ptr->contract_spec().low_tick(), sec_ptr->contract_spec().high_tick()); + LOG(OrderMan, Info, "TriggerOrder::_on_init_new key:{} state:{} " + "trigger_price_type:{} child_order_price:{}", + key(),_state, + trigger_order_def.trigger_condition().price_type(), + trigger_order_def.trigger_action().price()); + return true; } void TriggerOrder::_report_state(){ @@ -326,6 +332,12 @@ void TriggerOrder::_observe_market_once(){ if(obs_md != nullptr && obs_md->size()>0){ me->market_observed_once=true; me->trigger_above_market=_trigger_price()>=obs_md->price(); + LOG(OrderMan, Info, "TriggerOrder::_observe_market_once " + "key:{} state:{} " + "md_p:{} md_q:{} trigger_above_md:{}", + key(),_state, + obs_md->price(), obs_md->size(), + me->trigger_above_market); } } } From a17d54f6a0ed326dedc173d149945c51b9bddea4 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 16 Aug 2018 16:26:30 -0500 Subject: [PATCH 043/126] SPARK-1554 --- src/client/spark/view/Controls/Badge.cs | 79 ++++++++++++++++--- .../spark/view/Spark/Ladder/LadderOrderVM.cs | 12 ++- .../spark/view/Spark/Ladder/LadderVM.cs | 21 +++++ .../spark/view/Spark/Ladder/LadderView.xaml | 2 + 4 files changed, 99 insertions(+), 15 deletions(-) diff --git a/src/client/spark/view/Controls/Badge.cs b/src/client/spark/view/Controls/Badge.cs index 938595425..c4dc779b0 100644 --- a/src/client/spark/view/Controls/Badge.cs +++ b/src/client/spark/view/Controls/Badge.cs @@ -1,10 +1,12 @@ using bts.api; +using bts.api.orderman; using mbts.spark; using mbts.ui.utility.text; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Globalization; +using System.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Data; @@ -31,8 +33,10 @@ namespace mbts.ui.controls { static ConcurrentDictionary<(Point p1, Point p2, Point p3), StreamGeometry> _sg_cache = new ConcurrentDictionary<(Point p1, Point p2, Point p3), StreamGeometry>(); readonly GlyphContentRect _gcr = new GlyphContentRect(); - Brush _background, _foreground, _border_brush; + Brush _background, _foreground, _border_brush, _parent_algo_type_brush; bool _is_exchange_order, _is_multiple_orders_at_level, _is_hedge_order; + CustomOrderDefinition.CustomOneofCase _parent_algo_type; + static Badge() { DefaultStyleKeyProperty.OverrideMetadata(typeof(Badge), new FrameworkPropertyMetadata(typeof(Badge))); @@ -222,6 +226,30 @@ namespace mbts.ui.controls { (b, v) => b._is_multiple_orders_at_level = v, false); + public CustomOrderDefinition.CustomOneofCase ParentAlgoType { + get { return (CustomOrderDefinition.CustomOneofCase)GetValue(ParentAlgoTypeProperty); } + set { SetValue(ParentAlgoTypeProperty, value); } + } + + public static readonly DependencyProperty ParentAlgoTypeProperty = + WPFHelper.create_dp( + nameof(ParentAlgoType), + FrameworkPropertyMetadataOptions.AffectsRender, + (b, v) => b._parent_algo_type = v, + CustomOrderDefinition.CustomOneofCase.None); + + public Brush ParentAlgoTypeBrush { + get { return (Brush)GetValue(ParentAlgoTypeBrushProperty); } + set { SetValue(ParentAlgoTypeBrushProperty, value); } + } + + public static readonly DependencyProperty ParentAlgoTypeBrushProperty = + WPFHelper.create_dp( + nameof(ParentAlgoTypeBrush), + FrameworkPropertyMetadataOptions.AffectsRender, + (b, v) => b._parent_algo_type_brush = v, + Brushes.White); + public bool IsHedgeOrder { get { return (bool)GetValue(IsHedgeOrderProperty); } set { SetValue(IsHedgeOrderProperty, value); } @@ -243,16 +271,12 @@ namespace mbts.ui.controls { protected override void OnRender(DrawingContext dc) { base.OnRender(dc); + // this is the main badge rectangle double border_thickness = BorderThickness.Top; Pen pen; (pen = new Pen(BorderBrush, border_thickness)).Freeze(); dc.DrawRoundedRectangle(Background, pen, new Rect(0, border_thickness, _gcr.layout_size.Width, _gcr.layout_size.Height), CornerRadius, CornerRadius); - if (IsExchangeOrder) { - // for the y-component, since we start the RoundedRectangle at border_thickness, we have to include that in our y pos start position as well. - (pen = new Pen(Brushes.Black, border_thickness)).Freeze(); - dc.DrawEllipse(Brushes.Black, pen, new Point(_gcr.layout_size.Width - 2 * border_thickness - CornerRadius, 0 + border_thickness + 2 * border_thickness + CornerRadius), 2, 2); - } if (IsMultipleOrdersAtLevel) { _draw_triangle( @@ -261,15 +285,44 @@ namespace mbts.ui.controls { new Point(_gcr.layout_size.Width - (2 * border_thickness - CornerRadius) - 5, _gcr.layout_size.Height), // bottom left Brushes.IndianRed ); + } else { + if (IsExchangeOrder) { + // for the y-component, since we start the main badge RoundedRectangle at border_thickness, + // we have to include that in our y pos start position as well. + (pen = new Pen(Brushes.Black, border_thickness)).Freeze(); + dc.DrawEllipse(Brushes.Black, pen, new Point(_gcr.layout_size.Width - 2 * border_thickness - CornerRadius, 0 + border_thickness + 2 * border_thickness + CornerRadius), 2, 2); + } + if (IsHedgeOrder) { + (pen = new Pen(Brushes.Black, border_thickness)).Freeze(); + dc.DrawLine(pen, + new Point(2 * border_thickness, 0 + 2 * border_thickness), + new Point(2 * border_thickness, _gcr.layout_size.Height) + ); + } + if (ParentAlgoType != CustomOrderDefinition.CustomOneofCase.None) { + dc.DrawRectangle(ParentAlgoTypeBrush, null, new Rect(4 * border_thickness, 0 + 2 * border_thickness, 10, _gcr.layout_size.Height - 2 * border_thickness)); + //var chars = Enumerable.Range('A', 26).Select(x => (char)x).ToArray(); + //var text = new string(chars); + var palgo_type_name = utility.EnumHelper.get_display_name(ParentAlgoType); + if (palgo_type_name.Length > 1) { + var palgo_letter = palgo_type_name.Substring(0, 1); + var a_glyph_context = TextUtils.StandardGlyphContext; + var a_glyph_run = a_glyph_context.get_glyph_run( + palgo_letter, + 12, + _gcr.layout_size.Width, + _gcr.layout_size.Height, + HorizontalAlignment.Left, + 4 * border_thickness + 1, + VerticalAlignment.Center, + 0); + dc.DrawGlyphRun(Brushes.Black, a_glyph_run); + } + } + + } - if (IsHedgeOrder) { - (pen = new Pen(Brushes.Black, border_thickness)).Freeze(); - dc.DrawLine(pen, - new Point(2 * border_thickness, 0 + 2 * border_thickness), - new Point(2 * border_thickness, _gcr.layout_size.Height) - ); - } var gr = _gcr.glyph_run; if (gr != null) diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 3d9340574..5f788c0f3 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -34,8 +34,9 @@ namespace mbts.spark { readonly Property _font_family; readonly Property _font_weight; readonly Property _font_size; - readonly Property _foreground, _background, _hoverbackground, _border; + readonly Property _foreground, _background, _hoverbackground, _border, _parent_algo_type_brush; readonly Property _is_exchange_order, _is_multiple_orders_at_same_level, _is_hedge_order; + readonly Property _parent_algo_type; readonly Property _summary, _description; IObservable _bs; LadderSettings.BadgeStyle _current_badge_style; @@ -66,6 +67,8 @@ namespace mbts.spark { _is_exchange_order = backing(nameof(is_exchange_order), false); _is_multiple_orders_at_same_level = backing(nameof(is_multiple_orders_at_same_level), false); _is_hedge_order = backing(nameof(is_hedge_order), false); + _parent_algo_type = backing(nameof(parent_algo_type), CustomOrderDefinition.CustomOneofCase.None); + _parent_algo_type_brush = backing(nameof(parent_algo_type_brush), _color_bg_brush); FontFamily get_font_family(LadderSettings s) => new FontFamily(s.orders_column.font_family); FontWeight get_font_weight(LadderSettings s) => ui.utility.text.TextUtils.from_open_type_weight_safe(s.orders_column.font_weight); double get_font_size(LadderSettings s) => s.orders_column.font_size; @@ -93,6 +96,8 @@ namespace mbts.spark { var darker = BTSColor.darken2(color.R, color.G, color.B, 0.75); Color dark = new Color() { A = 255, R = darker.r, G = darker.g, B = darker.b }; //var completion = _parent_and_child_not_sharing_slot().Sum(order => OrderUtils.filled(order)) / _parent_and_child_not_sharing_slot().Sum(order => OrderUtils.quantity(order)); + bts.spark.OrderMetadata parent_algo_metadata = _parent.model.order_gateway.factory.get_metadata(parent_algo_type); + parent_algo_type_brush = parent_algo_metadata.Color.rgb_brush(); background = _color_bg_brush; //mkbrush(color, _colorbg, 0); hoverbackground = mkbrush(dark, _darkbg, 0); border = new SolidColorBrush(color); @@ -103,7 +108,7 @@ namespace mbts.spark { // TODO: call the appropriate taha-provided function for is_exchange_order in the future is_exchange_order = taha_function_stub(); is_multiple_orders_at_same_level = _orders.Count > 1; - is_hedge_order = _orders.All(o => o.Value.sub_type() == OrderSubType.HedgingLeg); + is_hedge_order = _orders.Any(o => o.Value.sub_type() == OrderSubType.HedgingLeg); if (_orders.Count > 0) { @@ -178,6 +183,9 @@ namespace mbts.spark { public bool is_exchange_order { get => _is_exchange_order.Value; private set => _is_exchange_order.Value = value; } public bool is_multiple_orders_at_same_level { get => _is_multiple_orders_at_same_level.Value; private set => _is_multiple_orders_at_same_level.Value = value; } public bool is_hedge_order { get => _is_hedge_order.Value; private set => _is_hedge_order.Value = value; } + public Brush parent_algo_type_brush { get => _parent_algo_type_brush.Value; private set => _parent_algo_type_brush.Value = value; } + // the setter is public so that the LadderVM can set this field + public CustomOrderDefinition.CustomOneofCase parent_algo_type { get => _parent_algo_type.Value; set => _parent_algo_type.Value = value; } public IEnumerable orders => _orders.Values; diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index 5ea6cc9d2..73439b1a9 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -122,6 +122,27 @@ namespace mbts.spark { // update dirty brushes and text foreach (var lovm in _slot_price_vs_orders.Values) { + // the parent algo is only valid when there is only a single order at a level + if (lovm.orders.Count() == 1) { + var only_order = lovm.orders.First(); + + if (only_order.has_parent()) { + var traversal_candidate = only_order; + bool exit_early = false; + while (!exit_early && traversal_candidate.ParentKey != 0) { + // TODO this needs to be a hashtable lookup + var found_parent = working.Where(o => o.Key == traversal_candidate.ParentKey); + if (found_parent.Count() == 1) + traversal_candidate = found_parent.First().Value; + else + exit_early = true; + } + if (!exit_early) + // we have successfully reached the root + lovm.parent_algo_type = traversal_candidate.Def.CustomDef.CustomCase; + } + // else this a single order, so do nothing + } lovm.update(); } diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml b/src/client/spark/view/Spark/Ladder/LadderView.xaml index 7521f3a9d..2e406aea6 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml @@ -454,6 +454,8 @@ + + From f42af15fe1dd0441dfabcbe2d874d3c018c8d794 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 16 Aug 2018 21:13:22 -0400 Subject: [PATCH 044/126] SPARK-1546 Trigger Order exit condition --- .../Orders/OrderTypeVMs/TriggerOrderVM.cs | 237 ++++++++++-------- .../spark/core/Utility/ViewModelBase.cs | 17 ++ .../Order/OrderDetailsPopupControl.xaml | 175 ++++++++++--- .../Order/OrderDetailsPopupControl.xaml.cs | 20 +- .../view/Controls/TickUpDown/TickUpDownInt.cs | 39 ++- src/client/spark/view/Utility/WPFHelper.cs | 6 + 6 files changed, 355 insertions(+), 139 deletions(-) diff --git a/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs index 8b6063a6a..328d9cd40 100644 --- a/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/TriggerOrderVM.cs @@ -11,72 +11,97 @@ using System.Linq; using System.Reactive.Linq; using static bts.api.orderman.CustomOrderDefinition; -namespace mbts.spark -{ - static partial class OrderTypeVMFactory - { - class InlineTriggerOrderProperties - { - public InlineTriggerOrderProperties (CustomOneofCase selected_child_order_type, IReadOnlyCollection child_order_types) - { +namespace mbts.spark { + static partial class OrderTypeVMFactory { + class InlineTriggerOrderProperties { + public readonly InlineUserProperty selected_child_order_type; + public readonly InlineUserProperty> child_order_types; + public readonly InlineUserProperty trigger_price_type; + public readonly InlineUserProperty payup_price_type; + public readonly InlineUserProperty fixed_price; + public readonly InlineUserProperty payup_ticks; + public readonly InlineUserProperty use_fixed_price, is_priceout_checked, is_timeout_checked; + public readonly InlineUserProperty timeout_secs; + + public InlineTriggerOrderProperties(CustomOneofCase selected_child_order_type, IReadOnlyCollection child_order_types) { ExceptionAssert.InvalidOperation.That(child_order_types.Contains(selected_child_order_type), $"Child order type {selected_child_order_type} is not in child_order_types"); this.selected_child_order_type = new InlineUserProperty(selected_child_order_type, true); this.child_order_types = new InlineUserProperty>(child_order_types, true); - trigger_price_type = new InlineUserProperty(TriggerPriceType.Bid, false); - order_price = new InlineUserProperty(double.NaN, true); + payup_price_type = new InlineUserProperty(); + use_fixed_price = new InlineUserProperty(false); + fixed_price = new InlineUserProperty(); + payup_ticks = new InlineUserProperty(); + is_priceout_checked = new InlineUserProperty(); + is_timeout_checked = new InlineUserProperty(); + timeout_secs = new InlineUserProperty(10); } - public readonly InlineUserProperty selected_child_order_type; - public readonly InlineUserProperty> child_order_types; - - public readonly InlineUserProperty trigger_price_type; - public readonly InlineUserProperty order_price; } - class TriggerOrderVM : OrderTypeVMBase, IHierarchicalOrderTypeVM, IDisposable - { + class TriggerOrderVM : OrderTypeVMBase, IHierarchicalOrderTypeVM, IDisposable { readonly IObservable _security_md_source; - SecurityImmutable? _security; + readonly UserProperty _payup_price_type; + readonly UserProperty _trigger_price_type; + readonly UserProperty _fixed_price; + readonly UserProperty _payup_ticks, _timeout_secs; + readonly UserProperty _use_fixed_price, _is_timeout_checked, _is_priceout_checked; + SecurityMD? _security_md; + SecurityImmutable? _security => _security_md.HasValue ? _security_md.Value.security : null; ObservableCollection _order_types = new ObservableCollection(); ObservableAutoWrapper _child_order_choices; InlineTriggerOrderProperties _inline_props; IOrderTypeVM _child_order; IDisposable _dispose, _child_order_errors_sub; - - public TriggerPriceType trigger_price_type { get; set; } = TriggerPriceType.Bid; - public double order_price { get; set; } = double.NaN; + ulong _bbo_ref = 0, _last_trade_ref = 0; + double _best_bid = double.NaN, _best_ask = double.NaN, _last_trade_price = double.NaN; public TriggerOrderVM(OrdersModel model, IObservable security_md_source) : this(model, security_md_source, security_md_source.Select(smd => new InlineTriggerOrderProperties(model.factory.default_order_type(smd.security), model.factory.default_order_types(smd.security).ToList()))) { } - public TriggerOrderVM(OrdersModel model, IObservable security_md_source, - IObservable inline_properties) : base(model) - { + public TriggerOrderVM(OrdersModel model, IObservable security_md_source, IObservable inline_properties) : base(model) { + _trigger_price_type = user_backing(nameof(trigger_price_type), TriggerPriceType.Bid); + _use_fixed_price = user_backing(nameof(use_fixed_price), true); + _fixed_price = user_backing(nameof(fixed_price), double.NaN); + _payup_price_type = user_backing(nameof(payup_price_type), TriggerPayupPrice.Types.TriggerPayupPriceType.Trigger); + _payup_ticks = user_backing(nameof(payup_ticks), 0); + _is_priceout_checked = user_backing(nameof(is_priceout_checked), false); + _is_timeout_checked = user_backing(nameof(is_timeout_checked), false); + _timeout_secs = user_backing(nameof(timeout_secs), 0); _security_md_source = security_md_source; _dispose = Disposable.Create( security_md_source.OnDispatcher() - .Subscribe(smd => _security = smd.security), + .Subscribe(smd => { + _security_md = smd; + _refresh_md(); + if (double.IsNaN(fixed_price) || !_fixed_price.setter_called) { + switch (trigger_price_type) { + case TriggerPriceType.Bid: _fixed_price.bypass_setter(_best_bid); break; + case TriggerPriceType.Ask: _fixed_price.bypass_setter(_best_ask); break; + case TriggerPriceType.LastTradePrice: _fixed_price.bypass_setter(_last_trade_price); break; + } + } + }), inline_properties.OnDispatcher() .Subscribe(p => { - if (_order_types.Count == 0 || p.child_order_types.force_override) - { + if (_order_types.Count == 0 || p.child_order_types.force_override) { _order_types.SetItems(p.child_order_types.value); } - if (_child_order_choices != null && (_child_order == null || p.selected_child_order_type.force_override)) - { + if (_child_order_choices != null && (_child_order == null || p.selected_child_order_type.force_override)) { _select_child_order(p.selected_child_order_type.value); - } - if (p.trigger_price_type.force_override) - { - trigger_price_type = p.trigger_price_type.value; - RaisePropertyChanged(nameof(trigger_price_type)); } - if (p.order_price.force_override) - { - order_price = p.order_price.value; - RaisePropertyChanged(nameof(order_price)); - } + // trigger price + _trigger_price_type.on_inline_prop(p.trigger_price_type); + // fixed price + _use_fixed_price.on_inline_prop(p.use_fixed_price); + _fixed_price.on_inline_prop(p.fixed_price); + // payup + _payup_price_type.on_inline_prop(p.payup_price_type); + _payup_ticks.on_inline_prop(p.payup_ticks); + // exit + _is_priceout_checked.on_inline_prop(p.is_priceout_checked); + _is_timeout_checked.on_inline_prop(p.is_timeout_checked); + _timeout_secs.on_inline_prop(p.timeout_secs); _inline_props = p; _validate(); }) @@ -84,65 +109,39 @@ namespace mbts.spark _validate(); } - public IEnumerable trigger_price_types => EnumHelper.get_values_except(TriggerPriceType.LastTradePrice); - - public override void assign_to(CustomOrderDefinition value) - { - if (_child_order == null) - _select_child_order(model.factory.default_order_type(_security.Value, true)); - _validate(); - if (!HasErrors) - { - var i = factory.trigger_order(); - i.TriggerCondition = new TriggerCondition() - { - PriceType = trigger_price_type, - AbsolutePriceTrigger = new AbsolutePriceTrigger() { TriggerQuantity = new TriggerQuantity() } - }; - i.TriggerAction = new TriggerAction() - { - Price = order_price, - SecurityId = _security.Value.Id - }; - child_order.assign_to(i.Child); - value.Trigger = i; - } - } - - public double price_tick - { - get { return _security.Value.ContractSpec.LowTick; } - } - - public ContractSpecificationImmutable spec - { - get { return _security.Value.ContractSpec; } - } - - public ICollection child_order_types - { - get - { - if (_child_order_choices == null) + // trigger price + public IEnumerable trigger_price_types => EnumHelper.get_values_except(TriggerPriceType.LastTradePrice); + public TriggerPriceType trigger_price_type { get => _trigger_price_type.Value; set => _trigger_price_type.Value = value; } + // fixed price + public bool use_fixed_price { get => _use_fixed_price.Value; set => _use_fixed_price.Value = value; } + public double fixed_price { get => _fixed_price.Value; set => _fixed_price.Value = value; } + // payup + public IEnumerable payup_price_types => EnumHelper.get_values(); + public TriggerPayupPrice.Types.TriggerPayupPriceType payup_price_type { get => _payup_price_type.Value; set => _payup_price_type.Value = value; } + public int payup_ticks { get => _payup_ticks.Value; set => _payup_ticks.Value = value; } + // exit + public bool is_priceout_checked { get => _is_priceout_checked.Value; set => _is_priceout_checked.Value = value; } + public bool is_timeout_checked { get => _is_timeout_checked.Value; set => _is_timeout_checked.Value = value; } + public int timeout_secs { get => _timeout_secs.Value; set => _timeout_secs.Value = value; } + // + public ContractSpecificationImmutable spec => _security.spec_or_default(); + public ICollection child_order_types { + get { + if (_child_order_choices == null) _child_order_choices = new ObservableAutoWrapper(_order_types, ot => create(ot, model, _security_md_source)); return _child_order_choices; } } - - public IOrderTypeVM child_order - { - get - { + public IOrderTypeVM child_order { + get { init(); return _child_order; } - set - { + set { Disposable.dispose(ref _child_order_errors_sub); _child_order = value; _child_order?.init(); - if (_child_order is INotifyDataErrorInfo ndei) - { + if (_child_order is INotifyDataErrorInfo ndei) { ndei.ErrorsChanged += on_errors_changed; void on_errors_changed(object s, DataErrorsChangedEventArgs e) => _validate(); @@ -151,40 +150,80 @@ namespace mbts.spark _validate(); RaisePropertyChanged(nameof(child_order)); } - } + } - public void Dispose() - { + public override void assign_to(CustomOrderDefinition value) { + if (_child_order == null) + _select_child_order(model.factory.default_order_type(_security.Value, true)); + _validate(); + if (!HasErrors) { + var i = factory.trigger_order(); + i.TriggerAction = new TriggerAction { + SecurityId = _security.Value.Id, + }; + i.TriggerCondition = new TriggerCondition() { + PriceType = trigger_price_type, + AbsolutePriceTrigger = new AbsolutePriceTrigger() { TriggerQuantity = new TriggerQuantity() }, + }; + i.ExitCondition = new TriggerExitCondition { + ConditionalCancel = is_priceout_checked, + TimeoutEnabled = is_timeout_checked, + TimeoutSeconds = (uint)(timeout_secs) + }; + if (use_fixed_price) { + // should already be null, setting it here for clarity + i.TriggerAction.Payup = null; + i.TriggerAction.Price = fixed_price; + } else { + i.TriggerAction.Price = double.NaN; + i.TriggerAction.Payup = new TriggerPayupPrice { + PayupTicks = payup_ticks, + PayupPriceType = payup_price_type + }; + } + child_order.assign_to(i.Child); + value.Trigger = i; + } + } + + public void Dispose() { Disposable.dispose(ref _dispose); if (_child_order_choices != null) _child_order_choices.OfType().DisposeAll(); } - public override void init() - { + public override void init() { if (_child_order == null && _security.HasValue) _select_child_order(); _validate(); } - void _select_child_order() - { + void _refresh_md() { + if (_security.HasValue) { + _security_md.Value.md.get_bbo(ref _bbo_ref, out co2.NativePriceSize bid, out co2.NativePriceSize ask); + _best_bid = bid.price; + _best_ask = ask.price; + _security_md.Value.md.get_last_trade(ref _last_trade_ref, out co2.NativePriceSize ps, out DateTime ts, out ulong v); + } + } + + void _select_child_order() { CustomOneofCase ot = _inline_props != null && _inline_props.selected_child_order_type.has_value ? _inline_props.selected_child_order_type.value : model.factory.default_order_type(_security.Value, true); _select_child_order(ot); } - void _select_child_order(CustomOneofCase ot) - { + void _select_child_order(CustomOneofCase ot) { _child_order = child_order_types.FirstOrDefault(vm => vm.order_type == ot); if (_child_order == null) _child_order = child_order_types.FirstOrDefault(); RaisePropertyChanged(nameof(child_order)); } - void _validate() - { + void _validate() { + assert(!use_fixed_price || !double.IsNaN(fixed_price), nameof(fixed_price)); + assert(!is_timeout_checked || timeout_secs > 0, nameof(timeout_secs)); if (_child_order == null || (_child_order is INotifyDataErrorInfo ndei && ndei.HasErrors)) set_error(nameof(child_order), string.Empty, true); else clear_error(nameof(child_order)); diff --git a/src/client/spark/core/Utility/ViewModelBase.cs b/src/client/spark/core/Utility/ViewModelBase.cs index a6da9680f..cee1235bf 100644 --- a/src/client/spark/core/Utility/ViewModelBase.cs +++ b/src/client/spark/core/Utility/ViewModelBase.cs @@ -281,6 +281,16 @@ namespace mbts.ui.shell /// Sets 'setter_called' to false. /// public void reset() => setter_called = false; + + public void on_inline_prop(InlineUserProperty inline_prop) { + if (inline_prop.force_override || (inline_prop.has_value && !setter_called)) + bypass_setter(inline_prop.value); + } + + public void on_inline_prop(InlineUserProperty inline_prop, Func select) { + if (inline_prop.force_override || (inline_prop.has_value && !setter_called)) + bypass_setter(select(inline_prop.value)); + } } #endregion @@ -440,6 +450,13 @@ namespace mbts.ui.shell return prop; } + protected UserProperty user_backing(string name, T default_value = default) => + new UserProperty(backing(name, default_value)); + + protected UserProperty user_backing(Property property) => + new UserProperty(property); + + // TODO: maybe include a revert_on_error flag? protected class PropertyValidation { public readonly Func validate; diff --git a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml index 0fb815cbe..7cbc07c8e 100644 --- a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml +++ b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml @@ -1,8 +1,11 @@ - + @@ -13,6 +16,8 @@ + 4 + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -180,65 +420,7 @@ Palettes="{Binding palettes}" SelectedColor="{Binding color}" /> - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -246,17 +428,5 @@ - \ No newline at end of file diff --git a/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml.cs b/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml.cs index 4a229cc3c..989102dc8 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml.cs +++ b/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml.cs @@ -5,7 +5,12 @@ namespace mbts.ui.spark { /// Interaction logic for LadderSettingsView.xaml /// partial class LadderSettingsView : UserControl { - public const string OrdersColumnSampleTemplateKey = "OrdersColumnSampleTemplate"; + public const string + OrdersColumnSampleTemplateKey = "OrdersColumnSampleTemplate", + LineTemplateKey = nameof(LineTemplateKey), + SessionLowTemplateKey = nameof(SessionLowTemplateKey), + SessionHighTemplateKey = nameof(SessionHighTemplateKey), + SessionRangeTemplateKey = nameof(SessionRangeTemplateKey); public LadderSettingsView() => InitializeComponent(); diff --git a/src/client/spark/view/Spark/Ladder/LaderRender.cs b/src/client/spark/view/Spark/Ladder/LaderRender.cs index 8a391b491..67afb3566 100644 --- a/src/client/spark/view/Spark/Ladder/LaderRender.cs +++ b/src/client/spark/view/Spark/Ladder/LaderRender.cs @@ -171,6 +171,12 @@ namespace mbts.spark { } } + public static void render_session_range(DrawingVisual dv, uint color, LadderColumnSettings settings, int low_index, int high_index, double[] prices, double row_height) { + using (var dc = dv.RenderOpen()) + using (_draw_with_clip(dc, settings, row_height, prices.Length)) + dc.DrawRectangle(new SolidColorBrush(color.rgb_color()) { Opacity = 0.2 }, null, new Rect(0, high_index * row_height, settings.width, (low_index - high_index) * row_height)); + } + static IDisposable _draw_with_clip(DrawingContext dc, LadderColumnSettings settings, double row_height, int row_count) { dc.PushClip(new RectangleGeometry(new Rect(0, 0, settings.width, row_height * row_count))); return Disposable.Create(dc.Pop); From 695ee0e97c086a8084bebab3fc800166873844e2 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 19 Aug 2018 23:04:30 -0400 Subject: [PATCH 053/126] fix LadderSettingsVM.cs --- src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs b/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs index a476e546a..00ec88061 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs @@ -93,8 +93,6 @@ namespace mbts.spark { } } - public EnabledValueVM session_region_fill { get; } = new EnabledValueVM(); - public void load(LadderSettings settings) { _current = settings; badge_style = settings.badge_style; @@ -109,10 +107,7 @@ namespace mbts.spark { _mid_mkt_line.assign_from(_current.mid_break_line); _session_low_mkt_line.assign_from(_current.session_low_line); _session_high_mkt_line.assign_from(_current.session_high_line); - if (_current.session_range_fill.show) { - session_region_fill.enabled = true; - session_region_fill.value = _current.session_range_fill.color.rgb_color(); - } else session_region_fill.enabled = false; + _session_range_fill.assign_from(_current.session_range_fill); } public LadderSettings get_result() { From 00468fdb4dc1af8770cb3cf2fae72b1da3a9259c Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 20 Aug 2018 00:01:07 -0400 Subject: [PATCH 054/126] LadderGridHost - refresh session_low/high --- src/client/spark/view/Spark/Ladder/LadderGridHost.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/client/spark/view/Spark/Ladder/LadderGridHost.cs b/src/client/spark/view/Spark/Ladder/LadderGridHost.cs index 1958ccebe..316fd09db 100644 --- a/src/client/spark/view/Spark/Ladder/LadderGridHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderGridHost.cs @@ -760,6 +760,10 @@ namespace mbts.spark { mid_dirty = ObjectHelper.update_value_type(ref _mid, _settings.mid_break_line.show ? _owner._get_mid_market_break() : double.NaN); session_low_dirty = ObjectHelper.update_value_type(ref _session_low, (_settings.session_low_line.show || _settings.session_range_fill.show) ? _owner._get_session_low() : double.NaN); session_high_dirty = ObjectHelper.update_value_type(ref _session_high, (_settings.session_high_line.show || _settings.session_range_fill.show) ? _owner._get_session_high() : double.NaN); + if (session_low_dirty) + _low_index = null; + if (session_high_dirty) + _high_index = null; // double new_origin; if (!double.IsNaN(bid)) From ff7bd05ad30da3272afbb17329914c7db86ff8e4 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 20 Aug 2018 11:25:07 -0400 Subject: [PATCH 055/126] fix LadderSessionRange refresh --- src/client/spark/view/Spark/Ladder/LadderGridHost.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/spark/view/Spark/Ladder/LadderGridHost.cs b/src/client/spark/view/Spark/Ladder/LadderGridHost.cs index 316fd09db..20aeaeaea 100644 --- a/src/client/spark/view/Spark/Ladder/LadderGridHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderGridHost.cs @@ -401,6 +401,7 @@ namespace mbts.spark { _refresh_mid_mkt_break(); _refresh_session_low_line(); _refresh_session_high_line(); + _refresh_session_range(); _refresh_last_trade(); _refresh_depth(); _refresh_sizes(); From 5f9969ad2112ff6a42ef7217342678102bdb4292 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 20 Aug 2018 11:40:58 -0400 Subject: [PATCH 056/126] LadderSettings - add session_range_fill default to BTSColors --- src/client/spark/core/FontsAndColors/BTSColors.cs | 7 +++---- src/client/spark/view/Spark/Ladder/LadderSettings.cs | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/client/spark/core/FontsAndColors/BTSColors.cs b/src/client/spark/core/FontsAndColors/BTSColors.cs index 3edcd5e64..04166e0b0 100644 --- a/src/client/spark/core/FontsAndColors/BTSColors.cs +++ b/src/client/spark/core/FontsAndColors/BTSColors.cs @@ -79,8 +79,6 @@ namespace mbts.ui { // therefore need to ensure that _bid/_ask are not null before instantiating bid_brush/ask_brush bid = new BTSColor(0x16, 0x7e, 0xd3); ask = BTSCoreColors.red_darker; - session_low = new BTSColor(89, 89, 107); - session_high = new BTSColor(35, 155, 0); _bid_brush = bid; _ask_brush = ask; } @@ -104,8 +102,9 @@ namespace mbts.ui { [DisplayInfo(name = "ATM")] public static BTSColor atm_background { get { return BTSCoreColors.gray_dark; } } - public static BTSColor session_low { get; } - public static BTSColor session_high { get; } + public static BTSColor session_low { get; } = new BTSColor(89, 89, 107); + public static BTSColor session_high { get; } = new BTSColor(35, 155, 0); + public static BTSColor session_range_fill { get; } = Colors.Black; // Alerts [DisplayInfo(name = "Trade Alert")] diff --git a/src/client/spark/view/Spark/Ladder/LadderSettings.cs b/src/client/spark/view/Spark/Ladder/LadderSettings.cs index 6535590ec..4d6f9131e 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettings.cs +++ b/src/client/spark/view/Spark/Ladder/LadderSettings.cs @@ -142,7 +142,7 @@ namespace mbts.spark { mid_break_line = new LadderMarketBreakLine { color = 0, show = false }, session_low_line = new LadderMarketBreakLine { color = BTSColors.MarketData.session_low, show = true }, session_high_line = new LadderMarketBreakLine { color = BTSColors.MarketData.session_high, show = true }, - session_range_fill = new LadderMarketBreakLine { show = true }, + session_range_fill = new LadderMarketBreakLine { color = BTSColors.MarketData.session_range_fill, show = true }, alternate_order_size = 0 }; } From 237b59afe5fa65f7762562978fdcd6ddcf94bae1 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 20 Aug 2018 12:11:16 -0500 Subject: [PATCH 057/126] some PR suggestions --- src/client/spark/view/Controls/Badge.cs | 36 ++++++++++--------- .../spark/view/Spark/Ladder/LadderOrderVM.cs | 8 ++--- .../spark/view/Spark/Ladder/LadderView.xaml | 2 +- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/client/spark/view/Controls/Badge.cs b/src/client/spark/view/Controls/Badge.cs index c4dc779b0..0bcda5119 100644 --- a/src/client/spark/view/Controls/Badge.cs +++ b/src/client/spark/view/Controls/Badge.cs @@ -30,12 +30,14 @@ namespace mbts.ui.controls { public static readonly FontFamily DefaultFontFamily = new FontFamily("Consolas"); // I am thinking that depending on how people have different ladder windows configured, the vertex points may be at different positions - static ConcurrentDictionary<(Point p1, Point p2, Point p3), StreamGeometry> _sg_cache = new ConcurrentDictionary<(Point p1, Point p2, Point p3), StreamGeometry>(); + //static ConcurrentDictionary<(Point p1, Point p2, Point p3), StreamGeometry> _sg_cache = new ConcurrentDictionary<(Point p1, Point p2, Point p3), StreamGeometry>(); readonly GlyphContentRect _gcr = new GlyphContentRect(); Brush _background, _foreground, _border_brush, _parent_algo_type_brush; - bool _is_exchange_order, _is_multiple_orders_at_level, _is_hedge_order; + bool _is_exchange_order, _has_multiple_orders_at_level, _is_hedge_order; CustomOrderDefinition.CustomOneofCase _parent_algo_type; + Tuple _current_triangle_vertices; + StreamGeometry _triangle_geometry; static Badge() { @@ -176,7 +178,7 @@ namespace mbts.ui.controls { _gcr.font_size = FontSize; _gcr.text_lines = TextLines; _is_exchange_order = IsExchangeOrder; - _is_multiple_orders_at_level = IsMultipleOrdersAtLevel; + _has_multiple_orders_at_level = HasMultipleOrdersAtLevel; _is_hedge_order = IsHedgeOrder; _gcr.glyph_context = GlyphContext.create(FontFamily, FontWeight); } @@ -214,16 +216,16 @@ namespace mbts.ui.controls { (b, v) => b._is_exchange_order = v, false); - public bool IsMultipleOrdersAtLevel { + public bool HasMultipleOrdersAtLevel { get { return (bool)GetValue(IsMultipleOrdersAtLevelProperty); } set { SetValue(IsMultipleOrdersAtLevelProperty, value); } } public static readonly DependencyProperty IsMultipleOrdersAtLevelProperty = WPFHelper.create_dp( - nameof(IsMultipleOrdersAtLevel), + nameof(HasMultipleOrdersAtLevel), FrameworkPropertyMetadataOptions.AffectsRender, - (b, v) => b._is_multiple_orders_at_level = v, + (b, v) => b._has_multiple_orders_at_level = v, false); public CustomOrderDefinition.CustomOneofCase ParentAlgoType { @@ -273,12 +275,12 @@ namespace mbts.ui.controls { base.OnRender(dc); // this is the main badge rectangle double border_thickness = BorderThickness.Top; - Pen pen; - (pen = new Pen(BorderBrush, border_thickness)).Freeze(); + Pen pen = new Pen(BorderBrush, border_thickness); + pen = pen.frozen(); dc.DrawRoundedRectangle(Background, pen, new Rect(0, border_thickness, _gcr.layout_size.Width, _gcr.layout_size.Height), CornerRadius, CornerRadius); - if (IsMultipleOrdersAtLevel) { + if (HasMultipleOrdersAtLevel) { _draw_triangle( new Point(_gcr.layout_size.Width - (2 * border_thickness - CornerRadius), _gcr.layout_size.Height - 5), // top right new Point(_gcr.layout_size.Width - (2 * border_thickness - CornerRadius), _gcr.layout_size.Height), // bottom right @@ -306,7 +308,7 @@ namespace mbts.ui.controls { var palgo_type_name = utility.EnumHelper.get_display_name(ParentAlgoType); if (palgo_type_name.Length > 1) { var palgo_letter = palgo_type_name.Substring(0, 1); - var a_glyph_context = TextUtils.StandardGlyphContext; + var a_glyph_context = _gcr.glyph_context; var a_glyph_run = a_glyph_context.get_glyph_run( palgo_letter, 12, @@ -329,18 +331,18 @@ namespace mbts.ui.controls { dc.DrawGlyphRun(_foreground, gr); void _draw_triangle(Point p1, Point p2, Point p3, Brush b) { - var key = (p1, p2, p3); - if (!_sg_cache.TryGetValue(key, out StreamGeometry sg)) { - sg = new StreamGeometry(); - using (var sgc = sg.Open()) { + Tuple new_vertices = new Tuple(p1, p2, p3); + if (!new_vertices.Equals(_current_triangle_vertices)) { + _triangle_geometry = new StreamGeometry(); + using (var sgc = _triangle_geometry.Open()) { sgc.BeginFigure(p1, true, true); sgc.PolyLineTo(new Point[] { p2, p3 }, true, true); } - sg.Freeze(); - _sg_cache[key] = sg; + _current_triangle_vertices = new_vertices; + _triangle_geometry.Freeze(); } (pen = new Pen(b, 1)).Freeze(); - dc.DrawGeometry(b, pen, sg); + dc.DrawGeometry(b, pen, _triangle_geometry); } } } diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index dc3e99206..75ef621be 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -35,7 +35,7 @@ namespace mbts.spark { readonly Property _font_weight; readonly Property _font_size; readonly Property _foreground, _background, _hoverbackground, _border, _parent_algo_type_brush; - readonly Property _is_exchange_order, _is_multiple_orders_at_same_level, _is_hedge_order; + readonly Property _is_exchange_order, _has_multiple_orders_at_same_level, _is_hedge_order; readonly Property _parent_algo_type; readonly Property _summary, _description; IObservable _bs; @@ -65,7 +65,7 @@ namespace mbts.spark { _summary = backing(nameof(summary), string.Empty); _description = backing(nameof(description), string.Empty); _is_exchange_order = backing(nameof(is_exchange_order), false); - _is_multiple_orders_at_same_level = backing(nameof(is_multiple_orders_at_same_level), false); + _has_multiple_orders_at_same_level = backing(nameof(has_multiple_orders_at_same_level), false); _is_hedge_order = backing(nameof(is_hedge_order), false); _parent_algo_type = backing(nameof(parent_algo_type), CustomOrderDefinition.CustomOneofCase.None); _parent_algo_type_brush = backing(nameof(parent_algo_type_brush), _color_bg_brush); @@ -117,7 +117,7 @@ namespace mbts.spark { border = new SolidColorBrush(color); is_exchange_order = false; } - is_multiple_orders_at_same_level = _orders.Count > 1; + has_multiple_orders_at_same_level = _orders.Count > 1; is_hedge_order = _orders.Any(o => o.Value.sub_type() == OrderSubType.HedgingLeg); if (_orders.Any()) { @@ -187,7 +187,7 @@ namespace mbts.spark { public string summary { get => _summary.Value; private set => _summary.Value = value; } public string description { get => _description.Value; private set => _description.Value = value; } public bool is_exchange_order { get => _is_exchange_order.Value; private set => _is_exchange_order.Value = value; } - public bool is_multiple_orders_at_same_level { get => _is_multiple_orders_at_same_level.Value; private set => _is_multiple_orders_at_same_level.Value = value; } + public bool has_multiple_orders_at_same_level { get => _has_multiple_orders_at_same_level.Value; private set => _has_multiple_orders_at_same_level.Value = value; } public bool is_hedge_order { get => _is_hedge_order.Value; private set => _is_hedge_order.Value = value; } public Brush parent_algo_type_brush { get => _parent_algo_type_brush.Value; private set => _parent_algo_type_brush.Value = value; } // the setter is public so that the LadderVM can set this field diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml b/src/client/spark/view/Spark/Ladder/LadderView.xaml index 2e406aea6..1f3feaabf 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml @@ -452,7 +452,7 @@ - + From 24290ddb276c72c3c1a2229a55dfb19861facbda Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Mon, 20 Aug 2018 15:03:18 -0400 Subject: [PATCH 058/126] added IOC / FAK --- src/lib/api/services/OrderService.proto | 1 + testing/manual/orders/ioc.txt | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 testing/manual/orders/ioc.txt diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 7a9cba44b..e05f8dd99 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -283,6 +283,7 @@ enum TimeInForce { TIME_IN_FORCE_UNDEFINED = 0; TIME_IN_FORCE_DAY = 48; TIME_IN_FORCE_GTC = 49; + TIME_IN_FORCE_IOC = 51; } enum ManualOrderIndicator { diff --git a/testing/manual/orders/ioc.txt b/testing/manual/orders/ioc.txt new file mode 100644 index 000000000..deebf75b5 --- /dev/null +++ b/testing/manual/orders/ioc.txt @@ -0,0 +1,15 @@ + +IOC Test + +Connect to Cert + +Bring up a ladder with a market + +Select a 1 lot, time in force = IOC + +Try to join a bid, it should cancel + +Try to lift an offer, it should fill + +If you don't know what join or lift means, ask Kevin + From 3d7e04ded1777c0efff1e129d76ef2028a32eef9 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 20 Aug 2018 15:04:05 -0500 Subject: [PATCH 059/126] Badges - removing unnecessary allocation when comparing triangle vertices --- src/client/spark/view/Controls/Badge.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/client/spark/view/Controls/Badge.cs b/src/client/spark/view/Controls/Badge.cs index 0bcda5119..978b44fd1 100644 --- a/src/client/spark/view/Controls/Badge.cs +++ b/src/client/spark/view/Controls/Badge.cs @@ -36,7 +36,7 @@ namespace mbts.ui.controls { Brush _background, _foreground, _border_brush, _parent_algo_type_brush; bool _is_exchange_order, _has_multiple_orders_at_level, _is_hedge_order; CustomOrderDefinition.CustomOneofCase _parent_algo_type; - Tuple _current_triangle_vertices; + (Point p1, Point p2, Point p3) _current_triangle_vertices; StreamGeometry _triangle_geometry; @@ -331,14 +331,13 @@ namespace mbts.ui.controls { dc.DrawGlyphRun(_foreground, gr); void _draw_triangle(Point p1, Point p2, Point p3, Brush b) { - Tuple new_vertices = new Tuple(p1, p2, p3); - if (!new_vertices.Equals(_current_triangle_vertices)) { + if (!(p1 == _current_triangle_vertices.p1 && p2 == _current_triangle_vertices.p2 && p3 == _current_triangle_vertices.p3)) { _triangle_geometry = new StreamGeometry(); using (var sgc = _triangle_geometry.Open()) { sgc.BeginFigure(p1, true, true); sgc.PolyLineTo(new Point[] { p2, p3 }, true, true); } - _current_triangle_vertices = new_vertices; + _current_triangle_vertices = (p1, p2, p3); _triangle_geometry.Freeze(); } (pen = new Pen(b, 1)).Freeze(); From 8e792fbd129f45b36f31740bc421ca8983f32b13 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 20 Aug 2018 15:31:20 -0500 Subject: [PATCH 060/126] SPARK-1569: Day PnL in the summary status box --- src/client/spark/view/Spark/PAndL/PAndLVM.cs | 11 ++++++++++- src/client/spark/view/Spark/PAndL/PAndLView.xaml | 13 +++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/client/spark/view/Spark/PAndL/PAndLVM.cs b/src/client/spark/view/Spark/PAndL/PAndLVM.cs index d6917b3c1..a699737fe 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLVM.cs +++ b/src/client/spark/view/Spark/PAndL/PAndLVM.cs @@ -113,6 +113,7 @@ namespace mbts.spark { void _update_totals() { if (pnl_view != null) { total_aggregate_pnl = pnl_view.Cast().Where(r => !Double.IsNaN(r.total_pnl)).Sum(r => r.total_pnl); + total_aggregate_day_pnl = pnl_view.Cast().Where(r => !Double.IsNaN(r.total_pnl)).Sum(r => r.day_pnl); total_aggregate_net_pos = pnl_view.Cast().Sum(r => r.total_net_position); total_aggregate_buy_qty = pnl_view.Cast().Sum(r => r.day_long_quantity); total_aggregate_sell_qty = pnl_view.Cast().Sum(r => r.day_short_quantity); @@ -153,6 +154,14 @@ namespace mbts.spark { } } + public double total_aggregate_day_pnl { + get { return _total_aggregate_day_pnl; } + set { + _total_aggregate_day_pnl = value; + RaisePropertyChanged(); + } + } + public double total_aggregate_net_pos { get { return _total_aggregate_net_pos; } set { @@ -227,7 +236,7 @@ namespace mbts.spark { static readonly TimeSpan _POSITION_UPDATE_PERIOD = TimeSpan.FromMilliseconds(333); readonly Property _selected_pnl_calc_type; - double _total_aggregate_pnl, _total_aggregate_net_pos, _total_aggregate_buy_qty, _total_aggregate_sell_qty; + double _total_aggregate_pnl, _total_aggregate_day_pnl, _total_aggregate_net_pos, _total_aggregate_buy_qty, _total_aggregate_sell_qty; TimeSpan _start_of_day_ts; DateTime _last_pnl_update_time = DateTime.MinValue; ObservableCollection _pnl_data = new ObservableCollection(); diff --git a/src/client/spark/view/Spark/PAndL/PAndLView.xaml b/src/client/spark/view/Spark/PAndL/PAndLView.xaml index 1ba3817a1..8a77617e9 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLView.xaml +++ b/src/client/spark/view/Spark/PAndL/PAndLView.xaml @@ -182,6 +182,19 @@ + + + + + + + + + + + + + From 75a1f6df9f7ce9691fa043aca545d8e5c38251d4 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 20 Aug 2018 17:08:11 -0400 Subject: [PATCH 061/126] SPARK-1453: Help buttons, rename Hedge Ratio, no negatives --- .../Spreader/ExecutionStrategyEditor.xaml | 19 ++++++++++-- .../Spreader/ExecutionStrategyEditor.xaml.cs | 23 ++++++++++++-- .../Spreader/ParameterSectionView.xaml | 2 +- .../ParameterRows/Leg/EnableQuotingModel.cs | 2 ++ .../VM/ParameterRows/Leg/HedgeRatioModel.cs | 7 +++-- .../ParameterRows/Leg/PriceMultiplierModel.cs | 2 ++ .../VM/ParameterRows/Leg/QuantityModel.cs | 2 ++ ...teMarketVolumeBasedCrossCrossTicksModel.cs | 2 ++ ...ositeMarketVolumeBasedCrossEnabledModel.cs | 2 ++ ...iteMarketVolumeBasedCrossThresholdModel.cs | 2 ++ .../PostHedgePriceBasedCrossEnabledModel.cs | 2 ++ ...ostHedgePriceBasedCrossMarketTicksModel.cs | 2 ++ .../PostHedgePriceBasedCrossTicksModel.cs | 2 ++ .../PostHedgeTimeBasedCrossEnabledModel.cs | 2 ++ ...PostHedgeTimeBasedCrossMarketTicksModel.cs | 2 ++ .../PostHedgeTimeBasedCrossTimeModel.cs | 2 ++ .../PreHedge/MaxTicksInsideMarketModel.cs | 2 ++ .../Payless/PreHedgePaylessEnabledModel.cs | 2 ++ .../Payless/PreHedgePaylessThresholdModel.cs | 2 ++ .../Payless/PreHedgePaylessTicksModel.cs | 3 ++ .../Payup/PreHedgePayupEnabledModel.cs | 2 ++ .../Payup/PreHedgePayupThresholdModel.cs | 2 ++ .../PreHedge/Payup/PreHedgePayupTicksModel.cs | 2 ++ .../QuoteInsideMarketThrottleEnabled.cs | 2 ++ .../QuoteInsideMarketThrottleMinMove.cs | 2 ++ .../QuoteInsideMarketThrottleTicksModel.cs | 2 ++ .../Throttle/QuoteThrottleEnabledModel.cs | 2 ++ .../Throttle/QuoteThrottleInsideTicksModel.cs | 2 ++ .../QuoteThrottleOutsideTicksModel.cs | 2 ++ .../Spreader/VM/ParameterRows/RowModel.cs | 19 +++++++----- src/client/spark/Modules/Spreader/VM/RowVM.cs | 3 ++ src/client/spark/view/Resources/Buttons.xaml | 31 +++++++++++-------- 32 files changed, 126 insertions(+), 29 deletions(-) diff --git a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml index 0094ac79f..2724697a1 100644 --- a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml +++ b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml @@ -256,14 +256,26 @@ + > + + + + + @@ -272,6 +284,9 @@ + + + @@ -49,246 +58,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -420,7 +189,76 @@ Palettes="{Binding palettes}" SelectedColor="{Binding color}" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml.cs b/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml.cs index 989102dc8..c95184598 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml.cs +++ b/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml.cs @@ -1,18 +1,19 @@ -using System.Windows.Controls; +using mbts.ui.converters; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Media; namespace mbts.ui.spark { /// /// Interaction logic for LadderSettingsView.xaml /// partial class LadderSettingsView : UserControl { - public const string - OrdersColumnSampleTemplateKey = "OrdersColumnSampleTemplate", - LineTemplateKey = nameof(LineTemplateKey), - SessionLowTemplateKey = nameof(SessionLowTemplateKey), - SessionHighTemplateKey = nameof(SessionHighTemplateKey), - SessionRangeTemplateKey = nameof(SessionRangeTemplateKey); + public const string OrdersColumnSampleTemplateKey = "OrdersColumnSampleTemplate"; public LadderSettingsView() => InitializeComponent(); + + public static IMultiValueConverter MktBreakLineBrushConverter = + ValueConverter.create((color, show) => show ? new SolidColorBrush(color) : Brushes.Transparent); } } \ No newline at end of file From 578290f8e8ebf1578f68e332c23e6d9cf4b1e1df Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 20 Aug 2018 17:08:11 -0400 Subject: [PATCH 073/126] SPARK-1453: Help buttons, rename Hedge Ratio, no negatives --- .../Spreader/ExecutionStrategyEditor.xaml | 19 ++++++++++-- .../Spreader/ExecutionStrategyEditor.xaml.cs | 23 ++++++++++++-- .../Spreader/ParameterSectionView.xaml | 2 +- .../ParameterRows/Leg/EnableQuotingModel.cs | 2 ++ .../VM/ParameterRows/Leg/HedgeRatioModel.cs | 7 +++-- .../ParameterRows/Leg/PriceMultiplierModel.cs | 2 ++ .../VM/ParameterRows/Leg/QuantityModel.cs | 2 ++ ...teMarketVolumeBasedCrossCrossTicksModel.cs | 2 ++ ...ositeMarketVolumeBasedCrossEnabledModel.cs | 2 ++ ...iteMarketVolumeBasedCrossThresholdModel.cs | 2 ++ .../PostHedgePriceBasedCrossEnabledModel.cs | 2 ++ ...ostHedgePriceBasedCrossMarketTicksModel.cs | 2 ++ .../PostHedgePriceBasedCrossTicksModel.cs | 2 ++ .../PostHedgeTimeBasedCrossEnabledModel.cs | 2 ++ ...PostHedgeTimeBasedCrossMarketTicksModel.cs | 2 ++ .../PostHedgeTimeBasedCrossTimeModel.cs | 2 ++ .../PreHedge/MaxTicksInsideMarketModel.cs | 2 ++ .../Payless/PreHedgePaylessEnabledModel.cs | 2 ++ .../Payless/PreHedgePaylessThresholdModel.cs | 2 ++ .../Payless/PreHedgePaylessTicksModel.cs | 3 ++ .../Payup/PreHedgePayupEnabledModel.cs | 2 ++ .../Payup/PreHedgePayupThresholdModel.cs | 2 ++ .../PreHedge/Payup/PreHedgePayupTicksModel.cs | 2 ++ .../QuoteInsideMarketThrottleEnabled.cs | 2 ++ .../QuoteInsideMarketThrottleMinMove.cs | 2 ++ .../QuoteInsideMarketThrottleTicksModel.cs | 2 ++ .../Throttle/QuoteThrottleEnabledModel.cs | 2 ++ .../Throttle/QuoteThrottleInsideTicksModel.cs | 2 ++ .../QuoteThrottleOutsideTicksModel.cs | 2 ++ .../Spreader/VM/ParameterRows/RowModel.cs | 19 +++++++----- src/client/spark/Modules/Spreader/VM/RowVM.cs | 3 ++ src/client/spark/view/Resources/Buttons.xaml | 31 +++++++++++-------- 32 files changed, 126 insertions(+), 29 deletions(-) diff --git a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml index 0094ac79f..2724697a1 100644 --- a/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml +++ b/src/client/spark/Modules/Spreader/ExecutionStrategyEditor.xaml @@ -256,14 +256,26 @@ + > + + + + + @@ -272,6 +284,9 @@ + + + - - - - - - - - - - Sounds - - - No Sounds - - - - - (click to add) - - - - + + + + + + + + + + + + Play Sound + - - Enable Toast Notifications + + + + Show Notification + + @@ -492,10 +515,6 @@ - - - - From ee475159902f465f1b8c2fcc900fe9bcd3c1507c Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 21 Aug 2018 15:38:10 -0400 Subject: [PATCH 078/126] SPARK-1573: Slightly less bad badge colors --- .../spark/core/FontsAndColors/BTSColors.cs | 36 ++++++++++--------- .../spark/view/Spark/Ladder/LadderOrderVM.cs | 6 ++-- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/client/spark/core/FontsAndColors/BTSColors.cs b/src/client/spark/core/FontsAndColors/BTSColors.cs index 04166e0b0..a7e819760 100644 --- a/src/client/spark/core/FontsAndColors/BTSColors.cs +++ b/src/client/spark/core/FontsAndColors/BTSColors.cs @@ -7,7 +7,7 @@ namespace mbts.ui { // Some colos are also available as static resources in colors.xaml public static class BTSColors { static Brush _header_brush, _header_text_brush, _header_alternate_brush, _header_error_text_brush; - + static BTSColors() { _init_brush(header, out _header_brush); _init_brush(header_text, out _header_text_brush); @@ -67,8 +67,8 @@ namespace mbts.ui { [DisplayInfo(name = "Cross Sell Alert")] public static BTSColor cross_sell { get { return BTSCoreColors.red_light; } } [DisplayInfo(name = "Proximity Sell Alert")] - public static BTSColor proximity_sell { get { return BTSCoreColors.red_lighter; } } - + public static BTSColor proximity_sell { get { return BTSCoreColors.red_lighter; } } + } public static class MarketData { @@ -84,12 +84,14 @@ namespace mbts.ui { } // Base Colors [DisplayInfo(name = "Market Data")] - public static BTSColor default_background { get { return BTSCoreColors.blue_light_lighter; } } + public static BTSColor default_background { get { return BTSCoreColors.blue_light_lighter; } } public static BTSColor default_text { get { return BTSCoreColors.black; } } //Another bid color option: 40,70,200 public static BTSColor bid { get; } + public static BTSColor bid_alt { get { return BTSCoreColors.blue_light; } } public static BTSColor ask { get; } + public static BTSColor ask_alt { get { return BTSCoreColors.red_light_dark; } } public static BTSColor last { get { return BTSCoreColors.black; } } public static Brush bid_brush => _bid_brush; public static Brush ask_brush => _ask_brush; @@ -112,7 +114,7 @@ namespace mbts.ui { [DisplayInfo(name = "Trade price over Theo Alert")] public static BTSColor trade_price_over_theo { get { return BTSCoreColors.red_pale_dark; } } [DisplayInfo(name = "Trade price under Theo Alert")] - public static BTSColor trade_price_under_theo { get { return BTSCoreColors.blue_bright_dark; } } + public static BTSColor trade_price_under_theo { get { return BTSCoreColors.blue_bright_dark; } } } @@ -184,9 +186,9 @@ namespace mbts.ui { public static readonly Brush working_order_background_brush; public static BTSColor filled { get { return BTSCoreColors.green_light_light_saturated; } } - public static BTSColor filled_dark => BTSCoreColors.green; + public static BTSColor filled_dark => BTSCoreColors.green; public static readonly Brush filled_dark_brush; // used in ladder log viewer - public static BTSColor modified => orange; + public static BTSColor modified => orange; public static readonly Brush modified_brush; // used in the ladder log viewer [DisplayInfo(name = "Order Buy Text")] @@ -262,7 +264,7 @@ namespace mbts.ui { public static class Presave { [DisplayInfo(name = "Presave")] - public static BTSColor default_background { get { return BTSCoreColors.yellow_light; } } + public static BTSColor default_background { get { return BTSCoreColors.yellow_light; } } public static BTSColor default_text { get { return BTSCoreColors.black; } } } @@ -311,7 +313,7 @@ namespace mbts.ui { [DisplayInfo(name = "Shell Text")] public static BTSColor default_text { get { return new BTSColor(0x22); } } public static BTSColor alternate_text { get { return BTSCoreColors.white; } } - + public static BTSColor menu_expander_mouseover { get { return BTSCoreColors.blue_bright; } } public static BTSColor spark_menu_background { get { return new BTSColor(0xe9); } } @@ -374,7 +376,7 @@ namespace mbts.ui { public static BTSColor unfocused_glyph { get { return normal_text; } } public static BTSColor unfocused_button_border { get { return UI.transparent; } } public static BTSColor unfocused_button_background { get { return UI.transparent; } } - + // Selected public static BTSColor selected_border { get { return UI.input_selected_border; } } public static BTSColor selected_background { get { return input_selected_background; } } @@ -382,7 +384,7 @@ namespace mbts.ui { public static BTSColor selected_glyph { get { return normal_text; } } public static BTSColor selected_button_border { get { return UI.transparent; } } public static BTSColor selected_button_background { get { return UI.transparent; } } - + // Disabled public static BTSColor disabled_border { get { return UI.input_disabled_border; } } public static BTSColor disabled_background { get { return UI.input_disabled_background; } } @@ -390,7 +392,7 @@ namespace mbts.ui { public static BTSColor disabled_glyph { get { return normal_text; } } public static BTSColor disabled_button_border { get { return UI.transparent; } } public static BTSColor disabled_button_background { get { return UI.transparent; } } - + // Valid public static BTSColor valid_background { get { return normal_background; } } public static BTSColor valid_border { get { return normal_border; } } @@ -517,7 +519,7 @@ namespace mbts.ui { public static BTSColor warning_dark { get { return new BTSColor(114, 61, 0); } } public static BTSColor warning_light { get { return new BTSColor(Colors.LightYellow); } } - + public static BTSColor brand_lightest { get { return new BTSColor(230, 243, 249); } } public static BTSColor brand_lighter { get { return new BTSColor(191, 225, 239); } } [DisplayInfo(name = "BTS Brand Light")] @@ -551,8 +553,8 @@ namespace mbts.ui { public static BTSColor gray_lightest { get { return BTSCoreColors.gray_lightest; } } public static BTSColor transparent { get { return new BTSColor(0, 0, 0, 0); } } - - + + } public static class LauncherColors @@ -562,7 +564,7 @@ namespace mbts.ui { public static BTSColor alternate_text { get { return UI.alternate_text; } } public static BTSColor separator { get { return new BTSColor(0x99); } } } - + public static class VolSurfaceGraph { @@ -575,7 +577,7 @@ namespace mbts.ui { [DisplayInfo(name = "Vol Surface ATM")] public static BTSColor main_curve_atm { get { return BTSCoreColors.green; } } [DisplayInfo(name = "Vol Surface Call Special")] - public static BTSColor call_special { get { return BTSCoreColors.red; } } + public static BTSColor call_special { get { return BTSCoreColors.red; } } [DisplayInfo(name = "Vol Surface Put Implied Vol")] public static BTSColor implied_put { get { return BTSCoreColors.blue_bright_light; } } [DisplayInfo(name = "Vol Surface ATM Implied Vol")] diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 75ef621be..ffc4fed04 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -87,8 +87,8 @@ namespace mbts.spark { // update brushes Color color; switch (side) { - case Side.Buy: color = BTSColors.MarketData.bid; break; - case Side.Sell: color = BTSColors.MarketData.ask; break; + case Side.Buy: color = BTSColors.MarketData.bid_alt; break; + case Side.Sell: color = BTSColors.MarketData.ask_alt; break; case Side.Undefined: default: color = Colors.MediumPurple; break; @@ -100,7 +100,7 @@ namespace mbts.spark { parent_algo_type_brush = parent_algo_metadata.Color.rgb_brush(); var buy_sell_background_fill_color = new SolidColorBrush(color); buy_sell_background_fill_color.Freeze(); - background = buy_sell_background_fill_color; + background = buy_sell_background_fill_color; hoverbackground = mkbrush(dark, _darkbg, 0); filled = _parent_and_child_not_sharing_slot().Select(order => OrderUtils.filled(order)).Sum(); working_quantity = _parent_and_child_not_sharing_slot().Select(order => order.working_quantity()).Sum(); From f4feabf83d08d5b7f31c6c1d5534e5fb2a5736b8 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 21 Aug 2018 15:58:16 -0400 Subject: [PATCH 079/126] added hidden/IOC state to spreader --- .../spreader_orders/spreader/SingleLegQuoter.cpp | 13 +++++++++---- .../spreader_orders/spreader/SingleLegQuoter.h | 1 + .../QuoterWaitingForSizeStateWorker.cpp | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index 1b36be36a..0a5f98e85 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -164,10 +164,12 @@ void SingleLegQuoter::_compute_price_quantity(Price& price, } void SingleLegQuoter::_adjust_for_hidden_order(Price& price, Quantity& quantity){ - const Book& book=_spreader.get_book(_this_leg_data.leg_index()); - SpreaderUtils::adjust_for_hidden_order(_this_leg_data, - book, - price,quantity); + if(_hidden_order){ + const Book& book=_spreader.get_book(_this_leg_data.leg_index()); + SpreaderUtils::adjust_for_hidden_order(_this_leg_data, + book, + price,quantity); + } } void SingleLegQuoter::_commit_drivers(Price quote_price){ if (!_two_legged) @@ -189,6 +191,9 @@ void SingleLegQuoter::_transform_to_WAITING_FOR_FIRST_ACK (){ bts_assert (_worker->state() == QuoterState::WAITING_FOR_SIZE); _switch_state (&_waiting_for_first_ack_state_worker); } +void SingleLegQuoter::_transform_to_WAITING_FOR_IOC (){ + bts_assert(false); +} void SingleLegQuoter::_transform_to_WAITING_FOR_FIRST_ACK_CANCELLED(){ bts_assert (_worker->state() == QuoterState::WAITING_FOR_FIRST_ACK); _switch_state (&_waiting_for_first_ack_cancelled_state_worker); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index 08849b8f4..93bd24ed6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -173,6 +173,7 @@ private: void _transform_to_START (); void _transform_to_WAITING_FOR_SIZE (); void _transform_to_WAITING_FOR_FIRST_ACK (); + void _transform_to_WAITING_FOR_IOC (); void _transform_to_WAITING_FOR_FIRST_ACK_CANCELLED(); void _transform_to_WORKING(); void _transform_to_WAITING_FOR_CANCEL_ACK(); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp index e0ce7f31b..52c269e64 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp @@ -62,7 +62,8 @@ void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(TickToTradeCorID _quoter->_key(), out_price, out_quantity); // this is the only place where a quoter order is entered _quoter->_place_order(out_price, out_quantity, cid); - _quoter->_transform_to_WAITING_FOR_FIRST_ACK (); + if(_quoter->_hidden_order) _quoter->_transform_to_WAITING_FOR_IOC(); + else _quoter->_transform_to_WAITING_FOR_FIRST_ACK (); } } } From 15feef9d239d35d88aa5f648aafb6b2f52785f10 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 20 Aug 2018 10:02:29 -0400 Subject: [PATCH 080/126] SPARK-1509 queueing in shell --- .../spark/Daemons/ShellLatencyDaemon.cs | 2 +- .../Modules/Trading/OrderBook/OrderBookVM.cs | 6 +- src/client/spark/Orders/FillTupleSource.cs | 8 +- .../spark/Orders/OrderActivitySummarizer.cs | 12 +- .../spark/Orders/OrderRecordTupleSource.cs | 4 +- src/client/spark/Orders/OrdersModel.cs | 38 ++- .../core/GlobalExtensions/GlobalExtensions.cs | 4 - .../spark/core/Utility/ObservableDemuxer.cs | 4 +- .../core/Utility/TableUpdateTransform.cs | 26 +- .../spark/view/Spark/Core/SparkUtils.cs | 17 -- src/client/spark/view/Utility/RXCollection.cs | 29 --- .../api/Channels/QuickBusClientChannel.cs | 34 +-- src/client/spark_api/api/Update.cs | 229 ++++++++++++++--- .../TestRunner/InProcessTestRunner.cs | 4 +- .../spark_core/TestRunner/TestAssert.cs | 16 +- .../TestRunner/TestResultReceiver.cs | 1 + .../spark_core/utils/GlobalExtensions.cs | 6 + src/client/spark_test/api/ApiTests.cs | 16 +- src/client/spark_test/api/ApiUpdateTests.cs | 231 ++++++++++++++++++ src/client/spark_test/api/SomeTests.cs | 11 +- src/client/spark_test/spark_test.csproj | 1 + src/lib/CMakeDeps.cmake | 2 +- 22 files changed, 540 insertions(+), 161 deletions(-) create mode 100644 src/client/spark_test/api/ApiUpdateTests.cs diff --git a/src/client/spark/Daemons/ShellLatencyDaemon.cs b/src/client/spark/Daemons/ShellLatencyDaemon.cs index 4e7c09760..827e80d49 100644 --- a/src/client/spark/Daemons/ShellLatencyDaemon.cs +++ b/src/client/spark/Daemons/ShellLatencyDaemon.cs @@ -29,7 +29,7 @@ namespace bts.perf { } void on_tick(Update update) { - if (update.added.Count > 0) { + if (update.added.Any()) { var tick = update.added.Last(); _service.report_async(new Report() { HostName = _hostname, diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 749b31368..c20eeea34 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -69,13 +69,13 @@ namespace mbts.spark { _dispose = Disposable.Create( bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(on_securities), - model.on_orders.OnDispatcher().Subscribe(on_orders), + model.on_orders.OnDispatcher().AddRemoveOnly().Subscribe(on_orders), grid_settings_manager, columns); - void on_orders(TableUpdate table) { + void on_orders(LegacyTableUpdate table) { // clear everything (most likely the server restarted) - if (table.removed.Count == _order_rows.Count && table.added.Count == 0) { + if (table.removed.Count() == _order_rows.Count && !table.added.Any()) { _selected_rows.Clear(); _order_rows.DisposeAll(); _order_rows.Clear(); diff --git a/src/client/spark/Orders/FillTupleSource.cs b/src/client/spark/Orders/FillTupleSource.cs index 3e2d90dab..d5c09c356 100644 --- a/src/client/spark/Orders/FillTupleSource.cs +++ b/src/client/spark/Orders/FillTupleSource.cs @@ -53,7 +53,7 @@ namespace mbts.spark { _dispose = Disposable.Create( securities.OnDispatcher().Subscribe(_update_securities), orders.OnDispatcher().Subscribe(_update_orders), - fills.OnDispatcher().Subscribe(_update_fills)); + fills.OnDispatcher().AddRemoveOnly().Subscribe(_update_fills)); public IDisposable Subscribe(IObserver> observer) { using (_read()) { @@ -64,9 +64,11 @@ namespace mbts.spark { public void Dispose() => Disposable.dispose(ref _dispose); - void _update_fills(TableUpdate fills) { + void _update_fills(LegacyTableUpdate fills) { using (_write()) { - Dictionary removed = new Dictionary(), added = new Dictionary(); + var removed = new Dictionary(); + var added = new Dictionary(); + foreach (FillImmutable fill in fills.removed) { FillTuple old_ft = new FillTuple(fill, _get_order(fill.OrderKey), _get_security_md(fill.SecurityKey)); removed.Add(old_ft.key, old_ft); diff --git a/src/client/spark/Orders/OrderActivitySummarizer.cs b/src/client/spark/Orders/OrderActivitySummarizer.cs index 7e3c7e7ef..ed3327560 100644 --- a/src/client/spark/Orders/OrderActivitySummarizer.cs +++ b/src/client/spark/Orders/OrderActivitySummarizer.cs @@ -114,14 +114,7 @@ namespace bts.spark { void orders_updated(TableUpdate update) { - // Go though added and changed orders - var added = new HashSet(update.added, _id_comparer); - var changed = new HashSet(update.added, _id_comparer); - var removed = update.removed.ToDictionary(o => o.Key); - added.ExceptWith(update.removed); - changed.ExceptWith(added); - - foreach (var order in added) { + foreach (var order in update.added) { if (!string.IsNullOrEmpty(order.State.LastMsg) && order.State.Created.ToDateTime().Date == DateTime.Today) { (var security, var spec) = get_security(order.Def.SecurityKey); if (security.HasValue) { @@ -130,8 +123,7 @@ namespace bts.spark { } } - foreach (var neworder in changed) { - var oldorder = removed[neworder.Key]; + foreach (var (neworder, oldorder) in update.changes) { (var security, var spec) = get_security(neworder.Def.SecurityKey); // // description diff --git a/src/client/spark/Orders/OrderRecordTupleSource.cs b/src/client/spark/Orders/OrderRecordTupleSource.cs index 114859b1c..2b57ebfa9 100644 --- a/src/client/spark/Orders/OrderRecordTupleSource.cs +++ b/src/client/spark/Orders/OrderRecordTupleSource.cs @@ -45,7 +45,7 @@ namespace mbts.spark { OrderRecordTupleSource(IObservable> securities, IObservable> orders) => _dispose = Disposable.Create( securities.OnDispatcher().Subscribe(_update_securities), - orders.OnDispatcher().Subscribe(_update_orders)); + orders.OnDispatcher().AddRemoveOnly().Subscribe(_update_orders)); public IDisposable Subscribe(IObserver> observer) { using (_rw_gate.read()) { @@ -56,7 +56,7 @@ namespace mbts.spark { public void Dispose() => Disposable.dispose(ref _dispose); - void _update_orders(TableUpdate orders) { + void _update_orders(LegacyTableUpdate orders) { using (_rw_gate.write()) { Dictionary removed = new Dictionary(), added = new Dictionary(); foreach (OrderRecordImmutable order in orders.removed) { diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 4a5b2a51a..d54a96675 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -7,9 +7,11 @@ using mbts.spark.utilities; using mbts.utils; using System; using System.Collections.Generic; +using System.Collections.Immutable; using System.Collections.Specialized; using System.ComponentModel.Composition; using System.Linq; +using System.Reactive.Concurrency; using System.Reactive.Linq; using System.Threading.Tasks; @@ -32,17 +34,21 @@ namespace mbts.spark { _service = service; _spreader = spreader; _error = error; - on_orders = _service.subscribei_orders().Table().Cache(); - IReadOnlyDictionary empty_orders = new Dictionary(); + var scheduler = ThreadPoolScheduler.Instance; + var interval = TimeSpan.FromMilliseconds(100); + on_orders = _service.subscribei_orders().Naggle(interval, scheduler).Table().Cache(); working_orders = - on_orders.Scan(empty_orders, (worders, table) => _update_working_orders(worders, table)).Replay(1).RefCount(); + on_orders.Scan( + ImmutableDictionary.Empty, + (workers, table) => _update_working_orders(workers, table)) + .Replay(1).RefCount(); on_order_tuples = OrderRecordTupleSource.create_observable(bus.subscribe(SparkTags.SecuritiesTag), on_orders); - on_fills = _service.subscribei_fills().Table().Cache(); + on_fills = _service.subscribei_fills().Naggle(interval, scheduler).Table().Cache(); _activity = new OrderActivitySummarizer(bus, on_orders); on_fill_tuples = FillTupleSource.create_observable(bus.subscribe(SparkTags.SecuritiesTag), on_orders, on_fills); _security_orders_demuxer = new TableUpdateDemuxer(o => o.Key, o => o.security_key()); _dispose = Disposable.Create( - on_orders.Subscribe(_security_orders_demuxer), + on_orders.AddRemoveOnly().Subscribe(_security_orders_demuxer), _bus.subscribe(SparkTags.CreateOrder).Subscribe(a => send_order(a.definition, a.price, a.size).ignore()), _bus.subscribe(SparkTags.RecreateOrder).Subscribe(a => a.ForEach(x => send_order(x.definition, x.price, x.size).ignore())), _bus.subscribe(SparkTags.CancelOrders).Subscribe(x => cancel_orders(x).ignore()), @@ -122,17 +128,27 @@ namespace mbts.spark { public void Dispose() => Disposable.dispose(ref _dispose); - static IReadOnlyDictionary _update_working_orders(IReadOnlyDictionary target, TableUpdate table) { - var clone = new Dictionary((IDictionary)target); + static ImmutableDictionary _update_working_orders(ImmutableDictionary target, TableUpdate table) { + var clone = target.ToBuilder(); foreach (var o in table.removed) { - if (o.is_active()) + if (o.is_active()) { clone.Remove(o.Key); + } + } + foreach (var o in table.changed) { + if (o.is_active()) { + clone[o.Key] = o; + } + else { + clone.Remove(o.Key); + } } foreach (var o in table.added) { - if (o.is_active()) + if (o.is_active()) { clone.Add(o.Key, o); + } } - return clone; + return clone.ToImmutableDictionary(); } } @@ -235,7 +251,7 @@ namespace mbts.spark { } // ** [continue comment at top of method] this call would otherwise be: // rod.last_update = rod.last_update.update(removed_dict.Values.ToList(), added_dict.Values.ToList(), o => o.Key) ** - rod.last_update = rod.last_update.update(removed_roots, added_roots, o => o.Key); + //rod.last_update = rod.last_update.update(removed_roots, added_roots, o => o.Key); return rod; }).Select(r => r.last_update); diff --git a/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs b/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs index 4cd9fed60..e4556752d 100644 --- a/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs @@ -70,10 +70,6 @@ namespace mbts } #endregion - public static T choose(this Random r, IEnumerable range) { - var index = r.Next(0, range.Count()); - return range.Skip(index).First(); - } // Iterate through a list 1,2,3,4 and return the items in pairwise tuples (1,2), (2,3), (3,4) // This is better than using Zip+Skip because it iterates the collectiononly once diff --git a/src/client/spark/core/Utility/ObservableDemuxer.cs b/src/client/spark/core/Utility/ObservableDemuxer.cs index 59b82e9ce..d51e9dc2a 100644 --- a/src/client/spark/core/Utility/ObservableDemuxer.cs +++ b/src/client/spark/core/Utility/ObservableDemuxer.cs @@ -81,7 +81,7 @@ namespace mbts.utils { protected override IDictionary demux(IDictionary input) => input; } - class TableUpdateDemuxer : IObservableDemuxer, ITableUpdateTransform> + class TableUpdateDemuxer : IObservableDemuxer, ITableUpdateTransform> where TKey : IEquatable where TGroupKey : IEquatable { readonly ConcurrentDictionary _map = new ConcurrentDictionary(); @@ -104,7 +104,7 @@ namespace mbts.utils { public void OnCompleted() { } public void OnError(Exception error) { } - public void OnNext(TableUpdate table) { + public void OnNext(LegacyTableUpdate table) { var changes = new Dictionary(); foreach (T value in table.added) changes.AddOrUpdate(_group_key(value), gk => ChangeSet.from_added(value), (gk, cs) => cs.added.Add(value)); diff --git a/src/client/spark/core/Utility/TableUpdateTransform.cs b/src/client/spark/core/Utility/TableUpdateTransform.cs index bf4fe4e6e..a694fafe3 100644 --- a/src/client/spark/core/Utility/TableUpdateTransform.cs +++ b/src/client/spark/core/Utility/TableUpdateTransform.cs @@ -14,8 +14,8 @@ namespace mbts.utils { interface ITableUpdateTransform where TKey : IEquatable { IReadOnlyDictionary state { get; } - IReadOnlyList added { get; } - IReadOnlyList removed { get; } + IEnumerable added { get; } + IEnumerable removed { get; } } class IncrementalUpdate : IIncrementalUpdate where TKey : IEquatable { @@ -33,20 +33,20 @@ namespace mbts.utils { class TableUpdateTransform : ITableUpdateTransform where TKey : IEquatable { readonly Dictionary _state; - readonly IReadOnlyList _added, _removed; + readonly IEnumerable _added, _removed; internal TableUpdateTransform() : this(new Dictionary(), new List(0), new List(0)) { } - internal TableUpdateTransform(Dictionary init, IReadOnlyList added, IReadOnlyList removed) { + internal TableUpdateTransform(Dictionary init, IEnumerable added, IEnumerable removed) { _state = init; _added = added; _removed = removed; } public IReadOnlyDictionary state => _state; - public IReadOnlyList added => _added; - public IReadOnlyList removed => _removed; + public IEnumerable added => _added; + public IEnumerable removed => _removed; public TableUpdateTransform update(Update update) => this.update(update.removed, update.added, update.key); @@ -54,7 +54,7 @@ namespace mbts.utils { public TableUpdateTransform update(TableUpdate update, Func key) => this.update(update.removed, update.added, key); - public TableUpdateTransform update(IReadOnlyList removed, IReadOnlyList added, Func key) { + public TableUpdateTransform update(IEnumerable removed, IEnumerable added, Func key) { var table = new TableUpdateTransform(new Dictionary(_state), added, removed); foreach (var item in removed) table._state.Remove(key(item)); @@ -86,7 +86,7 @@ namespace mbts.utils { public static IObservable> filter(this IObservable> source, Func predicate) where TKey : IEquatable => source .Select(u => new FilteredTableUpdateTransform(u, predicate)) - .Where(u => u.added.Count > 0 || u.removed.Count > 0); + .Where(u => u.added.Any() || u.removed.Any()); /// /// Makes a 1:1 conversion to an IncrementalUpdate sequence of TResult (TKey remains the same). @@ -143,8 +143,8 @@ namespace mbts.utils { } public IReadOnlyDictionary state { get; } - public IReadOnlyList added { get; } - public IReadOnlyList removed { get; } + public IEnumerable added { get; } + public IEnumerable removed { get; } } class PivotIncrementalUpdate : IIncrementalUpdate where TKey : IEquatable where TResultKey : IEquatable { @@ -208,7 +208,7 @@ namespace mbts.utils { internal PivotTableUpdateTransform(Func selector, Func result_key, Func key) : this(new Dictionary(), new List(0), new List(0), new SetMap(), selector, result_key, key) { } - PivotTableUpdateTransform(Dictionary state, IReadOnlyList added, IReadOnlyList removed, + PivotTableUpdateTransform(Dictionary state, IEnumerable added, IEnumerable removed, SetMap key_map, Func selector, Func result_key, Func key) { // _state = state; @@ -221,8 +221,8 @@ namespace mbts.utils { } public IReadOnlyDictionary state => _state; - public IReadOnlyList added { get; } - public IReadOnlyList removed { get; } + public IEnumerable added { get; } + public IEnumerable removed { get; } public PivotTableUpdateTransform update(ITableUpdateTransform table) { Dictionary removed = new Dictionary(), added = new Dictionary(); diff --git a/src/client/spark/view/Spark/Core/SparkUtils.cs b/src/client/spark/view/Spark/Core/SparkUtils.cs index 20e5f6b6e..0a67b4167 100644 --- a/src/client/spark/view/Spark/Core/SparkUtils.cs +++ b/src/client/spark/view/Spark/Core/SparkUtils.cs @@ -94,23 +94,6 @@ namespace mbts.spark { public static bool try_get(this TableUpdate table, TKey key, out T result) where TKey : IEquatable => table.state.TryGetValue(key, out result); - public static void detect_changed_keys(this TableUpdate table, Func key_selector, out HashSet removed_keys, out HashSet added_keys, out HashSet changed_keys) - where TKey : IEquatable { - removed_keys = new HashSet(table.removed.Select(key_selector)); - added_keys = new HashSet(table.added.Select(key_selector)); - changed_keys = new HashSet(removed_keys.Intersect(added_keys)); - removed_keys.ExceptWith(changed_keys); - added_keys.ExceptWith(changed_keys); - } - - public static void detect_changed_keys(this ITableUpdateTransform table, Func key_selector, out HashSet removed_keys, out HashSet added_keys, out HashSet changed_keys) - where TKey : IEquatable { - removed_keys = new HashSet(table.removed.Select(key_selector)); - added_keys = new HashSet(table.added.Select(key_selector)); - changed_keys = new HashSet(removed_keys.Intersect(added_keys)); - removed_keys.ExceptWith(changed_keys); - added_keys.ExceptWith(changed_keys); - } #endregion public static class UI { diff --git a/src/client/spark/view/Utility/RXCollection.cs b/src/client/spark/view/Utility/RXCollection.cs index 42d2e4f2d..135dbb0e3 100644 --- a/src/client/spark/view/Utility/RXCollection.cs +++ b/src/client/spark/view/Utility/RXCollection.cs @@ -52,17 +52,6 @@ namespace mbts.ui.utility { } }); - public static ITableUpdateCollection CreateTableUpdate(IObservable> source) where TKey : IEquatable => - CreateTableUpdate(source, _ => true); - - public static ITableUpdateCollection CreateTableUpdate(IObservable> source, Func collection_filter) where TKey : IEquatable => - new TableUpdateCollection(source, collection_filter ?? new Func(_ => true)); - - public static ITableUpdateCollection CreateTableUpdate(IObservable> source) where TKey : IEquatable => - CreateTableUpdate(source, _ => true); - - public static ITableUpdateCollection CreateTableUpdate(IObservable> source, Func collection_filter) where TKey : IEquatable => - new TableUpdateTransformCollection(source, collection_filter ?? new Func(_ => true)); public static IRXCollection CreateIncrementalUpdate(IObservable> source) where TKey : IEquatable => new IncrementalUpdateCollection(source); @@ -83,24 +72,6 @@ namespace mbts.ui.utility { public void Dispose() => Disposable.dispose(ref _sub); } - class TableUpdateCollection : ObservableCollection, ITableUpdateCollection where TKey : IEquatable { - readonly Func _collection_filter; - IReadOnlyDictionary _raw_state = new ReadOnlyDictionary(new Dictionary()); - IDisposable _sub; - - internal TableUpdateCollection(IObservable> source, Func collection_filter) { - _collection_filter = collection_filter; - _sub = source.OnDispatcher().Subscribe(u => { - _raw_state = u.state; - foreach (T val in u.removed.Where(_collection_filter)) Remove(val); - foreach (T val in u.added.Where(_collection_filter)) Add(val); - }); - } - - public bool TryGetValue(TKey key, out T result) => _raw_state.TryGetValue(key, out result); - public void Dispose() => Disposable.dispose(ref _sub); - } - class TableUpdateTransformCollection : ObservableCollection, ITableUpdateCollection where TKey : IEquatable { readonly Func _collection_filter; IReadOnlyDictionary _raw_state = new ReadOnlyDictionary(new Dictionary()); diff --git a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs index 52ccac268..6cf3ecb6b 100644 --- a/src/client/spark_api/api/Channels/QuickBusClientChannel.cs +++ b/src/client/spark_api/api/Channels/QuickBusClientChannel.cs @@ -57,30 +57,34 @@ namespace bts.api.core { } public unsafe override IObservable> subscribe(string method_and_qualifier, MessageParser parser, Func converter) { - bool first_update = true; var result = Observable.Create>(observer => { + bool first_update = true; + // Memory optimization. There is only one update per subscription. + RawUpdate the_update = new RawUpdate(); ApiNativeMethods.raw_subscription_callback cb = (event_type, changes, change_count, unused) => { + the_update.Clear(); try { if (event_type == ApiNativeMethods.EventType.TABLE_UPDATED) { - var added_items = new List(change_count); - var added_keys = new List(change_count); - var removed_keys = new List(change_count); foreach (var change in changes) { - if (change.type != ApiNativeMethods.ChangeType.REMOVE) { - // create or change - added_items.Add( converter( parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); - added_keys.Add(change.key); - } - if (change.type != ApiNativeMethods.ChangeType.CREATE) { - // removed or changed - removed_keys.Add(change.key); + switch (change.type) { + case ApiNativeMethods.ChangeType.REMOVE: + the_update.removed_keys.Add(change.key); + break; + case ApiNativeMethods.ChangeType.REPLACE: + the_update.changed_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); + the_update.changed_keys.Add(change.key); + break; + case ApiNativeMethods.ChangeType.CREATE: + the_update.added_items.Add(converter(parser.ParseFrom(new UnmanagedMemoryStream(change.buffer, change.buffer_len)))); + the_update.added_keys.Add(change.key); + break; } } - observer.OnNext(new RawUpdate(added_items, added_keys, removed_keys)); + observer.OnNext(the_update); } else if (event_type == ApiNativeMethods.EventType.TABLE_CREATED) { if (!first_update) { - observer.OnNext(RawUpdate.Reset()); + observer.OnNext(the_update.MarkAsReset()); } first_update = false; } @@ -88,7 +92,7 @@ namespace bts.api.core { catch (Exception e) { ApiNativeMethods.api_client_log_error($"Exception in subscription callback for sub: '{method_and_qualifier}' \n--\n '{e}'"); // Sleep to let the log message get asyncronously written to disk - System.Threading.Thread.Sleep(100); + Thread.Sleep(100); Environment.Exit(-1); } }; diff --git a/src/client/spark_api/api/Update.cs b/src/client/spark_api/api/Update.cs index 85056d0e0..075485975 100644 --- a/src/client/spark_api/api/Update.cs +++ b/src/client/spark_api/api/Update.cs @@ -1,84 +1,204 @@ using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; +using System.Diagnostics; using System.Linq; +using System.Reactive.Concurrency; +using System.Reactive.Disposables; using System.Reactive.Linq; namespace bts.api.core { - public struct RawUpdate { + class RawUpdate { // RawUpdate uses List instead of IReadonlyList to avoid virtual dispatch on a type not likely to be see in a public api surface - public RawUpdate(List added_items, List added_keys, List removed_keys) : this() { + // There is a single stack allocated RawUpdate per subscription + public RawUpdate() { is_reset = false; - this.added_items = added_items; - this.added_keys = added_keys; - this.removed_keys = removed_keys; + added_items = new List(); + added_keys = new List(); + changed_items = new List(); + changed_keys = new List(); + removed_keys = new List(); + } + public RawUpdate MarkAsReset() { + Clear(); + is_reset = true; + return this; } - public static RawUpdate Reset() { - return new RawUpdate() { is_reset = true }; + public void Clear() { + is_reset = false; + added_items.Clear(); + added_keys.Clear(); + changed_items.Clear(); + changed_keys.Clear(); + removed_keys.Clear(); } + public bool is_reset { get; private set; } + public List added_items { get; } + public List added_keys { get; } + public List changed_items { get; } + public List changed_keys { get; } + public List removed_keys { get; } - public bool is_reset; - public List added_items { get; private set; } - public List added_keys { get; private set; } - public List removed_keys { get; private set; } +#if DEBUG + public override string ToString() { + var added = string.Join(", ", added_items); + var changed = string.Join(", ", changed_items); + var removed = string.Join(", ", removed_keys); + return $"added [{added}] changed [{changed}] removed [{removed}]"; + } +#endif } public class Update where TKey : IEquatable { private Func _key; - public Update(IReadOnlyCollection all, IReadOnlyList added, IReadOnlyList removed, Func key_extractor) { + internal Update( + IReadOnlyCollection all, + IEnumerable added, + IEnumerable<(T New,T Old)> changes, + IEnumerable removed, + Func key_extractor) { this.added = added; this.removed = removed; + this.changes = changes; this.all = all; _key = key_extractor; } - public IReadOnlyCollection all { get; private set; } - public IReadOnlyList added { get; private set; } - public IReadOnlyList removed { get; private set; } + public static Update empty(Func key_extractor) => + new Update(new T[0], new T[0], new (T,T)[0], new T[0], key_extractor); + + public Update merge(Update next) { + var comp = new RowEqualityComparer(_key); + var added = this.added as HashSet ?? new HashSet(this.added, comp); + var changes = this.changed as HashSet<(T New,T Old)> ?? new HashSet<(T,T)>(this.changes, comp); + var removed = this.removed as HashSet ?? new HashSet(this.removed, comp); + + // Add + added.UnionWith(next.added); + + // Change + foreach (var c in next.changes) { + if (added.Contains(c.Old)) { + added.Remove(c.Old); + added.Add(c.New); + } + else { + // Remove does not error if it was not present + changes.Remove(c); + changes.Add(c); + } + } + + // Remove + foreach (var r in next.removed) { + if (!added.Remove(r)) { + removed.Add(r); + } + changes.Remove((r,r)); + } + + return new Update( + next.all, + added, changes, removed, + _key + ); + } + + public IReadOnlyCollection all { get; } + public IEnumerable added { get; } + public IEnumerable<(T New,T Old)> changes { get; } + public IEnumerable changed => changes.Select(c => c.New); + public IEnumerable removed { get; } public TKey key(T t) { return _key(t); } } + struct RowEqualityComparer : IEqualityComparer, IEqualityComparer<(T,T)> + where TKey : IEquatable { + readonly Func _key; + + public RowEqualityComparer(Func key) { + _key = key; + } + + public bool Equals(T x, T y) { + return _key(x).Equals(_key(y)); + } + + public bool Equals((T, T) x, (T, T) y) { + return Equals(x.Item1, y.Item1); + } + + public int GetHashCode(T obj) { + return _key(obj).GetHashCode(); + } + + public int GetHashCode((T, T) obj) { + return GetHashCode(obj.Item1); + } + } + public class TableUpdate where TKey : IEquatable { - ImmutableDictionary _state; + readonly ImmutableDictionary _state; - internal TableUpdate(ImmutableDictionary init, IReadOnlyList added, IReadOnlyList removed) { + internal TableUpdate( + ImmutableDictionary init, + IEnumerable added, + IEnumerable<(T,T)> changed, + IEnumerable removed) { _state = init; this.added = added; + this.changes = changed; this.removed = removed; } public IReadOnlyDictionary state { get { return _state; } } - public IReadOnlyList added { get; } - public IReadOnlyList removed { get; } + public IEnumerable added { get; } + public IEnumerable<(T New,T Old)> changes { get; } + public IEnumerable changed => changes.Select(c => c.New); - internal TableUpdate update(Update update) => - this.update(update.removed, update.added, update.key); + public IEnumerable removed { get; } - internal TableUpdate update(IReadOnlyList removed, IReadOnlyList added, Func key) { - var builder = _state.ToBuilder(); - builder.RemoveRange(removed.Select(i => key(i))); - builder.AddRange(added.Select(i => new KeyValuePair(key(i), i))); - return new TableUpdate(builder.ToImmutableDictionary(), added, removed); + internal static TableUpdate update(TableUpdate table, Update update) { + var builder = table._state.ToBuilder(); + builder.RemoveRange(update.removed.Select(i => update.key(i))); + builder.AddRange(update.added.Select(i => new KeyValuePair(update.key(i), i))); + foreach (var i in update.changed) { + builder[update.key(i)] = i; + } + return new TableUpdate(builder.ToImmutableDictionary(), update.added, update.changes, update.removed); } internal TableUpdate as_snapshot() { - return new TableUpdate(_state, _state.Values.ToList(), new T[0]); + return new TableUpdate(_state, _state.Values.ToList(), new (T,T)[0], new T[0]); } } + internal class LegacyTableUpdate where TKey : IEquatable { + public LegacyTableUpdate( + TableUpdate update) { + this.state = update.state; + this.added = update.added.Concat(update.changes.Select(t => t.New)); + this.removed = update.removed.Concat(update.changes.Select(t => t.Old)); + } + public IReadOnlyDictionary state { get; } + public IEnumerable added { get; } + public IEnumerable removed { get; } + } + public static class ObservableUpdateExtensions { - public static IObservable> reconstitute(this IObservable> source, Func key_extractor) where TKey : IEquatable { + internal static IObservable> reconstitute(this IObservable> source, Func key_extractor) where TKey : IEquatable { var state = new Dictionary(); return source.Select(raw => { if (raw.is_reset) { var removed = state.Values.ToList(); state.Clear(); - return new Update(new T[0], new T[0], removed, key_extractor); + return new Update(new T[0], new T[0], new (T,T)[0], removed, key_extractor); } else { var removed = new List(raw.removed_keys.Count); @@ -92,15 +212,56 @@ namespace bts.api.core { for (int x = 0; x < raw.added_items.Count; ++x) { state[raw.added_keys[x]] = raw.added_items[x]; } - return new Update(state.Values, raw.added_items, removed, key_extractor); + List<(T, T)> changes = new List<(T, T)>(raw.changed_items.Count); + for (int x = 0; x < raw.changed_items.Count; ++x) { + var old = state[raw.changed_keys[x]]; + state[raw.changed_keys[x]] = raw.changed_items[x]; + changes.Add((raw.changed_items[x], old)); + } + return new Update(state.Values.ToList(), raw.added_items.ToList(), changes, removed, key_extractor); } }); } public static IObservable> Table(this IObservable> source) where TKey : IEquatable => source.Scan( - new TableUpdate(ImmutableDictionary.Empty, new List(), new List()), - (table, update) => table.update(update)); + new TableUpdate(ImmutableDictionary.Empty, new T[0], new (T,T)[0], new T[0]), + (table, update) => TableUpdate.update(table,update)); + + // Fold updates and emit at max 1/interval + public static IObservable> Naggle(this IObservable> source, TimeSpan interval, IScheduler scheduler) where TKey : IEquatable { + // fold updates together and emit on TimeSpan (max) interval. Emit on threadpool + return Observable.Create>(observer => { + object guard = new object(); + Update cache = null; + bool finished = false; + + var d1 = source.Subscribe(update => { + // subscribe to the source, merge updates (Quickbus thread) + lock (guard) { + if (cache == null) cache = update; + else cache = cache.merge(update); + } + }, + () => { finished = true; }); + // publish on interval + var d2 = Observable.Interval(interval, scheduler).Subscribe(_ => { + Update update; + lock (guard) { + update = cache; + cache = null; + } + if (update != null) { + observer.OnNext(update); + } + if (finished) { + observer.OnCompleted(); + } + }); + + return new CompositeDisposable(d1, d2); + }); + } public static IObservable> Cache(this IObservable> source) where TKey : IEquatable { var inner = source.Replay(1).RefCount(); @@ -118,5 +279,9 @@ namespace bts.api.core { }); } + internal static IObservable> AddRemoveOnly(this IObservable> source) where TKey : IEquatable { + return source.Select(t => new LegacyTableUpdate(t)); + } + } } \ No newline at end of file diff --git a/src/client/spark_core/TestRunner/InProcessTestRunner.cs b/src/client/spark_core/TestRunner/InProcessTestRunner.cs index 7e3a22f45..4bab68419 100644 --- a/src/client/spark_core/TestRunner/InProcessTestRunner.cs +++ b/src/client/spark_core/TestRunner/InProcessTestRunner.cs @@ -37,11 +37,11 @@ namespace bts.test { result.Status = TestResult.Types.Step.Pass; } catch (AssertFailture af) { - result.Message = $"Assertion Failure: {af.Message}\nLocation:{af._filename}:{af._line}"; + result.Message = $"Assertion Failure:\n{af.Message}\nLocation:{af._filename}:{af._line}"; } catch (Exception ue) { if (ue.InnerException is AssertFailture af) { - result.Message = $"Assertion Failure: {af.Message}\nLocation:{af._filename}:{af._line}"; + result.Message = $"Assertion Failure:\n{af.Message}\nLocation:{af._filename}:{af._line}"; } else { result.Message = $"Unexpected error: {ue.Message}\n\n{ue.StackTrace}"; diff --git a/src/client/spark_core/TestRunner/TestAssert.cs b/src/client/spark_core/TestRunner/TestAssert.cs index 6c0267d1b..9351f1d79 100644 --- a/src/client/spark_core/TestRunner/TestAssert.cs +++ b/src/client/spark_core/TestRunner/TestAssert.cs @@ -18,28 +18,32 @@ namespace bts.test { } public static void IsTrue(bool test, string msg="", [CallerFilePath] string file="", [CallerLineNumber] int line=0) { if (!test) { - throw new AssertFailture($"Expected 'true' got 'false'. {msg}", file, line); + throw new AssertFailture($"Expected: 'true' got 'false'. {msg}", file, line); } } + public static void That(bool test, string msg = "", [CallerFilePath] string file = "", [CallerLineNumber] int line = 0) { + Assert.IsTrue(test, msg, file, line); + } public static void IsFalse(bool test, string msg="", [CallerFilePath] string file="", [CallerLineNumber] int line=0) { if (test) { - throw new AssertFailture($"Expected 'false' got 'true'. {msg}", file, line); + throw new AssertFailture($"Expected: 'false' got 'true'. {msg}", file, line); } } public static void AreEqual(T a, T b, string msg="", [CallerFilePath] string file="", [CallerLineNumber] int line=0) { if (!a.Equals(b)) { throw new AssertFailture( - $"Expected '{a}' == '{b}'. {msg}", file, line); + $"Expected: '{a}' == '{b}'. {msg}", file, line); } } - public static void AreEqual(IEnumerable a, IEnumerable b, string msg="", [CallerFilePath] string file="", [CallerLineNumber] int line=0) { + public static void SequenceEqual(IEnumerable a, IEnumerable b, string msg="", [CallerFilePath] string file="", [CallerLineNumber] int line=0) { if (!a.SequenceEqual(b)) { var aa = string.Join(", ", a); var bb = string.Join(", ", b); throw new AssertFailture( - $"Expected [{aa}] == [{bb}]. {msg}", file, line); + $"Expected: [{aa}]\nGot: [{bb}]. {msg}", file, line); } } + public static void IsNotNull(T a, string msg="", [CallerFilePath] string file="", [CallerLineNumber] int line=0) where T : class { @@ -53,7 +57,7 @@ namespace bts.test { if (!items.Contains(item)) { var aa = string.Join(", ", items); throw new AssertFailture( - $"Expected {item} in [{aa}]. {msg}", file, line); + $"Expected: {item} in [{aa}]. {msg}", file, line); } } } diff --git a/src/client/spark_core/TestRunner/TestResultReceiver.cs b/src/client/spark_core/TestRunner/TestResultReceiver.cs index 1afd28780..72a052c84 100644 --- a/src/client/spark_core/TestRunner/TestResultReceiver.cs +++ b/src/client/spark_core/TestRunner/TestResultReceiver.cs @@ -61,6 +61,7 @@ namespace bts.test { if (!string.IsNullOrEmpty(type)) { ConsoleEx.Write($" - {type}", ConsoleColor.DarkRed); } + Console.WriteLine(); if (!string.IsNullOrEmpty(result.Message)) { ConsoleEx.Write("==>", ConsoleColor.White, ConsoleColor.DarkRed); Console.Write(" "); diff --git a/src/client/spark_core/utils/GlobalExtensions.cs b/src/client/spark_core/utils/GlobalExtensions.cs index 1bd8a164e..3c05994a1 100644 --- a/src/client/spark_core/utils/GlobalExtensions.cs +++ b/src/client/spark_core/utils/GlobalExtensions.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using System.Linq; using System.Runtime.InteropServices; using System.Text; @@ -17,6 +19,10 @@ namespace mbts { } return sb.ToString(); } + public static T choose(this Random r, IEnumerable range) { + var index = r.Next(0, range.Count()); + return range.Skip(index).First(); + } [DllImport("libspark")] private static extern void ll_to_parts(UInt64 ll_time, out int year, out int month, out int day, out int hour, out int minute, out int second, out int ms); diff --git a/src/client/spark_test/api/ApiTests.cs b/src/client/spark_test/api/ApiTests.cs index d0f1d3e12..d1682bdb7 100644 --- a/src/client/spark_test/api/ApiTests.cs +++ b/src/client/spark_test/api/ApiTests.cs @@ -77,16 +77,16 @@ namespace mbts.api.Test { var response = h.say_hello(new HelloRequest() { Name = "UnitTest 1" }); Assert.AreEqual("Hello UnitTest 1", response.Message); Assert.IsNotNull(last_update); - Assert.IsTrue(last_update.added.Count == 1); - Assert.IsTrue(last_update.removed.Count == 0); + Assert.IsTrue(last_update.added.Count() == 1); + Assert.IsTrue(last_update.removed.Count() == 0); Assert.IsTrue(last_update.state.Count == 1); Assert.IsTrue(last_update.state.Single().Value.Message == "Hello UnitTest 1"); last_update = null; response = h.yell_hello(new HelloRequest() { Name = "UnitTest 2" }); Assert.AreEqual("HELLO UNITTEST 2", response.Message); Assert.IsNotNull(last_update); - Assert.IsTrue(last_update.added.Count == 1); - Assert.IsTrue(last_update.removed.Count == 1); + Assert.IsTrue(last_update.added.Count() == 1); + Assert.IsTrue(last_update.removed.Count() == 1); Assert.IsTrue(last_update.state.Count == 1); Assert.IsTrue(last_update.state.Single().Value.Message == "HELLO UNITTEST 2"); last_update = null; @@ -97,8 +97,8 @@ namespace mbts.api.Test { response = h.yell_hello(new HelloRequest() { Name = "UnitTest 3" }); Assert.AreEqual("HELLO UNITTEST 3", response.Message); Assert.IsNotNull(last_update); - Assert.IsTrue(last_update.added.Count == 1); - Assert.IsTrue(last_update.removed.Count == 1); + Assert.IsTrue(last_update.added.Count() == 1); + Assert.IsTrue(last_update.removed.Count() == 1); Assert.IsTrue(last_update.state.Count == 1); Assert.IsTrue(last_update.state.Single().Value.Message == "HELLO UNITTEST 3"); last_update = null; @@ -108,8 +108,8 @@ namespace mbts.api.Test { _ntest.run_shout_service(null); response = h.yell_hello(new HelloRequest() { Name = "UnitTest 4" }); Assert.AreEqual("HELLO UNITTEST 4", response.Message); - Assert.IsTrue(last_update.added.Count == 1); - Assert.IsTrue(last_update.removed.Count == 1); + Assert.IsTrue(last_update.added.Count() == 1); + Assert.IsTrue(last_update.removed.Count() == 1); Assert.IsTrue(last_update.state.Count == 1); Assert.IsTrue(last_update.state.Single().Value.Message == "HELLO UNITTEST 4"); last_update = null; diff --git a/src/client/spark_test/api/ApiUpdateTests.cs b/src/client/spark_test/api/ApiUpdateTests.cs new file mode 100644 index 000000000..e9c28d5a2 --- /dev/null +++ b/src/client/spark_test/api/ApiUpdateTests.cs @@ -0,0 +1,231 @@ +using bts.api.core; +using System.Collections.Generic; +using bts.test; +using System; +using System.Reactive.Linq; +using System.Threading.Tasks; +using System.Linq; +using System.Reactive.Concurrency; + +namespace mbts.api.Test { + [TestGroup] + public class ApiUpdateTests { + int _id = 0; + List _item_pool; + + public ApiUpdateTests() { + // Generate a pool of items + _item_pool = Enumerable.Range(1, 50).Select(i => mkitem()).ToList(); + } + + class Item : IEquatable { + public Item(int id, string name) { + this.id = id; + this.name = name; + } + public int id { get; } + public string name { get; } + public override string ToString() => $"{id}-{name}"; + public override bool Equals(object obj) { + if (obj is Item i) { + return this.Equals(i); + } + return false; + } + public override int GetHashCode() { + return ToString().GetHashCode(); + } + + public bool Equals(Item other) { + return id == other.id && name == other.name; + } + } + static int id(Item i) => i.id; + + Item mkitem() { + return new Item(++_id, Guid.NewGuid().ToString().Substring(0,8)); + } + + IObservable> validate_incremental(IObservable> source) { + // strip the state from source and turn it back into a 'raw' update + // then use the (well tested) reconstitute function to re-build the state from the increments + return source.Select(u => { + var r = new RawUpdate(); + r.added_items.AddRange(u.added); + r.added_keys.AddRange(u.added.Select(id)); + r.changed_items.AddRange(u.changed); + r.changed_keys.AddRange(u.changed.Select(id)); + r.removed_keys.AddRange(u.removed.Select(id)); + return r; + }).reconstitute(id); + } + + async Task validate_naggle(IObservable> raw) { + var total = raw.ToEnumerable().Count(); + + // Validate that update is right at each point + // This will mostly be collapsing to add() + for (var count = 1; count < total; ++count) { + var orig = raw.Take(count).reconstitute(id).ToEnumerable().Last(); + var nag = await + validate_incremental( + raw + .Take(count) + .reconstitute(i => i.id) + .Naggle(TimeSpan.FromMilliseconds(1), CurrentThreadScheduler.Instance)).LastAsync(); + Assert.SequenceEqual(orig.all.OrderBy(id), nag.all.OrderBy(id)); + } + + // Do it again with TableUpdate + for (var count = 1; count < total; ++count) { + var orig = raw.Take(count).reconstitute(id).Table().ToEnumerable().Last(); + var nag = await + validate_incremental( + raw + .Take(count) + .reconstitute(i => i.id) + .Naggle(TimeSpan.FromMilliseconds(1), CurrentThreadScheduler.Instance)) + .Table() + .LastAsync(); + Assert.SequenceEqual(orig.state.Values.OrderBy(id), nag.state.Values.OrderBy(id)); + } + + // collapse rolling window + var update_list = raw.reconstitute(id).ToEnumerable().ToList(); + var window = 10; + for (int x = 0; x+window < total; x += 5) { + var start = update_list[x]; + var end = update_list[x + window]; + + var super_update = update_list.Skip(x).Take(window+1).Aggregate((u1, u2) => u1.merge(u2)); + start.merge(super_update); + Assert.SequenceEqual(end.all, super_update.all); + } + + } + + [Test] + public async Task test_add() { + // Add 1 item 10x + var raw = Observable.Create>(observer => { + RawUpdate rup = new RawUpdate(); + for (int x = 0; x < 50; ++x) { + rup.Clear(); + var item = _item_pool[x]; + rup.added_items.Add(item); + rup.added_keys.Add(item.id); + observer.OnNext(rup); + } + observer.OnCompleted(); + return Disposable.empty; + }); + + await validate_naggle(raw); + } + + [Test] + public Task test_remove() { + // Add 20 items, then remove 10 one at a time + var raw = Observable.Create>(observer => { + RawUpdate rup = new RawUpdate(); + // add 20 items + rup.added_items.AddRange(_item_pool.Take(20)); + rup.added_keys.AddRange(_item_pool.Take(20).Select(id)); + observer.OnNext(rup); + + for (int x = 0; x < 50; x+=2) { + rup.Clear(); + var item = _item_pool[x]; + rup.removed_keys.Add(item.id); + observer.OnNext(rup); + } + observer.OnCompleted(); + return Disposable.empty; + }); + + return validate_naggle(raw); + } + + [Test] + public Task test_update() { + // Add 20 items, then change all of their names to Taha + var raw = Observable.Create>(observer => { + RawUpdate rup = new RawUpdate(); + // add 20 items + rup.added_items.AddRange(_item_pool.Take(20)); + rup.added_keys.AddRange(_item_pool.Take(20).Select(id)); + observer.OnNext(rup); + + for (int x = 0; x < 20; x++) { + rup.Clear(); + var item = _item_pool[x]; + var item2 = new Item(item.id, "Taha"); + rup.changed_items.Add(item2); + rup.changed_keys.Add(item2.id); + observer.OnNext(rup); + } + observer.OnCompleted(); + return Disposable.empty; + }); + + return validate_naggle(raw); + } + + [Test] + public async Task test_random_walk() { + // Split items in half. + // Permute one collection in the direction of the other + var raw = Observable.Create>((observer) => { + Random r = new Random(42); + var even = _item_pool.Where(i => i.id % 2 == 0).Take(10).ToList(); + var odd = _item_pool.Where(i => i.id % 2 == 1).ToList(); + + RawUpdate rup = new RawUpdate(); + rup.added_items.AddRange(even); + rup.added_keys.AddRange(even.Select(i => i.id)); + observer.OnNext(rup); + + for (var x = 0; x < 200; ++x) { + rup = new RawUpdate(); + switch (r.Next(0, 3)) { + case 0: // add + if (odd.Count > 0) { + even.Add(odd[0]); + rup.added_items.Add(odd[0]); + rup.added_keys.Add(odd[0].id); + odd.RemoveAt(0); + observer.OnNext(rup); + } + break; + case 1: // remove + if (even.Count > 0) { + var item = r.choose(even); + even.Remove(item); + rup.removed_keys.Add(item.id); + observer.OnNext(rup); + } + break; + case 2: // change + if (even.Count > 0) { + var item = r.choose(even); + var item2 = new Item(item.id, "Jake"); + var index = even.IndexOf(item); + even[index] = item2; + rup.changed_items.Add(item2); + rup.changed_keys.Add(item2.id); + observer.OnNext(rup); + } + break; + } + } + + observer.OnCompleted(); + return Disposable.empty; + }); + + // Since this is deterministic randomness get the final collection + await validate_naggle(raw); + } + + } +} diff --git a/src/client/spark_test/api/SomeTests.cs b/src/client/spark_test/api/SomeTests.cs index 4b4602f7e..30c4ffcb5 100644 --- a/src/client/spark_test/api/SomeTests.cs +++ b/src/client/spark_test/api/SomeTests.cs @@ -6,8 +6,15 @@ using System.Threading.Tasks; namespace bts.test { //[TestGroup] - public class SomeTests { - // Tests for testing the tester + public class SomeTests : IDisposable { + SomeTests() { + // You can run common setup code here. + } + + public void Dispose() { + // Implement dispose if you need to clean up + } + [Test] public void test1() { Assert.IsTrue(true); diff --git a/src/client/spark_test/spark_test.csproj b/src/client/spark_test/spark_test.csproj index 1c2375581..1c755b687 100644 --- a/src/client/spark_test/spark_test.csproj +++ b/src/client/spark_test/spark_test.csproj @@ -3,6 +3,7 @@ net471 x64 + x64 diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index abaa78d5a..d84a00902 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cpp_config.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cpp_config.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cpp_config.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cpp_config.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp) \ No newline at end of file From e4e24c0999a1bcca2afac318505509218bb215e8 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 21 Aug 2018 17:49:30 -0400 Subject: [PATCH 081/126] Added DisplayStatus to OrderStatus --- src/lib/api/services/OrderService.proto | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 47bafd0d9..2961a86aa 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -156,6 +156,12 @@ message OrderState { google.protobuf.Timestamp created = 16; google.protobuf.Timestamp last_change = 8; + enum DisplayStatus { + VISIBLE = 0; + HIDDEN = 1; + } + DisplayStatus display_status=23; + oneof custom { // native order types MarketOrderState market = 9; // OrdType = 1 From 29fd10e57652df859c1772d024ef873a6eedb375 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 21 Aug 2018 17:03:24 -0500 Subject: [PATCH 082/126] SPARK-1559 - Badges - hide orders whose DisplayStatus is set to hidden --- src/client/spark/view/Spark/Ladder/LadderVM.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index c2e6151a6..15d22735b 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -83,7 +83,7 @@ namespace mbts.spark { // Here we manage N orders to 1 price slot in the ladder Dictionary> orders_used_in_this_update = new Dictionary>(_equality); - var ladders_orders = working.Values.Where(o => o.Def.SecurityKey == security.Id); + var ladders_orders = working.Values.Where(o => o.Def.SecurityKey == security.Id && (o.HasState && o.State.DisplayStatus == OrderState.Types.DisplayStatus.Visible)); foreach (var wo in ladders_orders) { var slot_price_target = wo.price(); var order_type = wo.order_type(); From a763c54a339c1caed06213f25e8697b7f32a4494 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 21 Aug 2018 19:12:14 -0400 Subject: [PATCH 083/126] LadderSettingsView - replace margins with Row/ColumnDefinitions for spacing --- .../view/Spark/Ladder/LadderSettingsView.xaml | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml b/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml index 8eeef5e1b..ddeb1f325 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml @@ -9,9 +9,17 @@ xmlns:cv="clr-namespace:mbts.ui.converters" xmlns:usp="clr-namespace:mbts.ui.spark" xmlns:txt="clr-namespace:mbts.ui.utility.text" + xmlns:sys="clr-namespace:System;assembly=mscorlib" TextElement.FontSize="{x:Static u:FontSizes.Small}" > + 4 + 8 + 8 + 24 + 4 + 6 + 8 @@ -62,20 +70,25 @@ + + + + - + - + + + - Order Badge Style - - Alternate Order Qty - - + Order Badge Style + + Alternate Order Qty + + @@ -148,7 +161,7 @@ - + From b5e6cfea8fcf3f1425a8dac9dddedd869521972d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 21 Aug 2018 20:22:07 -0400 Subject: [PATCH 084/126] make EnumerableStringConverter more robust --- .../GenericCollectionExtensions.cs | 13 ++++++++ .../EnumerableDoubleStringConverter.cs | 6 ++-- .../EnumerableStringConverter.cs | 32 +++++++++---------- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs b/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs index fe5d4e1cd..aeb7db9fd 100644 --- a/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs @@ -364,6 +364,19 @@ namespace System.Collections.Generic { if (condition) yield return get_value(); } + + /// + /// Uses to convert the elements of an to the specified type. + /// + /// The type to convert the elements of source to. + /// The that contains the elements to be cast to type + /// An that contains each element of the source sequence cast to the specified type. + /// is null. + public static IEnumerable convert(this IEnumerable source) { + ExceptionAssert.Argument.NotNull(source, nameof(source)); + foreach (object obj in source) + yield return ObjectHelper.try_convert(obj); + } } public static class CollectionExtensions diff --git a/src/client/spark/view/Converters/EnumerableStringConverters/EnumerableDoubleStringConverter.cs b/src/client/spark/view/Converters/EnumerableStringConverters/EnumerableDoubleStringConverter.cs index f320aae89..7d838bbee 100644 --- a/src/client/spark/view/Converters/EnumerableStringConverters/EnumerableDoubleStringConverter.cs +++ b/src/client/spark/view/Converters/EnumerableStringConverters/EnumerableDoubleStringConverter.cs @@ -1,9 +1,7 @@ using System; -namespace mbts.ui.converters -{ - public class EnumerableDoubleStringConverter : EnumerableStringConverter - { +namespace mbts.ui.converters { + class EnumerableDoubleStringConverter : EnumerableStringConverter { protected override double convert_item_back(string item_str) { double result; if (Double.TryParse(item_str, out result)) diff --git a/src/client/spark/view/Converters/EnumerableStringConverters/EnumerableStringConverter.cs b/src/client/spark/view/Converters/EnumerableStringConverters/EnumerableStringConverter.cs index 528bd176c..406e5f8cc 100644 --- a/src/client/spark/view/Converters/EnumerableStringConverters/EnumerableStringConverter.cs +++ b/src/client/spark/view/Converters/EnumerableStringConverters/EnumerableStringConverter.cs @@ -1,26 +1,22 @@ using System; +using System.Collections; using System.Collections.Generic; using System.Linq; using System.Windows.Data; -namespace mbts.ui.converters -{ - public abstract class EnumerableStringConverter : IValueConverter - { - protected EnumerableStringConverter() { +namespace mbts.ui.converters { + abstract class EnumerableStringConverter : IValueConverter { + protected EnumerableStringConverter() => Separator = " "; - } public string Separator { get; set; } - protected virtual string convert_item(T item) { return item.ToString(); } - protected virtual T convert_item_back(string item_str) { throw new NotImplementedException(); } - public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) { - if (value is IEnumerable) - return ((IEnumerable)value).Select(convert_item).list_string(Separator); - else - throw new ArgumentException("Expected 'Convert' input value to be {0}".fmt(typeof(IEnumerable))); + if (value is IEnumerable vals) { + return _format(vals); + } else if (value is IEnumerable ng_vals) { + return _format(ng_vals.convert()); + } else return value?.ToString(); } public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) { @@ -33,9 +29,13 @@ namespace mbts.ui.converters } else throw new ArgumentException("Expected 'ConvertBack' input value to be {0}".fmt(typeof(string))); } + + protected virtual string convert_item(T item) { return item.ToString(); } + protected virtual T convert_item_back(string item_str) { throw new NotImplementedException(); } + + string _format(IEnumerable vals) => + string.Join(Separator, vals.Select(convert_item)); } - public class EnumerableStringConverter : EnumerableStringConverter - { - } + class EnumerableStringConverter : EnumerableStringConverter { } } From 6608bee39f9c0aafd2e2bf7e97c8e042443a8410 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 21 Aug 2018 21:12:13 -0400 Subject: [PATCH 085/126] SPARK-1544 Ability to change number pad quantities in Ladder --- .../ObservableEditableCollection.cs | 5 ++ .../spark/core/Utility/IPropertyWrapperVM.cs | 25 +++++++ .../spark/core/Utility/ViewModelBase.cs | 14 +++- .../view/Spark/Ladder/LadderSettingsVM.cs | 15 +++- .../view/Spark/Ladder/LadderSettingsView.xaml | 74 ++++++++++++++++++- 5 files changed, 127 insertions(+), 6 deletions(-) diff --git a/src/client/spark/core/Collections/ObservableEditableCollection.cs b/src/client/spark/core/Collections/ObservableEditableCollection.cs index 871689b17..5eb412eae 100644 --- a/src/client/spark/core/Collections/ObservableEditableCollection.cs +++ b/src/client/spark/core/Collections/ObservableEditableCollection.cs @@ -4,6 +4,11 @@ using System.Collections.ObjectModel; using System.Windows.Input; namespace mbts.collections { + static class ObservableEditableCollection { + public static ObservableEditableCollection create() where T : new() => + new ObservableEditableCollection(() => new T()); + } + class ObservableEditableCollection : ObservableCollection { public ObservableEditableCollection(Func factory, bool insert_new_item_at_front = false) { AddItemCommand = insert_new_item_at_front ? new DelegateCommand(() => Insert(0, factory())) : new DelegateCommand(() => Add(factory())); diff --git a/src/client/spark/core/Utility/IPropertyWrapperVM.cs b/src/client/spark/core/Utility/IPropertyWrapperVM.cs index 3a8d85d27..7de0096a9 100644 --- a/src/client/spark/core/Utility/IPropertyWrapperVM.cs +++ b/src/client/spark/core/Utility/IPropertyWrapperVM.cs @@ -5,6 +5,7 @@ using mbts.ui.utility; using System; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.ComponentModel; using System.Linq; using System.Reactive.Linq; using System.Runtime.CompilerServices; @@ -30,6 +31,10 @@ namespace mbts.spark { void load_from(T value); } + interface IMutableValueWrapperVM : INotifyPropertyChanged { + T value { get; set; } + } + interface IViewValue { object value { get; } object view { get; } @@ -70,6 +75,12 @@ namespace mbts.spark { return vm; } + public static IMutableValueWrapperVM create_mutable_vm(T init = default) => + create_mutable_vm(EqualityComparer.Default, init); + + public static IMutableValueWrapperVM create_mutable_vm(IEqualityComparer comparer, T init = default) => + new MutableValueWrapperVM(comparer, init); + public static ITemplatedPropertyWrapperVM create_vm(string template_key, Func get, Action set, Dictionary> named_params = null) => new DelegatePropertyWrapperVM(template_key, get, set, named_params); @@ -88,6 +99,20 @@ namespace mbts.spark { public static IPropertyWrapperVM link(this IPropertyWrapperVM inner, Func get, Action set) => new LinkedPropertyWrapperVM(inner, get, set); + class MutableValueWrapperVM : ViewModelBase, IMutableValueWrapperVM { + readonly IEqualityComparer _comparer; + readonly Property _value; + + public MutableValueWrapperVM(IEqualityComparer comparer, T init) { + _comparer = comparer; + _value = backing(nameof(value), comparer, init); + } + + public T value { get => _value.Value; set => _value.set(value); } + + public override string ToString() => value?.ToString(); + } + class LinkedPropertyWrapperVM : ViewModelBase, IPropertyWrapperVM { readonly Func _get; readonly Action _set; diff --git a/src/client/spark/core/Utility/ViewModelBase.cs b/src/client/spark/core/Utility/ViewModelBase.cs index ec7195ef0..47a090dc8 100644 --- a/src/client/spark/core/Utility/ViewModelBase.cs +++ b/src/client/spark/core/Utility/ViewModelBase.cs @@ -113,8 +113,11 @@ namespace mbts.ui.shell protected delegate void PropertyChange(T oldval, T newval); // use nameof() to add compile time checks - protected Property backing(string name, T default_value = default(T)) { - return new Property(this, name, default_value); + protected Property backing(string name, T default_value = default(T)) => + backing(name, EqualityComparer.Default, default_value); + + protected Property backing(string name, IEqualityComparer comparer, T default_value = default(T)) { + return new Property(this, name, comparer, default_value); } protected Property backing(Expression> member, T default_value) { @@ -134,12 +137,17 @@ namespace mbts.ui.shell protected class Property : IObservable<(T oldval,T newval)> { readonly string _propname; + readonly IEqualityComparer _comparer; readonly ViewModelBase _owner; T _value; - public Property(ViewModelBase owner, string name, T default_value) { + public Property(ViewModelBase owner, string name, T default_value) + : this(owner, name, EqualityComparer.Default, default_value) { } + + public Property(ViewModelBase owner, string name, IEqualityComparer comparer, T default_value) { _owner = owner; _propname = name; + _comparer = comparer; _value = default_value; } diff --git a/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs b/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs index f117f8953..982e843e1 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderSettingsVM.cs @@ -1,8 +1,8 @@ using bts.api; +using mbts.collections; using mbts.ui; using mbts.ui.controls.color_picker; using mbts.ui.shell; -using mbts.ui.spark; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -32,6 +32,8 @@ namespace mbts.spark { _session_range_fill = new LadderMarketBreakLineVM("Session Range", 0, 0, false); public LadderSettingsVM() { + size_presets = new ObservableEditableCollection>(_create_size_preset_vm); + size_presets.CollectionChanged += (s, e) => RaisePropertyChanged(nameof(size_presets_text)); _badge_style = backing(nameof(badge_style)); _badge_style.Changed += _badge_style_Changed; _alternate_order_size = backing(nameof(alternate_order_size)); @@ -81,6 +83,8 @@ namespace mbts.spark { public LadderColumnSettingsVM ask_column => _ask; public LadderColumnSettingsVM last_column => _last; public LadderMarketBreakLineVM session_range_fill => _session_range_fill; + public ObservableEditableCollection> size_presets { get; } + public string size_presets_text => string.Join(", ", size_presets); public IEnumerable mkt_break_items { get { @@ -97,6 +101,7 @@ namespace mbts.spark { _current = settings; badge_style = settings.badge_style; alternate_order_size = settings.alternate_order_size; + size_presets.SetItems(settings.calculator_buttons.empty_if_null().Select(s => _create_size_preset_vm((uint)s))); _orders.assign_from(_current.orders_column); _bid.assign_from(_current.bid_column); _ask.assign_from(_current.ask_column); @@ -114,6 +119,7 @@ namespace mbts.spark { var clone = SparkUtils.clone_proto(_current); clone.badge_style = badge_style; clone.alternate_order_size = alternate_order_size; + clone.calculator_buttons = size_presets.Select(vm => (int)vm.value).ToArray(); clone.orders_column = _orders.get_settings(); clone.bid_column = _bid.get_settings(); clone.price_column = _price.get_settings(); @@ -128,6 +134,13 @@ namespace mbts.spark { clone.row_height = LadderRender.measure_row_height(clone); return clone; } + + IMutableValueWrapperVM _create_size_preset_vm() => _create_size_preset_vm(0); + IMutableValueWrapperVM _create_size_preset_vm(uint init) { + var vm = PropertyWrapperVMUtils.create_mutable_vm(init); + vm.PropertyChanged += (s, e) => RaisePropertyChanged(nameof(size_presets_text)); + return vm; + } public class LadderColumnSettingsVM : ViewModelBase { readonly Property _font_size; diff --git a/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml b/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml index ddeb1f325..fa2b377ba 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderSettingsView.xaml @@ -20,6 +20,7 @@ 4 6 8 + 24 @@ -69,6 +70,8 @@ + + @@ -86,9 +89,76 @@ Order Badge Style + Alternate Order Qty - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -161,7 +231,7 @@ - + From b7c6b1ee0dc238d8c516ff9b7c99b85d7ee3872a Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Tue, 21 Aug 2018 21:38:08 -0400 Subject: [PATCH 086/126] Hidden quoting mode done --- src/lib/CMakeDeps.cmake | 2 +- .../orders/spreader_orders/spreader/SingleLegQuoter.cpp | 8 ++++++-- .../orders/spreader_orders/spreader/SingleLegQuoter.h | 1 + .../quoter/quoter_states/QuoterWaitingForIOCWorker.cpp | 6 +++--- .../quoter_states/QuoterWaitingForSizeStateWorker.cpp | 1 + 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 415793769..d84a00902 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cpp_config.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cpp_config.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp) +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cpp_config.conf;config/defaults/edge.conf;config/defaults/expiration_display_offset.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/testkeys.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cpp_config.proto;config/protos/environment.proto;config/protos/expiration_display_offset.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPriceLantencyTester.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/Dispatcher.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp) \ No newline at end of file diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp index 0a5f98e85..1f1d6dfe2 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp @@ -29,6 +29,7 @@ _worker(nullptr), _start_state_worker(this), _waiting_for_size_state_worker(this), _waiting_for_first_ack_state_worker(this), +_waiting_for_ioc_worker(this), _waiting_for_first_ack_cancelled_state_worker(this), _waiting_for_cancel_ack_state_worker(this), _working_state_worker(this), @@ -61,6 +62,7 @@ _worker(nullptr), _start_state_worker(this), _waiting_for_size_state_worker(this), _waiting_for_first_ack_state_worker(this), +_waiting_for_ioc_worker(this), _waiting_for_first_ack_cancelled_state_worker(this), _waiting_for_cancel_ack_state_worker(this), _working_state_worker(this), @@ -192,7 +194,8 @@ void SingleLegQuoter::_transform_to_WAITING_FOR_FIRST_ACK (){ _switch_state (&_waiting_for_first_ack_state_worker); } void SingleLegQuoter::_transform_to_WAITING_FOR_IOC (){ - bts_assert(false); + bts_assert (_worker->state() == QuoterState::WAITING_FOR_SIZE); + _switch_state (&_waiting_for_ioc_worker); } void SingleLegQuoter::_transform_to_WAITING_FOR_FIRST_ACK_CANCELLED(){ bts_assert (_worker->state() == QuoterState::WAITING_FOR_FIRST_ACK); @@ -204,7 +207,8 @@ void SingleLegQuoter::_transform_to_WORKING(){ } void SingleLegQuoter::_transform_to_WAITING_FOR_CANCEL_ACK(){ bts_assert (_worker->state() == QuoterState::WORKING || - _worker->state() == QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED); + _worker->state() == QuoterState::WAITING_FOR_FIRST_ACK_CANCELLED || + _worker->state() == QuoterState::WAITING_FOR_IOC); _switch_state (&_waiting_for_cancel_ack_state_worker); } void SingleLegQuoter::_transform_to_END(){ diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index 93bd24ed6..8690f6f37 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -57,6 +57,7 @@ private: QuoterStartStateWorker _start_state_worker; QuoterWaitingForSizeStateWorker _waiting_for_size_state_worker; QuoterWaitingForFirstAckWorker _waiting_for_first_ack_state_worker; + QuoterWaitingForIOCWorker _waiting_for_ioc_worker; QuoterWaitingForFirstAckCancelledWorker _waiting_for_first_ack_cancelled_state_worker; QuoterWaitingForCancelAckStateWorker _waiting_for_cancel_ack_state_worker; QuoterWorkingStateWorker _working_state_worker; diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp index 723fa4393..f5b0444e6 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForIOCWorker.cpp @@ -11,7 +11,7 @@ QuoterState QuoterWaitingForIOCWorker::state () const { return QuoterState::WAITING_FOR_IOC; } void QuoterWaitingForIOCWorker::one_time_activate (Price, - Quantity){ + Quantity){ bts_assert_msg (false, "QuoterWaitingForIOCWorker::one_time_activate " "is an illegal operation"); } @@ -21,8 +21,8 @@ void QuoterWaitingForIOCWorker::on_order_update (const SpreaderChildOrderState& _quoter->_transform_to_END (); } void QuoterWaitingForIOCWorker::on_book (bts::orderman::TickToTradeCorID, - size_t, - const bts::orderman::Book&){ + size_t, + const bts::orderman::Book&){ } void QuoterWaitingForIOCWorker::cancel(){ _quoter->_transform_to_WAITING_FOR_FIRST_ACK_CANCELLED (); diff --git a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp index 52c269e64..b247e5279 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp +++ b/src/lib/orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp @@ -55,6 +55,7 @@ void QuoterWaitingForSizeStateWorker::_longpath_analyze_and_act(TickToTradeCorID else{ Price out_price; Quantity out_quantity; _quoter->_compute_price_quantity (out_price, out_quantity); + _quoter->_adjust_for_hidden_order(out_price, out_quantity); if (out_quantity.value() > 0){ _quoter->_commit_drivers (out_price); LOG(OrderMan, Info, "QuoterWaitingForSizeStateWorker sending order " From 6e054d78145812971e0f1c53737ceaf116bf4f63 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Wed, 22 Aug 2018 12:17:35 -0400 Subject: [PATCH 087/126] SpreaderOrder::_get_order_error is a bit more strict now: --- .../orders/spreader_orders/SpreaderOrder.cpp | 54 ++++++++++++------- .../orders/spreader_orders/SpreaderOrder.h | 14 +++-- .../spreader/SingleLegQuoter.h | 3 +- 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp index 78388d3df..56a03c6ad 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.cpp @@ -34,7 +34,7 @@ const api::orderman::OrderDefinition& SpreaderOrder::definition() const{ bts_assert(_inited()); return _bookkeeping_data().order_def(); } -void SpreaderOrder::on_init_new(const api::orderman::OrderDefinition& order_def, +void SpreaderOrder::on_init_new(const bts::api::orderman::OrderDefinition& order_def, const PreActivationOrderServices& pao_services){ if (!_active) return; _on_init_new(order_def, SpreaderPreActivationOrderServices(&pao_services)); @@ -42,8 +42,10 @@ void SpreaderOrder::on_init_new(const api::orderman::OrderDefinition& order_def, } void SpreaderOrder::on_init_recovered(const bts::api::orderman::OrderRecord& order_record, const PreActivationOrderServices& pao_services){ - LOG(OrderMan, Info, "SpreaderOrder.on_init_recovered order_key: {}", key().value()); - _state_worker->on_init_recovered(order_record, SpreaderPreActivationOrderServices(&pao_services)); + LOG(OrderMan, Info, "SpreaderOrder.on_init_recovered order_key:{}", + key().value()); + _state_worker->on_init_recovered(order_record, + SpreaderPreActivationOrderServices(&pao_services)); _report_state(); } void SpreaderOrder::on_activate(Price price, Quantity quantity, @@ -55,7 +57,8 @@ void SpreaderOrder::on_activate(Price price, Quantity quantity, } void SpreaderOrder::on_update(Price price, Quantity quantity,TickToTradeCorID){ if (!_active) return; - LOG(OrderMan, Info, "SpreaderOrder.on_update key: {} price: {} quantity: {}", key().value(), price.value(), quantity.value()); + LOG(OrderMan, Info, "SpreaderOrder.on_update key:{} price:{} quantity:{}", + key().value(), price.value(), quantity.value()); _state_worker->on_update(price, quantity); _report_state(); } @@ -74,7 +77,8 @@ void SpreaderOrder::on_crack(TickToTradeCorID){ // ISpreaderManager //////////////////// //////////////////////////////////////// void SpreaderOrder::setup_new_quoter_order(size_t leg_index){ - LOG(OrderMan, Info, "SpreaderOrder.setup_new_quoter_order key: {} leg: {}", key().value(), leg_index); + LOG(OrderMan, Info, "SpreaderOrder.setup_new_quoter_order key:{} leg:{}", + key().value(), leg_index); SpreaderLegData& leg_data = _bookkeeping_data().get_leg_data(leg_index); bts::orderman::ChildOrder child_order = leg_data.quoter_order_builder().build(); leg_data.order_update_message().re_init(child_order); @@ -114,14 +118,18 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ Price last_price = Price(ord_ev.state.last_price()), order_price=Price(ord_ev.state.price()); if (!SpreaderUtils::order_acknowledged(status)){ - LOG(OrderMan, Diag, "SpreaderOrder::_on_child_order_update, unack'ed callback for key: {} sec_key: {} order_key: {} status: {} ignoring", key(), sec_key, order_key, status); + LOG(OrderMan, Diag, "SpreaderOrder::_on_child_order_update, unack'ed " + "callback for key:{} sec_key:{} order_key:{} " + "status:{} ignoring", + key(), sec_key, order_key, status); bts_assert(filled_qty.value() == 0); return; } - SpreaderLegData* leg_data_ptr = _bookkeeping_data().find_leg_from_quoter_orderkey(order_key); // can also be found through sec_key + SpreaderLegData* leg_data_ptr = _bookkeeping_data().find_leg_from_quoter_orderkey(order_key); if (leg_data_ptr != nullptr){ SpreaderLegData& leg_data = *leg_data_ptr; - ChildOrderError order_error = _get_order_error (ord_ev, leg_data.quoter().expecting_cancel_update()); + ChildOrderError order_error = _get_order_error (ord_ev, + leg_data.quoter().expecting_cancel_update()); LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update quoter order " "key:{} sec_key:{} state:{} order_key:{} status:{} " "filled_qty:{} price:{} last_price:{} " @@ -144,7 +152,8 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ // should be a hedge order then SingleFillHedger* hedger = _bookkeeping_data().find_hedger_from_orderkey(order_key); if (hedger != nullptr){ - ChildOrderError order_error = _get_order_error (ord_ev, hedger->expecting_cancel_update()); + ChildOrderError order_error = _get_order_error (ord_ev, + hedger->expecting_cancel_update()); LOG(OrderMan, Info, "SpreaderOrder::_on_child_order_update hedger " "key:{} sec_key:{} state:{} order_key:{} status:{} " "filled_qty:{} price:{} last_price:{} " @@ -160,8 +169,11 @@ void SpreaderOrder::_on_child_order_update(const OrderStateUpdateEvent& ord_ev){ _state_worker->on_hedger_order_error (*hedger); } else - LOG(OrderMan, Error, "SpreaderOrder::_on_child_order_update unknown order key: {} sec_key: {} order_key: {} status: {} filled_qty: {} last_price: {} msg: {}", - key(), sec_key, order_key, status, filled_qty, last_price, ord_ev.state.last_msg ()); + LOG(OrderMan, Error, "SpreaderOrder::_on_child_order_update unknown ord " + "key:{} sec_key:{} order_key:{} status:{} " + "filled_qty:{} last_price:{} msg:{}", + key(), sec_key, order_key, status, filled_qty, + last_price, ord_ev.state.last_msg ()); } _send_check_termination(true); _report_state(); @@ -196,15 +208,17 @@ void SpreaderOrder::_switch_state (ISpreaderStateWorker* new_state){ void SpreaderOrder::_on_init_new(const bts::api::orderman::OrderDefinition& order_def, const SpreaderPreActivationOrderServices& spreader_pao_services){ - LOG(OrderMan, Info, "SpreaderOrder.on_init_new key: {} order_def: {}", + LOG(OrderMan, Info, "SpreaderOrder.on_init_new key:{} order_def:{}", key().value(), bts::utils::pb::to_string(order_def)); bts_assert(!_inited()); _state_worker->on_init_new(order_def, spreader_pao_services); } -void SpreaderOrder::_on_activate(Price price, Quantity quantity, SpreaderOrderServices& order_services){ +void SpreaderOrder::_on_activate(Price price, + Quantity quantity, + SpreaderOrderServices& order_services){ bts_assert(_inited()); bts_assert(!_activated()); - LOG(OrderMan, Info, "SpreaderOrder.on_activate key: {} price: {} quantity: {}", + LOG(OrderMan, Info, "SpreaderOrder.on_activate key:{} price:{} quantity:{}", key().value(), price.value(), quantity.value()); _order_services = new SpreaderOrderServices(order_services); _state_worker->on_activate(price, quantity, *_order_services); @@ -338,14 +352,18 @@ void SpreaderOrder::_report_state (){ } // if order is cons'ed from disc, with inited_new==false, // we just publish what was given to us - LOG(OrderMan, Info, "SpreaderOrder::_report_state key: {} status: {} price: {} qty: {} filled: {} avg_price: {}", - key(), status, reported_state.price(), reported_state.quantity(), - reported_state.filled_quantity(), reported_state.avg_price()); + LOG(OrderMan, Info, "SpreaderOrder::_report_state key:{} status:{} " + "price:{} qty:{} filled:{} avg_price:{}", + key(), status, reported_state.price(), + reported_state.quantity(), + reported_state.filled_quantity(), + reported_state.avg_price()); _order_services->report_state(reported_state); } } bts::api::orderman::OrderStatus SpreaderOrder::_get_order_status () const{ - SpreaderState curr_state = _state_worker == nullptr ? SpreaderState::START : _state_worker->state(); + SpreaderState curr_state = _state_worker == nullptr ? + SpreaderState::START : _state_worker->state(); switch (curr_state){ case SpreaderState::WORKING: return bts::api::orderman::OrderStatus::ORDER_STATUS_WORKING; diff --git a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h index ff443d9a5..56060f489 100644 --- a/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h +++ b/src/lib/orderman/orders/spreader_orders/SpreaderOrder.h @@ -200,10 +200,18 @@ private: bts::api::orderman::OrderStatus order_status = ord_ev.state.status(); if (SpreaderUtils::order_in_error_state(order_status)) return ChildOrderError::ORDER_STATE_ERROR; - if (SpreaderUtils::SpreaderUtils::order_in_cancelled_state(order_status) && !expecting_cancel) - return ChildOrderError::UNEXPECTED_CANCEL_ERROR; + if (SpreaderUtils::SpreaderUtils::order_in_cancelled_state(order_status)){ + // the message is a bad way to decipher an error state. + // what we are saying here is + // i. cancels with messages are always an error state + // ii. when we get a cancel when not expecting thats also + // an error state + if(ord_ev.state.last_msg().length() > 0 || !expecting_cancel) + return ChildOrderError::UNEXPECTED_CANCEL_ERROR; + } // this is an inelegant way to detect modify errors - if (!SpreaderUtils::order_in_terminal_state(order_status) && ord_ev.state.last_msg().length() > 0) + if (!SpreaderUtils::order_in_terminal_state(order_status) && + ord_ev.state.last_msg().length() > 0) return ChildOrderError::MODIFY_ERROR; return ChildOrderError::NONE; } diff --git a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h index 8690f6f37..6f4212aa1 100644 --- a/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h +++ b/src/lib/orderman/orders/spreader_orders/spreader/SingleLegQuoter.h @@ -123,7 +123,8 @@ public: // tells if it is expecting to get a cancel (this helps catch // unsolicited cancels). returns true is its expecting a cancel bool expecting_cancel_update() const { - return _worker->state() == QuoterState::WAITING_FOR_CANCEL_ACK; + return _worker->state() == QuoterState::WAITING_FOR_CANCEL_ACK || + (_hidden_order && _worker->state() == QuoterState::WAITING_FOR_IOC); } public: // test only functions From aab8995de7a5499378bdc5a9d5493d8125a50a02 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 22 Aug 2018 11:18:12 -0500 Subject: [PATCH 088/126] more of SPARK-1566 and other things dicussed with Taha and John --- .../spark/Modules/Trading/Fills/FillsVM.cs | 2 +- .../Modules/Trading/PAndLWindowFactory.cs | 9 +-- src/client/spark/view/Spark/PAndL/PAndLVM.cs | 10 +-- .../spark/view/Spark/PAndL/PAndLView.xaml | 75 ++++++++++--------- .../spark/view/Spark/PAndL/PAndLWindow.cs | 3 +- .../spark/view/Spark/PAndL/PnLCalculator.cs | 64 +++++++--------- src/client/spark/view/Spark/PAndL/PnLData.cs | 3 +- .../spark/view/Spark/PAndL/PnLSummaryRow.cs | 7 +- .../config/protos/orders_fills_cleanup.proto | 6 ++ 9 files changed, 86 insertions(+), 93 deletions(-) diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 250cb888a..287b87973 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -159,7 +159,7 @@ namespace mbts.spark { public TimeInForce time_in_force => _order.Def.TimeInForce; public OrderType order_type => _order.Def.CustomDef.CustomCase; public OrderMetadata order_metadata => _model.factory.get_metadata(_order.Def.CustomDef.CustomCase); - public string account => _order.Def.Account; + public string account => _fill.FillKind != FillKind.Sod ? _order.Def.Account : _fill.Account; public string user => _order.Def.User; public Venue exchange => security.Exchange; public Side side => _fill.Side; diff --git a/src/client/spark/Modules/Trading/PAndLWindowFactory.cs b/src/client/spark/Modules/Trading/PAndLWindowFactory.cs index 6330ae08a..270b95ad4 100644 --- a/src/client/spark/Modules/Trading/PAndLWindowFactory.cs +++ b/src/client/spark/Modules/Trading/PAndLWindowFactory.cs @@ -40,11 +40,10 @@ namespace bts.shell { /// public PAndLStartupData() { } - public PAndLStartupData(List sorting_criteria, FilterStates filters, pnl_calc_type calc_type, TimeSpan start_of_day_time) { + public PAndLStartupData(List sorting_criteria, FilterStates filters, pnl_calc_type calc_type) { this.sort_criteria = sorting_criteria; this.filters = filters; this.calc_type = calc_type; - this.start_of_day_time = start_of_day_time; } [ProtoMember(5)] @@ -53,9 +52,9 @@ namespace bts.shell { public FilterStates filters; [ProtoMember(15)] public pnl_calc_type calc_type; - [ProtoMember(20)] - public TimeSpan? start_of_day_time; - + //[ProtoMember(20)] + // ProtoMember 20 cannot be used further + } [ProtoContract] diff --git a/src/client/spark/view/Spark/PAndL/PAndLVM.cs b/src/client/spark/view/Spark/PAndL/PAndLVM.cs index a699737fe..6a3305db3 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLVM.cs +++ b/src/client/spark/view/Spark/PAndL/PAndLVM.cs @@ -15,7 +15,7 @@ using static bts.api.orderman.Fill.Types; namespace mbts.spark { class PAndLVM : DisposableViewModelBase { - + public PAndLVM(IBus bus, PAndLModel model, PAndLStartupData startup_data) { _bus = bus; _model = model; @@ -30,13 +30,12 @@ namespace mbts.spark { // since we'll need to create a new PnLCalculator when this changes. (infrequent, if ever) _selected_pnl_calc_type.Value = (startup_data != null && startup_data.calc_type != pnl_calc_type.none) ? startup_data.calc_type : pnl_calc_type.midpoint; _selected_pnl_calc_type.Changed += pnl_calc_type_changed; - _start_of_day_ts = (startup_data != null && startup_data.start_of_day_time.HasValue) ? startup_data.start_of_day_time.Value : new TimeSpan(16, 30, 0); var pnl = model.on_pnl_data .Sample(_POSITION_UPDATE_PERIOD) .OnDispatcher() .Subscribe(p => { if (p != null) { - PnLCalculator calc = new PnLCalculator(p.state.Values, _selected_pnl_calc_type.Value, _start_of_day_ts); + PnLCalculator calc = new PnLCalculator(p.state.Values, _selected_pnl_calc_type.Value); var summary_position_rows = calc.get_summary_position(); _pnl_data.sync_with(summary_position_rows); _last_pnl_update_time = DateTime.Now; @@ -186,10 +185,6 @@ namespace mbts.spark { } } - public TimeSpan start_of_day { - get { return _start_of_day_ts; } - } - #region Filters public IDataGridColumnPersistentFilter account_filter { get; } = new RegexFilterVM(r => r.account, nameof(PnLSummaryRow.account)); @@ -237,7 +232,6 @@ namespace mbts.spark { readonly Property _selected_pnl_calc_type; double _total_aggregate_pnl, _total_aggregate_day_pnl, _total_aggregate_net_pos, _total_aggregate_buy_qty, _total_aggregate_sell_qty; - TimeSpan _start_of_day_ts; DateTime _last_pnl_update_time = DateTime.MinValue; ObservableCollection _pnl_data = new ObservableCollection(); diff --git a/src/client/spark/view/Spark/PAndL/PAndLView.xaml b/src/client/spark/view/Spark/PAndL/PAndLView.xaml index 8a77617e9..3f75eaa5a 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLView.xaml +++ b/src/client/spark/view/Spark/PAndL/PAndLView.xaml @@ -175,7 +175,7 @@ - + @@ -183,14 +183,40 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -201,36 +227,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/src/client/spark/view/Spark/PAndL/PAndLWindow.cs b/src/client/spark/view/Spark/PAndL/PAndLWindow.cs index 9b2d09dc0..0fa58bd01 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLWindow.cs +++ b/src/client/spark/view/Spark/PAndL/PAndLWindow.cs @@ -30,8 +30,7 @@ namespace mbts.spark { new PAndLWindowFactory.PAndLStartupData( _vm.get_sorting_states(), _vm.get_filters_states(), - _vm.selected_pnl_calc_type, - _vm.start_of_day + _vm.selected_pnl_calc_type ); public override UIElement Content => _view; public override double MinWidth => 894; diff --git a/src/client/spark/view/Spark/PAndL/PnLCalculator.cs b/src/client/spark/view/Spark/PAndL/PnLCalculator.cs index aef487543..c333fe0e1 100644 --- a/src/client/spark/view/Spark/PAndL/PnLCalculator.cs +++ b/src/client/spark/view/Spark/PAndL/PnLCalculator.cs @@ -17,11 +17,6 @@ namespace mbts.spark { } class MarketSchedule { - public string product_complex; // FIX 1227 - public int market_segment_id; // FIX 1300 - public string security_group; // FIX 1151 - // trade date FIX 75 vs (FIX 336, FIX 341) - public Dictionary> sessions; static readonly double _cme_gen_open_hrs; static MarketSchedule() { @@ -31,27 +26,6 @@ namespace mbts.spark { // for object initializers public MarketSchedule() { } - public static MarketSchedule es_schedule { - get { - return new MarketSchedule { - product_complex = "MINI S&P FUTURES", - market_segment_id = 64, - security_group = "ES", - sessions = new Dictionary>() { - { DateTime.ParseExact("20180301","yyyyMMdd", null), new List<(trading_session_state session_state, DateTime session_start_time)>() { - (trading_session_state.ReadyToTrade, get_utctimestamp_as_localtime("20180301213000000000")), - } - }, // single day dict entry - { DateTime.ParseExact("20180302","yyyyMMdd", null), new List<(trading_session_state session_state, DateTime session_start_time)>() { - (trading_session_state.ReadyToTrade, get_utctimestamp_as_localtime("20180301230000000000")), - (trading_session_state.Close, get_utctimestamp_as_localtime("20180302220000000000")) - } - } // single day dict entry - } // all sessions for the week - }; // specific market schedule - } // get - } - /// /// Returns the CME general open time of the most recent trading date (i.e today, or last Friday if today is not a weekday). /// @@ -79,29 +53,49 @@ namespace mbts.spark { readonly IEnumerable _data; readonly pnl_calc_type _calc_type; readonly DateTime _start_of_trading_day_utc; + readonly DateTime _adjusted_central_sod; - public PnLCalculator(IEnumerable data, pnl_calc_type calc_type, TimeSpan start_of_day_ts) { + const string cst_id = "Central Standard Time"; + // the sod time in config says it's stored in UTC, but it really represents 16:30 Central Daylight Time + // i.e. 21:30 UTC corresponds to 16:30 Central (4:30 PM), but only during *CDT* + // CDT it UTC -5 + // CST is UTC -6 + static readonly int sod_hh = (int)config.Configuration.get().sod_hh; + static readonly int sod_mm = (int)config.Configuration.get().sod_mm; + static readonly TimeZoneInfo central_tzi = TimeZoneInfo.FindSystemTimeZoneById(cst_id); + + static readonly DateTime unadjusted_central_sod = TimeZoneInfo.ConvertTimeFromUtc( + DateTime.UtcNow.Date.Add(new TimeSpan(sod_hh, sod_mm, 0)), + central_tzi + ); + + + public PnLCalculator(IEnumerable data, pnl_calc_type calc_type) { _data = data; _calc_type = calc_type; + _adjusted_central_sod = !central_tzi.IsDaylightSavingTime(unadjusted_central_sod) ? unadjusted_central_sod.AddHours(1) : unadjusted_central_sod; + // Note that this isn't the acutal start of the trading day // but it's close enough for pnl purposes. // In reality, instruments have different schedules - var _start_of_trading_day_local = DateTime.Now.Date.Add(start_of_day_ts); - if (_start_of_trading_day_local >= DateTime.Now) { - _start_of_trading_day_local = _start_of_trading_day_local.AddDays(-1); + + // if now is less than the current sod, then we me move the sod back a day to account for the trading day start + if (_adjusted_central_sod >= TimeZoneInfo.ConvertTime(DateTime.Now, central_tzi)) { + _adjusted_central_sod = _adjusted_central_sod.AddDays(-1); } - _start_of_trading_day_utc = _start_of_trading_day_local.ToUniversalTime(); + var local_time_zone_sod = TimeZoneInfo.ConvertTime(_adjusted_central_sod, central_tzi, TimeZoneInfo.Local); + _start_of_trading_day_utc = local_time_zone_sod.ToUniversalTime(); } public IEnumerable get_summary_position() { return (from pnl_item in _data group pnl_item by (pnl_item.account, pnl_item.exchange, pnl_item.symbol, pnl_item.security, pnl_item.sec_md, pnl_item.security_type) into grouping /* let start_of_day = _get_start_of_day(grouping.Key.symbol) */ - select new PnLSummaryRow(_calc_type, _start_of_trading_day_utc, grouping.Key, - grouping.Where(y => y.fill.Timestamp.ToDateTime() >= _start_of_trading_day_utc).Sum(y => (uint)y.buy_quantity), - grouping.Where(y => y.fill.Timestamp.ToDateTime() >= _start_of_trading_day_utc).Sum(y => (uint)y.sell_quantity), + select new PnLSummaryRow(_calc_type, grouping.Key, + grouping.Where(y => y.fill.FillKind != Fill.Types.FillKind.Sod).Sum(y => (uint)y.buy_quantity), + grouping.Where(y => y.fill.FillKind != Fill.Types.FillKind.Sod).Sum(y => (uint)y.sell_quantity), grouping.Sum(y => (int)(y.buy_quantity - y.sell_quantity)), - grouping.Where(y => y.fill.Timestamp.ToDateTime() < _start_of_trading_day_utc).Sum(y => (int)(y.buy_quantity - y.sell_quantity)), + grouping.Where(y => y.fill.FillKind == Fill.Types.FillKind.Sod).Sum(y => (int)(y.buy_quantity - y.sell_quantity)), grouping.weighted_average(y => y.fill.LastPrice, y => y.buy_quantity), grouping.weighted_average(y => y.fill.LastPrice, y => y.sell_quantity), grouping.Select(i => i.fill) diff --git a/src/client/spark/view/Spark/PAndL/PnLData.cs b/src/client/spark/view/Spark/PAndL/PnLData.cs index b4096f6e2..4a0120236 100644 --- a/src/client/spark/view/Spark/PAndL/PnLData.cs +++ b/src/client/spark/view/Spark/PAndL/PnLData.cs @@ -2,6 +2,7 @@ using bts.api.orderman; using System; using System.ComponentModel; +using static bts.api.orderman.Fill.Types; namespace mbts.spark { @@ -36,7 +37,7 @@ namespace mbts.spark { public SecurityMD? sec_md => _fill_tuple.security_md; public OrderRecordImmutable? order => _fill_tuple.order; // - public string account => order?.Def.Account; + public string account => _fill_tuple.fill.FillKind != FillKind.Sod ? _fill_tuple.order?.Def.Account : _fill_tuple.fill.Account; public Venue? exchange => sec_md?.security.Exchange; public string symbol => sec_md?.security.Symbol; public SecurityImmutable? security => sec_md?.security; diff --git a/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs b/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs index 10c4cc8d3..b2de339a5 100644 --- a/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs +++ b/src/client/spark/view/Spark/PAndL/PnLSummaryRow.cs @@ -12,7 +12,6 @@ namespace mbts.spark { internal class PnLSummaryRow : ViewModelBase, IEquatable { - DateTime _start_of_day; (string account, Venue? exchange, string symbol, SecurityImmutable? security, SecurityMD? sec_md, SecurityType? sec_type) key; int _start_net_position, _total_net_position; uint _day_long_quantity, _day_short_quantity; @@ -23,10 +22,8 @@ namespace mbts.spark { public PnLSummaryRow(pnl_calc_type calc_type, - DateTime start_of_day, (string, Venue?, string, SecurityImmutable?, SecurityMD?, SecurityType?) key, uint day_buy_quant, uint day_sell_quant, int net_pos, int sod_pos, double wavg_buy, double wavg_sell, IEnumerable fills) { - this._start_of_day = start_of_day; this.key = key; day_long_quantity = day_buy_quant; day_short_quantity = day_sell_quant; @@ -83,7 +80,7 @@ namespace mbts.spark { foreach (var fill in _fills) { double _tick_pnl = PnLCalculator.get_pnl(bid.price, ask.price, fill, cpp); summary_pnl += _tick_pnl; - if (fill.Timestamp.ToDateTime() >= _start_of_day) { + if (fill.FillKind != Fill.Types.FillKind.Sod) { day_pnl_total += _tick_pnl; } else { start_pnl_total += _tick_pnl; @@ -101,7 +98,7 @@ namespace mbts.spark { foreach (var fill in _fills) { double _tick_pnl = PnLCalculator.get_pnl(_driver, fill, cpp); summary_pnl += _tick_pnl; - if (fill.Timestamp.ToDateTime() >= _start_of_day) { + if (fill.FillKind != Fill.Types.FillKind.Sod) { day_pnl_total += _tick_pnl; } else { start_pnl_total += _tick_pnl; diff --git a/src/lib/config/protos/orders_fills_cleanup.proto b/src/lib/config/protos/orders_fills_cleanup.proto index d56b5629b..e7d77781e 100644 --- a/src/lib/config/protos/orders_fills_cleanup.proto +++ b/src/lib/config/protos/orders_fills_cleanup.proto @@ -12,4 +12,10 @@ message OrdersSoftCleanupCutoff{ // utc time optional uint32 sod_hh = 20 [default=21]; optional uint32 sod_mm = 30 [default=30]; +} + +message SODTime{ + // utc time + optional uint32 sod_hh = 20 [default=21]; + optional uint32 sod_mm = 30 [default=30]; } \ No newline at end of file From 9357016ec05912ceb5337cf23dd2a89a34922f73 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 22 Aug 2018 11:35:37 -0500 Subject: [PATCH 089/126] Moving SOD DST UTC calculations into MarketScheudle class --- .../spark/view/Spark/PAndL/PnLCalculator.cs | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/src/client/spark/view/Spark/PAndL/PnLCalculator.cs b/src/client/spark/view/Spark/PAndL/PnLCalculator.cs index c333fe0e1..4376bba24 100644 --- a/src/client/spark/view/Spark/PAndL/PnLCalculator.cs +++ b/src/client/spark/view/Spark/PAndL/PnLCalculator.cs @@ -19,9 +19,40 @@ namespace mbts.spark { class MarketSchedule { static readonly double _cme_gen_open_hrs; + + const string cst_id = "Central Standard Time"; + // the sod time in config says it's stored in UTC, but it really represents 16:30 Central Daylight Time + // i.e. 21:30 UTC corresponds to 16:30 Central (4:30 PM), but only during *CDT* + // CDT it UTC -5 + // CST is UTC -6 + static readonly int sod_hh = (int)config.Configuration.get().sod_hh; + static readonly int sod_mm = (int)config.Configuration.get().sod_mm; + static readonly TimeZoneInfo central_tzi = TimeZoneInfo.FindSystemTimeZoneById(cst_id); + static readonly DateTime _start_of_trading_day_utc; + static readonly DateTime _adjusted_central_sod; + + + static readonly DateTime unadjusted_central_sod = TimeZoneInfo.ConvertTimeFromUtc( + DateTime.UtcNow.Date.Add(new TimeSpan(sod_hh, sod_mm, 0)), + central_tzi + ); + static MarketSchedule() { var cme_schedule = config.Configuration.get(); _cme_gen_open_hrs = cme_schedule?.gen_open_hour ?? 8.5; + + _adjusted_central_sod = !central_tzi.IsDaylightSavingTime(unadjusted_central_sod) ? unadjusted_central_sod.AddHours(1) : unadjusted_central_sod; + + // Note that this isn't the acutal start of the trading day + // but it's close enough for pnl purposes. + // In reality, instruments have different schedules + + // if now is less than the current sod, then we me move the sod back a day to account for the trading day start + if (_adjusted_central_sod >= TimeZoneInfo.ConvertTime(DateTime.Now, central_tzi)) { + _adjusted_central_sod = _adjusted_central_sod.AddDays(-1); + } + var local_time_zone_sod = TimeZoneInfo.ConvertTime(_adjusted_central_sod, central_tzi, TimeZoneInfo.Local); + _start_of_trading_day_utc = local_time_zone_sod.ToUniversalTime(); } // for object initializers public MarketSchedule() { } @@ -52,39 +83,10 @@ namespace mbts.spark { class PnLCalculator { readonly IEnumerable _data; readonly pnl_calc_type _calc_type; - readonly DateTime _start_of_trading_day_utc; - readonly DateTime _adjusted_central_sod; - - const string cst_id = "Central Standard Time"; - // the sod time in config says it's stored in UTC, but it really represents 16:30 Central Daylight Time - // i.e. 21:30 UTC corresponds to 16:30 Central (4:30 PM), but only during *CDT* - // CDT it UTC -5 - // CST is UTC -6 - static readonly int sod_hh = (int)config.Configuration.get().sod_hh; - static readonly int sod_mm = (int)config.Configuration.get().sod_mm; - static readonly TimeZoneInfo central_tzi = TimeZoneInfo.FindSystemTimeZoneById(cst_id); - - static readonly DateTime unadjusted_central_sod = TimeZoneInfo.ConvertTimeFromUtc( - DateTime.UtcNow.Date.Add(new TimeSpan(sod_hh, sod_mm, 0)), - central_tzi - ); - public PnLCalculator(IEnumerable data, pnl_calc_type calc_type) { _data = data; _calc_type = calc_type; - _adjusted_central_sod = !central_tzi.IsDaylightSavingTime(unadjusted_central_sod) ? unadjusted_central_sod.AddHours(1) : unadjusted_central_sod; - - // Note that this isn't the acutal start of the trading day - // but it's close enough for pnl purposes. - // In reality, instruments have different schedules - - // if now is less than the current sod, then we me move the sod back a day to account for the trading day start - if (_adjusted_central_sod >= TimeZoneInfo.ConvertTime(DateTime.Now, central_tzi)) { - _adjusted_central_sod = _adjusted_central_sod.AddDays(-1); - } - var local_time_zone_sod = TimeZoneInfo.ConvertTime(_adjusted_central_sod, central_tzi, TimeZoneInfo.Local); - _start_of_trading_day_utc = local_time_zone_sod.ToUniversalTime(); } public IEnumerable get_summary_position() { From d58c28986bf03ac514f0dd7c9ed62ba84349736c Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 22 Aug 2018 11:49:17 -0400 Subject: [PATCH 090/126] FillTupleSource - use lock instead of ThreadYieldRWGate --- src/client/spark/Orders/FillTupleSource.cs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/client/spark/Orders/FillTupleSource.cs b/src/client/spark/Orders/FillTupleSource.cs index ebfae4ea6..18629764e 100644 --- a/src/client/spark/Orders/FillTupleSource.cs +++ b/src/client/spark/Orders/FillTupleSource.cs @@ -34,8 +34,6 @@ namespace mbts.spark { string fmt_assert_msg(string msg) => $"{nameof(FillTupleSource)}.{nameof(create_observable)}: {msg}"; } - // _n_write_ops should never be greater than 1, bc all 3 input observables fire 'OnDispatcher' - readonly ThreadYieldRWGate _rw_gate = new ThreadYieldRWGate(); readonly Subject> _subject = new Subject>(); readonly Dictionary _state = new Dictionary(); readonly SetMap _order_fills = new SetMap(); @@ -44,6 +42,7 @@ namespace mbts.spark { IReadOnlyDictionary _orders_cache = new Dictionary(0); IReadOnlyDictionary _security_md_cache = new Dictionary(0); IDisposable _dispose; + object _lock = new object(); FillTupleSource( IObservable> securities, @@ -51,12 +50,12 @@ namespace mbts.spark { IObservable> fills) => // _dispose = Disposable.Create( - securities.OnDispatcher().Subscribe(_update_securities), - orders.OnDispatcher().Subscribe(_update_orders), - fills.OnDispatcher().AddRemoveOnly().Subscribe(_update_fills)); + securities.Subscribe(_update_securities), + orders.Subscribe(_update_orders), + fills.AddRemoveOnly().Subscribe(_update_fills)); public IDisposable Subscribe(IObserver> observer) { - using (_rw_gate.read()) { + lock (_lock) { observer.OnNext(new IncrementalUpdate(new Dictionary(_state), new Dictionary(0))); return _subject.Subscribe(observer); } @@ -65,7 +64,7 @@ namespace mbts.spark { public void Dispose() => Disposable.dispose(ref _dispose); void _update_fills(LegacyTableUpdate fills) { - using (_rw_gate.write()) { + lock (_lock) { var removed = new Dictionary(); var added = new Dictionary(); @@ -87,7 +86,7 @@ namespace mbts.spark { } void _update_orders(TableUpdate orders) { - using (_rw_gate.write()) { + lock (_lock) { Dictionary added = new Dictionary(), removed = new Dictionary(); HashSet changed_keys = new HashSet(); foreach (var o in orders.removed) { @@ -125,7 +124,7 @@ namespace mbts.spark { } void _update_securities(IReadOnlyDictionary securities) { - using (_rw_gate.write()) { + lock (_lock) { Dictionary added = new Dictionary(), removed = new Dictionary(); _security_md_cache.Keys.difference(securities.Keys, out IEnumerable added_keys, out IEnumerable removed_keys); foreach (var k in removed_keys) { From 5f4db9fab649e43cd0cf552918c57be20b3e13c3 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 22 Aug 2018 11:52:57 -0400 Subject: [PATCH 091/126] ObservableDemuxer - use lock instead of ThreadYieldRWGate --- src/client/spark/core/Utility/ObservableDemuxer.cs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/client/spark/core/Utility/ObservableDemuxer.cs b/src/client/spark/core/Utility/ObservableDemuxer.cs index 2b5dcff16..721646f13 100644 --- a/src/client/spark/core/Utility/ObservableDemuxer.cs +++ b/src/client/spark/core/Utility/ObservableDemuxer.cs @@ -93,7 +93,7 @@ namespace mbts.utils { public IObservable> subscribe(TGroupKey group_key) => Observable.Create>(o => { var data = _map.GetOrAdd(group_key, gk => new Data()); - using (data.read()) { + lock (data) { o.OnNext(data.current.as_snapshot()); return data.subject.Subscribe(o); } @@ -113,19 +113,15 @@ namespace mbts.utils { } Data _update(Data data, ChangeSet changes) { - using (data.write()) + lock (data) { data.subject.OnNext(data.current = data.current.update(changes.removed, changes.added, _key)); - return data; + return data; + } } class Data { public readonly Subject> subject = new Subject>(); public TableUpdateTransform current = new TableUpdateTransform(); - - readonly ThreadYieldRWGate _rw_gate = new ThreadYieldRWGate(); - - public IDisposable read() => _rw_gate.read(); - public IDisposable write() => _rw_gate.write(); } // [John]I prefer this class over anonymous tuples bc it is easy to mix up Item1/Item2 From 2ee725110e11ab3242737c4ef4c2891b6b73ea09 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 22 Aug 2018 12:17:06 -0400 Subject: [PATCH 092/126] fix ThreadSafeDisposable --- .../spark/core/Utility/ObservableDemuxer.cs | 10 +++--- .../spark_core/utils/AnonymousDisposable.cs | 34 +++++++++---------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/client/spark/core/Utility/ObservableDemuxer.cs b/src/client/spark/core/Utility/ObservableDemuxer.cs index 721646f13..be351cc5c 100644 --- a/src/client/spark/core/Utility/ObservableDemuxer.cs +++ b/src/client/spark/core/Utility/ObservableDemuxer.cs @@ -25,13 +25,13 @@ namespace mbts.utils { } } - public IObservable subscribe(TKey key) { - _dispose.check_not_disposed(); - return _cache.GetOrAdd(key, k => new Data(this)); - } + public IObservable subscribe(TKey key) => + _cache.GetOrAdd(key, k => new Data(this)); public void OnNext(TInput input) { - _dispose.check_not_disposed(); + if (_dispose.has_dispose_started) { + return; + } var output = demux(input); foreach (var kv in output) { _cache.AddOrUpdate(kv.Key, diff --git a/src/client/spark_core/utils/AnonymousDisposable.cs b/src/client/spark_core/utils/AnonymousDisposable.cs index 948f4cf35..2c35b0ef1 100644 --- a/src/client/spark_core/utils/AnonymousDisposable.cs +++ b/src/client/spark_core/utils/AnonymousDisposable.cs @@ -94,34 +94,32 @@ namespace mbts } } + // inspired by: https://blogs.msdn.microsoft.com/blambert/2009/07/24/a-simple-and-totally-thread-safe-implementation-of-idisposable/ /// - /// Uses lock-free [Interlocked] code to ensure that a dispose action is only executed once. + /// Uses lock-free [Interlocked] code to ensure that a dispose-action is only executed once. /// class ThreadSafeDisposable : IDisposable { - int _state = 0; readonly Action _dispose_once; - readonly string _name; - public ThreadSafeDisposable(Action dispose_once, [CallerMemberName]string name = "Anonymous") { - _name = name; + /// + /// A value which indicates the disposable state. 0 indicates undisposed, 1 indicates disposing + /// or disposed. + /// + int _state; + + public ThreadSafeDisposable(Action dispose_once) => _dispose_once = dispose_once; - } - public bool has_dispose_started => _state > 0; - public bool has_dispose_finished { get; private set; } - - public void check_not_disposed() { - if (has_dispose_finished) - throw new ObjectDisposedException($"{_name}'s {nameof(ThreadSafeDisposable)}"); - } + public bool has_dispose_started => Thread.VolatileRead(ref _state) == 0; + /// + /// Guarenteed to only execute the dispose-action once. This is thread-safe. + /// public void Dispose() { - if (Interlocked.Increment(ref _state) == 1) { + // Attempt to move the disposable state from 0 to 1. If successful, we can be assured that + // this thread is the first thread to do so, and can safely dispose of the object. + if (Interlocked.CompareExchange(ref _state, 1, 0) == 0) _dispose_once(); - has_dispose_finished = true; - } else { - Interlocked.Decrement(ref _state); - } } } } \ No newline at end of file From 2b08791aa1609f6cfac9338ed63c2d90d88e0e70 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 22 Aug 2018 14:10:11 -0500 Subject: [PATCH 093/126] PnL - always TrimEnd the Account, regardless of Order or Fill --- src/client/spark/view/Spark/PAndL/PnLData.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Spark/PAndL/PnLData.cs b/src/client/spark/view/Spark/PAndL/PnLData.cs index 4a0120236..7bc015d8c 100644 --- a/src/client/spark/view/Spark/PAndL/PnLData.cs +++ b/src/client/spark/view/Spark/PAndL/PnLData.cs @@ -36,8 +36,9 @@ namespace mbts.spark { public FillImmutable fill => _fill_tuple.fill; public SecurityMD? sec_md => _fill_tuple.security_md; public OrderRecordImmutable? order => _fill_tuple.order; - // - public string account => _fill_tuple.fill.FillKind != FillKind.Sod ? _fill_tuple.order?.Def.Account : _fill_tuple.fill.Account; + // the TrimEnd is very important b/c the server currently does not trim, + // but the account is part of the group, so this is necessary + public string account => (_fill_tuple.fill.FillKind != FillKind.Sod ? _fill_tuple.order?.Def.Account : _fill_tuple.fill.Account).TrimEnd(); public Venue? exchange => sec_md?.security.Exchange; public string symbol => sec_md?.security.Symbol; public SecurityImmutable? security => sec_md?.security; From 47bed562677d96ae03d7b928501a86f900104989 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 22 Aug 2018 16:56:15 -0500 Subject: [PATCH 094/126] pnl and fills - moving account accessing code to FillTuple --- src/client/spark/Modules/Trading/Fills/FillsVM.cs | 3 ++- src/client/spark/Orders/FillTuple.cs | 5 +++++ src/client/spark/view/Spark/PAndL/PnLData.cs | 5 ++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 287b87973..9e2d30bcc 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -153,13 +153,14 @@ namespace mbts.spark { _fill = fill_tuple.fill; _order = fill_tuple.order ?? OrderDataHelper.Defaults.OrderRecordImmutable; _model = model; + account = fill_tuple.account; } public DateTime fill_time => _fill.Timestamp.ToDateTimeOffset().LocalDateTime; public TimeInForce time_in_force => _order.Def.TimeInForce; public OrderType order_type => _order.Def.CustomDef.CustomCase; public OrderMetadata order_metadata => _model.factory.get_metadata(_order.Def.CustomDef.CustomCase); - public string account => _fill.FillKind != FillKind.Sod ? _order.Def.Account : _fill.Account; + public string account { get; private set; } public string user => _order.Def.User; public Venue exchange => security.Exchange; public Side side => _fill.Side; diff --git a/src/client/spark/Orders/FillTuple.cs b/src/client/spark/Orders/FillTuple.cs index 7a2ca5b44..bdc9a6088 100644 --- a/src/client/spark/Orders/FillTuple.cs +++ b/src/client/spark/Orders/FillTuple.cs @@ -2,6 +2,7 @@ using bts.api.orderman; using mbts.utils; using System; +using static bts.api.orderman.Fill.Types; namespace mbts.spark { class FillTuple : IEquatable { @@ -17,6 +18,10 @@ namespace mbts.spark { key = new FillTupleKey(fill.FillKey, order.HasValue ? order.Value.Key : 0u, security_md.HasValue ? security_md.Value.security.Id : 0u); } + // the TrimEnd is very important b/c the server currently does not trim, + // but the account is part of the group, so this is necessary + public string account => (fill.FillKind != FillKind.Sod ? order?.Def.Account : fill.Account).TrimEnd(); + public bool Equals(FillTuple other) => other != null && other.order.HasValue == order.HasValue && other.security_md.HasValue == security_md.HasValue diff --git a/src/client/spark/view/Spark/PAndL/PnLData.cs b/src/client/spark/view/Spark/PAndL/PnLData.cs index 7bc015d8c..99c441c16 100644 --- a/src/client/spark/view/Spark/PAndL/PnLData.cs +++ b/src/client/spark/view/Spark/PAndL/PnLData.cs @@ -36,9 +36,8 @@ namespace mbts.spark { public FillImmutable fill => _fill_tuple.fill; public SecurityMD? sec_md => _fill_tuple.security_md; public OrderRecordImmutable? order => _fill_tuple.order; - // the TrimEnd is very important b/c the server currently does not trim, - // but the account is part of the group, so this is necessary - public string account => (_fill_tuple.fill.FillKind != FillKind.Sod ? _fill_tuple.order?.Def.Account : _fill_tuple.fill.Account).TrimEnd(); + + public string account => _fill_tuple.account; public Venue? exchange => sec_md?.security.Exchange; public string symbol => sec_md?.security.Symbol; public SecurityImmutable? security => sec_md?.security; From e72f171657e16a4abc7b719e922e7d5795e8f590 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 22 Aug 2018 12:17:06 -0400 Subject: [PATCH 095/126] fix ThreadSafeDisposable again (typeo) --- src/client/spark_core/utils/AnonymousDisposable.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark_core/utils/AnonymousDisposable.cs b/src/client/spark_core/utils/AnonymousDisposable.cs index 2c35b0ef1..5948d6484 100644 --- a/src/client/spark_core/utils/AnonymousDisposable.cs +++ b/src/client/spark_core/utils/AnonymousDisposable.cs @@ -110,7 +110,7 @@ namespace mbts public ThreadSafeDisposable(Action dispose_once) => _dispose_once = dispose_once; - public bool has_dispose_started => Thread.VolatileRead(ref _state) == 0; + public bool has_dispose_started => Thread.VolatileRead(ref _state) != 0; /// /// Guarenteed to only execute the dispose-action once. This is thread-safe. @@ -122,4 +122,4 @@ namespace mbts _dispose_once(); } } -} \ No newline at end of file +} From 2c8c6ac9b8ee7429e7c5d008043a16e477dd93c8 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 22 Aug 2018 13:12:42 -0400 Subject: [PATCH 096/126] OrderRecordTupleSource - use lock instead of ThreadYieldRWGate --- src/client/spark/Orders/OrderRecordTupleSource.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/client/spark/Orders/OrderRecordTupleSource.cs b/src/client/spark/Orders/OrderRecordTupleSource.cs index 4b3ab1a03..468063bb2 100644 --- a/src/client/spark/Orders/OrderRecordTupleSource.cs +++ b/src/client/spark/Orders/OrderRecordTupleSource.cs @@ -33,22 +33,21 @@ namespace mbts.spark { string fmt_assert_msg(string msg) => $"{nameof(OrderRecordTupleSource)}.{nameof(create_observable)}: {msg}"; } - // _n_write_ops should never be greater than 1, bc all 3 input observables fire 'OnDispatcher' - readonly ThreadYieldRWGate _rw_gate = new ThreadYieldRWGate(); readonly Subject> _subject = new Subject>(); readonly Dictionary _state = new Dictionary(); readonly SetMap _security_orders = new SetMap(); IReadOnlyDictionary _orders_cache = new Dictionary(0); IReadOnlyDictionary _security_md_cache = new Dictionary(0); IDisposable _dispose; + object _lock = new object(); OrderRecordTupleSource(IObservable> securities, IObservable> orders) => _dispose = Disposable.Create( - securities.OnDispatcher().Subscribe(_update_securities), - orders.OnDispatcher().AddRemoveOnly().Subscribe(_update_orders)); + securities.Subscribe(_update_securities), + orders.AddRemoveOnly().Subscribe(_update_orders)); public IDisposable Subscribe(IObserver> observer) { - using (_rw_gate.read()) { + lock (_lock) { observer.OnNext(new IncrementalUpdate(new Dictionary(_state), new Dictionary(0))); return _subject.Subscribe(observer); } @@ -57,7 +56,7 @@ namespace mbts.spark { public void Dispose() => Disposable.dispose(ref _dispose); void _update_orders(LegacyTableUpdate orders) { - using (_rw_gate.write()) { + lock (_lock) { Dictionary removed = new Dictionary(), added = new Dictionary(); foreach (OrderRecordImmutable order in orders.removed) { uint sec_key = order.security_key(); @@ -77,7 +76,7 @@ namespace mbts.spark { } void _update_securities(IReadOnlyDictionary securities) { - using (_rw_gate.write()) { + lock (_lock) { Dictionary added = new Dictionary(), removed = new Dictionary(); _security_md_cache.Keys.difference(securities.Keys, out IEnumerable added_keys, out IEnumerable removed_keys); foreach (var k in removed_keys) { From e05c38dcf6d444f5c47cbbbbab2817cd1c450ae3 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 22 Aug 2018 13:57:46 -0400 Subject: [PATCH 097/126] remove ThreadYieldRWGate --- .../spark/core/Utility/ThreadYieldRWGate.cs | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 src/client/spark/core/Utility/ThreadYieldRWGate.cs diff --git a/src/client/spark/core/Utility/ThreadYieldRWGate.cs b/src/client/spark/core/Utility/ThreadYieldRWGate.cs deleted file mode 100644 index 7d77ebe1f..000000000 --- a/src/client/spark/core/Utility/ThreadYieldRWGate.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Threading; - -namespace mbts.utils { - /// - /// Provides mechanisms to ensure that only one write op may execute at a time, and calls to read or write while a write op is underway will Thread.yield until the write-op is completed. - /// If no write-op is underway, read-ops may run concurrently. - /// - class ThreadYieldRWGate { - int _n_write_ops, _n_read_ops; - - public IDisposable read() { - while (_n_write_ops > 0) - Thread.Yield(); - Interlocked.Increment(ref _n_read_ops); - if (_n_write_ops > 0) { - // A write-op was yielding at the same time and beat us to the punch! Try again - Interlocked.Decrement(ref _n_read_ops); - return read(); - } - return Disposable.Create(() => Interlocked.Decrement(ref _n_read_ops)); - } - - public IDisposable write() { - while (_n_read_ops > 0 || _n_write_ops > 0) - Thread.Yield(); - if (Interlocked.Increment(ref _n_write_ops) > 1 || _n_read_ops > 0) { - // Another write/read-op was yielding at the same time and beat us to the punch! Try again - Interlocked.Decrement(ref _n_write_ops); - return write(); - } - return Disposable.Create(() => Interlocked.Decrement(ref _n_write_ops)); - } - } -} \ No newline at end of file From 102a6d826962dd83a94e8a0ca247691dd26cac95 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 22 Aug 2018 17:42:47 -0400 Subject: [PATCH 098/126] fix notification predicates that were dependent upon observing every update (api streams are naggled now) --- .../INotificationServiceDataCache.cs | 21 ++++-- .../spark/Notifications/ToastNotification.cs | 11 +-- .../spark/Orders/OrderActivitySummarizer.cs | 11 +++ .../Events/OrderCanceledEventPredicate.cs | 53 ++++++--------- .../Events/OrderCompletedEventPredicate.cs | 46 +++++-------- .../Data/Events/OrderEventPredicateHelper.cs | 67 +++++++++++++++++++ .../Data/Events/OrderFilledEventPredicate.cs | 9 ++- 7 files changed, 146 insertions(+), 72 deletions(-) create mode 100644 src/client/spark/Predicates/Data/Events/OrderEventPredicateHelper.cs diff --git a/src/client/spark/Notifications/INotificationServiceDataCache.cs b/src/client/spark/Notifications/INotificationServiceDataCache.cs index a79d5df33..aed90fbdb 100644 --- a/src/client/spark/Notifications/INotificationServiceDataCache.cs +++ b/src/client/spark/Notifications/INotificationServiceDataCache.cs @@ -8,8 +8,11 @@ namespace bts.shell { // The INotificationService updates these caches in its IObservable.OnNext callbacks, just before calling all of the predicate-trigger methods. // Therfore, data referenced through this interface is guarenteed to be up-to-date, and thread safe. It also reduces performance overhead by avoiding redundant bookeeping. // Note: last_order_reset_time can be used by sound/toast-notification sources to avoid sending false-positive notifications for old orders (i.e. all the orders that arrive in the first update on startup/server restart) + // -------------------------------------------------------------------------------------------------------------------------------------------- + // IMPOARTANT!!! The current implementation of this interface is NOT INTENDED FOR GENERAL USE - order_history is NOT THREAD-SAFE interface INotificationServiceDataCache { DateTime last_order_reset_time { get; } + bool is_first_order_update { get; } IReadOnlyDictionary>> order_history { get; } } @@ -31,31 +34,37 @@ namespace bts.shell { partial class NotificationService : INotificationService, IDisposable { class DataCache : INotificationServiceDataCache { const int _buffer_size = 10; - Dictionary>> _order_cache = new Dictionary>>(); - - public IReadOnlyDictionary>> order_history => _order_cache; + readonly Dictionary _order_cache = new Dictionary(); + readonly Dictionary>> _order_history = new Dictionary>>(); + public IReadOnlyDictionary>> order_history => _order_history; public DateTime last_order_reset_time { get; private set; } + public bool is_first_order_update { get; private set; } public void update(IIncrementalUpdate data) { DateTime now = DateTime.Now; if (data.removed.Count == _order_cache.Count) { last_order_reset_time = now; + _order_cache.Clear(); } + is_first_order_update = _order_cache.Count == 0 && data.added.Count > 0; foreach (var kv in data.removed) { if (data.added.ContainsKey(kv.Key)) { - _order_cache[kv.Key].Add(new TimeStampedData(kv.Value, now)); + _order_cache[kv.Key] = kv.Value; + _order_history[kv.Key].Add(new TimeStampedData(kv.Value, now)); } else { + _order_cache.Remove(kv.Key); // TODO: maybe these shouldn't be removed? // if we add delta/time predicates that need to refer to order history, we might need to keep them around // although, if the server is telling us to remove them, perhaps we shouldn't consider such data. - _order_cache.Remove(kv.Key); + _order_history.Remove(kv.Key); } } foreach (var kv in data.added) { if (data.removed.ContainsKey(kv.Key)) continue; - _order_cache.AddOrUpdate(kv.Key, + _order_cache.Add(kv.Key, kv.Value); + _order_history.AddOrUpdate(kv.Key, k => new List> { new TimeStampedData(kv.Value, now) }, (k, l) => { l.Add(new TimeStampedData(kv.Value, now)); diff --git a/src/client/spark/Notifications/ToastNotification.cs b/src/client/spark/Notifications/ToastNotification.cs index d6fb46378..e9542cc27 100644 --- a/src/client/spark/Notifications/ToastNotification.cs +++ b/src/client/spark/Notifications/ToastNotification.cs @@ -68,7 +68,7 @@ namespace bts.shell { public static IToastNotification order_completed(OrderRecordTuple order) => new OrderCompletedToastNotification(order.order, order.security_md?.security); - public static IToastNotification order_status_changed(uint key, OrderStatus old_status, OrderStatus new_status, SecurityImmutable? security) => + public static IToastNotification order_status_changed(uint key, OrderStatus? old_status, OrderStatus new_status, SecurityImmutable? security) => new OrderStatusChangeToastNotification(key, old_status, new_status, security); abstract class ToastNotificationBase : IToastNotification { @@ -109,10 +109,11 @@ namespace bts.shell { class OrderStatusChangeToastNotification : ToastNotificationBase, IEquatable { uint _key; - readonly OrderStatus _new_status, _old_status; + readonly OrderStatus _new_status; + readonly OrderStatus? _old_status; readonly SecurityImmutable? _security; - public OrderStatusChangeToastNotification(uint key, OrderStatus old_status, OrderStatus new_status, SecurityImmutable? security) { + public OrderStatusChangeToastNotification(uint key, OrderStatus? old_status, OrderStatus new_status, SecurityImmutable? security) { _key = key; _old_status = old_status; _new_status = new_status; @@ -126,14 +127,14 @@ namespace bts.shell { public bool Equals(OrderStatusChangeToastNotification other) => other != null && _key == other._key && - _old_status == other._old_status && + EqualityComparer.nullable_equals(_old_status, other._old_status) && _new_status == other._new_status && _security.HasValue == other._security.HasValue; public override bool Equals(object obj) => Equals(obj as OrderStatusChangeToastNotification); public override int GetHashCode() => - EqualityComparer.aggregate_hash((int)_key, (int)_old_status, (int)_new_status, _security.HasValue.GetHashCode()); + EqualityComparer.aggregate_hash((int)_key, _old_status.HasValue ? (int)_old_status.Value : -1, (int)_new_status, _security.HasValue.GetHashCode()); } // Note: this class does not check whether or not order.status is actually "completed," diff --git a/src/client/spark/Orders/OrderActivitySummarizer.cs b/src/client/spark/Orders/OrderActivitySummarizer.cs index ed3327560..6466c90bc 100644 --- a/src/client/spark/Orders/OrderActivitySummarizer.cs +++ b/src/client/spark/Orders/OrderActivitySummarizer.cs @@ -68,6 +68,14 @@ namespace bts.spark { public static string format_status_change(uint key, OrderStatus old_status, OrderStatus new_status, SecurityImmutable? security) => _format_status_change(_header(key, security), key, old_status, new_status); + // since changes are naggled, transition changes aren't always detected (e.g. a new order changes before observers are notified of its existence), so old_status might be null. + public static string format_status_change(uint key, OrderStatus? old_status, OrderStatus new_status, SecurityImmutable? security) { + string header = _header(key, security); + return old_status.HasValue? + _format_status_change(header, key, old_status.Value, new_status) : + _format_status_change(header, key, new_status); + } + public static string order_completion_debrief(OrderRecordImmutable order, SecurityImmutable? security) => _format_order_completion(_header(order.Key, security), order, security?.ContractSpec); @@ -104,6 +112,9 @@ namespace bts.spark { return $"{header} {after.Def.Side.past_tense()} {(fa - fb)} ({fa} total), still working {after.working_quantity()}"; } + static string _format_status_change(string header, uint key, OrderStatus new_status) => + $"{header} Status changed to {new_status}"; + static string _format_status_change(string header, uint key, OrderStatus old_status, OrderStatus new_status) => $"{header} Status changed from {old_status} to {new_status}"; diff --git a/src/client/spark/Predicates/Data/Events/OrderCanceledEventPredicate.cs b/src/client/spark/Predicates/Data/Events/OrderCanceledEventPredicate.cs index 5e727611e..fa8ebf3db 100644 --- a/src/client/spark/Predicates/Data/Events/OrderCanceledEventPredicate.cs +++ b/src/client/spark/Predicates/Data/Events/OrderCanceledEventPredicate.cs @@ -3,6 +3,7 @@ using bts.api.orderman; using bts.shell; using mbts.spark; using mbts.ui.settings; +using mbts.utils; using ProtoBuf; using System; using System.Collections.Generic; @@ -24,7 +25,7 @@ namespace mbts { } [ProtoContract] - class OrderCanceledEventPredicate : IPredicateBuilder, IEquatable { + class OrderCanceledEventPredicate : IPredicateBuilder, IEquatable { public enum PredicateTypeOneofCase { [Description("(any order)")] AnyOrder, @@ -44,56 +45,46 @@ namespace mbts { } public IPredicate create(object obj) => - create((INotificationServiceDataCache)obj); + create_predicate((INotificationServiceDataCache)obj); - public IPredicate create(INotificationServiceDataCache data_cache) { - IPredicate predicate = new MyPredicate(data_cache); - if (security != null) { - predicate = predicate.and(security.create(data_cache).wrap(o => (o.security_md?.security) ?? SecurityDataHelper.Defaults.SecurityImmutable)); - } - return predicate; - } + public IPredicate create_predicate(INotificationServiceDataCache data_cache) => + OrderEventPredicateHelper.create_status_transition_predicate(OrderStatus.Canceled, security, data_cache); public INotificationPredicate create_toast(INotificationServiceDataCache data_cache) => - new MyToaster(create(data_cache), data_cache); + new MyToaster(security?.create(data_cache), data_cache); public bool Equals(OrderCanceledEventPredicate other) => other != null && other.security.safe_equals(other.security); public override bool Equals(object obj) => Equals(obj as OrderCanceledEventPredicate); public override int GetHashCode() => security == null ? 0 : security.GetHashCode(); - class MyPredicate : IPredicate { - readonly INotificationServiceDataCache _data_cache; - - public MyPredicate(INotificationServiceDataCache data_cache) => - _data_cache = data_cache; - - public bool trigger(OrderRecordTuple order) => - _data_cache.order_history.TryGetValue(order.order.Key, out List> l) && l.Count > 1 && - l[l.Count - 2].data.order.status() != OrderStatus.Canceled && order.order.status() == OrderStatus.Canceled; - - public bool trigger(object obj) => trigger(obj as OrderRecordTuple); - } + static bool _is_canceled(OrderRecordImmutable o) => + o.HasState && o.State.Status == OrderStatus.Canceled; class MyToaster : INotificationPredicate, IEquatable { - readonly IPredicate _predicate; + readonly IPredicate _security_predicate; readonly INotificationServiceDataCache _data_cache; - public MyToaster(IPredicate predicate, INotificationServiceDataCache data_cache) { - _predicate = predicate; + public MyToaster(IPredicate security_predicate, INotificationServiceDataCache data_cache) { + _security_predicate = security_predicate; _data_cache = data_cache; } public IToastNotification trigger(OrderRecordTuple order) => - _predicate.trigger(order) && _data_cache.get_previous_order_state(order.order.Key) is OrderRecordTuple oldval ? - ToastNotifications.order_status_changed(order.order.Key, oldval.order.status(), order.order.status(), order.security_md?.security) : ToastNotifications.empty; + OrderEventPredicateHelper.check_order_transition_trigger(order, _is_canceled, _security_predicate, _data_cache, out OrderRecordTuple oldval) ? + ToastNotifications.order_status_changed(order.order.Key, OrderEventPredicateHelper.get_nullable_status(oldval), OrderStatus.Canceled, order.security_md.HasValue ? order.security_md.Value.security : new SecurityImmutable?()) : + ToastNotifications.empty; - bool IPredicate.trigger(OrderRecordTuple order) => _predicate.trigger(order); + bool IPredicate.trigger(OrderRecordTuple order) => + OrderEventPredicateHelper.check_order_transition_predicate(order, _is_canceled, _security_predicate, _data_cache); public bool Equals(MyToaster other) => - other != null && _predicate.Equals(other._predicate); + other != null && EqualityComparer.null_check_equals(_security_predicate, other._security_predicate); - public override bool Equals(object obj) => Equals(obj as MyToaster); - public override int GetHashCode() => _predicate.GetHashCode(); + public override bool Equals(object obj) => + Equals(obj as MyToaster); + + public override int GetHashCode() => + EqualityComparer.aggregate_hash((int)OrderStatus.Canceled, _security_predicate == null ? 0 : _security_predicate.GetHashCode()); } } } \ No newline at end of file diff --git a/src/client/spark/Predicates/Data/Events/OrderCompletedEventPredicate.cs b/src/client/spark/Predicates/Data/Events/OrderCompletedEventPredicate.cs index 9912f94d1..29337ee26 100644 --- a/src/client/spark/Predicates/Data/Events/OrderCompletedEventPredicate.cs +++ b/src/client/spark/Predicates/Data/Events/OrderCompletedEventPredicate.cs @@ -3,6 +3,7 @@ using bts.api.orderman; using bts.shell; using mbts.spark; using mbts.ui.settings; +using mbts.utils; using ProtoBuf; using System; using System.Collections.Generic; @@ -46,54 +47,43 @@ namespace mbts { public IPredicate create(object obj) => create_predicate((INotificationServiceDataCache)obj); - public IPredicate create_predicate(INotificationServiceDataCache data_cache) { - IPredicate predicate = new MyPredicate(data_cache); - if (security != null) { - predicate = predicate.and(security.create(data_cache).wrap(o => (o.security_md?.security) ?? SecurityDataHelper.Defaults.SecurityImmutable)); - } - return predicate; - } + public IPredicate create_predicate(INotificationServiceDataCache data_cache) => + OrderEventPredicateHelper.create_status_transition_predicate(OrderStatus.Completed, security, data_cache); public INotificationPredicate create_toast(INotificationServiceDataCache data_cache) => - new MyToaster(create_predicate(data_cache), data_cache); + new MyToaster(security?.create(data_cache), data_cache); public bool Equals(OrderCompletedEventPredicate other) => other != null && other.security.safe_equals(other.security); public override bool Equals(object obj) => Equals(obj as OrderCompletedEventPredicate); public override int GetHashCode() => security == null ? 0 : security.GetHashCode(); - class MyPredicate : IPredicate { - readonly INotificationServiceDataCache _data_cache; - - public MyPredicate(INotificationServiceDataCache data_cache) => - _data_cache = data_cache; - - public bool trigger(OrderRecordTuple order) => - _data_cache.get_previous_order_state(order.order.Key) is OrderRecordTuple oldval && - oldval.order.status() != OrderStatus.Completed && order.order.status() == OrderStatus.Completed; - - public bool trigger(object obj) => trigger(obj as OrderRecordTuple); - } + static bool _is_completed(OrderRecordImmutable o) => + o.HasState && o.State.Status == OrderStatus.Completed; class MyToaster : INotificationPredicate, IEquatable { - readonly IPredicate _predicate; + readonly IPredicate _security_predicate; readonly INotificationServiceDataCache _data_cache; - public MyToaster(IPredicate predicate, INotificationServiceDataCache data_cache) { - _predicate = predicate; + public MyToaster(IPredicate security_predicate, INotificationServiceDataCache data_cache) { + _security_predicate = security_predicate; _data_cache = data_cache; } public IToastNotification trigger(OrderRecordTuple order) => - _predicate.trigger(order) && _data_cache.get_previous_order_state(order.order.Key) is OrderRecordTuple oldval ? + OrderEventPredicateHelper.check_order_transition_predicate(order, _is_completed, _security_predicate, _data_cache) ? ToastNotifications.order_completed(order) : ToastNotifications.empty; - bool IPredicate.trigger(OrderRecordTuple order) => _predicate.trigger(order); + bool IPredicate.trigger(OrderRecordTuple order) => + OrderEventPredicateHelper.check_order_transition_predicate(order, _is_completed, _security_predicate, _data_cache); public bool Equals(MyToaster other) => - other != null && _predicate.Equals(other._predicate); + other != null && EqualityComparer.null_check_equals(_security_predicate, other._security_predicate); - public override bool Equals(object obj) => Equals(obj as MyToaster); - public override int GetHashCode() => _predicate.GetHashCode(); + public override bool Equals(object obj) => + Equals(obj as MyToaster); + + public override int GetHashCode() => + EqualityComparer.aggregate_hash((int)OrderStatus.Completed, _security_predicate == null ? 0 : _security_predicate.GetHashCode()); } } } \ No newline at end of file diff --git a/src/client/spark/Predicates/Data/Events/OrderEventPredicateHelper.cs b/src/client/spark/Predicates/Data/Events/OrderEventPredicateHelper.cs new file mode 100644 index 000000000..9582b6089 --- /dev/null +++ b/src/client/spark/Predicates/Data/Events/OrderEventPredicateHelper.cs @@ -0,0 +1,67 @@ +using bts.api; +using bts.api.orderman; +using bts.shell; +using mbts.spark; +using mbts.utils; +using System; + +namespace mbts { + static class OrderEventPredicateHelper { + /// + /// Checks if the order has transitioned from 'not passing the predicate, or not existing' to 'passing the predicate.' + /// + public static bool check_order_transition_predicate(OrderRecordTuple order, Func order_predicate_core, IPredicate security_predicate, INotificationServiceDataCache data_cache) => + check_order_transition_trigger(order, order_predicate_core, security_predicate, data_cache, out OrderRecordTuple _); + + /// + /// Checks if the order has transitioned from 'not passing the predicate, or not existing' to 'passing the predicate.' Oldval will be null if the order did not previously exist, or does not currently pass the predicate. + /// + public static bool check_order_transition_trigger(OrderRecordTuple order, Func order_predicate_core, IPredicate security_predicate, INotificationServiceDataCache data_cache, out OrderRecordTuple oldval) { + if (check_security_predicate(order, security_predicate) && order_predicate_core(order.order)) { + oldval = data_cache.get_previous_order_state(order.order.Key); + return oldval == null ? !data_cache.is_first_order_update : order_predicate_core(oldval.order); + } + oldval = null; + return false; + } + + /// + /// Checks if the 'security predicate is null,' or 'it is not null, and the order has a non-null security which passes.' + /// + public static bool check_security_predicate(OrderRecordTuple order, IPredicate security_predicate) => + security_predicate == null || (order.security_md.HasValue && security_predicate.trigger(order.security_md.Value.security)); + + public static OrderStatus? get_nullable_status(OrderRecordTuple order) { + if (order == null && order.order.HasState) + return order.order.State.Status; + return null; + } + + public static IPredicate create_status_transition_predicate(OrderStatus status, SecurityPredicate security_predicate, INotificationServiceDataCache data_cache) => + new OrderStatusTransitionPredicate(status, security_predicate?.create(data_cache), data_cache); + + class OrderStatusTransitionPredicate : IPredicate, IEquatable { + readonly IPredicate _security_predicate; + readonly INotificationServiceDataCache _data_cache; + readonly OrderStatus _status; + + public OrderStatusTransitionPredicate(OrderStatus status, IPredicate security_predicate, INotificationServiceDataCache data_cache) { + _status = status; + _security_predicate = security_predicate; + _data_cache = data_cache; + } + + public bool trigger(OrderRecordTuple value) => + check_order_transition_predicate(value, o => o.HasState && o.State.Status == _status, _security_predicate, _data_cache); + + public bool Equals(OrderStatusTransitionPredicate other) => + other != null && _status == other._status && EqualityComparer.null_check_equals(_security_predicate, other._security_predicate); + + public override bool Equals(object obj) => + Equals(obj as OrderStatusTransitionPredicate); + + public override int GetHashCode() => + EqualityComparer.aggregate_hash((int)_status, _security_predicate == null ? 0 : _security_predicate.GetHashCode()); + } + } +} \ No newline at end of file diff --git a/src/client/spark/Predicates/Data/Events/OrderFilledEventPredicate.cs b/src/client/spark/Predicates/Data/Events/OrderFilledEventPredicate.cs index 78686c976..9b67bd56f 100644 --- a/src/client/spark/Predicates/Data/Events/OrderFilledEventPredicate.cs +++ b/src/client/spark/Predicates/Data/Events/OrderFilledEventPredicate.cs @@ -57,7 +57,6 @@ namespace mbts { FillTriggerModel _create_model(INotificationServiceDataCache nsdc) => new FillTriggerModel(nsdc, security?.create(nsdc)); - class FillTriggerModel { readonly IPredicate _security_predicate; readonly INotificationServiceDataCache _data_cache; @@ -68,9 +67,15 @@ namespace mbts { } public (bool trigger, OrderRecordTuple oldval, OrderRecordTuple newval) get_filled_order_args(OrderRecordTuple ort) { - if (ort.order.is_exchange_order() && (_security_predicate == null || (ort.security_md.HasValue && _security_predicate.trigger(ort.security_md.Value.security)))) { + if (ort.order.is_exchange_order() && OrderEventPredicateHelper.check_security_predicate(ort, _security_predicate)) { if (_data_cache.get_previous_order_state(ort.order.Key) is OrderRecordTuple oldval) return (ort.order.filled() > oldval.order.filled(), oldval, ort); + else if (!_data_cache.is_first_order_update && ort.order.filled() > 0) { + // old order will be a copy of new order, except with filledQuantity set to 0 + var old_state = ort.order.State.CloneToMutable(); + old_state.FilledQuantity = 0; + return (true, new OrderRecordTuple(ort.order.with(state: old_state), ort.security_md), ort); + } } return (false, null, null); } From 4fdea219b619394ec0fc47301a5b29762018751a Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 22 Aug 2018 18:11:03 -0500 Subject: [PATCH 099/126] FillsVM - making it safer in case of nulls --- src/client/spark/Modules/Trading/Fills/FillsVM.cs | 6 +++--- src/client/spark/Orders/FillTuple.cs | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 9e2d30bcc..8f48ab0e4 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -157,11 +157,11 @@ namespace mbts.spark { } public DateTime fill_time => _fill.Timestamp.ToDateTimeOffset().LocalDateTime; - public TimeInForce time_in_force => _order.Def.TimeInForce; - public OrderType order_type => _order.Def.CustomDef.CustomCase; + public TimeInForce time_in_force => _order.time_in_force(); + public OrderType order_type => _order.order_type(); public OrderMetadata order_metadata => _model.factory.get_metadata(_order.Def.CustomDef.CustomCase); public string account { get; private set; } - public string user => _order.Def.User; + public string user => _order.user(); public Venue exchange => security.Exchange; public Side side => _fill.Side; public double price => _fill.LastPrice; diff --git a/src/client/spark/Orders/FillTuple.cs b/src/client/spark/Orders/FillTuple.cs index bdc9a6088..1cc929bcb 100644 --- a/src/client/spark/Orders/FillTuple.cs +++ b/src/client/spark/Orders/FillTuple.cs @@ -2,6 +2,7 @@ using bts.api.orderman; using mbts.utils; using System; + using static bts.api.orderman.Fill.Types; namespace mbts.spark { @@ -20,7 +21,14 @@ namespace mbts.spark { // the TrimEnd is very important b/c the server currently does not trim, // but the account is part of the group, so this is necessary - public string account => (fill.FillKind != FillKind.Sod ? order?.Def.Account : fill.Account).TrimEnd(); + public string account { + get { + var trimmed_account_string = string.Empty; + if (fill.FillKind != FillKind.Sod && order.HasValue && order.Value.HasDef) trimmed_account_string = order.Value.Def.Account; + else trimmed_account_string = fill.Account; + return trimmed_account_string == null ? string.Empty : trimmed_account_string.Trim(); + } + } public bool Equals(FillTuple other) => other != null && other.order.HasValue == order.HasValue From 0bd87e7063848fb8057de0181dfa2d10b2a501bc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 22 Aug 2018 19:11:58 -0400 Subject: [PATCH 100/126] Brush thread-safety --- src/client/spark/core/FontsAndColors/BTSColors.cs | 11 +++++++---- src/client/spark/view/Colors.xaml | 2 -- .../spark/view/Controls/Time/DateTimePicker.xaml | 2 +- .../spark/view/Controls/Time/TimeSpanControl.xaml | 2 +- src/client/spark/view/Extensions/WPFExtensions.cs | 3 +++ src/client/spark/view/Resources/Converters.xaml | 4 ++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/client/spark/core/FontsAndColors/BTSColors.cs b/src/client/spark/core/FontsAndColors/BTSColors.cs index a7e819760..894244e9f 100644 --- a/src/client/spark/core/FontsAndColors/BTSColors.cs +++ b/src/client/spark/core/FontsAndColors/BTSColors.cs @@ -306,8 +306,7 @@ namespace mbts.ui { public static BTSColor grid_line { get { return new BTSColor(64, 0, 0, 0); } } } - public static class UI - { + public static class UI { [DisplayInfo(name = "Shell Background")] public static BTSColor default_background { get { return new BTSColor(0xf6, 0xf6, 0xf6); } } [DisplayInfo(name = "Shell Text")] @@ -324,6 +323,7 @@ namespace mbts.ui { public static BTSColor input_mouseover_background { get { return new BTSColor(0xAB, 0xAD, 0xB3); } } public static BTSColor input_selected_border { get { return new BTSColor(0x7E, 0xB4, 0xEA); } } public static BTSColor input_selected_background { get { return new BTSColor(0xAB, 0xAD, 0xB3); } } + public static BTSColor text_prompt_foreground_color => 0x99999999; public static BTSColor input_disabled_text => new BTSColor(0x87); public static BTSColor input_disabled_text_dark => new BTSColor(0x66); @@ -335,6 +335,9 @@ namespace mbts.ui { public static BTSColor input_dirty_border => warning; + public static Brush text_prompt_foreground_brush { get; } = text_prompt_foreground_color.to_brush().frozen(); + public static Brush input_disabled_text_brush { get; } = input_disabled_text.to_brush().frozen(); + public static class ComboBox { // Normal @@ -645,8 +648,8 @@ namespace mbts.ui { public static Color logo_gray { get { return Color.FromRgb(179, 179, 179); } } public static Brush logo_gray_brush { get { return new SolidColorBrush(logo_gray); } } - public static Color common_background { get { return UI.default_background; } } - public static Brush common_background_brush { get { return new SolidColorBrush(common_background); } } + public static Color common_background => UI.default_background; + public static Brush common_background_brush { get; } = common_background.to_brush().frozen(); public static Color accent1 { get { return UI.accent_light; } } public static Brush accent1_brush { get { return new SolidColorBrush(accent1); } } diff --git a/src/client/spark/view/Colors.xaml b/src/client/spark/view/Colors.xaml index 073ca2704..e990a354c 100644 --- a/src/client/spark/view/Colors.xaml +++ b/src/client/spark/view/Colors.xaml @@ -75,6 +75,4 @@ - - \ No newline at end of file diff --git a/src/client/spark/view/Controls/Time/DateTimePicker.xaml b/src/client/spark/view/Controls/Time/DateTimePicker.xaml index 2b329506d..7aee8f0dd 100644 --- a/src/client/spark/view/Controls/Time/DateTimePicker.xaml +++ b/src/client/spark/view/Controls/Time/DateTimePicker.xaml @@ -66,7 +66,7 @@