diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 3b1adae92..c9e1cfa62 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,28 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 2.15.0 +### User Visible Changes + - Added ability to hide Ladder status messages via Ladder Settings -> Left Panel tab -> Show/Hide groupbox -> Status Message + - Synthetic cloning now allows for any parameter to be changed, including tick size and leg contracts + - Added ability to import synthetics from a CSV file; see our manual for further details on this process + - Reduced Iceberg reloading latency +### Bug Fixes + - Fixed a bug where highlighted fills could lose their highlight status + - Fixed a bug where the (Mini) OrderBook PIQ could be displaying an old value + +## 2.14.3 +### Bug Fixes + - Fixed a bug regarding ICE logon messaging + +## 2.14.2 +### Bug Fixes + - Fixed a bug regarding ICE messaging + +## 2.14.1 +### Bug Fixes + - Fixed a bug regarding ICE logon authentication + ## 2.14.0 ### User Visible Changes - All ladders can now be recentered by (shift or alt) + double clicking over the Price column in a ladder diff --git a/src/client/spark/Daemons/DeleteSyntheticDaemon.cs b/src/client/spark/Daemons/DeleteSyntheticDaemon.cs index 52819f4e3..e9f0758d7 100644 --- a/src/client/spark/Daemons/DeleteSyntheticDaemon.cs +++ b/src/client/spark/Daemons/DeleteSyntheticDaemon.cs @@ -4,43 +4,112 @@ using mbts; using mbts.spark; using mbts.ui; using System; +using System.Collections.Generic; +using System.Collections.Immutable; using System.ComponentModel.Composition; using System.Linq; using System.Reactive.Linq; +using System.Threading; +using System.Windows; namespace bts { [Export, Export(typeof(IShellDaemon))] class DeleteSyntheticDaemon : IShellDaemon, IDisposable { + // request_id is noted in the series of log messages that occur during a particular delete op. + static int _request_id = 1; + readonly OrdersModel _orders_model; readonly ErrorReporter _error_reporter; + IReadOnlyDictionary _strategy_map = + DictionaryHelper.empty(); + IDisposable _dispose; [ImportingConstructor] public DeleteSyntheticDaemon(IBus bus, OrdersModel orders_model, ErrorReporter error_reporter) { _orders_model = orders_model; _error_reporter = error_reporter; - _dispose = bus.subscribe(SparkTags.SyntheticDeleteTag) - .OnDispatcher() - .Subscribe(_delete_synthetic); + _dispose = Disposable.Create( + bus.subscribe(SparkTags.SyntheticDeleteTag).Subscribe(_delete_synthetic), + orders_model.spreader.strategy.Subscribe(map => _strategy_map = map)); } public void Dispose() => Disposable.dispose(ref _dispose); - async void _delete_synthetic(uint id) { - var (orders, orders_success) = await _orders_model.on_orders.FirstAsyncTask(SparkUtils.DefaultTimeOut); + async void _delete_synthetic(IImmutableSet keys) { + var log = new LoggerContext(Log.Ui, $"Synthetic Delete Req {unchecked(Interlocked.Increment(ref _request_id))} - ", null); + if (keys.is_null_or_empty()) { + log.warn("received empty delete request (no securities specified)."); + return; + } + log.info($"received request to delete the following {keys.Count} securities: {string.Join(", ", keys)}"); + var (orders, orders_success) = await _orders_model.security_order_groups.FirstAsyncTask(SparkUtils.DefaultTimeOut); if (!orders_success) { - _error_reporter.report_error($"Unable to delete synthetic security ({id}): unable to determine whether or not security ({id}) has working orders (deletion is not permitted while there are working orders)."); - Log.Ui.warn($"Ignoring request to delete synthetic security ({id}) because the orders lookup timed out (must confirm no working orders)."); - } else if (orders.state.Values.Any(o => o.order.Def.SecurityKey == id && o.order.is_non_terminal())) { - Log.Ui.warn($"Ignoring request to delete synthetic security ({id}) because non-terminal-orders were detected."); + var msg = "Unable to delete synthetic securities: " + + $"timed out waiting for orders table (must verify that a synthetic security does not have any working orders before it can be deleted)."; + _error_reporter.report_error(msg); + log.warn(msg); } else { - ExecutionStrategyImmutable? strategy = await _orders_model.spreader.lookup_strategy_async(id); - if (strategy.HasValue) { - ExecutionStrategyImmutable deleted_strategy = strategy.Value.with(deleted: true); - await _orders_model.spreader.save_strategy(id, deleted_strategy); + var working_orders = new List(); + var missing_strategies = new List(); + var items = new List<(uint key, ExecutionStrategyImmutable strategy)>(); + var temp_strats = _strategy_map; + foreach (var k in keys) { + if (orders.state.TryGetValue(k, out var sec_group) && sec_group.table.state.Values.Any(tup => tup.order.is_active())) { + working_orders.Add(k); + } else if (!temp_strats.TryGetValue(k, out var strat)) { + missing_strategies.Add(k); + } else { + items.Add((k, strat.with(deleted: true))); + } } + var lines = new List(); + if (working_orders.Count > 0) { + lines.Add($"skipping {working_orders.Count} securities because they have working orders."); + } + if (missing_strategies.Count > 0) { + lines.Add($"skipping {missing_strategies.Count} securities because their execution strategies were not discovered."); + } + if (lines.Count > 0) + log.warn(string.Join("; ", lines)); + var errors = await _orders_model.spreader.save_strategies(items); + int error_count = errors.Count(e => !string.IsNullOrEmpty(e)); + log.info($"{items.Count - error_count}/{items.Count} attempted deletes were successful (skipped {working_orders.Count + missing_strategies.Count})."); + // display results to user + const string dialog_title = "Synthetic Deletion"; + string display_msg; + MessageBoxImage icon = MessageBoxImage.None; + if (keys.Count > 1) { + if (error_count == 0 && working_orders.Count == 0 && missing_strategies.Count == 0) { + display_msg = $"Synthetic securities have been deleted."; + icon = MessageBoxImage.Information; + } else { + display_msg = $"{keys.Count - error_count - working_orders.Count - missing_strategies.Count}/{keys.Count} securities were successfully deleted."; + icon = MessageBoxImage.Error; + } + } else { + if (error_count == 0 && working_orders.Count == 0 && missing_strategies.Count == 0) { + display_msg = "Synthetic security has been deleted."; + icon = MessageBoxImage.Information; + } else { + string reason; + if (error_count > 0) { + reason = errors[0]; + } else if (missing_strategies.Count > 0) { + reason = "did not find execution strategy."; + } else if (working_orders.Count > 0) { + reason = "working orders detected."; + } else { + // unexpected code path + reason = "unknown error."; + } + icon = MessageBoxImage.Error; + display_msg = $"Unable to delete synthetic security: " + reason; + } + } + BTSMessageBox.Show(display_msg, dialog_title, BTSMessageBoxButtons.OK, icon); } } } -} \ No newline at end of file +} diff --git a/src/client/spark/Daemons/ErrorReporter.cs b/src/client/spark/Daemons/ErrorReporter.cs index e2a7b462b..f14d9e76b 100644 --- a/src/client/spark/Daemons/ErrorReporter.cs +++ b/src/client/spark/Daemons/ErrorReporter.cs @@ -1,12 +1,15 @@ using bts.api; using bts.api.core; using bts.support; +using bts.utils; using mbts; using mbts.spark; using mbts.ui; using System; +using System.Collections.Generic; using System.ComponentModel.Composition; using System.Reactive.Linq; +using System.Text; using System.Threading.Tasks; using System.Windows; using System.Windows.Threading; @@ -164,5 +167,45 @@ namespace bts.spark { void _report_error(string msg) => error_reporter.report_error($"Error {desc}: {msg}", AlgoStudioWindow.NAME, MessageBoxImage.Warning); } + + public static async Task<(TResult result, string error_msg)[]> safe_execute_batch( + this ErrorReporter error_reporter, + IEnumerable> execute, + Func result_selector, + string desc, + string title) { + // + try { + var results = await Task.WhenAll(execute as Task[] ?? ArrayHelper.clone_optimized(execute)); + var result_values = new (TResult, string)[results.Length]; + StringBuilder error_bd = null; + for (int i = 0; i < results.Length; i++) { + var r = results[i]; + var (result, error) = result_selector(r); + if (!string.IsNullOrEmpty(error)) { + if (error_bd == null) { + error_bd = new StringBuilder(); + } else { + error_bd.AppendLine(); + } + error_bd.Append(error); + } + result_values[i] = (result, error); + } + if (error_bd != null) { + var error_msg = error_bd.ToString(); + if (!string.IsNullOrEmpty(error_msg)) + _report_error(error_msg); + } + return result_values; + } + catch (Exception ex) { + _report_error(ex.ToString()); + } + return null; + // + void _report_error(string msg) => + error_reporter.report_error($"Error {desc}: {msg}", title, MessageBoxImage.Warning); + } } -} \ No newline at end of file +} diff --git a/src/client/spark/Daemons/MDDaemon.cs b/src/client/spark/Daemons/MDDaemon.cs index b6bcfa70b..ea0bdfe9b 100644 --- a/src/client/spark/Daemons/MDDaemon.cs +++ b/src/client/spark/Daemons/MDDaemon.cs @@ -39,7 +39,7 @@ namespace bts { _relay.set_token(_token.Value); _dispose.Add( _ss.Value.subscribei_metadata() - .Select(upd => upd.all.ToDictionary(i => i.SecurityKey, i => i.Strategy)) + .Select(upd => upd.all.Where(i => i.HasStrategy).ToDictionary(i => i.SecurityKey, i => i.Strategy)) .Subscribe(t => { var deleted_synthetic_keys = new HashSet(t.Where(kv => kv.Value.Deleted).Select(kv => kv.Key)); // add back 'undeleted' synthetics @@ -64,4 +64,4 @@ namespace bts { Task.Run(run); } } -} \ No newline at end of file +} diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs index aef0d6142..4223bde21 100644 --- a/src/client/spark/Images/Icons.cs +++ b/src/client/spark/Images/Icons.cs @@ -1,4 +1,5 @@ using bts; +using mbts.ui.dpi; using System; using System.Collections.Generic; using System.Linq; @@ -55,7 +56,9 @@ namespace mbts.ui { StarGeometryKey = nameof(StarGeometryKey), ToolsGeometryKey = nameof(ToolsGeometryKey), TrashGeometryKey = nameof(TrashGeometryKey), - UndoCircularGeometryKey = nameof(UndoCircularGeometryKey); + UndoCircularGeometryKey = nameof(UndoCircularGeometryKey), + WarningExclamationGeometryKey = nameof(WarningExclamationGeometryKey), + WarningGeometryKey = nameof(WarningGeometryKey); public static Geometry PlayGeometry => Geometry.Parse(get_geometric_path(PlayGeometryKey).FirstOrDefault() ?? string.Empty); @@ -190,6 +193,8 @@ namespace mbts.ui { public static ImageSource Tetris { get { return load_resource_and_freeze("Tetris"); } } public static ImageSource Tools => create_icon(ToolsGeometryKey); public static ImageSource Trash => create_icon(TrashGeometryKey); + public static ImageSource Warning => create_icon(WarningGeometryKey, Brushes.IndianRed); + public static ImageSource WarningExclamation => create_icon(WarningExclamationGeometryKey, Brushes.IndianRed); public static ImageSource UndoCircular => create_icon(UndoCircularGeometryKey); public static ImageSource ViewSettings => load_resource_and_freeze("ViewSettings"); public static ImageSource Wrench { get { return load_resource_and_freeze("Wrench"); } } diff --git a/src/client/spark/Images/Vector/Icons.xaml b/src/client/spark/Images/Vector/Icons.xaml index 650c43eb0..3b4f882f6 100644 --- a/src/client/spark/Images/Vector/Icons.xaml +++ b/src/client/spark/Images/Vector/Icons.xaml @@ -363,6 +363,18 @@ c-84.15,0-153-68.85-153-153h-51c0,112.2,91.8,204,204,204s204-91.8,204-204S360.825,89.25,248.625,89.25z + + M15.998999,17.988002C16.551,17.988002 16.999,18.437009 16.999,18.990018 16.999,19.543027 16.551,19.992034 15.998999,19.992034 15.446999,19.992034 14.998999,19.543027 14.998999,18.990018 14.998999,18.437009 15.446999,17.988002 15.998999,17.988002z + M15.998999,8.0630169C16.552,8.0630169,16.999,8.5110159,16.999,9.0650149L16.999,16.167001C16.999,16.721 16.552,17.168998 15.998999,17.168998 15.446,17.168998 14.998999,16.721 14.998999,16.167001L14.998999,9.0650149C14.998999,8.5110159,15.446,8.0630169,15.998999,8.0630169z + + + + M15.998999,17.988002C16.551,17.988002 16.999,18.437009 16.999,18.990018 16.999,19.543027 16.551,19.992034 15.998999,19.992034 15.446999,19.992034 14.998999,19.543027 14.998999,18.990018 14.998999,18.437009 15.446999,17.988002 15.998999,17.988002z + M15.998999,8.0630169C16.552,8.0630169,16.999,8.5110159,16.999,9.0650149L16.999,16.167001C16.999,16.721 16.552,17.168998 15.998999,17.168998 15.446,17.168998 14.998999,16.721 14.998999,16.167001L14.998999,9.0650149C14.998999,8.5110159,15.446,8.0630169,15.998999,8.0630169z + M15.999277,2.3337629L2.3830507,22.996989 29.615442,22.996989z + M15.999513,0C16.50052,-3.8678991E-07,17.001274,0.21826346,17.288297,0.65479128L31.74151,22.585975C32.057495,23.064982 32.084472,23.677966 31.812494,24.184989 31.541494,24.687009 31.02049,24.999999 30.450475,24.999999L1.5480773,24.999999C0.97903845,24.999999 0.45705819,24.687009 0.18703459,24.184989 -0.085979476,23.677966 -0.057963934,23.064982 0.25704309,22.585975L14.709219,0.65479128C14.997247,0.21826346,15.498506,-3.8678991E-07,15.999513,0z + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/client/spark/Modules/Spreader/Import/SyntheticImportConflictsView.xaml.cs b/src/client/spark/Modules/Spreader/Import/SyntheticImportConflictsView.xaml.cs new file mode 100644 index 000000000..0d2bbd6d9 --- /dev/null +++ b/src/client/spark/Modules/Spreader/Import/SyntheticImportConflictsView.xaml.cs @@ -0,0 +1,20 @@ +using System.Windows.Controls; + +namespace bts.shell.spreader { + enum SyntheticContractComponent { + Name, + TickSize, + Security, + PriceMultiplier, + Quantity, + LegType + } + + /// + /// Interaction logic for SyntheticImportConflictsView.xaml + /// + partial class SyntheticImportConflictsView : UserControl { + public SyntheticImportConflictsView() => + InitializeComponent(); + } +} diff --git a/src/client/spark/Modules/Spreader/Import/SyntheticImportDialog.xaml b/src/client/spark/Modules/Spreader/Import/SyntheticImportDialog.xaml new file mode 100644 index 000000000..b904ca775 --- /dev/null +++ b/src/client/spark/Modules/Spreader/Import/SyntheticImportDialog.xaml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/client/spark/Modules/Spreader/Import/SyntheticImportDialog.xaml.cs b/src/client/spark/Modules/Spreader/Import/SyntheticImportDialog.xaml.cs new file mode 100644 index 000000000..917de1574 --- /dev/null +++ b/src/client/spark/Modules/Spreader/Import/SyntheticImportDialog.xaml.cs @@ -0,0 +1,11 @@ +using System.Windows; + +namespace bts.shell.spreader { + /// + /// Interaction logic for SyntheticImportDialog.xaml + /// + partial class SyntheticImportDialog : Window { + public SyntheticImportDialog() => + InitializeComponent(); + } +} diff --git a/src/client/spark/Modules/Spreader/Import/SyntheticImportRowCollectionView.cs b/src/client/spark/Modules/Spreader/Import/SyntheticImportRowCollectionView.cs new file mode 100644 index 000000000..6b1b7813f --- /dev/null +++ b/src/client/spark/Modules/Spreader/Import/SyntheticImportRowCollectionView.cs @@ -0,0 +1,236 @@ +using mbts; +using mbts.ui; +using mbts.ui.shell; +using mbts.ui.utility; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Collections.Specialized; +using System.ComponentModel; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Windows.Data; + +namespace bts.shell.spreader { + class SyntheticImportRowCollectionView : ListCollectionView { + ReadOnlyObservableCollection _base_groups, _groups_wrapper; + ObservableAutoWrapper _groups; + + public SyntheticImportRowCollectionView(IList list) + : base(list) { } + + public override bool CanGroup => true; + + // Must return null if there are no GroupDescriptions (i.e., instead of an empty collection). + // If an empty collection is returned, the view assumes grouping is active and there are no items. + public override ReadOnlyObservableCollection Groups { + get { + if ((GroupDescriptions?.Count ?? 0) == 0) + return null; + if (_groups_wrapper == null) { + _base_groups = base.Groups; + if (_base_groups == null) + return null; + _groups = new ObservableAutoWrapper(_base_groups, obj => new SyntheticImportRowCollectionViewGroup((CollectionViewGroup)obj, this)); + _groups_wrapper = new ReadOnlyObservableCollection(_groups); + } + return _groups_wrapper; + } + } + + public void set_all_expanded(bool is_expanded) { + foreach (var g in Groups.OfTypeSafe()) + g.set_all_expanded(is_expanded); + } + } + + class SyntheticImportRowCollectionViewGroup : CollectionViewGroup, INotifyDataErrorInfo, IRaiseNotifyPropertyChanged, IEquatable { + static readonly string _desc_delim = ", "; + readonly SyntheticImportRowCollectionView _root; + readonly CollectionViewGroup _from; + readonly Dictionary _inner_groups = new Dictionary(); + readonly Dictionary _rows = new Dictionary(); + string + _leg_type_desc, + _security_desc, + _quantity_desc, + _price_multiplier_desc; + + IDisposable _dispose; + bool _is_expanded; + + public SyntheticImportRowCollectionViewGroup(CollectionViewGroup from, SyntheticImportRowCollectionView root) : base(from.Name) { + _root = root; + _from = from; + ((INotifyCollectionChanged)_from.Items).CollectionChanged += _from_items_CollectionChanged; + _from_items_CollectionChanged(_from.Items, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, _from.Items, 0)); + } + + public event Action ProtectedItemCountChanged; + public event EventHandler ErrorsChanged; + + public override bool IsBottomLevel => _from.IsBottomLevel; + public bool is_expanded { get => _is_expanded; set => _set(ref _is_expanded, value); } + public int level => parent == null ? 1 : parent.level + 1; + public SyntheticImportRowCollectionViewGroup parent { get; private set; } + // leg type desc + public string leg_type_desc => + _leg_type_desc ?? (_leg_type_desc = string.Join(_desc_delim, ProtectedItems.OfType().Select(l => l.leg_type.display_name()))); + // price multiplier desc + public string price_multiplier_desc => + _price_multiplier_desc ?? (_price_multiplier_desc = string.Join(_desc_delim, ProtectedItems.OfType().Select(l => l.price_multiplier))); + // quantity desc + public string quantity_desc => + _quantity_desc ?? (_quantity_desc = string.Join(_desc_delim, ProtectedItems.OfType().Select(l => l.quantity))); + // security desc + public string security_desc => + _security_desc ?? (_security_desc = string.Join(_desc_delim, ProtectedItems.OfType().Select(l => l.security?.ToString() ?? "?").ExceptNull()).if_null_or_empty("(No Legs)")); + + new int ProtectedItemCount { + get => base.ProtectedItemCount; + set { + if (base.ProtectedItemCount != value) { + base.ProtectedItemCount = value; + ProtectedItemCountChanged?.Invoke(); + } + } + } + + public bool HasErrors => Items.OfType().Any(l => l.HasErrors); + public IEnumerable GetErrors(string propertyName) => + propertyName == nameof(Items) ? + Items.OfType().SelectMany(l => l.AllErrors) : + Enumerable.Empty(); + + public void set_all_expanded(bool is_expanded) { + this.is_expanded = is_expanded; + foreach (var g in Items.OfTypeSafe()) + g.set_all_expanded(is_expanded); + } + + public bool Equals(SyntheticImportRowCollectionViewGroup other) => + other != null && + level == other.level && + Equals(Name, other.Name); + + void IRaiseNotifyPropertyChanged.raise_notify_property_changed(string prop) => + OnPropertyChanged(new PropertyChangedEventArgs(prop)); + + void _add_item(int index, object item) { + Log.assert(index >= 0, "Index is less than 0."); + if (item is CollectionViewGroup group) { + var inner_group = new SyntheticImportRowCollectionViewGroup(group, _root); + _inner_groups.Add(group.Name, new InnerGroupSubscription(this, inner_group)); + ProtectedItems.Insert(index, inner_group); + } else { + var row = (ContractLegVM)item; + if (_rows.TryPopValue(row.id, out var sub)) + sub.Dispose(); + _rows[row.id] = _connect_row(row); + ProtectedItems.Insert(index, item); + } + } + + void _remove_item(int index, object item) { + if (item is SyntheticImportRowCollectionViewGroup inner_group) { + if (!_inner_groups.TryPopValue(inner_group.Name, out var ig_sub)) + throw new InvalidOperationException($"Inner groups cache does not have an entry for the specified name '{inner_group.Name}' (entire tree structure may be compromised)."); + ig_sub.Dispose(); + Disposable.dispose(ref inner_group._dispose); + } + ProtectedItems.RemoveAt(index); + } + + void _from_items_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) { + switch (e.Action) { + case NotifyCollectionChangedAction.Add: + for (int i = 0; i < e.NewItems.Count; i++) + _add_item(e.NewStartingIndex + i, e.NewItems[i]); + break; + case NotifyCollectionChangedAction.Remove: + for (int i = 0; i < e.OldItems.Count; i++) + _remove_item(e.OldStartingIndex, ProtectedItems[e.OldStartingIndex]); + break; + case NotifyCollectionChangedAction.Replace: + for (int i = 0; i < e.OldItems.Count; i++) + _remove_item(e.OldStartingIndex, ProtectedItems[e.OldStartingIndex]); + for (int i = 0; i < e.NewItems.Count; i++) + _add_item(e.NewStartingIndex + i, e.NewItems[i]); + break; + case NotifyCollectionChangedAction.Reset: + while (ProtectedItems.Count > 0) + _remove_item(0, ProtectedItems[0]); + for (int i = 0; i < _from.Items.Count; i++) + _add_item(i, _from.Items[i]); + break; + } + } + + void _invalidate_props(params string[] props) { + for (int i = 0; i < props.Length; i++) + OnPropertyChanged(new PropertyChangedEventArgs(props[i])); + } + + void _set(ref T backing, T new_value, [CallerMemberName]string prop = "") => + _set(ref backing, new_value, EqualityComparer.Default, prop); + + void _set(ref T backing, T new_value, IEqualityComparer comparer, [CallerMemberName]string prop = "") { + if (!comparer.Equals(backing, new_value)) { + backing = new_value; + OnPropertyChanged(new PropertyChangedEventArgs(prop)); + } + } + + IDisposable _connect_row(ContractLegVM row) { + row.result_changed += on_result_changed; + row.ErrorsChanged += on_errors_changed; + return Disposable.Create(() => { + row.result_changed -= on_result_changed; + row.ErrorsChanged -= on_errors_changed; + }); + void on_result_changed() { + _security_desc = null; + _price_multiplier_desc = null; + _quantity_desc = null; + _leg_type_desc = null; + _invalidate_props(nameof(security_desc), nameof(price_multiplier_desc), nameof(quantity_desc), nameof(leg_type_desc)); + } + void on_errors_changed(object sender, DataErrorsChangedEventArgs e) => + ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Items))); + } + + class InnerGroupSubscription : IDisposable { + public readonly SyntheticImportRowCollectionViewGroup _inner_group; + readonly SyntheticImportRowCollectionViewGroup _parent; + int _last_count; + + public InnerGroupSubscription(SyntheticImportRowCollectionViewGroup parent, SyntheticImportRowCollectionViewGroup inner_group) { + _parent = parent; + _inner_group = inner_group; + _inner_group.parent = parent; + // init item count + _on_item_count_changed(); + // listen to item count changes + _inner_group.ProtectedItemCountChanged += _on_item_count_changed; + } + + public void Dispose() { + _inner_group.ProtectedItemCountChanged -= _on_item_count_changed; + _inner_group.parent = null; + // make sure the state is valid (if a bad state goes by undetected here, nefarious/difficult-to-track bugs could arise) + if (_last_count != _inner_group.ProtectedItemCount) { + Log.Ui.warn("Cached inner count is not equal to the inner group's ItemCount (entire tree structure may be compromised)."); + } + _parent.ProtectedItemCount -= _last_count; + } + + void _on_item_count_changed() { + // add the delta + _parent.ProtectedItemCount += (_inner_group.ProtectedItemCount - _last_count); + // reset the local cache + _last_count = _inner_group.ProtectedItemCount; + } + } + } +} diff --git a/src/client/spark/Modules/Spreader/Import/SyntheticImportVM.cs b/src/client/spark/Modules/Spreader/Import/SyntheticImportVM.cs new file mode 100644 index 000000000..209468f92 --- /dev/null +++ b/src/client/spark/Modules/Spreader/Import/SyntheticImportVM.cs @@ -0,0 +1,253 @@ +using bts.api; +using bts.collections; +using bts.spark; +using mbts; +using mbts.collections; +using mbts.spark; +using mbts.ui; +using mbts.ui.shell; +using mbts.ui.utility; +using mbts.user.settings; +using mbts.utils; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel; +using System.Linq; +using System.Reactive.Linq; +using System.Windows.Data; +using System.Windows.Input; +using Disposable = mbts.Disposable; + +namespace bts.shell.spreader { + class SyntheticImportVM : DisposableViewModelBase, IRequestViewClose { + IReadOnlyDictionary _security_map = DictionaryHelper.empty(); + + public SyntheticImportVM() { + var rows_view = new SyntheticImportRowCollectionView(flat_legs); + rows_view.GroupDescriptions.Add(new PropertyGroupDescription(nameof(ContractLegVM.owner))); + this.rows_view = rows_view; + ok_cmd = new DelegateCommand(() => import_request?.Invoke()); + cancel_cmd = new DelegateCommand(() => RequestClose?.Invoke(this, new EventArgs())); + _dispose = ObservableAutoWrapper.connect_item_hooks( + rows, + r => { + flat_legs.AddRange(r.legs); + return Disposable.Create(() => flat_legs.removeRange(r.legs)); + }); + } + + public event Action import_request; + public event EventHandler RequestClose; + + public ObservableCollection rows { get; } = new ObservableCollection(); + public ObservableCollection flat_legs { get; } = new ObservableCollection(); + public IReadOnlyDictionary security_map { get => _security_map; set => Set(ref _security_map, value); } + public ICollectionView rows_view { get; } + // commands + public ICommand ok_cmd { get; } + public ICommand cancel_cmd { get; } + } + + class SyntheticImportRowVM : DisposableViewModelBase, IEquatable { + readonly ReactiveThresholdMonitor _leg_errors_mon = new ReactiveThresholdMonitor(l => l.subscribe_has_errors(true)); + readonly Func _get_name_exists; + SecurityImmutable? _security; + ExecutionStrategyImmutable? _strategy; + TickFactors _tick_factors; + string _name; + bool _is_selected; + + public SyntheticImportRowVM(uint user_id, Func get_name_exists) { + this.user_id = user_id; + _get_name_exists = get_name_exists; + _validate(); + add_leg_cmd = new DelegateCommand(r => { + if (r != null) { + r.legs.Add(new ContractLegVM { + price_multiplier = 1, + quantity = 1, + owner = r + }); + } + }); + remove_leg_cmd = new DelegateCommand(l => l?.owner?.legs?.Remove(l)); + PropertyChanged += on_property_changed; + var disp = new DisposableCombo( + _leg_errors_mon.OnDispatcher().Subscribe(v => _validate()), + ObservableAutoWrapper.connect_item_hooks(legs, + l => { + l.result_changed += invalidate; + return new DisposableCombo(_leg_errors_mon.join(l), l) + + new Action(() => l.result_changed -= invalidate); + })) + + new Action(() => PropertyChanged -= on_property_changed); + + void invalidate() { + _security = null; + _strategy = null; + _validate(); + result_changed?.Invoke(); + } + + void on_property_changed(object sender, PropertyChangedEventArgs e) => + invalidate(); + } + + public event Action result_changed; + + public SecurityImmutable result => + _security ?? (_security = new SecurityImmutable(to_security())).Value; + + public ExecutionStrategyImmutable strategy => + _strategy ?? (_strategy = new ExecutionStrategyImmutable(to_strategy())).Value; + + public (SecurityImmutable security, ExecutionStrategyImmutable strategy) result_tuple => + (result, strategy); + + public ParsedSyntheticContract parsed_synth { get; set; } + + public string name { get => _name; set => Set(ref _name, value); } + public uint user_id { get; } + public TickFactors tick_factors { get => _tick_factors; set => Set(ref _tick_factors, value); } + public ObservableCollection legs { get; } = new ObservableCollection(); + public bool is_selected { get => _is_selected; set => Set(ref _is_selected, value); } + public ICommand add_leg_cmd { get; } + public ICommand remove_leg_cmd { get; } + + public Security to_security() { + var sc = new SyntheticContract { + Name = name, + UserId = user_id + }; + sc.Legs.AddRange(legs.Select(l => l.to_contract_leg())); + return new Security { + Synthetic = sc, + Symbol = sc.Legs.FirstOrDefault()?.Security?.Symbol ?? string.Empty, + Exchange = Venue.Bts, + ContractSpec = tick_factors.to_spec() + }; + } + + public ExecutionStrategy to_strategy() { + var strat = new ExecutionStrategy(); + foreach (var l in legs) { + if (l.security.HasValue) + strat.LegParamsMap[l.security.Value.Id] = l.to_leg_params(); + } + return strat; + } + + void _validate() { + using (validation()) { + if (string.IsNullOrEmpty(name)) { + validation_assert(false, "Name is not specified.", nameof(name)); + } else if (_get_name_exists(name)) { + validation_assert(false, "Name already exists.", nameof(name)); + } + validation_assert(tick_factors != null && tick_factors.is_valid(), "Invalid tick", nameof(tick_factors)); + validation_assert(legs.Count > 0 && !_leg_errors_mon.is_above_threshold, "Invalid legs.", nameof(legs)); + } + } + + public bool Equals(SyntheticImportRowVM other) => + other != null && + parsed_synth.unpersisted_id == other.parsed_synth.unpersisted_id; + + public override bool Equals(object obj) => + Equals(obj as SyntheticImportRowVM); + + public override int GetHashCode() => + parsed_synth.unpersisted_id; + } + + class ContractLegVM : DisposableViewModelBase, IEquatable { + ContractLegImmutable? _leg; + LegSpreaderParamsImmutable? _leg_params; + SecurityImmutable? _security; + double _price_multiplier, _quantity; + ContractLegType _leg_type; + bool _is_selected; + + public ContractLegVM() { + PropertyChanged += on_property_changed; + _dispose = Disposable.Create(() => PropertyChanged -= on_property_changed); + _validate(); + void on_property_changed(object sender, PropertyChangedEventArgs e) { + switch (e.PropertyName) { + case nameof(security): + case nameof(price_multiplier): + case nameof(quantity): + _leg = null; + break; + case nameof(leg_type): + _leg_params = null; + break; + default: return; + } + _validate(); + result_changed?.Invoke(); + } + } + + public event Action result_changed; + + public ParsedContractLeg parsed_leg { get; set; } + public SyntheticImportRowVM owner { get; set; } + public int owner_id => owner.parsed_synth.unpersisted_id; + public int id => parsed_leg.id; + + public ContractLegImmutable leg => + _leg ?? (_leg = new ContractLegImmutable(to_contract_leg())).Value; + + public LegSpreaderParamsImmutable leg_params => + _leg_params ?? (_leg_params = new LegSpreaderParamsImmutable(to_leg_params())).Value; + + public (ContractLegImmutable leg, LegSpreaderParamsImmutable leg_params) result_tuple => + (leg, leg_params); + + public SecurityImmutable? security { get => _security; set => Set(ref _security, value); } + public double price_multiplier { get => _price_multiplier; set => Set(ref _price_multiplier, value); } + public double quantity { get => _quantity; set => Set(ref _quantity, value); } + public ContractLegType leg_type { get => _leg_type; set => Set(ref _leg_type, value); } + public bool is_selected { get => _is_selected; set => Set(ref _is_selected, value); } + + public void load(ContractLegImmutable leg) { + security = leg.Security; + price_multiplier = leg.PriceMultiplier; + quantity = leg.Quantity; + } + + public ContractLeg to_contract_leg() => + new ContractLeg { + Security = security?.CloneToMutable(), + PriceMultiplier = price_multiplier, + Side = quantity < 0 ? Side.Sell : Side.Buy, + Quantity = Math.Abs(quantity) + }; + + public LegSpreaderParams to_leg_params() { + var lps = SyntheticDataHelper.Defaults.LegSpreaderParams; + lps.EnableHedging = (leg_type & ContractLegType.Hedge) != 0; + lps.IsActiveQuoting = (leg_type & ContractLegType.Quote) != 0; + return lps; + } + + void _validate() { + using (validation()) { + validation_assert(security.is_exchange_security(), "Invalid security", nameof(security)); + validation_assert(price_multiplier.IsNonZero(), "Invalid price multiplier", nameof(price_multiplier)); + validation_assert(quantity.IsNonZero(), "Invalid quantity", nameof(quantity)); + } + } + + public bool Equals(ContractLegVM other) => + other != null && id == other.id; + + public override bool Equals(object obj) => + Equals(obj as ContractLegVM); + + public override int GetHashCode() => + id; + } +} diff --git a/src/client/spark/Modules/Spreader/Import/SyntheticImportView.xaml b/src/client/spark/Modules/Spreader/Import/SyntheticImportView.xaml new file mode 100644 index 000000000..9c7cfe5c9 --- /dev/null +++ b/src/client/spark/Modules/Spreader/Import/SyntheticImportView.xaml @@ -0,0 +1,270 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/client/spark/Modules/Spreader/Import/SyntheticImportView.xaml.cs b/src/client/spark/Modules/Spreader/Import/SyntheticImportView.xaml.cs new file mode 100644 index 000000000..39bc9f8ab --- /dev/null +++ b/src/client/spark/Modules/Spreader/Import/SyntheticImportView.xaml.cs @@ -0,0 +1,50 @@ +using mbts.ui.controls; +using mbts.ui.dpi; +using mbts.ui.utility; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Input; + +namespace bts.shell.spreader { + enum SyntheticImportColumns { + Name = 1, + Security, + Ticks, + PriceMultiplier, + Quantity, + LegType + } + + /// + /// Interaction logic for SyntheticImportView.xaml + /// + partial class SyntheticImportView : UserControl { + public static double RowHeight => + 27.0.RoundLayoutValue(); + + public static Thickness CellPadding => + new Thickness(6, 3, 6, 3).RoundToLayout(); + + public SyntheticImportView() => + InitializeComponent(); + + void _on_group_item_mouse_down(object sender, MouseButtonEventArgs e) { + if (!e.Handled && e.ClickCount == 2 && sender is FrameworkElement el && el.DataContext is SyntheticImportRowCollectionViewGroup group) { + group.is_expanded = !group.is_expanded; + e.Handled = true; + } + } + } + + class SyntheticImportColumn : DIYGrid.ColumnBase { + public SyntheticImportColumn() => + is_visible = true; + + protected override void on_key_initialized(SyntheticImportColumns key) { + if (Header == null) + Header = EnumHelper.get_display_name(key); + if (id == null) + id = key.ToString(); + } + } +} diff --git a/src/client/spark/Modules/Spreader/Import/SyntheticImporter.cs b/src/client/spark/Modules/Spreader/Import/SyntheticImporter.cs new file mode 100644 index 000000000..7271fa417 --- /dev/null +++ b/src/client/spark/Modules/Spreader/Import/SyntheticImporter.cs @@ -0,0 +1,194 @@ +using bts; +using bts.api; +using bts.collections; +using bts.shell.spreader; +using mbts.ui; +using mbts.ui.utility; +using mbts.utils; +using System; +using System.Collections.Generic; +using System.Collections.Immutable; +using System.IO; +using System.Linq; +using System.Reactive.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace mbts.spark { + static class SyntheticImporter { + const string _import_title = "Import Synthetics"; + static readonly TimeSpan _import_op_sec_map_timeout = TimeSpan.FromSeconds(30); + + public static IDisposable import_from_file(string path, IBus bus, OrdersModel orders_model) { + bool is_disposed = false; + IDisposable dispose_op = null; + dispose_op = Disposable.Create(() => is_disposed = true); + impl(); + return Disposable.Create(() => Disposable.dispose(ref dispose_op)); + async void impl() { + IReadOnlyDictionary sec_md_map = null; + while (true) { + await Task.WhenAny(init_sec_md_map(), Task.Delay(_import_op_sec_map_timeout)); + if (is_disposed) + return; + if (sec_md_map != null) + break; + if (!retry_on_error($"Synthetic import op timed out waiting for security map after {_import_op_sec_map_timeout.TotalSeconds:0.00} seconds.")) + return; + } + // The following conditions should break the while loop: + // 1) the import succeeds + // 2) the import fails, and the user does not click 'Yes' in the 'try again...' confirmation dialog + while (true) { + string error_msg = null; + try { + var raw_lines = File.ReadAllLines(path); + var used_names = new HashSet(sec_md_map.Values.Where(smd => smd.security.ContractCase == Security.ContractOneofCase.Synthetic) + .Select(smd => smd.security.Synthetic.Name)); + var parsed_synths = SyntheticSecurityParser.parse_rows(raw_lines, MappedDictionary.create(sec_md_map, smd => smd.security), used_names).ToList(); + var main_vm = new SyntheticImportVM() { + security_map = sec_md_map + }; + // add rows/conflicts + main_vm.rows.AddRange(parsed_synths.Select(ps => { + var sec = ps.result; + var r = new SyntheticImportRowVM(orders_model.admin_model.user.id, used_names.Contains) { + tick_factors = TickUtils.get_regional_ticks(sec.ContractSpec).low_tick, + name = sec.Synthetic.Name, + parsed_synth = ps + }; + r.legs.AddRange(ps.legs.Zip(sec.Synthetic.Legs).Select(tup => { + var (pl, l) = tup; + var leg_vm = new ContractLegVM { + price_multiplier = l.PriceMultiplier, + quantity = l.Quantity, + parsed_leg = pl, + owner = r, + leg_type = + (pl.result_tuple.leg_params.EnableHedging ? ContractLegType.Hedge : ContractLegType.None) | + (pl.result_tuple.leg_params.IsActiveQuoting ? ContractLegType.Quote : ContractLegType.None) + }; + if (l.Security != null) + leg_vm.security = new SecurityImmutable(l.Security); + return leg_vm; + })); + return r; + })); + var main_win = new SyntheticImportDialog { DataContext = main_vm }; + ui.WindowStyle.SetSizeToContent(main_win, SizeToContent.WidthAndHeight); + main_vm.import_request += on_main_import_request; + main_win.move_to_mouse(-200, -75); + dispose_op = WindowUtilities.connect_vm(main_win, main_vm, main_vm); + main_win.Show(); + // conflicts + var conflicts = SyntheticSecurityParser.get_conflicts(main_vm.rows); + if (conflicts.Values.Any(c => c.Count > 0)) { + var conflicts_vm = new SyntheticImportConflictsVM(parsed_synths.Count) { + security_map = sec_md_map + }; + foreach (var kv in conflicts) { + var assign_del = SyntheticSecurityParser.assign_component(kv.Key); + foreach (var text_groups in kv.Value) { + var eval = get_error_value(kv.Key); + var row = new SyntheticImportConflictRowVM(kv.Key, text_groups.Key, text_groups.Value, eval, eval); + conflicts_vm.conflicts.Add(row); + conflicts_vm.committed += () => { + foreach (var (synth, leg_vm) in text_groups.Value) { + var leg_tup = leg_vm?.parsed_leg?.result_tuple; + assign_del(synth.parsed_synth.result, leg_tup?.leg, leg_tup?.leg_params, row.value); + } + row.on_conflicts_resolved(); + }; + } + } + + var conflicts_win = new SyntheticImportConflictsDialog { + DataContext = conflicts_vm, + Owner = main_win, + Title = $"{_import_title} Conflicts", + WindowStartupLocation = WindowStartupLocation.CenterOwner + }; + dispose_op = new DisposableCombo(WindowUtilities.connect_vm(conflicts_win, conflicts_vm, conflicts_vm)) + dispose_op; + + conflicts_win.ShowDialog(); + } + + object get_error_value(SyntheticContractComponent component) { + switch (component) { + case SyntheticContractComponent.PriceMultiplier: + case SyntheticContractComponent.Quantity: return double.NaN; + default: return null; + } + } + + void on_main_import_request() { + if (!is_disposed) + import_synths(parsed_synths, main_vm.rows); + Disposable.dispose(ref dispose_op); + } + } + catch (Exception ex) { + error_msg = $"Error parsing synthetics from file '{path}': {ex}."; + } + if (error_msg == null) { + // Exit loop: the import succeeded. + break; + } + if (!retry_on_error(error_msg)) { + // Exit loop: the import failed, and the user did not click 'Yes' in the 'try again...' confirmation dialog. + break; + } + // Continue loop: the import failed, and the user wants to try again. + error_msg = null; + } + async void import_synths(IReadOnlyList parsed_synths, IEnumerable rows) { + (uint? key, string error_msg)[] new_ids = null; + string error_msg = null; + try { + new_ids = await orders_model.spreader.create_synthetics( + rows.Where(r => !r.HasErrors) + .Select(r => r.result_tuple)); + } + catch (Exception ex) { + Log.Ui.error($"Failed to save all synthetics during import op (one or more may have been successfully saved): {ex}."); + error_msg = $"Import was unsuccessful: {ex}."; + } + if (new_ids == null) + error_msg = "An unknown error occurred (check the synthetic management window to see if any synthetics were successfully added)."; + if (error_msg != null) { + BTSMessageBox.Show(error_msg, "Import Synthetics", BTSMessageBoxButtons.OK); + } else { + Log.assert(new_ids != null); + var failed = new_ids + .Where(r => !r.error_msg.is_null_or_empty()) + .ToList(); + int num_succeeded = new_ids.Length - failed.Count; + if (num_succeeded < parsed_synths.Count) { + if (!BTSMessageBox.Confirm( + $"{num_succeeded}/{parsed_synths.Count} synthetics were successfully imported.\n" + + "Would you like to keep the imports that were successful?", + _import_title)) { + bus.post(SparkTags.SyntheticDeleteTag, + ImmutableHashSet.CreateRange(new_ids.Where(r => r.key.HasValue).Select(r => r.key.Value))); + } + } else { + BTSMessageBox.Show( + $"All {num_succeeded} synthetics were successfully imported.", + _import_title, + BTSMessageBoxButtons.OK, + MessageBoxImage.Information); + } + } + } + + async Task init_sec_md_map() => + sec_md_map = await bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().FirstOrDefaultAsync(); + + bool retry_on_error(string error_msg) { + Log.Ui.warn(error_msg); + return BTSMessageBox.Confirm(error_msg + "\nTry again?", _import_title, MessageBoxImage.Exclamation); + } + } + } + } +} diff --git a/src/client/spark/Modules/Spreader/Import/SyntheticSecurityParser.cs b/src/client/spark/Modules/Spreader/Import/SyntheticSecurityParser.cs new file mode 100644 index 000000000..582a73717 --- /dev/null +++ b/src/client/spark/Modules/Spreader/Import/SyntheticSecurityParser.cs @@ -0,0 +1,307 @@ +using bts.api; +using bts.spark; +using bts.utils; +using mbts; +using mbts.ui.utility; +using mbts.utils; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.Reactive.Linq; + +namespace bts.shell.spreader { + [Flags] + enum ContractLegType { + None = 0, + Quote = 1, + Hedge = 2 + } + + class ParsedSyntheticContract : IDisposable { + [ThreadStatic] + static int _id_counter; + + public readonly int unpersisted_id = unchecked(_id_counter++); + public readonly Security result = new Security { + Synthetic = new SyntheticContract(), + ContractSpec = new ContractSpecification(), + Exchange = Venue.Bts + }; + + readonly ReactiveThresholdMonitor _legs_valid_mon = + new ReactiveThresholdMonitor(l => l.subscribe_is_valid()); + IDisposable _dispose; + + public ParsedSyntheticContract() { + _dispose = Disposable.Create( + ObservableAutoWrapper.connect_item_hooks(legs, _legs_valid_mon.join), + _legs_valid_mon.Subscribe(_ => _is_dirty = true)); + } + + bool + _is_dirty, + _is_valid; + + (string text, bool success) + _name, + _tick_size; + + public (string text, bool success) name { get => _name; set => _set(ref _name, value); } + public (string text, bool success) tick_size { get => _tick_size; set => _set(ref _tick_size, value); } + public ObservableCollection legs { get; } = new ObservableCollection(); + + public bool is_valid { + get { + if (_is_dirty) { + _is_valid = tick_size.success && name.success && !_legs_valid_mon.is_above_threshold; + _is_dirty = false; + } + return _is_valid; + } + } + + public ParsedContractLeg current_leg => + legs.LastOrDefault() ?? add_new_leg(); + + public ParsedContractLeg add_new_leg() { + var leg = new ParsedContractLeg(); + legs.Add(leg); + result.Synthetic.Legs.Add(leg.result); + return leg; + } + + public void Dispose() => + Disposable.dispose(ref _dispose); + + public bool Equals(ParsedSyntheticContract other) => other != null && unpersisted_id == other.unpersisted_id; + public override bool Equals(object obj) => Equals(obj as ParsedSyntheticContract); + public override int GetHashCode() => unpersisted_id.GetHashCode(); + + void _set(ref T backing, T value) { + backing = value; + _is_dirty = true; + } + } + + class ParsedContractLeg { + [ThreadStatic] + static int _id_counter; + + public readonly ContractLeg result = new ContractLeg { }; + public readonly LegSpreaderParams leg_params = new LegSpreaderParams(); + bool + _is_dirty, + _is_valid; + + (string text, bool success) + _security, + _quantity, + _price_multiplier, + _leg_type; + + public event Action invalidated; + + public int id { get; } = unchecked(_id_counter++); + public (string text, bool success) security { get => _security; set => _set(ref _security, value); } + public (string text, bool success) quantity { get => _quantity; set => _set(ref _quantity, value); } + public (string text, bool success) price_multiplier { get => _price_multiplier; set => _set(ref _price_multiplier, value); } + public (string text, bool success) leg_type { get => _leg_type; set => _set(ref _leg_type, value); } + + public (ContractLeg leg, LegSpreaderParams leg_params) result_tuple => (result, leg_params); + + public bool is_valid { + get { + if (_is_dirty) { + if (_is_valid != (security.success && quantity.success && price_multiplier.success && leg_type.success)) { + _is_valid = !_is_valid; + invalidated?.Invoke(); + } + _is_dirty = false; + } + return _is_valid; + } + } + + public IObservable subscribe_is_valid() => + Observable.Create(o => { + o.OnNext(is_valid); + invalidated += on_invalidated; + return Disposable.Create(() => invalidated -= on_invalidated); + void on_invalidated() => + o.OnNext(is_valid); + }); + + void _set(ref T backing, T value) { + backing = value; + _is_dirty = true; + } + } + + static class SyntheticSecurityParser { + public const string file_extension = "csv"; + + public static string display_name(this ContractLegType leg_type) { + if (leg_type == ContractLegType.None) + return "N"; + var flags = EnumHelper.split_flags(leg_type); + return string.Join("", flags.Select(f => f.ToString()) + .Where(str => str.Length > 0) + .Select(str => str.Substring(0, 1))); + } + + public static Action assign_component(SyntheticContractComponent component) { + switch (component) { + case SyntheticContractComponent.Name: return (sec, leg, leg_params, val) => sec.Synthetic.Name = val?.ToString() ?? string.Empty; + case SyntheticContractComponent.TickSize: return (sec, leg, leg_params, val) => sec.ContractSpec.LowTick = sec.ContractSpec.HighTick = ConvertUtils.try_convert(val) ?? 0.0; + case SyntheticContractComponent.PriceMultiplier: return (sec, leg, leg_params, val) => leg.PriceMultiplier = ConvertUtils.try_convert(val) ?? double.NaN; + case SyntheticContractComponent.Quantity: return (sec, leg, leg_params, val) => leg.Quantity = ConvertUtils.try_convert(val) ?? double.NaN; + case SyntheticContractComponent.Security: return (sec, leg, leg_params, val) => leg.Security = val as Security ?? (val is SecurityImmutable si ? si.CloneToMutable() : null); + case SyntheticContractComponent.LegType: return (sec, leg, leg_params, val) => assign_leg_type(leg_params, ConvertUtils.try_convert(val, out ContractLegType lt) ? lt : ContractLegType.None); + default: throw new NotImplementedException(); + } + } + + /// Note: the returned dictionary will have entries for each , regardless of whether or not that component has any conflicts. + public static Dictionary>> get_conflicts(IEnumerable parsed_fills) { + var missing_components = EnumHelper.get_values().ToDictionary(c => c, c => new Dictionary>()); + var mk_list = new Func>(_ => new List<(ParsedSyntheticContract, ParsedContractLeg)>()); + foreach (var psc in parsed_fills) { + if (!psc.name.success) { + add_missing(SyntheticContractComponent.Name, psc.name.text, psc); + } + if (!psc.tick_size.success) { + add_missing(SyntheticContractComponent.TickSize, psc.tick_size.text, psc); + } + foreach (var leg in psc.legs) { + if (!leg.price_multiplier.success) + add_missing(SyntheticContractComponent.PriceMultiplier, leg.price_multiplier.text, psc, leg); + if (!leg.quantity.success) + add_missing(SyntheticContractComponent.Quantity, leg.quantity.text, psc, leg); + if (!leg.security.success) + add_missing(SyntheticContractComponent.Security, leg.security.text, psc, leg); + if (!leg.leg_type.success) + add_missing(SyntheticContractComponent.LegType, leg.leg_type.text, psc, leg); + } + } + return missing_components; + void add_missing(SyntheticContractComponent component, string text, ParsedSyntheticContract result, ParsedContractLeg leg = null) => + missing_components[component].GetOrAdd(text ?? string.Empty, mk_list).Add((result, leg)); + } + + public static Dictionary>> get_conflicts(IEnumerable import_rows) { + var missing_components = EnumHelper.get_values().ToDictionary(c => c, c => new Dictionary>()); + var mk_list = new Func>(_ => new List<(SyntheticImportRowVM, ContractLegVM)>()); + foreach (var ir in import_rows) { + var psc = ir.parsed_synth; + if (!psc.name.success) { + add_missing(SyntheticContractComponent.Name, psc.name.text, ir); + } + if (!psc.tick_size.success) { + add_missing(SyntheticContractComponent.TickSize, psc.tick_size.text, ir); + } + foreach (var leg in ir.legs) { + if (!leg.parsed_leg.price_multiplier.success) + add_missing(SyntheticContractComponent.PriceMultiplier, leg.parsed_leg.price_multiplier.text, ir, leg); + if (!leg.parsed_leg.quantity.success) + add_missing(SyntheticContractComponent.Quantity, leg.parsed_leg.quantity.text, ir, leg); + if (!leg.parsed_leg.security.success) + add_missing(SyntheticContractComponent.Security, leg.parsed_leg.security.text, ir, leg); + if (!leg.parsed_leg.leg_type.success) + add_missing(SyntheticContractComponent.LegType, leg.parsed_leg.leg_type.text, ir, leg); + } + } + return missing_components; + void add_missing(SyntheticContractComponent component, string text, SyntheticImportRowVM row, ContractLegVM leg = null) => + missing_components[component].GetOrAdd(text ?? string.Empty, mk_list).Add((row, leg)); + } + // This implementation prioritizes simplicity over speed. + // The security desc lookup could be better optimized, but the speed at which fills are imported is probably not a paramount concern. + public static IEnumerable parse_rows(IEnumerable rows, IReadOnlyDictionary security_map, ISet used_names) { + var sec_lookup = security_map.ToLookup(kv => kv.Value.ToString()); + var name_col = Cells.name(used_names.Contains); + var sec_col = Cells.contract_security(lookup_security); + return RowParser.parse_rows(rows, columns(), Cells.delimiter); + + Security lookup_security(string sec_text) => + sec_lookup.Contains(sec_text) ? sec_lookup[sec_text].First().Value.CloneToMutable() : null; + + IEnumerable> columns() { + yield return name_col; + yield return Cells.tick_size; + // if an imported synth has > 255 legs, assume it is an error. + const int max_legs = 255; + int leg_count = 0; + do { + yield return sec_col; + yield return Cells.contract_quantity; + yield return Cells.contract_price_multiplier; + yield return Cells.leg_type; + } while (leg_count++ < max_legs); + } + } + + public static Func reverse_lookup(IReadOnlyDictionary map) { + var lookup = map.ToLookup(kv => kv.Value, kv => kv.Key); + return cell_text => lookup.Contains(cell_text) ? lookup[cell_text].First() : default; + } + + public static void assign_leg_type(LegSpreaderParams leg_params, ContractLegType leg_type) { + leg_params.IsActiveQuoting = (leg_type & ContractLegType.Quote) != 0; + leg_params.EnableHedging = (leg_type & ContractLegType.Hedge) != 0; + } + + static class Cells { + public const char delimiter = ','; + + public static RowParser.AssignColumnValue name(Func name_exists) => + (ref ParsedSyntheticContract psc, string cell_text) => { + psc.name = (cell_text, !name_exists(cell_text)); + psc.result.Synthetic.Name = cell_text; + }; + + public static void tick_size(ref ParsedSyntheticContract psc, string cell_text) { + psc.tick_size = (cell_text, double.TryParse(cell_text.Trim(), out var val)); + if (psc.tick_size.success) { + psc.tick_size = (cell_text, val.IsNonZero()); + psc.result.ContractSpec.LowTick = psc.result.ContractSpec.HighTick = val; + } + } + + public static RowParser.AssignColumnValue contract_security(Func reverse_security_lookup) => + (ref ParsedSyntheticContract psc, string cell_text) => { + var leg = psc.add_new_leg(); + leg.result.Security = reverse_security_lookup(cell_text.Trim()); + leg.security = (cell_text, leg.result.Security != null); + }; + + public static void contract_quantity(ref ParsedSyntheticContract psc, string cell_text) { + psc.current_leg.quantity = (cell_text, double.TryParse(cell_text.Trim(), out var val) && val.IsNonZero()); + psc.current_leg.result.Quantity = val; + } + + public static void contract_price_multiplier(ref ParsedSyntheticContract psc, string cell_text) { + psc.current_leg.price_multiplier = (cell_text, double.TryParse(cell_text.Trim(), out var val) && val.IsNonZero()); + psc.current_leg.result.PriceMultiplier = val; + } + + public static void leg_type(ref ParsedSyntheticContract psc, string cell_text) { + psc.current_leg.leg_type = (cell_text, _parse_leg_type(cell_text.Trim(), out var leg_type)); + assign_leg_type(psc.current_leg.leg_params, leg_type); + } + + static bool _parse_leg_type(string cell_text, out ContractLegType result) { + result = ContractLegType.None; + if (cell_text.IsNullOrEmpty()) + return false; + switch (char.ToUpper(cell_text[0])) { + case 'Q': result = ContractLegType.Quote; break; + case 'H': result = ContractLegType.Hedge; break; + case 'N': break; + default: return false; + } + return true; + } + } + } +} diff --git a/src/client/spark/Modules/Spreader/LegSpreaderParamsTuple.cs b/src/client/spark/Modules/Spreader/LegSpreaderParamsTuple.cs index edd831000..7afa0472c 100644 --- a/src/client/spark/Modules/Spreader/LegSpreaderParamsTuple.cs +++ b/src/client/spark/Modules/Spreader/LegSpreaderParamsTuple.cs @@ -1,17 +1,52 @@ using bts.api; using bts.spark; +using mbts.ui.shell; +using System; + +namespace mbts.ui.spark { + class LegSpreaderParamsTuple : ViewModelBase, IEquatable { + [ThreadStatic] + static int _id_counter; + + SecurityImmutable? _security; -namespace mbts.ui.spark -{ - internal class LegSpreaderParamsTuple - { public LegSpreaderParamsTuple(ContractLeg leg, LegSpreaderParams leg_params) { + id = unchecked(_id_counter++); this.leg = leg; this.leg_params = leg_params; + if (leg.Security != null) + _security = new SecurityImmutable(leg.Security); } + public event Action security_changed; + + public int id { get; } + /// + /// Important: do NOT modify security via , + /// use instead ([only]the latter raises the PropertyChanged event). + /// public ContractLeg leg { get; } public LegSpreaderParams leg_params { get; } + public SecurityImmutable? security { + get => _security; + set { + if (!_security.Equals(value)) { + _security = value; + leg.Security = value?.CloneToMutable(); + security_changed?.Invoke(); + RaisePropertyChanged(); + } + } + } public uint SecurityKey => leg.Security.Id; + + public bool Equals(LegSpreaderParamsTuple other) => + ReferenceEquals(this, other); + + public override bool Equals(object obj) => + Equals(obj as LegSpreaderParamsTuple); + + public override int GetHashCode() => + id; } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Spreader/SpreaderModel.cs b/src/client/spark/Modules/Spreader/SpreaderModel.cs index 916e7f078..d71b8faea 100644 --- a/src/client/spark/Modules/Spreader/SpreaderModel.cs +++ b/src/client/spark/Modules/Spreader/SpreaderModel.cs @@ -4,6 +4,8 @@ using bts.api.core; using bts.api.synthetic; using bts.collections; using bts.spark; +using bts.utils; +using mbts.utils; using System; using System.Collections.Generic; using System.ComponentModel.Composition; @@ -82,6 +84,61 @@ namespace mbts.spark { (mdc, success) => success ? mdc.Data[0].Strategy : (ExecutionStrategyImmutable?)null, "lookup strategy"); + public Task<(uint? key, string error_msg)[]> create_synthetics(IEnumerable<(SecurityImmutable security, ExecutionStrategyImmutable strategy)> synthetics) { + var tasks = synthetics.Select(tup => { + var (sec, strat) = tup; + if (sec.ContractCase != Security.ContractOneofCase.Synthetic) + return Task.FromException<(Result, Result?)>(ExceptionBuilder.Argument.unexpected_case(sec.ContractCase, nameof(sec))); + if (sec.Synthetic.UserId != _user_id) { + var msec = sec.CloneToMutable(); + msec.Synthetic.UserId = _user_id; + sec = new SecurityImmutable(msec); + } + return impl(); + async Task<(Result sec, Result? strat)> impl() { + var result = await _service.create_synthetic_async(sec); + Result? strategy; + if (result.success && result.value.Error == CreateResult.Types.Error.Ok) { + strategy = await _service.update_security_metadata_async(new Metadata { + SecurityKey = result.value.Key, + Strategy = tup.strategy.CloneToMutable() + }); + } else { + strategy = null; + } + return (result, strategy); + } + }); + return _error.safe_execute_batch(tasks, + tup => { + var (sec, strat) = tup; + // security + string sec_error_msg = null; + uint? key = null; + if (!sec.success) { + sec_error_msg = sec.error_message; + } else if (sec.value.Error != CreateResult.Types.Error.Ok) { + sec_error_msg = sec.value.Error.ToString(); + } else { + key = sec.value.Key; + } + // strategy + string strat_error_msg = null; + if (!strat.HasValue) { + strat_error_msg = "Strategy was not successfully saved"; + } else if (!strat.Value.success) { + strat_error_msg = strat.Value.error_message; + } else if (strat.Value.value.Error != UpdateResult.Types.Error.Ok) { + strat_error_msg = strat.Value.value.Error.ToString(); + } + // merge error msgs (result should be null if both errors are empty) + var error_msg = string.Join(Environment.NewLine, new[] { sec_error_msg, strat_error_msg }.ExceptNull()); + return (key, error_msg.NullIfEmpty()); + }, + "Synthetic", + "creating synthetics"); + } + public Task create_synthetic(SecurityImmutable synthetic) { if (synthetic.ContractCase != Security.ContractOneofCase.Synthetic) return null; @@ -106,10 +163,32 @@ namespace mbts.spark { (r, success) => success, "saving strategy"); + public async Task save_strategies(IEnumerable<(uint key, ExecutionStrategyImmutable strategy)> items) { + // Copy everything to a new list, to guarentee that it won't be altered during the op. + // The performance impact should be insignificant, as this should be a rare call. + var item_list = new List<(uint key, ExecutionStrategyImmutable strategy, int index)>(items.Select((item, index) => (item.key, item.strategy, index))); + string[] errors = new string[item_list.Count]; + await Task.WhenAll(item_list.Select(impl)); + return errors; + async Task impl((uint key, ExecutionStrategyImmutable strategy, int index) tup) { + var (key, strategy, index) = tup; + try { + var result = await _service.update_security_metadata_async(new Metadata { + SecurityKey = key, + Strategy = strategy.CloneToMutable() + }); + if (!result.success) + errors[index] = result.error_message; + } catch (Exception ex) { + errors[index] = ex.ToString(); + } + } + } + public async Task verify_name_is_unique(string name) { var (result, success) = await strategy_tuple.FirstAsyncTask(SparkUtils.DefaultTimeOut); name = name.Trim().ToLower(); return success && !result.Values.Any(st => st.md.security.Synthetic.Name.Trim().ToLower() == name); } } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs index cfbe2b7e3..e7b449de9 100644 --- a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs +++ b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs @@ -1,6 +1,7 @@ using bts; using bts.api; using bts.shell; +using bts.shell.spreader; using bts.spark; using mbts.persist; using mbts.ui; @@ -18,7 +19,10 @@ using static bts.shell.SyntheticManagementWindowFactory; namespace mbts.spark { class SyntheticManagementWindow : SparkWindow, ISharedWindow { - const string _window_type = "SyntheticManagement"; + const string + _window_type = "SyntheticManagement", + _import_title = "Import Synthetics"; + static readonly TimeSpan _import_op_sec_map_timeout = TimeSpan.FromSeconds(30); SingleValuePump _vm = new SingleValuePump(); StartupData _state; OrdersModel _orders_model; @@ -27,7 +31,6 @@ namespace mbts.spark { IReadOnlyList _commands; readonly IWindowSettingsManager _settings_manager; - public SyntheticManagementWindow(SyntheticManagementWindowFactory factory, IBus bus, OrdersModel orders_model, StartupData state, IWindowSettingsManager settings_manager) : base("Synthetic Management", bus, factory, SparkCommands.ShowSyntheticManagement.icon) { _orders_model = orders_model; @@ -90,7 +93,11 @@ namespace mbts.spark { var dialog = new ShellSettingsDialog { Title = "Synthetic Management Grid Settings", DataContext = vm }; vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog); return dialog; - })) + })), + new SparkCommandCommand( + "Import Synthetics...", Icons.Import, FileDialogCommand.open_file(import, extensions: SyntheticSecurityParser.file_extension)) { + show_in_toolbar = false + } }; _subscriptions = Disposable.Create( @@ -105,13 +112,16 @@ namespace mbts.spark { r == null ? Observable.Return(new RowStrategy?()) : _orders_model.spreader.security_strategy(r.security.Id).Select(strategy => RowStrategy.create(r.security, strategy)); - uint select_security_id(RowModificationParams? rmp) => rmp.HasValue ? rmp.Value.security.Id : 0; + IImmutableSet select_security_id(RowModificationParams? rmp) => ImmutableHashSet.Create(rmp.HasValue ? rmp.Value.security.Id : 0); (SecurityImmutable, ExecutionStrategyImmutable) select_row_strategy_tuple(RowStrategy? rs) => rs.HasValue ? (rs.Value.security, rs.Value.strategy) : default; bool can_execute(RowModificationParams? rmp) => rmp.HasValue && !rmp.Value.has_working_orders; _vm.value = new SyntheticManagementDialogVM(_bus, _orders_model, _settings_manager, _state.sorting_criteria, _state.filters ?? new FilterStates()); if (_view == null) _view = new SyntheticManagementView { DataContext = _vm.value }; else _view.DataContext = _vm.value; + + void import(string path) => + SyntheticImporter.import_from_file(path, _bus, _orders_model); } public override void Dispose() { @@ -145,4 +155,4 @@ namespace mbts.spark { new RowStrategy(security, strategy); } } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossCrossTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossCrossTicksModel.cs index e1c5a3a82..1397b9c55 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossCrossTicksModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossCrossTicksModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class PostHedgeOppositeMarketVolumeBasedCrossCrossTicksModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Cross Ticks"; public override string help_text { get; } = string.Empty; @@ -22,7 +22,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_omv_cross(leg_tup) is PostHedgeOppositeMarketVolumeBasedForcedCross omv_cross) omv_cross.CrossTicks = value; } @@ -34,7 +34,7 @@ namespace mbts.spark { leg_tup.leg_params.PostHedgeParams.OppositeMarketVolumeBasedForcedCross; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PostHedgeOppositeMarketVolumeBasedForcedCross.CrossTicks); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PostHedgeOppositeMarketVolumeBasedForcedCross.CrossTicks); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossThresholdModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossThresholdModel.cs index 5b8afafc6..6b473e5db 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossThresholdModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/OppositeMarketVolumeBasedCross/PostHedgeOppositeMarketVolumeBasedCrossThresholdModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class PostHedgeOppositeMarketVolumeBasedCrossThresholdModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Threshold"; public override string help_text { get; } = string.Empty; @@ -22,7 +22,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, QuantityMeasure value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_omv_cross(leg_tup) is PostHedgeOppositeMarketVolumeBasedForcedCross omv_cross) omv_cross.QuantityThreshold = value; } @@ -36,7 +36,7 @@ namespace mbts.spark { leg_tup.leg_params.PostHedgeParams.OppositeMarketVolumeBasedForcedCross; QuantityMeasure _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PostHedgeOppositeMarketVolumeBasedForcedCross.QuantityThreshold); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PostHedgeOppositeMarketVolumeBasedForcedCross.QuantityThreshold); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossMarketTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossMarketTicksModel.cs index f66fa1405..d5ac32341 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossMarketTicksModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossMarketTicksModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class PostHedgePriceBasedCrossMarketTicksModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Cross Ticks"; public override string help_text { get; } = string.Empty; @@ -22,7 +22,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_price_based_cross(leg_tup) is PostHedgePriceBasedForcedCross price_based_cross) price_based_cross.MarketCrossTicks = value; } @@ -34,7 +34,7 @@ namespace mbts.spark { leg_tup.leg_params.PostHedgeParams.PriceBasedCross; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PostHedgePriceBasedForcedCross.MarketCrossTicks); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PostHedgePriceBasedForcedCross.MarketCrossTicks); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossTicksModel.cs index a89457e68..3dbfa6f6a 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossTicksModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/PriceBasedCross/PostHedgePriceBasedCrossTicksModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class PostHedgePriceBasedCrossTicksModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Ticks"; public override string help_text { get; } = string.Empty; @@ -22,7 +22,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_price_based_cross(leg_tup) is PostHedgePriceBasedForcedCross price_based_cross) price_based_cross.TicksThreshold = value; } @@ -34,7 +34,7 @@ namespace mbts.spark { leg_tup.leg_params.PostHedgeParams.PriceBasedCross; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PostHedgePriceBasedForcedCross.TicksThreshold); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PostHedgePriceBasedForcedCross.TicksThreshold); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossMarketTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossMarketTicksModel.cs index 1eb364385..cdf718f5d 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossMarketTicksModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossMarketTicksModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class PostHedgeTimeBasedCrossMarketTicksModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Cross Ticks"; public override string help_text { get; } = string.Empty; @@ -22,7 +22,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_time_based_cross(leg_tup) is PostHedgeTimeBasedForcedCross time_based_cross) time_based_cross.MarketCrossTicks = value; } @@ -34,7 +34,7 @@ namespace mbts.spark { leg_tup.leg_params.PostHedgeParams.TimeBasedForcedCross; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PostHedgeTimeBasedForcedCross.MarketCrossTicks); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PostHedgeTimeBasedForcedCross.MarketCrossTicks); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossTimeModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossTimeModel.cs index 5af8a6b38..7958963a3 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossTimeModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PostHedge/TimeBasedCross/PostHedgeTimeBasedCrossTimeModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class PostHedgeTimeBasedCrossTimeModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Time(ms)"; public override string help_text { get; } = string.Empty; @@ -22,7 +22,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_time_based_cross(leg_tup) is PostHedgeTimeBasedForcedCross time_based_cross) time_based_cross.TimeInMsThreshold = value; } @@ -34,7 +34,7 @@ namespace mbts.spark { leg_tup.leg_params.PostHedgeParams.TimeBasedForcedCross; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PostHedgeTimeBasedForcedCross.TimeInMsThreshold); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PostHedgeTimeBasedForcedCross.TimeInMsThreshold); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessThresholdModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessThresholdModel.cs index 7d334c946..d11bba2c1 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessThresholdModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessThresholdModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class PreHedgePaylessThresholdModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Threshold"; public override string help_text { get; } = string.Empty; @@ -22,7 +22,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, QuantityMeasure value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_payless_ticks(leg_tup) is PreHedgeQuantityBasedPayLessTicks payless_ticks) payless_ticks.QuantityThreshold = value; } @@ -36,7 +36,7 @@ namespace mbts.spark { leg_tup.leg_params.PreHedgeParams.QuantityBasedPaylessTicks; QuantityMeasure _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayLessTicks.QuantityThreshold); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayLessTicks.QuantityThreshold); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessTicksModel.cs index ef62031fd..b4b7904d4 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessTicksModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payless/PreHedgePaylessTicksModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class PreHedgePaylessTicksModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Payless Ticks"; public override string help_text { get; } = string.Empty; @@ -23,7 +23,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_payless_ticks(leg_tup) is PreHedgeQuantityBasedPayLessTicks payless_ticks) payless_ticks.PaylessTicks = value; } @@ -35,7 +35,7 @@ namespace mbts.spark { leg_tup.leg_params.PreHedgeParams.QuantityBasedPaylessTicks; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayLessTicks.PaylessTicks); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayLessTicks.PaylessTicks); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupThresholdModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupThresholdModel.cs index 9dbe329c6..142c0e70b 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupThresholdModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupThresholdModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class PreHedgePayupThresholdModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Threshold"; public override string help_text { get; } = string.Empty; @@ -22,7 +22,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, QuantityMeasure value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_payup_ticks(leg_tup) is PreHedgeQuantityBasedPayupTicks payup_ticks) payup_ticks.QuantityThreshold = value; } @@ -36,7 +36,7 @@ namespace mbts.spark { leg_tup.leg_params.PreHedgeParams.QuantityBasedPayupTicks; QuantityMeasure _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayUpTicks.QuantityThreshold); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayUpTicks.QuantityThreshold); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupTicksModel.cs index ec39ec8a0..b4f2241a4 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupTicksModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/PreHedge/Payup/PreHedgePayupTicksModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class PreHedgePayupTicksModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Payup Ticks"; public override string help_text { get; } = string.Empty; @@ -22,7 +22,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_payup_ticks(leg_tup) is PreHedgeQuantityBasedPayupTicks payup_ticks) payup_ticks.PayupTicks = value; } @@ -34,7 +34,7 @@ namespace mbts.spark { leg_tup.leg_params.PreHedgeParams.QuantityBasedPayupTicks; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayUpTicks.PayupTicks); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.PreHedgeQuantityBasedPayUpTicks.PayupTicks); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingPriceTypeModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingPriceTypeModel.cs index fc1e2517e..dc2ddde7a 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingPriceTypeModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingPriceTypeModel.cs @@ -9,7 +9,7 @@ namespace mbts.spark { { class ConditionalQuotingPriceTypeModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Price Type"; public override string help_text { get; } = string.Empty; @@ -26,7 +26,7 @@ namespace mbts.spark { public override void set_value(LegSpreaderParamsTuple leg_tup, PriceType value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_value(leg_tup) is ConditionalQuoting cond) cond.PriceType = value; } @@ -37,7 +37,7 @@ namespace mbts.spark { leg_tup.leg_params.QuoteParams.ConditionalQuoting; PriceType _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.ConditionalQuoting.PriceType); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.ConditionalQuoting.PriceType); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingTicksModel.cs index 92c56fcaf..83dfe65af 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingTicksModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Conditional/ConditionalQuotingTicksModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class ConditionalQuotingTicksModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Ticks"; public override string help_text { get; } = string.Empty; @@ -22,7 +22,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, int value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_value(leg_tup) is ConditionalQuoting cond) cond.NTicks = value; } @@ -34,7 +34,7 @@ namespace mbts.spark { leg_tup.leg_params.QuoteParams.ConditionalQuoting; int _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.ConditionalQuoting.NTicks); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.ConditionalQuoting.NTicks); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Hidden/QuoteHiddenModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Hidden/QuoteHiddenModel.cs index a0f2e1417..1c090a770 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Hidden/QuoteHiddenModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Hidden/QuoteHiddenModel.cs @@ -6,7 +6,7 @@ using System.Windows; namespace mbts.spark { partial class SyntheticEditorVM { class QuoteHiddenModel : RowModelBase, IHaveFontParams { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Hidden"; public override string help_text { get; } = "A hidden quote is not sent out until the market crosses the computed quoting price. When that happens, the quote is sent out as an IOC order. This continues until the synthetic spreader order is fully filled, or cancelled."; @@ -21,7 +21,7 @@ namespace mbts.spark { _get_throttle(leg_tup) != null; public override void set_value(LegSpreaderParamsTuple leg_tup, bool value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; leg_tup.leg_params.QuoteParams.QuoteHidden = value ? new QuoteHidden() : null; } @@ -32,7 +32,7 @@ namespace mbts.spark { leg_tup.leg_params.QuoteParams.QuoteHidden; bool _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => false); + _value_store.GetValueOrDefault(leg_tup.id, _ => false); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs index f38365209..2890aa98d 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketDistance/QuoteInsideMarketDistanceTowardModel.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class QuoteInsideMarketDistanceTowardModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Toward Distance"; public override string help_text { get; } = string.Empty; @@ -21,7 +21,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_inside_market_distance(leg_tup) is QuoteInsideMarketDistanceThrottle inside_market_distance) inside_market_distance.OnTowardDistance = value; } @@ -33,7 +33,7 @@ namespace mbts.spark { leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceThrottle; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey); + _value_store.GetValueOrDefault(leg_tup.id); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleMinMove.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleMinMove.cs index 0a4550dee..7511b83d6 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleMinMove.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleMinMove.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class QuoteInsideMarketThrottleMinMoveModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Min Move"; public override string help_text { get; } = string.Empty; @@ -22,7 +22,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_inside_market_throttle(leg_tup) is QuoteInsideMarketDistanceWithTravel inside_market_throttle) inside_market_throttle.Limit = value; } @@ -34,7 +34,7 @@ namespace mbts.spark { leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceWithTravel; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.QuoteInsideMarketDistanceWithTravel.Limit); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.QuoteInsideMarketDistanceWithTravel.Limit); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleTicksModel.cs index 99798bc96..01bab5a5c 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleTicksModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/InsideMarketThrottle/QuoteInsideMarketThrottleTicksModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class QuoteInsideMarketThrottleTicksModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Ticks"; public override string help_text { get; } = string.Empty; @@ -22,7 +22,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_inside_market_throttle(leg_tup) is QuoteInsideMarketDistanceWithTravel inside_market_throttle) inside_market_throttle.TicksFromInside = value; } @@ -34,7 +34,7 @@ namespace mbts.spark { leg_tup.leg_params.QuoteParams.QuoteInsideMarketDistanceWithTravel; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.QuoteInsideMarketDistanceWithTravel.TicksFromInside); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.QuoteInsideMarketDistanceWithTravel.TicksFromInside); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/QuoteQueueHolderModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/QuoteQueueHolderModel.cs index 0342d0489..a3e3f2f28 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/QuoteQueueHolderModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/QuoteQueueHolderModel.cs @@ -9,7 +9,7 @@ namespace mbts.spark { class QuoteQueueHolderModel : RowModelBase, IHaveFontParams { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public QuoteQueueHolderModel() { } @@ -27,7 +27,7 @@ namespace mbts.spark public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; leg_tup.leg_params.QuoteParams.NQueueHolderOrders = value ; } @@ -38,7 +38,7 @@ namespace mbts.spark leg_tup.leg_params.QuoteParams; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => 0u); + _value_store.GetValueOrDefault(leg_tup.id, _ => 0u); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/ShowQuantity/ShowQuantityQuantityModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/ShowQuantity/ShowQuantityQuantityModel.cs index 4cdb916f1..8f1673cee 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/ShowQuantity/ShowQuantityQuantityModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/ShowQuantity/ShowQuantityQuantityModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { internal class ShowQuantityQuantityModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name => "Quantity"; @@ -24,7 +24,7 @@ namespace mbts.spark { _get_value(leg_tup) is NullableQuantity show_quantity ? show_quantity.Quantity : _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_value(leg_tup) is NullableQuantity show_quantity) { show_quantity.Quantity = value; } @@ -37,7 +37,7 @@ namespace mbts.spark { leg_tup.leg_params.QuoteParams.ShowQuantity; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.ShowQuantity.Quantity); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.ShowQuantity.Quantity); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleInsideTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleInsideTicksModel.cs index fbb31e836..da7bd2b38 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleInsideTicksModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleInsideTicksModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class QuoteThrottleInsideTicksModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Inside Ticks"; public override string help_text { get; } = string.Empty; @@ -22,7 +22,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_throttle(leg_tup) is QuoteMuteZone throttle) throttle.InsideTicks = value; } @@ -34,7 +34,7 @@ namespace mbts.spark { leg_tup.leg_params.QuoteParams.QuoteMuteZone; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.QuoteMuteZone.InsideTicks); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.QuoteMuteZone.InsideTicks); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleOutsideTicksModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleOutsideTicksModel.cs index cfa2c8194..a1df97c4f 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleOutsideTicksModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/Quote/Throttle/QuoteThrottleOutsideTicksModel.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; namespace mbts.spark { partial class SyntheticEditorVM { class QuoteThrottleOutsideTicksModel : RowModelBase { - IDictionary _value_store = new Dictionary(); + IDictionary _value_store = new Dictionary(); public override string display_name { get; } = "Outside Ticks"; public override string help_text { get; } = string.Empty; @@ -22,7 +22,7 @@ namespace mbts.spark { _value_from_store(leg_tup); public override void set_value(LegSpreaderParamsTuple leg_tup, uint value) { - _value_store[leg_tup.SecurityKey] = value; + _value_store[leg_tup.id] = value; if (_get_throttle(leg_tup) is QuoteMuteZone throttle) throttle.OutsideTicks = value; } @@ -34,7 +34,7 @@ namespace mbts.spark { leg_tup.leg_params.QuoteParams.QuoteMuteZone; uint _value_from_store(LegSpreaderParamsTuple leg_tup) => - _value_store.GetValueOrDefault(leg_tup.SecurityKey, _ => SyntheticDataHelper.Defaults.QuoteMuteZone.OutsideTicks); + _value_store.GetValueOrDefault(leg_tup.id, _ => SyntheticDataHelper.Defaults.QuoteMuteZone.OutsideTicks); } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs b/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs index 3d516614f..8575c953c 100644 --- a/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs +++ b/src/client/spark/Modules/Spreader/VM/ParameterRows/RowModel.cs @@ -42,8 +42,8 @@ namespace mbts.spark { } internal abstract class RowModelBase : ViewModelBase, IRowModel { - readonly Dictionary> _enabled_store = new Dictionary>(); - readonly Dictionary> _override_value_store = new Dictionary>(); + readonly Dictionary> _enabled_store = new Dictionary>(); + readonly Dictionary> _override_value_store = new Dictionary>(); protected RowModelBase() { } @@ -59,22 +59,22 @@ namespace mbts.spark { public virtual ICell create_cell(LegSpreaderParamsTuple leg_tup) => new Cell(this, leg_tup); public void set_enabled(LegSpreaderParamsTuple leg_tup, bool enabled) => - _enabled_store.GetOrAdd(leg_tup.SecurityKey, sec => new ReplaySubject(1)).OnNext(enabled); + _enabled_store.GetOrAdd(leg_tup, sec => new ReplaySubject(1)).OnNext(enabled); public void override_value(LegSpreaderParamsTuple leg_tup, T value) { - if (_override_value_store.TryGetValue(leg_tup.SecurityKey, out Subject subject)) + if (_override_value_store.TryGetValue(leg_tup, out Subject subject)) subject.OnNext(value); } public IObservable observe_enabled(LegSpreaderParamsTuple leg_tup) => - _enabled_store.GetOrAdd(leg_tup.leg.Security.Id, sec => { + _enabled_store.GetOrAdd(leg_tup, sec => { var rs = new ReplaySubject(1); rs.OnNext(_get_enabled(leg_tup)); return rs; }); public IObservable observe_override_value(LegSpreaderParamsTuple leg_tup) => - _override_value_store.GetOrAdd(leg_tup.leg.Security.Id, sec => new Subject()); + _override_value_store.GetOrAdd(leg_tup, sec => new Subject()); protected virtual bool _get_enabled(LegSpreaderParamsTuple leg_tup) => true; #region IRowModel (explicit) diff --git a/src/client/spark/Modules/Spreader/VM/RowVM.cs b/src/client/spark/Modules/Spreader/VM/RowVM.cs index 7f7b9019e..86493bd0c 100644 --- a/src/client/spark/Modules/Spreader/VM/RowVM.cs +++ b/src/client/spark/Modules/Spreader/VM/RowVM.cs @@ -1,6 +1,4 @@ -using bts.api; -using mbts.collections; -using mbts.ui.controls; +using mbts.ui.controls; using mbts.ui.spark; using mbts.ui.utility; using System; @@ -18,8 +16,8 @@ namespace mbts.spark { ParameterSection[] section_path { get; } } - internal class RowVM : DataGridExRow, IParameterRowVM, IDisposable { - readonly ObservableKeyedCollection, uint> _cells = new ObservableKeyedCollection, uint>(kv => kv.Key); + internal class RowVM : DataGridExRow, IParameterRowVM, IDisposable { + readonly ObservableCollection<(LegSpreaderParamsTuple leg, ICell cell)> _cells = new ObservableCollection<(LegSpreaderParamsTuple leg, ICell cell)>(); readonly Property _has_errors; IDisposable _dispose; @@ -34,15 +32,16 @@ namespace mbts.spark { _has_errors = backing(nameof(has_errors), false); _dispose = Disposable.Create( - ObservableAutoWrapper.connect(legs, _cells, lt => new KeyValuePair(lt.SecurityKey, (model.create_cell(lt), lt))), - ObservableAutoWrapper.connect_item_hooks(_cells, kv => { - kv.Value.cell.value_changed += raise_cell_value_changed; + ObservableAutoWrapper.connect(legs, _cells, lt => (lt, model.create_cell(lt))), + ObservableAutoWrapper.connect_item_hooks(_cells, tup => { + var (leg, cell) = tup; + cell.value_changed += raise_cell_value_changed; return new CompositeDisposable { - Disposable.Create(() => kv.Value.cell.value_changed -= raise_cell_value_changed), - kv.Value.cell as IDisposable ?? Disposable.empty + Disposable.Create(() => cell.value_changed -= raise_cell_value_changed), + cell as IDisposable ?? Disposable.empty }; void raise_cell_value_changed() => - cell_value_changed?.Invoke(kv.Value.cell, kv.Value.leg); + cell_value_changed?.Invoke(cell, leg); }, true)); } @@ -56,8 +55,13 @@ namespace mbts.spark { public bool read_only { get; } public bool has_errors => _has_errors.Value; - public override object get_cell(Security col_key) => - _cells.TryGetValue(col_key.Id, out KeyValuePair kv) ? kv.Value.cell : null; + public override object get_cell(LegSpreaderParamsTuple leg_tup) => + // Note this is an O(n) op. + // If need ever arises to improve perf here, + // an id member could be added to the LegSpreaderParamsTuple, + // which could serve as a sorting key to enable Log(n) lookups. + leg_tup != null && + _cells.TryGetFirst(t => t.leg == leg_tup, out var match) ? match.cell : null; public ParameterSection this[string section_no] => int.TryParse(section_no, out int i) && i < section_path.Length ? section_path[i] : null; diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs index b9c676d9e..a99d8043f 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticEditorVM.cs @@ -88,7 +88,7 @@ namespace mbts.spark { _close_new_leg_popup(); } }; - remove_leg = new DelegateCommand(s => leg_tuples.removeFirst(l => l.leg.Security.Id == s.Id)); + remove_leg = new DelegateCommand(l => leg_tuples.Remove(l)); commit = new AsyncCommand(commit_async, () => leg_count >= 2); if (override_auto_set_behavior) { @@ -112,6 +112,14 @@ namespace mbts.spark { commit.RaiseCanExecuteChanged(); _validate_leg_count(); }; + _resources.Add(ObservableAutoWrapper.connect_item_hooks(leg_tuples, l => { + l.security_changed += on_sec_changed; + return Disposable.Create(() => l.security_changed -= on_sec_changed); + void on_sec_changed() { + if (_set_name_automatically) + _deduce_name(); + } + })); async Task commit_async() { RequestUpdate?.Invoke(); @@ -130,12 +138,7 @@ namespace mbts.spark { if (valid) { _synthetic.Synthetic.Legs.SetItems(leg_tuples.Select(l => l.leg)); _synthetic.Symbol = _deduce_symbol(_synthetic); - double tick_frac = _tick_factors.tick_unit / _tick_factors.tick_base; - _synthetic.ContractSpec.LowTick = tick_frac; - _synthetic.ContractSpec.HighTick = tick_frac; - _synthetic.ContractSpec.PriceBreak = double.MaxValue; - _synthetic.ContractSpec.MainFraction = (uint)MathUtils.factor_out(_tick_factors.tick_base, 10); - _synthetic.ContractSpec.PriceDisplayFormat = (uint)_tick_factors.display_digits(); + _synthetic.ContractSpec = _tick_factors.to_spec(); uint? id = await model.create_synthetic(new SecurityImmutable(_synthetic)); if (id.HasValue && id != 0) { if (await model.save_strategy(id.Value, get_strategy())) { @@ -377,4 +380,4 @@ namespace mbts.spark { else clear_error(nameof(leg_count)); } } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index e370685ea..fcb682772 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -38,10 +38,10 @@ namespace mbts.spark { IWindowSettingsManager _settings_manager; int _total_row_count; - public FillsVM(IBus bus, OrdersModel model, IObservable state_obs, IWindowSettingsManager settings_manager) - : this(bus, model, state_obs, _get_observable(bus, model, state_obs), settings_manager) { } + public FillsVM(IBus bus, OrdersModel model, FillsSettings settings, IWindowSettingsManager settings_manager) + : this(bus, model, settings, _get_observable(bus, model, settings), settings_manager) { } - public FillsVM(IBus bus, OrdersModel model, IObservable state_obs, IObservable> fills_source, IWindowSettingsManager settings_manager) { + public FillsVM(IBus bus, OrdersModel model, FillsSettings settings, IObservable> fills_source, IWindowSettingsManager settings_manager) { _model = model; _settings_manager = settings_manager; /// Columns @@ -136,8 +136,6 @@ namespace mbts.spark { // this will initialize the immutable properties that correspond to the col_settings_flags above (e.g. Bid/Ask font_color_override, etc.) if (_settings_manager != null) grid_settings_manager.load_from(_settings_manager.current_settings()); - var filter_src = Observable.FromEvent>, Func>(cb => _rows_manager.filter_changed += cb, cb => _rows_manager.filter_changed -= cb); - var comp_src = Observable.FromEvent>, IComparer>(cb => _rows_manager.comparer_changed += cb, cb => _rows_manager.comparer_changed -= cb); TableUpdate last_unfiltered_fills = TableUpdate.mk_empty(FillTuple.key_fn); var fills_buffer = Observable.Create>(o => { // this is what .Cache() does, but is a little cheaper, since we know subscriptions and callbacks occur on the same thread (i.e., on this Dispatcher). @@ -145,29 +143,36 @@ namespace mbts.spark { _unfiltered_fills_changed += o.OnNext; return Disposable.Create(() => _unfiltered_fills_changed -= o.OnNext); }); + if (settings.grid != null && _settings_manager != null) { + // this means we are not using defaults, + // Note: settings_manager in turn notifies grid_settings_manager of this update + _settings_manager.instance_settings = settings.grid; + } + _rows_manager.on_settings(settings.filters ?? new FillsFilterStates { + fill_time = new TimeFilterTuple( + TimeFilterMode.CMEOpen, + TimeTextTuple.FromDateTime(DateTime.Today), + TimeTextTuple.FromDateTime(DateTime.Today.AddDays(1))) + }, + settings.sorting_criterion); + // resources/subscriptions _dispose = new CompositeDisposable( ObservableAutoWrapper.connect(col_tups, columns, ct => ct.col), ObservableAutoWrapper.connect_item_hooks(col_tups, ct => ct.filter as IDisposable), - RXCollection.connect(rows, fills_buffer.Filter(filter_src, FillTuple.key_fn), comp_src, ft => new Row(ft, model), r => r.fill_tuple), + RXCollection.connect( + rows, + fills_buffer.Filter(_rows_manager.observe_filter(), FillTuple.key_fn), + _rows_manager.observe_comparer(), + ft => new Row(ft, model), + r => r.fill_tuple, + Row.update, + r => r.is_selected, + (r, is_selected) => r.is_selected = is_selected), fills_source.OnDispatcher().Subscribe(t => { last_unfiltered_fills = t; Set(ref _total_row_count, t.state.Count, nameof(total_row_count)); _unfiltered_fills_changed?.Invoke(t); }), - state_obs.OnDispatcher().Subscribe(s => { - if (s.grid != null && _settings_manager != null) { - // this means we are not using defaults, - // Note: settings_manager in turn notifies grid_settings_manager of this update - _settings_manager.instance_settings = s.grid; - } - var fs = s.filters ?? new FillsFilterStates { - fill_time = new TimeFilterTuple( - TimeFilterMode.CMEOpen, - TimeTextTuple.FromDateTime(DateTime.Today), - TimeTextTuple.FromDateTime(DateTime.Today.AddDays(1))) - }; - _rows_manager.on_settings(fs, s.sorting_criterion); - }), model.subscribe_all_algos().SelectKeyValue(AlgoDataVM.from_data, d => AlgoID.from_algo_key(d.data.key)).OnDispatcher().Subscribe(root_algo_type_observer), settings_manager == null ? Disposable.empty : settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager) ); @@ -262,33 +267,40 @@ namespace mbts.spark { } public class Row : SecurityRow, IEquatable, IRowVM { - public readonly FillTuple fill_tuple; + public static readonly Func update = + (r, ft) => { + using (_change_detector.detect_changes(r)) { + r._badge_fill = null; + r._root_algo_badge_color = null; + r._order_metadata = null; + r.fill_tuple = ft; + } + return r; + }; + + static readonly IPropertyChangedDetector _change_detector = + ObjectSnapshot.build_detector_except(nameof(fill_key), nameof(is_selected)); readonly OrdersModel _model; - readonly FillImmutable _fill; - readonly OrderRecordImmutable _order; - AlgoData? _root_algo => fill_tuple.root_algo; - AlgoDefinitionMetadata? _root_algo_meta => fill_tuple.root_algo_meta; Brush _badge_fill; Color? _root_algo_badge_color; OrderMetadata _order_metadata; + bool _is_selected; public Row(FillTuple fill_tuple, OrdersModel model) : base(fill_tuple.security ?? SecurityDataHelper.Defaults.SecurityImmutable) { this.fill_tuple = fill_tuple; - _fill = fill_tuple.fill; - _order = fill_tuple.order ?? OrderDataHelper.Defaults.OrderRecordImmutable; _model = model; - account = fill_tuple.account; } + public FillTuple fill_tuple { get; private set; } public DateTime fill_time => _fill.Timestamp.to_local_time(); public TimeInForce time_in_force => _order.time_in_force(); public OrderType order_type => _order.order_type(); public string display_name => OrderUtils.display_name(_order, fill_tuple.algo); public OrderMetadata order_metadata => _order_metadata ?? (_order_metadata = _model.factory.get_metadata(_order.Def.CustomDef.CustomCase)); public Brush badge_fill => _badge_fill ?? (_badge_fill = OrderUtils.badge_fill(fill_tuple.algo_meta, order_metadata)); - public string account { get; private set; } + public string account => fill_tuple.account; public string user => _order.user(); public Venue exchange => security.Exchange; public Side side => _fill.Side; @@ -298,6 +310,10 @@ namespace mbts.spark { public FillStatus fill_status => _fill.FillStatus; public string fill_key => _fill.FillKey; public string order_key => _order.Key.ToString(); + public bool is_selected { + get => _is_selected; + set => Set(ref _is_selected, value); + } // Root Algo public OrderType root_algo_order_type => _root_algo.HasValue ? _root_algo.Value.value.CustomCase : OrderType.None; @@ -305,6 +321,11 @@ namespace mbts.spark { public Color root_algo_badge_color => _root_algo_badge_color ?? (_root_algo_badge_color = OrderUtils.badge_color(_root_algo_meta, root_algo_order_metadata)).Value; public string root_algo_display_name => fill_tuple.root_order_security?.display_name() ?? OrderType.None.display_name(); + FillImmutable _fill => fill_tuple.fill; + OrderRecordImmutable _order => fill_tuple.order ?? OrderDataHelper.Defaults.OrderRecordImmutable; + AlgoData? _root_algo => fill_tuple.root_algo; + AlgoDefinitionMetadata? _root_algo_meta => fill_tuple.root_algo_meta; + public bool Equals(Row other) => other != null && other._fill.Equals(_fill) && other._order.Equals(_order); public override bool Equals(object obj) => Equals(obj as Row); public override int GetHashCode() => _fill.FillKey.GetHashCode() ^ _order.Key.GetHashCode(); @@ -313,4 +334,4 @@ namespace mbts.spark { void IRowVM.raise_invalidated() => invalidated?.Invoke(); } } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml b/src/client/spark/Modules/Trading/Fills/FillsView.xaml index b8d3410da..2e4b581f5 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml +++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml @@ -9,7 +9,6 @@ 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}" > @@ -49,10 +48,15 @@ CanExecute="{x:Static c:DIYGrid.DefaultRowActionCanExecute}" /> - - - - + + + + + + + diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs index 090fd86b5..1b2b66464 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs @@ -6,7 +6,6 @@ using bts.spark; using mbts.persist; using mbts.ui; using mbts.ui.settings; -using mbts.ui.shell; using mbts.ui.spark; using mbts.ui.utility; using mbts.utils; @@ -26,7 +25,6 @@ namespace mbts.spark { FillsView _view; FillsSettings _state; IReadOnlyList _commands; - IDisposable _subscriptions; public FillsWindow(FillsWindowFactory factory, IBus bus, OrdersModel orders_model, FillsSettings state, WindowSettingsManager settings_manager) : base("Fills", bus, factory, SparkCommands.ShowFills().icon) { @@ -36,8 +34,6 @@ namespace mbts.spark { thread_id = config.Configuration.get().fills ? "Fills" : null; } - event Action _state_changed; - public override string window_type => window_type_name; public override UIElement Content => _view; public override IEnumerable Commands => _commands; @@ -54,8 +50,7 @@ namespace mbts.spark { public void thread_init() { _init_guard.check_access(); Log.notnull(_state); - var state_src = Observable.FromEvent, FillsSettings>(cb => _state_changed += cb, cb => _state_changed -= cb).StartWith(_state); - _vm = new FillsVM(_bus, _orders_model, state_src, _settings_manager); + _vm = new FillsVM(_bus, _orders_model, _state, _settings_manager); _view = new FillsView { DataContext = _vm }; _commands = new List { @@ -77,15 +72,6 @@ namespace mbts.spark { return dialog; })) }; - _subscriptions = Disposable.Create(() => - _state_changed?.Invoke( - _state = new FillsSettings(_state.orders, - _vm.get_sorting_criterion().ToList(), - _vm.get_filters(), - _vm.grid_settings_manager.create() - ) - ) - ); } public override void Dispose() { @@ -93,4 +79,4 @@ namespace mbts.spark { Commands.OfType().DisposeAll(); } } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs index 30a1059d7..fcb66670d 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs @@ -284,6 +284,7 @@ namespace mbts.spark { favorite_algos = new LadderFavoriteAlgosSettings(null, 2, null); show_warn_on_cross = _default_show_warn_on_cross; enforce_max_clip = _default_enforce_max_clip; + status_message_visible = true; } public static LadderSettings Default { @@ -351,6 +352,7 @@ namespace mbts.spark { mini_ob = new LadderMiniOrderBookSettings(bts.shell.orderbook.OrderBookStartupData.default_mini_grid.general), max_clip = 0, price_display_format = PriceDisplayFormat.Default, + status_message_visible = true, }; rv.row_height = LadderRender.measure_row_height(rv); return rv; @@ -519,6 +521,9 @@ namespace mbts.spark { [ProtoMember(60)] public PriceDisplayFormat price_display_format { get; set; } + [ProtoMember(61), DefaultValue(true)] + public bool status_message_visible { get; set; } + public void sanitize() => sanitize(this); @@ -623,7 +628,8 @@ namespace mbts.spark { a.mini_ob == b.mini_ob && a.enforce_max_clip == b.enforce_max_clip && a.max_clip == b.max_clip && - a.price_display_format == b.price_display_format; + a.price_display_format == b.price_display_format && + a.status_message_visible == b.status_message_visible; public bool Equals(LadderSettings other) => profile_equals(this, other) && diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index 22d2a75b5..48bb1ed72 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -79,7 +79,8 @@ namespace mbts.spark { _clear_visibility = new OrderEntryPanelItemVisibilityVM("Clear"), _cancel_buys_visibility = new OrderEntryPanelItemVisibilityVM("Cancel Buys"), _cancel_sells_visibility = new OrderEntryPanelItemVisibilityVM("Cancel Sells"), - _cancel_all_visibility = new OrderEntryPanelItemVisibilityVM("Cancel All"); + _cancel_all_visibility = new OrderEntryPanelItemVisibilityVM("Cancel All"), + _status_message_visibility = new OrderEntryPanelItemVisibilityVM("Status Message"); public LadderSettingsVM(OrdersModel model, SecurityImmutable security) { _model = model; @@ -253,6 +254,7 @@ namespace mbts.spark { yield return _cancel_buys_visibility; yield return _cancel_sells_visibility; yield return _cancel_all_visibility; + yield return _status_message_visibility; } } @@ -296,6 +298,7 @@ namespace mbts.spark { yield return _cancel_buys_visibility; yield return _cancel_sells_visibility; yield return _cancel_all_visibility; + yield return _status_message_visibility; // other yield return size_display; yield return favorite_algos_vm; @@ -361,6 +364,7 @@ namespace mbts.spark { _cancel_all_visibility.show = settings.cancel_all_visible; price_format = settings.net_change; price_display_format = settings.price_display_format; + _status_message_visibility.show = settings.status_message_visible; // safety checks show_warn_on_cross = settings.show_warn_on_cross; enforce_max_clip = settings.enforce_max_clip; @@ -438,6 +442,7 @@ namespace mbts.spark { clone.zoom_slider_visible = _zoom_slider_visbility.show; clone.net_change = price_format; clone.price_display_format = price_display_format; + clone.status_message_visible = _status_message_visibility.show; // safety checks clone.show_warn_on_cross = show_warn_on_cross; clone.enforce_max_clip = enforce_max_clip; diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index ca85b7b7f..6538b59c7 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -32,7 +32,7 @@ namespace mbts.spark { readonly Property _auto_clear; readonly PropertyAutoWrapper _show_day, _show_high, _show_low, _show_open, _show_settle, _show_volume, _show_account, _show_tif, _show_order_type, _show_size_preset, _show_auto_clear, _show_clear, _show_cancel_buys, - _show_cancel_sells, _show_cancel_all, _show_zoom; + _show_cancel_sells, _show_cancel_all, _show_zoom, _show_status_message; readonly PropertyAutoWrapper _bid_background, _bid_foreground, _ask_background, _ask_foreground; readonly HashSet _sticky_algos = new HashSet(); double @@ -116,6 +116,7 @@ namespace mbts.spark { (_show_cancel_sells = bool_prop(nameof(show_cancel_sells), s => s.cancel_sells_visible)).set, (_show_cancel_all = bool_prop(nameof(show_cancel_all), s => s.cancel_all_visible)).set, (_show_zoom = bool_prop(nameof(show_zoom), s => s.zoom_slider_visible)).set, + (_show_status_message = bool_prop(nameof(show_status_message), s => s.status_message_visible)).set, s => { if ( Set(ref _show_account_position, s.account_position_visible, nameof(show_account_position)) | @@ -341,6 +342,7 @@ namespace mbts.spark { public bool show_cancel_sells => _show_cancel_sells.view; public bool show_cancel_all => _show_cancel_all.view; public bool show_zoom => _show_zoom.view; + public bool show_status_message => _show_status_message.view; // left panel scroll props public double left_panel_view_port_height { get => _left_panel_view_port_height; diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml index c0275583a..0fbbf5137 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml @@ -627,8 +627,8 @@ message to have the topmost Z order --> - -