From 90f1bb085109fbf95fa362274b0abd00ebcdeff7 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 20 Mar 2025 11:19:35 -0400 Subject: [PATCH] refactor: Move PNL data types to spark_api csproj --- .../spark/Model/Trading/PositionModel.cs | 2 +- .../Trading/ManualFills/ManualFillRow.cs | 1 + .../Trading/OrderBook/OrderBookRowVM.cs | 1 + .../spark/Modules/Trading/PNL/Data/PNLData.cs | 163 ------------- .../spark/view/Spark/Shell/CalculatorLogic.cs | 1 + .../Utility/DisplayTranslatorExtensions.cs | 27 +++ .../spark/view/Utility/IDisplayTranslator.cs | 215 ------------------ .../spark_api/Orders/WorkingOrderData.cs | 69 ++++++ .../spark_api/Orders/WorkingOrdersSideData.cs | 128 +++++++++++ .../data/DisplayQuantityMultiplier.cs | 99 ++++++++ .../spark_api/data/IDisplayTranslator.cs | 60 +++++ .../spark_api/data/QuantityConversionData.cs | 43 ++++ .../Collections}/ReverseComparer.cs | 40 ++-- 13 files changed, 450 insertions(+), 399 deletions(-) create mode 100644 src/client/spark/view/Utility/DisplayTranslatorExtensions.cs delete mode 100644 src/client/spark/view/Utility/IDisplayTranslator.cs create mode 100644 src/client/spark_api/Orders/WorkingOrderData.cs create mode 100644 src/client/spark_api/Orders/WorkingOrdersSideData.cs create mode 100644 src/client/spark_api/data/DisplayQuantityMultiplier.cs create mode 100644 src/client/spark_api/data/IDisplayTranslator.cs create mode 100644 src/client/spark_api/data/QuantityConversionData.cs rename src/client/{spark/core/Utility => spark_core/Collections}/ReverseComparer.cs (95%) diff --git a/src/client/spark/Model/Trading/PositionModel.cs b/src/client/spark/Model/Trading/PositionModel.cs index 15f0e2ba3..2f3d0def7 100644 --- a/src/client/spark/Model/Trading/PositionModel.cs +++ b/src/client/spark/Model/Trading/PositionModel.cs @@ -11,8 +11,8 @@ namespace Spark.Trading { using mbts.analytics; using mbts.spark; - using mbts.ui; + using Spark.Api.Data; using Spark.Api.Orders; using Spark.Api.Reactive; using Spark.Core; diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillRow.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillRow.cs index 60aad0efa..00d2fccab 100644 --- a/src/client/spark/Modules/Trading/ManualFills/ManualFillRow.cs +++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillRow.cs @@ -5,6 +5,7 @@ using mbts.spark; using mbts.ui; using mbts.ui.shell; +using Spark.Api.Data; using Spark.Core.Data; using Spark.Core.Disposables; using Spark.Core.Reflection; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index cd1e857bc..baf7e0216 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -8,6 +8,7 @@ using bts.utils; using mbts.ui; using mbts.ui.controls; +using Spark.Api.Data; using Spark.Api.Orders; using Spark.Core.Collections; using Spark.ViewModel.Commands; diff --git a/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs b/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs index c539b7270..0c01ddfd5 100644 --- a/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs +++ b/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs @@ -36,169 +36,6 @@ namespace bts.shell.pnl { Settle } - readonly struct WorkingOrderData { - public readonly WorkingOrderSideData long_data, short_data; - - WorkingOrderData(WorkingOrderSideData long_data, WorkingOrderSideData short_data) { - this.long_data = long_data; - this.short_data = short_data; - } - - public static WorkingOrderData Empty => - new WorkingOrderData(WorkingOrderSideData.EmptyLong, WorkingOrderSideData.EmptyShort); - - public double top_bid => - long_data.data.Count > 0 ? - long_data.data.First().Key : - double.NaN; - - public double top_ask => - short_data.data.Count > 0 ? - short_data.data.First().Key : - double.NaN; - - public PositionPriceSize summary => - new PositionPriceSize(long_data.working_total, long_data.avg_price, short_data.working_total, short_data.avg_price); - - public static WorkingOrderData Create( - IEnumerable orders, QuantityConversionData qty_conversion) => - Create(orders.Select(o => (o, qty_conversion))); - - public static WorkingOrderData Create( - IEnumerable<(OrderRecordImmutable order, QuantityConversionData qty_conversion)> orders) => - orders.Aggregate(Empty, (seed, tup) => seed.Add(tup.order, tup.qty_conversion)); - - public WorkingOrderData Add(OrderRecordImmutable order, QuantityConversionData qty_conversion) { - if (order.working_quantity() <= 0) - return new WorkingOrderData(long_data, short_data); - switch (order.side()) { - case Side.Buy: return new WorkingOrderData(long_data.Add(order, qty_conversion), short_data); - case Side.Sell: return new WorkingOrderData(long_data, short_data.Add(order, qty_conversion)); - default: throw ExceptionBuilder.Argument.unexpected_case(order.side(), "order.side"); - } - } - - public WorkingOrderData Remove(OrderRecordImmutable order) { - if (order.working_quantity() <= 0) - return new WorkingOrderData(long_data, short_data); - switch (order.side()) { - case Side.Buy: return new WorkingOrderData(long_data.Remove(order.Key, order.price()), short_data); - case Side.Sell: return new WorkingOrderData(long_data, short_data.Remove(order.Key, order.price())); - default: throw ExceptionBuilder.Argument.unexpected_case(order.side(), "order.side"); - } - } - } - - readonly struct WorkingOrderSideData { - public readonly double avg_price, display_avg_price; - public readonly ImmutableSortedDictionary qty_conversion)>> data; - public readonly double working_total; - public readonly double display_working_total; - - WorkingOrderSideData( - double avg_price, - double working_total, - double display_avg_price, - double display_working_total, - ImmutableSortedDictionary)>> data - ) { - this.avg_price = avg_price; - this.working_total = working_total; - this.display_avg_price = display_avg_price; - this.data = data; - this.display_working_total = display_working_total; - } - - public static WorkingOrderSideData EmptyLong => new( - double.NaN, 0, double.NaN, 0, - ImmutableSortedDictionary.Create)>>( - new ReverseComparer(new OrderPriceComparer()))); - - public static WorkingOrderSideData EmptyShort => new( - double.NaN, 0, double.NaN, 0, - ImmutableSortedDictionary.Create)>>( - new OrderPriceComparer())); - - public double top_price => - data.Count > 0 ? - data.First().Key : - double.NaN; - - public double top_volume => - data.Count > 0 ? - data.Values.First().Values.Sum(o => o.order.working_quantity()) : - 0; - - public double display_top_volume => - data.Count > 0 ? - data.Values.First().Values.Sum(o => o.qty_conversion - .convert_numeric_type() - .to_display(o.order.working_quantity())) : - 0; - - public WorkingOrderSideData Add(OrderRecordImmutable order_record) => - Add(order_record, new()); - - public WorkingOrderSideData Add( - OrderRecordImmutable order_record, QuantityConversionData qty_conversion) { - var working_qty = order_record.working_quantity(); - if (working_qty <= 0) - throw new ArgumentException(nameof(working_qty)); - uint order = order_record.Key; - var dworking_qty = qty_conversion.to_display(working_qty); - double price = order_record.price(); - if (working_total == 0) { - Log.assert(display_working_total == 0); - return new WorkingOrderSideData(price, working_qty, display_avg_price, dworking_qty, data.Add( - price, ImmutableDictionary)>.Empty.Add(order, (order_record, qty_conversion)))); - } else return new WorkingOrderSideData( - avg_price + ((price - avg_price) * ((double)working_qty / (working_total + working_qty))), - working_total + working_qty, - display_avg_price + ((price - display_avg_price) * ((double)dworking_qty / (display_working_total + dworking_qty))), - display_working_total + dworking_qty, - data.SetItem(price, data.TryGetValue(price, out var curr) ? - curr.Add(order, (order_record, qty_conversion)) : - ImmutableDictionary)>.Empty.Add(order, (order_record, qty_conversion)))); - } - - public WorkingOrderSideData Remove(uint order, double price) { - var tmp_data = data; - if (!tmp_data.TryGetValue(price, out var wdata)) - throw new KeyNotFoundException(nameof(price)); - if (!wdata.TryGetValue(order, out var worder)) - throw new KeyNotFoundException(nameof(order)); - var wqty = worder.order.working_quantity(); - var dwqty = worder.qty_conversion.to_display(wqty); - wdata = wdata.Remove(order); - if (wdata.Count == 0) - tmp_data = tmp_data.Remove(price); - if (tmp_data.Count == 0) - return new( - double.NaN, 0, double.NaN, 0, - ImmutableSortedDictionary.Create)>>( - data.KeyComparer)); - return new( - avg_price - ((price - avg_price) * (wqty / (working_total - wqty))), - working_total - wqty, - display_avg_price - ((price - display_avg_price) * (dwqty / (display_working_total - dwqty))), - display_working_total - dwqty, - tmp_data); - } - - public override string ToString() { - if (data.Count > 0) { - var best_order = data.Values.First().Values.First(); - return OrderUtils.order_collection_summary( - best_order.order.price(), - display_avg_price, - best_order.qty_conversion.to_display(best_order.order.working_quantity()), - display_working_total, - Security.Defaults.ContractSpecificationImmutable); - } - return string.Empty; - } - } - readonly struct PNLRowData : IEquatable { public static readonly Func key_fn = d => d.key; public static IComparer key_comparer = Comparer.Default.wrap(d => d.key); diff --git a/src/client/spark/view/Spark/Shell/CalculatorLogic.cs b/src/client/spark/view/Spark/Shell/CalculatorLogic.cs index ea3740108..4b56155a9 100644 --- a/src/client/spark/view/Spark/Shell/CalculatorLogic.cs +++ b/src/client/spark/view/Spark/Shell/CalculatorLogic.cs @@ -6,6 +6,7 @@ using mbts.ui; using mbts.ui.shell; + using Spark.Api.Data; using Spark.Core.Disposables; using System; diff --git a/src/client/spark/view/Utility/DisplayTranslatorExtensions.cs b/src/client/spark/view/Utility/DisplayTranslatorExtensions.cs new file mode 100644 index 000000000..88cfddefd --- /dev/null +++ b/src/client/spark/view/Utility/DisplayTranslatorExtensions.cs @@ -0,0 +1,27 @@ +namespace mbts.ui; + +using mbts.ui.shell; + +using Spark.Api.Data; +using Spark.Core.Disposables; + +using System; + +static class DisplayTranslatorExtensions { + public static IDisposable connect_owner( + this IDisplayTranslator display_translator, + IRaiseNotifyPropertyChanged owner, + params string[] properties + ) { + if (display_translator is null) + throw new ArgumentNullException(nameof(display_translator)); + if (owner is null) + throw new ArgumentNullException(nameof(owner)); + display_translator.value_changed += on_value_changed; + return Disposable.Create(() => display_translator.value_changed -= on_value_changed); + void on_value_changed() { + for (int i = 0; i < properties.Length; i++) + owner.raise_notify_property_changed(properties[i]); + } + } +} diff --git a/src/client/spark/view/Utility/IDisplayTranslator.cs b/src/client/spark/view/Utility/IDisplayTranslator.cs deleted file mode 100644 index c8d64692e..000000000 --- a/src/client/spark/view/Utility/IDisplayTranslator.cs +++ /dev/null @@ -1,215 +0,0 @@ -using bts.utils; - -using mbts.ui.shell; - -using Spark.Core; -using Spark.Core.Disposables; - -using System; -using System.Collections.Generic; -using System.Numerics; -using System.Reactive.Linq; - -namespace mbts.ui { - interface IDisplayTranslator { - T display_value { get; set; } - T actual_value { get; set; } - event Action value_changed; - } - - enum QuantityConversionOpType { - None, - MultiplyActual, - DivideActual - } - - readonly struct QuantityConversionData : IEquatable> - where T : INumber { - public QuantityConversionData(T value, QuantityConversionOpType op) { - this.value = value; - this.op = op; - } - - public enum OpType { - None, - MultiplyActual, - DivideActual - } - - public T value { get; } - public QuantityConversionOpType op { get; } - - public QuantityConversionData convert_numeric_type() - where TResult : INumber => - new(NumericCastConverter.convert(value), op); - - public bool Equals(QuantityConversionData other) => - value == other.value && - op == other.op; - - public override bool Equals(object obj) => - obj is QuantityConversionData other && Equals(other); - - public override int GetHashCode() => - EqualityComparer.auto_phase(value.GetHashCode(), op.GetHashCode()); - - public static bool operator ==(QuantityConversionData x, QuantityConversionData y) => - x.Equals(y); - - public static bool operator !=(QuantityConversionData x, QuantityConversionData y) => - !x.Equals(y); - } - - static class DisplayQuantityMultiplier { - public static DisplayQuantityMultiplier create_uint() => new( - DisplayTranslatorExtensions.to_display, - DisplayTranslatorExtensions.from_display); - - public static DisplayQuantityMultiplier create_double() => new( - DisplayTranslatorExtensions.to_display, - DisplayTranslatorExtensions.from_display); - } - - class DisplayQuantityMultiplier : IDisplayTranslator where T : struct, INumber { - readonly Func, T, T> _to_display, _from_display; - readonly IEqualityComparer _comparer; - T _actual_value; - QuantityConversionData _conversion_data; - - public DisplayQuantityMultiplier( - Func, T, T> to_display, - Func, T, T> from_display, - IEqualityComparer comparer = null, - T actual_value = default, - QuantityConversionData conversion_data = default) { - // - _to_display = to_display ?? throw new ArgumentNullException(nameof(to_display)); - _from_display = from_display ?? throw new ArgumentNullException(nameof(from_display)); - _comparer = comparer ?? EqualityComparer.Default; - _actual_value = actual_value; - _conversion_data = conversion_data; - } - - public event Action value_changed; - - public T actual_value { - get => _actual_value; - set { - if (!_comparer.Equals(_actual_value, value)) { - _actual_value = value; - value_changed?.Invoke(); - } - } - } - - public T display_value { - get => _to_display(_conversion_data, _actual_value); - set => actual_value = _from_display(_conversion_data, value); - } - - public QuantityConversionData conversion_data { - get => _conversion_data; - set { - if (_conversion_data != value) { - _conversion_data = value; - value_changed?.Invoke(); - } - } - } - } - - class OptionalDisplayQuantityMultiplier : IDisplayTranslator where T : struct, INumber { - T? _actual_value; - QuantityConversionData _conversion_data; - - public event Action value_changed; - - public T? actual_value { - get => _actual_value; - set { - if (_actual_value != value) { - _actual_value = value; - value_changed?.Invoke(); - } - } - } - - public T? display_value { - get => _actual_value.HasValue ? - _conversion_data.to_display(_actual_value.Value) : _actual_value; - set => actual_value = value.HasValue ? - _conversion_data.from_display(value.Value) : value; - } - - public QuantityConversionData conversion_data { - get => _conversion_data; - set { - if (_conversion_data != value) { - _conversion_data = value; - value_changed?.Invoke(); - } - } - } - } - - static class DisplayTranslatorExtensions { - public static IDisposable connect_owner( - this IDisplayTranslator display_translator, - IRaiseNotifyPropertyChanged owner, - params string[] properties - ) { - if (display_translator is null) - throw new ArgumentNullException(nameof(display_translator)); - if (owner is null) - throw new ArgumentNullException(nameof(owner)); - display_translator.value_changed += on_value_changed; - return Disposable.Create(() => display_translator.value_changed -= on_value_changed); - void on_value_changed() { - for (int i = 0; i < properties.Length; i++) - owner.raise_notify_property_changed(properties[i]); - } - } - - public static IObservable subscribe_actual_value( - this IDisplayTranslator display_translator) => - subscribe_actual_value(display_translator, EqualityComparer.Default); - - public static IObservable subscribe_actual_value( - this IDisplayTranslator display_translator, IEqualityComparer comparer) { - if (comparer is null) - throw new ArgumentNullException(nameof(comparer)); - return Observable.Create(o => { - var curr = display_translator.actual_value; - o.OnNext(curr); - display_translator.value_changed += on_value_changed; - return Disposable.Create(() => display_translator.value_changed -= on_value_changed); - void on_value_changed() { - var next = display_translator.actual_value; - if (!comparer.Equals(curr, next)) - o.OnNext(curr = next); - } - }); - } - - public static T to_display( - this QuantityConversionData quantity_conversion_data, T actual_value) - where T : INumber => - quantity_conversion_data.op switch { - QuantityConversionOpType.DivideActual => - actual_value.safe_divide(quantity_conversion_data.value), - QuantityConversionOpType.MultiplyActual => - actual_value * quantity_conversion_data.value, - _ => actual_value, - }; - - public static T from_display( - this QuantityConversionData quantity_conversion_data, T display_value) - where T : INumber => - quantity_conversion_data.op switch { - QuantityConversionOpType.DivideActual => display_value * quantity_conversion_data.value, - QuantityConversionOpType.MultiplyActual => - display_value.safe_divide(quantity_conversion_data.value), - _ => display_value, - }; - } -} diff --git a/src/client/spark_api/Orders/WorkingOrderData.cs b/src/client/spark_api/Orders/WorkingOrderData.cs new file mode 100644 index 000000000..9034376d7 --- /dev/null +++ b/src/client/spark_api/Orders/WorkingOrderData.cs @@ -0,0 +1,69 @@ +namespace bts.shell.pnl; + +using bts.api; +using bts.api.orderman; + +using mbts.spark; +using mbts.utils; + +using Spark.Api.Data; +using Spark.Api.Orders; +using Spark.Api.Position; + +using System.Collections.Generic; +using System.Linq; + +readonly struct WorkingOrderData { + public readonly WorkingOrderSideData long_data, short_data; + + WorkingOrderData(WorkingOrderSideData long_data, WorkingOrderSideData short_data) { + this.long_data = long_data; + this.short_data = short_data; + } + + public static WorkingOrderData Empty => + new(WorkingOrderSideData.EmptyLong, WorkingOrderSideData.EmptyShort); + + public double top_bid => + long_data.data.Count > 0 ? + long_data.data.First().Key : + double.NaN; + + public double top_ask => + short_data.data.Count > 0 ? + short_data.data.First().Key : + double.NaN; + + public PositionPriceSize summary => + new(long_data.working_total, long_data.avg_price, short_data.working_total, short_data.avg_price); + + public static WorkingOrderData Create( + IEnumerable orders, QuantityConversionData qty_conversion) => + Create(orders.Select(o => (o, qty_conversion))); + + public static WorkingOrderData Create( + IEnumerable<(OrderRecordImmutable order, QuantityConversionData qty_conversion)> orders) => + orders.Aggregate(Empty, (seed, tup) => seed.Add(tup.order, tup.qty_conversion)); + + public WorkingOrderData Add(OrderRecordImmutable order, QuantityConversionData qty_conversion) { + if (order.working_quantity() <= 0) { + return new(long_data, short_data); + } + return order.side() switch { + Side.Buy => new(long_data.Add(order, qty_conversion), short_data), + Side.Sell => new(long_data, short_data.Add(order, qty_conversion)), + _ => throw ExceptionBuilder.Argument.unexpected_case(order.side(), "order.side"), + }; + } + + public WorkingOrderData Remove(OrderRecordImmutable order) { + if (order.working_quantity() <= 0) { + return new(long_data, short_data); + } + return order.side() switch { + Side.Buy => new(long_data.Remove(order.Key, order.price()), short_data), + Side.Sell => new(long_data, short_data.Remove(order.Key, order.price())), + _ => throw ExceptionBuilder.Argument.unexpected_case(order.side(), "order.side"), + }; + } +} diff --git a/src/client/spark_api/Orders/WorkingOrdersSideData.cs b/src/client/spark_api/Orders/WorkingOrdersSideData.cs new file mode 100644 index 000000000..da3098f15 --- /dev/null +++ b/src/client/spark_api/Orders/WorkingOrdersSideData.cs @@ -0,0 +1,128 @@ +namespace bts.shell.pnl; + +using bts.api; +using bts.api.orderman; + +using mbts.spark; +using mbts.utils; + +using Spark.Api.Data; +using Spark.Api.Orders; + +using System; +using System.Collections.Generic; +using System.Collections.Immutable; +using System.Linq; + +public readonly struct WorkingOrderSideData { + public readonly double avg_price, display_avg_price; + public readonly ImmutableSortedDictionary qty_conversion)>> data; + public readonly double working_total; + public readonly double display_working_total; + + WorkingOrderSideData( + double avg_price, + double working_total, + double display_avg_price, + double display_working_total, + ImmutableSortedDictionary)>> data + ) { + this.avg_price = avg_price; + this.working_total = working_total; + this.display_avg_price = display_avg_price; + this.data = data; + this.display_working_total = display_working_total; + } + + public static WorkingOrderSideData EmptyLong => new( + double.NaN, 0, double.NaN, 0, + ImmutableSortedDictionary.Create)>>( + new ReverseComparer(new OrderPriceComparer()))); + + public static WorkingOrderSideData EmptyShort => new( + double.NaN, 0, double.NaN, 0, + ImmutableSortedDictionary.Create)>>( + new OrderPriceComparer())); + + public double top_price => + data.Count > 0 ? + data.First().Key : + double.NaN; + + public double top_volume => + data.Count > 0 ? + data.Values.First().Values.Sum(o => o.order.working_quantity()) : + 0; + + public double display_top_volume => + data.Count > 0 ? + data.Values.First().Values.Sum(o => o.qty_conversion + .convert_numeric_type() + .to_display(o.order.working_quantity())) : + 0; + + public WorkingOrderSideData Add(OrderRecordImmutable order_record) => + Add(order_record, new()); + + public WorkingOrderSideData Add( + OrderRecordImmutable order_record, QuantityConversionData qty_conversion) { + var working_qty = order_record.working_quantity(); + if (working_qty <= 0) + throw new ArgumentException(nameof(working_qty)); + uint order = order_record.Key; + var dworking_qty = qty_conversion.to_display(working_qty); + double price = order_record.price(); + if (working_total == 0) { + Log.assert(display_working_total == 0); + return new WorkingOrderSideData(price, working_qty, display_avg_price, dworking_qty, data.Add( + price, ImmutableDictionary)>.Empty.Add(order, (order_record, qty_conversion)))); + } else return new WorkingOrderSideData( + avg_price + ((price - avg_price) * ((double)working_qty / (working_total + working_qty))), + working_total + working_qty, + display_avg_price + ((price - display_avg_price) * ((double)dworking_qty / (display_working_total + dworking_qty))), + display_working_total + dworking_qty, + data.SetItem(price, data.TryGetValue(price, out var curr) ? + curr.Add(order, (order_record, qty_conversion)) : + ImmutableDictionary)>.Empty.Add(order, (order_record, qty_conversion)))); + } + + public WorkingOrderSideData Remove(uint order, double price) { + var tmp_data = data; + if (!tmp_data.TryGetValue(price, out var wdata)) + throw new KeyNotFoundException(nameof(price)); + if (!wdata.TryGetValue(order, out var worder)) + throw new KeyNotFoundException(nameof(order)); + var wqty = worder.order.working_quantity(); + var dwqty = worder.qty_conversion.to_display(wqty); + wdata = wdata.Remove(order); + if (wdata.Count == 0) + tmp_data = tmp_data.Remove(price); + if (tmp_data.Count == 0) + return new( + double.NaN, 0, double.NaN, 0, + ImmutableSortedDictionary.Create)>>( + data.KeyComparer)); + return new( + avg_price - ((price - avg_price) * (wqty / (working_total - wqty))), + working_total - wqty, + display_avg_price - ((price - display_avg_price) * (dwqty / (display_working_total - dwqty))), + display_working_total - dwqty, + tmp_data); + } + + public override string ToString() { + if (data.Count > 0) { + if (display_working_total == 0) { + return string.Empty; + } + var spec = Security.Defaults.ContractSpecificationImmutable; + var best_order = data.Values.First().Values.First(); + var best_price_volume = best_order.qty_conversion.to_display(best_order.order.working_quantity()); + var best_price = best_order.order.price(); + return display_working_total == best_price_volume ? + $"{best_price_volume} @ {spec.format(best_price)}" : + $"{best_price_volume} ({display_working_total}) @ {spec.format(best_price)}"; + } + return string.Empty; + } +} diff --git a/src/client/spark_api/data/DisplayQuantityMultiplier.cs b/src/client/spark_api/data/DisplayQuantityMultiplier.cs new file mode 100644 index 000000000..850d64f28 --- /dev/null +++ b/src/client/spark_api/data/DisplayQuantityMultiplier.cs @@ -0,0 +1,99 @@ +namespace Spark.Api.Data; + +using mbts.ui; + +using System; +using System.Collections.Generic; +using System.Numerics; + +public class DisplayQuantityMultiplier : IDisplayTranslator where T : struct, INumber { + readonly Func, T, T> _to_display, _from_display; + readonly IEqualityComparer _comparer; + T _actual_value; + QuantityConversionData _conversion_data; + + public DisplayQuantityMultiplier( + Func, T, T> to_display, + Func, T, T> from_display, + IEqualityComparer comparer = null, + T actual_value = default, + QuantityConversionData conversion_data = default) { + // + _to_display = to_display ?? throw new ArgumentNullException(nameof(to_display)); + _from_display = from_display ?? throw new ArgumentNullException(nameof(from_display)); + _comparer = comparer ?? EqualityComparer.Default; + _actual_value = actual_value; + _conversion_data = conversion_data; + } + + public event Action value_changed; + + public T actual_value { + get => _actual_value; + set { + if (!_comparer.Equals(_actual_value, value)) { + _actual_value = value; + value_changed?.Invoke(); + } + } + } + + public T display_value { + get => _to_display(_conversion_data, _actual_value); + set => actual_value = _from_display(_conversion_data, value); + } + + public QuantityConversionData conversion_data { + get => _conversion_data; + set { + if (_conversion_data != value) { + _conversion_data = value; + value_changed?.Invoke(); + } + } + } +} + +public class OptionalDisplayQuantityMultiplier : IDisplayTranslator where T : struct, INumber { + T? _actual_value; + QuantityConversionData _conversion_data; + + public event Action value_changed; + + public T? actual_value { + get => _actual_value; + set { + if (_actual_value != value) { + _actual_value = value; + value_changed?.Invoke(); + } + } + } + + public T? display_value { + get => _actual_value.HasValue ? + _conversion_data.to_display(_actual_value.Value) : _actual_value; + set => actual_value = value.HasValue ? + _conversion_data.from_display(value.Value) : value; + } + + public QuantityConversionData conversion_data { + get => _conversion_data; + set { + if (_conversion_data != value) { + _conversion_data = value; + value_changed?.Invoke(); + } + } + } +} + +public static class DisplayQuantityMultiplier { + public static DisplayQuantityMultiplier create_uint() => new( + DisplayTranslatorExtensions.to_display, + DisplayTranslatorExtensions.from_display); + + public static DisplayQuantityMultiplier create_double() => new( + DisplayTranslatorExtensions.to_display, + DisplayTranslatorExtensions.from_display); +} diff --git a/src/client/spark_api/data/IDisplayTranslator.cs b/src/client/spark_api/data/IDisplayTranslator.cs new file mode 100644 index 000000000..bbf878840 --- /dev/null +++ b/src/client/spark_api/data/IDisplayTranslator.cs @@ -0,0 +1,60 @@ +using bts.utils; + +using Spark.Core.Disposables; + +using System; +using System.Collections.Generic; +using System.Numerics; +using System.Reactive.Linq; + +namespace Spark.Api.Data; + +public interface IDisplayTranslator { + T display_value { get; set; } + T actual_value { get; set; } + event Action value_changed; +} + +public static class DisplayTranslatorExtensions { + public static IObservable subscribe_actual_value( + this IDisplayTranslator display_translator) => + subscribe_actual_value(display_translator, EqualityComparer.Default); + + public static IObservable subscribe_actual_value( + this IDisplayTranslator display_translator, IEqualityComparer comparer) { + if (comparer is null) + throw new ArgumentNullException(nameof(comparer)); + return Observable.Create(o => { + var curr = display_translator.actual_value; + o.OnNext(curr); + display_translator.value_changed += on_value_changed; + return Disposable.Create(() => display_translator.value_changed -= on_value_changed); + void on_value_changed() { + var next = display_translator.actual_value; + if (!comparer.Equals(curr, next)) + o.OnNext(curr = next); + } + }); + } + + public static T to_display( + this QuantityConversionData quantity_conversion_data, T actual_value) + where T : INumber => + quantity_conversion_data.op switch { + QuantityConversionOpType.DivideActual => + actual_value.safe_divide(quantity_conversion_data.value), + QuantityConversionOpType.MultiplyActual => + actual_value * quantity_conversion_data.value, + _ => actual_value, + }; + + public static T from_display( + this QuantityConversionData quantity_conversion_data, T display_value) + where T : INumber => + quantity_conversion_data.op switch { + QuantityConversionOpType.DivideActual => display_value * quantity_conversion_data.value, + QuantityConversionOpType.MultiplyActual => + display_value.safe_divide(quantity_conversion_data.value), + _ => display_value, + }; +} diff --git a/src/client/spark_api/data/QuantityConversionData.cs b/src/client/spark_api/data/QuantityConversionData.cs new file mode 100644 index 000000000..83ba67e95 --- /dev/null +++ b/src/client/spark_api/data/QuantityConversionData.cs @@ -0,0 +1,43 @@ +namespace Spark.Api.Data; + +using Spark.Core; + +using System; +using System.Numerics; + +public enum QuantityConversionOpType { + None, + MultiplyActual, + DivideActual +} + +public readonly struct QuantityConversionData : IEquatable> + where T : INumber { + public QuantityConversionData(T value, QuantityConversionOpType op) { + this.value = value; + this.op = op; + } + + public T value { get; } + public QuantityConversionOpType op { get; } + + public QuantityConversionData convert_numeric_type() + where TResult : INumber => + new(NumericCastConverter.convert(value), op); + + public bool Equals(QuantityConversionData other) => + value == other.value && + op == other.op; + + public override bool Equals(object obj) => + obj is QuantityConversionData other && Equals(other); + + public override int GetHashCode() => + HashCode.Combine(value, op); + + public static bool operator ==(QuantityConversionData x, QuantityConversionData y) => + x.Equals(y); + + public static bool operator !=(QuantityConversionData x, QuantityConversionData y) => + !x.Equals(y); +} diff --git a/src/client/spark/core/Utility/ReverseComparer.cs b/src/client/spark_core/Collections/ReverseComparer.cs similarity index 95% rename from src/client/spark/core/Utility/ReverseComparer.cs rename to src/client/spark_core/Collections/ReverseComparer.cs index 2618ae1ed..5fc5da853 100644 --- a/src/client/spark/core/Utility/ReverseComparer.cs +++ b/src/client/spark_core/Collections/ReverseComparer.cs @@ -1,20 +1,20 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace mbts.utils { - public class ReverseComparer : IComparer { - private readonly IComparer _wrapped; - - public ReverseComparer(IComparer wrapped) { - _wrapped = wrapped; - } - - public int Compare(T x, T y) { - // reverse operands - return _wrapped.Compare(y, x); - } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace mbts.utils { + public class ReverseComparer : IComparer { + private readonly IComparer _wrapped; + + public ReverseComparer(IComparer wrapped) { + _wrapped = wrapped; + } + + public int Compare(T x, T y) { + // reverse operands + return _wrapped.Compare(y, x); + } + } +}