removing some commented out bits (as per Claud's suggestions)

Author: lipchev

CodeGen/Helpers/ExpressionEvaluationHelpers.cs

@@ -351,8 +351,8 @@ public static string GetConversionExpressionFormat(this CompositeExpression expr
             return $"new ConversionExpression(coefficient: {coefficientTermFormat}, exponent: {exponentFormat})";
         }
 
-        // return $"new ConversionExpression({coefficientTermFormat})";
-        return coefficientTermFormat; // using the implicit constructor from QuantityValue
+        // using the implicit constructor from QuantityValue, which is equivalent to "new ConversionExpression({coefficientTermFormat})"
+        return coefficientTermFormat; 
     }
 
     private static string GetConversionExpressionFormat(string expression, string csharpParameter = "value", string jsonParameter = "{x}")

UnitsNet/CustomCode/QuantityConverters/DynamicQuantityConverter.cs

@@ -1,10 +1,7 @@
 // Licensed under MIT No Attribution, see LICENSE file at the root.
 // Copyright 2013 Andreas Gullberg Larsen ([email protected]). Maintained at https://github.com/angularsen/UnitsNet.
 
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 
 namespace UnitsNet;
 
@@ -55,7 +52,6 @@ private bool TryConvertValue(QuantityValue value, UnitConversionKey conversionKe
 
         if (TryGetUnitInfo(conversionKey.FromUnitKey, out UnitInfo? fromUnitInfo) &&
             TryGetUnitInfo(new UnitKey(conversionKey.FromUnitKey.UnitEnumType, conversionKey.ToUnitValue), out UnitInfo? toUnitInfo))
-            // TryGetUnitInfo(conversionKey.FromUnitKey with { UnitValue = conversionKey.ToUnitValue }, out UnitInfo? toUnitInfo))
         {
             cachedConversion = _unitConversions.GetOrAdd(conversionKey, fromUnitInfo.GetUnitConversionExpressionTo(toUnitInfo, _reduceConstants));
             convertedValue = cachedConversion(value);
@@ -344,7 +340,6 @@ public override TTargetQuantity ConvertTo<TSourceUnit, TTargetQuantity, TTargetU
     {
         var conversionKey = QuantityConversionKey.Create<TSourceUnit, TTargetUnit>(fromUnit);
         QuantityConversionFunction conversionFunction = GetOrAdd(conversionKey, targetQuantityInfo);
-        // return targetQuantityInfo.Create(conversionFunction.Convert(value), conversionFunction.TargetUnit);
         return targetQuantityInfo.From(conversionFunction.Convert(value), conversionFunction.TargetUnit.ToUnit<TTargetUnit>());
     }
 
@@ -359,7 +354,6 @@ private ConvertValueDelegate GetConversionExpression(UnitConversionKey conversio
     {
         UnitInfo fromUnitInfo = GetUnitInfo(conversionKey.FromUnitKey);
         UnitInfo toUnitInfo = GetUnitInfo(new UnitKey(conversionKey.FromUnitKey.UnitEnumType, conversionKey.ToUnitValue));
-        // UnitInfo toUnitInfo = GetUnitInfo(conversionKey.FromUnitKey with { UnitValue = conversionKey.ToUnitValue });
         return fromUnitInfo.GetUnitConversionExpressionTo(toUnitInfo, _reduceConstants);
     }
 

UnitsNet/CustomCode/QuantityConverters/FrozenQuantityConverter.cs

@@ -6,8 +6,6 @@
 #else
 using System.Linq;
 #endif
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 
 namespace UnitsNet;
 
@@ -64,7 +62,6 @@ private bool TryConvertValue(QuantityValue value, UnitConversionKey conversionKe
 
         if (TryGetUnitInfo(conversionKey.FromUnitKey, out UnitInfo? fromUnitInfo) &&
             TryGetUnitInfo(new UnitKey(conversionKey.FromUnitKey.UnitEnumType, conversionKey.ToUnitValue), out UnitInfo? toUnitInfo))
-            // TryGetUnitInfo(conversionKey.FromUnitKey with { UnitValue = conversionKey.ToUnitValue }, out UnitInfo? toUnitInfo))
         {
             convertedValue = toUnitInfo.GetValueFrom(value, fromUnitInfo);
             return true;
@@ -156,7 +153,6 @@ private QuantityValue ConvertValue(QuantityValue value, UnitConversionKey conver
 
         UnitInfo fromUnitInfo = GetUnitInfo(conversionKey.FromUnitKey);
         UnitInfo toUnitInfo = GetUnitInfo(new UnitKey(conversionKey.FromUnitKey.UnitEnumType, conversionKey.ToUnitValue));
-        // UnitInfo toUnitInfo = GetUnitInfo(conversionKey.FromUnitKey with { UnitValue = conversionKey.ToUnitValue });
         return toUnitInfo.GetValueFrom(value, fromUnitInfo);
     }
 

UnitsNet/CustomCode/QuantityInfo/Builder/QuantitiesSelector.cs

@@ -1,8 +1,6 @@
 // Licensed under MIT No Attribution, see LICENSE file at the root.
 // Copyright 2013 Andreas Gullberg Larsen ([email protected]). Maintained at https://github.com/angularsen/UnitsNet.
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace UnitsNet;
@@ -27,8 +25,6 @@ internal QuantitiesSelector(Func<IEnumerable<QuantityInfo>> defaultQuantitiesSel
         _defaultQuantitiesSelection = defaultQuantitiesSelection;
     }
 
-    // internal Lazy<IEnumerable<QuantityInfo>> QuantitiesSelected { get; }
-
     /// <summary>
     ///     Adds additional quantities to the current selection.
     /// </summary>
@@ -95,7 +91,6 @@ internal IEnumerable<QuantityInfo> GetQuantityInfos()
         }
 
         return enumeration;
-        // return enumeration.ToList();
     }
 
     /// <summary>
@@ -129,116 +124,3 @@ internal QuantityInfo<TQuantity, TUnit> CreateOrDefault<TQuantity, TUnit>(Func<Q
         return _quantitiesInfoBuilder is null ? defaultConfiguration() : _quantitiesInfoBuilder.CreateOrDefault(defaultConfiguration);
     }
 }
-
-// /// <summary>
-// ///     Provides functionality to select and configure quantities for use within the UnitsNet library.
-// /// </summary>
-// /// <remarks>
-// ///     This class allows for the selection of default quantities, addition of custom quantities, and configuration of
-// ///     specific quantities.
-// ///     It supports lazy loading of quantities and can be used to build a collection of quantity information dynamically at
-// ///     runtime.
-// /// </remarks>
-// public sealed class QuantitiesSelector
-// {
-//     private readonly Func<IReadOnlyCollection<QuantityInfo>> _defaultQuantitiesSelection;
-//     private IEnumerable<QuantityInfo>? _additionalQuantities;
-//     private QuantitiesInfoBuilder? _quantitiesInfoBuilder;
-//
-//     internal QuantitiesSelector(Func<IReadOnlyCollection<QuantityInfo>> defaultQuantitiesSelection)
-//     {
-//         _defaultQuantitiesSelection = defaultQuantitiesSelection;
-//         QuantitiesSelected = new Lazy<IReadOnlyCollection<QuantityInfo>>(BuildSelection);
-//     }
-//
-//     internal Lazy<IReadOnlyCollection<QuantityInfo>> QuantitiesSelected { get; }
-//
-//     /// <summary>
-//     ///     Adds additional quantities to the current selection.
-//     /// </summary>
-//     /// <param name="quantities">The quantities to be added.</param>
-//     /// <returns>The current <see cref="QuantitiesSelector" /> instance with the additional quantities included.</returns>
-//     /// <remarks>
-//     ///     This method allows for the dynamic addition of custom quantities to the existing selection of quantities.
-//     /// </remarks>
-//     public QuantitiesSelector WithAdditionalQuantities(IEnumerable<QuantityInfo> quantities)
-//     {
-//         _additionalQuantities = _additionalQuantities?.Concat(quantities) ?? quantities;
-//         return this;
-//     }
-//
-//     /// <summary>
-//     ///     Configures a specific quantity with a custom configuration.
-//     /// </summary>
-//     /// <typeparam name="TQuantity">The type of the quantity to configure.</typeparam>
-//     /// <typeparam name="TUnit">The type of the unit associated with the quantity.</typeparam>
-//     /// <param name="createCustomConfigurationDelegate">
-//     ///     A delegate that creates a custom configuration for the specified quantity.
-//     /// </param>
-//     /// <returns>The current instance of <see cref="QuantitiesSelector" /> to allow for method chaining.</returns>
-//     /// <remarks>
-//     ///     This method allows for the customization of a specific quantity by providing a delegate that creates
-//     ///     a custom configuration. It initializes the <see cref="QuantitiesInfoBuilder" /> if it is not already initialized
-//     ///     and uses it to configure the quantity.
-//     /// </remarks>
-//     public QuantitiesSelector Configure<TQuantity, TUnit>(Func<QuantityInfo<TQuantity, TUnit>> createCustomConfigurationDelegate)
-//         where TQuantity : IQuantity<TQuantity, TUnit>
-//         where TUnit : struct, Enum
-//     {
-//         _quantitiesInfoBuilder ??= new QuantitiesInfoBuilder();
-//         _quantitiesInfoBuilder.ConfigureQuantity(createCustomConfigurationDelegate);
-//         return this;
-//     }
-//
-//     private IReadOnlyCollection<QuantityInfo> BuildSelection()
-//     {
-//         if (_quantitiesInfoBuilder is null && _additionalQuantities is null)
-//         {
-//             return _defaultQuantitiesSelection();
-//         }
-//
-//         IEnumerable<QuantityInfo> enumeration = _defaultQuantitiesSelection();
-//         if (_additionalQuantities is not null)
-//         {
-//             enumeration = enumeration.Concat(_additionalQuantities);
-//         }
-//
-//         if (_quantitiesInfoBuilder is not null)
-//         {
-//             enumeration = enumeration.Select(_quantitiesInfoBuilder.CreateOrDefault);
-//         }
-//
-//         return enumeration.ToList();
-//     }
-//
-//     /// <summary>
-//     ///     Creates a quantity information instance using the provided default configuration or a custom configuration
-//     ///     if available.
-//     /// </summary>
-//     /// <typeparam name="TQuantity">
-//     ///     The type of the quantity, which must implement <see cref="IQuantity{TSelf, TUnitType}" />.
-//     /// </typeparam>
-//     /// <typeparam name="TUnit">
-//     ///     The type of the unit, which must be a struct and an enumeration.
-//     /// </typeparam>
-//     /// <param name="defaultConfiguration">
-//     ///     A delegate that provides the default configuration for creating the <see cref="QuantityInfo{TQuantity, TUnit}" />.
-//     /// </param>
-//     /// <returns>
-//     ///     An instance of <see cref="QuantityInfo{TQuantity, TUnit}" /> created using either the default configuration
-//     ///     or a custom configuration if available.
-//     /// </returns>
-//     /// <remarks>
-//     ///     This method checks if a custom configuration is available through the <see cref="QuantitiesInfoBuilder" />.
-//     ///     If no custom configuration is available, it falls back to the provided default configuration.
-//     /// </remarks>
-//     /// <exception cref="ArgumentNullException">
-//     ///     Thrown if the <paramref name="defaultConfiguration" /> is <c>null</c>.
-//     /// </exception>
-//     internal QuantityInfo<TQuantity, TUnit> CreateOrDefault<TQuantity, TUnit>(Func<QuantityInfo<TQuantity, TUnit>> defaultConfiguration)
-//         where TQuantity : IQuantity<TQuantity, TUnit>
-//         where TUnit : struct, Enum
-//     {
-//         return _quantitiesInfoBuilder is null ? defaultConfiguration() : _quantitiesInfoBuilder.CreateOrDefault(defaultConfiguration);
-//     }
-// }