From ce7ec0c68d77f3f049554d901deb92dffede8a03 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 3 Oct 2023 10:12:18 -0400 Subject: [PATCH] refactor: Get rid of redundant UniversalNumericComparer --- .../core/Utility/UniversalNumericComparer.cs | 106 ------------------ .../Numeric/NumericSignBrushConverter.cs | 4 +- 2 files changed, 3 insertions(+), 107 deletions(-) delete mode 100644 src/client/spark/core/Utility/UniversalNumericComparer.cs diff --git a/src/client/spark/core/Utility/UniversalNumericComparer.cs b/src/client/spark/core/Utility/UniversalNumericComparer.cs deleted file mode 100644 index 9896b44de..000000000 --- a/src/client/spark/core/Utility/UniversalNumericComparer.cs +++ /dev/null @@ -1,106 +0,0 @@ -using System; - -namespace bts.utils { - /// - /// An IComparable implementation that supports cross type comparisons of any combination of int, uint, double, and decimal. - /// - readonly struct UniversalNumericComparer : IComparable { - readonly int? _int; - readonly uint? _uint; - readonly double? _double; - readonly decimal? _decimal; - - public UniversalNumericComparer(int i) { - _int = i; - _uint = null; - _double = null; - _decimal = null; - } - - public UniversalNumericComparer(double d) { - _int = null; - _uint = null; - _double = d; - _decimal = null; - } - - public UniversalNumericComparer(uint u) { - _int = null; - _uint = u; - _double = null; - _decimal = null; - } - - public UniversalNumericComparer(decimal d) { - _int = null; - _uint = null; - _double = null; - _decimal = d; - } - - public int CompareTo(object obj) { - if (obj is int i) { - return -(i.CompareTo(this)); - } else if (obj is uint u) { - return -(u.CompareTo(this)); - } else if (obj is double d) - return -(d.CompareTo(this)); - else if (obj is decimal dec) - return -(dec.CompareTo(this)); - throw new ArgumentException("Obj is not of a supported numeric type (int, uint, double).", nameof(obj)); - } - - public static implicit operator int(UniversalNumericComparer w) { - if (w._int.HasValue) - return w._int.Value; - else if (w._double.HasValue) - return (int)w._double.Value; - else if (w._uint.HasValue) - return (int)w._uint.Value; - else if (w._decimal.HasValue) - return (int)w._decimal.Value; - return 0; - } - - public static implicit operator uint(UniversalNumericComparer w) { - if (w._uint.HasValue) - return w._uint.Value; - else if (w._int.HasValue) - return (uint)w._int.Value; - else if (w._double.HasValue) - return (uint)w._double.Value; - else if (w._decimal.HasValue) - return (uint)w._decimal.Value; - return 0u; - } - - public static implicit operator double(UniversalNumericComparer w) { - if (w._double.HasValue) - return w._double.Value; - else if (w._int.HasValue) - return w._int.Value; - else if (w._uint.HasValue) - return w._uint.Value; - else if (w._decimal.HasValue) - return (double)w._decimal.Value; - return 0.0; - } - - public static implicit operator decimal(UniversalNumericComparer w) { - if (w._double.HasValue) - return (decimal)w._double.Value; - else if (w._int.HasValue) - return w._int.Value; - else if (w._uint.HasValue) - return w._uint.Value; - else if (w._decimal.HasValue) - return w._decimal.Value; - return 0; - } - - public static implicit operator UniversalNumericComparer(int i) => new UniversalNumericComparer(i); - public static implicit operator UniversalNumericComparer(uint u) => new UniversalNumericComparer(u); - public static implicit operator UniversalNumericComparer(double d) => new UniversalNumericComparer(d); - public static implicit operator UniversalNumericComparer(decimal d) => new UniversalNumericComparer(d); - } -} diff --git a/src/client/spark/view/Converters/Numeric/NumericSignBrushConverter.cs b/src/client/spark/view/Converters/Numeric/NumericSignBrushConverter.cs index bb22df2f7..fec25d68c 100644 --- a/src/client/spark/view/Converters/Numeric/NumericSignBrushConverter.cs +++ b/src/client/spark/view/Converters/Numeric/NumericSignBrushConverter.cs @@ -1,5 +1,7 @@ using bts.utils; +using Spark.Core.Math; + using System; using System.Globalization; using System.Windows.Data; @@ -55,7 +57,7 @@ namespace mbts.ui.converters { _brushes.error.Clone().with(value).frozen()); } } - public IComparable Zero { get; set; } = new UniversalNumericComparer(0.0); + public IComparable Zero { get; set; } = new NumericOneof(0.0); public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { var comparable = value as IComparable;