Merge remote-tracking branch 'angularsen/master' into v4

Author: tmilnthorp

Common/UnitDefinitions/Force.json

@@ -61,7 +61,7 @@
       "PluralName": "Newtons",
       "FromUnitToBaseFunc": "x",
       "FromBaseToUnitFunc": "x",
-      "Prefixes": [ "Deca", "Kilo", "Mega" ],
+      "Prefixes": [ "Micro", "Milli", "Deca", "Kilo", "Mega" ],
       "Localization": [
         {
           "Culture": "en-US",
@@ -70,7 +70,7 @@
         {
           "Culture": "ru-RU",
           "Abbreviations": [ "Н" ],
-          "AbbreviationsWithPrefixes": [ "даН", "кН" ]
+          "AbbreviationsWithPrefixes": [ "мкН", "мН", "даН", "кН", "МН" ]
         }
       ]
     },
@@ -121,6 +121,18 @@
           "Abbreviations": [ "фунт-сила" ]
         }
       ]
+    },
+    {
+      "SingularName": "OunceForce",
+      "PluralName": "OunceForce",
+      "FromUnitToBaseFunc": "x*2.780138509537812e-1",
+      "FromBaseToUnitFunc": "x/2.780138509537812e-1",
+      "Localization": [
+        {
+          "Culture": "en-US",
+          "Abbreviations": [ "ozf" ]
+        }
+      ]
     }
   ]
 }

Common/UnitDefinitions/Pressure.json

@@ -47,7 +47,7 @@
       "PluralName": "Bars",
       "FromUnitToBaseFunc": "x*1e5",
       "FromBaseToUnitFunc": "x/1e5",
-      "Prefixes": [ "Milli", "Centi", "Deci", "Kilo", "Mega" ],
+      "Prefixes": [ "Micro", "Milli", "Centi", "Deci", "Kilo", "Mega" ],
       "Localization": [
         {
           "Culture": "en-US",
@@ -304,6 +304,30 @@
           "Abbreviations": [ "inHg" ]
         }
       ]
+    },
+    {
+      "SingularName": "DynePerSquareCentimeter",
+      "PluralName": "DynesPerSquareCentimeter",
+      "FromUnitToBaseFunc": "x*1.0e-1",
+      "FromBaseToUnitFunc": "x/1.0e-1",
+      "Localization": [
+        {
+          "Culture": "en-US",
+          "Abbreviations": [ "dyn/cm²" ]
+        }
+      ]
+    },
+    {
+      "SingularName": "PoundPerInchSecondSquared",
+      "PluralName": "PoundsPerInchSecondSquared",
+      "FromUnitToBaseFunc": "x*1.785796732283465e1",
+      "FromBaseToUnitFunc": "x/1.785796732283465e1",
+      "Localization": [
+        {
+          "Culture": "en-US",
+          "Abbreviations": [ "lbm/(in·s²)", "lb/(in·s²)" ]
+        }
+      ]
     }
   ]
 }

Common/UnitDefinitions/Torque.json

@@ -48,7 +48,7 @@
         {
           "Culture": "ru-RU",
           "Abbreviations": [ "Н·м" ],
-          "AbbreviationsWithPrefixes": [ "кН·м" ]
+          "AbbreviationsWithPrefixes": [ "кН·м", "МН·м" ]
         }
       ]
     },

UnitsNet.Tests/CustomCode/ForceTests.cs

@@ -43,6 +43,12 @@ public class ForceTests : ForceTestsBase
 
         protected override double TonnesForceInOneNewton => 1.019716212977928e-4;
 
+        protected override double MillinewtonsInOneNewton => 1.0e3;
+
+        protected override double MicronewtonsInOneNewton => 1.0e6;
+
+        protected override double OunceForceInOneNewton => 3.596943089595368;
+
         [Fact]
         public void ForceDividedByAreaEqualsPressure()
         {

UnitsNet.Tests/CustomCode/PressureTests.cs

@@ -94,10 +94,16 @@ public class PressureTests : PressureTestsBase
 
         protected override double MillibarsInOnePascal => 1e-2;
 
+        protected override double MicrobarsInOnePascal => 1.0e1;
+
         protected override double MillimetersOfMercuryInOnePascal => 7.50061561302643e-3;
 
         protected override double InchesOfMercuryInOnePascal => 2.95299830714159e-4;
 
+        protected override double DynesPerSquareCentimeterInOnePascal => 1.0e1;
+
+        protected override double PoundsPerInchSecondSquaredInOnePascal => 5.599741459495891e-2;
+
         [Fact]
         public void AreaTimesPressureEqualsForce()
         {

UnitsNet.Tests/QuantityTests.cs

@@ -0,0 +1,38 @@
+// Copyright (c) 2013 Andreas Gullberg Larsen ([email protected]).
+// https://github.com/angularsen/UnitsNet
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using UnitsNet.Units;
+using Xunit;
+
+namespace UnitsNet.Tests
+{
+    public partial class QuantityTests
+    {
+        [Fact]
+        public void GetHashCodeForDifferentQuantitiesWithSameValuesAreNotEqual()
+        {
+            var length = new Length( 1.0, (LengthUnit)2 );
+            var area = new Area( 1.0, (AreaUnit)2 );
+
+            Assert.NotEqual( length.GetHashCode(), area.GetHashCode() );
+        }
+    }
+}

UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Information.WindowsRuntimeComponent.g.cs

@@ -817,7 +817,7 @@ public bool Equals(Information other, double tolerance, ComparisonType compariso
         /// <returns>A hash code for the current Information.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { QuantityType, Value, Unit }.GetHashCode();
         }
 
         #endregion

UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Length.WindowsRuntimeComponent.g.cs

@@ -757,7 +757,7 @@ public bool Equals(Length other, double tolerance, ComparisonType comparisonType
         /// <returns>A hash code for the current Length.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { QuantityType, Value, Unit }.GetHashCode();
         }
 
         #endregion

UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Level.WindowsRuntimeComponent.g.cs

@@ -457,7 +457,7 @@ public bool Equals(Level other, double tolerance, ComparisonType comparisonType)
         /// <returns>A hash code for the current Level.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { QuantityType, Value, Unit }.GetHashCode();
         }
 
         #endregion

UnitsNet/GeneratedCode/Quantities/Information.NetFramework.g.cs

@@ -829,7 +829,7 @@ public bool Equals(Information other, double tolerance, ComparisonType compariso
         /// <returns>A hash code for the current Information.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { QuantityType, Value, Unit }.GetHashCode();
         }
 
         #endregion

UnitsNet/GeneratedCode/Quantities/Length.NetFramework.g.cs

@@ -773,7 +773,7 @@ public bool Equals(Length other, double tolerance, ComparisonType comparisonType
         /// <returns>A hash code for the current Length.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { QuantityType, Value, Unit }.GetHashCode();
         }
 
         #endregion

UnitsNet/GeneratedCode/Quantities/Level.NetFramework.g.cs

@@ -501,7 +501,7 @@ public bool Equals(Level other, double tolerance, ComparisonType comparisonType)
         /// <returns>A hash code for the current Level.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { QuantityType, Value, Unit }.GetHashCode();
         }
 
         #endregion

UnitsNet/GeneratedCode/UnitAbbreviationsCache.g.cs

@@ -339,9 +339,14 @@ private static readonly (string CultureName, Type UnitType, int UnitValue, strin
                 ("en-US", typeof(ForceUnit), (int)ForceUnit.KiloPond, new string[]{"kp"}),
                 ("ru-RU", typeof(ForceUnit), (int)ForceUnit.KiloPond, new string[]{"кгс"}),
                 ("en-US", typeof(ForceUnit), (int)ForceUnit.Meganewton, new string[]{"MN"}),
-                ("ru-RU", typeof(ForceUnit), (int)ForceUnit.Meganewton, new string[]{""}),
+                ("ru-RU", typeof(ForceUnit), (int)ForceUnit.Meganewton, new string[]{"МН"}),
+                ("en-US", typeof(ForceUnit), (int)ForceUnit.Micronewton, new string[]{"µN"}),
+                ("ru-RU", typeof(ForceUnit), (int)ForceUnit.Micronewton, new string[]{"мкН"}),
+                ("en-US", typeof(ForceUnit), (int)ForceUnit.Millinewton, new string[]{"mN"}),
+                ("ru-RU", typeof(ForceUnit), (int)ForceUnit.Millinewton, new string[]{"мН"}),
                 ("en-US", typeof(ForceUnit), (int)ForceUnit.Newton, new string[]{"N"}),
                 ("ru-RU", typeof(ForceUnit), (int)ForceUnit.Newton, new string[]{"Н"}),
+                ("en-US", typeof(ForceUnit), (int)ForceUnit.OunceForce, new string[]{"ozf"}),
                 ("en-US", typeof(ForceUnit), (int)ForceUnit.Poundal, new string[]{"pdl"}),
                 ("ru-RU", typeof(ForceUnit), (int)ForceUnit.Poundal, new string[]{"паундаль"}),
                 ("en-US", typeof(ForceUnit), (int)ForceUnit.PoundForce, new string[]{"lbf"}),
@@ -694,6 +699,7 @@ private static readonly (string CultureName, Type UnitType, int UnitValue, strin
                 ("ru-RU", typeof(PressureUnit), (int)PressureUnit.Decapascal, new string[]{"даПа"}),
                 ("en-US", typeof(PressureUnit), (int)PressureUnit.Decibar, new string[]{"dbar"}),
                 ("ru-RU", typeof(PressureUnit), (int)PressureUnit.Decibar, new string[]{"dбар"}),
+                ("en-US", typeof(PressureUnit), (int)PressureUnit.DynePerSquareCentimeter, new string[]{"dyn/cm²"}),
                 ("en-US", typeof(PressureUnit), (int)PressureUnit.FootOfHead, new string[]{"ft of head"}),
                 ("en-US", typeof(PressureUnit), (int)PressureUnit.Gigapascal, new string[]{"GPa"}),
                 ("ru-RU", typeof(PressureUnit), (int)PressureUnit.Gigapascal, new string[]{"ГПа"}),
@@ -725,6 +731,8 @@ private static readonly (string CultureName, Type UnitType, int UnitValue, strin
                 ("en-US", typeof(PressureUnit), (int)PressureUnit.Megapascal, new string[]{"MPa"}),
                 ("ru-RU", typeof(PressureUnit), (int)PressureUnit.Megapascal, new string[]{"МПа"}),
                 ("en-US", typeof(PressureUnit), (int)PressureUnit.MeterOfHead, new string[]{"m of head"}),
+                ("en-US", typeof(PressureUnit), (int)PressureUnit.Microbar, new string[]{"µbar"}),
+                ("ru-RU", typeof(PressureUnit), (int)PressureUnit.Microbar, new string[]{"µбар"}),
                 ("en-US", typeof(PressureUnit), (int)PressureUnit.Micropascal, new string[]{"µPa"}),
                 ("ru-RU", typeof(PressureUnit), (int)PressureUnit.Micropascal, new string[]{"мкПа"}),
                 ("en-US", typeof(PressureUnit), (int)PressureUnit.Millibar, new string[]{"mbar"}),
@@ -740,6 +748,7 @@ private static readonly (string CultureName, Type UnitType, int UnitValue, strin
                 ("ru-RU", typeof(PressureUnit), (int)PressureUnit.Pascal, new string[]{"Па"}),
                 ("en-US", typeof(PressureUnit), (int)PressureUnit.PoundForcePerSquareFoot, new string[]{"lb/ft²"}),
                 ("en-US", typeof(PressureUnit), (int)PressureUnit.PoundForcePerSquareInch, new string[]{"psi", "lb/in²"}),
+                ("en-US", typeof(PressureUnit), (int)PressureUnit.PoundPerInchSecondSquared, new string[]{"lbm/(in·s²)", "lb/(in·s²)"}),
                 ("en-US", typeof(PressureUnit), (int)PressureUnit.TechnicalAtmosphere, new string[]{"at"}),
                 ("ru-RU", typeof(PressureUnit), (int)PressureUnit.TechnicalAtmosphere, new string[]{"ат"}),
                 ("en-US", typeof(PressureUnit), (int)PressureUnit.TonneForcePerSquareCentimeter, new string[]{"tf/cm²"}),
@@ -914,7 +923,7 @@ private static readonly (string CultureName, Type UnitType, int UnitValue, strin
                 ("en-US", typeof(TorqueUnit), (int)TorqueUnit.KilopoundForceInch, new string[]{"kipf·in"}),
                 ("en-US", typeof(TorqueUnit), (int)TorqueUnit.MeganewtonCentimeter, new string[]{"MN·cm"}),
                 ("en-US", typeof(TorqueUnit), (int)TorqueUnit.MeganewtonMeter, new string[]{"MN·m"}),
-                ("ru-RU", typeof(TorqueUnit), (int)TorqueUnit.MeganewtonMeter, new string[]{""}),
+                ("ru-RU", typeof(TorqueUnit), (int)TorqueUnit.MeganewtonMeter, new string[]{"МН·м"}),
                 ("en-US", typeof(TorqueUnit), (int)TorqueUnit.MeganewtonMillimeter, new string[]{"MN·mm"}),
                 ("en-US", typeof(TorqueUnit), (int)TorqueUnit.MegapoundForceFoot, new string[]{"Mlbf·ft"}),
                 ("en-US", typeof(TorqueUnit), (int)TorqueUnit.MegapoundForceInch, new string[]{"Mlbf·in"}),

UnitsNet/GeneratedCode/Units/ForceUnit.g.cs

@@ -50,7 +50,10 @@ public enum ForceUnit
         Kilonewton,
         KiloPond,
         Meganewton,
+        Micronewton,
+        Millinewton,
         Newton,
+        OunceForce,
         Poundal,
         PoundForce,
         TonneForce,

UnitsNet/GeneratedCode/Units/PressureUnit.g.cs

@@ -49,6 +49,7 @@ public enum PressureUnit
         Centibar,
         Decapascal,
         Decibar,
+        DynePerSquareCentimeter,
         FootOfHead,
         Gigapascal,
         Hectopascal,
@@ -67,6 +68,7 @@ public enum PressureUnit
         MeganewtonPerSquareMeter,
         Megapascal,
         MeterOfHead,
+        Microbar,
         Micropascal,
         Millibar,
         MillimeterOfMercury,
@@ -76,6 +78,7 @@ public enum PressureUnit
         Pascal,
         PoundForcePerSquareFoot,
         PoundForcePerSquareInch,
+        PoundPerInchSecondSquared,
         TechnicalAtmosphere,
         TonneForcePerSquareCentimeter,
         TonneForcePerSquareMeter,

UnitsNet/Scripts/GenerateUnits.ps1

@@ -129,6 +129,14 @@ function Add-PrefixUnits {
 
         foreach ($unit in $quantity.Units)
         {
+            foreach ($localization in $unit.Localization){
+                if($localization.AbbreviationsWithPrefixes.Count -gt 0){
+                    if($unit.Prefixes.Count -ne $localization.AbbreviationsWithPrefixes.Count){
+                        Write-Error "The prefix count ($($unit.Prefixes.Count)) does not match the abbreviations with prefixes count ($($localization.AbbreviationsWithPrefixes.Count)) for $($quantity.Name).$($unit.SingularName)" -ErrorAction Stop
+                    }
+                }
+            }
+
             $prefixIndex = 0
             foreach ($prefix in $unit.Prefixes)
             {
@@ -175,6 +183,7 @@ function Add-PrefixUnits {
                     PluralName=$prefix + $(ToCamelCase $unit.PluralName)
                     FromUnitToBaseFunc="("+$unit.FromUnitToBaseFunc+") * $prefixFactor"
                     FromBaseToUnitFunc="("+$unit.FromBaseToUnitFunc+") / $prefixFactor"
+
                     Localization=$unit.Localization | % {
                         $abbrev = $prefixAbbreviation + $_.Abbreviations[0]
                         if ($_.AbbreviationsWithPrefixes) {

UnitsNet/Scripts/Include-GenerateQuantitySourceCodeNetFramework.ps1

@@ -899,7 +899,7 @@ $accessModifier = if ($wrc) { "internal" } else { "public" } @"
         /// <returns>A hash code for the current $quantityName.</returns>
         public override int GetHashCode()
         {
-            return new { Value, Unit }.GetHashCode();
+            return new { QuantityType, Value, Unit }.GetHashCode();
         }
 
         #endregion