Merge branch 'master' into feature/operator-overloading

Author: Erik Ovegard

Build/UnitsNet.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>UnitsNet</id>
-    <version>3.19.2</version>
+    <version>3.22.0</version>
     <title>Units.NET</title>
     <authors>Andreas Gullberg Larsen</authors>
     <owners>Andreas Gullberg Larsen</owners>
@@ -13,7 +13,13 @@
     <summary>Simplifies working with units of measurement.</summary>
     <iconUrl>https://raw.githubusercontent.com/anjdreas/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png</iconUrl>
     <releaseNotes>
-* Make UnitSystem thread-safe (@istanishev)
+* Add MassFlow units: KilogramPerSecond, TonnePerDay (@eriove)
+* Add 8 SpecificEnergy units (@eriove)
+* Add Angle units: Arcminute, ArcSecond (@eriove)
+* Add Frequency units: RadianPerSecond (@eriove)
+* Add Length units: NauticalMile (@eriove)
+* Add RotationalSpeed units: RadianPerSecond (@eriove)
+* Add Speed units: MeterPerHour (@eriove)
     </releaseNotes>
     <copyright>Copyright © 2015 Andreas Gullberg Larsen</copyright>
     <language>en-US</language>

README.md

@@ -144,6 +144,6 @@ Continuous Integration
 ===
 A [TeamCity build server](http://dev.swingcatalyst.com/TeamCity/viewType.html?buildTypeId=UnitsNet&guest=1) performs the following:
 * Build and test pull requests. Notifies on success or error.
-* Build, test and publish nuget on commits to **stable** branch.
+* Build and test master branch.
 
 [Contact me](https://github.com/anjdreas) if you have any questions.

UnitsNet.Tests/CustomCode/AngleTests.cs

@@ -33,6 +33,16 @@ public void AngleDividedByTimeEqualsRotationalSpeed()
             Assert.AreEqual(rotationalSpeed, RotationalSpeed.FromRadiansPerSecond(2));
         }
 
+        protected override double DegreesInOneDegree
+        {
+            get { return 1; }
+        }
+
+        protected override double GradiansInOneDegree
+        {
+            get { return 400 / 360.0; }
+        }
+
         protected override double ArcminutesInOneDegree
         {
             get
@@ -41,6 +51,11 @@ protected override double ArcminutesInOneDegree
             }
         }
 
+        protected override double RadiansInOneDegree
+        {
+            get { return Math.PI / 2 / 90; }
+        }
+
         protected override double ArcsecondsInOneDegree
         {
             get
@@ -49,21 +64,5 @@ protected override double ArcsecondsInOneDegree
             }
         }
 
-        protected override double DegreesInOneDegree
-        {
-            get { return 1; }
-        }
-
-        protected override double GradiansInOneDegree
-        {
-            get { return 400/360.0; }
-        }
-
-
-        protected override double RadiansInOneDegree
-        {
-            get { return Math.PI/2/90; }
-        }
-
     }
 }

UnitsNet.Tests/CustomCode/FlowTests.cs

@@ -25,24 +25,33 @@ public class FlowTests : FlowTestsBase
     {
         protected override double CubicMetersPerHourInOneCubicMeterPerSecond
         {
-            get { return 1*3600.0; }
+            get { return 3600.0; }
         }
 
         protected override double CubicFeetPerSecondInOneCubicMeterPerSecond
         {
-            get { return 1*35.314666213; }
+            get { return 35.314666213; }
         }
 
         protected override double MillionUsGallonsPerDayInOneCubicMeterPerSecond
         {
-            get { return 1*22.824465227; }
+            get { return 22.824465227; }
         }
 
         protected override double CubicMetersPerSecondInOneCubicMeterPerSecond
         {
             get { return 1; }
         }
 
-        
+        protected override double UsGallonsPerMinuteInOneCubicMeterPerSecond
+        {
+            get { return 15850.323141489; }
+        }
+
+        protected override double LitersPerMinuteInOneCubicMeterPerSecond
+        {
+            get { return 60000.00000; }
+        }
+
     }
 }

UnitsNet.Tests/CustomCode/LengthTests.cs

@@ -122,7 +122,7 @@ protected override double YardsInOneMeter
         protected override double NauticalMilesInOneMeter
         {
             get
-            { return 5.3996E-04; }
+            { return 1.0/1852.0; }
         }
 
     }

UnitsNet.Tests/CustomCode/MassFlowTests.cs

@@ -54,7 +54,7 @@ protected override double TonnesPerDayInOneKilogramPerSecond
         {
             get
             {
-                return 1.0 / (60.0 * 60 * 24 / 1000);
+                return (60.0 * 60 * 24 / 1000);
             }
         }
     }

UnitsNet.Tests/CustomCode/PressureChangeRateTests.cs

@@ -0,0 +1,49 @@
+// Copyright © 2007 by Initial Force AS.  All rights reserved.
+// https://github.com/InitialForce/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 System;
+
+namespace UnitsNet.Tests.CustomCode
+{
+    public class PressureChangeRateTests : PressureChangeRateTestsBase
+    {
+        protected override double AtmospheresPerSecondInOnePascalPerSecond
+        {
+            get { return 9.8692 * 1E-6; }
+        }
+
+        protected override double KilopascalsPerSecondInOnePascalPerSecond
+        {
+            get { return 1e-3; }
+        }
+
+        protected override double MegapascalsPerSecondInOnePascalPerSecond
+        {
+            get { return 1E-6; }
+        }
+
+        protected override double PascalsPerSecondInOnePascalPerSecond
+        {
+            get { return 1; }
+        }
+    }
+}

UnitsNet.Tests/CustomCode/SpecificEnergyTests.cs

@@ -27,6 +27,7 @@ namespace UnitsNet.Tests.CustomCode
 {
     public class SpecificEnergyTests : SpecificEnergyTestsBase
     {
+
         [Test]
         public void SpecificEnergyTimesMassEqualsEnergy()
         {
@@ -41,7 +42,6 @@ public void MassTimesSpecificEnergyEqualsEnergy()
         }
 
 
-        // TODO Override properties in base class here
         protected override double JoulesPerKilogramInOneJoulePerKilogram
         {
             get
@@ -57,6 +57,7 @@ protected override double CaloriesPerGramInOneJoulePerKilogram
                 return 1.0 / (4.184E3);
             }
         }
+
         protected override double KilocaloriesPerGramInOneJoulePerKilogram
         {
             get
@@ -65,6 +66,7 @@ protected override double KilocaloriesPerGramInOneJoulePerKilogram
             }
         }
 
+
         protected override double KilojoulesPerKilogramInOneJoulePerKilogram
         {
             get

UnitsNet.Tests/GeneratedCode/FlowTestsBase.g.cs

@@ -39,13 +39,17 @@ public abstract partial class FlowTestsBase
         protected abstract double CubicFeetPerSecondInOneCubicMeterPerSecond { get; }
         protected abstract double CubicMetersPerHourInOneCubicMeterPerSecond { get; }
         protected abstract double CubicMetersPerSecondInOneCubicMeterPerSecond { get; }
+        protected abstract double LitersPerMinuteInOneCubicMeterPerSecond { get; }
         protected abstract double MillionUsGallonsPerDayInOneCubicMeterPerSecond { get; }
+        protected abstract double UsGallonsPerMinuteInOneCubicMeterPerSecond { get; }
 
 // ReSharper disable VirtualMemberNeverOverriden.Global
         protected virtual double CubicFeetPerSecondTolerance { get { return 1e-5; } }
         protected virtual double CubicMetersPerHourTolerance { get { return 1e-5; } }
         protected virtual double CubicMetersPerSecondTolerance { get { return 1e-5; } }
+        protected virtual double LitersPerMinuteTolerance { get { return 1e-5; } }
         protected virtual double MillionUsGallonsPerDayTolerance { get { return 1e-5; } }
+        protected virtual double UsGallonsPerMinuteTolerance { get { return 1e-5; } }
 // ReSharper restore VirtualMemberNeverOverriden.Global
 
         [Test]
@@ -55,7 +59,9 @@ public void CubicMeterPerSecondToFlowUnits()
             Assert.AreEqual(CubicFeetPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.CubicFeetPerSecond, CubicFeetPerSecondTolerance);
             Assert.AreEqual(CubicMetersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.CubicMetersPerHour, CubicMetersPerHourTolerance);
             Assert.AreEqual(CubicMetersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.CubicMetersPerSecond, CubicMetersPerSecondTolerance);
+            Assert.AreEqual(LitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.LitersPerMinute, LitersPerMinuteTolerance);
             Assert.AreEqual(MillionUsGallonsPerDayInOneCubicMeterPerSecond, cubicmeterpersecond.MillionUsGallonsPerDay, MillionUsGallonsPerDayTolerance);
+            Assert.AreEqual(UsGallonsPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.UsGallonsPerMinute, UsGallonsPerMinuteTolerance);
         }
 
         [Test]
@@ -64,7 +70,9 @@ public void FromValueAndUnit()
             Assert.AreEqual(1, Flow.From(1, FlowUnit.CubicFootPerSecond).CubicFeetPerSecond, CubicFeetPerSecondTolerance);
             Assert.AreEqual(1, Flow.From(1, FlowUnit.CubicMeterPerHour).CubicMetersPerHour, CubicMetersPerHourTolerance);
             Assert.AreEqual(1, Flow.From(1, FlowUnit.CubicMeterPerSecond).CubicMetersPerSecond, CubicMetersPerSecondTolerance);
+            Assert.AreEqual(1, Flow.From(1, FlowUnit.LitersPerMinute).LitersPerMinute, LitersPerMinuteTolerance);
             Assert.AreEqual(1, Flow.From(1, FlowUnit.MillionUsGallonsPerDay).MillionUsGallonsPerDay, MillionUsGallonsPerDayTolerance);
+            Assert.AreEqual(1, Flow.From(1, FlowUnit.UsGallonsPerMinute).UsGallonsPerMinute, UsGallonsPerMinuteTolerance);
         }
 
         [Test]
@@ -74,7 +82,9 @@ public void As()
             Assert.AreEqual(CubicFeetPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicFootPerSecond), CubicFeetPerSecondTolerance);
             Assert.AreEqual(CubicMetersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicMeterPerHour), CubicMetersPerHourTolerance);
             Assert.AreEqual(CubicMetersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicMeterPerSecond), CubicMetersPerSecondTolerance);
+            Assert.AreEqual(LitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.LitersPerMinute), LitersPerMinuteTolerance);
             Assert.AreEqual(MillionUsGallonsPerDayInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.MillionUsGallonsPerDay), MillionUsGallonsPerDayTolerance);
+            Assert.AreEqual(UsGallonsPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.UsGallonsPerMinute), UsGallonsPerMinuteTolerance);
         }
 
         [Test]
@@ -84,7 +94,9 @@ public void ConversionRoundTrip()
             Assert.AreEqual(1, Flow.FromCubicFeetPerSecond(cubicmeterpersecond.CubicFeetPerSecond).CubicMetersPerSecond, CubicFeetPerSecondTolerance);
             Assert.AreEqual(1, Flow.FromCubicMetersPerHour(cubicmeterpersecond.CubicMetersPerHour).CubicMetersPerSecond, CubicMetersPerHourTolerance);
             Assert.AreEqual(1, Flow.FromCubicMetersPerSecond(cubicmeterpersecond.CubicMetersPerSecond).CubicMetersPerSecond, CubicMetersPerSecondTolerance);
+            Assert.AreEqual(1, Flow.FromLitersPerMinute(cubicmeterpersecond.LitersPerMinute).CubicMetersPerSecond, LitersPerMinuteTolerance);
             Assert.AreEqual(1, Flow.FromMillionUsGallonsPerDay(cubicmeterpersecond.MillionUsGallonsPerDay).CubicMetersPerSecond, MillionUsGallonsPerDayTolerance);
+            Assert.AreEqual(1, Flow.FromUsGallonsPerMinute(cubicmeterpersecond.UsGallonsPerMinute).CubicMetersPerSecond, UsGallonsPerMinuteTolerance);
         }
 
         [Test]

UnitsNet.Tests/GeneratedCode/LengthTestsBase.g.cs

@@ -241,6 +241,5 @@ public void EqualsReturnsFalseOnNull()
             Length meter = Length.FromMeters(1);
             Assert.IsFalse(meter.Equals(null));
         }
-
     }
 }