From ac3e270de14df7c14bc6991cc3333bf5b61dfdce Mon Sep 17 00:00:00 2001 From: Daniel Sirz Date: Thu, 2 Jun 2016 18:07:36 +0200 Subject: [PATCH 1/4] Added MassFlowUnit.KilogramPerHour --- UnitsNet.Tests/CustomCode/MassFlowTests.cs | 1 + .../GeneratedCode/MassFlowTestsBase.g.cs | 6 +++ .../GeneratedCode/Enums/MassFlowUnit.g.cs | 1 + .../GeneratedCode/UnitClasses/MassFlow.g.cs | 37 +++++++++++++++++++ .../GeneratedCode/UnitSystem.Default.g.cs | 6 +++ .../Scripts/UnitDefinitions/MassFlow.json | 18 ++++++++- 6 files changed, 68 insertions(+), 1 deletion(-) diff --git a/UnitsNet.Tests/CustomCode/MassFlowTests.cs b/UnitsNet.Tests/CustomCode/MassFlowTests.cs index ae20dcbf07..194c9f6391 100644 --- a/UnitsNet.Tests/CustomCode/MassFlowTests.cs +++ b/UnitsNet.Tests/CustomCode/MassFlowTests.cs @@ -31,6 +31,7 @@ public class MassFlowTests : MassFlowTestsBase protected override double DecagramsPerSecondInOneGramPerSecond => 1E-1; protected override double HectogramsPerSecondInOneGramPerSecond => 1E-2; + protected override double KilogramsPerHourInOneGramPerSecond => 3.6; protected override double KilogramsPerSecondInOneGramPerSecond => 1E-3; diff --git a/UnitsNet.Tests/GeneratedCode/MassFlowTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/MassFlowTestsBase.g.cs index 8b7eb221bc..5b0d5cc58d 100644 --- a/UnitsNet.Tests/GeneratedCode/MassFlowTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/MassFlowTestsBase.g.cs @@ -41,6 +41,7 @@ public abstract partial class MassFlowTestsBase protected abstract double DecigramsPerSecondInOneGramPerSecond { get; } protected abstract double GramsPerSecondInOneGramPerSecond { get; } protected abstract double HectogramsPerSecondInOneGramPerSecond { get; } + protected abstract double KilogramsPerHourInOneGramPerSecond { get; } protected abstract double KilogramsPerSecondInOneGramPerSecond { get; } protected abstract double MicrogramsPerSecondInOneGramPerSecond { get; } protected abstract double MilligramsPerSecondInOneGramPerSecond { get; } @@ -53,6 +54,7 @@ public abstract partial class MassFlowTestsBase protected virtual double DecigramsPerSecondTolerance { get { return 1e-5; } } protected virtual double GramsPerSecondTolerance { get { return 1e-5; } } protected virtual double HectogramsPerSecondTolerance { get { return 1e-5; } } + protected virtual double KilogramsPerHourTolerance { get { return 1e-5; } } protected virtual double KilogramsPerSecondTolerance { get { return 1e-5; } } protected virtual double MicrogramsPerSecondTolerance { get { return 1e-5; } } protected virtual double MilligramsPerSecondTolerance { get { return 1e-5; } } @@ -69,6 +71,7 @@ public void GramPerSecondToMassFlowUnits() Assert.AreEqual(DecigramsPerSecondInOneGramPerSecond, grampersecond.DecigramsPerSecond, DecigramsPerSecondTolerance); Assert.AreEqual(GramsPerSecondInOneGramPerSecond, grampersecond.GramsPerSecond, GramsPerSecondTolerance); Assert.AreEqual(HectogramsPerSecondInOneGramPerSecond, grampersecond.HectogramsPerSecond, HectogramsPerSecondTolerance); + Assert.AreEqual(KilogramsPerHourInOneGramPerSecond, grampersecond.KilogramsPerHour, KilogramsPerHourTolerance); Assert.AreEqual(KilogramsPerSecondInOneGramPerSecond, grampersecond.KilogramsPerSecond, KilogramsPerSecondTolerance); Assert.AreEqual(MicrogramsPerSecondInOneGramPerSecond, grampersecond.MicrogramsPerSecond, MicrogramsPerSecondTolerance); Assert.AreEqual(MilligramsPerSecondInOneGramPerSecond, grampersecond.MilligramsPerSecond, MilligramsPerSecondTolerance); @@ -84,6 +87,7 @@ public void FromValueAndUnit() Assert.AreEqual(1, MassFlow.From(1, MassFlowUnit.DecigramPerSecond).DecigramsPerSecond, DecigramsPerSecondTolerance); Assert.AreEqual(1, MassFlow.From(1, MassFlowUnit.GramPerSecond).GramsPerSecond, GramsPerSecondTolerance); Assert.AreEqual(1, MassFlow.From(1, MassFlowUnit.HectogramPerSecond).HectogramsPerSecond, HectogramsPerSecondTolerance); + Assert.AreEqual(1, MassFlow.From(1, MassFlowUnit.KilogramPerHour).KilogramsPerHour, KilogramsPerHourTolerance); Assert.AreEqual(1, MassFlow.From(1, MassFlowUnit.KilogramPerSecond).KilogramsPerSecond, KilogramsPerSecondTolerance); Assert.AreEqual(1, MassFlow.From(1, MassFlowUnit.MicrogramPerSecond).MicrogramsPerSecond, MicrogramsPerSecondTolerance); Assert.AreEqual(1, MassFlow.From(1, MassFlowUnit.MilligramPerSecond).MilligramsPerSecond, MilligramsPerSecondTolerance); @@ -100,6 +104,7 @@ public void As() Assert.AreEqual(DecigramsPerSecondInOneGramPerSecond, grampersecond.As(MassFlowUnit.DecigramPerSecond), DecigramsPerSecondTolerance); Assert.AreEqual(GramsPerSecondInOneGramPerSecond, grampersecond.As(MassFlowUnit.GramPerSecond), GramsPerSecondTolerance); Assert.AreEqual(HectogramsPerSecondInOneGramPerSecond, grampersecond.As(MassFlowUnit.HectogramPerSecond), HectogramsPerSecondTolerance); + Assert.AreEqual(KilogramsPerHourInOneGramPerSecond, grampersecond.As(MassFlowUnit.KilogramPerHour), KilogramsPerHourTolerance); Assert.AreEqual(KilogramsPerSecondInOneGramPerSecond, grampersecond.As(MassFlowUnit.KilogramPerSecond), KilogramsPerSecondTolerance); Assert.AreEqual(MicrogramsPerSecondInOneGramPerSecond, grampersecond.As(MassFlowUnit.MicrogramPerSecond), MicrogramsPerSecondTolerance); Assert.AreEqual(MilligramsPerSecondInOneGramPerSecond, grampersecond.As(MassFlowUnit.MilligramPerSecond), MilligramsPerSecondTolerance); @@ -116,6 +121,7 @@ public void ConversionRoundTrip() Assert.AreEqual(1, MassFlow.FromDecigramsPerSecond(grampersecond.DecigramsPerSecond).GramsPerSecond, DecigramsPerSecondTolerance); Assert.AreEqual(1, MassFlow.FromGramsPerSecond(grampersecond.GramsPerSecond).GramsPerSecond, GramsPerSecondTolerance); Assert.AreEqual(1, MassFlow.FromHectogramsPerSecond(grampersecond.HectogramsPerSecond).GramsPerSecond, HectogramsPerSecondTolerance); + Assert.AreEqual(1, MassFlow.FromKilogramsPerHour(grampersecond.KilogramsPerHour).GramsPerSecond, KilogramsPerHourTolerance); Assert.AreEqual(1, MassFlow.FromKilogramsPerSecond(grampersecond.KilogramsPerSecond).GramsPerSecond, KilogramsPerSecondTolerance); Assert.AreEqual(1, MassFlow.FromMicrogramsPerSecond(grampersecond.MicrogramsPerSecond).GramsPerSecond, MicrogramsPerSecondTolerance); Assert.AreEqual(1, MassFlow.FromMilligramsPerSecond(grampersecond.MilligramsPerSecond).GramsPerSecond, MilligramsPerSecondTolerance); diff --git a/UnitsNet/GeneratedCode/Enums/MassFlowUnit.g.cs b/UnitsNet/GeneratedCode/Enums/MassFlowUnit.g.cs index 910c286da5..cd06fa36b5 100644 --- a/UnitsNet/GeneratedCode/Enums/MassFlowUnit.g.cs +++ b/UnitsNet/GeneratedCode/Enums/MassFlowUnit.g.cs @@ -30,6 +30,7 @@ public enum MassFlowUnit DecigramPerSecond, GramPerSecond, HectogramPerSecond, + KilogramPerHour, KilogramPerSecond, MicrogramPerSecond, MilligramPerSecond, diff --git a/UnitsNet/GeneratedCode/UnitClasses/MassFlow.g.cs b/UnitsNet/GeneratedCode/UnitClasses/MassFlow.g.cs index 692b9f8d6c..c29ca1b6c5 100644 --- a/UnitsNet/GeneratedCode/UnitClasses/MassFlow.g.cs +++ b/UnitsNet/GeneratedCode/UnitClasses/MassFlow.g.cs @@ -133,6 +133,14 @@ public double HectogramsPerSecond get { return (_gramsPerSecond) / 1e2d; } } + /// + /// Get MassFlow in KilogramsPerHour. + /// + public double KilogramsPerHour + { + get { return _gramsPerSecond/0.277778; } + } + /// /// Get MassFlow in KilogramsPerSecond. /// @@ -222,6 +230,14 @@ public static MassFlow FromHectogramsPerSecond(double hectogramspersecond) return new MassFlow((hectogramspersecond) * 1e2d); } + /// + /// Get MassFlow from KilogramsPerHour. + /// + public static MassFlow FromKilogramsPerHour(double kilogramsperhour) + { + return new MassFlow(kilogramsperhour*0.277778); + } + /// /// Get MassFlow from KilogramsPerSecond. /// @@ -338,6 +354,21 @@ public static MassFlow FromTonnesPerDay(double tonnesperday) } } + /// + /// Get nullable MassFlow from nullable KilogramsPerHour. + /// + public static MassFlow? FromKilogramsPerHour(double? kilogramsperhour) + { + if (kilogramsperhour.HasValue) + { + return FromKilogramsPerHour(kilogramsperhour.Value); + } + else + { + return null; + } + } + /// /// Get nullable MassFlow from nullable KilogramsPerSecond. /// @@ -435,6 +466,8 @@ public static MassFlow From(double val, MassFlowUnit fromUnit) return FromGramsPerSecond(val); case MassFlowUnit.HectogramPerSecond: return FromHectogramsPerSecond(val); + case MassFlowUnit.KilogramPerHour: + return FromKilogramsPerHour(val); case MassFlowUnit.KilogramPerSecond: return FromKilogramsPerSecond(val); case MassFlowUnit.MicrogramPerSecond: @@ -476,6 +509,8 @@ public static MassFlow From(double val, MassFlowUnit fromUnit) return FromGramsPerSecond(value.Value); case MassFlowUnit.HectogramPerSecond: return FromHectogramsPerSecond(value.Value); + case MassFlowUnit.KilogramPerHour: + return FromKilogramsPerHour(value.Value); case MassFlowUnit.KilogramPerSecond: return FromKilogramsPerSecond(value.Value); case MassFlowUnit.MicrogramPerSecond: @@ -650,6 +685,8 @@ public double As(MassFlowUnit unit) return GramsPerSecond; case MassFlowUnit.HectogramPerSecond: return HectogramsPerSecond; + case MassFlowUnit.KilogramPerHour: + return KilogramsPerHour; case MassFlowUnit.KilogramPerSecond: return KilogramsPerSecond; case MassFlowUnit.MicrogramPerSecond: diff --git a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs index e322d949f5..9e6815f862 100644 --- a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs +++ b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs @@ -1179,6 +1179,12 @@ private static readonly ReadOnlyCollection DefaultLocalization { new AbbreviationsForCulture("en-US", "hg/S"), }), + new CulturesForEnumValue((int) MassFlowUnit.KilogramPerHour, + new[] + { + new AbbreviationsForCulture("en-US", "kg/h"), + new AbbreviationsForCulture("ru-RU", "кг/ч"), + }), new CulturesForEnumValue((int) MassFlowUnit.KilogramPerSecond, new[] { diff --git a/UnitsNet/Scripts/UnitDefinitions/MassFlow.json b/UnitsNet/Scripts/UnitDefinitions/MassFlow.json index 00b615bd65..db48579eeb 100644 --- a/UnitsNet/Scripts/UnitDefinitions/MassFlow.json +++ b/UnitsNet/Scripts/UnitDefinitions/MassFlow.json @@ -1,4 +1,4 @@ -{ +{ "Name": "MassFlow", "BaseUnit": "GramPerSecond", "XmlDoc": "Mass flow is the ratio of the mass change to the time during which the change occurred (value of mass changes per unit time).", @@ -16,6 +16,22 @@ } ] }, + { + "SingularName": "KilogramPerHour", + "PluralName": "KilogramsPerHour", + "FromUnitToBaseFunc": "x*0.277778", + "FromBaseToUnitFunc": "x/0.277778", + "Localization": [ + { + "Culture": "en-US", + "Abbreviations": [ "kg/h" ] + }, + { + "Culture": "ru-RU", + "Abbreviations": [ "кг/ч" ] + } + ] + }, { "SingularName": "TonnePerDay", "PluralName": "TonnesPerDay", From 2cedf2f9c60b5f2573381f0d8915a3b5dd97d600 Mon Sep 17 00:00:00 2001 From: Daniel Sirz Date: Fri, 3 Jun 2016 03:17:46 +0200 Subject: [PATCH 2/4] Update on MassFlow Definition --- UnitsNet.Tests/CustomCode/MassFlowTests.cs | 2 +- UnitsNet/GeneratedCode/UnitClasses/MassFlow.g.cs | 4 ++-- UnitsNet/Scripts/UnitDefinitions/MassFlow.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/UnitsNet.Tests/CustomCode/MassFlowTests.cs b/UnitsNet.Tests/CustomCode/MassFlowTests.cs index 194c9f6391..93572b6be5 100644 --- a/UnitsNet.Tests/CustomCode/MassFlowTests.cs +++ b/UnitsNet.Tests/CustomCode/MassFlowTests.cs @@ -31,7 +31,7 @@ public class MassFlowTests : MassFlowTestsBase protected override double DecagramsPerSecondInOneGramPerSecond => 1E-1; protected override double HectogramsPerSecondInOneGramPerSecond => 1E-2; - protected override double KilogramsPerHourInOneGramPerSecond => 3.6; + protected override double KilogramsPerHourInOneGramPerSecond => 0.277778; protected override double KilogramsPerSecondInOneGramPerSecond => 1E-3; diff --git a/UnitsNet/GeneratedCode/UnitClasses/MassFlow.g.cs b/UnitsNet/GeneratedCode/UnitClasses/MassFlow.g.cs index c29ca1b6c5..3a901ad9b6 100644 --- a/UnitsNet/GeneratedCode/UnitClasses/MassFlow.g.cs +++ b/UnitsNet/GeneratedCode/UnitClasses/MassFlow.g.cs @@ -138,7 +138,7 @@ public double HectogramsPerSecond /// public double KilogramsPerHour { - get { return _gramsPerSecond/0.277778; } + get { return _gramsPerSecond/3.6; } } /// @@ -235,7 +235,7 @@ public static MassFlow FromHectogramsPerSecond(double hectogramspersecond) /// public static MassFlow FromKilogramsPerHour(double kilogramsperhour) { - return new MassFlow(kilogramsperhour*0.277778); + return new MassFlow(kilogramsperhour*3.6); } /// diff --git a/UnitsNet/Scripts/UnitDefinitions/MassFlow.json b/UnitsNet/Scripts/UnitDefinitions/MassFlow.json index db48579eeb..5032c602d9 100644 --- a/UnitsNet/Scripts/UnitDefinitions/MassFlow.json +++ b/UnitsNet/Scripts/UnitDefinitions/MassFlow.json @@ -19,8 +19,8 @@ { "SingularName": "KilogramPerHour", "PluralName": "KilogramsPerHour", - "FromUnitToBaseFunc": "x*0.277778", - "FromBaseToUnitFunc": "x/0.277778", + "FromUnitToBaseFunc": "x*3.6", + "FromBaseToUnitFunc": "x/3.6", "Localization": [ { "Culture": "en-US", From 304b90d053e24b1fb2e98c7492380645c16aab64 Mon Sep 17 00:00:00 2001 From: Daniel Sirz Date: Fri, 3 Jun 2016 10:11:29 +0200 Subject: [PATCH 3/4] swapped functions + corrected test --- UnitsNet.Tests/CustomCode/MassFlowTests.cs | 3 ++- UnitsNet/GeneratedCode/UnitClasses/MassFlow.g.cs | 4 ++-- UnitsNet/Scripts/UnitDefinitions/MassFlow.json | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/UnitsNet.Tests/CustomCode/MassFlowTests.cs b/UnitsNet.Tests/CustomCode/MassFlowTests.cs index 93572b6be5..e7ba919f7d 100644 --- a/UnitsNet.Tests/CustomCode/MassFlowTests.cs +++ b/UnitsNet.Tests/CustomCode/MassFlowTests.cs @@ -31,7 +31,8 @@ public class MassFlowTests : MassFlowTestsBase protected override double DecagramsPerSecondInOneGramPerSecond => 1E-1; protected override double HectogramsPerSecondInOneGramPerSecond => 1E-2; - protected override double KilogramsPerHourInOneGramPerSecond => 0.277778; + + protected override double KilogramsPerHourInOneGramPerSecond => 3.6; protected override double KilogramsPerSecondInOneGramPerSecond => 1E-3; diff --git a/UnitsNet/GeneratedCode/UnitClasses/MassFlow.g.cs b/UnitsNet/GeneratedCode/UnitClasses/MassFlow.g.cs index 3a901ad9b6..272799494b 100644 --- a/UnitsNet/GeneratedCode/UnitClasses/MassFlow.g.cs +++ b/UnitsNet/GeneratedCode/UnitClasses/MassFlow.g.cs @@ -138,7 +138,7 @@ public double HectogramsPerSecond /// public double KilogramsPerHour { - get { return _gramsPerSecond/3.6; } + get { return _gramsPerSecond*3.6; } } /// @@ -235,7 +235,7 @@ public static MassFlow FromHectogramsPerSecond(double hectogramspersecond) /// public static MassFlow FromKilogramsPerHour(double kilogramsperhour) { - return new MassFlow(kilogramsperhour*3.6); + return new MassFlow(kilogramsperhour/3.6); } /// diff --git a/UnitsNet/Scripts/UnitDefinitions/MassFlow.json b/UnitsNet/Scripts/UnitDefinitions/MassFlow.json index 5032c602d9..cb26e7c28f 100644 --- a/UnitsNet/Scripts/UnitDefinitions/MassFlow.json +++ b/UnitsNet/Scripts/UnitDefinitions/MassFlow.json @@ -19,8 +19,8 @@ { "SingularName": "KilogramPerHour", "PluralName": "KilogramsPerHour", - "FromUnitToBaseFunc": "x*3.6", - "FromBaseToUnitFunc": "x/3.6", + "FromUnitToBaseFunc": "x/3.6", + "FromBaseToUnitFunc": "x*3.6", "Localization": [ { "Culture": "en-US", From a23caf24499533e0e3593b7c18c5eb720630829e Mon Sep 17 00:00:00 2001 From: Z900420 Date: Fri, 3 Jun 2016 14:57:27 +0200 Subject: [PATCH 4/4] Added CubicDecimetersPerMinute --- UnitsNet.Tests/CustomCode/FlowTests.cs | 2 + .../GeneratedCode/FlowTestsBase.g.cs | 6 +++ UnitsNet/GeneratedCode/Enums/FlowUnit.g.cs | 1 + UnitsNet/GeneratedCode/UnitClasses/Flow.g.cs | 37 +++++++++++++++++++ .../GeneratedCode/UnitSystem.Default.g.cs | 6 +++ UnitsNet/Scripts/UnitDefinitions/Flow.json | 20 +++++++++- 6 files changed, 70 insertions(+), 2 deletions(-) diff --git a/UnitsNet.Tests/CustomCode/FlowTests.cs b/UnitsNet.Tests/CustomCode/FlowTests.cs index de7424e14e..d7768e6f82 100644 --- a/UnitsNet.Tests/CustomCode/FlowTests.cs +++ b/UnitsNet.Tests/CustomCode/FlowTests.cs @@ -25,6 +25,8 @@ public class FlowTests : FlowTestsBase { protected override double CubicMetersPerHourInOneCubicMeterPerSecond => 3600.0; + protected override double CubicDecimetersPerMinuteInOneCubicMeterPerSecond => 60000.00000; + protected override double CubicFeetPerSecondInOneCubicMeterPerSecond => 35.314666213; protected override double MillionUsGallonsPerDayInOneCubicMeterPerSecond => 22.824465227; diff --git a/UnitsNet.Tests/GeneratedCode/FlowTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/FlowTestsBase.g.cs index b588d865db..7388305f34 100644 --- a/UnitsNet.Tests/GeneratedCode/FlowTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/FlowTestsBase.g.cs @@ -37,6 +37,7 @@ namespace UnitsNet.Tests public abstract partial class FlowTestsBase { protected abstract double CentilitersPerMinuteInOneCubicMeterPerSecond { get; } + protected abstract double CubicDecimetersPerMinuteInOneCubicMeterPerSecond { get; } protected abstract double CubicFeetPerSecondInOneCubicMeterPerSecond { get; } protected abstract double CubicMetersPerHourInOneCubicMeterPerSecond { get; } protected abstract double CubicMetersPerSecondInOneCubicMeterPerSecond { get; } @@ -51,6 +52,7 @@ public abstract partial class FlowTestsBase // ReSharper disable VirtualMemberNeverOverriden.Global protected virtual double CentilitersPerMinuteTolerance { get { return 1e-5; } } + protected virtual double CubicDecimetersPerMinuteTolerance { get { return 1e-5; } } protected virtual double CubicFeetPerSecondTolerance { get { return 1e-5; } } protected virtual double CubicMetersPerHourTolerance { get { return 1e-5; } } protected virtual double CubicMetersPerSecondTolerance { get { return 1e-5; } } @@ -69,6 +71,7 @@ public void CubicMeterPerSecondToFlowUnits() { Flow cubicmeterpersecond = Flow.FromCubicMetersPerSecond(1); Assert.AreEqual(CentilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.CentilitersPerMinute, CentilitersPerMinuteTolerance); + Assert.AreEqual(CubicDecimetersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.CubicDecimetersPerMinute, CubicDecimetersPerMinuteTolerance); Assert.AreEqual(CubicFeetPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.CubicFeetPerSecond, CubicFeetPerSecondTolerance); Assert.AreEqual(CubicMetersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.CubicMetersPerHour, CubicMetersPerHourTolerance); Assert.AreEqual(CubicMetersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.CubicMetersPerSecond, CubicMetersPerSecondTolerance); @@ -86,6 +89,7 @@ public void CubicMeterPerSecondToFlowUnits() public void FromValueAndUnit() { Assert.AreEqual(1, Flow.From(1, FlowUnit.CentilitersPerMinute).CentilitersPerMinute, CentilitersPerMinuteTolerance); + Assert.AreEqual(1, Flow.From(1, FlowUnit.CubicDecimeterPerMinute).CubicDecimetersPerMinute, CubicDecimetersPerMinuteTolerance); 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); @@ -104,6 +108,7 @@ public void As() { var cubicmeterpersecond = Flow.FromCubicMetersPerSecond(1); Assert.AreEqual(CentilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CentilitersPerMinute), CentilitersPerMinuteTolerance); + Assert.AreEqual(CubicDecimetersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicDecimeterPerMinute), CubicDecimetersPerMinuteTolerance); Assert.AreEqual(CubicFeetPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicFootPerSecond), CubicFeetPerSecondTolerance); Assert.AreEqual(CubicMetersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicMeterPerHour), CubicMetersPerHourTolerance); Assert.AreEqual(CubicMetersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicMeterPerSecond), CubicMetersPerSecondTolerance); @@ -122,6 +127,7 @@ public void ConversionRoundTrip() { Flow cubicmeterpersecond = Flow.FromCubicMetersPerSecond(1); Assert.AreEqual(1, Flow.FromCentilitersPerMinute(cubicmeterpersecond.CentilitersPerMinute).CubicMetersPerSecond, CentilitersPerMinuteTolerance); + Assert.AreEqual(1, Flow.FromCubicDecimetersPerMinute(cubicmeterpersecond.CubicDecimetersPerMinute).CubicMetersPerSecond, CubicDecimetersPerMinuteTolerance); 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); diff --git a/UnitsNet/GeneratedCode/Enums/FlowUnit.g.cs b/UnitsNet/GeneratedCode/Enums/FlowUnit.g.cs index 642a735303..fa7870e81e 100644 --- a/UnitsNet/GeneratedCode/Enums/FlowUnit.g.cs +++ b/UnitsNet/GeneratedCode/Enums/FlowUnit.g.cs @@ -26,6 +26,7 @@ public enum FlowUnit { Undefined = 0, CentilitersPerMinute, + CubicDecimeterPerMinute, CubicFootPerSecond, CubicMeterPerHour, CubicMeterPerSecond, diff --git a/UnitsNet/GeneratedCode/UnitClasses/Flow.g.cs b/UnitsNet/GeneratedCode/UnitClasses/Flow.g.cs index 1971620ec1..b43467592a 100644 --- a/UnitsNet/GeneratedCode/UnitClasses/Flow.g.cs +++ b/UnitsNet/GeneratedCode/UnitClasses/Flow.g.cs @@ -101,6 +101,14 @@ public double CentilitersPerMinute get { return (_cubicMetersPerSecond*60000.00000) / 1e-2d; } } + /// + /// Get Flow in CubicDecimetersPerMinute. + /// + public double CubicDecimetersPerMinute + { + get { return _cubicMetersPerSecond*60000.00000; } + } + /// /// Get Flow in CubicFeetPerSecond. /// @@ -206,6 +214,14 @@ public static Flow FromCentilitersPerMinute(double centilitersperminute) return new Flow((centilitersperminute/60000.00000) * 1e-2d); } + /// + /// Get Flow from CubicDecimetersPerMinute. + /// + public static Flow FromCubicDecimetersPerMinute(double cubicdecimetersperminute) + { + return new Flow(cubicdecimetersperminute/60000.00000); + } + /// /// Get Flow from CubicFeetPerSecond. /// @@ -310,6 +326,21 @@ public static Flow FromUsGallonsPerMinute(double usgallonsperminute) } } + /// + /// Get nullable Flow from nullable CubicDecimetersPerMinute. + /// + public static Flow? FromCubicDecimetersPerMinute(double? cubicdecimetersperminute) + { + if (cubicdecimetersperminute.HasValue) + { + return FromCubicDecimetersPerMinute(cubicdecimetersperminute.Value); + } + else + { + return null; + } + } + /// /// Get nullable Flow from nullable CubicFeetPerSecond. /// @@ -489,6 +520,8 @@ public static Flow From(double val, FlowUnit fromUnit) { case FlowUnit.CentilitersPerMinute: return FromCentilitersPerMinute(val); + case FlowUnit.CubicDecimeterPerMinute: + return FromCubicDecimetersPerMinute(val); case FlowUnit.CubicFootPerSecond: return FromCubicFeetPerSecond(val); case FlowUnit.CubicMeterPerHour: @@ -534,6 +567,8 @@ public static Flow From(double val, FlowUnit fromUnit) { case FlowUnit.CentilitersPerMinute: return FromCentilitersPerMinute(value.Value); + case FlowUnit.CubicDecimeterPerMinute: + return FromCubicDecimetersPerMinute(value.Value); case FlowUnit.CubicFootPerSecond: return FromCubicFeetPerSecond(value.Value); case FlowUnit.CubicMeterPerHour: @@ -712,6 +747,8 @@ public double As(FlowUnit unit) { case FlowUnit.CentilitersPerMinute: return CentilitersPerMinute; + case FlowUnit.CubicDecimeterPerMinute: + return CubicDecimetersPerMinute; case FlowUnit.CubicFootPerSecond: return CubicFeetPerSecond; case FlowUnit.CubicMeterPerHour: diff --git a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs index 9e6815f862..9f74331518 100644 --- a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs +++ b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs @@ -567,6 +567,12 @@ private static readonly ReadOnlyCollection DefaultLocalization { new AbbreviationsForCulture("en-US", "cLPM"), }), + new CulturesForEnumValue((int) FlowUnit.CubicDecimeterPerMinute, + new[] + { + new AbbreviationsForCulture("en-US", "dm³/min"), + new AbbreviationsForCulture("ru-RU", "дм³/мин"), + }), new CulturesForEnumValue((int) FlowUnit.CubicFootPerSecond, new[] { diff --git a/UnitsNet/Scripts/UnitDefinitions/Flow.json b/UnitsNet/Scripts/UnitDefinitions/Flow.json index f30e9b948c..d4936ed565 100644 --- a/UnitsNet/Scripts/UnitDefinitions/Flow.json +++ b/UnitsNet/Scripts/UnitDefinitions/Flow.json @@ -64,12 +64,12 @@ "PluralName": "LitersPerMinute", "FromUnitToBaseFunc": "x/60000.00000", "FromBaseToUnitFunc": "x*60000.00000", - "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo"], + "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ], "Localization": [ { "Culture": "en-US", "Abbreviations": [ "LPM" ], - "AbbreviationsWithPrefixes": ["nLPM", "μLPM", "mLPM", "cLPM", "dLPM", "kLPM"] + "AbbreviationsWithPrefixes": [ "nLPM", "μLPM", "mLPM", "cLPM", "dLPM", "kLPM" ] } ] }, @@ -84,6 +84,22 @@ "Abbreviations": [ "GPM" ] } ] + }, + { + "SingularName": "CubicDecimeterPerMinute", + "PluralName": "CubicDecimetersPerMinute", + "FromUnitToBaseFunc": "x/60000.00000", + "FromBaseToUnitFunc": "x*60000.00000", + "Localization": [ + { + "Culture": "en-US", + "Abbreviations": [ "dm³/min" ] + }, + { + "Culture": "ru-RU", + "Abbreviations": [ "дм³/мин" ] + } + ] } ] }