Remove TValueType from IQuantity

Author: Muximize

CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs

@@ -69,7 +69,7 @@ namespace UnitsNet
             Writer.WL(@$"
     [DataContract]
     public readonly partial struct {_quantity.Name} :
-        {(_quantity.GenerateArithmetic ? "IArithmeticQuantity" : "IQuantity")}<{_quantity.Name}, {_unitEnumName}, {_quantity.ValueType}>,");
+        {(_quantity.GenerateArithmetic ? "IArithmeticQuantity" : "IQuantity")}<{_quantity.Name}, {_unitEnumName}>,");
 
             if (_quantity.Relations.Any(r => r.Operator is "*" or "/"))
             {

UnitsNet.Tests/CustomCode/IQuantityTests.cs

@@ -57,27 +57,5 @@ public void ToUnit_GivenSIUnitSystem_ReturnsSIQuantity()
             Assert.Equal(0.0508, inSI.Value);
             Assert.Equal(LengthUnit.Meter, inSI.Unit);
         }
-
-
-        [Fact]
-        public void IQuantityTUnitDouble_Value_ReturnsDouble()
-        {
-            IQuantity<TemperatureUnit, double> doubleQuantity = Temperature.FromDegreesCelsius(1234.5);
-            Assert.IsType<double>(doubleQuantity.Value);
-        }
-
-        [Fact]
-        public void IQuantityTUnitDouble_AsEnum_ReturnsDouble()
-        {
-            IQuantity<TemperatureUnit, double> doubleQuantity = Temperature.FromDegreesCelsius(1234.5);
-            Assert.IsType<double>(doubleQuantity.As(TemperatureUnit.Kelvin));
-        }
-
-        [Fact]
-        public void IQuantityTUnitDouble_AsUnitSystem_ReturnsDouble()
-        {
-            IQuantity<TemperatureUnit, double> doubleQuantity = Temperature.FromDegreesCelsius(1234.5);
-            Assert.IsType<double>(doubleQuantity.As(UnitSystem.SI));
-        }
     }
 }

UnitsNet.Tests/QuantityTests.cs

@@ -31,9 +31,9 @@ public void GetHashCodeForDifferentQuantitiesWithSameValuesAreNotEqual()
         public void Equals_IGenericEquatableQuantity(string q1String, string q2String, string toleranceString, bool expectedEqual)
         {
             // This interfaces implements .NET generic math interfaces.
-            IQuantity<Length, LengthUnit, double> q1 = ParseLength(q1String);
-            IQuantity<Length, LengthUnit, double> q2 = ParseLength(q2String);
-            IQuantity<Length, LengthUnit, double> tolerance = ParseLength(toleranceString);
+            IQuantity<Length, LengthUnit> q1 = ParseLength(q1String);
+            IQuantity<Length, LengthUnit> q2 = ParseLength(q2String);
+            IQuantity<Length, LengthUnit> tolerance = ParseLength(toleranceString);
 
             Assert.Equal(expectedEqual, q1.Equals(q2, tolerance));
         }
@@ -88,9 +88,9 @@ public void Equals_IQuantity_ToleranceIsDifferentType_Throws()
         [Fact]
         public void Equals_GenericEquatableIQuantity_OtherIsNull_ReturnsFalse()
         {
-            IQuantity<Length, LengthUnit, double> q1 = ParseLength("10 m");
-            IQuantity<Length, LengthUnit, double>? q2 = null;
-            IQuantity<Length, LengthUnit, double> tolerance = ParseLength("0.1 m");
+            IQuantity<Length, LengthUnit> q1 = ParseLength("10 m");
+            IQuantity<Length, LengthUnit>? q2 = null;
+            IQuantity<Length, LengthUnit> tolerance = ParseLength("0.1 m");
 
             Assert.False(q1.Equals(q2, tolerance));
         }

UnitsNet/IArithmeticQuantity.cs

@@ -7,26 +7,21 @@
 namespace UnitsNet;
 
 /// <summary>
-///     An <see cref="IQuantity{TSelf, TUnitType, TValueType}"/> that (in .NET 7+) implements generic math interfaces for arithmetic operations.
+///     An <see cref="IQuantity{TSelf, TUnitType}"/> that (in .NET 7+) implements generic math interfaces for arithmetic operations.
 /// </summary>
 /// <typeparam name="TSelf">The type itself, for the CRT pattern.</typeparam>
 /// <typeparam name="TUnitType">The underlying unit enum type.</typeparam>
-/// <typeparam name="TValueType">The underlying value type for internal representation.</typeparam>
-public interface IArithmeticQuantity<TSelf, TUnitType, TValueType> : IQuantity<TSelf, TUnitType, TValueType>
+public interface IArithmeticQuantity<TSelf, TUnitType> : IQuantity<TSelf, TUnitType>
 #if NET7_0_OR_GREATER
     , IAdditionOperators<TSelf, TSelf, TSelf>
     , IAdditiveIdentity<TSelf, TSelf>
     , ISubtractionOperators<TSelf, TSelf, TSelf>
-    , IMultiplyOperators<TSelf, TValueType, TSelf>
-    , IDivisionOperators<TSelf, TValueType, TSelf>
+    , IMultiplyOperators<TSelf, double, TSelf>
+    , IDivisionOperators<TSelf, double, TSelf>
     , IUnaryNegationOperators<TSelf, TSelf>
 #endif
-    where TSelf : IArithmeticQuantity<TSelf, TUnitType, TValueType>
+    where TSelf : IArithmeticQuantity<TSelf, TUnitType>
     where TUnitType : Enum
-    where TValueType : struct
-#if NET7_0_OR_GREATER
-    , INumber<TValueType>
-#endif
 {
 #if NET7_0_OR_GREATER
     /// <summary>

UnitsNet/IQuantity.cs

@@ -142,49 +142,22 @@ public interface IQuantity<TUnitType> : IQuantity
         new IQuantity<TUnitType> ToUnit(UnitSystem unitSystem);
     }
 
-    /// <summary>
-    ///     A quantity backed by a particular value type with a stronger typed interface where the unit enum type is known, to avoid passing in the
-    ///     wrong unit enum type and not having to cast from <see cref="Enum"/>.
-    /// </summary>
-    /// <typeparam name="TUnitType">The unit type of the quantity.</typeparam>
-    /// <typeparam name="TValueType">The value type of the quantity.</typeparam>
-    public interface IQuantity<TUnitType, out TValueType> : IQuantity<TUnitType>
-        where TUnitType : Enum
-#if NET7_0_OR_GREATER
-        where TValueType : INumber<TValueType>
-#else
-        where TValueType : struct
-#endif
-    {
-        /// <summary>
-        ///     Convert to a unit representation <typeparamref name="TUnitType"/>.
-        /// </summary>
-        /// <returns>Value converted to the specified unit.</returns>
-        new TValueType As(TUnitType unit);
-    }
-
     /// <summary>
     ///     An <see cref="IQuantity{TUnitType}"/> that (in .NET 7+) implements generic math interfaces for equality, comparison and parsing.
     /// </summary>
     /// <typeparam name="TSelf">The type itself, for the CRT pattern.</typeparam>
     /// <typeparam name="TUnitType">The underlying unit enum type.</typeparam>
-    /// <typeparam name="TValueType">The underlying value type for internal representation.</typeparam>
 #if NET7_0_OR_GREATER
-    public interface IQuantity<TSelf, TUnitType, out TValueType>
-        : IQuantity<TUnitType, TValueType>
+    public interface IQuantity<TSelf, TUnitType>
+        : IQuantity<TUnitType>
         , IComparisonOperators<TSelf, TSelf, bool>
         , IParsable<TSelf>
 #else
-    public interface IQuantity<in TSelf, TUnitType, out TValueType>
-        : IQuantity<TUnitType, TValueType>
+    public interface IQuantity<in TSelf, TUnitType>
+        : IQuantity<TUnitType>
 #endif
-        where TSelf : IQuantity<TSelf, TUnitType, TValueType>
+        where TSelf : IQuantity<TSelf, TUnitType>
         where TUnitType : Enum
-#if NET7_0_OR_GREATER
-        where TValueType : INumber<TValueType>
-#else
-        where TValueType : struct
-#endif
     {
         /// <summary>
         ///     <para>