Merge pull request #445 from gojanpaolo/add-operator-overloads

Add operator overloads for SpecificWeight, Density, Length, Acceleratino and Pressure

Author: angularsen

UnitsNet.Tests/CustomCode/AccelerationTests.cs

@@ -19,6 +19,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+using Xunit;
+
 namespace UnitsNet.Tests.CustomCode
 {
     public class AccelerationTests : AccelerationTestsBase
@@ -48,5 +50,12 @@ public class AccelerationTests : AccelerationTestsBase
         protected override double KnotsPerMinuteInOneMeterPerSecondSquared => 1.16630669546436E2;
 
         protected override double KnotsPerSecondInOneMeterPerSecondSquared => 1.94384449244060;
+
+        [Fact]
+        public void AccelerationTimesDensityEqualsSpecificWeight()
+        {
+            SpecificWeight specificWeight = Acceleration.FromMetersPerSecondSquared(10) * Density.FromKilogramsPerCubicMeter(2);
+            Assert.Equal(SpecificWeight.FromNewtonsPerCubicMeter(20), specificWeight);
+        }
     }
 }

UnitsNet.Tests/CustomCode/DensityTests.cs

@@ -148,5 +148,12 @@ public void DensityTimesSpeedEqualsMassFlux()
             MassFlux massFlux = Density.FromKilogramsPerCubicMeter(20) * Speed.FromMetersPerSecond(2);
             Assert.Equal(massFlux, MassFlux.FromKilogramsPerSecondPerSquareMeter(40));
         }
+
+        [Fact]
+        public void DensityTimesAccelerationEqualsSpecificWeight()
+        {
+            SpecificWeight specificWeight = Density.FromKilogramsPerCubicMeter(10) * Acceleration.FromMetersPerSecondSquared(2);
+            Assert.Equal(SpecificWeight.FromNewtonsPerCubicMeter(20), specificWeight);
+        }
     }
 }

UnitsNet.Tests/CustomCode/LengthTests.cs

@@ -120,6 +120,13 @@ public void LengthTimesSpeedEqualsKinematicViscosity()
             Assert.Equal(KinematicViscosity.FromSquareMetersPerSecond(40), kinematicViscosity);
         }
 
+        [Fact]
+        public void LengthTimesSpecificWeightEqualsPressure()
+        {
+            Pressure pressure = Length.FromMeters(2) * SpecificWeight.FromNewtonsPerCubicMeter(10);
+            Assert.Equal(Pressure.FromPascals(20), pressure);
+        }
+
         [Fact]
         public void ToStringReturnsCorrectNumberAndUnitWithDefaultUnitWhichIsMeter()
         {

UnitsNet.Tests/CustomCode/PressureTests.cs

@@ -114,5 +114,19 @@ public void PressureTimesAreaEqualsForce()
             Force force = Pressure.FromPascals(20)*Area.FromSquareMeters(3);
             Assert.Equal(force, Force.FromNewtons(60));
         }
+
+        [Fact]
+        public void PressureDividedBySpecificWeightEqualsLength()
+        {
+            Length length = Pressure.FromPascals(20) / SpecificWeight.FromNewtonsPerCubicMeter(2);
+            Assert.Equal(Length.FromMeters(10), length);
+        }
+
+        [Fact]
+        public void PressureDividedByLengthEqualsSpecificWeight()
+        {
+            SpecificWeight specificWeight = Pressure.FromPascals(20) / Length.FromMeters(2);
+            Assert.Equal(SpecificWeight.FromNewtonsPerCubicMeter(10), specificWeight);
+        }
     }
 }

UnitsNet.Tests/CustomCode/SpecificWeightTests.cs

@@ -19,6 +19,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+using Xunit;
+
 namespace UnitsNet.Tests.CustomCode
 {
     public class SpecificWeightTests : SpecificWeightTestsBase
@@ -56,5 +58,26 @@ public class SpecificWeightTests : SpecificWeightTestsBase
         protected override double TonnesForcePerCubicMillimeterInOneNewtonPerCubicMeter => 1.02e-10;
 
         protected override double MeganewtonsPerCubicMeterInOneNewtonPerCubicMeter => 1e-6;
+
+        [Fact]
+        public void SpecificWeightTimesLengthEqualsPressure()
+        {
+            Pressure pressure = SpecificWeight.FromNewtonsPerCubicMeter(10) * Length.FromMeters(2);
+            Assert.Equal(Pressure.FromPascals(20), pressure);
+        }
+
+        [Fact]
+        public void SpecificWeightDividedByDensityEqualsAcceleration()
+        {
+            Acceleration acceleration = SpecificWeight.FromNewtonsPerCubicMeter(40) / Density.FromKilogramsPerCubicMeter(4);
+            Assert.Equal(Acceleration.FromMetersPerSecondSquared(10), acceleration);
+        }
+
+        [Fact]
+        public void SpecificWeightDividedByAccelerationEqualsDensity()
+        {
+            Density density = SpecificWeight.FromNewtonsPerCubicMeter(20) / Acceleration.FromMetersPerSecondSquared(2);
+            Assert.Equal(Density.FromKilogramsPerCubicMeter(10), density);
+        }
     }
 }

UnitsNet/CustomCode/Quantities/Acceleration.extra.cs

@@ -0,0 +1,41 @@
+// 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.
+
+namespace UnitsNet
+{
+    // Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components
+    // Public structures can't have any members other than public fields, and those fields must be value types or strings.
+    // Public classes must be sealed (NotInheritable in Visual Basic). If your programming model requires polymorphism, you can create a public interface and implement that interface on the classes that must be polymorphic.
+#if WINDOWS_UWP
+    public sealed partial class Acceleration
+#else
+    public partial struct Acceleration
+#endif
+    {
+        // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
+#if !WINDOWS_UWP
+        public static SpecificWeight operator *(Acceleration acceleration, Density density)
+        {
+            return new SpecificWeight(acceleration.MetersPerSecondSquared * density.KilogramsPerCubicMeter, UnitsNet.Units.SpecificWeightUnit.NewtonPerCubicMeter);
+        }
+#endif
+    }
+}

UnitsNet/CustomCode/Quantities/Density.extra.cs

@@ -66,6 +66,11 @@ public static Molarity ToMolarity(Density density, Mass molecularWeight)
         {
             return MassFlux.FromKilogramsPerSecondPerSquareMeter(density.KilogramsPerCubicMeter * speed.MetersPerSecond);
         }
+
+        public static SpecificWeight operator *(Density density, Acceleration acceleration)
+        {
+            return new SpecificWeight(density.KilogramsPerCubicMeter * acceleration.MetersPerSecondSquared, UnitsNet.Units.SpecificWeightUnit.NewtonPerCubicMeter);
+        }
 #endif
     }
-}
+}

UnitsNet/CustomCode/Quantities/Length.extra.cs

@@ -111,6 +111,11 @@ public static Length FromFeetInches(double feet, double inches)
         {
             return KinematicViscosity.FromSquareMetersPerSecond(length.Meters*speed.MetersPerSecond);
         }
+
+        public static Pressure operator *(Length length, SpecificWeight specificWeight)
+        {
+            return new Pressure(length.Meters * specificWeight.NewtonsPerCubicMeter, PressureUnit.Pascal);
+        }
 #endif
     }
 
@@ -142,4 +147,4 @@ public string ToString([CanBeNull] Culture cultureInfo)
                 inchUnit);
         }
     }
-}
+}

UnitsNet/CustomCode/Quantities/Pressure.extra.cs

@@ -42,6 +42,16 @@ public partial struct Pressure
         {
             return Force.FromNewtons(pressure.Pascals * area.SquareMeters);
         }
+
+        public static Length operator /(Pressure pressure, SpecificWeight specificWeight)
+        {
+            return new Length(pressure.Pascals / specificWeight.NewtonsPerCubicMeter, UnitsNet.Units.LengthUnit.Meter);
+        }
+
+        public static SpecificWeight operator /(Pressure pressure, Length length)
+        {
+            return new SpecificWeight(pressure.Pascals / length.Meters, UnitsNet.Units.SpecificWeightUnit.NewtonPerCubicMeter);
+        }
 #endif
     }
-}
+}

UnitsNet/CustomCode/Quantities/SpecificWeight.extra.cs

@@ -0,0 +1,51 @@
+// 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.
+
+namespace UnitsNet
+{
+    // Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components
+    // Public structures can't have any members other than public fields, and those fields must be value types or strings.
+    // Public classes must be sealed (NotInheritable in Visual Basic). If your programming model requires polymorphism, you can create a public interface and implement that interface on the classes that must be polymorphic.
+#if WINDOWS_UWP
+    public sealed partial class SpecificWeight
+#else
+    public partial struct SpecificWeight
+#endif
+    {
+        // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
+#if !WINDOWS_UWP
+        public static Pressure operator *(SpecificWeight specificWeight, Length length)
+        {
+            return new Pressure(specificWeight.NewtonsPerCubicMeter * length.Meters, UnitsNet.Units.PressureUnit.Pascal);
+        }
+
+        public static Acceleration operator /(SpecificWeight specificWeight, Density density)
+        {
+            return new Acceleration(specificWeight.NewtonsPerCubicMeter / density.KilogramsPerCubicMeter, UnitsNet.Units.AccelerationUnit.MeterPerSecondSquared);
+        }
+
+        public static Density operator /(SpecificWeight specific, Acceleration acceleration)
+        {
+            return new Density(specific.NewtonsPerCubicMeter / acceleration.MetersPerSecondSquared, UnitsNet.Units.DensityUnit.KilogramPerCubicMeter);
+        }
+#endif
+    }
+}