Simplify interfaces

CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs

@@ -103,21 +103,24 @@ namespace UnitsNet
 
         private void GenerateInterfaceExtensions()
         {
-            // generate the base interface (either IVectorQuantity, IAffineQuantity or ILogarithmicQuantity)
+            Writer.WL($@"
+        IQuantity<{_quantity.Name}, {_unitEnumName}>, ");
+
+            // generate ILogarithmicQuantity, IAffineQuantity or ILinearQuantity
             if (_quantity.Logarithmic)
             {
-                Writer.WL(@$"
-        ILogarithmicQuantity<{_quantity.Name}, {_unitEnumName}>,");
+                Writer.WL($@"
+        ILogarithmicQuantity<{_quantity.Name}>,");
             }
             else if (!string.IsNullOrEmpty(_quantity.AffineOffsetType))
             {
-                Writer.WL(@$"
-        IAffineQuantity<{_quantity.Name}, {_unitEnumName}, {_quantity.AffineOffsetType}>,");
+                Writer.WL($@"
+        IAffineQuantity<{_quantity.Name}, {_quantity.AffineOffsetType}>,");
             }
-            else // the default quantity type implements the IVectorQuantity interface
+            else // the default quantity type implements the ILinearQuantity interface
             {
-                Writer.WL(@$"
-        IArithmeticQuantity<{_quantity.Name}, {_unitEnumName}>,");
+                Writer.WL($@"
+        ILinearQuantity<{_quantity.Name}>,");
             }
 
             Writer.WL(@"

UnitsNet/Extensions/LogarithmicQuantityExtensions.cs

@@ -176,7 +176,7 @@ public static TQuantity Sum<TSource, TQuantity>(this IEnumerable<TSource> source
     ///     logarithmic space.
     /// </remarks>
     public static TQuantity Sum<TQuantity, TUnit>(this IEnumerable<TQuantity> quantities, TUnit targetUnit)
-        where TQuantity : ILogarithmicQuantity<TQuantity, TUnit>
+        where TQuantity : ILogarithmicQuantity<TQuantity>, IQuantity<TQuantity, TUnit>
         where TUnit : struct, Enum
     {
         if (quantities is null)
@@ -228,7 +228,7 @@ public static TQuantity Sum<TQuantity, TUnit>(this IEnumerable<TQuantity> quanti
     ///     logarithmic space.
     /// </remarks>
     public static TQuantity Sum<TSource, TQuantity, TUnit>(this IEnumerable<TSource> source, Func<TSource, TQuantity> selector, TUnit targetUnit)
-        where TQuantity : ILogarithmicQuantity<TQuantity, TUnit>
+        where TQuantity : ILogarithmicQuantity<TQuantity>, IQuantity<TQuantity, TUnit>
         where TUnit : struct, Enum
     {
         return source.Select(selector).Sum(targetUnit);
@@ -316,7 +316,7 @@ public static TQuantity ArithmeticMean<TSource, TQuantity>(this IEnumerable<TSou
     ///     averaged, and then the result is converted back to logarithmic space using the same unit.
     /// </remarks>
     public static TQuantity ArithmeticMean<TQuantity, TUnit>(this IEnumerable<TQuantity> quantities, TUnit unit)
-        where TQuantity : ILogarithmicQuantity<TQuantity, TUnit>
+        where TQuantity : ILogarithmicQuantity<TQuantity>, IQuantity<TQuantity, TUnit>
         where TUnit : struct, Enum
     {
         if (quantities is null)
@@ -371,7 +371,7 @@ public static TQuantity ArithmeticMean<TQuantity, TUnit>(this IEnumerable<TQuant
     ///     averaged, and then the result is converted back to logarithmic space using the same unit.
     /// </remarks>
     public static TQuantity ArithmeticMean<TSource, TQuantity, TUnit>(this IEnumerable<TSource> source, Func<TSource, TQuantity> selector, TUnit targetUnit)
-        where TQuantity : ILogarithmicQuantity<TQuantity, TUnit>
+        where TQuantity : ILogarithmicQuantity<TQuantity>, IQuantity<TQuantity, TUnit>
         where TUnit : struct, Enum
     {
         return ArithmeticMean(source.Select(selector), targetUnit);
@@ -456,7 +456,7 @@ public static TQuantity GeometricMean<TSource, TQuantity>(this IEnumerable<TSour
     ///     logarithmic quantities is equal to the sum the values, converted in unit of the first element.
     /// </remarks>
     public static TQuantity GeometricMean<TQuantity, TUnit>(this IEnumerable<TQuantity> quantities, TUnit targetUnit)
-        where TQuantity : ILogarithmicQuantity<TQuantity, TUnit>
+        where TQuantity : ILogarithmicQuantity<TQuantity>, IQuantity<TQuantity, TUnit>
         where TUnit : struct, Enum
     {
         if (quantities is null)
@@ -506,7 +506,7 @@ public static TQuantity GeometricMean<TQuantity, TUnit>(this IEnumerable<TQuanti
     ///     logarithmic quantities is equal to the sum the values, converted in unit of the first element.
     /// </remarks>
     public static TQuantity GeometricMean<TSource, TQuantity, TUnit>(this IEnumerable<TSource> source, Func<TSource, TQuantity> selector, TUnit targetUnit)
-        where TQuantity : ILogarithmicQuantity<TQuantity, TUnit>
+        where TQuantity : ILogarithmicQuantity<TQuantity>, IQuantity<TQuantity, TUnit>
         where TUnit : struct, Enum
     {
         return source.Select(selector).GeometricMean(targetUnit);