codegen: Update to Value/Unit props and proper casting

* Store Value/Unit upon construction with From() methods or ctor()
* Move conversion functions into As() and AsBaseUnit() methods
* Add QuantityValueDecimal to avoid precision-loss going via double

Author: angularsen

UnitsNet/QuantityValue.cs

@@ -60,9 +60,9 @@ private QuantityValue(double val)
 
         #region To double
 
-        public static explicit operator double(QuantityValue number) => number._value;
+        public static explicit operator double(QuantityValue number) => Convert.ToDouble(number._value);
 
         #endregion
     }
 }
-#endif
+#endif

UnitsNet/Scripts/GenerateUnits.ps1

@@ -135,8 +135,8 @@ function Set-ConversionFunctions
         foreach ($u in $quantity.Units) {
 
             # Use decimal for internal calculations if base type is not double, such as for long or int.
-            if ($quantity.BaseType -ne "double") {
-                $u.FromUnitToBaseFunc = $u.FromUnitToBaseFunc -replace "m", "d"
+            if ($quantity.BaseType -eq "decimal") {
+                $u.FromUnitToBaseFunc = $u.FromUnitToBaseFunc -replace "d", "m"
                 $u.FromBaseToUnitFunc = $u.FromBaseToUnitFunc -replace "d", "m"
             }
 
@@ -274,8 +274,8 @@ $pad = 25
 $quantities = Get-ChildItem -Path $templatesDir -filter "*.json" `
     | %{(Get-Content $_.FullName -Encoding "UTF8" | Out-String)} `
     | ConvertFrom-Json `
-    | Add-PrefixUnits `
     | Set-DefaultValues `
+    | Add-PrefixUnits `
     | Set-ConversionFunctions `
     | Set-UnitsOrderedByName
 

UnitsNet/Scripts/Include-GenerateLogarithmicCode.ps1

@@ -28,45 +28,45 @@ function GenerateLogarithmicArithmeticOperators([string]$quantityName, [string]$
 #if !WINDOWS_UWP
         public static $quantityName operator -($quantityName right)
         {
-            return new $quantityName(-right.$baseUnitFieldName);
+            return new $quantityName(-right.Value, right.Unit);
         }
 
         public static $quantityName operator +($quantityName left, $quantityName right)
         {
             // Logarithmic addition
             // Formula: $x*log10(10^(x/$x) + 10^(y/$x))
-            return new $quantityName($x*Math.Log10(Math.Pow(10, left.$baseUnitFieldName/$x) + Math.Pow(10, right.$baseUnitFieldName/$x)));
+            return new $quantityName($x*Math.Log10(Math.Pow(10, left.Value/$x) + Math.Pow(10, right.AsBaseNumericType(left.Unit)/$x)), left.Unit);
         }
 
         public static $quantityName operator -($quantityName left, $quantityName right)
         {
             // Logarithmic subtraction
             // Formula: $x*log10(10^(x/$x) - 10^(y/$x))
-            return new $quantityName($x*Math.Log10(Math.Pow(10, left.$baseUnitFieldName/$x) - Math.Pow(10, right.$baseUnitFieldName/$x)));
+            return new $quantityName($x*Math.Log10(Math.Pow(10, left.Value/$x) - Math.Pow(10, right.AsBaseNumericType(left.Unit)/$x)), left.Unit);
         }
 
         public static $quantityName operator *($baseType left, $quantityName right)
         {
             // Logarithmic multiplication = addition
-            return new $quantityName(left + right.$baseUnitFieldName);
+            return new $quantityName(left + right.Value, right.Unit);
         }
 
         public static $quantityName operator *($quantityName left, double right)
         {
             // Logarithmic multiplication = addition
-            return new $quantityName(left.$baseUnitFieldName + ($baseType)right);
+            return new $quantityName(left.Value + ($baseType)right, left.Unit);
         }
 
         public static $quantityName operator /($quantityName left, double right)
         {
             // Logarithmic division = subtraction
-            return new $quantityName(left.$baseUnitFieldName - ($baseType)right);
+            return new $quantityName(left.Value - ($baseType)right, left.Unit);
         }
 
         public static double operator /($quantityName left, $quantityName right)
         {
             // Logarithmic division = subtraction
-            return Convert.ToDouble(left.$baseUnitFieldName - right.$baseUnitFieldName);
+            return Convert.ToDouble(left.Value - right.AsBaseNumericType(left.Unit));
         }
 #endif