Changing Compare methods to compare current value to other in "this" … (#454)

* Changing Compare methods to compare current value to other in "this" units. This avoids scaling issues (and converting two quantities when we only need to potentially convert one) when both "this" and "other" are not defined in base units. "This" is the reference value.

* Use nameof(param) for parameter exceptions

Author: tmilnthorp

UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs

@@ -736,9 +736,10 @@ public static string GetAbbreviation(
 
         public int CompareTo(object obj)
         {
-            if (obj == null) throw new ArgumentNullException("obj");
-            if (!(obj is Acceleration)) throw new ArgumentException("Expected type Acceleration.", "obj");
-            return CompareTo((Acceleration) obj);
+            if(obj is null) throw new ArgumentNullException(nameof(obj));
+            if(!(obj is Acceleration)) throw new ArgumentException("Expected type Acceleration.", nameof(obj));
+
+            return CompareTo((Acceleration)obj);
         }
 
         // Windows Runtime Component does not allow public methods/ctors with same number of parameters: https://msdn.microsoft.com/en-us/library/br230301.aspx#Overloaded methods
@@ -749,7 +750,7 @@ public int CompareTo(object obj)
 #endif
         int CompareTo(Acceleration other)
         {
-            return AsBaseUnit().CompareTo(other.AsBaseUnit());
+            return _value.CompareTo(other.AsBaseNumericType(this.Unit));
         }
 
         // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -1006,7 +1007,7 @@ public static Acceleration Parse(
             [CanBeNull] IFormatProvider provider)
 #endif
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
 #if WINDOWS_UWP
             // Windows Runtime Component does not support CultureInfo and IFormatProvider types, so we use culture name for public methods: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -1134,7 +1135,7 @@ public static AccelerationUnit ParseUnit(string str, [CanBeNull] string cultureN
 #endif
         static AccelerationUnit ParseUnit(string str, IFormatProvider provider = null)
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
             var unitSystem = UnitSystem.GetCached(provider);
             var unit = unitSystem.Parse<AccelerationUnit>(str.Trim());

UnitsNet/GeneratedCode/Quantities/AmountOfSubstance.g.cs

@@ -769,9 +769,10 @@ public static string GetAbbreviation(
 
         public int CompareTo(object obj)
         {
-            if (obj == null) throw new ArgumentNullException("obj");
-            if (!(obj is AmountOfSubstance)) throw new ArgumentException("Expected type AmountOfSubstance.", "obj");
-            return CompareTo((AmountOfSubstance) obj);
+            if(obj is null) throw new ArgumentNullException(nameof(obj));
+            if(!(obj is AmountOfSubstance)) throw new ArgumentException("Expected type AmountOfSubstance.", nameof(obj));
+
+            return CompareTo((AmountOfSubstance)obj);
         }
 
         // Windows Runtime Component does not allow public methods/ctors with same number of parameters: https://msdn.microsoft.com/en-us/library/br230301.aspx#Overloaded methods
@@ -782,7 +783,7 @@ public int CompareTo(object obj)
 #endif
         int CompareTo(AmountOfSubstance other)
         {
-            return AsBaseUnit().CompareTo(other.AsBaseUnit());
+            return _value.CompareTo(other.AsBaseNumericType(this.Unit));
         }
 
         // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -1041,7 +1042,7 @@ public static AmountOfSubstance Parse(
             [CanBeNull] IFormatProvider provider)
 #endif
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
 #if WINDOWS_UWP
             // Windows Runtime Component does not support CultureInfo and IFormatProvider types, so we use culture name for public methods: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -1169,7 +1170,7 @@ public static AmountOfSubstanceUnit ParseUnit(string str, [CanBeNull] string cul
 #endif
         static AmountOfSubstanceUnit ParseUnit(string str, IFormatProvider provider = null)
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
             var unitSystem = UnitSystem.GetCached(provider);
             var unit = unitSystem.Parse<AmountOfSubstanceUnit>(str.Trim());

UnitsNet/GeneratedCode/Quantities/AmplitudeRatio.g.cs

@@ -437,9 +437,10 @@ public static string GetAbbreviation(
 
         public int CompareTo(object obj)
         {
-            if (obj == null) throw new ArgumentNullException("obj");
-            if (!(obj is AmplitudeRatio)) throw new ArgumentException("Expected type AmplitudeRatio.", "obj");
-            return CompareTo((AmplitudeRatio) obj);
+            if(obj is null) throw new ArgumentNullException(nameof(obj));
+            if(!(obj is AmplitudeRatio)) throw new ArgumentException("Expected type AmplitudeRatio.", nameof(obj));
+
+            return CompareTo((AmplitudeRatio)obj);
         }
 
         // Windows Runtime Component does not allow public methods/ctors with same number of parameters: https://msdn.microsoft.com/en-us/library/br230301.aspx#Overloaded methods
@@ -450,7 +451,7 @@ public int CompareTo(object obj)
 #endif
         int CompareTo(AmplitudeRatio other)
         {
-            return AsBaseUnit().CompareTo(other.AsBaseUnit());
+            return _value.CompareTo(other.AsBaseNumericType(this.Unit));
         }
 
         // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -689,7 +690,7 @@ public static AmplitudeRatio Parse(
             [CanBeNull] IFormatProvider provider)
 #endif
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
 #if WINDOWS_UWP
             // Windows Runtime Component does not support CultureInfo and IFormatProvider types, so we use culture name for public methods: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -817,7 +818,7 @@ public static AmplitudeRatioUnit ParseUnit(string str, [CanBeNull] string cultur
 #endif
         static AmplitudeRatioUnit ParseUnit(string str, IFormatProvider provider = null)
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
             var unitSystem = UnitSystem.GetCached(provider);
             var unit = unitSystem.Parse<AmplitudeRatioUnit>(str.Trim());

UnitsNet/GeneratedCode/Quantities/Angle.g.cs

@@ -759,9 +759,10 @@ public static string GetAbbreviation(
 
         public int CompareTo(object obj)
         {
-            if (obj == null) throw new ArgumentNullException("obj");
-            if (!(obj is Angle)) throw new ArgumentException("Expected type Angle.", "obj");
-            return CompareTo((Angle) obj);
+            if(obj is null) throw new ArgumentNullException(nameof(obj));
+            if(!(obj is Angle)) throw new ArgumentException("Expected type Angle.", nameof(obj));
+
+            return CompareTo((Angle)obj);
         }
 
         // Windows Runtime Component does not allow public methods/ctors with same number of parameters: https://msdn.microsoft.com/en-us/library/br230301.aspx#Overloaded methods
@@ -772,7 +773,7 @@ public int CompareTo(object obj)
 #endif
         int CompareTo(Angle other)
         {
-            return AsBaseUnit().CompareTo(other.AsBaseUnit());
+            return _value.CompareTo(other.AsBaseNumericType(this.Unit));
         }
 
         // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -1031,7 +1032,7 @@ public static Angle Parse(
             [CanBeNull] IFormatProvider provider)
 #endif
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
 #if WINDOWS_UWP
             // Windows Runtime Component does not support CultureInfo and IFormatProvider types, so we use culture name for public methods: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -1159,7 +1160,7 @@ public static AngleUnit ParseUnit(string str, [CanBeNull] string cultureName)
 #endif
         static AngleUnit ParseUnit(string str, IFormatProvider provider = null)
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
             var unitSystem = UnitSystem.GetCached(provider);
             var unit = unitSystem.Parse<AngleUnit>(str.Trim());

UnitsNet/GeneratedCode/Quantities/ApparentEnergy.g.cs

@@ -406,9 +406,10 @@ public static string GetAbbreviation(
 
         public int CompareTo(object obj)
         {
-            if (obj == null) throw new ArgumentNullException("obj");
-            if (!(obj is ApparentEnergy)) throw new ArgumentException("Expected type ApparentEnergy.", "obj");
-            return CompareTo((ApparentEnergy) obj);
+            if(obj is null) throw new ArgumentNullException(nameof(obj));
+            if(!(obj is ApparentEnergy)) throw new ArgumentException("Expected type ApparentEnergy.", nameof(obj));
+
+            return CompareTo((ApparentEnergy)obj);
         }
 
         // Windows Runtime Component does not allow public methods/ctors with same number of parameters: https://msdn.microsoft.com/en-us/library/br230301.aspx#Overloaded methods
@@ -419,7 +420,7 @@ public int CompareTo(object obj)
 #endif
         int CompareTo(ApparentEnergy other)
         {
-            return AsBaseUnit().CompareTo(other.AsBaseUnit());
+            return _value.CompareTo(other.AsBaseNumericType(this.Unit));
         }
 
         // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -656,7 +657,7 @@ public static ApparentEnergy Parse(
             [CanBeNull] IFormatProvider provider)
 #endif
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
 #if WINDOWS_UWP
             // Windows Runtime Component does not support CultureInfo and IFormatProvider types, so we use culture name for public methods: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -784,7 +785,7 @@ public static ApparentEnergyUnit ParseUnit(string str, [CanBeNull] string cultur
 #endif
         static ApparentEnergyUnit ParseUnit(string str, IFormatProvider provider = null)
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
             var unitSystem = UnitSystem.GetCached(provider);
             var unit = unitSystem.Parse<ApparentEnergyUnit>(str.Trim());

UnitsNet/GeneratedCode/Quantities/ApparentPower.g.cs

@@ -439,9 +439,10 @@ public static string GetAbbreviation(
 
         public int CompareTo(object obj)
         {
-            if (obj == null) throw new ArgumentNullException("obj");
-            if (!(obj is ApparentPower)) throw new ArgumentException("Expected type ApparentPower.", "obj");
-            return CompareTo((ApparentPower) obj);
+            if(obj is null) throw new ArgumentNullException(nameof(obj));
+            if(!(obj is ApparentPower)) throw new ArgumentException("Expected type ApparentPower.", nameof(obj));
+
+            return CompareTo((ApparentPower)obj);
         }
 
         // Windows Runtime Component does not allow public methods/ctors with same number of parameters: https://msdn.microsoft.com/en-us/library/br230301.aspx#Overloaded methods
@@ -452,7 +453,7 @@ public int CompareTo(object obj)
 #endif
         int CompareTo(ApparentPower other)
         {
-            return AsBaseUnit().CompareTo(other.AsBaseUnit());
+            return _value.CompareTo(other.AsBaseNumericType(this.Unit));
         }
 
         // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -691,7 +692,7 @@ public static ApparentPower Parse(
             [CanBeNull] IFormatProvider provider)
 #endif
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
 #if WINDOWS_UWP
             // Windows Runtime Component does not support CultureInfo and IFormatProvider types, so we use culture name for public methods: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -819,7 +820,7 @@ public static ApparentPowerUnit ParseUnit(string str, [CanBeNull] string culture
 #endif
         static ApparentPowerUnit ParseUnit(string str, IFormatProvider provider = null)
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
             var unitSystem = UnitSystem.GetCached(provider);
             var unit = unitSystem.Parse<ApparentPowerUnit>(str.Trim());

UnitsNet/GeneratedCode/Quantities/Area.g.cs

@@ -736,9 +736,10 @@ public static string GetAbbreviation(
 
         public int CompareTo(object obj)
         {
-            if (obj == null) throw new ArgumentNullException("obj");
-            if (!(obj is Area)) throw new ArgumentException("Expected type Area.", "obj");
-            return CompareTo((Area) obj);
+            if(obj is null) throw new ArgumentNullException(nameof(obj));
+            if(!(obj is Area)) throw new ArgumentException("Expected type Area.", nameof(obj));
+
+            return CompareTo((Area)obj);
         }
 
         // Windows Runtime Component does not allow public methods/ctors with same number of parameters: https://msdn.microsoft.com/en-us/library/br230301.aspx#Overloaded methods
@@ -749,7 +750,7 @@ public int CompareTo(object obj)
 #endif
         int CompareTo(Area other)
         {
-            return AsBaseUnit().CompareTo(other.AsBaseUnit());
+            return _value.CompareTo(other.AsBaseNumericType(this.Unit));
         }
 
         // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -1006,7 +1007,7 @@ public static Area Parse(
             [CanBeNull] IFormatProvider provider)
 #endif
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
 #if WINDOWS_UWP
             // Windows Runtime Component does not support CultureInfo and IFormatProvider types, so we use culture name for public methods: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -1134,7 +1135,7 @@ public static AreaUnit ParseUnit(string str, [CanBeNull] string cultureName)
 #endif
         static AreaUnit ParseUnit(string str, IFormatProvider provider = null)
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
             var unitSystem = UnitSystem.GetCached(provider);
             var unit = unitSystem.Parse<AreaUnit>(str.Trim());

UnitsNet/GeneratedCode/Quantities/AreaDensity.g.cs

@@ -340,9 +340,10 @@ public static string GetAbbreviation(
 
         public int CompareTo(object obj)
         {
-            if (obj == null) throw new ArgumentNullException("obj");
-            if (!(obj is AreaDensity)) throw new ArgumentException("Expected type AreaDensity.", "obj");
-            return CompareTo((AreaDensity) obj);
+            if(obj is null) throw new ArgumentNullException(nameof(obj));
+            if(!(obj is AreaDensity)) throw new ArgumentException("Expected type AreaDensity.", nameof(obj));
+
+            return CompareTo((AreaDensity)obj);
         }
 
         // Windows Runtime Component does not allow public methods/ctors with same number of parameters: https://msdn.microsoft.com/en-us/library/br230301.aspx#Overloaded methods
@@ -353,7 +354,7 @@ public int CompareTo(object obj)
 #endif
         int CompareTo(AreaDensity other)
         {
-            return AsBaseUnit().CompareTo(other.AsBaseUnit());
+            return _value.CompareTo(other.AsBaseNumericType(this.Unit));
         }
 
         // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -586,7 +587,7 @@ public static AreaDensity Parse(
             [CanBeNull] IFormatProvider provider)
 #endif
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
 #if WINDOWS_UWP
             // Windows Runtime Component does not support CultureInfo and IFormatProvider types, so we use culture name for public methods: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -714,7 +715,7 @@ public static AreaDensityUnit ParseUnit(string str, [CanBeNull] string cultureNa
 #endif
         static AreaDensityUnit ParseUnit(string str, IFormatProvider provider = null)
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
             var unitSystem = UnitSystem.GetCached(provider);
             var unit = unitSystem.Parse<AreaDensityUnit>(str.Trim());

UnitsNet/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs

@@ -505,9 +505,10 @@ public static string GetAbbreviation(
 
         public int CompareTo(object obj)
         {
-            if (obj == null) throw new ArgumentNullException("obj");
-            if (!(obj is AreaMomentOfInertia)) throw new ArgumentException("Expected type AreaMomentOfInertia.", "obj");
-            return CompareTo((AreaMomentOfInertia) obj);
+            if(obj is null) throw new ArgumentNullException(nameof(obj));
+            if(!(obj is AreaMomentOfInertia)) throw new ArgumentException("Expected type AreaMomentOfInertia.", nameof(obj));
+
+            return CompareTo((AreaMomentOfInertia)obj);
         }
 
         // Windows Runtime Component does not allow public methods/ctors with same number of parameters: https://msdn.microsoft.com/en-us/library/br230301.aspx#Overloaded methods
@@ -518,7 +519,7 @@ public int CompareTo(object obj)
 #endif
         int CompareTo(AreaMomentOfInertia other)
         {
-            return AsBaseUnit().CompareTo(other.AsBaseUnit());
+            return _value.CompareTo(other.AsBaseNumericType(this.Unit));
         }
 
         // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -761,7 +762,7 @@ public static AreaMomentOfInertia Parse(
             [CanBeNull] IFormatProvider provider)
 #endif
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
 #if WINDOWS_UWP
             // Windows Runtime Component does not support CultureInfo and IFormatProvider types, so we use culture name for public methods: https://msdn.microsoft.com/en-us/library/br230301.aspx
@@ -889,7 +890,7 @@ public static AreaMomentOfInertiaUnit ParseUnit(string str, [CanBeNull] string c
 #endif
         static AreaMomentOfInertiaUnit ParseUnit(string str, IFormatProvider provider = null)
         {
-            if (str == null) throw new ArgumentNullException("str");
+            if (str == null) throw new ArgumentNullException(nameof(str));
 
             var unitSystem = UnitSystem.GetCached(provider);
             var unit = unitSystem.Parse<AreaMomentOfInertiaUnit>(str.Trim());