From 31ce98aff59912a8f6a212b5cbfdb4310798519d Mon Sep 17 00:00:00 2001 From: Tristan Milnthorp Date: Fri, 28 Sep 2018 13:35:51 -0400 Subject: [PATCH 1/2] Fix SingularName for some units in VolumeFlow --- .../Quantities/VolumeFlow.Common.g.cs | 128 +++++++------- Common/UnitDefinitions/VolumeFlow.json | 22 +-- .../GeneratedCode/VolumeFlowTestsBase.g.cs | 160 +++++++++--------- UnitsNet.Tests/UnitSystemTests.cs | 2 +- .../GeneratedCode/UnitSystem.Default.g.cs | 32 ++-- .../GeneratedCode/Units/VolumeFlowUnit.g.cs | 32 ++-- 6 files changed, 188 insertions(+), 188 deletions(-) diff --git a/Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs b/Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs index 80fa85e868..edde9c93fe 100644 --- a/Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs +++ b/Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs @@ -127,7 +127,7 @@ public static BaseDimensions BaseDimensions /// /// Get VolumeFlow in CentilitersPerMinute. /// - public double CentilitersPerMinute => As(VolumeFlowUnit.CentilitersPerMinute); + public double CentilitersPerMinute => As(VolumeFlowUnit.CentiliterPerMinute); /// /// Get VolumeFlow in CubicDecimetersPerMinute. @@ -182,77 +182,77 @@ public static BaseDimensions BaseDimensions /// /// Get VolumeFlow in DecilitersPerMinute. /// - public double DecilitersPerMinute => As(VolumeFlowUnit.DecilitersPerMinute); + public double DecilitersPerMinute => As(VolumeFlowUnit.DeciliterPerMinute); /// /// Get VolumeFlow in KilolitersPerMinute. /// - public double KilolitersPerMinute => As(VolumeFlowUnit.KilolitersPerMinute); + public double KilolitersPerMinute => As(VolumeFlowUnit.KiloliterPerMinute); /// /// Get VolumeFlow in LitersPerHour. /// - public double LitersPerHour => As(VolumeFlowUnit.LitersPerHour); + public double LitersPerHour => As(VolumeFlowUnit.LiterPerHour); /// /// Get VolumeFlow in LitersPerMinute. /// - public double LitersPerMinute => As(VolumeFlowUnit.LitersPerMinute); + public double LitersPerMinute => As(VolumeFlowUnit.LiterPerMinute); /// /// Get VolumeFlow in LitersPerSecond. /// - public double LitersPerSecond => As(VolumeFlowUnit.LitersPerSecond); + public double LitersPerSecond => As(VolumeFlowUnit.LiterPerSecond); /// /// Get VolumeFlow in MicrolitersPerMinute. /// - public double MicrolitersPerMinute => As(VolumeFlowUnit.MicrolitersPerMinute); + public double MicrolitersPerMinute => As(VolumeFlowUnit.MicroliterPerMinute); /// /// Get VolumeFlow in MillilitersPerMinute. /// - public double MillilitersPerMinute => As(VolumeFlowUnit.MillilitersPerMinute); + public double MillilitersPerMinute => As(VolumeFlowUnit.MilliliterPerMinute); /// /// Get VolumeFlow in MillionUsGallonsPerDay. /// - public double MillionUsGallonsPerDay => As(VolumeFlowUnit.MillionUsGallonsPerDay); + public double MillionUsGallonsPerDay => As(VolumeFlowUnit.MillionUsGallonPerDay); /// /// Get VolumeFlow in NanolitersPerMinute. /// - public double NanolitersPerMinute => As(VolumeFlowUnit.NanolitersPerMinute); + public double NanolitersPerMinute => As(VolumeFlowUnit.NanoliterPerMinute); /// /// Get VolumeFlow in OilBarrelsPerDay. /// - public double OilBarrelsPerDay => As(VolumeFlowUnit.OilBarrelsPerDay); + public double OilBarrelsPerDay => As(VolumeFlowUnit.OilBarrelPerDay); /// /// Get VolumeFlow in OilBarrelsPerHour. /// - public double OilBarrelsPerHour => As(VolumeFlowUnit.OilBarrelsPerHour); + public double OilBarrelsPerHour => As(VolumeFlowUnit.OilBarrelPerHour); /// /// Get VolumeFlow in OilBarrelsPerMinute. /// - public double OilBarrelsPerMinute => As(VolumeFlowUnit.OilBarrelsPerMinute); + public double OilBarrelsPerMinute => As(VolumeFlowUnit.OilBarrelPerMinute); /// /// Get VolumeFlow in UsGallonsPerHour. /// - public double UsGallonsPerHour => As(VolumeFlowUnit.UsGallonsPerHour); + public double UsGallonsPerHour => As(VolumeFlowUnit.UsGallonPerHour); /// /// Get VolumeFlow in UsGallonsPerMinute. /// - public double UsGallonsPerMinute => As(VolumeFlowUnit.UsGallonsPerMinute); + public double UsGallonsPerMinute => As(VolumeFlowUnit.UsGallonPerMinute); /// /// Get VolumeFlow in UsGallonsPerSecond. /// - public double UsGallonsPerSecond => As(VolumeFlowUnit.UsGallonsPerSecond); + public double UsGallonsPerSecond => As(VolumeFlowUnit.UsGallonPerSecond); #endregion @@ -274,7 +274,7 @@ public static VolumeFlow FromCentilitersPerMinute(QuantityValue centiliterspermi #endif { double value = (double) centilitersperminute; - return new VolumeFlow(value, VolumeFlowUnit.CentilitersPerMinute); + return new VolumeFlow(value, VolumeFlowUnit.CentiliterPerMinute); } /// @@ -428,7 +428,7 @@ public static VolumeFlow FromDecilitersPerMinute(QuantityValue decilitersperminu #endif { double value = (double) decilitersperminute; - return new VolumeFlow(value, VolumeFlowUnit.DecilitersPerMinute); + return new VolumeFlow(value, VolumeFlowUnit.DeciliterPerMinute); } /// @@ -442,7 +442,7 @@ public static VolumeFlow FromKilolitersPerMinute(QuantityValue kilolitersperminu #endif { double value = (double) kilolitersperminute; - return new VolumeFlow(value, VolumeFlowUnit.KilolitersPerMinute); + return new VolumeFlow(value, VolumeFlowUnit.KiloliterPerMinute); } /// @@ -456,7 +456,7 @@ public static VolumeFlow FromLitersPerHour(QuantityValue litersperhour) #endif { double value = (double) litersperhour; - return new VolumeFlow(value, VolumeFlowUnit.LitersPerHour); + return new VolumeFlow(value, VolumeFlowUnit.LiterPerHour); } /// @@ -470,7 +470,7 @@ public static VolumeFlow FromLitersPerMinute(QuantityValue litersperminute) #endif { double value = (double) litersperminute; - return new VolumeFlow(value, VolumeFlowUnit.LitersPerMinute); + return new VolumeFlow(value, VolumeFlowUnit.LiterPerMinute); } /// @@ -484,7 +484,7 @@ public static VolumeFlow FromLitersPerSecond(QuantityValue literspersecond) #endif { double value = (double) literspersecond; - return new VolumeFlow(value, VolumeFlowUnit.LitersPerSecond); + return new VolumeFlow(value, VolumeFlowUnit.LiterPerSecond); } /// @@ -498,7 +498,7 @@ public static VolumeFlow FromMicrolitersPerMinute(QuantityValue microliterspermi #endif { double value = (double) microlitersperminute; - return new VolumeFlow(value, VolumeFlowUnit.MicrolitersPerMinute); + return new VolumeFlow(value, VolumeFlowUnit.MicroliterPerMinute); } /// @@ -512,7 +512,7 @@ public static VolumeFlow FromMillilitersPerMinute(QuantityValue milliliterspermi #endif { double value = (double) millilitersperminute; - return new VolumeFlow(value, VolumeFlowUnit.MillilitersPerMinute); + return new VolumeFlow(value, VolumeFlowUnit.MilliliterPerMinute); } /// @@ -526,7 +526,7 @@ public static VolumeFlow FromMillionUsGallonsPerDay(QuantityValue millionusgallo #endif { double value = (double) millionusgallonsperday; - return new VolumeFlow(value, VolumeFlowUnit.MillionUsGallonsPerDay); + return new VolumeFlow(value, VolumeFlowUnit.MillionUsGallonPerDay); } /// @@ -540,7 +540,7 @@ public static VolumeFlow FromNanolitersPerMinute(QuantityValue nanolitersperminu #endif { double value = (double) nanolitersperminute; - return new VolumeFlow(value, VolumeFlowUnit.NanolitersPerMinute); + return new VolumeFlow(value, VolumeFlowUnit.NanoliterPerMinute); } /// @@ -554,7 +554,7 @@ public static VolumeFlow FromOilBarrelsPerDay(QuantityValue oilbarrelsperday) #endif { double value = (double) oilbarrelsperday; - return new VolumeFlow(value, VolumeFlowUnit.OilBarrelsPerDay); + return new VolumeFlow(value, VolumeFlowUnit.OilBarrelPerDay); } /// @@ -568,7 +568,7 @@ public static VolumeFlow FromOilBarrelsPerHour(QuantityValue oilbarrelsperhour) #endif { double value = (double) oilbarrelsperhour; - return new VolumeFlow(value, VolumeFlowUnit.OilBarrelsPerHour); + return new VolumeFlow(value, VolumeFlowUnit.OilBarrelPerHour); } /// @@ -582,7 +582,7 @@ public static VolumeFlow FromOilBarrelsPerMinute(QuantityValue oilbarrelsperminu #endif { double value = (double) oilbarrelsperminute; - return new VolumeFlow(value, VolumeFlowUnit.OilBarrelsPerMinute); + return new VolumeFlow(value, VolumeFlowUnit.OilBarrelPerMinute); } /// @@ -596,7 +596,7 @@ public static VolumeFlow FromUsGallonsPerHour(QuantityValue usgallonsperhour) #endif { double value = (double) usgallonsperhour; - return new VolumeFlow(value, VolumeFlowUnit.UsGallonsPerHour); + return new VolumeFlow(value, VolumeFlowUnit.UsGallonPerHour); } /// @@ -610,7 +610,7 @@ public static VolumeFlow FromUsGallonsPerMinute(QuantityValue usgallonsperminute #endif { double value = (double) usgallonsperminute; - return new VolumeFlow(value, VolumeFlowUnit.UsGallonsPerMinute); + return new VolumeFlow(value, VolumeFlowUnit.UsGallonPerMinute); } /// @@ -624,7 +624,7 @@ public static VolumeFlow FromUsGallonsPerSecond(QuantityValue usgallonspersecond #endif { double value = (double) usgallonspersecond; - return new VolumeFlow(value, VolumeFlowUnit.UsGallonsPerSecond); + return new VolumeFlow(value, VolumeFlowUnit.UsGallonPerSecond); } @@ -775,7 +775,7 @@ private double AsBaseUnit() { switch(Unit) { - case VolumeFlowUnit.CentilitersPerMinute: return (_value/60000.00000) * 1e-2d; + case VolumeFlowUnit.CentiliterPerMinute: return (_value/60000.00000) * 1e-2d; case VolumeFlowUnit.CubicDecimeterPerMinute: return _value/60000.00000; case VolumeFlowUnit.CubicFootPerHour: return _value*7.8657907199999087346816086183876e-6; case VolumeFlowUnit.CubicFootPerMinute: return _value/2118.88000326; @@ -786,21 +786,21 @@ private double AsBaseUnit() case VolumeFlowUnit.CubicYardPerHour: return _value*2.1237634944E-4; case VolumeFlowUnit.CubicYardPerMinute: return _value*0.0127425809664; case VolumeFlowUnit.CubicYardPerSecond: return _value*0.764554857984; - case VolumeFlowUnit.DecilitersPerMinute: return (_value/60000.00000) * 1e-1d; - case VolumeFlowUnit.KilolitersPerMinute: return (_value/60000.00000) * 1e3d; - case VolumeFlowUnit.LitersPerHour: return _value/3600000.000; - case VolumeFlowUnit.LitersPerMinute: return _value/60000.00000; - case VolumeFlowUnit.LitersPerSecond: return _value/1000; - case VolumeFlowUnit.MicrolitersPerMinute: return (_value/60000.00000) * 1e-6d; - case VolumeFlowUnit.MillilitersPerMinute: return (_value/60000.00000) * 1e-3d; - case VolumeFlowUnit.MillionUsGallonsPerDay: return _value/22.824465227; - case VolumeFlowUnit.NanolitersPerMinute: return (_value/60000.00000) * 1e-9d; - case VolumeFlowUnit.OilBarrelsPerDay: return _value*1.8401307283333333333333333333333e-6; - case VolumeFlowUnit.OilBarrelsPerHour: return _value*4.41631375e-5; - case VolumeFlowUnit.OilBarrelsPerMinute: return _value*2.64978825e-3; - case VolumeFlowUnit.UsGallonsPerHour: return _value/951019.38848933424; - case VolumeFlowUnit.UsGallonsPerMinute: return _value/15850.323141489; - case VolumeFlowUnit.UsGallonsPerSecond: return _value/264.1720523581484; + case VolumeFlowUnit.DeciliterPerMinute: return (_value/60000.00000) * 1e-1d; + case VolumeFlowUnit.KiloliterPerMinute: return (_value/60000.00000) * 1e3d; + case VolumeFlowUnit.LiterPerHour: return _value/3600000.000; + case VolumeFlowUnit.LiterPerMinute: return _value/60000.00000; + case VolumeFlowUnit.LiterPerSecond: return _value/1000; + case VolumeFlowUnit.MicroliterPerMinute: return (_value/60000.00000) * 1e-6d; + case VolumeFlowUnit.MilliliterPerMinute: return (_value/60000.00000) * 1e-3d; + case VolumeFlowUnit.MillionUsGallonPerDay: return _value/22.824465227; + case VolumeFlowUnit.NanoliterPerMinute: return (_value/60000.00000) * 1e-9d; + case VolumeFlowUnit.OilBarrelPerDay: return _value*1.8401307283333333333333333333333e-6; + case VolumeFlowUnit.OilBarrelPerHour: return _value*4.41631375e-5; + case VolumeFlowUnit.OilBarrelPerMinute: return _value*2.64978825e-3; + case VolumeFlowUnit.UsGallonPerHour: return _value/951019.38848933424; + case VolumeFlowUnit.UsGallonPerMinute: return _value/15850.323141489; + case VolumeFlowUnit.UsGallonPerSecond: return _value/264.1720523581484; default: throw new NotImplementedException($"Can not convert {Unit} to base units."); } @@ -815,7 +815,7 @@ private double AsBaseNumericType(VolumeFlowUnit unit) switch(unit) { - case VolumeFlowUnit.CentilitersPerMinute: return (baseUnitValue*60000.00000) / 1e-2d; + case VolumeFlowUnit.CentiliterPerMinute: return (baseUnitValue*60000.00000) / 1e-2d; case VolumeFlowUnit.CubicDecimeterPerMinute: return baseUnitValue*60000.00000; case VolumeFlowUnit.CubicFootPerHour: return baseUnitValue/7.8657907199999087346816086183876e-6; case VolumeFlowUnit.CubicFootPerMinute: return baseUnitValue*2118.88000326; @@ -826,21 +826,21 @@ private double AsBaseNumericType(VolumeFlowUnit unit) case VolumeFlowUnit.CubicYardPerHour: return baseUnitValue/2.1237634944E-4; case VolumeFlowUnit.CubicYardPerMinute: return baseUnitValue/0.0127425809664; case VolumeFlowUnit.CubicYardPerSecond: return baseUnitValue/0.764554857984; - case VolumeFlowUnit.DecilitersPerMinute: return (baseUnitValue*60000.00000) / 1e-1d; - case VolumeFlowUnit.KilolitersPerMinute: return (baseUnitValue*60000.00000) / 1e3d; - case VolumeFlowUnit.LitersPerHour: return baseUnitValue*3600000.000; - case VolumeFlowUnit.LitersPerMinute: return baseUnitValue*60000.00000; - case VolumeFlowUnit.LitersPerSecond: return baseUnitValue*1000; - case VolumeFlowUnit.MicrolitersPerMinute: return (baseUnitValue*60000.00000) / 1e-6d; - case VolumeFlowUnit.MillilitersPerMinute: return (baseUnitValue*60000.00000) / 1e-3d; - case VolumeFlowUnit.MillionUsGallonsPerDay: return baseUnitValue*22.824465227; - case VolumeFlowUnit.NanolitersPerMinute: return (baseUnitValue*60000.00000) / 1e-9d; - case VolumeFlowUnit.OilBarrelsPerDay: return baseUnitValue/1.8401307283333333333333333333333e-6; - case VolumeFlowUnit.OilBarrelsPerHour: return baseUnitValue/4.41631375e-5; - case VolumeFlowUnit.OilBarrelsPerMinute: return baseUnitValue/2.64978825e-3; - case VolumeFlowUnit.UsGallonsPerHour: return baseUnitValue*951019.38848933424; - case VolumeFlowUnit.UsGallonsPerMinute: return baseUnitValue*15850.323141489; - case VolumeFlowUnit.UsGallonsPerSecond: return baseUnitValue*264.1720523581484; + case VolumeFlowUnit.DeciliterPerMinute: return (baseUnitValue*60000.00000) / 1e-1d; + case VolumeFlowUnit.KiloliterPerMinute: return (baseUnitValue*60000.00000) / 1e3d; + case VolumeFlowUnit.LiterPerHour: return baseUnitValue*3600000.000; + case VolumeFlowUnit.LiterPerMinute: return baseUnitValue*60000.00000; + case VolumeFlowUnit.LiterPerSecond: return baseUnitValue*1000; + case VolumeFlowUnit.MicroliterPerMinute: return (baseUnitValue*60000.00000) / 1e-6d; + case VolumeFlowUnit.MilliliterPerMinute: return (baseUnitValue*60000.00000) / 1e-3d; + case VolumeFlowUnit.MillionUsGallonPerDay: return baseUnitValue*22.824465227; + case VolumeFlowUnit.NanoliterPerMinute: return (baseUnitValue*60000.00000) / 1e-9d; + case VolumeFlowUnit.OilBarrelPerDay: return baseUnitValue/1.8401307283333333333333333333333e-6; + case VolumeFlowUnit.OilBarrelPerHour: return baseUnitValue/4.41631375e-5; + case VolumeFlowUnit.OilBarrelPerMinute: return baseUnitValue/2.64978825e-3; + case VolumeFlowUnit.UsGallonPerHour: return baseUnitValue*951019.38848933424; + case VolumeFlowUnit.UsGallonPerMinute: return baseUnitValue*15850.323141489; + case VolumeFlowUnit.UsGallonPerSecond: return baseUnitValue*264.1720523581484; default: throw new NotImplementedException($"Can not convert {Unit} to {unit}."); } diff --git a/Common/UnitDefinitions/VolumeFlow.json b/Common/UnitDefinitions/VolumeFlow.json index 37f22c1273..ddbc7b06ce 100644 --- a/Common/UnitDefinitions/VolumeFlow.json +++ b/Common/UnitDefinitions/VolumeFlow.json @@ -1,4 +1,4 @@ -{ +{ "Name": "VolumeFlow", "BaseUnit": "CubicMeterPerSecond", "XmlDoc": "In physics and engineering, in particular fluid dynamics and hydrometry, the volumetric flow rate, (also known as volume flow rate, rate of fluid flow or volume velocity) is the volume of fluid which passes through a given surface per unit time. The SI unit is m³/s (cubic meters per second). In US Customary Units and British Imperial Units, volumetric flow rate is often expressed as ft³/s (cubic feet per second). It is usually represented by the symbol Q.", @@ -124,7 +124,7 @@ ] }, { - "SingularName": "MillionUsGallonsPerDay", + "SingularName": "MillionUsGallonPerDay", "PluralName": "MillionUsGallonsPerDay", "FromUnitToBaseFunc": "x/22.824465227", "FromBaseToUnitFunc": "x*22.824465227", @@ -136,7 +136,7 @@ ] }, { - "SingularName": "LitersPerSecond", + "SingularName": "LiterPerSecond", "PluralName": "LitersPerSecond", "FromUnitToBaseFunc": "x/1000", "FromBaseToUnitFunc": "x*1000", @@ -148,7 +148,7 @@ ] }, { - "SingularName": "LitersPerMinute", + "SingularName": "LiterPerMinute", "PluralName": "LitersPerMinute", "FromUnitToBaseFunc": "x/60000.00000", "FromBaseToUnitFunc": "x*60000.00000", @@ -161,7 +161,7 @@ ] }, { - "SingularName": "LitersPerHour", + "SingularName": "LiterPerHour", "PluralName": "LitersPerHour", "FromUnitToBaseFunc": "x/3600000.000", "FromBaseToUnitFunc": "x*3600000.000", @@ -177,7 +177,7 @@ ] }, { - "SingularName": "UsGallonsPerSecond", + "SingularName": "UsGallonPerSecond", "PluralName": "UsGallonsPerSecond", "FromUnitToBaseFunc": "x/264.1720523581484", "FromBaseToUnitFunc": "x*264.1720523581484", @@ -189,7 +189,7 @@ ] }, { - "SingularName": "UsGallonsPerMinute", + "SingularName": "UsGallonPerMinute", "PluralName": "UsGallonsPerMinute", "FromUnitToBaseFunc": "x/15850.323141489", "FromBaseToUnitFunc": "x*15850.323141489", @@ -201,7 +201,7 @@ ] }, { - "SingularName": "UsGallonsPerHour", + "SingularName": "UsGallonPerHour", "PluralName": "UsGallonsPerHour", "FromUnitToBaseFunc": "x/951019.38848933424", "FromBaseToUnitFunc": "x*951019.38848933424", @@ -229,7 +229,7 @@ ] }, { - "SingularName": "OilBarrelsPerDay", + "SingularName": "OilBarrelPerDay", "PluralName": "OilBarrelsPerDay", "FromUnitToBaseFunc": "x*1.8401307283333333333333333333333e-6", "FromBaseToUnitFunc": "x/1.8401307283333333333333333333333e-6", @@ -241,7 +241,7 @@ ] }, { - "SingularName": "OilBarrelsPerMinute", + "SingularName": "OilBarrelPerMinute", "PluralName": "OilBarrelsPerMinute", "FromUnitToBaseFunc": "x*2.64978825e-3", "FromBaseToUnitFunc": "x/2.64978825e-3", @@ -253,7 +253,7 @@ ] }, { - "SingularName": "OilBarrelsPerHour", + "SingularName": "OilBarrelPerHour", "PluralName": "OilBarrelsPerHour", "FromUnitToBaseFunc": "x*4.41631375e-5", "FromBaseToUnitFunc": "x/4.41631375e-5", diff --git a/UnitsNet.Tests/GeneratedCode/VolumeFlowTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/VolumeFlowTestsBase.g.cs index e7f4484e3f..8ae378b1b8 100644 --- a/UnitsNet.Tests/GeneratedCode/VolumeFlowTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/VolumeFlowTestsBase.g.cs @@ -144,7 +144,7 @@ public void CubicMeterPerSecondToVolumeFlowUnits() [Fact] public void FromValueAndUnit() { - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.CentilitersPerMinute).CentilitersPerMinute, CentilitersPerMinuteTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.CentiliterPerMinute).CentilitersPerMinute, CentilitersPerMinuteTolerance); AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.CubicDecimeterPerMinute).CubicDecimetersPerMinute, CubicDecimetersPerMinuteTolerance); AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.CubicFootPerHour).CubicFeetPerHour, CubicFeetPerHourTolerance); AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.CubicFootPerMinute).CubicFeetPerMinute, CubicFeetPerMinuteTolerance); @@ -155,28 +155,28 @@ public void FromValueAndUnit() AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.CubicYardPerHour).CubicYardsPerHour, CubicYardsPerHourTolerance); AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.CubicYardPerMinute).CubicYardsPerMinute, CubicYardsPerMinuteTolerance); AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.CubicYardPerSecond).CubicYardsPerSecond, CubicYardsPerSecondTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.DecilitersPerMinute).DecilitersPerMinute, DecilitersPerMinuteTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.KilolitersPerMinute).KilolitersPerMinute, KilolitersPerMinuteTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.LitersPerHour).LitersPerHour, LitersPerHourTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.LitersPerMinute).LitersPerMinute, LitersPerMinuteTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.LitersPerSecond).LitersPerSecond, LitersPerSecondTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.MicrolitersPerMinute).MicrolitersPerMinute, MicrolitersPerMinuteTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.MillilitersPerMinute).MillilitersPerMinute, MillilitersPerMinuteTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.MillionUsGallonsPerDay).MillionUsGallonsPerDay, MillionUsGallonsPerDayTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.NanolitersPerMinute).NanolitersPerMinute, NanolitersPerMinuteTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.OilBarrelsPerDay).OilBarrelsPerDay, OilBarrelsPerDayTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.OilBarrelsPerHour).OilBarrelsPerHour, OilBarrelsPerHourTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.OilBarrelsPerMinute).OilBarrelsPerMinute, OilBarrelsPerMinuteTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.UsGallonsPerHour).UsGallonsPerHour, UsGallonsPerHourTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.UsGallonsPerMinute).UsGallonsPerMinute, UsGallonsPerMinuteTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.UsGallonsPerSecond).UsGallonsPerSecond, UsGallonsPerSecondTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.DeciliterPerMinute).DecilitersPerMinute, DecilitersPerMinuteTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.KiloliterPerMinute).KilolitersPerMinute, KilolitersPerMinuteTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.LiterPerHour).LitersPerHour, LitersPerHourTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.LiterPerMinute).LitersPerMinute, LitersPerMinuteTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.LiterPerSecond).LitersPerSecond, LitersPerSecondTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.MicroliterPerMinute).MicrolitersPerMinute, MicrolitersPerMinuteTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.MilliliterPerMinute).MillilitersPerMinute, MillilitersPerMinuteTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.MillionUsGallonPerDay).MillionUsGallonsPerDay, MillionUsGallonsPerDayTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.NanoliterPerMinute).NanolitersPerMinute, NanolitersPerMinuteTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.OilBarrelPerDay).OilBarrelsPerDay, OilBarrelsPerDayTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.OilBarrelPerHour).OilBarrelsPerHour, OilBarrelsPerHourTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.OilBarrelPerMinute).OilBarrelsPerMinute, OilBarrelsPerMinuteTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.UsGallonPerHour).UsGallonsPerHour, UsGallonsPerHourTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.UsGallonPerMinute).UsGallonsPerMinute, UsGallonsPerMinuteTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.UsGallonPerSecond).UsGallonsPerSecond, UsGallonsPerSecondTolerance); } [Fact] public void As() { var cubicmeterpersecond = VolumeFlow.FromCubicMetersPerSecond(1); - AssertEx.EqualTolerance(CentilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.CentilitersPerMinute), CentilitersPerMinuteTolerance); + AssertEx.EqualTolerance(CentilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.CentiliterPerMinute), CentilitersPerMinuteTolerance); AssertEx.EqualTolerance(CubicDecimetersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.CubicDecimeterPerMinute), CubicDecimetersPerMinuteTolerance); AssertEx.EqualTolerance(CubicFeetPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.CubicFootPerHour), CubicFeetPerHourTolerance); AssertEx.EqualTolerance(CubicFeetPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.CubicFootPerMinute), CubicFeetPerMinuteTolerance); @@ -187,21 +187,21 @@ public void As() AssertEx.EqualTolerance(CubicYardsPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.CubicYardPerHour), CubicYardsPerHourTolerance); AssertEx.EqualTolerance(CubicYardsPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.CubicYardPerMinute), CubicYardsPerMinuteTolerance); AssertEx.EqualTolerance(CubicYardsPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.CubicYardPerSecond), CubicYardsPerSecondTolerance); - AssertEx.EqualTolerance(DecilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.DecilitersPerMinute), DecilitersPerMinuteTolerance); - AssertEx.EqualTolerance(KilolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.KilolitersPerMinute), KilolitersPerMinuteTolerance); - AssertEx.EqualTolerance(LitersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.LitersPerHour), LitersPerHourTolerance); - AssertEx.EqualTolerance(LitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.LitersPerMinute), LitersPerMinuteTolerance); - AssertEx.EqualTolerance(LitersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.LitersPerSecond), LitersPerSecondTolerance); - AssertEx.EqualTolerance(MicrolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.MicrolitersPerMinute), MicrolitersPerMinuteTolerance); - AssertEx.EqualTolerance(MillilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.MillilitersPerMinute), MillilitersPerMinuteTolerance); - AssertEx.EqualTolerance(MillionUsGallonsPerDayInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.MillionUsGallonsPerDay), MillionUsGallonsPerDayTolerance); - AssertEx.EqualTolerance(NanolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.NanolitersPerMinute), NanolitersPerMinuteTolerance); - AssertEx.EqualTolerance(OilBarrelsPerDayInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.OilBarrelsPerDay), OilBarrelsPerDayTolerance); - AssertEx.EqualTolerance(OilBarrelsPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.OilBarrelsPerHour), OilBarrelsPerHourTolerance); - AssertEx.EqualTolerance(OilBarrelsPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.OilBarrelsPerMinute), OilBarrelsPerMinuteTolerance); - AssertEx.EqualTolerance(UsGallonsPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.UsGallonsPerHour), UsGallonsPerHourTolerance); - AssertEx.EqualTolerance(UsGallonsPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.UsGallonsPerMinute), UsGallonsPerMinuteTolerance); - AssertEx.EqualTolerance(UsGallonsPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.UsGallonsPerSecond), UsGallonsPerSecondTolerance); + AssertEx.EqualTolerance(DecilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.DeciliterPerMinute), DecilitersPerMinuteTolerance); + AssertEx.EqualTolerance(KilolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.KiloliterPerMinute), KilolitersPerMinuteTolerance); + AssertEx.EqualTolerance(LitersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.LiterPerHour), LitersPerHourTolerance); + AssertEx.EqualTolerance(LitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.LiterPerMinute), LitersPerMinuteTolerance); + AssertEx.EqualTolerance(LitersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.LiterPerSecond), LitersPerSecondTolerance); + AssertEx.EqualTolerance(MicrolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.MicroliterPerMinute), MicrolitersPerMinuteTolerance); + AssertEx.EqualTolerance(MillilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.MilliliterPerMinute), MillilitersPerMinuteTolerance); + AssertEx.EqualTolerance(MillionUsGallonsPerDayInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.MillionUsGallonPerDay), MillionUsGallonsPerDayTolerance); + AssertEx.EqualTolerance(NanolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.NanoliterPerMinute), NanolitersPerMinuteTolerance); + AssertEx.EqualTolerance(OilBarrelsPerDayInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.OilBarrelPerDay), OilBarrelsPerDayTolerance); + AssertEx.EqualTolerance(OilBarrelsPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.OilBarrelPerHour), OilBarrelsPerHourTolerance); + AssertEx.EqualTolerance(OilBarrelsPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.OilBarrelPerMinute), OilBarrelsPerMinuteTolerance); + AssertEx.EqualTolerance(UsGallonsPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.UsGallonPerHour), UsGallonsPerHourTolerance); + AssertEx.EqualTolerance(UsGallonsPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.UsGallonPerMinute), UsGallonsPerMinuteTolerance); + AssertEx.EqualTolerance(UsGallonsPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.UsGallonPerSecond), UsGallonsPerSecondTolerance); } [Fact] @@ -209,9 +209,9 @@ public void ToUnit() { var cubicmeterpersecond = VolumeFlow.FromCubicMetersPerSecond(1); - var centilitersperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.CentilitersPerMinute); - AssertEx.EqualTolerance(CentilitersPerMinuteInOneCubicMeterPerSecond, (double)centilitersperminuteQuantity.Value, CentilitersPerMinuteTolerance); - Assert.Equal(VolumeFlowUnit.CentilitersPerMinute, centilitersperminuteQuantity.Unit); + var centiliterperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.CentiliterPerMinute); + AssertEx.EqualTolerance(CentilitersPerMinuteInOneCubicMeterPerSecond, (double)centiliterperminuteQuantity.Value, CentilitersPerMinuteTolerance); + Assert.Equal(VolumeFlowUnit.CentiliterPerMinute, centiliterperminuteQuantity.Unit); var cubicdecimeterperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.CubicDecimeterPerMinute); AssertEx.EqualTolerance(CubicDecimetersPerMinuteInOneCubicMeterPerSecond, (double)cubicdecimeterperminuteQuantity.Value, CubicDecimetersPerMinuteTolerance); @@ -253,65 +253,65 @@ public void ToUnit() AssertEx.EqualTolerance(CubicYardsPerSecondInOneCubicMeterPerSecond, (double)cubicyardpersecondQuantity.Value, CubicYardsPerSecondTolerance); Assert.Equal(VolumeFlowUnit.CubicYardPerSecond, cubicyardpersecondQuantity.Unit); - var decilitersperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.DecilitersPerMinute); - AssertEx.EqualTolerance(DecilitersPerMinuteInOneCubicMeterPerSecond, (double)decilitersperminuteQuantity.Value, DecilitersPerMinuteTolerance); - Assert.Equal(VolumeFlowUnit.DecilitersPerMinute, decilitersperminuteQuantity.Unit); + var deciliterperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.DeciliterPerMinute); + AssertEx.EqualTolerance(DecilitersPerMinuteInOneCubicMeterPerSecond, (double)deciliterperminuteQuantity.Value, DecilitersPerMinuteTolerance); + Assert.Equal(VolumeFlowUnit.DeciliterPerMinute, deciliterperminuteQuantity.Unit); - var kilolitersperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.KilolitersPerMinute); - AssertEx.EqualTolerance(KilolitersPerMinuteInOneCubicMeterPerSecond, (double)kilolitersperminuteQuantity.Value, KilolitersPerMinuteTolerance); - Assert.Equal(VolumeFlowUnit.KilolitersPerMinute, kilolitersperminuteQuantity.Unit); + var kiloliterperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.KiloliterPerMinute); + AssertEx.EqualTolerance(KilolitersPerMinuteInOneCubicMeterPerSecond, (double)kiloliterperminuteQuantity.Value, KilolitersPerMinuteTolerance); + Assert.Equal(VolumeFlowUnit.KiloliterPerMinute, kiloliterperminuteQuantity.Unit); - var litersperhourQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.LitersPerHour); - AssertEx.EqualTolerance(LitersPerHourInOneCubicMeterPerSecond, (double)litersperhourQuantity.Value, LitersPerHourTolerance); - Assert.Equal(VolumeFlowUnit.LitersPerHour, litersperhourQuantity.Unit); + var literperhourQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.LiterPerHour); + AssertEx.EqualTolerance(LitersPerHourInOneCubicMeterPerSecond, (double)literperhourQuantity.Value, LitersPerHourTolerance); + Assert.Equal(VolumeFlowUnit.LiterPerHour, literperhourQuantity.Unit); - var litersperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.LitersPerMinute); - AssertEx.EqualTolerance(LitersPerMinuteInOneCubicMeterPerSecond, (double)litersperminuteQuantity.Value, LitersPerMinuteTolerance); - Assert.Equal(VolumeFlowUnit.LitersPerMinute, litersperminuteQuantity.Unit); + var literperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.LiterPerMinute); + AssertEx.EqualTolerance(LitersPerMinuteInOneCubicMeterPerSecond, (double)literperminuteQuantity.Value, LitersPerMinuteTolerance); + Assert.Equal(VolumeFlowUnit.LiterPerMinute, literperminuteQuantity.Unit); - var literspersecondQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.LitersPerSecond); - AssertEx.EqualTolerance(LitersPerSecondInOneCubicMeterPerSecond, (double)literspersecondQuantity.Value, LitersPerSecondTolerance); - Assert.Equal(VolumeFlowUnit.LitersPerSecond, literspersecondQuantity.Unit); + var literpersecondQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.LiterPerSecond); + AssertEx.EqualTolerance(LitersPerSecondInOneCubicMeterPerSecond, (double)literpersecondQuantity.Value, LitersPerSecondTolerance); + Assert.Equal(VolumeFlowUnit.LiterPerSecond, literpersecondQuantity.Unit); - var microlitersperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.MicrolitersPerMinute); - AssertEx.EqualTolerance(MicrolitersPerMinuteInOneCubicMeterPerSecond, (double)microlitersperminuteQuantity.Value, MicrolitersPerMinuteTolerance); - Assert.Equal(VolumeFlowUnit.MicrolitersPerMinute, microlitersperminuteQuantity.Unit); + var microliterperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.MicroliterPerMinute); + AssertEx.EqualTolerance(MicrolitersPerMinuteInOneCubicMeterPerSecond, (double)microliterperminuteQuantity.Value, MicrolitersPerMinuteTolerance); + Assert.Equal(VolumeFlowUnit.MicroliterPerMinute, microliterperminuteQuantity.Unit); - var millilitersperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.MillilitersPerMinute); - AssertEx.EqualTolerance(MillilitersPerMinuteInOneCubicMeterPerSecond, (double)millilitersperminuteQuantity.Value, MillilitersPerMinuteTolerance); - Assert.Equal(VolumeFlowUnit.MillilitersPerMinute, millilitersperminuteQuantity.Unit); + var milliliterperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.MilliliterPerMinute); + AssertEx.EqualTolerance(MillilitersPerMinuteInOneCubicMeterPerSecond, (double)milliliterperminuteQuantity.Value, MillilitersPerMinuteTolerance); + Assert.Equal(VolumeFlowUnit.MilliliterPerMinute, milliliterperminuteQuantity.Unit); - var millionusgallonsperdayQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.MillionUsGallonsPerDay); - AssertEx.EqualTolerance(MillionUsGallonsPerDayInOneCubicMeterPerSecond, (double)millionusgallonsperdayQuantity.Value, MillionUsGallonsPerDayTolerance); - Assert.Equal(VolumeFlowUnit.MillionUsGallonsPerDay, millionusgallonsperdayQuantity.Unit); + var millionusgallonperdayQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.MillionUsGallonPerDay); + AssertEx.EqualTolerance(MillionUsGallonsPerDayInOneCubicMeterPerSecond, (double)millionusgallonperdayQuantity.Value, MillionUsGallonsPerDayTolerance); + Assert.Equal(VolumeFlowUnit.MillionUsGallonPerDay, millionusgallonperdayQuantity.Unit); - var nanolitersperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.NanolitersPerMinute); - AssertEx.EqualTolerance(NanolitersPerMinuteInOneCubicMeterPerSecond, (double)nanolitersperminuteQuantity.Value, NanolitersPerMinuteTolerance); - Assert.Equal(VolumeFlowUnit.NanolitersPerMinute, nanolitersperminuteQuantity.Unit); + var nanoliterperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.NanoliterPerMinute); + AssertEx.EqualTolerance(NanolitersPerMinuteInOneCubicMeterPerSecond, (double)nanoliterperminuteQuantity.Value, NanolitersPerMinuteTolerance); + Assert.Equal(VolumeFlowUnit.NanoliterPerMinute, nanoliterperminuteQuantity.Unit); - var oilbarrelsperdayQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.OilBarrelsPerDay); - AssertEx.EqualTolerance(OilBarrelsPerDayInOneCubicMeterPerSecond, (double)oilbarrelsperdayQuantity.Value, OilBarrelsPerDayTolerance); - Assert.Equal(VolumeFlowUnit.OilBarrelsPerDay, oilbarrelsperdayQuantity.Unit); + var oilbarrelperdayQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.OilBarrelPerDay); + AssertEx.EqualTolerance(OilBarrelsPerDayInOneCubicMeterPerSecond, (double)oilbarrelperdayQuantity.Value, OilBarrelsPerDayTolerance); + Assert.Equal(VolumeFlowUnit.OilBarrelPerDay, oilbarrelperdayQuantity.Unit); - var oilbarrelsperhourQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.OilBarrelsPerHour); - AssertEx.EqualTolerance(OilBarrelsPerHourInOneCubicMeterPerSecond, (double)oilbarrelsperhourQuantity.Value, OilBarrelsPerHourTolerance); - Assert.Equal(VolumeFlowUnit.OilBarrelsPerHour, oilbarrelsperhourQuantity.Unit); + var oilbarrelperhourQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.OilBarrelPerHour); + AssertEx.EqualTolerance(OilBarrelsPerHourInOneCubicMeterPerSecond, (double)oilbarrelperhourQuantity.Value, OilBarrelsPerHourTolerance); + Assert.Equal(VolumeFlowUnit.OilBarrelPerHour, oilbarrelperhourQuantity.Unit); - var oilbarrelsperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.OilBarrelsPerMinute); - AssertEx.EqualTolerance(OilBarrelsPerMinuteInOneCubicMeterPerSecond, (double)oilbarrelsperminuteQuantity.Value, OilBarrelsPerMinuteTolerance); - Assert.Equal(VolumeFlowUnit.OilBarrelsPerMinute, oilbarrelsperminuteQuantity.Unit); + var oilbarrelperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.OilBarrelPerMinute); + AssertEx.EqualTolerance(OilBarrelsPerMinuteInOneCubicMeterPerSecond, (double)oilbarrelperminuteQuantity.Value, OilBarrelsPerMinuteTolerance); + Assert.Equal(VolumeFlowUnit.OilBarrelPerMinute, oilbarrelperminuteQuantity.Unit); - var usgallonsperhourQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.UsGallonsPerHour); - AssertEx.EqualTolerance(UsGallonsPerHourInOneCubicMeterPerSecond, (double)usgallonsperhourQuantity.Value, UsGallonsPerHourTolerance); - Assert.Equal(VolumeFlowUnit.UsGallonsPerHour, usgallonsperhourQuantity.Unit); + var usgallonperhourQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.UsGallonPerHour); + AssertEx.EqualTolerance(UsGallonsPerHourInOneCubicMeterPerSecond, (double)usgallonperhourQuantity.Value, UsGallonsPerHourTolerance); + Assert.Equal(VolumeFlowUnit.UsGallonPerHour, usgallonperhourQuantity.Unit); - var usgallonsperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.UsGallonsPerMinute); - AssertEx.EqualTolerance(UsGallonsPerMinuteInOneCubicMeterPerSecond, (double)usgallonsperminuteQuantity.Value, UsGallonsPerMinuteTolerance); - Assert.Equal(VolumeFlowUnit.UsGallonsPerMinute, usgallonsperminuteQuantity.Unit); + var usgallonperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.UsGallonPerMinute); + AssertEx.EqualTolerance(UsGallonsPerMinuteInOneCubicMeterPerSecond, (double)usgallonperminuteQuantity.Value, UsGallonsPerMinuteTolerance); + Assert.Equal(VolumeFlowUnit.UsGallonPerMinute, usgallonperminuteQuantity.Unit); - var usgallonspersecondQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.UsGallonsPerSecond); - AssertEx.EqualTolerance(UsGallonsPerSecondInOneCubicMeterPerSecond, (double)usgallonspersecondQuantity.Value, UsGallonsPerSecondTolerance); - Assert.Equal(VolumeFlowUnit.UsGallonsPerSecond, usgallonspersecondQuantity.Unit); + var usgallonpersecondQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.UsGallonPerSecond); + AssertEx.EqualTolerance(UsGallonsPerSecondInOneCubicMeterPerSecond, (double)usgallonpersecondQuantity.Value, UsGallonsPerSecondTolerance); + Assert.Equal(VolumeFlowUnit.UsGallonPerSecond, usgallonpersecondQuantity.Unit); } [Fact] diff --git a/UnitsNet.Tests/UnitSystemTests.cs b/UnitsNet.Tests/UnitSystemTests.cs index e65f0df700..3a040d7343 100644 --- a/UnitsNet.Tests/UnitSystemTests.cs +++ b/UnitsNet.Tests/UnitSystemTests.cs @@ -275,7 +275,7 @@ public void ShouldUseCorrectMicroSign() Assert.Equal(TemperatureChangeRateUnit.MicrodegreeCelsiusPerSecond, TemperatureChangeRate.ParseUnit("\u00b5°C/s")); Assert.Equal(VolumeUnit.Microliter, Volume.ParseUnit("\u00b5l")); Assert.Equal(VolumeUnit.CubicMicrometer, Volume.ParseUnit("\u00b5m³")); - Assert.Equal(VolumeFlowUnit.MicrolitersPerMinute, VolumeFlow.ParseUnit("\u00b5LPM")); + Assert.Equal(VolumeFlowUnit.MicroliterPerMinute, VolumeFlow.ParseUnit("\u00b5LPM")); // "\u03bc" = Lower case greek letter 'Mu' Assert.Throws(() => Acceleration.ParseUnit("\u03bcm/s²")); diff --git a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs index e8d6492a90..1a976417fe 100644 --- a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs +++ b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs @@ -4408,7 +4408,7 @@ private static readonly ReadOnlyCollection DefaultLocalization new UnitLocalization(typeof (VolumeFlowUnit), new[] { - new CulturesForEnumValue((int) VolumeFlowUnit.CentilitersPerMinute, + new CulturesForEnumValue((int) VolumeFlowUnit.CentiliterPerMinute, new[] { new AbbreviationsForCulture("en-US", "cLPM"), @@ -4466,78 +4466,78 @@ private static readonly ReadOnlyCollection DefaultLocalization { new AbbreviationsForCulture("en-US", "yd³/s"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.DecilitersPerMinute, + new CulturesForEnumValue((int) VolumeFlowUnit.DeciliterPerMinute, new[] { new AbbreviationsForCulture("en-US", "dLPM"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.KilolitersPerMinute, + new CulturesForEnumValue((int) VolumeFlowUnit.KiloliterPerMinute, new[] { new AbbreviationsForCulture("en-US", "kLPM"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.LitersPerHour, + new CulturesForEnumValue((int) VolumeFlowUnit.LiterPerHour, new[] { new AbbreviationsForCulture("en-US", "LPH"), new AbbreviationsForCulture("ru-RU", "л/ч"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.LitersPerMinute, + new CulturesForEnumValue((int) VolumeFlowUnit.LiterPerMinute, new[] { new AbbreviationsForCulture("en-US", "LPM"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.LitersPerSecond, + new CulturesForEnumValue((int) VolumeFlowUnit.LiterPerSecond, new[] { new AbbreviationsForCulture("en-US", "LPS"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.MicrolitersPerMinute, + new CulturesForEnumValue((int) VolumeFlowUnit.MicroliterPerMinute, new[] { new AbbreviationsForCulture("en-US", "µLPM"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.MillilitersPerMinute, + new CulturesForEnumValue((int) VolumeFlowUnit.MilliliterPerMinute, new[] { new AbbreviationsForCulture("en-US", "mLPM"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.MillionUsGallonsPerDay, + new CulturesForEnumValue((int) VolumeFlowUnit.MillionUsGallonPerDay, new[] { new AbbreviationsForCulture("en-US", "MGD"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.NanolitersPerMinute, + new CulturesForEnumValue((int) VolumeFlowUnit.NanoliterPerMinute, new[] { new AbbreviationsForCulture("en-US", "nLPM"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.OilBarrelsPerDay, + new CulturesForEnumValue((int) VolumeFlowUnit.OilBarrelPerDay, new[] { new AbbreviationsForCulture("en-US", "bbl/d", "BOPD"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.OilBarrelsPerHour, + new CulturesForEnumValue((int) VolumeFlowUnit.OilBarrelPerHour, new[] { new AbbreviationsForCulture("en-US", "bbl/hr", "bph"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.OilBarrelsPerMinute, + new CulturesForEnumValue((int) VolumeFlowUnit.OilBarrelPerMinute, new[] { new AbbreviationsForCulture("en-US", "bbl/min", "bpm"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.UsGallonsPerHour, + new CulturesForEnumValue((int) VolumeFlowUnit.UsGallonPerHour, new[] { new AbbreviationsForCulture("en-US", "gal (U.S.)/h"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.UsGallonsPerMinute, + new CulturesForEnumValue((int) VolumeFlowUnit.UsGallonPerMinute, new[] { new AbbreviationsForCulture("en-US", "gal (U.S.)/min", "GPM"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.UsGallonsPerSecond, + new CulturesForEnumValue((int) VolumeFlowUnit.UsGallonPerSecond, new[] { new AbbreviationsForCulture("en-US", "gal (U.S.)/s"), diff --git a/UnitsNet/GeneratedCode/Units/VolumeFlowUnit.g.cs b/UnitsNet/GeneratedCode/Units/VolumeFlowUnit.g.cs index b21fed06c2..f115757442 100644 --- a/UnitsNet/GeneratedCode/Units/VolumeFlowUnit.g.cs +++ b/UnitsNet/GeneratedCode/Units/VolumeFlowUnit.g.cs @@ -45,7 +45,7 @@ namespace UnitsNet.Units public enum VolumeFlowUnit { Undefined = 0, - CentilitersPerMinute, + CentiliterPerMinute, CubicDecimeterPerMinute, CubicFootPerHour, CubicFootPerMinute, @@ -56,21 +56,21 @@ public enum VolumeFlowUnit CubicYardPerHour, CubicYardPerMinute, CubicYardPerSecond, - DecilitersPerMinute, - KilolitersPerMinute, - LitersPerHour, - LitersPerMinute, - LitersPerSecond, - MicrolitersPerMinute, - MillilitersPerMinute, - MillionUsGallonsPerDay, - NanolitersPerMinute, - OilBarrelsPerDay, - OilBarrelsPerHour, - OilBarrelsPerMinute, - UsGallonsPerHour, - UsGallonsPerMinute, - UsGallonsPerSecond, + DeciliterPerMinute, + KiloliterPerMinute, + LiterPerHour, + LiterPerMinute, + LiterPerSecond, + MicroliterPerMinute, + MilliliterPerMinute, + MillionUsGallonPerDay, + NanoliterPerMinute, + OilBarrelPerDay, + OilBarrelPerHour, + OilBarrelPerMinute, + UsGallonPerHour, + UsGallonPerMinute, + UsGallonPerSecond, } #pragma warning restore 1591 From 9d4a017c84855e3abb169b474ff5a589fdbefbf1 Mon Sep 17 00:00:00 2001 From: Tristan Milnthorp Date: Fri, 28 Sep 2018 13:39:50 -0400 Subject: [PATCH 2/2] On second thought, MillionUsGallonsPerDay is appropiate since millions already defines a plurality --- Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs | 8 ++++---- Common/UnitDefinitions/VolumeFlow.json | 2 +- UnitsNet.Tests/GeneratedCode/VolumeFlowTestsBase.g.cs | 10 +++++----- UnitsNet/GeneratedCode/UnitSystem.Default.g.cs | 2 +- UnitsNet/GeneratedCode/Units/VolumeFlowUnit.g.cs | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs b/Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs index edde9c93fe..6d1309ae28 100644 --- a/Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs +++ b/Common/GeneratedCode/Quantities/VolumeFlow.Common.g.cs @@ -217,7 +217,7 @@ public static BaseDimensions BaseDimensions /// /// Get VolumeFlow in MillionUsGallonsPerDay. /// - public double MillionUsGallonsPerDay => As(VolumeFlowUnit.MillionUsGallonPerDay); + public double MillionUsGallonsPerDay => As(VolumeFlowUnit.MillionUsGallonsPerDay); /// /// Get VolumeFlow in NanolitersPerMinute. @@ -526,7 +526,7 @@ public static VolumeFlow FromMillionUsGallonsPerDay(QuantityValue millionusgallo #endif { double value = (double) millionusgallonsperday; - return new VolumeFlow(value, VolumeFlowUnit.MillionUsGallonPerDay); + return new VolumeFlow(value, VolumeFlowUnit.MillionUsGallonsPerDay); } /// @@ -793,7 +793,7 @@ private double AsBaseUnit() case VolumeFlowUnit.LiterPerSecond: return _value/1000; case VolumeFlowUnit.MicroliterPerMinute: return (_value/60000.00000) * 1e-6d; case VolumeFlowUnit.MilliliterPerMinute: return (_value/60000.00000) * 1e-3d; - case VolumeFlowUnit.MillionUsGallonPerDay: return _value/22.824465227; + case VolumeFlowUnit.MillionUsGallonsPerDay: return _value/22.824465227; case VolumeFlowUnit.NanoliterPerMinute: return (_value/60000.00000) * 1e-9d; case VolumeFlowUnit.OilBarrelPerDay: return _value*1.8401307283333333333333333333333e-6; case VolumeFlowUnit.OilBarrelPerHour: return _value*4.41631375e-5; @@ -833,7 +833,7 @@ private double AsBaseNumericType(VolumeFlowUnit unit) case VolumeFlowUnit.LiterPerSecond: return baseUnitValue*1000; case VolumeFlowUnit.MicroliterPerMinute: return (baseUnitValue*60000.00000) / 1e-6d; case VolumeFlowUnit.MilliliterPerMinute: return (baseUnitValue*60000.00000) / 1e-3d; - case VolumeFlowUnit.MillionUsGallonPerDay: return baseUnitValue*22.824465227; + case VolumeFlowUnit.MillionUsGallonsPerDay: return baseUnitValue*22.824465227; case VolumeFlowUnit.NanoliterPerMinute: return (baseUnitValue*60000.00000) / 1e-9d; case VolumeFlowUnit.OilBarrelPerDay: return baseUnitValue/1.8401307283333333333333333333333e-6; case VolumeFlowUnit.OilBarrelPerHour: return baseUnitValue/4.41631375e-5; diff --git a/Common/UnitDefinitions/VolumeFlow.json b/Common/UnitDefinitions/VolumeFlow.json index ddbc7b06ce..49f73e108e 100644 --- a/Common/UnitDefinitions/VolumeFlow.json +++ b/Common/UnitDefinitions/VolumeFlow.json @@ -124,7 +124,7 @@ ] }, { - "SingularName": "MillionUsGallonPerDay", + "SingularName": "MillionUsGallonsPerDay", "PluralName": "MillionUsGallonsPerDay", "FromUnitToBaseFunc": "x/22.824465227", "FromBaseToUnitFunc": "x*22.824465227", diff --git a/UnitsNet.Tests/GeneratedCode/VolumeFlowTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/VolumeFlowTestsBase.g.cs index 8ae378b1b8..2e70cb5e58 100644 --- a/UnitsNet.Tests/GeneratedCode/VolumeFlowTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/VolumeFlowTestsBase.g.cs @@ -162,7 +162,7 @@ public void FromValueAndUnit() AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.LiterPerSecond).LitersPerSecond, LitersPerSecondTolerance); AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.MicroliterPerMinute).MicrolitersPerMinute, MicrolitersPerMinuteTolerance); AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.MilliliterPerMinute).MillilitersPerMinute, MillilitersPerMinuteTolerance); - AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.MillionUsGallonPerDay).MillionUsGallonsPerDay, MillionUsGallonsPerDayTolerance); + AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.MillionUsGallonsPerDay).MillionUsGallonsPerDay, MillionUsGallonsPerDayTolerance); AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.NanoliterPerMinute).NanolitersPerMinute, NanolitersPerMinuteTolerance); AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.OilBarrelPerDay).OilBarrelsPerDay, OilBarrelsPerDayTolerance); AssertEx.EqualTolerance(1, VolumeFlow.From(1, VolumeFlowUnit.OilBarrelPerHour).OilBarrelsPerHour, OilBarrelsPerHourTolerance); @@ -194,7 +194,7 @@ public void As() AssertEx.EqualTolerance(LitersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.LiterPerSecond), LitersPerSecondTolerance); AssertEx.EqualTolerance(MicrolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.MicroliterPerMinute), MicrolitersPerMinuteTolerance); AssertEx.EqualTolerance(MillilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.MilliliterPerMinute), MillilitersPerMinuteTolerance); - AssertEx.EqualTolerance(MillionUsGallonsPerDayInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.MillionUsGallonPerDay), MillionUsGallonsPerDayTolerance); + AssertEx.EqualTolerance(MillionUsGallonsPerDayInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.MillionUsGallonsPerDay), MillionUsGallonsPerDayTolerance); AssertEx.EqualTolerance(NanolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.NanoliterPerMinute), NanolitersPerMinuteTolerance); AssertEx.EqualTolerance(OilBarrelsPerDayInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.OilBarrelPerDay), OilBarrelsPerDayTolerance); AssertEx.EqualTolerance(OilBarrelsPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(VolumeFlowUnit.OilBarrelPerHour), OilBarrelsPerHourTolerance); @@ -281,9 +281,9 @@ public void ToUnit() AssertEx.EqualTolerance(MillilitersPerMinuteInOneCubicMeterPerSecond, (double)milliliterperminuteQuantity.Value, MillilitersPerMinuteTolerance); Assert.Equal(VolumeFlowUnit.MilliliterPerMinute, milliliterperminuteQuantity.Unit); - var millionusgallonperdayQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.MillionUsGallonPerDay); - AssertEx.EqualTolerance(MillionUsGallonsPerDayInOneCubicMeterPerSecond, (double)millionusgallonperdayQuantity.Value, MillionUsGallonsPerDayTolerance); - Assert.Equal(VolumeFlowUnit.MillionUsGallonPerDay, millionusgallonperdayQuantity.Unit); + var millionusgallonsperdayQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.MillionUsGallonsPerDay); + AssertEx.EqualTolerance(MillionUsGallonsPerDayInOneCubicMeterPerSecond, (double)millionusgallonsperdayQuantity.Value, MillionUsGallonsPerDayTolerance); + Assert.Equal(VolumeFlowUnit.MillionUsGallonsPerDay, millionusgallonsperdayQuantity.Unit); var nanoliterperminuteQuantity = cubicmeterpersecond.ToUnit(VolumeFlowUnit.NanoliterPerMinute); AssertEx.EqualTolerance(NanolitersPerMinuteInOneCubicMeterPerSecond, (double)nanoliterperminuteQuantity.Value, NanolitersPerMinuteTolerance); diff --git a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs index 1a976417fe..ce797d70f4 100644 --- a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs +++ b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs @@ -4502,7 +4502,7 @@ private static readonly ReadOnlyCollection DefaultLocalization { new AbbreviationsForCulture("en-US", "mLPM"), }), - new CulturesForEnumValue((int) VolumeFlowUnit.MillionUsGallonPerDay, + new CulturesForEnumValue((int) VolumeFlowUnit.MillionUsGallonsPerDay, new[] { new AbbreviationsForCulture("en-US", "MGD"), diff --git a/UnitsNet/GeneratedCode/Units/VolumeFlowUnit.g.cs b/UnitsNet/GeneratedCode/Units/VolumeFlowUnit.g.cs index f115757442..bc04eaddfe 100644 --- a/UnitsNet/GeneratedCode/Units/VolumeFlowUnit.g.cs +++ b/UnitsNet/GeneratedCode/Units/VolumeFlowUnit.g.cs @@ -63,7 +63,7 @@ public enum VolumeFlowUnit LiterPerSecond, MicroliterPerMinute, MilliliterPerMinute, - MillionUsGallonPerDay, + MillionUsGallonsPerDay, NanoliterPerMinute, OilBarrelPerDay, OilBarrelPerHour,