From e623a1de908d3ca95da1fe8621fd6cf14286c2d2 Mon Sep 17 00:00:00 2001 From: lipchev Date: Fri, 3 Jan 2025 14:02:18 +0200 Subject: [PATCH 1/3] Rename SpecificFuelConsumption.GramPerKiloNewtonSecond to GramPerKilonewtonSecond --- .../SpecificFuelConsumption.json | 6 +- Common/UnitEnumValues.g.json | 4 +- .../Quantities/SpecificFuelConsumption.g.cs | 26 +- .../Units/SpecificFuelConsumptionUnit.g.cs | 4 +- ...SpecificFuelConsumptionExtensionsTest.g.cs | 8 +- ...erToSpecificFuelConsumptionExtensions.g.cs | 12 +- .../SpecificFuelConsumptionTests.cs | 8 +- .../SpecificFuelConsumptionTestsBase.g.cs | 278 +++++++++--------- .../Quantities/SpecificFuelConsumption.g.cs | 58 ++-- .../Resources/SpecificFuelConsumption.restext | 4 +- .../Units/SpecificFuelConsumptionUnit.g.cs | 4 +- 11 files changed, 207 insertions(+), 205 deletions(-) diff --git a/Common/UnitDefinitions/SpecificFuelConsumption.json b/Common/UnitDefinitions/SpecificFuelConsumption.json index 35d7d5c4ad..b1b05e5318 100644 --- a/Common/UnitDefinitions/SpecificFuelConsumption.json +++ b/Common/UnitDefinitions/SpecificFuelConsumption.json @@ -1,6 +1,6 @@ { "Name": "SpecificFuelConsumption", - "BaseUnit": "GramPerKiloNewtonSecond", + "BaseUnit": "GramPerKilonewtonSecond", "XmlDocSummary": "SFC is the fuel efficiency of an engine design with respect to thrust output", "XmlDocRemarks": "https://en.wikipedia.org/wiki/Thrust-specific_fuel_consumption", "BaseDimensions": { @@ -33,8 +33,8 @@ ] }, { - "SingularName": "GramPerKiloNewtonSecond", - "PluralName": "GramsPerKiloNewtonSecond", + "SingularName": "GramPerKilonewtonSecond", + "PluralName": "GramsPerKilonewtonSecond", "BaseUnits": { "L": "Meter", "T": "Second" diff --git a/Common/UnitEnumValues.g.json b/Common/UnitEnumValues.g.json index aa5b0b6558..d9bdcd18f1 100644 --- a/Common/UnitEnumValues.g.json +++ b/Common/UnitEnumValues.g.json @@ -1334,7 +1334,9 @@ "GramPerKiloNewtonSecond": 1, "KilogramPerKilogramForceHour": 2, "KilogramPerKiloNewtonSecond": 3, - "PoundMassPerPoundForceHour": 4 + "PoundMassPerPoundForceHour": 4, + "GramPerKilonewtonSecond": 11, + "KilogramPerKilonewtonSecond": 6 }, "SpecificVolume": { "CubicFootPerPound": 1, diff --git a/UnitsNet.NanoFramework/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs index ec57340cb9..0d7f66059b 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs @@ -63,7 +63,7 @@ public SpecificFuelConsumption(double value, SpecificFuelConsumptionUnit unit) /// /// The base unit of SpecificFuelConsumption, which is Second. All conversions go via this value. /// - public static SpecificFuelConsumptionUnit BaseUnit { get; } = SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond; + public static SpecificFuelConsumptionUnit BaseUnit { get; } = SpecificFuelConsumptionUnit.GramPerKilonewtonSecond; /// /// Represents the largest possible value of SpecificFuelConsumption. @@ -82,9 +82,9 @@ public SpecificFuelConsumption(double value, SpecificFuelConsumptionUnit unit) #region Conversion Properties /// - /// Gets a value of this quantity converted into + /// Gets a value of this quantity converted into /// - public double GramsPerKiloNewtonSecond => As(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond); + public double GramsPerKilonewtonSecond => As(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond); /// /// Gets a value of this quantity converted into @@ -92,9 +92,9 @@ public SpecificFuelConsumption(double value, SpecificFuelConsumptionUnit unit) public double KilogramsPerKilogramForceHour => As(SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour); /// - /// Gets a value of this quantity converted into + /// Gets a value of this quantity converted into /// - public double KilogramsPerKiloNewtonSecond => As(SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond); + public double KilogramsPerKilonewtonSecond => As(SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond); /// /// Gets a value of this quantity converted into @@ -106,9 +106,9 @@ public SpecificFuelConsumption(double value, SpecificFuelConsumptionUnit unit) #region Static Factory Methods /// - /// Creates a from . + /// Creates a from . /// - public static SpecificFuelConsumption FromGramsPerKiloNewtonSecond(double gramsperkilonewtonsecond) => new SpecificFuelConsumption(gramsperkilonewtonsecond, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond); + public static SpecificFuelConsumption FromGramsPerKilonewtonSecond(double gramsperkilonewtonsecond) => new SpecificFuelConsumption(gramsperkilonewtonsecond, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond); /// /// Creates a from . @@ -116,9 +116,9 @@ public SpecificFuelConsumption(double value, SpecificFuelConsumptionUnit unit) public static SpecificFuelConsumption FromKilogramsPerKilogramForceHour(double kilogramsperkilogramforcehour) => new SpecificFuelConsumption(kilogramsperkilogramforcehour, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour); /// - /// Creates a from . + /// Creates a from . /// - public static SpecificFuelConsumption FromKilogramsPerKiloNewtonSecond(double kilogramsperkilonewtonsecond) => new SpecificFuelConsumption(kilogramsperkilonewtonsecond, SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond); + public static SpecificFuelConsumption FromKilogramsPerKilonewtonSecond(double kilogramsperkilonewtonsecond) => new SpecificFuelConsumption(kilogramsperkilonewtonsecond, SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond); /// /// Creates a from . @@ -165,9 +165,9 @@ private double GetValueInBaseUnit() { return Unit switch { - SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond => _value, + SpecificFuelConsumptionUnit.GramPerKilonewtonSecond => _value, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour => _value * 28.33, - SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond => (_value) * 1e3d, + SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond => (_value) * 1e3d, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour => _value * 28.33, _ => throw new NotImplementedException($"Can not convert {Unit} to base units.") }; @@ -182,9 +182,9 @@ private double GetValueAs(SpecificFuelConsumptionUnit unit) return unit switch { - SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond => baseUnitValue, + SpecificFuelConsumptionUnit.GramPerKilonewtonSecond => baseUnitValue, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour => baseUnitValue / 28.33, - SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond => (baseUnitValue) / 1e3d, + SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond => (baseUnitValue) / 1e3d, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour => baseUnitValue / 28.33, _ => throw new NotImplementedException($"Can not convert {Unit} to {unit}.") }; diff --git a/UnitsNet.NanoFramework/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs index f647a17cf6..4aec962d5f 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs @@ -25,9 +25,9 @@ namespace UnitsNet.Units public enum SpecificFuelConsumptionUnit { - GramPerKiloNewtonSecond = 1, + GramPerKilonewtonSecond = 11, KilogramPerKilogramForceHour = 2, - KilogramPerKiloNewtonSecond = 3, + KilogramPerKilonewtonSecond = 6, PoundMassPerPoundForceHour = 4, } diff --git a/UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToSpecificFuelConsumptionExtensionsTest.g.cs b/UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToSpecificFuelConsumptionExtensionsTest.g.cs index 4129c6055c..836d851957 100644 --- a/UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToSpecificFuelConsumptionExtensionsTest.g.cs +++ b/UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToSpecificFuelConsumptionExtensionsTest.g.cs @@ -25,16 +25,16 @@ namespace UnitsNet.Tests public class NumberToSpecificFuelConsumptionExtensionsTests { [Fact] - public void NumberToGramsPerKiloNewtonSecondTest() => - Assert.Equal(SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(2), 2.GramsPerKiloNewtonSecond()); + public void NumberToGramsPerKilonewtonSecondTest() => + Assert.Equal(SpecificFuelConsumption.FromGramsPerKilonewtonSecond(2), 2.GramsPerKilonewtonSecond()); [Fact] public void NumberToKilogramsPerKilogramForceHourTest() => Assert.Equal(SpecificFuelConsumption.FromKilogramsPerKilogramForceHour(2), 2.KilogramsPerKilogramForceHour()); [Fact] - public void NumberToKilogramsPerKiloNewtonSecondTest() => - Assert.Equal(SpecificFuelConsumption.FromKilogramsPerKiloNewtonSecond(2), 2.KilogramsPerKiloNewtonSecond()); + public void NumberToKilogramsPerKilonewtonSecondTest() => + Assert.Equal(SpecificFuelConsumption.FromKilogramsPerKilonewtonSecond(2), 2.KilogramsPerKilonewtonSecond()); [Fact] public void NumberToPoundsMassPerPoundForceHourTest() => diff --git a/UnitsNet.NumberExtensions/GeneratedCode/NumberToSpecificFuelConsumptionExtensions.g.cs b/UnitsNet.NumberExtensions/GeneratedCode/NumberToSpecificFuelConsumptionExtensions.g.cs index 0d6dc5a674..230e9a2a07 100644 --- a/UnitsNet.NumberExtensions/GeneratedCode/NumberToSpecificFuelConsumptionExtensions.g.cs +++ b/UnitsNet.NumberExtensions/GeneratedCode/NumberToSpecificFuelConsumptionExtensions.g.cs @@ -32,13 +32,13 @@ namespace UnitsNet.NumberExtensions.NumberToSpecificFuelConsumption /// public static class NumberToSpecificFuelConsumptionExtensions { - /// - public static SpecificFuelConsumption GramsPerKiloNewtonSecond(this T value) + /// + public static SpecificFuelConsumption GramsPerKilonewtonSecond(this T value) where T : notnull #if NET7_0_OR_GREATER , INumber #endif - => SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(Convert.ToDouble(value)); + => SpecificFuelConsumption.FromGramsPerKilonewtonSecond(Convert.ToDouble(value)); /// public static SpecificFuelConsumption KilogramsPerKilogramForceHour(this T value) @@ -48,13 +48,13 @@ public static SpecificFuelConsumption KilogramsPerKilogramForceHour(this T va #endif => SpecificFuelConsumption.FromKilogramsPerKilogramForceHour(Convert.ToDouble(value)); - /// - public static SpecificFuelConsumption KilogramsPerKiloNewtonSecond(this T value) + /// + public static SpecificFuelConsumption KilogramsPerKilonewtonSecond(this T value) where T : notnull #if NET7_0_OR_GREATER , INumber #endif - => SpecificFuelConsumption.FromKilogramsPerKiloNewtonSecond(Convert.ToDouble(value)); + => SpecificFuelConsumption.FromKilogramsPerKilonewtonSecond(Convert.ToDouble(value)); /// public static SpecificFuelConsumption PoundsMassPerPoundForceHour(this T value) diff --git a/UnitsNet.Tests/CustomCode/SpecificFuelConsumptionTests.cs b/UnitsNet.Tests/CustomCode/SpecificFuelConsumptionTests.cs index ce22b6eec8..ce48500cdb 100644 --- a/UnitsNet.Tests/CustomCode/SpecificFuelConsumptionTests.cs +++ b/UnitsNet.Tests/CustomCode/SpecificFuelConsumptionTests.cs @@ -27,12 +27,12 @@ public class SpecificFuelConsumptionTests : SpecificFuelConsumptionTestsBase // Override properties in base class here protected override bool SupportsSIUnitSystem => false; - protected override double GramsPerKiloNewtonSecondInOneGramPerKiloNewtonSecond => 1; + protected override double GramsPerKilonewtonSecondInOneGramPerKilonewtonSecond => 1; - protected override double KilogramsPerKiloNewtonSecondInOneGramPerKiloNewtonSecond => 1e-3; + protected override double KilogramsPerKilonewtonSecondInOneGramPerKilonewtonSecond => 1e-3; - protected override double PoundsMassPerPoundForceHourInOneGramPerKiloNewtonSecond => 0.03529827; + protected override double PoundsMassPerPoundForceHourInOneGramPerKilonewtonSecond => 0.03529827; - protected override double KilogramsPerKilogramForceHourInOneGramPerKiloNewtonSecond => 0.03529827; + protected override double KilogramsPerKilogramForceHourInOneGramPerKilonewtonSecond => 0.03529827; } } diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificFuelConsumptionTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificFuelConsumptionTestsBase.g.cs index 07723809cf..0e89153519 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificFuelConsumptionTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificFuelConsumptionTestsBase.g.cs @@ -39,15 +39,15 @@ namespace UnitsNet.Tests // ReSharper disable once PartialTypeWithSinglePart public abstract partial class SpecificFuelConsumptionTestsBase : QuantityTestsBase { - protected abstract double GramsPerKiloNewtonSecondInOneGramPerKiloNewtonSecond { get; } - protected abstract double KilogramsPerKilogramForceHourInOneGramPerKiloNewtonSecond { get; } - protected abstract double KilogramsPerKiloNewtonSecondInOneGramPerKiloNewtonSecond { get; } - protected abstract double PoundsMassPerPoundForceHourInOneGramPerKiloNewtonSecond { get; } + protected abstract double GramsPerKilonewtonSecondInOneGramPerKilonewtonSecond { get; } + protected abstract double KilogramsPerKilogramForceHourInOneGramPerKilonewtonSecond { get; } + protected abstract double KilogramsPerKilonewtonSecondInOneGramPerKilonewtonSecond { get; } + protected abstract double PoundsMassPerPoundForceHourInOneGramPerKilonewtonSecond { get; } // ReSharper disable VirtualMemberNeverOverriden.Global - protected virtual double GramsPerKiloNewtonSecondTolerance { get { return 1e-5; } } + protected virtual double GramsPerKilonewtonSecondTolerance { get { return 1e-5; } } protected virtual double KilogramsPerKilogramForceHourTolerance { get { return 1e-5; } } - protected virtual double KilogramsPerKiloNewtonSecondTolerance { get { return 1e-5; } } + protected virtual double KilogramsPerKilonewtonSecondTolerance { get { return 1e-5; } } protected virtual double PoundsMassPerPoundForceHourTolerance { get { return 1e-5; } } // ReSharper restore VirtualMemberNeverOverriden.Global @@ -55,19 +55,19 @@ public abstract partial class SpecificFuelConsumptionTestsBase : QuantityTestsBa { return unit switch { - SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond => (GramsPerKiloNewtonSecondInOneGramPerKiloNewtonSecond, GramsPerKiloNewtonSecondTolerance), - SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour => (KilogramsPerKilogramForceHourInOneGramPerKiloNewtonSecond, KilogramsPerKilogramForceHourTolerance), - SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond => (KilogramsPerKiloNewtonSecondInOneGramPerKiloNewtonSecond, KilogramsPerKiloNewtonSecondTolerance), - SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour => (PoundsMassPerPoundForceHourInOneGramPerKiloNewtonSecond, PoundsMassPerPoundForceHourTolerance), + SpecificFuelConsumptionUnit.GramPerKilonewtonSecond => (GramsPerKilonewtonSecondInOneGramPerKilonewtonSecond, GramsPerKilonewtonSecondTolerance), + SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour => (KilogramsPerKilogramForceHourInOneGramPerKilonewtonSecond, KilogramsPerKilogramForceHourTolerance), + SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond => (KilogramsPerKilonewtonSecondInOneGramPerKilonewtonSecond, KilogramsPerKilonewtonSecondTolerance), + SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour => (PoundsMassPerPoundForceHourInOneGramPerKilonewtonSecond, PoundsMassPerPoundForceHourTolerance), _ => throw new NotSupportedException() }; } public static IEnumerable UnitTypes = new List { - new object[] { SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond }, + new object[] { SpecificFuelConsumptionUnit.GramPerKilonewtonSecond }, new object[] { SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour }, - new object[] { SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond }, + new object[] { SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond }, new object[] { SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour }, }; @@ -76,14 +76,14 @@ public void DefaultCtor_ReturnsQuantityWithZeroValueAndBaseUnit() { var quantity = new SpecificFuelConsumption(); Assert.Equal(0, quantity.Value); - Assert.Equal(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, quantity.Unit); + Assert.Equal(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, quantity.Unit); } [Fact] public void Ctor_WithInfinityValue_DoNotThrowsArgumentException() { - var exception1 = Record.Exception(() => new SpecificFuelConsumption(double.PositiveInfinity, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond)); - var exception2 = Record.Exception(() => new SpecificFuelConsumption(double.NegativeInfinity, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond)); + var exception1 = Record.Exception(() => new SpecificFuelConsumption(double.PositiveInfinity, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond)); + var exception2 = Record.Exception(() => new SpecificFuelConsumption(double.NegativeInfinity, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond)); Assert.Null(exception1); Assert.Null(exception2); @@ -92,7 +92,7 @@ public void Ctor_WithInfinityValue_DoNotThrowsArgumentException() [Fact] public void Ctor_WithNaNValue_DoNotThrowsArgumentException() { - var exception = Record.Exception(() => new SpecificFuelConsumption(double.NaN, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond)); + var exception = Record.Exception(() => new SpecificFuelConsumption(double.NaN, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond)); Assert.Null(exception); } @@ -121,7 +121,7 @@ public void Ctor_UnitSystem_ThrowsArgumentExceptionIfNotSupported() [Fact] public void SpecificFuelConsumption_QuantityInfo_ReturnsQuantityInfoDescribingQuantity() { - var quantity = new SpecificFuelConsumption(1, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond); + var quantity = new SpecificFuelConsumption(1, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond); QuantityInfo quantityInfo = quantity.QuantityInfo; @@ -133,29 +133,29 @@ public void SpecificFuelConsumption_QuantityInfo_ReturnsQuantityInfoDescribingQu } [Fact] - public void GramPerKiloNewtonSecondToSpecificFuelConsumptionUnits() + public void GramPerKilonewtonSecondToSpecificFuelConsumptionUnits() { - SpecificFuelConsumption gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1); - AssertEx.EqualTolerance(GramsPerKiloNewtonSecondInOneGramPerKiloNewtonSecond, gramperkilonewtonsecond.GramsPerKiloNewtonSecond, GramsPerKiloNewtonSecondTolerance); - AssertEx.EqualTolerance(KilogramsPerKilogramForceHourInOneGramPerKiloNewtonSecond, gramperkilonewtonsecond.KilogramsPerKilogramForceHour, KilogramsPerKilogramForceHourTolerance); - AssertEx.EqualTolerance(KilogramsPerKiloNewtonSecondInOneGramPerKiloNewtonSecond, gramperkilonewtonsecond.KilogramsPerKiloNewtonSecond, KilogramsPerKiloNewtonSecondTolerance); - AssertEx.EqualTolerance(PoundsMassPerPoundForceHourInOneGramPerKiloNewtonSecond, gramperkilonewtonsecond.PoundsMassPerPoundForceHour, PoundsMassPerPoundForceHourTolerance); + SpecificFuelConsumption gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1); + AssertEx.EqualTolerance(GramsPerKilonewtonSecondInOneGramPerKilonewtonSecond, gramperkilonewtonsecond.GramsPerKilonewtonSecond, GramsPerKilonewtonSecondTolerance); + AssertEx.EqualTolerance(KilogramsPerKilogramForceHourInOneGramPerKilonewtonSecond, gramperkilonewtonsecond.KilogramsPerKilogramForceHour, KilogramsPerKilogramForceHourTolerance); + AssertEx.EqualTolerance(KilogramsPerKilonewtonSecondInOneGramPerKilonewtonSecond, gramperkilonewtonsecond.KilogramsPerKilonewtonSecond, KilogramsPerKilonewtonSecondTolerance); + AssertEx.EqualTolerance(PoundsMassPerPoundForceHourInOneGramPerKilonewtonSecond, gramperkilonewtonsecond.PoundsMassPerPoundForceHour, PoundsMassPerPoundForceHourTolerance); } [Fact] public void From_ValueAndUnit_ReturnsQuantityWithSameValueAndUnit() { - var quantity00 = SpecificFuelConsumption.From(1, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond); - AssertEx.EqualTolerance(1, quantity00.GramsPerKiloNewtonSecond, GramsPerKiloNewtonSecondTolerance); - Assert.Equal(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, quantity00.Unit); + var quantity00 = SpecificFuelConsumption.From(1, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond); + AssertEx.EqualTolerance(1, quantity00.GramsPerKilonewtonSecond, GramsPerKilonewtonSecondTolerance); + Assert.Equal(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, quantity00.Unit); var quantity01 = SpecificFuelConsumption.From(1, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour); AssertEx.EqualTolerance(1, quantity01.KilogramsPerKilogramForceHour, KilogramsPerKilogramForceHourTolerance); Assert.Equal(SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour, quantity01.Unit); - var quantity02 = SpecificFuelConsumption.From(1, SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond); - AssertEx.EqualTolerance(1, quantity02.KilogramsPerKiloNewtonSecond, KilogramsPerKiloNewtonSecondTolerance); - Assert.Equal(SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond, quantity02.Unit); + var quantity02 = SpecificFuelConsumption.From(1, SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond); + AssertEx.EqualTolerance(1, quantity02.KilogramsPerKilonewtonSecond, KilogramsPerKilonewtonSecondTolerance); + Assert.Equal(SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond, quantity02.Unit); var quantity03 = SpecificFuelConsumption.From(1, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour); AssertEx.EqualTolerance(1, quantity03.PoundsMassPerPoundForceHour, PoundsMassPerPoundForceHourTolerance); @@ -164,19 +164,19 @@ public void From_ValueAndUnit_ReturnsQuantityWithSameValueAndUnit() } [Fact] - public void FromGramsPerKiloNewtonSecond_WithInfinityValue_DoNotThrowsArgumentException() + public void FromGramsPerKilonewtonSecond_WithInfinityValue_DoNotThrowsArgumentException() { - var exception1 = Record.Exception(() => SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(double.PositiveInfinity)); - var exception2 = Record.Exception(() => SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(double.NegativeInfinity)); + var exception1 = Record.Exception(() => SpecificFuelConsumption.FromGramsPerKilonewtonSecond(double.PositiveInfinity)); + var exception2 = Record.Exception(() => SpecificFuelConsumption.FromGramsPerKilonewtonSecond(double.NegativeInfinity)); Assert.Null(exception1); Assert.Null(exception2); } [Fact] - public void FromGramsPerKiloNewtonSecond_WithNanValue_DoNotThrowsArgumentException() + public void FromGramsPerKilonewtonSecond_WithNanValue_DoNotThrowsArgumentException() { - var exception = Record.Exception(() => SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(double.NaN)); + var exception = Record.Exception(() => SpecificFuelConsumption.FromGramsPerKilonewtonSecond(double.NaN)); Assert.Null(exception); } @@ -184,11 +184,11 @@ public void FromGramsPerKiloNewtonSecond_WithNanValue_DoNotThrowsArgumentExcepti [Fact] public void As() { - var gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1); - AssertEx.EqualTolerance(GramsPerKiloNewtonSecondInOneGramPerKiloNewtonSecond, gramperkilonewtonsecond.As(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond), GramsPerKiloNewtonSecondTolerance); - AssertEx.EqualTolerance(KilogramsPerKilogramForceHourInOneGramPerKiloNewtonSecond, gramperkilonewtonsecond.As(SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour), KilogramsPerKilogramForceHourTolerance); - AssertEx.EqualTolerance(KilogramsPerKiloNewtonSecondInOneGramPerKiloNewtonSecond, gramperkilonewtonsecond.As(SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond), KilogramsPerKiloNewtonSecondTolerance); - AssertEx.EqualTolerance(PoundsMassPerPoundForceHourInOneGramPerKiloNewtonSecond, gramperkilonewtonsecond.As(SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour), PoundsMassPerPoundForceHourTolerance); + var gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1); + AssertEx.EqualTolerance(GramsPerKilonewtonSecondInOneGramPerKilonewtonSecond, gramperkilonewtonsecond.As(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond), GramsPerKilonewtonSecondTolerance); + AssertEx.EqualTolerance(KilogramsPerKilogramForceHourInOneGramPerKilonewtonSecond, gramperkilonewtonsecond.As(SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour), KilogramsPerKilogramForceHourTolerance); + AssertEx.EqualTolerance(KilogramsPerKilonewtonSecondInOneGramPerKilonewtonSecond, gramperkilonewtonsecond.As(SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond), KilogramsPerKilonewtonSecondTolerance); + AssertEx.EqualTolerance(PoundsMassPerPoundForceHourInOneGramPerKilonewtonSecond, gramperkilonewtonsecond.As(SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour), PoundsMassPerPoundForceHourTolerance); } [Fact] @@ -303,8 +303,8 @@ public void Parse() try { var parsed = SpecificFuelConsumption.Parse("1 g/(kN�s)", CultureInfo.GetCultureInfo("en-US")); - AssertEx.EqualTolerance(1, parsed.GramsPerKiloNewtonSecond, GramsPerKiloNewtonSecondTolerance); - Assert.Equal(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, parsed.Unit); + AssertEx.EqualTolerance(1, parsed.GramsPerKilonewtonSecond, GramsPerKilonewtonSecondTolerance); + Assert.Equal(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, parsed.Unit); } catch (AmbiguousUnitParseException) { /* Some units have the same abbreviations */ } try @@ -317,8 +317,8 @@ public void Parse() try { var parsed = SpecificFuelConsumption.Parse("1 kg/(kN�s)", CultureInfo.GetCultureInfo("en-US")); - AssertEx.EqualTolerance(1, parsed.KilogramsPerKiloNewtonSecond, KilogramsPerKiloNewtonSecondTolerance); - Assert.Equal(SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond, parsed.Unit); + AssertEx.EqualTolerance(1, parsed.KilogramsPerKilonewtonSecond, KilogramsPerKilonewtonSecondTolerance); + Assert.Equal(SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond, parsed.Unit); } catch (AmbiguousUnitParseException) { /* Some units have the same abbreviations */ } try @@ -335,8 +335,8 @@ public void TryParse() { { Assert.True(SpecificFuelConsumption.TryParse("1 g/(kN�s)", CultureInfo.GetCultureInfo("en-US"), out var parsed)); - AssertEx.EqualTolerance(1, parsed.GramsPerKiloNewtonSecond, GramsPerKiloNewtonSecondTolerance); - Assert.Equal(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, parsed.Unit); + AssertEx.EqualTolerance(1, parsed.GramsPerKilonewtonSecond, GramsPerKilonewtonSecondTolerance); + Assert.Equal(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, parsed.Unit); } { @@ -347,8 +347,8 @@ public void TryParse() { Assert.True(SpecificFuelConsumption.TryParse("1 kg/(kN�s)", CultureInfo.GetCultureInfo("en-US"), out var parsed)); - AssertEx.EqualTolerance(1, parsed.KilogramsPerKiloNewtonSecond, KilogramsPerKiloNewtonSecondTolerance); - Assert.Equal(SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond, parsed.Unit); + AssertEx.EqualTolerance(1, parsed.KilogramsPerKilonewtonSecond, KilogramsPerKilonewtonSecondTolerance); + Assert.Equal(SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond, parsed.Unit); } { @@ -360,9 +360,9 @@ public void TryParse() } [Theory] - [InlineData("g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond)] + [InlineData("g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKilonewtonSecond)] [InlineData("kg/(kgf�h)", SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour)] - [InlineData("kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond)] + [InlineData("kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond)] [InlineData("lb/(lbf·h)", SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour)] public void ParseUnit_WithUsEnglishCurrentCulture(string abbreviation, SpecificFuelConsumptionUnit expectedUnit) { @@ -373,9 +373,9 @@ public void ParseUnit_WithUsEnglishCurrentCulture(string abbreviation, SpecificF } [Theory] - [InlineData("g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond)] + [InlineData("g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKilonewtonSecond)] [InlineData("kg/(kgf�h)", SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour)] - [InlineData("kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond)] + [InlineData("kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond)] [InlineData("lb/(lbf·h)", SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour)] public void ParseUnit_WithUnsupportedCurrentCulture_FallsBackToUsEnglish(string abbreviation, SpecificFuelConsumptionUnit expectedUnit) { @@ -386,9 +386,9 @@ public void ParseUnit_WithUnsupportedCurrentCulture_FallsBackToUsEnglish(string } [Theory] - [InlineData("en-US", "g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond)] + [InlineData("en-US", "g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKilonewtonSecond)] [InlineData("en-US", "kg/(kgf�h)", SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour)] - [InlineData("en-US", "kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond)] + [InlineData("en-US", "kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond)] [InlineData("en-US", "lb/(lbf·h)", SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour)] public void ParseUnit_WithCurrentCulture(string culture, string abbreviation, SpecificFuelConsumptionUnit expectedUnit) { @@ -398,9 +398,9 @@ public void ParseUnit_WithCurrentCulture(string culture, string abbreviation, Sp } [Theory] - [InlineData("en-US", "g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond)] + [InlineData("en-US", "g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKilonewtonSecond)] [InlineData("en-US", "kg/(kgf�h)", SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour)] - [InlineData("en-US", "kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond)] + [InlineData("en-US", "kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond)] [InlineData("en-US", "lb/(lbf·h)", SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour)] public void ParseUnit_WithCulture(string culture, string abbreviation, SpecificFuelConsumptionUnit expectedUnit) { @@ -409,9 +409,9 @@ public void ParseUnit_WithCulture(string culture, string abbreviation, SpecificF } [Theory] - [InlineData("g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond)] + [InlineData("g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKilonewtonSecond)] [InlineData("kg/(kgf�h)", SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour)] - [InlineData("kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond)] + [InlineData("kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond)] [InlineData("lb/(lbf·h)", SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour)] public void TryParseUnit_WithUsEnglishCurrentCulture(string abbreviation, SpecificFuelConsumptionUnit expectedUnit) { @@ -422,9 +422,9 @@ public void TryParseUnit_WithUsEnglishCurrentCulture(string abbreviation, Specif } [Theory] - [InlineData("g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond)] + [InlineData("g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKilonewtonSecond)] [InlineData("kg/(kgf�h)", SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour)] - [InlineData("kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond)] + [InlineData("kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond)] [InlineData("lb/(lbf·h)", SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour)] public void TryParseUnit_WithUnsupportedCurrentCulture_FallsBackToUsEnglish(string abbreviation, SpecificFuelConsumptionUnit expectedUnit) { @@ -435,9 +435,9 @@ public void TryParseUnit_WithUnsupportedCurrentCulture_FallsBackToUsEnglish(stri } [Theory] - [InlineData("en-US", "g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond)] + [InlineData("en-US", "g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKilonewtonSecond)] [InlineData("en-US", "kg/(kgf�h)", SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour)] - [InlineData("en-US", "kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond)] + [InlineData("en-US", "kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond)] [InlineData("en-US", "lb/(lbf·h)", SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour)] public void TryParseUnit_WithCurrentCulture(string culture, string abbreviation, SpecificFuelConsumptionUnit expectedUnit) { @@ -447,9 +447,9 @@ public void TryParseUnit_WithCurrentCulture(string culture, string abbreviation, } [Theory] - [InlineData("en-US", "g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond)] + [InlineData("en-US", "g/(kN�s)", SpecificFuelConsumptionUnit.GramPerKilonewtonSecond)] [InlineData("en-US", "kg/(kgf�h)", SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour)] - [InlineData("en-US", "kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond)] + [InlineData("en-US", "kg/(kN�s)", SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond)] [InlineData("en-US", "lb/(lbf·h)", SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour)] public void TryParseUnit_WithCulture(string culture, string abbreviation, SpecificFuelConsumptionUnit expectedUnit) { @@ -502,47 +502,47 @@ public virtual void ToUnit_FromDefaultQuantity_ReturnsQuantityWithGivenUnit(Spec [Fact] public void ConversionRoundTrip() { - SpecificFuelConsumption gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1); - AssertEx.EqualTolerance(1, SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(gramperkilonewtonsecond.GramsPerKiloNewtonSecond).GramsPerKiloNewtonSecond, GramsPerKiloNewtonSecondTolerance); - AssertEx.EqualTolerance(1, SpecificFuelConsumption.FromKilogramsPerKilogramForceHour(gramperkilonewtonsecond.KilogramsPerKilogramForceHour).GramsPerKiloNewtonSecond, KilogramsPerKilogramForceHourTolerance); - AssertEx.EqualTolerance(1, SpecificFuelConsumption.FromKilogramsPerKiloNewtonSecond(gramperkilonewtonsecond.KilogramsPerKiloNewtonSecond).GramsPerKiloNewtonSecond, KilogramsPerKiloNewtonSecondTolerance); - AssertEx.EqualTolerance(1, SpecificFuelConsumption.FromPoundsMassPerPoundForceHour(gramperkilonewtonsecond.PoundsMassPerPoundForceHour).GramsPerKiloNewtonSecond, PoundsMassPerPoundForceHourTolerance); + SpecificFuelConsumption gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1); + AssertEx.EqualTolerance(1, SpecificFuelConsumption.FromGramsPerKilonewtonSecond(gramperkilonewtonsecond.GramsPerKilonewtonSecond).GramsPerKilonewtonSecond, GramsPerKilonewtonSecondTolerance); + AssertEx.EqualTolerance(1, SpecificFuelConsumption.FromKilogramsPerKilogramForceHour(gramperkilonewtonsecond.KilogramsPerKilogramForceHour).GramsPerKilonewtonSecond, KilogramsPerKilogramForceHourTolerance); + AssertEx.EqualTolerance(1, SpecificFuelConsumption.FromKilogramsPerKilonewtonSecond(gramperkilonewtonsecond.KilogramsPerKilonewtonSecond).GramsPerKilonewtonSecond, KilogramsPerKilonewtonSecondTolerance); + AssertEx.EqualTolerance(1, SpecificFuelConsumption.FromPoundsMassPerPoundForceHour(gramperkilonewtonsecond.PoundsMassPerPoundForceHour).GramsPerKilonewtonSecond, PoundsMassPerPoundForceHourTolerance); } [Fact] public void ArithmeticOperators() { - SpecificFuelConsumption v = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1); - AssertEx.EqualTolerance(-1, -v.GramsPerKiloNewtonSecond, GramsPerKiloNewtonSecondTolerance); - AssertEx.EqualTolerance(2, (SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(3)-v).GramsPerKiloNewtonSecond, GramsPerKiloNewtonSecondTolerance); - AssertEx.EqualTolerance(2, (v + v).GramsPerKiloNewtonSecond, GramsPerKiloNewtonSecondTolerance); - AssertEx.EqualTolerance(10, (v*10).GramsPerKiloNewtonSecond, GramsPerKiloNewtonSecondTolerance); - AssertEx.EqualTolerance(10, (10*v).GramsPerKiloNewtonSecond, GramsPerKiloNewtonSecondTolerance); - AssertEx.EqualTolerance(2, (SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(10)/5).GramsPerKiloNewtonSecond, GramsPerKiloNewtonSecondTolerance); - AssertEx.EqualTolerance(2, SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(10)/SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(5), GramsPerKiloNewtonSecondTolerance); + SpecificFuelConsumption v = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1); + AssertEx.EqualTolerance(-1, -v.GramsPerKilonewtonSecond, GramsPerKilonewtonSecondTolerance); + AssertEx.EqualTolerance(2, (SpecificFuelConsumption.FromGramsPerKilonewtonSecond(3)-v).GramsPerKilonewtonSecond, GramsPerKilonewtonSecondTolerance); + AssertEx.EqualTolerance(2, (v + v).GramsPerKilonewtonSecond, GramsPerKilonewtonSecondTolerance); + AssertEx.EqualTolerance(10, (v*10).GramsPerKilonewtonSecond, GramsPerKilonewtonSecondTolerance); + AssertEx.EqualTolerance(10, (10*v).GramsPerKilonewtonSecond, GramsPerKilonewtonSecondTolerance); + AssertEx.EqualTolerance(2, (SpecificFuelConsumption.FromGramsPerKilonewtonSecond(10)/5).GramsPerKilonewtonSecond, GramsPerKilonewtonSecondTolerance); + AssertEx.EqualTolerance(2, SpecificFuelConsumption.FromGramsPerKilonewtonSecond(10)/SpecificFuelConsumption.FromGramsPerKilonewtonSecond(5), GramsPerKilonewtonSecondTolerance); } [Fact] public void ComparisonOperators() { - SpecificFuelConsumption oneGramPerKiloNewtonSecond = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1); - SpecificFuelConsumption twoGramsPerKiloNewtonSecond = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(2); + SpecificFuelConsumption oneGramPerKilonewtonSecond = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1); + SpecificFuelConsumption twoGramsPerKilonewtonSecond = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(2); - Assert.True(oneGramPerKiloNewtonSecond < twoGramsPerKiloNewtonSecond); - Assert.True(oneGramPerKiloNewtonSecond <= twoGramsPerKiloNewtonSecond); - Assert.True(twoGramsPerKiloNewtonSecond > oneGramPerKiloNewtonSecond); - Assert.True(twoGramsPerKiloNewtonSecond >= oneGramPerKiloNewtonSecond); + Assert.True(oneGramPerKilonewtonSecond < twoGramsPerKilonewtonSecond); + Assert.True(oneGramPerKilonewtonSecond <= twoGramsPerKilonewtonSecond); + Assert.True(twoGramsPerKilonewtonSecond > oneGramPerKilonewtonSecond); + Assert.True(twoGramsPerKilonewtonSecond >= oneGramPerKilonewtonSecond); - Assert.False(oneGramPerKiloNewtonSecond > twoGramsPerKiloNewtonSecond); - Assert.False(oneGramPerKiloNewtonSecond >= twoGramsPerKiloNewtonSecond); - Assert.False(twoGramsPerKiloNewtonSecond < oneGramPerKiloNewtonSecond); - Assert.False(twoGramsPerKiloNewtonSecond <= oneGramPerKiloNewtonSecond); + Assert.False(oneGramPerKilonewtonSecond > twoGramsPerKilonewtonSecond); + Assert.False(oneGramPerKilonewtonSecond >= twoGramsPerKilonewtonSecond); + Assert.False(twoGramsPerKilonewtonSecond < oneGramPerKilonewtonSecond); + Assert.False(twoGramsPerKilonewtonSecond <= oneGramPerKilonewtonSecond); } [Fact] public void CompareToIsImplemented() { - SpecificFuelConsumption gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1); + SpecificFuelConsumption gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1); Assert.Equal(0, gramperkilonewtonsecond.CompareTo(gramperkilonewtonsecond)); Assert.True(gramperkilonewtonsecond.CompareTo(SpecificFuelConsumption.Zero) > 0); Assert.True(SpecificFuelConsumption.Zero.CompareTo(gramperkilonewtonsecond) < 0); @@ -551,22 +551,22 @@ public void CompareToIsImplemented() [Fact] public void CompareToThrowsOnTypeMismatch() { - SpecificFuelConsumption gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1); + SpecificFuelConsumption gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1); Assert.Throws(() => gramperkilonewtonsecond.CompareTo(new object())); } [Fact] public void CompareToThrowsOnNull() { - SpecificFuelConsumption gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1); + SpecificFuelConsumption gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1); Assert.Throws(() => gramperkilonewtonsecond.CompareTo(null)); } [Theory] - [InlineData(1, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, 1, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, true)] // Same value and unit. - [InlineData(1, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, 2, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, false)] // Different value. - [InlineData(2, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, 1, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour, false)] // Different value and unit. - [InlineData(1, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, 1, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour, false)] // Different unit. + [InlineData(1, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, 1, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, true)] // Same value and unit. + [InlineData(1, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, 2, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, false)] // Different value. + [InlineData(2, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, 1, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour, false)] // Different value and unit. + [InlineData(1, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, 1, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour, false)] // Different unit. public void Equals_ReturnsTrue_IfValueAndUnitAreEqual(double valueA, SpecificFuelConsumptionUnit unitA, double valueB, SpecificFuelConsumptionUnit unitB, bool expectEqual) { var a = new SpecificFuelConsumption(valueA, unitA); @@ -606,31 +606,31 @@ public void Equals_Null_ReturnsFalse() [Fact] public void Equals_RelativeTolerance_IsImplemented() { - var v = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1); - Assert.True(v.Equals(SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1), GramsPerKiloNewtonSecondTolerance, ComparisonType.Relative)); - Assert.False(v.Equals(SpecificFuelConsumption.Zero, GramsPerKiloNewtonSecondTolerance, ComparisonType.Relative)); - Assert.True(SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(100).Equals(SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(120), 0.3, ComparisonType.Relative)); - Assert.False(SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(100).Equals(SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(120), 0.1, ComparisonType.Relative)); + var v = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1); + Assert.True(v.Equals(SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1), GramsPerKilonewtonSecondTolerance, ComparisonType.Relative)); + Assert.False(v.Equals(SpecificFuelConsumption.Zero, GramsPerKilonewtonSecondTolerance, ComparisonType.Relative)); + Assert.True(SpecificFuelConsumption.FromGramsPerKilonewtonSecond(100).Equals(SpecificFuelConsumption.FromGramsPerKilonewtonSecond(120), 0.3, ComparisonType.Relative)); + Assert.False(SpecificFuelConsumption.FromGramsPerKilonewtonSecond(100).Equals(SpecificFuelConsumption.FromGramsPerKilonewtonSecond(120), 0.1, ComparisonType.Relative)); } [Fact] public void Equals_NegativeRelativeTolerance_ThrowsArgumentOutOfRangeException() { - var v = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1); - Assert.Throws(() => v.Equals(SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1), -1, ComparisonType.Relative)); + var v = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1); + Assert.Throws(() => v.Equals(SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1), -1, ComparisonType.Relative)); } [Fact] public void EqualsReturnsFalseOnTypeMismatch() { - SpecificFuelConsumption gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1); + SpecificFuelConsumption gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1); Assert.False(gramperkilonewtonsecond.Equals(new object())); } [Fact] public void EqualsReturnsFalseOnNull() { - SpecificFuelConsumption gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1); + SpecificFuelConsumption gramperkilonewtonsecond = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1); Assert.False(gramperkilonewtonsecond.Equals(null)); } @@ -654,9 +654,9 @@ public void BaseDimensionsShouldNeverBeNull() public void ToString_ReturnsValueAndUnitAbbreviationInCurrentCulture() { using var _ = new CultureScope("en-US"); - Assert.Equal("1 g/(kN�s)", new SpecificFuelConsumption(1, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond).ToString()); + Assert.Equal("1 g/(kN�s)", new SpecificFuelConsumption(1, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond).ToString()); Assert.Equal("1 kg/(kgf�h)", new SpecificFuelConsumption(1, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour).ToString()); - Assert.Equal("1 kg/(kN�s)", new SpecificFuelConsumption(1, SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond).ToString()); + Assert.Equal("1 kg/(kN�s)", new SpecificFuelConsumption(1, SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond).ToString()); Assert.Equal("1 lb/(lbf·h)", new SpecificFuelConsumption(1, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour).ToString()); } @@ -666,9 +666,9 @@ public void ToString_WithSwedishCulture_ReturnsUnitAbbreviationForEnglishCulture // Chose this culture, because we don't currently have any abbreviations mapped for that culture and we expect the en-US to be used as fallback. var swedishCulture = CultureInfo.GetCultureInfo("sv-SE"); - Assert.Equal("1 g/(kN�s)", new SpecificFuelConsumption(1, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond).ToString(swedishCulture)); + Assert.Equal("1 g/(kN�s)", new SpecificFuelConsumption(1, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond).ToString(swedishCulture)); Assert.Equal("1 kg/(kgf�h)", new SpecificFuelConsumption(1, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour).ToString(swedishCulture)); - Assert.Equal("1 kg/(kN�s)", new SpecificFuelConsumption(1, SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond).ToString(swedishCulture)); + Assert.Equal("1 kg/(kN�s)", new SpecificFuelConsumption(1, SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond).ToString(swedishCulture)); Assert.Equal("1 lb/(lbf·h)", new SpecificFuelConsumption(1, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour).ToString(swedishCulture)); } @@ -676,20 +676,20 @@ public void ToString_WithSwedishCulture_ReturnsUnitAbbreviationForEnglishCulture public void ToString_SFormat_FormatsNumberWithGivenDigitsAfterRadixForCurrentCulture() { var _ = new CultureScope(CultureInfo.InvariantCulture); - Assert.Equal("0.1 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond).ToString("s1")); - Assert.Equal("0.12 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond).ToString("s2")); - Assert.Equal("0.123 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond).ToString("s3")); - Assert.Equal("0.1235 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond).ToString("s4")); + Assert.Equal("0.1 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond).ToString("s1")); + Assert.Equal("0.12 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond).ToString("s2")); + Assert.Equal("0.123 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond).ToString("s3")); + Assert.Equal("0.1235 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond).ToString("s4")); } [Fact] public void ToString_SFormatAndCulture_FormatsNumberWithGivenDigitsAfterRadixForGivenCulture() { var culture = CultureInfo.InvariantCulture; - Assert.Equal("0.1 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond).ToString("s1", culture)); - Assert.Equal("0.12 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond).ToString("s2", culture)); - Assert.Equal("0.123 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond).ToString("s3", culture)); - Assert.Equal("0.1235 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond).ToString("s4", culture)); + Assert.Equal("0.1 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond).ToString("s1", culture)); + Assert.Equal("0.12 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond).ToString("s2", culture)); + Assert.Equal("0.123 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond).ToString("s3", culture)); + Assert.Equal("0.1235 g/(kN�s)", new SpecificFuelConsumption(0.123456, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond).ToString("s4", culture)); } [Theory] @@ -697,7 +697,7 @@ public void ToString_SFormatAndCulture_FormatsNumberWithGivenDigitsAfterRadixFor [InlineData("en-US")] public void ToString_NullFormat_DefaultsToGeneralFormat(string cultureName) { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); CultureInfo formatProvider = cultureName == null ? null : CultureInfo.GetCultureInfo(cultureName); @@ -710,154 +710,154 @@ public void ToString_NullFormat_DefaultsToGeneralFormat(string cultureName) [InlineData("g")] public void ToString_NullProvider_EqualsCurrentCulture(string format) { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal(quantity.ToString(format, CultureInfo.CurrentCulture), quantity.ToString(format, null)); } [Fact] public void Convert_ToBool_ThrowsInvalidCastException() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Throws(() => Convert.ToBoolean(quantity)); } [Fact] public void Convert_ToByte_EqualsValueAsSameType() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal((byte)quantity.Value, Convert.ToByte(quantity)); } [Fact] public void Convert_ToChar_ThrowsInvalidCastException() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Throws(() => Convert.ToChar(quantity)); } [Fact] public void Convert_ToDateTime_ThrowsInvalidCastException() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Throws(() => Convert.ToDateTime(quantity)); } [Fact] public void Convert_ToDecimal_EqualsValueAsSameType() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal((decimal)quantity.Value, Convert.ToDecimal(quantity)); } [Fact] public void Convert_ToDouble_EqualsValueAsSameType() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal((double)quantity.Value, Convert.ToDouble(quantity)); } [Fact] public void Convert_ToInt16_EqualsValueAsSameType() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal((short)quantity.Value, Convert.ToInt16(quantity)); } [Fact] public void Convert_ToInt32_EqualsValueAsSameType() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal((int)quantity.Value, Convert.ToInt32(quantity)); } [Fact] public void Convert_ToInt64_EqualsValueAsSameType() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal((long)quantity.Value, Convert.ToInt64(quantity)); } [Fact] public void Convert_ToSByte_EqualsValueAsSameType() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal((sbyte)quantity.Value, Convert.ToSByte(quantity)); } [Fact] public void Convert_ToSingle_EqualsValueAsSameType() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal((float)quantity.Value, Convert.ToSingle(quantity)); } [Fact] public void Convert_ToString_EqualsToString() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal(quantity.ToString(), Convert.ToString(quantity)); } [Fact] public void Convert_ToUInt16_EqualsValueAsSameType() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal((ushort)quantity.Value, Convert.ToUInt16(quantity)); } [Fact] public void Convert_ToUInt32_EqualsValueAsSameType() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal((uint)quantity.Value, Convert.ToUInt32(quantity)); } [Fact] public void Convert_ToUInt64_EqualsValueAsSameType() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal((ulong)quantity.Value, Convert.ToUInt64(quantity)); } [Fact] public void Convert_ChangeType_SelfType_EqualsSelf() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal(quantity, Convert.ChangeType(quantity, typeof(SpecificFuelConsumption))); } [Fact] public void Convert_ChangeType_UnitType_EqualsUnit() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal(quantity.Unit, Convert.ChangeType(quantity, typeof(SpecificFuelConsumptionUnit))); } [Fact] public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal(SpecificFuelConsumption.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); } [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal(SpecificFuelConsumption.BaseDimensions, Convert.ChangeType(quantity, typeof(BaseDimensions))); } [Fact] public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Throws(() => Convert.ChangeType(quantity, typeof(QuantityFormatter))); } [Fact] public void GetHashCode_Equals() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal(new {SpecificFuelConsumption.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } @@ -866,8 +866,8 @@ public void GetHashCode_Equals() [InlineData(-1.0)] public void NegationOperator_ReturnsQuantity_WithNegatedValue(double value) { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(value); - Assert.Equal(SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(-value), -quantity); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(value); + Assert.Equal(SpecificFuelConsumption.FromGramsPerKilonewtonSecond(-value), -quantity); } } } diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs index 7e03ae75a1..901c4578d1 100644 --- a/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs @@ -70,15 +70,15 @@ namespace UnitsNet static SpecificFuelConsumption() { BaseDimensions = new BaseDimensions(-1, 0, 1, 0, 0, 0, 0); - BaseUnit = SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond; + BaseUnit = SpecificFuelConsumptionUnit.GramPerKilonewtonSecond; Units = Enum.GetValues(typeof(SpecificFuelConsumptionUnit)).Cast().ToArray(); Zero = new SpecificFuelConsumption(0, BaseUnit); Info = new QuantityInfo("SpecificFuelConsumption", new UnitInfo[] { - new UnitInfo(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, "GramsPerKiloNewtonSecond", new BaseUnits(length: LengthUnit.Meter, time: DurationUnit.Second), "SpecificFuelConsumption"), + new UnitInfo(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, "GramsPerKilonewtonSecond", new BaseUnits(length: LengthUnit.Meter, time: DurationUnit.Second), "SpecificFuelConsumption"), new UnitInfo(SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour, "KilogramsPerKilogramForceHour", BaseUnits.Undefined, "SpecificFuelConsumption"), - new UnitInfo(SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond, "KilogramsPerKiloNewtonSecond", new BaseUnits(length: LengthUnit.Millimeter, time: DurationUnit.Second), "SpecificFuelConsumption"), + new UnitInfo(SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond, "KilogramsPerKilonewtonSecond", new BaseUnits(length: LengthUnit.Millimeter, time: DurationUnit.Second), "SpecificFuelConsumption"), new UnitInfo(SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour, "PoundsMassPerPoundForceHour", BaseUnits.Undefined, "SpecificFuelConsumption"), }, BaseUnit, Zero, BaseDimensions); @@ -128,7 +128,7 @@ public SpecificFuelConsumption(double value, UnitSystem unitSystem) public static BaseDimensions BaseDimensions { get; } /// - /// The base unit of SpecificFuelConsumption, which is GramPerKiloNewtonSecond. All conversions go via this value. + /// The base unit of SpecificFuelConsumption, which is GramPerKilonewtonSecond. All conversions go via this value. /// public static SpecificFuelConsumptionUnit BaseUnit { get; } @@ -138,7 +138,7 @@ public SpecificFuelConsumption(double value, UnitSystem unitSystem) public static SpecificFuelConsumptionUnit[] Units { get; } /// - /// Gets an instance of this quantity with a value of 0 in the base unit GramPerKiloNewtonSecond. + /// Gets an instance of this quantity with a value of 0 in the base unit GramPerKilonewtonSecond. /// public static SpecificFuelConsumption Zero { get; } @@ -178,9 +178,9 @@ public SpecificFuelConsumption(double value, UnitSystem unitSystem) #region Conversion Properties /// - /// Gets a value of this quantity converted into + /// Gets a value of this quantity converted into /// - public double GramsPerKiloNewtonSecond => As(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond); + public double GramsPerKilonewtonSecond => As(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond); /// /// Gets a value of this quantity converted into @@ -188,9 +188,9 @@ public SpecificFuelConsumption(double value, UnitSystem unitSystem) public double KilogramsPerKilogramForceHour => As(SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour); /// - /// Gets a value of this quantity converted into + /// Gets a value of this quantity converted into /// - public double KilogramsPerKiloNewtonSecond => As(SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond); + public double KilogramsPerKilonewtonSecond => As(SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond); /// /// Gets a value of this quantity converted into @@ -208,17 +208,17 @@ public SpecificFuelConsumption(double value, UnitSystem unitSystem) internal static void RegisterDefaultConversions(UnitConverter unitConverter) { // Register in unit converter: SpecificFuelConsumptionUnit -> BaseUnit - unitConverter.SetConversionFunction(SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, quantity => quantity.ToUnit(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond)); - unitConverter.SetConversionFunction(SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, quantity => quantity.ToUnit(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond)); - unitConverter.SetConversionFunction(SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, quantity => quantity.ToUnit(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond)); + unitConverter.SetConversionFunction(SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, quantity => quantity.ToUnit(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond)); + unitConverter.SetConversionFunction(SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, quantity => quantity.ToUnit(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond)); + unitConverter.SetConversionFunction(SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, quantity => quantity.ToUnit(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond)); // Register in unit converter: BaseUnit <-> BaseUnit - unitConverter.SetConversionFunction(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, quantity => quantity); + unitConverter.SetConversionFunction(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, quantity => quantity); // Register in unit converter: BaseUnit -> SpecificFuelConsumptionUnit - unitConverter.SetConversionFunction(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour, quantity => quantity.ToUnit(SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour)); - unitConverter.SetConversionFunction(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond, quantity => quantity.ToUnit(SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond)); - unitConverter.SetConversionFunction(SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour, quantity => quantity.ToUnit(SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour)); + unitConverter.SetConversionFunction(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour, quantity => quantity.ToUnit(SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour)); + unitConverter.SetConversionFunction(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond, quantity => quantity.ToUnit(SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond)); + unitConverter.SetConversionFunction(SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour, quantity => quantity.ToUnit(SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour)); } /// @@ -247,11 +247,11 @@ public static string GetAbbreviation(SpecificFuelConsumptionUnit unit, IFormatPr #region Static Factory Methods /// - /// Creates a from . + /// Creates a from . /// - public static SpecificFuelConsumption FromGramsPerKiloNewtonSecond(double value) + public static SpecificFuelConsumption FromGramsPerKilonewtonSecond(double value) { - return new SpecificFuelConsumption(value, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond); + return new SpecificFuelConsumption(value, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond); } /// @@ -263,11 +263,11 @@ public static SpecificFuelConsumption FromKilogramsPerKilogramForceHour(double v } /// - /// Creates a from . + /// Creates a from . /// - public static SpecificFuelConsumption FromKilogramsPerKiloNewtonSecond(double value) + public static SpecificFuelConsumption FromKilogramsPerKilonewtonSecond(double value) { - return new SpecificFuelConsumption(value, SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond); + return new SpecificFuelConsumption(value, SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond); } /// @@ -476,7 +476,7 @@ public static bool TryParseUnit([NotNullWhen(true)]string? str, IFormatProvider? /// Get ratio value from dividing by . public static double operator /(SpecificFuelConsumption left, SpecificFuelConsumption right) { - return left.GramsPerKiloNewtonSecond / right.GramsPerKiloNewtonSecond; + return left.GramsPerKilonewtonSecond / right.GramsPerKilonewtonSecond; } #endregion @@ -744,14 +744,14 @@ private bool TryToUnit(SpecificFuelConsumptionUnit unit, [NotNullWhen(true)] out SpecificFuelConsumption? convertedOrNull = (Unit, unit) switch { // SpecificFuelConsumptionUnit -> BaseUnit - (SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond) => new SpecificFuelConsumption(_value * 28.33, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond), - (SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond) => new SpecificFuelConsumption((_value) * 1e3d, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond), - (SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond) => new SpecificFuelConsumption(_value * 28.33, SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond), + (SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond) => new SpecificFuelConsumption(_value * 28.33, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond), + (SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond) => new SpecificFuelConsumption((_value) * 1e3d, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond), + (SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond) => new SpecificFuelConsumption(_value * 28.33, SpecificFuelConsumptionUnit.GramPerKilonewtonSecond), // BaseUnit -> SpecificFuelConsumptionUnit - (SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour) => new SpecificFuelConsumption(_value / 28.33, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour), - (SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond) => new SpecificFuelConsumption((_value) / 1e3d, SpecificFuelConsumptionUnit.KilogramPerKiloNewtonSecond), - (SpecificFuelConsumptionUnit.GramPerKiloNewtonSecond, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour) => new SpecificFuelConsumption(_value / 28.33, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour), + (SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour) => new SpecificFuelConsumption(_value / 28.33, SpecificFuelConsumptionUnit.KilogramPerKilogramForceHour), + (SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond) => new SpecificFuelConsumption((_value) / 1e3d, SpecificFuelConsumptionUnit.KilogramPerKilonewtonSecond), + (SpecificFuelConsumptionUnit.GramPerKilonewtonSecond, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour) => new SpecificFuelConsumption(_value / 28.33, SpecificFuelConsumptionUnit.PoundMassPerPoundForceHour), _ => null }; diff --git a/UnitsNet/GeneratedCode/Resources/SpecificFuelConsumption.restext b/UnitsNet/GeneratedCode/Resources/SpecificFuelConsumption.restext index 89e437194a..bf6cc1babc 100644 --- a/UnitsNet/GeneratedCode/Resources/SpecificFuelConsumption.restext +++ b/UnitsNet/GeneratedCode/Resources/SpecificFuelConsumption.restext @@ -1,4 +1,4 @@ -GramsPerKiloNewtonSecond=g/(kN�s) +GramsPerKilonewtonSecond=g/(kN�s) KilogramsPerKilogramForceHour=kg/(kgf�h) -KilogramsPerKiloNewtonSecond=kg/(kN�s) +KilogramsPerKilonewtonSecond=kg/(kN�s) PoundsMassPerPoundForceHour=lb/(lbf·h) diff --git a/UnitsNet/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs b/UnitsNet/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs index f647a17cf6..4aec962d5f 100644 --- a/UnitsNet/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs +++ b/UnitsNet/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs @@ -25,9 +25,9 @@ namespace UnitsNet.Units public enum SpecificFuelConsumptionUnit { - GramPerKiloNewtonSecond = 1, + GramPerKilonewtonSecond = 11, KilogramPerKilogramForceHour = 2, - KilogramPerKiloNewtonSecond = 3, + KilogramPerKilonewtonSecond = 6, PoundMassPerPoundForceHour = 4, } From 730eab19ddb691296c3c6cadd1278ac24f87ed89 Mon Sep 17 00:00:00 2001 From: lipchev Date: Fri, 3 Jan 2025 20:31:59 +0200 Subject: [PATCH 2/3] manually renaming the SpecificFuelConsumption units in the UnitEnumValues --- Common/UnitEnumValues.g.json | 8 +++----- .../GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs | 4 ++-- .../GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Common/UnitEnumValues.g.json b/Common/UnitEnumValues.g.json index d9bdcd18f1..f94deeb9a9 100644 --- a/Common/UnitEnumValues.g.json +++ b/Common/UnitEnumValues.g.json @@ -1331,12 +1331,10 @@ "MegajoulePerKilogramKelvin": 9 }, "SpecificFuelConsumption": { - "GramPerKiloNewtonSecond": 1, + "GramPerKilonewtonSecond": 1, "KilogramPerKilogramForceHour": 2, - "KilogramPerKiloNewtonSecond": 3, - "PoundMassPerPoundForceHour": 4, - "GramPerKilonewtonSecond": 11, - "KilogramPerKilonewtonSecond": 6 + "KilogramPerKilonewtonSecond": 3, + "PoundMassPerPoundForceHour": 4 }, "SpecificVolume": { "CubicFootPerPound": 1, diff --git a/UnitsNet.NanoFramework/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs b/UnitsNet.NanoFramework/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs index 4aec962d5f..6801a748fc 100644 --- a/UnitsNet.NanoFramework/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs +++ b/UnitsNet.NanoFramework/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs @@ -25,9 +25,9 @@ namespace UnitsNet.Units public enum SpecificFuelConsumptionUnit { - GramPerKilonewtonSecond = 11, + GramPerKilonewtonSecond = 1, KilogramPerKilogramForceHour = 2, - KilogramPerKilonewtonSecond = 6, + KilogramPerKilonewtonSecond = 3, PoundMassPerPoundForceHour = 4, } diff --git a/UnitsNet/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs b/UnitsNet/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs index 4aec962d5f..6801a748fc 100644 --- a/UnitsNet/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs +++ b/UnitsNet/GeneratedCode/Units/SpecificFuelConsumptionUnit.g.cs @@ -25,9 +25,9 @@ namespace UnitsNet.Units public enum SpecificFuelConsumptionUnit { - GramPerKilonewtonSecond = 11, + GramPerKilonewtonSecond = 1, KilogramPerKilogramForceHour = 2, - KilogramPerKilonewtonSecond = 6, + KilogramPerKilonewtonSecond = 3, PoundMassPerPoundForceHour = 4, } From 98262afb4f3eb2b2680d4d3ce2712f962d4a1a3e Mon Sep 17 00:00:00 2001 From: lipchev Date: Tue, 7 Jan 2025 23:15:52 +0200 Subject: [PATCH 3/3] fix the Convert_GetTypeCode_Returns_Object using the old spelling --- .../TestsBase/SpecificFuelConsumptionTestsBase.g.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificFuelConsumptionTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificFuelConsumptionTestsBase.g.cs index eda1841f8a..1b04853582 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificFuelConsumptionTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificFuelConsumptionTestsBase.g.cs @@ -876,7 +876,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() [Fact] public void Convert_GetTypeCode_Returns_Object() { - var quantity = SpecificFuelConsumption.FromGramsPerKiloNewtonSecond(1.0); + var quantity = SpecificFuelConsumption.FromGramsPerKilonewtonSecond(1.0); Assert.Equal(TypeCode.Object, Convert.GetTypeCode(quantity)); }