From 36d40dec70c254a2e9dfe05e69b0d2f26cd6d29b Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 13 May 2019 12:59:49 -0400 Subject: [PATCH 01/86] spell check manual tests --- testing/manual/spreader_misc/fractional_hedging.txt | 8 ++++---- testing/manual/spreader_misc/implied_vs_direct.txt | 6 +++--- testing/manual/spreader_misc/n_legs.txt | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/testing/manual/spreader_misc/fractional_hedging.txt b/testing/manual/spreader_misc/fractional_hedging.txt index ea0798e65..c0f218383 100644 --- a/testing/manual/spreader_misc/fractional_hedging.txt +++ b/testing/manual/spreader_misc/fractional_hedging.txt @@ -2,9 +2,9 @@ This test verifies that fractional hedges work. That is, when a fill in a quotin not equate to one full contract in the hedging leg, we accumulate the unhedged delta, until we can send one or more hedging contracts. -1. Create a new synthetic spread. For the legs choose SIF9 and SIH9 (if you dont +1. Create a new synthetic spread. For the legs choose SIF9 and SIH9 (if you don't have these contracts, other contracts can be chosen too) and for the quantities choose 1 and -1.5 -respectively (and same for the Price multiplier). +respectively (and same for the Price multiplier). Enable quoting for SIH9, and disable all quoting, pre-hedge and post-hedge parameters. Name the synthetic SIF9-1.5SIH9. @@ -18,13 +18,13 @@ to enter orders). The quoting order will lean against this. 4. Verify that a 15 lot quoting order is sent for SIH9 at 19.935. 5. Now we will start filling the quoting order and verify the hedges. A 1 lot fill in the -quoting leg means a 2/3 contract in the hedging leg. Since we can not send 2/3 constracts, +quoting leg means a 2/3 contract in the hedging leg. Since we can not send 2/3 contracts, we will add it to the "unhedged delta" till the unhedged delta > 1, and then we will send one or more orders to get the unhedged delta < 1. Force quoting fills based on the left most column (by lifting the quoting offer) and verify that hedge orders of size "hedge_order_sent" (3rd column) are sent as a result. -The "unhedged_delta" column shows the unhedged delta immediatly after the quoting fill +The "unhedged_delta" column shows the unhedged delta immediately after the quoting fill and the "remaining_unhedged_delta" column is the unhedged delta after the hedge order has been sent. You can check the hedge orders being sent easily by looking at the order reduction diff --git a/testing/manual/spreader_misc/implied_vs_direct.txt b/testing/manual/spreader_misc/implied_vs_direct.txt index 6acf12cb2..74fbef376 100644 --- a/testing/manual/spreader_misc/implied_vs_direct.txt +++ b/testing/manual/spreader_misc/implied_vs_direct.txt @@ -10,7 +10,7 @@ ExchangeSim { } } -1. Open up the mview and find a security with with both direct and implied markets, on the ask side. +1. Open up the mview and find a security with with both direct and implied markets, on the ask side. Make sure those markets are stable and you can rely on them. 2. Create a synthetic with the security in 1. being the hedge leg (buy) and choose a quoting @@ -19,11 +19,11 @@ use "Merged" 3. Disable all spreader params. -4. Now enter a spreader order so that it doesnt get filled immediatly. Note the quoting order. +4. Now enter a spreader order so that it doesn't get filled immediately. Note the quoting order. quoting leg price = hedge_price - spreader_price. hedge_price is where it can buy the hedge order (which since its a buy will be on the ask side of the hedging market). -Make sure thta its correct and its using the merged book in the hedging market. +Make sure that its correct and its using the merged book in the hedging market. 5. Cancel the order and change the spreader so its using Direct prices. Repeat 4, and make sure its using direct price on the hedging market. \ No newline at end of file diff --git a/testing/manual/spreader_misc/n_legs.txt b/testing/manual/spreader_misc/n_legs.txt index dd596a8dd..edf10eab2 100644 --- a/testing/manual/spreader_misc/n_legs.txt +++ b/testing/manual/spreader_misc/n_legs.txt @@ -5,8 +5,8 @@ with 1 quoting leg. 1. Create a 4 legged synthetic spread with legs SIF9, SIH9, SIK9, SIN9, with leg quantities and price multipliers of 1,1,1 and -1 respectively. Leg SIN9 is the only quoting leg. -Disable all Quote, Pre-Hedge and Post-Hedge paramaters (leg contracts are arbitrary, so if you -dont have those contracts, choose any set of 4 contracts). +Disable all Quote, Pre-Hedge and Post-Hedge parameters (leg contracts are arbitrary, so if you +don't have those contracts, choose any set of 4 contracts). 2. Enter a synthetic buy order of 10 lots at 40.00. The ladders will most likely be empty, so use the market view to enter orders. @@ -16,7 +16,7 @@ Now enter: SIH9 10 lot sell @ 19.950 SIK9 10 lot sell @ 20.200 -There should still be no quoting order for SIN9 since the SIF9 hedge leg still doesnt have a market. +There should still be no quoting order for SIN9 since the SIF9 hedge leg still doesn't have a market. Now Enter: SIF9 1 lot sell @ 20.000 From 533e688d1a75f28c014f81b565a3c9b6cfe5d8f7 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 13 May 2019 13:09:15 -0400 Subject: [PATCH 02/86] SPARK-2438: init spreader_lean_qty_factor test --- src/client/spark_test/System/SpreaderTests.cs | 5 +++ .../spreader_lean_qty_factor.sh | 32 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh diff --git a/src/client/spark_test/System/SpreaderTests.cs b/src/client/spark_test/System/SpreaderTests.cs index 10a8a42d5..07462ed21 100644 --- a/src/client/spark_test/System/SpreaderTests.cs +++ b/src/client/spark_test/System/SpreaderTests.cs @@ -118,6 +118,11 @@ namespace bts.tests } + [Test(Timeout = 30)] + public async Task spreader_lean_qty_factor() { + + } + private async Task<(Boolean, OrderRecordImmutable?)> verify_child_order_status(uint parent_order_key, OrderStatus expected_status) { var order = await get_order(ordi => ordi.ParentKey == parent_order_key && ordi.State.Status == expected_status); return (order.HasValue && order.Value.State.Status == expected_status, order); diff --git a/src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh b/src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh new file mode 100644 index 000000000..28913e469 --- /dev/null +++ b/src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +rm -r ~/sparkdata/data/databases/ > /dev/null + +mv ~/sparkdata/conf/spark.conf ~/sparkdata/conf/spark.conf.bak +cat << EOF > ~/sparkdata/conf/spark.conf + ExchangeSim { + value { + merge_with_md:false + } + } + Logging { + value { + console { default_level: "Error" } + syslog { default_level: "Error" } + file { default_level: "Error" } + } +} +EOF + + +nohup ./sparkd run & +pid=$! +echo "sparkd pid: " $pid + +echo "sleeping for 120 seconds..." +sleep 120 + +dotnet sparkcmd.dll test spreader_lean_qty_factor + +kill $pid +mv ~/sparkdata/conf/spark.conf.bak ~/sparkdata/conf/spark.conf \ No newline at end of file From c0d097cb40e6b6f6852ee416f70a30ba82c95661 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 13 May 2019 13:26:53 -0400 Subject: [PATCH 03/86] SPARK-2438: spreader_lean_qty_factor test setup --- src/client/spark_test/System/SpreaderTests.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/client/spark_test/System/SpreaderTests.cs b/src/client/spark_test/System/SpreaderTests.cs index 07462ed21..92888b532 100644 --- a/src/client/spark_test/System/SpreaderTests.cs +++ b/src/client/spark_test/System/SpreaderTests.cs @@ -120,6 +120,16 @@ namespace bts.tests [Test(Timeout = 30)] public async Task spreader_lean_qty_factor() { + Assert.IsTrue(await TestUtils.test_for_system_ready(_context, TimeSpan.FromMinutes(5)), "System is not ready"); + + string test_symbol = "SI";// don't use ES, the prices will be rounded to the same number and the result will be off + var test_user = (name: "bts", id: 1u); + var test_account = (name: "ACC A", id: 1u); + + (SecurityImmutable s1, SecurityImmutable s2) test_securities = await SpreaderUtilities.get_securities_for_common_setup_one(_md_relay, test_symbol); + + var setup_product = await SpreaderUtilities.common_setup_one(_order_service, _synthetic_service, test_securities, test_account, test_user); + } From fb314f0eb19b72e573dc32398e2db2bbd3b82f66 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 5 Jun 2019 14:01:47 -0500 Subject: [PATCH 04/86] SPARK-2491 - mass cancel --- .../Trading/Ladder/VM/LadderOrderVM.cs | 1 + .../Trading/OrderBook/OrderBookColumns.cs | 22 +++++++++++++++++++ .../Trading/OrderBook/OrderBookRowVM.cs | 6 ++++- .../Modules/Trading/OrderBook/OrderBookVM.cs | 9 ++++++-- .../OrderBook/View/OrderBookGridView.xaml.cs | 3 ++- 5 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs index 51e162565..c0bbe5c18 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs @@ -335,6 +335,7 @@ namespace mbts.spark { } obvm.columns.Insert(0, new OrderBookVM.UpdateColumn(typeof(MiniOrderBookView))); obvm.columns.Insert(0, new OrderBookVM.CancelColumn(nameof(OrderBookRowVM.cancel_command))); + obvm.columns.Insert(0, new OrderBookVM.CheckColumn(nameof(OrderBookRowVM.is_checked))); obvm.load_from(state); return obvm; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 76daca299..6eaa6d6c1 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -724,6 +724,28 @@ namespace mbts.spark { } } + public class CheckColumn : FrameworkElementColumnBase { + readonly BindingBase _checked_binding; + public CheckColumn(string checked_property) : base(Columns.Check) { + id = key.ToString(); + Width = 30; + _checked_binding = new Binding(checked_property); + } + + public override FrameworkElement view_factory() { + var grid = new Grid() { + HorizontalAlignment = HorizontalAlignment.Center, + VerticalAlignment = VerticalAlignment.Center, + }; + var cb = new CheckBox(); + cb.Name = "check_col"; + cb.SetBinding(CheckBox.IsCheckedProperty, _checked_binding); + + grid.Children.Add(cb); + return grid; + } + } + public class CancelColumn : FrameworkElementColumnBase { readonly BindingBase _command_binding; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index e9a7d3b6b..24c36ca91 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -21,7 +21,7 @@ namespace mbts.spark { Color? _root_algo_badge_color_backing; Brush _badge_fill, _root_algo_badge_fill; IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd, _detach_command, _attach_command, _update_command, _modify_order_quantity_andor_price, _revert_prospective_order_quantity_andor_price; - bool _is_parent, _is_expanded, _is_selected, _is_attachable, _is_detachable; + bool _is_parent, _is_expanded, _is_selected, _is_attachable, _is_detachable, _is_checked; int _depth_level; SecurityImmutable? _security => order_tuple.security; // for mini-ob @@ -138,6 +138,10 @@ namespace mbts.spark { } public bool is_qty_dirty => this.prospective_quantity != this.quantity; public bool is_price_dirty => this.prospective_price != this.price; + public bool is_checked { + get => _is_checked; + set => Set(ref _is_checked, value); + } // Commands public ICommand toggle_command => _toggle_expanded_cmd ?? ( diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index cff54d5c4..7957d9541 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -572,8 +572,13 @@ namespace mbts.spark { internal void show_order_modify(OrderBookRowVM row) => _bus.post(SparkTags.ShowModifyOrderTag, row.order_key); - internal void cancel_order(OrderBookRowVM row) => - _bus.post(SparkTags.CancelOrders, new List { row.order_key }); + internal void cancel_order(OrderBookRowVM row) { + if (row.is_checked) { + rows.Where(r => r.is_checked).ForEach((checked_row) => _bus.post(SparkTags.CancelOrders, new List { checked_row.order_key })); + } else { + _bus.post(SparkTags.CancelOrders, new List { row.order_key }); + } + } internal void modify_order_quantity(OrderBookRowVM row, uint size) => _bus.post(SparkTags.UpdateOrder, (row.order_key, row.price, size)); diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs index 2f996e32f..2f6d21923 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs @@ -50,7 +50,8 @@ namespace mbts.spark { Update = 1 << 27, Commit = 1 << 28, RootAlgoType = 1 << 29, - Piq = 1 << 30 + Piq = 1 << 30, + Check = 1 << 31 } public OrderBookGridView() { From dcd8984b33e918a03e41ce7f16b5bdf4d88dceab Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 6 Jun 2019 12:35:09 -0500 Subject: [PATCH 05/86] SPARK-2489 / SPARK-2494 rename 'Column Settings' tab 'Ladder Columns' --- .../spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index ca4691070..3fd7dcb94 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -141,8 +141,8 @@ - - + + From a38a6057e07aa7798dba39b9764c7a1198c6b8d7 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 6 Jun 2019 13:32:48 -0500 Subject: [PATCH 06/86] part of SPARK-2485 - mini ob only shows exchange orders + spreader rows --- .../spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs | 6 ++++++ .../spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs | 4 +++- src/client/spark/Orders/OrderDataHelper.cs | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs index 98c414a46..f063fb01c 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs @@ -3,6 +3,7 @@ using bts.persist.algo; using bts.utils; using ProtoBuf; using System; +using System.Linq; namespace mbts.spark { [ProtoContract] @@ -14,6 +15,11 @@ namespace mbts.spark { [ProtoMember(3)] readonly uint? _persisted_key; + public static readonly AlgoID[] exchange_algo_keys = utilities.OrderDataHelper.outright_order_types + .Concat(new CustomOrderDefinition.CustomOneofCase[] { CustomOrderDefinition.CustomOneofCase.Spreader }) + .Select(cooc => new AlgoID(cooc)) + .ToArray(); + public AlgoID(CustomOrderDefinition.CustomOneofCase factory_key) { _factory_key = factory_key; _dynamic_key = null; diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs index c0bbe5c18..cbc33c7b4 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs @@ -1,5 +1,6 @@ using bts.api; using bts.api.orderman; +using mbts.spark.utilities; using mbts.ui; using mbts.ui.shell; using System; @@ -297,7 +298,8 @@ namespace mbts.spark { new bts.shell.orderbook.FilterStates { security_criteria = new SecurityCriteria(_owner.security), price = price_filter, - statuses = new[] { OrderStatus.Working } + statuses = new[] { OrderStatus.Working }, + order_types = AlgoID.exchange_algo_keys }, bts.shell.orderbook.OrderBookStartupData.default_mini_grid, use_defaults: false diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index 96acc2caa..0fa0730a0 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -622,6 +622,13 @@ namespace mbts.spark.utilities { CustomOrderDefinition.CustomOneofCase.Join, CustomOrderDefinition.CustomOneofCase.Cover, CustomOrderDefinition.CustomOneofCase.Top + }, + outright_order_types = new[] { + CustomOrderDefinition.CustomOneofCase.Market, + CustomOrderDefinition.CustomOneofCase.Limit, + CustomOrderDefinition.CustomOneofCase.Stop, + CustomOrderDefinition.CustomOneofCase.StopLimit, + CustomOrderDefinition.CustomOneofCase.GlbxIceberg, }; public static readonly CustomOrderDefinition.CustomOneofCase[] all_order_types = exchange_order_types.Union(spreader_order_types).ToArray(); From 570f85377ae1072732d3da056e6e7e696645a7ab Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 6 Jun 2019 14:00:06 -0500 Subject: [PATCH 07/86] part of SPARK-2485 - miniob - update buttons not visible unless leaf under control of an algo --- .../Modules/Trading/OrderBook/OrderBookColumns.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 6eaa6d6c1..2b9e28a09 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -992,9 +992,9 @@ namespace mbts.spark { public override FrameworkElement view_factory() { var popup = new System.Windows.Controls.Primitives.Popup(); - #region Attach Button + #region Update Button - // create the attach button and assign the menu to it + // create the update button and assign the menu to it var update_button = new Button() { Name = "update_button", Content = "ยทยทยท", @@ -1017,6 +1017,14 @@ namespace mbts.spark { row_vm_update_command_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(MiniOrderBookRowView), 1); update_button.SetBinding(Button.CommandProperty, row_vm_update_command_binding); + // update button is only visible for orders under the control of an algo + var update_button_visibility_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookRowVM.root_algo_order_type))) { + Converter = ValueConverter.create(ord_type => utilities.OrderDataHelper.outright_order_types.Contains(ord_type) ? Visibility.Hidden : Visibility.Visible) + }; + update_button_visibility_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(MiniOrderBookRowView), 1); + update_button.SetBinding(Button.VisibilityProperty, update_button_visibility_binding); + + #endregion #region OrderParamsPanel From 3f245cd88674530a5703467be28d181f2e001a0c Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 6 Jun 2019 14:20:00 -0500 Subject: [PATCH 08/86] SPARK-2497 - mini ob mass detach --- .../spark/Modules/Trading/OrderBook/OrderBookVM.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 7957d9541..0a9759524 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -555,8 +555,15 @@ namespace mbts.spark { return r; } - internal void detach_orders(OrderBookRowVM order) => - _detach_orders_async(new[] { order }).ignore(); + internal void detach_orders(OrderBookRowVM order) { + if (order.is_checked) { + var detach_candidates = rows.Where(r => r.is_checked); + _detach_orders_async(detach_candidates).ignore(); + detach_candidates.ForEach((row_vm) => row_vm.is_checked = false); + } else { + _detach_orders_async(new[] { order }).ignore(); + } + } public OrderSecurity get_ordersecurityalgometa(OrderRecordImmutable order) { _cached_orders.TryGetValue(order.Key, out var osam); From aef8e2dbb10ed09e118ce559c7e5ab0ac540b6be Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 13 May 2019 12:59:49 -0400 Subject: [PATCH 09/86] spell check manual tests --- testing/manual/spreader_misc/fractional_hedging.txt | 8 ++++---- testing/manual/spreader_misc/implied_vs_direct.txt | 6 +++--- testing/manual/spreader_misc/n_legs.txt | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/testing/manual/spreader_misc/fractional_hedging.txt b/testing/manual/spreader_misc/fractional_hedging.txt index ea0798e65..c0f218383 100644 --- a/testing/manual/spreader_misc/fractional_hedging.txt +++ b/testing/manual/spreader_misc/fractional_hedging.txt @@ -2,9 +2,9 @@ This test verifies that fractional hedges work. That is, when a fill in a quotin not equate to one full contract in the hedging leg, we accumulate the unhedged delta, until we can send one or more hedging contracts. -1. Create a new synthetic spread. For the legs choose SIF9 and SIH9 (if you dont +1. Create a new synthetic spread. For the legs choose SIF9 and SIH9 (if you don't have these contracts, other contracts can be chosen too) and for the quantities choose 1 and -1.5 -respectively (and same for the Price multiplier). +respectively (and same for the Price multiplier). Enable quoting for SIH9, and disable all quoting, pre-hedge and post-hedge parameters. Name the synthetic SIF9-1.5SIH9. @@ -18,13 +18,13 @@ to enter orders). The quoting order will lean against this. 4. Verify that a 15 lot quoting order is sent for SIH9 at 19.935. 5. Now we will start filling the quoting order and verify the hedges. A 1 lot fill in the -quoting leg means a 2/3 contract in the hedging leg. Since we can not send 2/3 constracts, +quoting leg means a 2/3 contract in the hedging leg. Since we can not send 2/3 contracts, we will add it to the "unhedged delta" till the unhedged delta > 1, and then we will send one or more orders to get the unhedged delta < 1. Force quoting fills based on the left most column (by lifting the quoting offer) and verify that hedge orders of size "hedge_order_sent" (3rd column) are sent as a result. -The "unhedged_delta" column shows the unhedged delta immediatly after the quoting fill +The "unhedged_delta" column shows the unhedged delta immediately after the quoting fill and the "remaining_unhedged_delta" column is the unhedged delta after the hedge order has been sent. You can check the hedge orders being sent easily by looking at the order reduction diff --git a/testing/manual/spreader_misc/implied_vs_direct.txt b/testing/manual/spreader_misc/implied_vs_direct.txt index 6acf12cb2..74fbef376 100644 --- a/testing/manual/spreader_misc/implied_vs_direct.txt +++ b/testing/manual/spreader_misc/implied_vs_direct.txt @@ -10,7 +10,7 @@ ExchangeSim { } } -1. Open up the mview and find a security with with both direct and implied markets, on the ask side. +1. Open up the mview and find a security with with both direct and implied markets, on the ask side. Make sure those markets are stable and you can rely on them. 2. Create a synthetic with the security in 1. being the hedge leg (buy) and choose a quoting @@ -19,11 +19,11 @@ use "Merged" 3. Disable all spreader params. -4. Now enter a spreader order so that it doesnt get filled immediatly. Note the quoting order. +4. Now enter a spreader order so that it doesn't get filled immediately. Note the quoting order. quoting leg price = hedge_price - spreader_price. hedge_price is where it can buy the hedge order (which since its a buy will be on the ask side of the hedging market). -Make sure thta its correct and its using the merged book in the hedging market. +Make sure that its correct and its using the merged book in the hedging market. 5. Cancel the order and change the spreader so its using Direct prices. Repeat 4, and make sure its using direct price on the hedging market. \ No newline at end of file diff --git a/testing/manual/spreader_misc/n_legs.txt b/testing/manual/spreader_misc/n_legs.txt index dd596a8dd..edf10eab2 100644 --- a/testing/manual/spreader_misc/n_legs.txt +++ b/testing/manual/spreader_misc/n_legs.txt @@ -5,8 +5,8 @@ with 1 quoting leg. 1. Create a 4 legged synthetic spread with legs SIF9, SIH9, SIK9, SIN9, with leg quantities and price multipliers of 1,1,1 and -1 respectively. Leg SIN9 is the only quoting leg. -Disable all Quote, Pre-Hedge and Post-Hedge paramaters (leg contracts are arbitrary, so if you -dont have those contracts, choose any set of 4 contracts). +Disable all Quote, Pre-Hedge and Post-Hedge parameters (leg contracts are arbitrary, so if you +don't have those contracts, choose any set of 4 contracts). 2. Enter a synthetic buy order of 10 lots at 40.00. The ladders will most likely be empty, so use the market view to enter orders. @@ -16,7 +16,7 @@ Now enter: SIH9 10 lot sell @ 19.950 SIK9 10 lot sell @ 20.200 -There should still be no quoting order for SIN9 since the SIF9 hedge leg still doesnt have a market. +There should still be no quoting order for SIN9 since the SIF9 hedge leg still doesn't have a market. Now Enter: SIF9 1 lot sell @ 20.000 From a07bc152d1d59df30f3cdd541ec3efa83af496b6 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 13 May 2019 13:09:15 -0400 Subject: [PATCH 10/86] SPARK-2438: init spreader_lean_qty_factor test --- src/client/spark_test/System/SpreaderTests.cs | 5 +++ .../spreader_lean_qty_factor.sh | 32 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh diff --git a/src/client/spark_test/System/SpreaderTests.cs b/src/client/spark_test/System/SpreaderTests.cs index 0fe39194f..394fc46c1 100644 --- a/src/client/spark_test/System/SpreaderTests.cs +++ b/src/client/spark_test/System/SpreaderTests.cs @@ -120,6 +120,11 @@ namespace bts.tests } + [Test(Timeout = 30)] + public async Task spreader_lean_qty_factor() { + + } + private async Task<(Boolean, OrderRecordImmutable?)> verify_child_order_status(uint parent_order_key, OrderStatus expected_status) { var order = await get_order(ordi => ordi.ParentKey == parent_order_key && ordi.State.Status == expected_status); return (order.HasValue && order.Value.State.Status == expected_status, order); diff --git a/src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh b/src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh new file mode 100644 index 000000000..28913e469 --- /dev/null +++ b/src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +rm -r ~/sparkdata/data/databases/ > /dev/null + +mv ~/sparkdata/conf/spark.conf ~/sparkdata/conf/spark.conf.bak +cat << EOF > ~/sparkdata/conf/spark.conf + ExchangeSim { + value { + merge_with_md:false + } + } + Logging { + value { + console { default_level: "Error" } + syslog { default_level: "Error" } + file { default_level: "Error" } + } +} +EOF + + +nohup ./sparkd run & +pid=$! +echo "sparkd pid: " $pid + +echo "sleeping for 120 seconds..." +sleep 120 + +dotnet sparkcmd.dll test spreader_lean_qty_factor + +kill $pid +mv ~/sparkdata/conf/spark.conf.bak ~/sparkdata/conf/spark.conf \ No newline at end of file From eb97fd045aacee1090f78204bc40847b36c080e2 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 13 May 2019 13:26:53 -0400 Subject: [PATCH 11/86] SPARK-2438: spreader_lean_qty_factor test setup --- src/client/spark_test/System/SpreaderTests.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/client/spark_test/System/SpreaderTests.cs b/src/client/spark_test/System/SpreaderTests.cs index 394fc46c1..af23a7fed 100644 --- a/src/client/spark_test/System/SpreaderTests.cs +++ b/src/client/spark_test/System/SpreaderTests.cs @@ -122,6 +122,16 @@ namespace bts.tests [Test(Timeout = 30)] public async Task spreader_lean_qty_factor() { + Assert.IsTrue(await TestUtils.test_for_system_ready(_context, TimeSpan.FromMinutes(5)), "System is not ready"); + + string test_symbol = "SI";// don't use ES, the prices will be rounded to the same number and the result will be off + var test_user = (name: "bts", id: 1u); + var test_account = (name: "ACC A", id: 1u); + + (SecurityImmutable s1, SecurityImmutable s2) test_securities = await SpreaderUtilities.get_securities_for_common_setup_one(_md_relay, test_symbol); + + var setup_product = await SpreaderUtilities.common_setup_one(_order_service, _synthetic_service, test_securities, test_account, test_user); + } From 040960d33bca6e8c4c57e9c2233d73936c46ec5d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 6 Jun 2019 19:31:36 -0500 Subject: [PATCH 12/86] SPARK-2489 / SPARK-2495 merge 'Volume Display' tab into the 'Ladder Columns' tab --- .../Trading/Ladder/VM/LadderSettingsVM.cs | 30 +- .../Ladder/View/LadderSettingsView.xaml | 676 +++++++++++------- .../Ladder/View/LadderSettingsView.xaml.cs | 9 +- 3 files changed, 433 insertions(+), 282 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index 7a379e0f5..6712731b0 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -30,8 +30,8 @@ namespace mbts.spark { _bid = new LadderColumnSettingsVM("Bid"), _price = new LadderColumnSettingsVM("Price"), _ask = new LadderColumnSettingsVM("Ask"), - _last = new LadderColumnSettingsVM("Last", true), - _piq = new LadderColumnSettingsVM("PIQ", true); + _last = new LadderColumnSettingsVM("Last", LadderSettingsView.LastColumnTemplateKey, true), + _piq = new LadderColumnSettingsVM("PIQ", can_toggle_show: true); VolumeColumnVM _volume = new VolumeColumnVM(); LadderMarketBreakLineVM _bid_mkt_line = new LadderMarketBreakLineVM("Bid"), @@ -323,11 +323,12 @@ namespace mbts.spark { readonly DelegateProperty _font_weight; readonly DelegateProperty _font_display_name; readonly Property _show; - readonly bool _can_toggle_visibility; + readonly string _template_key; - public LadderColumnSettingsVM(string name, bool can_toggle_visibility = false) { + public LadderColumnSettingsVM(string name, string template_key = null, bool can_toggle_show = false) { this.name = name; - _can_toggle_visibility = can_toggle_visibility; + _template_key = template_key; + this.can_toggle_show = can_toggle_show; foreground_palettes = new ObservableCollection(ColorPalette.all_presets().Select(p => new ColorPaletteVM(p))); background_palettes = new ObservableCollection(ColorPalette.all_presets().Select(p => new ColorPaletteVM(p))); _show = backing(nameof(show), true); @@ -340,8 +341,14 @@ namespace mbts.spark { _font_display_name = backing(nameof(font_display_name), () => TextUtils.display_name(font_family, font_weight, font_size), nameof(font_family), nameof(font_weight), nameof(font_size)); _font_size.Changed += (oldval, newval) => font_size_changed?.Invoke(oldval, newval); + toggle_show_details_cmd = new DelegateCommand(() => { + show_details = !show_details; + RaisePropertyChanged(nameof(show_details)); + }); } + public event Action font_size_changed; + public string name { get; } public Typeface typeface { get => _typeface.Value; set => _typeface.Value = value; } public FontFamily font_family => _font_family.Value; @@ -350,14 +357,17 @@ namespace mbts.spark { public double font_size { get => _font_size.Value; set => _font_size.Value = value; } public uint width { get; set; } public bool show { get => _show.Value; set => _show.Value = value; } + public bool can_toggle_show { get; } + public bool show_details { get; private set; } public Color foreground { get => _foreground.Value; set => _foreground.Value = value; } public Color background { get => _background.Value; set => _background.Value = value; } public ObservableCollection foreground_palettes { get; } public ObservableCollection background_palettes { get; } - public event Action font_size_changed; - public virtual string sample_text => "999-56789.01234"; - string ITemplateSelectorKey.key => _can_toggle_visibility ? ui.spark.LadderSettingsView.ColumnVisibilityToggleTemplateKey : null; + + public ICommand toggle_show_details_cmd { get; } + + string ITemplateSelectorKey.key => _template_key; public void assign_from(LadderColumnSettings settings) { typeface = new Typeface( @@ -395,7 +405,7 @@ namespace mbts.spark { public Brush badge_border { get; } = new SolidColorBrush(BTSColors.MarketData.ask); public Brush badge_background { get; } = Brushes.White; - string ITemplateSelectorKey.key => ui.spark.LadderSettingsView.OrdersColumnSampleTemplateKey; + string ITemplateSelectorKey.key => ui.spark.LadderSettingsView.OrdersColumnTemplateKey; } public class LadderMarketBreakLineVM : ViewModelBase { @@ -463,7 +473,7 @@ namespace mbts.spark { } } - public LadderColumnSettingsVM general { get; } = new LadderColumnSettingsVM("Volume", true); + public LadderColumnSettingsVM general { get; } = new LadderColumnSettingsVM("Volume", LadderSettingsView.VolumeColumnTemplateKey, true); public VolumeAtPriceAnimationVM buy { get; } public VolumeAtPriceAnimationVM sell { get; } public VolumeAtPriceAnimationVM passive { get; } diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index 3fd7dcb94..1aa1c1b1f 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -3,6 +3,7 @@ x:ClassModifier="internal" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:ice="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" xmlns:sp="clr-namespace:mbts.spark" xmlns:u="clr-namespace:mbts.ui" xmlns:c="clr-namespace:mbts.ui.controls" @@ -22,9 +23,24 @@ 6 8 24 + + 57 + 70 + 81 + 160 + 153 + + + LightGray + Black + + + + + @@ -40,71 +56,369 @@ - + + + + + + - + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -134,7 +448,7 @@ Alternate Order Qty - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -470,141 +741,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml.cs index da00027a1..c42bbbaa0 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml.cs @@ -10,10 +10,15 @@ namespace mbts.ui.spark { /// partial class LadderSettingsView : UserControl { public const string - OrdersColumnSampleTemplateKey = nameof(OrdersColumnSampleTemplateKey), - ColumnVisibilityToggleTemplateKey = nameof(ColumnVisibilityToggleTemplateKey), + OrdersColumnTemplateKey = nameof(OrdersColumnTemplateKey), + VolumeColumnTemplateKey = nameof(VolumeColumnTemplateKey), + LastColumnTemplateKey = nameof(LastColumnTemplateKey), FavoriteAlgoAddButtonTemplateKey = nameof(FavoriteAlgoAddButtonTemplateKey); + public static readonly IMultiValueConverter LadderColumnToggleShowToolTipConverter = + ValueConverter.create((can_toggle_show, show, col_name) => + can_toggle_show ? $"{(show ? "Hide" : "Show")} {col_name}" : $"{col_name} cannot be {(show ? "hidden" : "shown")}."); + public LadderSettingsView() => InitializeComponent(); From 4b2f39c536a53a8c5a9b0048aadeab694bc54923 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 6 Jun 2019 22:42:55 -0500 Subject: [PATCH 13/86] LadderSettingsView - drop 'Show/Hide' from 'Advanced' hyperlinks --- .../Modules/Trading/Ladder/View/LadderSettingsView.xaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index 1aa1c1b1f..b1da2aa83 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -39,8 +39,6 @@ - - @@ -261,7 +259,7 @@ - + (Advanced) @@ -315,7 +313,7 @@ - + (Advanced) From 31fe708907392aa5a7e3e9a73b08a83f62e497f2 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 6 Jun 2019 23:17:09 -0500 Subject: [PATCH 14/86] touch up LadderSettingsView --- .../Ladder/View/LadderSettingsView.xaml | 134 +++++++++--------- 1 file changed, 70 insertions(+), 64 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index b1da2aa83..4cfc9e879 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -36,8 +36,10 @@ LightGray Black + Navy + @@ -64,9 +66,14 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1518906b7f988bb29716182c230cd0be2cf9cc18 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 6 Jun 2019 23:21:51 -0500 Subject: [PATCH 15/86] SPARK-2489 / SPARK-2498 remove 'Order Badge Style' option --- .../Trading/Ladder/View/LadderSettingsView.xaml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index 4cfc9e879..a9657a093 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -436,12 +436,6 @@ - - - - - - @@ -450,13 +444,9 @@ - Order Badge Style - - - Alternate Order Qty - - - + Alternate Order Qty + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + + + - - - - - - Show Price in Net Change - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + - + + + + + + + + + + + + + - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Show Price in Net Change + + + + + + + + + + + - - + - + + + + + + + + + + + + + + + + - + - + + + + + + - - + + + - - - 'Single Click' Quantity - - - Hint: right click on a bid/ask cell to submit orders with this quantity. - - - - - - - - - - - - - - - - - Number of Columns - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 'Single Click' Quantity + + + Hint: right click on a bid/ask cell to submit orders with this quantity. + + + + + + + + + + + + + + + + + Number of Columns + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 16eeddec7dd459425db2781a96e9c85d3c19f624 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 7 Jun 2019 16:10:17 -0500 Subject: [PATCH 23/86] OperableHierarchicalCollectionModel - fixing get_parent --- .../Hierarchical/OperableHierarchicalCollectionModel.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/client/spark_core/Collections/Operable/Hierarchical/OperableHierarchicalCollectionModel.cs b/src/client/spark_core/Collections/Operable/Hierarchical/OperableHierarchicalCollectionModel.cs index 3dd046b8d..28c795387 100644 --- a/src/client/spark_core/Collections/Operable/Hierarchical/OperableHierarchicalCollectionModel.cs +++ b/src/client/spark_core/Collections/Operable/Hierarchical/OperableHierarchicalCollectionModel.cs @@ -65,8 +65,12 @@ namespace bts.collections { return false; } - public TRow get_parent(TKey key) => - _tree.TryGetNode(key, out var n) ? n.value : default; + public TRow get_parent(TKey key) { + if (try_get_row(key, out TRow r)) { + return _tree.GetParent(r).value; + } + return default; + } public IEnumerable get_descendent_rows(TKey key) { if (_tree.TryGetNode(key, out var n)) { From c5f7ee0ed3d48dfd03c013dcab037d897a1185ca Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 7 Jun 2019 16:16:27 -0500 Subject: [PATCH 24/86] reassigning the miniob update button to the update_command property so select the row if it's not already selected --- .../spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index a9eab87a9..0ac341136 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -1013,9 +1013,9 @@ namespace mbts.spark { // kept in sync between those controls via a PlacementTarget.DataContext binding update_button.SetBinding(Button.DataContextProperty, orderbook_vm_datacontext_binding); - //var row_vm_update_command_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookRowVM.update_command))); - //row_vm_update_command_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(MiniOrderBookRowView), 1); - //update_button.SetBinding(Button.CommandProperty, row_vm_update_command_binding); + var row_vm_update_command_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookRowVM.update_command))); + row_vm_update_command_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(MiniOrderBookRowView), 1); + update_button.SetBinding(Button.CommandProperty, row_vm_update_command_binding); // update button is only visible for orders under the control of an algo var update_button_visibility_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookRowVM.root_algo_order_type))) { From 6756b23104b513d1a4dcff1d52f342959033373e Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 7 Jun 2019 16:17:42 -0500 Subject: [PATCH 25/86] miniob - attach and update select the row if they're not already selected --- .../Trading/OrderBook/OrderBookRowVM.cs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 53bf811a8..2f767c6d2 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -20,7 +20,7 @@ namespace mbts.spark { readonly OrderBookVM _owner; Color? _root_algo_badge_color_backing; Brush _badge_fill, _root_algo_badge_fill; - IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd, _detach_command, _attach_command, /*_update_command,*/ _modify_order_quantity_andor_price, _revert_prospective_order_quantity_andor_price; + IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd, _detach_command, _attach_command, _update_command, _modify_order_quantity_andor_price, _revert_prospective_order_quantity_andor_price; bool _is_parent, _is_expanded, _is_selected, _is_attachable, _is_detachable; int _depth_level; SecurityImmutable? _security => order_tuple.security; @@ -190,16 +190,20 @@ namespace mbts.spark { public ICommand attach_command => _attach_command ?? ( _attach_command = new DelegateCommand(() => { // the _select me will trigger the OBVM.attach_vm to get primed - //_select_me(); + if (!is_selected) { + _select_me(); + } _owner.begin_attach_algos(); }) ); - //public ICommand update_command => _update_command ?? ( - // _update_command = new DelegateCommand(() => { - // _select_me(); - // }) - //); + public ICommand update_command => _update_command ?? ( + _update_command = new DelegateCommand(() => { + if (!is_selected) { + _select_me(); + } + }) + ); // private props Color _root_algo_badge_color { From 370b4bcde93e3aea8ab7881ba8f061d32e909b13 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 7 Jun 2019 16:19:16 -0500 Subject: [PATCH 26/86] coording root row with selected params mon --- .../Modules/Trading/OrderBook/OrderBookVM.cs | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index d2a32fa53..d308b5075 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -430,16 +430,20 @@ namespace mbts.spark { using (_selected_params_mon.begin_udpate()) { if (e.RemovedItems != null) { foreach (var row_vm in e.RemovedItems.OfType()) { + var root_row_vm = get_root(row_vm); row_vm.is_selected = false; - _selected_params_mon.on_row_unselected(row_vm); + root_row_vm.is_selected = false; + _selected_params_mon.on_row_unselected(root_row_vm); _attachable_selected_orders.Remove(row_vm.order_key); _detachable_selected_orders.Remove(row_vm.order_key); } } if (e.AddedItems != null) { foreach (var row_vm in e.AddedItems.OfType()) { + var root_row_vm = get_root(row_vm); row_vm.is_selected = true; - _selected_params_mon.on_row_selected(row_vm); + root_row_vm.is_selected = true; + _selected_params_mon.on_row_selected(root_row_vm); if (row_vm.is_attachable) _attachable_selected_orders.Add(row_vm.order_key); if (row_vm.is_detachable) @@ -548,13 +552,23 @@ namespace mbts.spark { public bool try_get_parent(OrderBookRowVM row, out OrderSecurity parent) => _cached_orders.TryGetValue(row.parent_order_key, out parent); - public OrderRecordImmutable get_root(OrderRecordImmutable r) { - while (r.ParentKey != 0 && _cached_orders.TryGetValue(r.ParentKey, out var parent_osam)) { - r = parent_osam.order; + public OrderBookRowVM get_root(OrderBookRowVM r) { + while (r.order.ParentKey != 0 ) { + var parent = get_parent(r); + if (parent != null) { + r = parent; + } } return r; } + public OrderSecurity get_root(OrderSecurity os) { + while (os.order.ParentKey != 0 && _cached_orders.TryGetValue(os.order.ParentKey, out var parent_osam)) { + os = parent_osam; + } + return os; + } + internal void detach_orders(OrderBookRowVM order) { if (order.is_selected) { var detach_candidates = rows.Where(r => r.is_selected); @@ -624,9 +638,9 @@ namespace mbts.spark { } } - async Task _modify_selected_orders_async() => await _modify_orders_async(selected_rows); + async Task _modify_selected_orders_async() => await _modify_orders_async(selected_rows.Select(r => get_root(r.order_tuple))); - async Task _modify_orders_async(IEnumerable modify_candidates) { + async Task _modify_orders_async(IEnumerable modify_candidates) { double? price = DoubleHelper.nan_nullable(order_mod_vm.price); uint? size = order_mod_vm.size; if (order_mod_vm.algo_vm.algo_root is IAlgoVM mod_algo_vm) { @@ -640,15 +654,15 @@ namespace mbts.spark { // ---- var update_params = modify_candidates.Select(update_params_factory).ToList(); await Task.WhenAll(update_params.Select(t => _model.update_order(t.order, new_price: price, new_size: size, new_algo: t.new_algo))); - (OrderRecordImmutable order, CustomOrderDefinitionImmutable? new_algo) update_params_factory(OrderBookRowVM row) { - var mod_algo = row.order.Def.CustomDef.CloneToMutable(); + (OrderRecordImmutable order, CustomOrderDefinitionImmutable? new_algo) update_params_factory(OrderSecurity os) { + var mod_algo = os.order.Def.CustomDef.CloneToMutable(); if (mod_algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Composite) { mod_algo_vm.assign_to(mod_algo.Composite.Definition); } else { mod_algo_vm.assign_to(mod_algo); } var mod_algoi = new CustomOrderDefinitionImmutable(mod_algo); - return (row.order, OrderDataHelper.EqualsHelpers.equals(row.order.Def.CustomDef, mod_algoi) ? (CustomOrderDefinitionImmutable?)null : mod_algoi); + return (os.order, OrderDataHelper.EqualsHelpers.equals(os.order.Def.CustomDef, mod_algoi) ? (CustomOrderDefinitionImmutable?)null : mod_algoi); } } else await Task.WhenAll(modify_candidates.Select(r => _model.update_order(r.order, price))); } From ecd384501ea7a400969e0c4bd95ff20a12ae3600 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 10 Jun 2019 12:22:05 -0500 Subject: [PATCH 27/86] align LadderSettingsView (content in settings dialog) with hamburger button --- .../Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml index 2a642bccc..d114c1cb1 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml +++ b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml @@ -77,7 +77,7 @@ - + From cd41632b5386a9047e662fb3a686131574cba2a1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 10 Jun 2019 14:27:54 -0500 Subject: [PATCH 28/86] LadderSettingsView - touch up 'Order Quantities' tab --- .../Modules/Trading/Ladder/View/LadderSettingsView.xaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index 83c508ac3..aa80663e4 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -731,7 +731,7 @@ - + @@ -745,7 +745,7 @@ - + @@ -779,7 +779,7 @@ - 'Single Click' Quantity + 'Single Click' Quantity Hint: right click on a bid/ask cell to submit orders with this quantity. From a0bf7779f5b0bc8df568561a56e00b1adb7c36ff Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 10 Jun 2019 14:35:06 -0500 Subject: [PATCH 29/86] mini ob - changes from John; closer to working but not yet, likely related to mark_commited/revert not getting wired up/called --- .../Modules/Trading/OrderBook/OrderBookVM.cs | 70 ++++++++++--------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index d308b5075..8986731bc 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -430,24 +430,35 @@ namespace mbts.spark { using (_selected_params_mon.begin_udpate()) { if (e.RemovedItems != null) { foreach (var row_vm in e.RemovedItems.OfType()) { - var root_row_vm = get_root(row_vm); row_vm.is_selected = false; - root_row_vm.is_selected = false; - _selected_params_mon.on_row_unselected(root_row_vm); + _selected_params_mon.on_row_unselected(_get_root(row_vm.order_tuple)); _attachable_selected_orders.Remove(row_vm.order_key); _detachable_selected_orders.Remove(row_vm.order_key); } } if (e.AddedItems != null) { foreach (var row_vm in e.AddedItems.OfType()) { - var root_row_vm = get_root(row_vm); + var root = _get_root(row_vm.order_tuple); row_vm.is_selected = true; - root_row_vm.is_selected = true; - _selected_params_mon.on_row_selected(root_row_vm); + row_vm.updated += on_updated; + _selected_params_mon.on_row_selected(root); if (row_vm.is_attachable) _attachable_selected_orders.Add(row_vm.order_key); if (row_vm.is_detachable) _detachable_selected_orders.Add(row_vm.order_key); + void on_updated((OrderSecurity oldval, OrderSecurity newval) change) { + if (!row_vm.is_selected) { + // self destruct + row_vm.updated -= on_updated; + return; + } + var new_root = _get_root(change.newval); + if (!new_root.Equals(root)) { + _selected_params_mon.on_row_unselected(root); + _selected_params_mon.on_row_selected(new_root); + root = new_root; + } + } } } RowSelectionHelper.apply_changes(selected_rows, e); @@ -552,20 +563,15 @@ namespace mbts.spark { public bool try_get_parent(OrderBookRowVM row, out OrderSecurity parent) => _cached_orders.TryGetValue(row.parent_order_key, out parent); - public OrderBookRowVM get_root(OrderBookRowVM r) { - while (r.order.ParentKey != 0 ) { - var parent = get_parent(r); - if (parent != null) { - r = parent; - } - } - return r; + OrderBookRowVM _get_root_row(OrderBookRowVM row) { + while (row.parent_order_key != 0 && _row_collection.get_parent(row.parent_order_key) is OrderBookRowVM prow) + row = prow; + return row; } - public OrderSecurity get_root(OrderSecurity os) { - while (os.order.ParentKey != 0 && _cached_orders.TryGetValue(os.order.ParentKey, out var parent_osam)) { - os = parent_osam; - } + OrderSecurity _get_root(OrderSecurity os) { + while (os.order.ParentKey != 0 && _cached_orders.TryGetValue(os.order.ParentKey, out var pos)) + os = pos; return os; } @@ -638,9 +644,8 @@ namespace mbts.spark { } } - async Task _modify_selected_orders_async() => await _modify_orders_async(selected_rows.Select(r => get_root(r.order_tuple))); - - async Task _modify_orders_async(IEnumerable modify_candidates) { + // Note: modifications are performed on the selected orders' ROOT orders. + async Task _modify_selected_orders_async() { double? price = DoubleHelper.nan_nullable(order_mod_vm.price); uint? size = order_mod_vm.size; if (order_mod_vm.algo_vm.algo_root is IAlgoVM mod_algo_vm) { @@ -652,19 +657,20 @@ namespace mbts.spark { // their values will be cleared (in the param grid gui), and the modifications will not be applied. // FYI this behavior is implemented to support 'partial edits.' (e.g., changing the 'price' for multiple orders that do not have the same 'size'). // ---- - var update_params = modify_candidates.Select(update_params_factory).ToList(); + var update_params = selected_rows.Select(r => update_params_factory(_get_root(r.order_tuple))).ToList(); await Task.WhenAll(update_params.Select(t => _model.update_order(t.order, new_price: price, new_size: size, new_algo: t.new_algo))); - (OrderRecordImmutable order, CustomOrderDefinitionImmutable? new_algo) update_params_factory(OrderSecurity os) { - var mod_algo = os.order.Def.CustomDef.CloneToMutable(); + (OrderRecordImmutable order, CustomOrderDefinitionImmutable? new_algo) update_params_factory(OrderSecurity order_tuple) { + var mod_algo = order_tuple.order.Def.CustomDef.CloneToMutable(); if (mod_algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Composite) { mod_algo_vm.assign_to(mod_algo.Composite.Definition); } else { mod_algo_vm.assign_to(mod_algo); } var mod_algoi = new CustomOrderDefinitionImmutable(mod_algo); - return (os.order, OrderDataHelper.EqualsHelpers.equals(os.order.Def.CustomDef, mod_algoi) ? (CustomOrderDefinitionImmutable?)null : mod_algoi); + return (order_tuple.order, OrderDataHelper.EqualsHelpers.equals(order_tuple.order.Def.CustomDef, mod_algoi) ? (CustomOrderDefinitionImmutable?)null : mod_algoi); } - } else await Task.WhenAll(modify_candidates.Select(r => _model.update_order(r.order, price))); + } else await Task.WhenAll(selected_rows.Select(r => _model.update_order(r.order, price))); + selected_rows.ForEach(r => r.is_selected = false); } IObservable> _subscribe_throttled_selected_rows() => @@ -1035,15 +1041,11 @@ namespace mbts.spark { public IDisposable begin_udpate() => _group_mon.defer_updates(); - public void on_row_selected(OrderBookRowVM row) { - _group_mon.add(row.order_tuple); - row.updated += _on_row_updated; - } + public void on_row_selected(OrderSecurity order_tuple) => + _group_mon.add(order_tuple); - public void on_row_unselected(OrderBookRowVM row) { - _group_mon.remove(row.order_tuple); - row.updated -= _on_row_updated; - } + public void on_row_unselected(OrderSecurity order_tuple) => + _group_mon.remove(order_tuple); public void on_security_md_map(IReadOnlyDictionary security_md_map) { _security_md_map = security_md_map; From 1bc451086200ec7f9314d90ab44ef27e1152380d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 10 Jun 2019 15:12:38 -0500 Subject: [PATCH 30/86] LadderSettingsView - touch up 'Market Price And Size Display' tab --- .../Modules/Trading/Ladder/LadderSettings.cs | 10 +- .../Trading/Ladder/VM/LadderSettingsVM.cs | 54 +---- .../Ladder/View/LadderSettingsView.xaml | 197 ++++++++---------- 3 files changed, 99 insertions(+), 162 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs index ce6e4743b..e20468abe 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs @@ -327,7 +327,15 @@ namespace mbts.spark { public enum BadgeStyle { Normal, Alternate } - public enum NetChangeTerms { None, Dollars, Ticks } + // TODO: rename to PriceDisplayFormat (today is merge monday, since this isn't a functional change, it is not worth the potential merge headaches right now) + public enum NetChangeTerms { + [Description("Standard Ticks")] + None, + [Description("Net Change Dollars")] + Dollars, + [Description("Net Change Ticks")] + Ticks + } [ProtoMember(1)] public double row_height { get; set; } diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index 6712731b0..e1c33486b 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -23,6 +23,7 @@ namespace mbts.spark { readonly Property _badge_style; readonly Property _alternate_order_size; readonly DelegateProperty _row_height; + LadderSettings.NetChangeTerms _price_format; Func _get_order_entry_panel_width, _get_zoom_factor; LadderSettings _current; LadderColumnSettingsVM @@ -59,10 +60,6 @@ namespace mbts.spark { _cancel_buys_visibility = new OrderEntryPanelItemVisibilityVM("Cancel Buys"), _cancel_sells_visibility = new OrderEntryPanelItemVisibilityVM("Cancel Sells"), _cancel_all_visibility = new OrderEntryPanelItemVisibilityVM("Cancel All"); - readonly Property - _show_in_net_change, - _show_in_net_change_dollars, - _show_in_net_change_ticks; public LadderSettingsVM(OrdersModel model, bool is_synthetic, Func get_left_panel_width, Func get_zoom_factor) { this.is_synthetic = is_synthetic; @@ -74,10 +71,6 @@ namespace mbts.spark { _alternate_order_size = backing(nameof(alternate_order_size)); _get_order_entry_panel_width = get_left_panel_width; _get_zoom_factor = get_zoom_factor; - _show_in_net_change = backing(nameof(show_in_net_change)); - _show_in_net_change_dollars = backing(nameof(show_in_net_change_dollars)); - _show_in_net_change_ticks = backing(nameof(show_in_net_change_ticks)); - // be sure to initialize backings before this measure_row_height call _row_height = backing(nameof(row_height), () => LadderRender.measure_row_height(get_result())); _orders.font_size_changed += on_font_size_changed; @@ -110,6 +103,8 @@ namespace mbts.spark { } public MarketSizeDisplayVM size_display { get; } = new MarketSizeDisplayVM(); + public LadderSettings.NetChangeTerms price_format { get => _price_format; set => Set(ref _price_format, value); } + public IEnumerable price_format_options => EnumHelper.get_values(); public FavoriteAlgosVM favorite_algos_vm { get; } public double row_height => _row_height.Value; @@ -175,32 +170,6 @@ namespace mbts.spark { } } - public bool show_in_net_change { - get => _show_in_net_change.Value; - set { - // when unchecking, clear out dollars and ticks - if (!value) { - show_in_net_change_dollars = false; - show_in_net_change_ticks = false; - } - // when checking, by defalt check dollars - if (value) { - show_in_net_change_dollars = true; - } - _show_in_net_change.Value = value; - } - } - public bool show_in_net_change_dollars { - get => _show_in_net_change_dollars.Value; - set => _show_in_net_change_dollars.Value = value; - } - - public bool show_in_net_change_ticks { - get => _show_in_net_change_ticks.Value; - set => _show_in_net_change_ticks.Value = value; - } - - public string key => GridSettingsTemplateKeys.Ladder; public void load(LadderSettings settings) { @@ -241,13 +210,11 @@ namespace mbts.spark { _cancel_buys_visibility.show = settings.cancel_buys_visible; _cancel_sells_visibility.show = settings.cancel_sells_visible; _cancel_all_visibility.show = settings.cancel_all_visible; + price_format = settings.net_change; // do not read the order entry panel width here from settings // because it could have changed from the UI // there might be a better way of doing this, like how // does the widths of the ladder grid column pull this off? - show_in_net_change = settings.net_change != LadderSettings.NetChangeTerms.None; - show_in_net_change_dollars = settings.net_change == LadderSettings.NetChangeTerms.Dollars; - show_in_net_change_ticks = settings.net_change == LadderSettings.NetChangeTerms.Ticks; } public LadderSettings get_result() { @@ -291,19 +258,8 @@ namespace mbts.spark { clone.order_entry_panel_initial_width = _get_order_entry_panel_width(); clone.zoom_slider_visible = _zoom_slider_visbility.show; clone.zoom_factor = _get_zoom_factor(); - clone.net_change = _create_net_change_terms(show_in_net_change_dollars, show_in_net_change_ticks); + clone.net_change = price_format; return clone; - - LadderSettings.NetChangeTerms _create_net_change_terms(bool dollars, bool ticks) { - if (dollars) { - return LadderSettings.NetChangeTerms.Dollars; - } - if (ticks) { - return LadderSettings.NetChangeTerms.Ticks; - } - return LadderSettings.NetChangeTerms.None; - } - } public void Dispose() => favorite_algos_vm.Dispose(); diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index aa80663e4..879ac260f 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -607,125 +607,98 @@ - - - - - - - - + - - + - - - - - - Show Price in Net Change - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + From c652032ddfb92bf5117655ce57f1ec8d22940cc9 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 10 Jun 2019 17:27:46 -0400 Subject: [PATCH 31/86] Updated release notes. --- doc/user/content/release_notes/_index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index cf891b4cc..09b6c5ed3 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -18,7 +18,8 @@ insert_anchor_links = "right" - Fixed a number of problems with filtering on the Fills form - On the Lean algo, OnToward and Away are now calculated with respect to the opposite inside market at time of the order launch - Iceberg Spreaders with queue holders are not erroneously cancelled after the first fill - - Security symbol added for fills window + - Added security symbol column to fills window + - Re-organized ladder settings dialog to make it clearer and easier to use ## 2.1.4 ### User Visible Changes From 93534eb8010d86d62620497bd17147c378083b62 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 11 Jun 2019 10:57:07 -0500 Subject: [PATCH 32/86] changing row selection while in change breaks the main ob --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 8986731bc..9c4dbaa8c 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -670,7 +670,6 @@ namespace mbts.spark { return (order_tuple.order, OrderDataHelper.EqualsHelpers.equals(order_tuple.order.Def.CustomDef, mod_algoi) ? (CustomOrderDefinitionImmutable?)null : mod_algoi); } } else await Task.WhenAll(selected_rows.Select(r => _model.update_order(r.order, price))); - selected_rows.ForEach(r => r.is_selected = false); } IObservable> _subscribe_throttled_selected_rows() => From d64df2718875042f051bf936b5947f356f4ecafd Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 11 Jun 2019 12:27:51 -0500 Subject: [PATCH 33/86] don't change is_selected state here b/c it leads to discrepancies when attaching/updating --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 9c4dbaa8c..bb79529bc 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -579,7 +579,8 @@ namespace mbts.spark { if (order.is_selected) { var detach_candidates = rows.Where(r => r.is_selected); _detach_orders_async(detach_candidates).ignore(); - detach_candidates.ForEach((row_vm) => row_vm.is_selected = false); + // Don't change the is_selecte state here b/c it will cause state issues + // in with the miniob attach param popup } else { _detach_orders_async(new[] { order }).ignore(); } From a7da930e697190ebf6f120c0b91142ffeb3e1d95 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 11 Jun 2019 14:02:23 -0500 Subject: [PATCH 34/86] synchronize selected_rows with _un/select_me() --- src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 2f767c6d2..8c13ef0e6 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -237,11 +237,13 @@ namespace mbts.spark { private void _unselect_me() { this.is_selected = false; + _owner.selected_rows.Remove(this); _owner.current_row = null; } private void _select_me() { this.is_selected = true; + _owner.selected_rows.Add(this); _owner.current_row = this; } From 44e7cfb4a50fa145694a239913ef323e7064384e Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 11 Jun 2019 14:06:08 -0500 Subject: [PATCH 35/86] setting is_selected and clearing selected_rows when update popup closes --- .../spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 0ac341136..66876feab 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -1116,8 +1116,11 @@ namespace mbts.spark { RelativeSource = new RelativeSource(RelativeSourceMode.Self) }); popup.Closed += (s, e) => { - if (popup.try_find_ancestor_of_type(out MiniOrderBookView mini_ob) && mini_ob.DataContext is OrderBookVM ob_vm) + if (popup.try_find_ancestor_of_type(out MiniOrderBookView mini_ob) && mini_ob.DataContext is OrderBookVM ob_vm) { ob_vm.is_attaching_orders = false; + ob_vm.selected_rows.ForEach(r => r.is_selected = false); + ob_vm.selected_rows.Clear(); + } }; var the_whole_thing = new Grid(); From 4854a06edac9dfac442691d57a1b0c590518cc96 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 08:12:48 -0500 Subject: [PATCH 36/86] fix SelectionHighlight databinding expression in mini ob --- .../Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index 6cc0ec713..7450bd576 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -121,7 +121,7 @@ Rows="{Binding rows}" RowStyle="{StaticResource {x:Static sp:MiniOrderBookView.RowStyleKey}}" RowTemplate="{StaticResource {x:Static sp:MiniOrderBookView.RowTemplateKey}}" - SelectionHighlight="{Binding grid_settings_manager.selection_highlight, Mode=OneWay}" + SelectionHighlight="{Binding grid_settings_manager.core_manager.selection_highlight, Mode=OneWay}" RowsHorizontalScrollBarVisibility="Collapsed" RowHeight="20" > From b21cd840c290b4a12fa3c410d16b4c4918c2e946 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 08:23:55 -0500 Subject: [PATCH 37/86] The first time I met the blues, I was losing my SelectionHighlight; too beat down to remove this Setter that was added over many hours of debugging --- .../OrderBook/MiniOrderBook/MiniOrderBookView.xaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index 7450bd576..a3c025aa5 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -99,7 +99,16 @@ - + + From 40805be11eb1cd410238be15e8d15283b5a5f40a Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 08:27:39 -0500 Subject: [PATCH 38/86] Bringing back the check column in case of SelectionHighlight shenanigans --- .../Trading/OrderBook/OrderBookColumns.cs | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 66876feab..1f8c4105c 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -724,27 +724,27 @@ namespace mbts.spark { } } - //public class CheckColumn : FrameworkElementColumnBase { - // readonly BindingBase _checked_binding; - // public CheckColumn(string checked_property) : base(Columns.Check) { - // id = key.ToString(); - // Width = 30; - // _checked_binding = new Binding(checked_property); - // } + public class CheckColumn : FrameworkElementColumnBase { + readonly BindingBase _checked_binding; + public CheckColumn(string checked_property) : base(Columns.Check) { + id = key.ToString(); + Width = 30; + _checked_binding = new Binding(checked_property); + } - // public override FrameworkElement view_factory() { - // var grid = new Grid() { - // HorizontalAlignment = HorizontalAlignment.Center, - // VerticalAlignment = VerticalAlignment.Center, - // }; - // var cb = new CheckBox(); - // cb.Name = "check_col"; - // cb.SetBinding(CheckBox.IsCheckedProperty, _checked_binding); + public override FrameworkElement view_factory() { + var grid = new Grid() { + HorizontalAlignment = HorizontalAlignment.Center, + VerticalAlignment = VerticalAlignment.Center, + }; + var cb = new CheckBox(); + cb.Name = "check_col"; + cb.SetBinding(CheckBox.IsCheckedProperty, _checked_binding); - // grid.Children.Add(cb); - // return grid; - // } - //} + grid.Children.Add(cb); + return grid; + } + } public class CancelColumn : FrameworkElementColumnBase { readonly BindingBase _command_binding; From 114c9f3c2791d74eee0f8398daf6ffc76fbfac4d Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 08:28:56 -0500 Subject: [PATCH 39/86] Adding resurrected check column back to mini ob, bound to is_selected --- src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs index 11ad2036e..1de41351e 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs @@ -337,7 +337,7 @@ namespace mbts.spark { } obvm.columns.Insert(0, new OrderBookVM.UpdateColumn(typeof(MiniOrderBookView))); obvm.columns.Insert(0, new OrderBookVM.CancelColumn(nameof(OrderBookRowVM.cancel_command))); - //obvm.columns.Insert(0, new OrderBookVM.CheckColumn(nameof(OrderBookRowVM.is_checked))); + obvm.columns.Insert(0, new OrderBookVM.CheckColumn(nameof(OrderBookRowVM.is_selected))); obvm.load_from(state); return obvm; From c2e91b03f62c074b1ef874cf7ec99b3545252be2 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 09:40:35 -0500 Subject: [PATCH 40/86] Adding similar IsSelected setter to main OB just in case ... --- .../Modules/Trading/OrderBook/View/OrderBookGridView.xaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml index b9c7a1421..916c3783e 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml @@ -108,4 +108,9 @@ + + + \ No newline at end of file From e47706eb1b6d0dc0852fc82bf4c890403af38841 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 09:49:00 -0500 Subject: [PATCH 41/86] guaranteeing on_updating is hooked up to only a single callback; this was a major pain to debug, thx john --- .../Modules/Trading/OrderBook/OrderBookVM.cs | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index bb79529bc..3ec1c118a 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -64,6 +64,7 @@ namespace mbts.spark { _attachable_selected_orders = new HashSet(), _detachable_selected_orders = new HashSet(); FilterData _cached_filter_data; + Dictionary _on_updated_single_callback_gatekeeper = new Dictionary(); public OrderBookVM( IObservable owner_title, @@ -440,7 +441,10 @@ namespace mbts.spark { foreach (var row_vm in e.AddedItems.OfType()) { var root = _get_root(row_vm.order_tuple); row_vm.is_selected = true; - row_vm.updated += on_updated; + if (!_on_updated_single_callback_gatekeeper.ContainsKey(row_vm.order_key)) { + row_vm.updated += on_updated; + _on_updated_single_callback_gatekeeper.Add(row_vm.order_key, Disposable.Create(() => row_vm.updated -= on_updated)); + } _selected_params_mon.on_row_selected(root); if (row_vm.is_attachable) _attachable_selected_orders.Add(row_vm.order_key); @@ -449,13 +453,19 @@ namespace mbts.spark { void on_updated((OrderSecurity oldval, OrderSecurity newval) change) { if (!row_vm.is_selected) { // self destruct - row_vm.updated -= on_updated; + if (_on_updated_single_callback_gatekeeper.TryGetValue(row_vm.order_key, out var unsubscribe_updated_disposable)) { + unsubscribe_updated_disposable.Dispose(); + _on_updated_single_callback_gatekeeper.Remove(row_vm.order_key); + } + _selected_params_mon.on_row_unselected(_get_root(row_vm.order_tuple)); return; } var new_root = _get_root(change.newval); if (!new_root.Equals(root)) { - _selected_params_mon.on_row_unselected(root); - _selected_params_mon.on_row_selected(new_root); + // unselect and select in one smooth motion via on_row_updated + // because we thought there may be gremlins afoot when doing + // on_row_unselected and then on_row_selected + _selected_params_mon.on_row_updated((root, new_root)); root = new_root; } } @@ -1052,7 +1062,7 @@ namespace mbts.spark { _security_md_map_changed?.Invoke(); } - void _on_row_updated((OrderSecurity oldval, OrderSecurity newval) ch) { + public void on_row_updated((OrderSecurity oldval, OrderSecurity newval) ch) { using (begin_udpate()) { _group_mon.remove(ch.oldval); _group_mon.add(ch.newval); From b57d6cce85f2cea195776cfeaed3fad0a1aea2b1 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 09:52:22 -0500 Subject: [PATCH 42/86] select/unselect me only needs to manipulate row.is_selected now --- src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 8c13ef0e6..c605a4630 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -237,14 +237,10 @@ namespace mbts.spark { private void _unselect_me() { this.is_selected = false; - _owner.selected_rows.Remove(this); - _owner.current_row = null; } private void _select_me() { this.is_selected = true; - _owner.selected_rows.Add(this); - _owner.current_row = this; } // These fns present a way for the orderbook to avoid noisy, intermittent collection changes during "Expand/Collapse All" ops, From 164c88fa60682e0251c0353b2388160e71286f4b Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 09:56:03 -0500 Subject: [PATCH 43/86] popup debug comments --- src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 1f8c4105c..2afe9f50e 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -879,6 +879,7 @@ namespace mbts.spark { // We take our original ICommand (send_attached) and wrap it in another Command by way of a Converter on the binding, // pure genious! var send_attach_button_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookVM.send_attached_orders_cmd))) { + // set to true for debugging Converter = CommandWithActionWrapper.mk_wrap_converter(() => popup.IsOpen = false) }; send_attach_button_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(Popup), 1); @@ -929,6 +930,7 @@ namespace mbts.spark { #endregion popup.Child = border; + // set to true for debugging popup.StaysOpen = false; popup.PlacementTarget = attach_button; popup.Placement = PlacementMode.Bottom; @@ -1057,6 +1059,7 @@ namespace mbts.spark { // We take our original ICommand (send_attached) and wrap it in another Command by way of a Converter on the binding, // pure genious! var modify_selected_button_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookVM.modify_selected_orders_cmd))) { + // set to true for debugging Converter = CommandWithActionWrapper.mk_wrap_converter(() => popup.IsOpen = false) }; modify_selected_button_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(Popup), 1); From 4b7adbe0c9b2bb2ee4478c81166258ebb9fc7bdb Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 09:59:48 -0500 Subject: [PATCH 44/86] adding tooltip to update button --- src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 2afe9f50e..5a3ca9786 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -1002,7 +1002,8 @@ namespace mbts.spark { Content = "ยทยทยท", Margin = new Thickness(2), VerticalAlignment = VerticalAlignment.Center, - Focusable = false + Focusable = false, + ToolTip = "Update" }; update_button.Click += (s, e) => { popup.IsOpen = !popup.IsOpen; }; From 5c79a08f0ed0a7fa0c90e757556209b45dd5bb4e Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 10:53:15 -0500 Subject: [PATCH 45/86] popup close event no longer messes with selected_rows --- src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 5a3ca9786..aee502117 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -1122,8 +1122,6 @@ namespace mbts.spark { popup.Closed += (s, e) => { if (popup.try_find_ancestor_of_type(out MiniOrderBookView mini_ob) && mini_ob.DataContext is OrderBookVM ob_vm) { ob_vm.is_attaching_orders = false; - ob_vm.selected_rows.ForEach(r => r.is_selected = false); - ob_vm.selected_rows.Clear(); } }; From 4a758c75541af40ae094f3986aa1cba5eed4fcfd Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 10:54:02 -0500 Subject: [PATCH 46/86] misc comment cleanup, line endings or something --- .../Modules/Trading/OrderBook/OrderBookColumns.cs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index aee502117..77a5e18f8 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -851,13 +851,13 @@ namespace mbts.spark { var row_vm_attach_command_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookRowVM.attach_command))); row_vm_attach_command_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(MiniOrderBookRowView), 1); - attach_button.SetBinding(Button.CommandProperty, row_vm_attach_command_binding); + attach_button.SetBinding(Button.CommandProperty, row_vm_attach_command_binding); #region OrderParamsPanel // finally, set the order_params DataContext to that of the ContextMenu var order_params = AlgoEditorGridView.create_attach_view(); var order_params_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookVM.attach_vm))); - order_params_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(Popup), 1); + order_params_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(Popup), 1); order_params.SetBinding(FrameworkElement.DataContextProperty, order_params_binding); order_params.SetBinding(AlgoEditorGridView.AlgoRootsProperty, new Binding(WPFHelper.join_binding_paths(nameof(OrderParamsVM.algo_vm), nameof(AlgoDefinitionVM.algo_roots)))); order_params.SetBinding(AlgoEditorGridView.SelectedAlgoRootProperty, new Binding(WPFHelper.join_binding_paths(nameof(OrderParamsVM.algo_vm), nameof(AlgoDefinitionVM.algo_root)))); @@ -938,7 +938,6 @@ namespace mbts.spark { popup.SetBinding(Popup.DataContextProperty, new Binding("PlacementTarget.DataContext") { RelativeSource = new RelativeSource(RelativeSourceMode.Self) }); - #endregion #region Detach Button @@ -1026,23 +1025,20 @@ namespace mbts.spark { }; update_button_visibility_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(MiniOrderBookRowView), 1); update_button.SetBinding(Button.VisibilityProperty, update_button_visibility_binding); - - #endregion #region OrderParamsPanel - // finally, set the order_params DataContext to that of the ContextMenu var order_params = new AlgoEditorGridView { Margin = new Thickness(6), CanUserChangeAlgoRoot = false, }; - ; var order_params_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookVM.order_mod_vm))); order_params_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(Popup), 1); order_params.SetBinding(FrameworkElement.DataContextProperty, order_params_binding); order_params.SetBinding(AlgoEditorGridView.AlgoRootsProperty, new Binding(WPFHelper.join_binding_paths(nameof(OrderParamsVM.algo_vm), nameof(AlgoDefinitionVM.algo_roots)))); order_params.SetBinding(AlgoEditorGridView.SelectedAlgoRootProperty, new Binding(WPFHelper.join_binding_paths(nameof(OrderParamsVM.algo_vm), nameof(AlgoDefinitionVM.algo_root)))); order_params.SetBinding(AlgoEditorGridView.AlgoParamRowsProperty, new Binding(nameof(OrderParamsVM.param_rows))); + #endregion #region Dialog Skirt From c2f6b0156759936d53284c0f0bfd80da60c858b8 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 10:54:24 -0500 Subject: [PATCH 47/86] debugging comment --- src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs index ac4354874..6ccb3d81c 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs @@ -139,6 +139,7 @@ namespace mbts.spark { // properly Dispose of it later when the popup is closed. DataContext = obvm, Child = view, + // StaysOpen true for debugging StaysOpen = false, PlacementTarget = popup_placement_target, Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom, From 4490ac303e594e25bb03c2c419f9d8c0bc00a337 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 12 Jun 2019 15:41:16 -0400 Subject: [PATCH 48/86] SPARK-2438: Lean Qty test --- src/client/spark_test/System/SpreaderTests.cs | 158 +++++++++++++++++- src/client/spark_test/Utils/OrderUtilities.cs | 6 +- .../spark_test/Utils/SpreaderUtilities.cs | 28 +++- 3 files changed, 179 insertions(+), 13 deletions(-) diff --git a/src/client/spark_test/System/SpreaderTests.cs b/src/client/spark_test/System/SpreaderTests.cs index af23a7fed..4116f9b4a 100644 --- a/src/client/spark_test/System/SpreaderTests.cs +++ b/src/client/spark_test/System/SpreaderTests.cs @@ -76,7 +76,7 @@ namespace bts.tests ); var spreader_order1_response = await OrderUtilities.send_order(_order_service, order1_def, -0.30, 1); - Assert.IsTrue(spreader_order1_response.success, "Failed to send first spreader order"); + Assert.IsTrue(spreader_order1_response.success, "Failed to send spreader order"); var (spreader_order_is_working, working_spreader_order1) = await verify_order_status(spreader_order1_response.value.OrderKey, OrderStatus.Working); Assert.IsTrue(spreader_order_is_working, "Spreader order is not Working"); @@ -120,11 +120,11 @@ namespace bts.tests } - [Test(Timeout = 30)] + [Test(Timeout = 300000)] public async Task spreader_lean_qty_factor() { - Assert.IsTrue(await TestUtils.test_for_system_ready(_context, TimeSpan.FromMinutes(5)), "System is not ready"); + await setup_spreader_tests(); - string test_symbol = "SI";// don't use ES, the prices will be rounded to the same number and the result will be off + string test_symbol = "SI"; var test_user = (name: "bts", id: 1u); var test_account = (name: "ACC A", id: 1u); @@ -132,6 +132,141 @@ namespace bts.tests var setup_product = await SpreaderUtilities.common_setup_one(_order_service, _synthetic_service, test_securities, test_account, test_user); + var order1_def = OrderDefinitionUtilities.create_spreader_order_def( + setup_product.synthetic.security, + Side.Buy, + setup_product.synthetic.strategy, + test_account, + test_user + ); + + var spreader_order1_response = await OrderUtilities.send_order(_order_service, order1_def, -0.30, 1); + Assert.IsTrue(spreader_order1_response.success, "Failed to send spreader order"); + + var (spreader_order_is_working, working_spreader_order1) = await verify_order_status(spreader_order1_response.value.OrderKey, OrderStatus.Working); + Assert.IsTrue(spreader_order_is_working, "Spreader order is not Working"); + + var (quoting_order_is_working, working_quoting_order) = await verify_child_order_status(spreader_order1_response.value.OrderKey, OrderStatus.Working); + Assert.IsTrue(quoting_order_is_working, "Order is not Working"); + Assert.IsTrue(working_quoting_order.Value.State.Price == 18.6, "Quoting order has the wrong price"); + + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, new List {working_spreader_order1.Value}), "Failed to cancel order"); + + var (quoting_order_is_canceled, canceled_quoting_order) = await verify_child_order_status(spreader_order1_response.value.OrderKey, OrderStatus.Canceled); + Assert.IsTrue(quoting_order_is_canceled, "Quoting order may not have been canceled"); + + // change the synthetic + var hedge_leg = setup_product.synthetic.strategy.LegParamsMap.Where(m => !m.Value.IsActiveQuoting).TryFirst(); + Assert.IsTrue(hedge_leg.HasValue, "you need more legs"); + + foreach(var key in setup_product.synthetic.strategy.LegParamsMap.Keys) { + if(!setup_product.synthetic.strategy.LegParamsMap[key].IsActiveQuoting) { + setup_product.synthetic.strategy.LegParamsMap[key].QuoteParams.LeanQuantityRatio = 2d; + break; + } + } + + Assert.IsTrue(await SpreaderUtilities.save_strategy(_synthetic_service, setup_product.synthetic.security.Id, (ExecutionStrategyImmutable) setup_product.synthetic.strategy), "Failed to save strategy"); + + var order2_def = OrderDefinitionUtilities.create_spreader_order_def( + setup_product.synthetic.security, + Side.Buy, + setup_product.synthetic.strategy, + test_account, + test_user + ); + + var spreader_order2_response = await OrderUtilities.send_order(_order_service, order2_def, -0.30, 1); + Assert.IsTrue(spreader_order2_response.success, "Failed to send spreader order"); + + var (spreader_order2_is_working, working_spreader_order2) = await verify_order_status(spreader_order2_response.value.OrderKey, OrderStatus.Working); + Assert.IsTrue(spreader_order2_is_working, "Spreader order is not Working"); + + var (quoting_order2_is_working, working_quoting_order2) = await verify_child_order_status(spreader_order2_response.value.OrderKey, OrderStatus.Working); + Assert.IsTrue(quoting_order2_is_working, "Order is not Working"); + Assert.IsTrue(working_quoting_order2.Value.State.Price == 18.61, "Quoting order has the wrong price"); + + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, new List {working_spreader_order2.Value}), "Failed to cancel order"); + + var (quoting_order2_is_canceled, canceled_quoting_order2) = await verify_child_order_status(spreader_order2_response.value.OrderKey, OrderStatus.Canceled); + Assert.IsTrue(quoting_order2_is_canceled, "Quoting order may not have been canceled"); + + + // Order 3 + foreach(var key in setup_product.synthetic.strategy.LegParamsMap.Keys) { + if(!setup_product.synthetic.strategy.LegParamsMap[key].IsActiveQuoting) { + setup_product.synthetic.strategy.LegParamsMap[key].QuoteParams.LeanQuantityRatio = 4d; + break; + } + } + + Assert.IsTrue(await SpreaderUtilities.save_strategy(_synthetic_service, setup_product.synthetic.security.Id, (ExecutionStrategyImmutable) setup_product.synthetic.strategy), "Failed to save strategy"); + + var order3_def = OrderDefinitionUtilities.create_spreader_order_def( + setup_product.synthetic.security, + Side.Buy, + setup_product.synthetic.strategy, + test_account, + test_user + ); + + var spreader_order3_response = await OrderUtilities.send_order(_order_service, order3_def, -0.30, 1); + Assert.IsTrue(spreader_order3_response.success, "Failed to send spreader order"); + + var (spreader_order3_is_working, working_spreader_order3) = await verify_order_status(spreader_order3_response.value.OrderKey, OrderStatus.Working); + Assert.IsTrue(spreader_order3_is_working, "Spreader order is not Working"); + + var (quoting_order3_is_working, working_quoting_order3) = await verify_child_order_status(spreader_order3_response.value.OrderKey, OrderStatus.Working); + Assert.IsTrue(quoting_order3_is_working, "Order is not Working"); + Assert.IsTrue(working_quoting_order3.Value.State.Price == 18.63, "Quoting order has the wrong price"); + + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, new List {working_spreader_order3.Value}), "Failed to cancel order"); + + var (quoting_order3_is_canceled, canceled_quoting_order3) = await verify_child_order_status(spreader_order3_response.value.OrderKey, OrderStatus.Canceled); + Assert.IsTrue(quoting_order3_is_canceled, "Quoting order may not have been canceled"); + + // Order 4 + foreach(var key in setup_product.synthetic.strategy.LegParamsMap.Keys) { + if(!setup_product.synthetic.strategy.LegParamsMap[key].IsActiveQuoting) { + setup_product.synthetic.strategy.LegParamsMap[key].QuoteParams.LeanQuantityRatio = 5d; + break; + } + } + + Assert.IsTrue(await SpreaderUtilities.save_strategy(_synthetic_service, setup_product.synthetic.security.Id, (ExecutionStrategyImmutable) setup_product.synthetic.strategy), "Failed to save strategy"); + + var order4_def = OrderDefinitionUtilities.create_spreader_order_def( + setup_product.synthetic.security, + Side.Buy, + setup_product.synthetic.strategy, + test_account, + test_user + ); + + var spreader_order4_response = await OrderUtilities.send_order(_order_service, order4_def, -0.30, 1); + Assert.IsTrue(spreader_order4_response.success, "Failed to send spreader order"); + + var (spreader_order4_is_working, working_spreader_order4) = await verify_order_status(spreader_order4_response.value.OrderKey, OrderStatus.Working); + Assert.IsTrue(spreader_order4_is_working, "Spreader order is not Working"); + + var no_quoting_order4 = await get_order(ord => ord.ParentKey == spreader_order4_response.value.OrderKey, TimeSpan.FromSeconds(10)); + Assert.IsFalse(no_quoting_order4.HasValue, "There should not have been a quoting order here..."); + + OrderRecordImmutable order_from_book = setup_product.book.Where(ordi => ordi.State.Price == 18.30).First(); + var mod_resp = await OrderUtilities.modify_order(_order_service, order_from_book, 2); + Assert.IsTrue(mod_resp.success, "Order size was not changed"); + + var (quoting_order4_is_working, working_quoting_order4) = await verify_child_order_status(spreader_order4_response.value.OrderKey, OrderStatus.Working); + Assert.IsTrue(quoting_order4_is_working, "Order is not Working"); + Assert.IsTrue(working_quoting_order4.Value.State.Price == 18.63, "Quoting order has the wrong price"); + + var mod_resp2 = await OrderUtilities.modify_order(_order_service, order_from_book, 1); + Assert.IsTrue(mod_resp.success, "Order size was not changed"); + + var (quoting_order5_is_canceled, canceled_quoting_order5) = await verify_child_order_status(spreader_order4_response.value.OrderKey, OrderStatus.Canceled); + Assert.IsTrue(quoting_order5_is_canceled, "Order was not canceld"); + + Assert.IsTrue(await OrderUtilities.cancel_orders(_order_service, new List {working_spreader_order4.Value}), "Failed to cancel order"); } @@ -155,13 +290,22 @@ namespace bts.tests return order.HasValue && (Math.Truncate(order.Value.State.Price * precision) == precision * expected_price); } - private async Task get_order(Func predicate) + private async Task get_order(Func predicate, TimeSpan? timeout = null) { + if(timeout == null){ + timeout = TimeSpan.FromSeconds(60); + } var orders = await OrderUtilities.wait_for_filtered_orders(_order_service, o => o.Where(predicate).Count() > 0, ord => ord.Where(predicate), - TimeSpan.FromSeconds(30)); - return orders.result.TryFirst(); + timeout); + if(orders.result != null) { + return orders.result.TryFirst(); + } + else { + return null; + } + } diff --git a/src/client/spark_test/Utils/OrderUtilities.cs b/src/client/spark_test/Utils/OrderUtilities.cs index 031484a5c..ab89a0f83 100644 --- a/src/client/spark_test/Utils/OrderUtilities.cs +++ b/src/client/spark_test/Utils/OrderUtilities.cs @@ -75,6 +75,10 @@ namespace bts.tests }); var tr = await tcs.Task.timeout(timeout.Value); sub.Dispose(); + if(tr.result == null) { + Console.WriteLine("Timed out while retreving orders."); + } + return tr; } @@ -124,7 +128,7 @@ namespace bts.tests } /// - /// We should replace with something like the OrderDataHeler from the Spark project. + /// We should replace with something like the OrderDataHelper from the Spark project. /// public static class OrderDefinitionUtilities { diff --git a/src/client/spark_test/Utils/SpreaderUtilities.cs b/src/client/spark_test/Utils/SpreaderUtilities.cs index db2f830f6..5de24e9a6 100644 --- a/src/client/spark_test/Utils/SpreaderUtilities.cs +++ b/src/client/spark_test/Utils/SpreaderUtilities.cs @@ -27,8 +27,24 @@ namespace bts.tests Assert.IsNotNull(exps); Assert.IsTrue(exps.Count() > 2, "Need at least two expirations"); - var exp1 = exps[0]; - var exp2 = exps[1]; + (uint, uint) preferred_expirations = (07,12); + + FutureContract exp1; + FutureContract exp2; + + if(exps.Exists(expir => expir.ExpirationMonth == preferred_expirations.Item1)) { + exp1 = exps.Where(ex => ex.ExpirationMonth == preferred_expirations.Item1).First(); + } + else { + exp1 = exps[0]; + } + + if(exps.Exists(expir => expir.ExpirationMonth == preferred_expirations.Item2 && expir.ExpirationYear == exp1.ExpirationYear)) { + exp2 = exps.Where(ex => ex.ExpirationMonth == preferred_expirations.Item2 && ex.ExpirationYear == exp1.ExpirationYear).First(); + } + else { + exp2 = exps[1]; + } Func sec1_match = ch => ch.Security.Future.ExpirationYear == exp1.ExpirationYear && @@ -103,13 +119,15 @@ namespace bts.tests new_synth.Synthetic.Legs.Add(legs.Select(l => l.contract)); new_synth.Symbol = deduce_symbol(new_synth); new_synth.ContractSpec = new ContractSpecification(); - new_synth.ContractSpec.LowTick = 0.01; - new_synth.ContractSpec.HighTick = 0.01; + new_synth.ContractSpec.LowTick = 0.005; + new_synth.ContractSpec.HighTick = 0.005; new_synth.ContractSpec.PriceBreak = double.MaxValue; new_synth.ContractSpec.MainFraction = 1u; new_synth.ContractSpec.PriceDisplayFormat = 3u; + new_synth.ContractSpec.CashPerPoint = 1u; + new_synth.ContractSpec.PriceMultiplier = 1u; new_synth.Exchange = Venue.Bts; - new_synth.Synthetic.Name = "TEST_SYNTH" + DateTime.Now.ToString(); + new_synth.Synthetic.Name = "TEST_SYNTH" + DateTime.Now.TimeOfDay.ToString(); var result = await service.create_synthetic_async(new_synth); Assert.IsTrue(result.success, "Unable to create synthetic"); From 0d020e98212f8720672958f16b84a979c4139d80 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 14:48:36 -0500 Subject: [PATCH 49/86] updating manual test --- testing/manual/orders/mini_ob.txt | 57 +++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/testing/manual/orders/mini_ob.txt b/testing/manual/orders/mini_ob.txt index 1858ef6d3..b2dd6ca8c 100644 --- a/testing/manual/orders/mini_ob.txt +++ b/testing/manual/orders/mini_ob.txt @@ -51,5 +51,62 @@ A(attach)/D(etach) buttons Verify the limit row's D button has now changed to an A Verify the limit row is no longer a child to the IB Verify the IB order is now canceled + +Multi-selection specific tests +------------------------------ + +Prerequisites + Place 10 1-lots at a specific price in the ladder + Have the mini ob open + + Cancel + ------ + Select any 2 rows by however you feel like it - click and drag, ctrl + click, clicking on checkbox column + Note the rows you have chosen, perhaps by time + Click the red cancel icon and the your selected orders should be cancelled + Attach + ------ + Select any 2 rows + Click the attach icon and then OK to attach to an IB + If you're feeling adventurous, attach to a different Algo + The following should happen to your selected rows: + Update buttons should be visible + The black attach icon should change to the red detach icon + The root algo column should reflect IB (the root algo badge as well) + + Detach + ------ + Select the previously attached rows from our prior attach step + Click the detach icon + The following should happen to your selected rows: + Update buttons should disappear + The red detach icon should change to the black attach icon + The root algo column should reflect a standard Limit(the root algo badge as well) + For extra credit, repeat the detach step here but also include some non-attached rows as well + + Update + ------ + Perform the following WITHOUT closing the mini ob: + + Attach an IB with show qty 1 to any 2 rows + Click update (...) button, modify the show quantity to 2, and hit ok + Uncheck one of the selected rows + Hit the update button in the currently selected row and verify the show quantity reads 2, hit cancel + + Uncheck your current row, so there should be no rows currently selected + + Hit the update button in the *other* row and verify the show quantity reads 2 there as well, now change the show quantity to 3 + Uncheck your current row + Hit the update button in the *other* row and verify the show quantity *still* reads 2. + + Check both rows and hit the update button + Show quantity should display as '-' signifying that the 2 rows have differing show quantities + + Uncheck all rows + Select one of the currently IB-controlled rows and a regular limit order and hit the update button + You should see the param popup effectively display as empty as these are incompatible order types selected + Cancel to return back to mini ob + + \ No newline at end of file From 64fd8addb2261e9ffc2ee52f37364e65b0234dd6 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Thu, 13 Jun 2019 09:38:11 -0400 Subject: [PATCH 50/86] Update Lean qty factor shell script --- .../spreader_lean_qty_factor.sh | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh b/src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh index 28913e469..afe9e1e5f 100644 --- a/src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh +++ b/src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh @@ -1,9 +1,21 @@ #!/bin/bash -rm -r ~/sparkdata/data/databases/ > /dev/null +if [ -d ~/sparkdata/ ] +then + sparkdata_dir=~/sparkdata +else + sparkdata_dir=/sparkdata +fi -mv ~/sparkdata/conf/spark.conf ~/sparkdata/conf/spark.conf.bak -cat << EOF > ~/sparkdata/conf/spark.conf +./delete_dbs.sh + +config=$sparkdata_dir/conf/spark.conf +bak=$sparkdata_dir/conf/spark.conf.bak + +[ ! -d "$sparkdata_dir/conf" ] && mkdir $sparkdata_dir/conf/ +[ -f "$conf" ] && mv $conf $bak + +cat << EOF > $sparkdata_dir/conf/spark.conf ExchangeSim { value { merge_with_md:false @@ -15,7 +27,13 @@ cat << EOF > ~/sparkdata/conf/spark.conf syslog { default_level: "Error" } file { default_level: "Error" } } -} + } + + SymbolList { + value { + symbol: "SI" + } + } EOF @@ -23,10 +41,12 @@ nohup ./sparkd run & pid=$! echo "sparkd pid: " $pid -echo "sleeping for 120 seconds..." -sleep 120 - dotnet sparkcmd.dll test spreader_lean_qty_factor -kill $pid -mv ~/sparkdata/conf/spark.conf.bak ~/sparkdata/conf/spark.conf \ No newline at end of file +exit_status=$? + +pkill -P $$ + +[ -f "$bak" ] && mv $bak $conf +[ $exit_status -eq 0 ] && echo "Test Finished" || echo "Test failed" +exit $exit_status \ No newline at end of file From 12dd3909bfc32aedaa92d2a3cbf95a8deb015b40 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Thu, 13 Jun 2019 12:49:13 -0400 Subject: [PATCH 51/86] Fix documentation deploy --- doc/user/deploy_to_web.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/doc/user/deploy_to_web.sh b/doc/user/deploy_to_web.sh index 5b6339c66..f80a67ed5 100644 --- a/doc/user/deploy_to_web.sh +++ b/doc/user/deploy_to_web.sh @@ -1,7 +1,6 @@ #/bin/bash #python -m mkdocs build -d site -cp -r ../../src/sdk/doc/* ./content/bts_spark_sdk/Server/ ./run_zola.sh build scp -r ./public bts@bluetradesys.com:/home/bts/doc/ @@ -14,7 +13,3 @@ sudo mv ./public/* /var/www/documentation/ EOF rm -r public -cd ./content/bts_spark_sdk/server/ -find . -not -name '_index.md' -delete -cd ../.. - From 5a54b37af7f8d18781061d7a7d63cab564036731 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Thu, 13 Jun 2019 13:07:42 -0400 Subject: [PATCH 52/86] Move system requirements to Docs --- .../content/system_requirements/_index.md | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 doc/user/content/system_requirements/_index.md diff --git a/doc/user/content/system_requirements/_index.md b/doc/user/content/system_requirements/_index.md new file mode 100644 index 000000000..d5f9e5ae9 --- /dev/null +++ b/doc/user/content/system_requirements/_index.md @@ -0,0 +1,55 @@ ++++ +title = "System Requirements" +weight = 4 +sort_by = "weight" +insert_anchor_links = "right" ++++ + + +### Minimum Workstation +* New XPS Tower +* 8th Generation Intelยฎ Coreโ„ข i7-8700 6-Core Processor (12M Cache, up to 4.6 GHz) +* 16GB, 2666MHz, DDR4 up to 64GB +* Windows 10 Professional 64-bit +* NVIDIAยฎ GeForceยฎ GTX 1070 with 8GB GDDR5 Graphics Memory +* 1 x 2.5" 256GB SATA Solid State Drive + +### Recommended Workstation +* Similar or better than: +* Dell Precision Tower 5820 +* Intel Xeon W-2145 3.7GHz, 4.5GHz Turbo, 8C, 11M Cache, HT, (140W) DDR4-2666 +* Windows 10 Professional 64-bit +* NVIDIAยฎ Quadroยฎ P1000, 4GB, 4 mDP +* 16GB (4x4GB) 2133MHz DDR4 RDIMM ECC +* 2 x 2.5" 256GB SATA Solid State Drive running RAID1 + + +### BTS Recommended Server Specifications +* Dell R640 +* 2x Intel Xeon Gold 6148 2.40GHz 20-Core Processors. For better performance BTS recommends Intelยฎ Xeonยฎ Platinum 8268 2.9G, 24 Core CPU +* 192GB RAM 2666MHz DDR4 +* 3x 480GB SSD RAID 5 HBA Minicard +* iDRAC 9 Enterprise +* Embedded Broadcom NIC +* Solarflare SFN8522-R2 +* Redundant Power Supply + +### BTS Minimum Server Specifications +* Dell R620 +* Chassis with up to 8, 2.5โ€ Hard Drives, up to 2 PCIe Slots (With Optional Riser) +* 2 x Intelยฎ E5-2670 (16 total cores/ 32 total threads) +* 64GB total memory +* RAID 1 for H330/H730/H730P +* PERC H730 RAID Controller, 1GB NV Cache +* 3 x 300GB 10K RPM SATA 6Gbps 2.5in Hot-plug Hard Drive (RAID 5) +* iDRAC8 Enterprise, integrated Dell Remote Access Controller, Enterprise (varies by hosting company) +* Solarflare Ultra SFN7122F Dual-Port 10GbE (10 GB connectivity requirements, copper vs optical, varies by hosting company). +* Dual, Hot-plug, Redundant Power Supply (1+1), 750W +* Performance BIOS Setting +* ReadyRails Sliding Rails Without Cable Management Arm (varies by hosting company) + +### Edge Tablet Requirements +* Similar or better than: +* Microsoft Surface Pro 4 Or Motion R12 +* Intel i7 +* 8 GB DDR4 RAM \ No newline at end of file From 83190b437a39fc7e6b922f070ddf55ec840e13d3 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 13 Jun 2019 13:31:33 -0500 Subject: [PATCH 53/86] defining a new RowStyle for the fills grid that uses a converter based on side --- .../Modules/Trading/Fills/FillsView.xaml | 51 +++++++++++++++++++ .../Modules/Trading/Fills/FillsView.xaml.cs | 1 + 2 files changed, 52 insertions(+) diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml b/src/client/spark/Modules/Trading/Fills/FillsView.xaml index aab914119..ce661513e 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml +++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml @@ -6,6 +6,10 @@ xmlns:c="clr-namespace:mbts.ui.controls" xmlns:usp="clr-namespace:mbts.ui.spark" xmlns:uspcv="clr-namespace:mbts.ui.spark.converters" + xmlns:cv="clr-namespace:mbts.ui.converters" + xmlns:u="clr-namespace:mbts.ui" + xmlns:api="clr-namespace:bts.api;assembly=spark_api" + xmlns:bts="clr-namespace:mbts.ui.controls" FocusManager.IsFocusScope="True" Background="{StaticResource CommonBackground}" > @@ -15,6 +19,52 @@ + + + + + @@ -29,6 +79,7 @@ Columns="{Binding columns}" CurrentRow="{Binding current_row}" Rows="{Binding rows}" + RowStyle="{StaticResource {x:Static usp:FillsView.RowStyleKey}}" > diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs index 4b74769eb..fc5023cec 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs @@ -24,6 +24,7 @@ namespace mbts.ui.spark { OrderKey, SecurityKey } + public const string RowStyleKey = "RowStyle"; public FillsView() => InitializeComponent(); From 318ea5909c5ab61a2d651b2f0b0e37dd5cdc9a3d Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 13 Jun 2019 13:32:29 -0500 Subject: [PATCH 54/86] adding new brushes to be references from xaml; misc helper function --- .../spark/core/FontsAndColors/BTSColors.cs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/client/spark/core/FontsAndColors/BTSColors.cs b/src/client/spark/core/FontsAndColors/BTSColors.cs index e58fb36c0..630d071a7 100644 --- a/src/client/spark/core/FontsAndColors/BTSColors.cs +++ b/src/client/spark/core/FontsAndColors/BTSColors.cs @@ -21,6 +21,10 @@ namespace mbts.ui { brush.Freeze(); } + public static void create_frozen_brush(BTSColor color, double opacity, out Brush brush) { + (brush = new SolidColorBrush(color) { Opacity = opacity }).Freeze(); + } + [DisplayInfo(name = "Default Header")] public static BTSColor header { get { return BTSCoreColors.base_blue; } } public static Brush header_brush { get { return _header_brush; } } @@ -72,15 +76,18 @@ namespace mbts.ui { } public static class MarketData { - static readonly Brush _bid_brush, _ask_brush; + static readonly Brush _bid_brush, _ask_brush, _semi_transparent_bid_brush, _semi_transparent_ask_brush; static MarketData() { // null BTSColors are implicitly gray media colors/brushes (this behavior is problematic and should be changed), // 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; - _bid_brush = bid; - _ask_brush = ask; + _init_brush(bid, out _bid_brush); + _init_brush(ask, out _ask_brush); + create_frozen_brush(BTSColors.MarketData.bid, 0.33, out _semi_transparent_bid_brush); + create_frozen_brush(BTSColors.MarketData.ask, 0.33, out _semi_transparent_ask_brush); + } // Base Colors [DisplayInfo(name = "Market Data")] @@ -97,6 +104,9 @@ namespace mbts.ui { public static Brush bid_brush => _bid_brush; public static Brush ask_brush => _ask_brush; + public static Brush semi_transparent_bid_brush => _semi_transparent_bid_brush; + public static Brush semi_transparent_ask_brush => _semi_transparent_ask_brush; + [DisplayInfo(name = "Settlement")] public static BTSColor settlement_background { get { return Grid.default_column_background; } } From 64f78e6077845de91a87c264078e9f19b89495e9 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 13 Jun 2019 14:11:53 -0500 Subject: [PATCH 55/86] RenderColumn now accepct a Func for background brush --- .../view/Controls/DIYGrid/Columns/RenderColumn.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/RenderColumn.cs b/src/client/spark/view/Controls/DIYGrid/Columns/RenderColumn.cs index f6bb51015..4c58bc40d 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/RenderColumn.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/RenderColumn.cs @@ -21,13 +21,17 @@ namespace mbts.ui.controls { public class RenderTextColumn : RenderColumnBase, IRenderColumn, IFilterableColumn { protected readonly Func _get_text; + protected readonly Func _get_background_brush; public RenderTextColumn( Func get_text, IDataGridColumnFilter filter = null, - string filter_template = null) + string filter_template = null, + Func get_brush = null) : base() { _get_text = get_text; + Func get_default_background_brush = (TRowVM _) => this.background; + _get_background_brush = get_brush ?? get_default_background_brush; this.filter = filter; this.filter_template = filter_template; font_params_changed += refresh_glyph_context; @@ -46,13 +50,16 @@ namespace mbts.ui.controls { public override void draw(TRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => CellRender.draw_text( dc, glyph_context, font_size, _get_text(row), position, row_height, - font_brush, background, horizontal_alignment, vertical_alignment, padding); + font_brush, _get_background_brush(row), horizontal_alignment, vertical_alignment, padding); } public class RenderTextColumn : RenderTextColumn, IKeyedColumn { public RenderTextColumn(TColKey key, Func get_text, IDataGridColumnFilter filter, string filter_template) : base(get_text, filter, filter_template) => this.key = key; + public RenderTextColumn(TColKey key, Func get_text, IDataGridColumnFilter filter, string filter_template, Func get_brush) + : base(get_text, filter, filter_template, get_brush) => this.key = key; + public TColKey key { get; } } } From 7aae61decd11a38d19824799ea984231c052cc05 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 13 Jun 2019 14:14:45 -0500 Subject: [PATCH 56/86] Cleanup related to new RenderTextColumn func; deleting classes, etc --- .../Market/TimeAndSales/TimeAndSalesVM.cs | 9 +---- .../TimeAndSalesColumn.cs | 40 ------------------- src/client/spark/view/Spark/PAndL/PAndLVM.cs | 13 +----- 3 files changed, 3 insertions(+), 59 deletions(-) delete mode 100644 src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/TimeAndSalesColumn.cs diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs index 57d296185..11a3a44ee 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs @@ -49,13 +49,8 @@ namespace mbts.spark { add_column(TimeAndSalesView.Columns.Aggressor, DefaultColumnHeaders.Aggressor, DefaultColumnWidths.Aggressor, nameof(Row.aggressor_side), aggressor_filter, DataGridFilterKnownTemplates.EnumValues); add_column(TimeAndSalesView.Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, DefaultColumnWidths.SecurityKey, nameof(Row.security_key), security_key_filter, DataGridFilterKnownTemplates.Regex); void add_column(TimeAndSalesView.Columns col_key, string header, double width, string sort_member_path, IDataGridColumnFilter filter, string filter_template, System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) => - columns.Add(new TimeAndSalesColumn( - col_key - , (r) => _get_aggressor_brush(r) - , filter - , filter_template - ) - { Header = header, Width = width, sort_member_path = sort_member_path, horizontal_alignment = h_alignment } + columns.Add(new RenderTextColumn(col_key, r => r[col_key], filter, filter_template, r => _get_aggressor_brush(r)) + { id = col_id(col_key), Header = header, Width = width, sort_member_path = sort_member_path, horizontal_alignment = h_alignment } ); // be sure to load GridSettings AFTER the columns collection has been populated, the grid settings manager looks columns by id to apply the appropriate settings, diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/TimeAndSalesColumn.cs b/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/TimeAndSalesColumn.cs deleted file mode 100644 index dafdbe936..000000000 --- a/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/TimeAndSalesColumn.cs +++ /dev/null @@ -1,40 +0,0 @@ -๏ปฟusing bts.shell; -using mbts.spark; -using mbts.spark.filters; -using mbts.ui.spark; -using mbts.ui.utility.text; -using System; -using System.Windows.Media; - -namespace mbts.ui.controls { - partial class DIYGrid { - internal class TimeAndSalesColumn : RenderTextColumn, IKeyedColumn { - readonly Func _get_brush; - - public TimeAndSalesColumn(TimeAndSalesView.Columns key, Func get_brush, IDataGridColumnFilter filter = null, string filter_template = null) - : base(r => r[key], filter, filter_template) { - this.key = key; - // id is used for settings (another case of ProtoBufs vs Generics - strings seemed like the easiest way to provide an identifier for the common GridColumnSettings proto) - id = TimeAndSalesWindowFactory.col_id(key); - _get_brush = get_brush; - } - - public TimeAndSalesView.Columns key { get; } - - public override void draw(TimeAndSalesVM.Row row, DrawingContext dc, ColumnGeometry position, double row_height) { - CellRender.draw_text(dc - , glyph_context - , font_size - , _get_text(row) - , position - , row_height - , font_brush - , _get_brush(row) - , horizontal_alignment - , vertical_alignment - , padding); - } - - } - } -} diff --git a/src/client/spark/view/Spark/PAndL/PAndLVM.cs b/src/client/spark/view/Spark/PAndL/PAndLVM.cs index 60de61e32..c97d20f9a 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLVM.cs +++ b/src/client/spark/view/Spark/PAndL/PAndLVM.cs @@ -152,9 +152,7 @@ namespace mbts.spark { add_col(Columns.TotalPNL, DefaultColumnHeaders.TotalPnL, r => r.total_pnl_text, nameof(PnLSummaryRow.total_pnl), DefaultColumnWidths.PnL_Generic, total_pnl_filter, DataGridFilterKnownTemplates.DoubleMinMax, HorizontalAlignment.Right, r => r.total_pnl_background); add_col(Columns.PNLPrice, DefaultColumnHeaders.PnLPrice, r => r.pnl_price_text, nameof(PnLSummaryRow.pnl_price), DefaultColumnWidths.PnL_Generic, pnl_price_filter, DataGridFilterKnownTemplates.DoubleMinMax, HorizontalAlignment.Right); void add_col(Columns key, string header, Func get_text, string sort_prop, double width, IDataGridColumnFilter filter, string filter_template, HorizontalAlignment h_align = HorizontalAlignment.Left, Func get_background = null) { - var col = get_background == null ? - new RenderTextColumn(key, get_text, filter, filter_template) : - new PnLDelegateBackgroundColumn(key, get_text, get_background, filter, filter_template); + var col = new RenderTextColumn(key, get_text, filter, filter_template, get_background); col.Header = header; col.Width = width; col.sort_member_path = sort_prop; @@ -357,14 +355,5 @@ namespace mbts.spark { DateTime _last_pnl_update_time = DateTime.MinValue; ObservableCollection _pnl_data = new ObservableCollection(); - class PnLDelegateBackgroundColumn : RenderTextColumn { - readonly Func _get_brush; - - public PnLDelegateBackgroundColumn(Columns key, Func get_text, Func get_brush, IDataGridColumnFilter filter, string filter_template) - : base(key, get_text, filter, filter_template) => _get_brush = get_brush; - - public override void draw(PnLSummaryRow row, DrawingContext dc, ColumnGeometry position, double row_height) => - CellRender.draw_text(dc, glyph_context, font_size, _get_text(row), position, row_height, font_brush, _get_brush.Invoke(row), horizontal_alignment, VerticalAlignment.Center, DefaultCellPadding); - } } } \ No newline at end of file From 5202300fb1c039bef7c0647b20f1b144746ecd1d Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 13 Jun 2019 15:58:12 -0500 Subject: [PATCH 57/86] ActualWidth for total visible width down in the HighPerformanceRow per John --- .../spark/view/Controls/DIYGrid/Columns/ColumnGeometry.cs | 1 + .../spark/view/Controls/DIYGrid/Row/HighPerformanceRow.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnGeometry.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnGeometry.cs index f4a3cd191..6e7bf2d99 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnGeometry.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnGeometry.cs @@ -13,6 +13,7 @@ namespace mbts.ui.controls { public double width { get { return column.ActualWidth; } } public double right { get { return unclipped_left + width; } } public bool is_partially_obscured { get { return unclipped_left < left; } } + public double visible_width => width - left + unclipped_left; public override string ToString() { return "{3} {0:0.0},{1:0.0} w{2:0.0}".fmt(left, right, width, column.Header); } diff --git a/src/client/spark/view/Controls/DIYGrid/Row/HighPerformanceRow.cs b/src/client/spark/view/Controls/DIYGrid/Row/HighPerformanceRow.cs index eb1213a7c..66b48390f 100644 --- a/src/client/spark/view/Controls/DIYGrid/Row/HighPerformanceRow.cs +++ b/src/client/spark/view/Controls/DIYGrid/Row/HighPerformanceRow.cs @@ -101,7 +101,7 @@ namespace mbts.ui.controls { protected override void OnRender(DrawingContext dc) { if (cached_background != null) { - dc.DrawRectangle(cached_background, null, new Rect(0, 0, ActualWidth, ActualHeight)); + dc.DrawRectangle(cached_background, null, new Rect(0, 0, _column_layout.Sum(col => col.visible_width), ActualHeight)); } if (_row != null) { foreach (var cell in _column_layout) { From 86733747f1e97f5a827875914327aedb4890095e Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 13 Jun 2019 15:58:40 -0500 Subject: [PATCH 58/86] getting rid of the ListBoxItem template and just going with the converter --- .../Modules/Trading/Fills/FillsView.xaml | 51 ++----------------- 1 file changed, 4 insertions(+), 47 deletions(-) diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml b/src/client/spark/Modules/Trading/Fills/FillsView.xaml index ce661513e..b8d3410da 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml +++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml @@ -23,48 +23,6 @@ - @@ -79,7 +37,6 @@ Columns="{Binding columns}" CurrentRow="{Binding current_row}" Rows="{Binding rows}" - RowStyle="{StaticResource {x:Static usp:FillsView.RowStyleKey}}" > @@ -92,10 +49,10 @@ CanExecute="{x:Static c:DIYGrid.DefaultRowActionCanExecute}" /> - - - - + + + + From 4edd804b3c78460e90a359460c59026f72f8fdf1 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 13 Jun 2019 16:15:22 -0500 Subject: [PATCH 59/86] forgot to remove this when I took the resource out --- src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs index fc5023cec..4b74769eb 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs @@ -24,7 +24,6 @@ namespace mbts.ui.spark { OrderKey, SecurityKey } - public const string RowStyleKey = "RowStyle"; public FillsView() => InitializeComponent(); From e8d799a0f66f8bb204ad8d413aef5d006f751895 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 14 Jun 2019 09:00:17 -0500 Subject: [PATCH 60/86] PR refactoring detach --- .../spark/Modules/Trading/OrderBook/OrderBookVM.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 1bbec8df9..65850bd5c 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -584,14 +584,11 @@ namespace mbts.spark { return os; } - internal void detach_orders(OrderBookRowVM order) { - if (order.is_selected) { - var detach_candidates = rows.Where(r => r.is_selected); - _detach_orders_async(detach_candidates).ignore(); - // Don't change the is_selecte state here b/c it will cause state issues - // in with the miniob attach param popup + internal void detach_orders(OrderBookRowVM row) { + if (row.is_selected) { + _detach_orders_async(selected_rows).ignore(); } else { - _detach_orders_async(new[] { order }).ignore(); + _detach_orders_async(new[] { row }).ignore(); } } From 213fb1de594557e34b1f27cdf6e9c24bc54367ea Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 14 Jun 2019 09:00:30 -0500 Subject: [PATCH 61/86] PR refactoring cancel --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 65850bd5c..e14b4e3d8 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -608,7 +608,7 @@ namespace mbts.spark { internal void cancel_order(OrderBookRowVM row) { if (row.is_selected) { - rows.Where(r => r.is_selected).ForEach((selected_row) => _bus.post(SparkTags.CancelOrders, new List { selected_row.order_key })); + _bus.post(SparkTags.CancelOrders, selected_rows.Select(r => r.order_key).ToList()); } else { _bus.post(SparkTags.CancelOrders, new List { row.order_key }); } From f34f718c721b1a56ad20490ae606f7997c7d4176 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 14 Jun 2019 09:02:24 -0500 Subject: [PATCH 62/86] PR rename on_row_selected --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index e14b4e3d8..e5993412f 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -444,7 +444,7 @@ namespace mbts.spark { row_vm.updated += on_updated; _on_updated_single_callback_gatekeeper.Add(row_vm.order_key, Disposable.Create(() => row_vm.updated -= on_updated)); } - _selected_params_mon.on_row_selected(root); + _selected_params_mon.on_order_selected(root); if (row_vm.is_attachable) _attachable_selected_orders.Add(row_vm.order_key); if (row_vm.is_detachable) @@ -1047,7 +1047,7 @@ namespace mbts.spark { public IDisposable begin_udpate() => _group_mon.defer_updates(); - public void on_row_selected(OrderSecurity order_tuple) => + public void on_order_selected(OrderSecurity order_tuple) => _group_mon.add(order_tuple); public void on_row_unselected(OrderSecurity order_tuple) => From ad0b1756b121fd5ccd95eb690787c0c0be1d4307 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 14 Jun 2019 09:03:07 -0500 Subject: [PATCH 63/86] PR rename on_row_unselected --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index e5993412f..a7808fd64 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -431,7 +431,7 @@ namespace mbts.spark { if (e.RemovedItems != null) { foreach (var row_vm in e.RemovedItems.OfType()) { row_vm.is_selected = false; - _selected_params_mon.on_row_unselected(_get_root(row_vm.order_tuple)); + _selected_params_mon.on_order_unselected(_get_root(row_vm.order_tuple)); _attachable_selected_orders.Remove(row_vm.order_key); _detachable_selected_orders.Remove(row_vm.order_key); } @@ -456,7 +456,7 @@ namespace mbts.spark { unsubscribe_updated_disposable.Dispose(); _on_updated_single_callback_gatekeeper.Remove(row_vm.order_key); } - _selected_params_mon.on_row_unselected(_get_root(row_vm.order_tuple)); + _selected_params_mon.on_order_unselected(_get_root(row_vm.order_tuple)); return; } var new_root = _get_root(change.newval); @@ -1050,7 +1050,7 @@ namespace mbts.spark { public void on_order_selected(OrderSecurity order_tuple) => _group_mon.add(order_tuple); - public void on_row_unselected(OrderSecurity order_tuple) => + public void on_order_unselected(OrderSecurity order_tuple) => _group_mon.remove(order_tuple); public void on_security_md_map(IReadOnlyDictionary security_md_map) { From d678d202c1f03c454df90fa16663cc5a6ee8f44f Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 14 Jun 2019 09:04:09 -0500 Subject: [PATCH 64/86] PR rename on_row_updated --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index a7808fd64..bb9da3e0d 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -464,7 +464,7 @@ namespace mbts.spark { // unselect and select in one smooth motion via on_row_updated // because we thought there may be gremlins afoot when doing // on_row_unselected and then on_row_selected - _selected_params_mon.on_row_updated((root, new_root)); + _selected_params_mon.on_order_updated((root, new_root)); root = new_root; } } @@ -1058,7 +1058,7 @@ namespace mbts.spark { _security_md_map_changed?.Invoke(); } - public void on_row_updated((OrderSecurity oldval, OrderSecurity newval) ch) { + public void on_order_updated((OrderSecurity oldval, OrderSecurity newval) ch) { using (begin_udpate()) { _group_mon.remove(ch.oldval); _group_mon.add(ch.newval); From 3dda3e7f758466a6cafdbda5ba720ea6c396d1be Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 14 Jun 2019 10:44:38 -0400 Subject: [PATCH 65/86] Allow cover order to continue even if hedgding child is canceled. --- src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp index 01dff07fb..86f2cf008 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp @@ -134,17 +134,12 @@ void CoverAlgo::on_child_change(OrderKey k, ChildState const &st) { switch (st.status) { case ChildStatus::WORKING: break; + case ChildStatus::CANCELED: case ChildStatus::COMPLETED: if (auto it = std::find(me->hedges.begin(), me->hedges.end(), k); it != me->hedges.end()) me->hedges.erase(it); break; - case ChildStatus::CANCELED: - LOG(OrderMan, Info, "CoverAlgo {}. Hedge was canceled, terminating", - algo().order_key().value()); - me->status = Status::DONE; - algo().terminate_error("Unexpected child cancel"); - break; } } check_terminate(); From ed23bc7e2b30bcd5e573812a3665dd540f347c6c Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 14 Jun 2019 10:50:34 -0400 Subject: [PATCH 66/86] Enhanced the API to allow algos to implement custom cancel handling --- .../orderman/orders/algo/AlgoWrapperOrder.cpp | 18 ++++++++++++++---- src/lib/orderman/orders/algo/IAlgoOrder.h | 8 ++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index b14e7c7ef..950c619a3 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -135,9 +135,9 @@ void AlgoWrapperOrder::on_init_new(OrderDefinition const &def, if (can_consume_attachment(me->definition.custom_def().custom_case())) { me->attach_target = OrderKey(me->definition.attach_target_order_key()); me->definition.clear_attach_target_order_key(); - } - else { - terminate(ORDER_STATUS_REJECTED_BY_SPARK, "Algo does not support attachment"); + } else { + terminate(ORDER_STATUS_REJECTED_BY_SPARK, + "Algo does not support attachment"); return; } } @@ -290,9 +290,19 @@ orderman::OrderOpResult AlgoWrapperOrder::on_cancel() { switch (me->status) { case Status::W_ATTACH: - case Status::WORKING: terminate(ORDER_STATUS_CANCELED); break; + case Status::WORKING: + switch (me->algo->on_cancel()) { + case IAlgoOrder::OnCancelResponse::HONOR: + cancel(); + break; + case IAlgoOrder::OnCancelResponse::IGNORE: + LOG(OrderMan,Info,"Algo order with key {} ignored cancel request", + key().value()); + break; + } + break; case Status::COMPLETED: break; case Status::INACTIVE: diff --git a/src/lib/orderman/orders/algo/IAlgoOrder.h b/src/lib/orderman/orders/algo/IAlgoOrder.h index 55f5d7679..3b882b49d 100644 --- a/src/lib/orderman/orders/algo/IAlgoOrder.h +++ b/src/lib/orderman/orders/algo/IAlgoOrder.h @@ -64,6 +64,14 @@ class IAlgoOrder { // implementation should validate the update and either apply it, // if valid or terminate with an error otherwise virtual void do_update(api::orderman::Update const &) {} + + // Override this method to provide custom handling of a cancel + // request. The default behaviour is to cancel both this order and + // recursively any of its children. Algos may override this method + // for example to detach from specific children before canceling or + // to implement custom cleanup behaviour when canceled. + enum class OnCancelResponse {IGNORE, HONOR}; + virtual OnCancelResponse on_cancel() {return OnCancelResponse::HONOR;} }; } // namespace orderman From bc3ab563bf1d5e2ab4c469f2bc3c51bcb0b02dd5 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 14 Jun 2019 10:58:33 -0400 Subject: [PATCH 67/86] Changed Cover to detach its hedges when canceled. --- src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp | 7 +++++++ src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h | 1 + 2 files changed, 8 insertions(+) diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp index 86f2cf008..e96081023 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp @@ -209,5 +209,12 @@ void CoverAlgo::check_terminate() { } } +IAlgoOrder::OnCancelResponse CoverAlgo::on_cancel() +{ + for (auto &k : me->hedges) + algo().detach_child(k); + return IAlgoOrder::OnCancelResponse::HONOR; +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h index 3bedb00e7..203f93e5c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h @@ -18,6 +18,7 @@ public: void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; void do_update(api::orderman::Update const &) override; void on_child_change(OrderKey, ChildState const &) override; + IAlgoOrder::OnCancelResponse on_cancel() override; private: struct PImpl; From 66d05c63afa930c101d6490dfb5d43d7330c808b Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 14 Jun 2019 14:25:04 -0400 Subject: [PATCH 68/86] Made cover cancel behaviour parameterizable. This implements the server side only, the UI does not expose this configuration so effectively the behaviour right now is hard-coded until we get around to adding the UI. --- src/lib/api/services/OrderService.proto | 2 ++ .../orders/algo/algo_orders/CoverAlgo.cpp | 31 +++++++++++++------ .../orders/algo/algo_orders/CoverAlgo.h | 2 +- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 5c03be00b..2470930e5 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -174,6 +174,8 @@ message CoverOrderDefinition { CustomOrderDefinition hedge = 1; uint32 hedge_ticks = 2; CustomOrderDefinition child = 3; + bool cancel_on_external_hedge_cancel = 4; + bool cancel_hedges_on_cancel = 5; } message OffsetOrderDefinition { uint32 tick_offset_on_deploy = 1; diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp index e96081023..d7dd1a56f 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp @@ -26,6 +26,8 @@ struct CoverAlgo::PImpl { IAlgoServices *algo; OrderKey child_key = null_order_key(); Price price_improvement_delta; + bool cancel_on_external_hedge_cancel = false; + bool cancel_hedges_on_cancel = false; ChildTemplate *child_template = nullptr; ChildTemplate *hedge_template = nullptr; Quantity hedged_fills = Quantity(0); @@ -64,7 +66,7 @@ OrderOpResult CoverAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { } init_hedge_template(serv, cover.hedge()); - set_price_improvement_delta(serv, cover); + update_definition(serv, cover); return {}; } @@ -135,10 +137,16 @@ void CoverAlgo::on_child_change(OrderKey k, ChildState const &st) { case ChildStatus::WORKING: break; case ChildStatus::CANCELED: + if (me->cancel_on_external_hedge_cancel) { + LOG(OrderMan, Info, "CoverAlgo {}. Hedge was canceled, terminating", + algo().order_key().value()); + me->status = Status::DONE; + algo().terminate_error("Unexpected child cancel"); + } else + std::remove(me->hedges.begin(), me->hedges.end(), k); + break; case ChildStatus::COMPLETED: - if (auto it = std::find(me->hedges.begin(), me->hedges.end(), k); - it != me->hedges.end()) - me->hedges.erase(it); + std::remove(me->hedges.begin(), me->hedges.end(), k); break; } } @@ -162,7 +170,7 @@ void CoverAlgo::do_update(api::orderman::Update const &update) { // process custom part of the udpate if any if (update.has_custom()) { auto &cover_update = update.custom().cover(); - set_price_improvement_delta(algo(), cover_update); + update_definition(algo(), cover_update); if (cover_update.has_child()) { *child_update.mutable_custom() = cover_update.child(); } @@ -189,11 +197,14 @@ void orderman::CoverAlgo::init_hedge_template( me->hedge_template = &(algo.make_child_template(hedge_def)); } -void CoverAlgo::set_price_improvement_delta( +void CoverAlgo::update_definition( IBeforeLaunchAlgoServices &serv, api::orderman::CoverOrderDefinition const &cover) { me->price_improvement_delta = Price( securities::tick_size(serv.security()).value() * cover.hedge_ticks()); + me->cancel_hedges_on_cancel = cover.cancel_hedges_on_cancel(); + me->cancel_on_external_hedge_cancel = + cover.cancel_on_external_hedge_cancel(); } void CoverAlgo::check_terminate() { @@ -209,10 +220,10 @@ void CoverAlgo::check_terminate() { } } -IAlgoOrder::OnCancelResponse CoverAlgo::on_cancel() -{ - for (auto &k : me->hedges) - algo().detach_child(k); +IAlgoOrder::OnCancelResponse CoverAlgo::on_cancel() { + if (!me->cancel_hedges_on_cancel) + for (auto &k : me->hedges) + algo().detach_child(k); return IAlgoOrder::OnCancelResponse::HONOR; } diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h index 203f93e5c..24fb06cf5 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h @@ -26,7 +26,7 @@ private: std::unique_ptr me; IAlgoServices &algo() const; void - set_price_improvement_delta(IBeforeLaunchAlgoServices &, + update_definition(IBeforeLaunchAlgoServices &, api::orderman::CoverOrderDefinition const &); void init_hedge_template(IBeforeLaunchAlgoServices &, api::orderman::CustomOrderDefinition const &); From 69f61757c46fd072437e2e7112c615900e7bdeff Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 17 Jun 2019 09:47:02 -0400 Subject: [PATCH 69/86] Added API support for ladder visibility control. --- .../orderman/orders/algo/AlgoWrapperOrder.cpp | 16 +++++++++++++--- src/lib/orderman/orders/algo/AlgoWrapperOrder.h | 3 ++- src/lib/orderman/orders/algo/IAlgoServices.h | 7 +++++++ src/server/sparkd/cmds/QuickTest.cpp | 1 + 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index 950c619a3..c0e83266b 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -47,6 +47,7 @@ struct AlgoWrapperOrder::PImpl { OrderDefinition definition; const api::Security *security; OrderState const &state() const { return _state; } + OrderState &state() { return _state; } Map book_subs; Map children; @@ -167,7 +168,7 @@ void AlgoWrapperOrder::on_init_recovered( terminate(ORDER_STATUS_ERROR, "System restarted with active algo order"); return; - // Terminal states + // Terminal states case ORDER_STATUS_ERROR: case ORDER_STATUS_REJECTED_BY_SPARK: case ORDER_STATUS_COMPLETED: @@ -175,7 +176,7 @@ void AlgoWrapperOrder::on_init_recovered( terminate(rec.state().status(), rec.state().last_msg()); break; - // It should not be possible to reach these + // It should not be possible to reach these case ORDER_STATUS_DISCONNECTED: case ORDER_STATUS_INACTIVE: case OrderStatus_INT_MIN_SENTINEL_DO_NOT_USE_: @@ -298,7 +299,7 @@ orderman::OrderOpResult AlgoWrapperOrder::on_cancel() { cancel(); break; case IAlgoOrder::OnCancelResponse::IGNORE: - LOG(OrderMan,Info,"Algo order with key {} ignored cancel request", + LOG(OrderMan, Info, "Algo order with key {} ignored cancel request", key().value()); break; } @@ -501,6 +502,15 @@ void AlgoWrapperOrder::update_fill_state(Quantity q, Price p) { } } +void AlgoWrapperOrder::set_ladder_visibility(bool is_visible) { + if (!is_working()) + return; + + ReportStateGuard _(*this); + me->state().set_display_status(is_visible ? OrderState::VISIBLE + : OrderState::HIDDEN); +} + void AlgoWrapperOrder::cancel(std::string const &msg) { if (!is_working()) return; diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.h b/src/lib/orderman/orders/algo/AlgoWrapperOrder.h index ef36b638a..f11a84a23 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.h +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.h @@ -58,7 +58,8 @@ class AlgoWrapperOrder : public Order, void terminate_error(std::string const &msg) override; void complete() override; void update_fill_state(Quantity total_fills, Price last_price) override; - + void set_ladder_visibility (bool is_visibile) override; + // Private struct ReportStateGuard; struct ChildRecord; diff --git a/src/lib/orderman/orders/algo/IAlgoServices.h b/src/lib/orderman/orders/algo/IAlgoServices.h index 9d61c9282..4d9cd2f2f 100644 --- a/src/lib/orderman/orders/algo/IAlgoServices.h +++ b/src/lib/orderman/orders/algo/IAlgoServices.h @@ -80,6 +80,13 @@ class IAlgoServices : public IBeforeLaunchAlgoServices { // active children. virtual void complete() = 0; + // -------------------------------------------------------------- + // Algo State Update + // -------------------------------------------------------------- + + // Set wheter this algo instance should be displayed in the Spark UI ladder + virtual void set_ladder_visibility(bool is_visible) = 0; + // Update this algos's filled quantity and last price virtual void update_fill_state(Quantity total_fills, Price last_price) = 0; }; diff --git a/src/server/sparkd/cmds/QuickTest.cpp b/src/server/sparkd/cmds/QuickTest.cpp index ebc012dbe..f6f86be5a 100644 --- a/src/server/sparkd/cmds/QuickTest.cpp +++ b/src/server/sparkd/cmds/QuickTest.cpp @@ -46,6 +46,7 @@ struct Proxy : public IAlgoServices { void terminate_error(std::string const &) {} void complete() {} void update_fill_state(Quantity , Price ) {} + void set_ladder_visibility(bool) {} }; int QuickTest::execute(std::vector const &) { From 19dc7f8915455ddb953a2d90dedadd5d5f184256 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 17 Jun 2019 09:59:03 -0400 Subject: [PATCH 70/86] Fixed a bug in visibiliy control API and changed Join to hide itself --- src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp | 10 +++++++--- src/lib/orderman/orders/algo/algo_orders/JoinAlgo.cpp | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index c0e83266b..c3a483969 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -47,7 +47,6 @@ struct AlgoWrapperOrder::PImpl { OrderDefinition definition; const api::Security *security; OrderState const &state() const { return _state; } - OrderState &state() { return _state; } Map book_subs; Map children; @@ -94,6 +93,12 @@ struct AlgoWrapperOrder::PImpl { _state.set_avg_price(avg_price.value()); } + void set_ladder_visibility(bool is_visible) { + is_state_dirty = true; + _state.set_display_status(is_visible ? OrderState::VISIBLE + : OrderState::HIDDEN); + } + private: OrderState _state; }; @@ -507,8 +512,7 @@ void AlgoWrapperOrder::set_ladder_visibility(bool is_visible) { return; ReportStateGuard _(*this); - me->state().set_display_status(is_visible ? OrderState::VISIBLE - : OrderState::HIDDEN); + me->set_ladder_visibility(is_visible); } void AlgoWrapperOrder::cancel(std::string const &msg) { diff --git a/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.cpp index e85a07f6e..2264be4e7 100644 --- a/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/JoinAlgo.cpp @@ -153,6 +153,7 @@ void JoinAlgo::try_to_join() { child_update.set_price(my_side_psz.price()); child_update.set_quantity(algo().quantity().value()); algo().update_child(me->child_key, child_update); + algo().set_ladder_visibility(false); me->status = Status::JOINED; } else { LOG(OrderMan, Diag, From e8cccdb1c0f7ab33ee86f70e8db53f109e57b933 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 17 Jun 2019 10:15:52 -0400 Subject: [PATCH 71/86] Changed manual fills to show in day rather than SOD. --- src/server/sparkd/position/PositionServiceServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/sparkd/position/PositionServiceServer.cpp b/src/server/sparkd/position/PositionServiceServer.cpp index 6f4bfa843..116938572 100644 --- a/src/server/sparkd/position/PositionServiceServer.cpp +++ b/src/server/sparkd/position/PositionServiceServer.cpp @@ -97,7 +97,7 @@ bts::api::orderman::Fill PositionServiceServer::to_fill(bts::api::position::Manu result.set_last_price(src.price()); result.set_side(src.side()); result.set_last_shares(src.quantity()); - result.set_fill_kind(Fill::FILL_KIND_SOD); + result.set_fill_kind(Fill::FILL_KIND_STANDARD); result.set_fill_key(std::string("manual:")+std::to_string(src.record_id())); return result; } From fef5b4edaa47c09dbb0baa628902de66d02c8b75 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 17 Jun 2019 10:42:05 -0400 Subject: [PATCH 72/86] Updated release notes. --- doc/user/content/release_notes/_index.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 09b6c5ed3..d0b293803 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,12 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 2.3.0 +### User Visible Changes + - Changed cover order to continue even if hedgding child is canceled and detach from hedges if canceled +### API Changes + - Enhanced the API to allow algos to implement custom cancel handling + ## 2.2.0 ### User Visible Changes - Made our orders easier to spot in MBO display From 0f87973ee24dca701c2dc02a2d57e60dd55207ff Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 17 Jun 2019 10:53:22 -0400 Subject: [PATCH 73/86] Updated release notes. --- doc/user/content/release_notes/_index.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index d0b293803..f2575da24 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -7,6 +7,11 @@ insert_anchor_links = "right" ## 2.3.0 ### User Visible Changes - Changed cover order to continue even if hedgding child is canceled and detach from hedges if canceled + - Streamlined the mini order book as follows: + - We now only show exchange orders + - We now only display update buttons for orders that are under control of an algo with the update applying to the entire algo, not just the exchange order + - We can now select multiple rows to attach, detach, update or cancel multiple orders in a batch + - A checkbox column has been added to make clearer which rows are selected ### API Changes - Enhanced the API to allow algos to implement custom cancel handling From e7286e305da4e0ad86707f55c8faa4a0e6bbbeda Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 17 Jun 2019 10:57:33 -0400 Subject: [PATCH 74/86] Updated release notes. --- doc/user/content/release_notes/_index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index f2575da24..4dbe96aaf 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -14,6 +14,8 @@ insert_anchor_links = "right" - A checkbox column has been added to make clearer which rows are selected ### API Changes - Enhanced the API to allow algos to implement custom cancel handling +### Internal Changes + - Added system requirements to Spark documentation ## 2.2.0 ### User Visible Changes From b3bff8ecc38975f2dc94bbe66992b30bf0920fcd Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 17 Jun 2019 11:02:01 -0400 Subject: [PATCH 75/86] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 4dbe96aaf..f5a259f0a 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -7,6 +7,7 @@ insert_anchor_links = "right" ## 2.3.0 ### User Visible Changes - Changed cover order to continue even if hedgding child is canceled and detach from hedges if canceled + - Changed manual fills to appear in day PnL rather than in the SOD records - Streamlined the mini order book as follows: - We now only show exchange orders - We now only display update buttons for orders that are under control of an algo with the update applying to the entire algo, not just the exchange order From 219da9b22aab53c4805dd3febfc3dfd1f581b01f Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 17 Jun 2019 11:50:43 -0500 Subject: [PATCH 76/86] mini ob - select/unselect all checkbox in header --- .../Trading/OrderBook/OrderBookColumns.cs | 5 +++++ .../Trading/OrderBook/OrderBookRowVM.cs | 10 +++++++-- .../Modules/Trading/OrderBook/OrderBookVM.cs | 22 +++++++++++++++++-- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 77a5e18f8..c25faa1cf 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -730,6 +730,11 @@ namespace mbts.spark { id = key.ToString(); Width = 30; _checked_binding = new Binding(checked_property); + + var header_cb = new CheckBox(); + header_cb.ToolTip = "Select / Unselect All"; + header_cb.SetBinding(CheckBox.IsCheckedProperty, new Binding(nameof(OrderBookVM.all_rows_selected))); + this.Header = header_cb; } public override FrameworkElement view_factory() { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index c605a4630..497428632 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -27,14 +27,16 @@ namespace mbts.spark { // for mini-ob uint _prospective_quantity; double _prospective_price; + Action _on_selection_changed; - public OrderBookRowVM(OrderBookVM owner, OrderSecurity order_tuple, bool is_expanded) { + public OrderBookRowVM(OrderBookVM owner, OrderSecurity order_tuple, bool is_expanded, Action on_selection_changed) { _owner = owner; this.order_tuple = order_tuple; is_visible = !is_child; _is_expanded = is_expanded; prospective_quantity = this.quantity; prospective_price = this.price; + _on_selection_changed = on_selection_changed; } //// This takes care of the case where the OB has all rows visible @@ -118,7 +120,11 @@ namespace mbts.spark { public int depth_level { get => _depth_level; set => Set(ref _depth_level, value); } public bool is_selected { get => _is_selected; - set => Set(ref _is_selected, value); + set { + if (Set(ref _is_selected, value)) { + _on_selection_changed(value); + } + } } public uint prospective_quantity { get => _prospective_quantity; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index bb9da3e0d..de69cd377 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -56,7 +56,8 @@ namespace mbts.spark { bool _show_right_panel = OrderBookStartupData.Default.show_right_panel, _is_attaching_orders, - _is_row_collection_populated; + _is_row_collection_populated, + _all_rows_selected; IReadOnlyDictionary _cached_orders = DictionaryHelper.empty(); IReadOnlyDictionary _cached_attachable = DictionaryHelper.empty(), _cached_detachable = DictionaryHelper.empty(); HashSet @@ -99,7 +100,17 @@ namespace mbts.spark { // we use an ObservableAppendCollection b/c the mini-ob needs a cancel column at the front columns = new ObservableAppendCollection(_columns); _row_collection = new OperableHierarchicalCollection( - o => new OrderBookRowVM(this, o, rows_are_initially_expanded) { + o => new OrderBookRowVM(this, o, rows_are_initially_expanded, (row_is_selected) => { + // all are selected and one is checked off + if (all_rows_selected && !row_is_selected) { + _all_rows_selected = false; + RaisePropertyChanged(nameof(this.all_rows_selected)); + // not all selected and now the last one gets turned on + } else if (!all_rows_selected && _row_collection.All(r => r.is_selected)) { + _all_rows_selected = true; + RaisePropertyChanged(nameof(this.all_rows_selected)); + } + }) { is_attachable = _cached_attachable.TryGetValue(o.order.Key, out bool ia) && ia, is_detachable = _cached_detachable.TryGetValue(o.order.Key, out bool id) }, @@ -420,6 +431,13 @@ namespace mbts.spark { public bool can_attach_selected_orders => _can_attach_selected_orders.Value; public bool can_detach_selected_orders => _can_detach_selected_orders.Value; public Plurality security_plurality { get; private set; } + public bool all_rows_selected { + get => _all_rows_selected; + set { + Set(ref _all_rows_selected, value); + _row_collection.ForEach(r => r.is_selected = value); + } + } public IObservable subscribe_show_fills() => _show_fills.observe_current(true); public IObservable subscribe_show_ladder() => _show_ladder.observe_current(true); From e5d31d3c891e8ba817b98d3c56c22955e9d2f4ae Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 17 Jun 2019 12:58:21 -0400 Subject: [PATCH 77/86] match sparkdata discovery, remove use_onixs: false --- src/client/spark_test/system_test_scripts/delete_dbs.sh | 6 +++--- .../system_test_scripts/spreader_lean_qty_factor.sh | 6 +++--- .../system_test_scripts/spreader_simple_sanity.sh | 7 +++---- .../spark_test/system_test_scripts/test_join_algo.sh | 5 ----- .../spark_test/system_test_scripts/test_position_limits.sh | 7 +++---- 5 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/client/spark_test/system_test_scripts/delete_dbs.sh b/src/client/spark_test/system_test_scripts/delete_dbs.sh index dce0fd4f8..423cb3f23 100644 --- a/src/client/spark_test/system_test_scripts/delete_dbs.sh +++ b/src/client/spark_test/system_test_scripts/delete_dbs.sh @@ -1,10 +1,10 @@ #!/bin/bash -if [ -d ~/sparkdata/ ] +if [ -d /sparkdata/ ] then - sparkdata_dir=~/sparkdata -else sparkdata_dir=/sparkdata +else + sparkdata_dir=~/sparkdata fi if [ -d "$sparkdata_dir/data" ] diff --git a/src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh b/src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh index afe9e1e5f..dab656a08 100644 --- a/src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh +++ b/src/client/spark_test/system_test_scripts/spreader_lean_qty_factor.sh @@ -1,10 +1,10 @@ #!/bin/bash -if [ -d ~/sparkdata/ ] +if [ -d /sparkdata ] then - sparkdata_dir=~/sparkdata -else sparkdata_dir=/sparkdata +else + sparkdata_dir=~/sparkdata fi ./delete_dbs.sh diff --git a/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh b/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh index 2ca201c44..a79760e29 100644 --- a/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh +++ b/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh @@ -1,10 +1,10 @@ #!/bin/bash -if [ -d ~/sparkdata/ ] +if [ -d /sparkdata ] then - sparkdata_dir=~/sparkdata -else sparkdata_dir=/sparkdata +else + sparkdata_dir=~/sparkdata fi ./delete_dbs.sh @@ -28,7 +28,6 @@ cat << EOF > $sparkdata_dir/conf/spark.conf file { default_level: "Error" } } } - MarketDataConfig { value { use_onixs: false; } } EOF diff --git a/src/client/spark_test/system_test_scripts/test_join_algo.sh b/src/client/spark_test/system_test_scripts/test_join_algo.sh index 6eeb35b96..3f47db564 100644 --- a/src/client/spark_test/system_test_scripts/test_join_algo.sh +++ b/src/client/spark_test/system_test_scripts/test_join_algo.sh @@ -130,11 +130,6 @@ ExchangeSim { merge_with_md: false } } -MarketDataConfig { - value { - use_onixs: false; - } -} END_HEREDOC ) diff --git a/src/client/spark_test/system_test_scripts/test_position_limits.sh b/src/client/spark_test/system_test_scripts/test_position_limits.sh index edd0b1295..45837eab0 100644 --- a/src/client/spark_test/system_test_scripts/test_position_limits.sh +++ b/src/client/spark_test/system_test_scripts/test_position_limits.sh @@ -1,10 +1,10 @@ #!/bin/bash -if [ -d ~/sparkdata/ ] +if [ -d /sparkdata ] then - sparkdata_dir=~/sparkdata -else sparkdata_dir=/sparkdata +else + sparkdata_dir=~/sparkdata fi ./delete_dbs.sh @@ -28,7 +28,6 @@ cat << EOF > $sparkdata_dir/conf/spark.conf file { default_level: "Error" } } } - MarketDataConfig { value { use_onixs: false; } } EOF From 64e79212803080a61ca8f2e0319e3d9db95cbdb8 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 17 Jun 2019 13:07:16 -0400 Subject: [PATCH 78/86] Lean Algo hides its badge once it has fired --- src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp index 27a451aa2..cff48e2cf 100644 --- a/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/LeanAlgo.cpp @@ -329,8 +329,9 @@ void LeanAlgo::_udpate_out_price_qty(Price price, Quantity qty){ } bool LeanAlgo::_modify_price_price_qty(Price price, Quantity qty){ if(me->out_price.value()!=price.value() || - me->out_qty.value()!=qty.value()){ + me->out_qty.value()!=qty.value()){ _udpate_out_price_qty(price,qty); + bool first_cross = os::is_nan(me->cross_price.value()); me->cross_price = price; Update child_update; child_update.set_price(price.value()), @@ -340,6 +341,8 @@ bool LeanAlgo::_modify_price_price_qty(Price price, Quantity qty){ algo().order_key().value(),me->child_key, child_update.price(),child_update.quantity()); algo().update_child(me->child_key, child_update); + if(first_cross) + algo().set_ladder_visibility(false); return true; } return false; From cb0ec5f3b955679e53dff246ec55bffaf7bc7916 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Mon, 17 Jun 2019 13:08:59 -0400 Subject: [PATCH 79/86] match sparkdata discovery --- .../spark_test/system_test_scripts/test_clip_limits.sh | 7 +++---- .../spark_test/system_test_scripts/test_join_algo.sh | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/client/spark_test/system_test_scripts/test_clip_limits.sh b/src/client/spark_test/system_test_scripts/test_clip_limits.sh index f2f440124..542cbb399 100644 --- a/src/client/spark_test/system_test_scripts/test_clip_limits.sh +++ b/src/client/spark_test/system_test_scripts/test_clip_limits.sh @@ -1,10 +1,10 @@ #!/bin/bash -if [ -d ~/sparkdata/ ] +if [ -d /sparkdata/ ] then - sparkdata_dir=~/sparkdata -else sparkdata_dir=/sparkdata +else + sparkdata_dir=~/sparkdata fi ./delete_dbs.sh @@ -28,7 +28,6 @@ cat << EOF > $sparkdata_dir/conf/spark.conf file { default_level: "Error" } } } - MarketDataConfig { value { use_onixs: false; } } EOF nohup ./sparkd run & diff --git a/src/client/spark_test/system_test_scripts/test_join_algo.sh b/src/client/spark_test/system_test_scripts/test_join_algo.sh index 3f47db564..0aa24331e 100644 --- a/src/client/spark_test/system_test_scripts/test_join_algo.sh +++ b/src/client/spark_test/system_test_scripts/test_join_algo.sh @@ -5,11 +5,11 @@ # Stop script if unbound variable found (use ${var:-} if intentional) set -u -if [ -d ~/sparkdata/ ] +if [ -d /sparkdata/ ] then - sparkdata_dir=~/sparkdata -else sparkdata_dir=/sparkdata +else + sparkdata_dir=~/sparkdata fi # Use in the the functions: eval $invocation From 38db7b28e017ef81ec43d8fa08d010f1ba7df60f Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 17 Jun 2019 14:05:11 -0400 Subject: [PATCH 80/86] Updated manual test. --- testing/manual/positions_and_fills/PAndL.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testing/manual/positions_and_fills/PAndL.txt b/testing/manual/positions_and_fills/PAndL.txt index cbbbb6624..ba51139aa 100644 --- a/testing/manual/positions_and_fills/PAndL.txt +++ b/testing/manual/positions_and_fills/PAndL.txt @@ -128,14 +128,14 @@ Buy a 1 lot at the current bid in ACCA via Trading -> Manual Fills Click OK to state the fill Click the Save icon to publish it out - The manual fill will be published as part of the SOD so ACC A should reflect as follows: + The manual fill will be published as part of the Day PnL so ACC A should reflect as follows: ACC A: - Start Net Pos 0 - Start PnL 0.00 + Start Net Pos -1 (no change) + Start PnL -37.5 Day Long 0 - Day Short 1 - Day PnL -37.5 + Day Short 0 + Day PnL 0 Total Net Pos -1 Total PnL -37.5 PnL Price 14.0125 (displayed as 14.015) From 81167007370efd6d310fc65bfdd9ed2e9fa93e52 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 17 Jun 2019 14:31:39 -0400 Subject: [PATCH 81/86] Updated release notes. --- doc/user/content/release_notes/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index f5a259f0a..6b744d6a3 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -8,6 +8,7 @@ insert_anchor_links = "right" ### User Visible Changes - Changed cover order to continue even if hedgding child is canceled and detach from hedges if canceled - Changed manual fills to appear in day PnL rather than in the SOD records + - Add buy/sell coloring to fill rows in fills window - Streamlined the mini order book as follows: - We now only show exchange orders - We now only display update buttons for orders that are under control of an algo with the update applying to the entire algo, not just the exchange order From 09ed017bf2dae6d8f9a444352cacc37aaf7480a4 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 18 Jun 2019 07:52:55 -0500 Subject: [PATCH 82/86] BTSColors - no need to explicity freeze when we have an implicit operator that can do so, thx Eric --- src/client/spark/core/FontsAndColors/BTSColors.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/client/spark/core/FontsAndColors/BTSColors.cs b/src/client/spark/core/FontsAndColors/BTSColors.cs index 630d071a7..f1fa88503 100644 --- a/src/client/spark/core/FontsAndColors/BTSColors.cs +++ b/src/client/spark/core/FontsAndColors/BTSColors.cs @@ -6,6 +6,8 @@ namespace mbts.ui { // Value = "{mbts:BTSColor X.y}" // Some colos are also available as static resources in colors.xaml public static class BTSColors { + // 84 = 255 * 0.33 + const byte _one_third_opacity_strength = 84; static Brush _header_brush, _header_text_brush, _header_alternate_brush, _header_error_text_brush; static BTSColors() { @@ -21,10 +23,6 @@ namespace mbts.ui { brush.Freeze(); } - public static void create_frozen_brush(BTSColor color, double opacity, out Brush brush) { - (brush = new SolidColorBrush(color) { Opacity = opacity }).Freeze(); - } - [DisplayInfo(name = "Default Header")] public static BTSColor header { get { return BTSCoreColors.base_blue; } } public static Brush header_brush { get { return _header_brush; } } @@ -85,9 +83,8 @@ namespace mbts.ui { ask = BTSCoreColors.red_darker; _init_brush(bid, out _bid_brush); _init_brush(ask, out _ask_brush); - create_frozen_brush(BTSColors.MarketData.bid, 0.33, out _semi_transparent_bid_brush); - create_frozen_brush(BTSColors.MarketData.ask, 0.33, out _semi_transparent_ask_brush); - + _semi_transparent_bid_brush = new BTSColor(_one_third_opacity_strength, BTSColors.MarketData.bid); + _semi_transparent_ask_brush = new BTSColor(_one_third_opacity_strength, BTSColors.MarketData.ask); } // Base Colors [DisplayInfo(name = "Market Data")] From 98006a07e81a89c70941719303d946d3c191d381 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 18 Jun 2019 08:04:15 -0500 Subject: [PATCH 83/86] PR - refactoring - eliminating init_brush in favor of implicit BTSColor to frozen Brush operator --- .../spark/core/FontsAndColors/BTSColors.cs | 34 ++++++++----------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/src/client/spark/core/FontsAndColors/BTSColors.cs b/src/client/spark/core/FontsAndColors/BTSColors.cs index f1fa88503..06b18318c 100644 --- a/src/client/spark/core/FontsAndColors/BTSColors.cs +++ b/src/client/spark/core/FontsAndColors/BTSColors.cs @@ -11,16 +11,10 @@ namespace mbts.ui { 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); - _init_brush(header_alternate, out _header_alternate_brush); - _init_brush(header_error_text, out _header_error_text_brush); - } - - // freezing brushes makes them thread-safe - static void _init_brush(BTSColor color, out Brush brush) { - brush = color; - brush.Freeze(); + _header_brush = header; + _header_text_brush = header_text; + _header_alternate_brush = header_alternate; + _header_error_text_brush = header_error_text; } [DisplayInfo(name = "Default Header")] @@ -81,8 +75,8 @@ 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; - _init_brush(bid, out _bid_brush); - _init_brush(ask, out _ask_brush); + _bid_brush = bid; + _ask_brush = ask; _semi_transparent_bid_brush = new BTSColor(_one_third_opacity_strength, BTSColors.MarketData.bid); _semi_transparent_ask_brush = new BTSColor(_one_third_opacity_strength, BTSColors.MarketData.ask); } @@ -172,14 +166,14 @@ namespace mbts.ui { static Orders() { - _init_brush(_sent, out sent_brush); - _init_brush(filled_dark, out filled_dark_brush); - _init_brush(working_cancel, out working_cancel_brush); - _init_brush(working_order_background, out working_order_background_brush); - _init_brush(completed_order_background, out completed_order_background_brush); - _init_brush(error_order_background, out error_order_background_brush); - _init_brush(canceled_order_background, out canceled_order_background_brush); - _init_brush(modified, out modified_brush); + sent_brush = _sent; + filled_dark_brush = filled_dark; + working_cancel_brush = working_cancel; + working_order_background_brush = working_order_background; + completed_order_background_brush = completed_order_background; + error_order_background_brush = error_order_background; + canceled_order_background_brush = canceled_order_background; + modified_brush = modified; } // Base Colors From 0b5d2bd4dc0911b53f962190b99e3cce418fc249 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 18 Jun 2019 09:58:08 -0400 Subject: [PATCH 84/86] Fix null security Id --- src/client/spark_test/System/LimitsTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark_test/System/LimitsTests.cs b/src/client/spark_test/System/LimitsTests.cs index 72d19b9cf..53465d4d6 100644 --- a/src/client/spark_test/System/LimitsTests.cs +++ b/src/client/spark_test/System/LimitsTests.cs @@ -234,8 +234,8 @@ namespace bts.tests //create Orders Here var all = await all_futures(test_symbol); - SecurityImmutable? sec = all.FirstOrDefault(); - Assert.IsTrue(sec.HasValue); + SecurityImmutable? sec = all.TryFirst(); + Assert.IsTrue(sec.HasValue, "No Futures?"); uint under_limit_order_key; uint over_limit_order_key; From c2788e4d615422b4d56bbf26637253e279551dc3 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 18 Jun 2019 09:58:54 -0400 Subject: [PATCH 85/86] Harden wait_for_orders_service_ready --- src/client/spark_test/Utils/TestUtils.cs | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/client/spark_test/Utils/TestUtils.cs b/src/client/spark_test/Utils/TestUtils.cs index 1901f67dd..c0d099b97 100644 --- a/src/client/spark_test/Utils/TestUtils.cs +++ b/src/client/spark_test/Utils/TestUtils.cs @@ -131,7 +131,27 @@ namespace bts.tests.utils { System.Diagnostics.Stopwatch watch = new System.Diagnostics.Stopwatch(); watch.Start(); - var odef = OrderDefinitionUtilities.create_limit_order_def(1, Side.Buy, ("bts", 1), ("ACC A", 1)); + var ctx = new ServiceContext(); + var mdrelay = ctx.locate(); + + bts.co2.ProductListReply products = null; + + for(int i = 0; i < 10; i++) { + var tmpp = await mdrelay.request_products_async(null); + if( tmpp.value != null) { + Console.WriteLine(i); + products = tmpp.value; + break; + } + } + + bts.test.Assert.IsTrue(products != null, "No products found"); + var filtered_products = products.Products.Where(z => z.Exchange == Venue.Sim && z.Type == SecurityType.Future); + bts.test.Assert.IsTrue(filtered_products.Count() > 0, "No suitable products found"); + var test_security = await MarketDataUtilities.get_security(mdrelay, filtered_products.First().Symbol, SecurityType.Future, f => true); + bts.test.Assert.IsTrue(test_security.HasValue, "No suitable security found"); + + var odef = OrderDefinitionUtilities.create_limit_order_def(test_security.Value.Id, Side.Buy, ("ACC A", 1), ("bts", 1)); Update service_value = null; while(service_value == null && watch.Elapsed < timeout) { From fd0e1dfb0ecefbe0f2473be754f585ce1e0964c0 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 18 Jun 2019 12:01:09 -0400 Subject: [PATCH 86/86] Updated release notes. --- doc/user/content/release_notes/_index.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 6b744d6a3..4736992cd 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -7,6 +7,7 @@ insert_anchor_links = "right" ## 2.3.0 ### User Visible Changes - Changed cover order to continue even if hedgding child is canceled and detach from hedges if canceled + - Changed Lean and Join algos to hide themselves in the ladder once they are triggered - Changed manual fills to appear in day PnL rather than in the SOD records - Add buy/sell coloring to fill rows in fills window - Streamlined the mini order book as follows: @@ -16,6 +17,7 @@ insert_anchor_links = "right" - A checkbox column has been added to make clearer which rows are selected ### API Changes - Enhanced the API to allow algos to implement custom cancel handling + - Allowed algos to control their visibility in the ladder through the API ### Internal Changes - Added system requirements to Spark documentation @@ -367,7 +369,7 @@ insert_anchor_links = "right" - This is configurable from a ladder's settings as well ### Customized settings in all windows - All windows now contain a settings page where grid settings (font color, size, etc) are applied - - These settings can be saved on a per-window basis or as a Default for newly-launched windows + - These settings can be saved on a per-window basis or as a Default for newly-launched windows ## 1.3.1 Through 1.3.4