From 277802b3fe7fc87b31b6625af57d044e22947e9d Mon Sep 17 00:00:00 2001 From: Tristan Milnthorp Date: Wed, 2 May 2018 16:46:14 -0400 Subject: [PATCH 1/3] Plural fix for accelerations --- .../CustomCode/AccelerationTests.cs | 26 +- UnitsNet.Tests/CustomCode/ForceTests.cs | 8 +- UnitsNet.Tests/CustomCode/MassTests.cs | 4 +- UnitsNet.Tests/CustomCode/SpeedTests.cs | 4 +- UnitsNet.Tests/DecimalOverloadTests.cs | 20 +- .../GeneratedCode/AccelerationTestsBase.g.cs | 214 ++++++------- UnitsNet.Tests/IntOverloadTests.cs | 20 +- UnitsNet.Tests/LongOverloadTests.cs | 20 +- UnitsNet.Tests/UnitSystemTests.cs | 2 +- UnitsNet/CustomCode/Quantities/Force.extra.cs | 8 +- UnitsNet/CustomCode/Quantities/Mass.extra.cs | 6 +- UnitsNet/CustomCode/Quantities/Speed.extra.cs | 4 +- .../NumberToAccelerationExtensions.g.cs | 294 +++++++++--------- .../Quantities/Acceleration.g.cs | 220 ++++++------- .../GeneratedCode/UnitSystem.Default.g.cs | 14 +- .../GeneratedCode/Units/AccelerationUnit.g.cs | 14 +- UnitsNet/UnitDefinitions/Acceleration.json | 6 +- 17 files changed, 442 insertions(+), 442 deletions(-) diff --git a/UnitsNet.Tests/CustomCode/AccelerationTests.cs b/UnitsNet.Tests/CustomCode/AccelerationTests.cs index 459b8db734..dca7a88613 100644 --- a/UnitsNet.Tests/CustomCode/AccelerationTests.cs +++ b/UnitsNet.Tests/CustomCode/AccelerationTests.cs @@ -23,30 +23,30 @@ namespace UnitsNet.Tests.CustomCode { public class AccelerationTests : AccelerationTestsBase { - protected override double KilometerPerSecondSquaredInOneMeterPerSecondSquared => 1E-3; + protected override double KilometersPerSecondSquaredInOneMetersPerSecondSquared => 1E-3; - protected override double MeterPerSecondSquaredInOneMeterPerSecondSquared => 1; + protected override double MetersPerSecondSquaredInOneMetersPerSecondSquared => 1; - protected override double DecimeterPerSecondSquaredInOneMeterPerSecondSquared => 1E1; + protected override double DecimetersPerSecondSquaredInOneMetersPerSecondSquared => 1E1; - protected override double CentimeterPerSecondSquaredInOneMeterPerSecondSquared => 1E2; + protected override double CentimetersPerSecondSquaredInOneMetersPerSecondSquared => 1E2; - protected override double MillimeterPerSecondSquaredInOneMeterPerSecondSquared => 1E3; + protected override double MillimetersPerSecondSquaredInOneMetersPerSecondSquared => 1E3; - protected override double MicrometerPerSecondSquaredInOneMeterPerSecondSquared => 1E6; + protected override double MicrometersPerSecondSquaredInOneMetersPerSecondSquared => 1E6; - protected override double NanometerPerSecondSquaredInOneMeterPerSecondSquared => 1E9; + protected override double NanometersPerSecondSquaredInOneMetersPerSecondSquared => 1E9; - protected override double StandardGravityInOneMeterPerSecondSquared => 0.1019727; + protected override double StandardGravityInOneMetersPerSecondSquared => 0.1019727; - protected override double InchesPerSecondSquaredInOneMeterPerSecondSquared => 39.3700787; + protected override double InchesPerSecondSquaredInOneMetersPerSecondSquared => 39.3700787; - protected override double FeetPerSecondSquaredInOneMeterPerSecondSquared => 3.28084; + protected override double FeetPerSecondSquaredInOneMetersPerSecondSquared => 3.28084; - protected override double KnotsPerHourInOneMeterPerSecondSquared => 6.99784017278618E3; + protected override double KnotsPerHourInOneMetersPerSecondSquared => 6.99784017278618E3; - protected override double KnotsPerMinuteInOneMeterPerSecondSquared => 1.16630669546436E2; + protected override double KnotsPerMinuteInOneMetersPerSecondSquared => 1.16630669546436E2; - protected override double KnotsPerSecondInOneMeterPerSecondSquared => 1.94384449244060; + protected override double KnotsPerSecondInOneMetersPerSecondSquared => 1.94384449244060; } } diff --git a/UnitsNet.Tests/CustomCode/ForceTests.cs b/UnitsNet.Tests/CustomCode/ForceTests.cs index 67bea8715b..795a569b53 100644 --- a/UnitsNet.Tests/CustomCode/ForceTests.cs +++ b/UnitsNet.Tests/CustomCode/ForceTests.cs @@ -68,13 +68,13 @@ public void PressureByAreaEqualsForceUsingLength2D() public void ForceDividedByMassEqualsAcceleration() { Acceleration acceleration = Force.FromNewtons(27)/Mass.FromKilograms(9); - Assert.Equal(acceleration, Acceleration.FromMeterPerSecondSquared(3)); + Assert.Equal(acceleration, Acceleration.FromMetersPerSecondSquared(3)); } [Fact] public void ForceDividedByAccelerationEqualsMass() { - Mass acceleration = Force.FromNewtons(200)/Acceleration.FromMeterPerSecondSquared(50); + Mass acceleration = Force.FromNewtons(200)/Acceleration.FromMetersPerSecondSquared(50); Assert.Equal(acceleration, Mass.FromKilograms(4)); } @@ -94,7 +94,7 @@ public void MassByAccelerationEqualsForceUsingDouble() [Fact] public void MassByAccelerationEqualsForce() { - Force force = Force.FromMassByAcceleration(Mass.FromKilograms(85), Acceleration.FromMeterPerSecondSquared(-4)); + Force force = Force.FromMassByAcceleration(Mass.FromKilograms(85), Acceleration.FromMetersPerSecondSquared(-4)); Assert.Equal(force, Force.FromNewtons(-340)); } @@ -112,4 +112,4 @@ public void SpeedTimesForceEqualsPower() Assert.Equal(power, Power.FromWatts(270)); } } -} \ No newline at end of file +} diff --git a/UnitsNet.Tests/CustomCode/MassTests.cs b/UnitsNet.Tests/CustomCode/MassTests.cs index e6e89065d7..a4e16a0bbe 100644 --- a/UnitsNet.Tests/CustomCode/MassTests.cs +++ b/UnitsNet.Tests/CustomCode/MassTests.cs @@ -73,7 +73,7 @@ public class MassTests : MassTestsBase [Fact] public void AccelerationTimesMassEqualsForce() { - Force force = Acceleration.FromMeterPerSecondSquared(3)*Mass.FromKilograms(18); + Force force = Acceleration.FromMetersPerSecondSquared(3)*Mass.FromKilograms(18); Assert.Equal(force, Force.FromNewtons(54)); } @@ -101,7 +101,7 @@ public void MassDividedByVolumeEqualsDensity() [Fact] public void MassTimesAccelerationEqualsForce() { - Force force = Mass.FromKilograms(18)*Acceleration.FromMeterPerSecondSquared(3); + Force force = Mass.FromKilograms(18)*Acceleration.FromMetersPerSecondSquared(3); Assert.Equal(force, Force.FromNewtons(54)); } } diff --git a/UnitsNet.Tests/CustomCode/SpeedTests.cs b/UnitsNet.Tests/CustomCode/SpeedTests.cs index ed98670905..b297f206cf 100644 --- a/UnitsNet.Tests/CustomCode/SpeedTests.cs +++ b/UnitsNet.Tests/CustomCode/SpeedTests.cs @@ -115,14 +115,14 @@ public void LengthDividedByTimeSpanEqualsSpeed() public void SpeedDividedByDurationEqualsAcceleration() { Acceleration acceleration = Speed.FromMetersPerSecond(20)/Duration.FromSeconds(2); - Assert.Equal(acceleration, Acceleration.FromMeterPerSecondSquared(10)); + Assert.Equal(acceleration, Acceleration.FromMetersPerSecondSquared(10)); } [Fact] public void SpeedDividedByTimeSpanEqualsAcceleration() { Acceleration acceleration = Speed.FromMetersPerSecond(20)/TimeSpan.FromSeconds(2); - Assert.Equal(acceleration, Acceleration.FromMeterPerSecondSquared(10)); + Assert.Equal(acceleration, Acceleration.FromMetersPerSecondSquared(10)); } [Fact] diff --git a/UnitsNet.Tests/DecimalOverloadTests.cs b/UnitsNet.Tests/DecimalOverloadTests.cs index 286813fcf8..f19e131a14 100644 --- a/UnitsNet.Tests/DecimalOverloadTests.cs +++ b/UnitsNet.Tests/DecimalOverloadTests.cs @@ -31,24 +31,24 @@ public class DecimalOverloadTests public static void CreatingQuantityWithDoubleBackingFieldFromDecimalReturnsCorrectValue() { decimal oneMeterPerSecondSquared = 1m; - Acceleration acceleration = Acceleration.FromMeterPerSecondSquared(oneMeterPerSecondSquared); - Assert.Equal(1.0, acceleration.MeterPerSecondSquared); + Acceleration acceleration = Acceleration.FromMetersPerSecondSquared(oneMeterPerSecondSquared); + Assert.Equal(1.0, acceleration.MetersPerSecondSquared); } [Fact] public static void CreatingQuantityWithDoubleBackingFieldFromNullableDecimalReturnsCorrectValue() { decimal? oneMeterPerSecondSquared = 1m; - Acceleration? acceleration = Acceleration.FromMeterPerSecondSquared(oneMeterPerSecondSquared); + Acceleration? acceleration = Acceleration.FromMetersPerSecondSquared(oneMeterPerSecondSquared); Assert.NotNull(acceleration); - Assert.Equal(1.0, acceleration.Value.MeterPerSecondSquared); + Assert.Equal(1.0, acceleration.Value.MetersPerSecondSquared); } [Fact] public static void CreatingQuantityWithDoubleBackingFieldFromNullableDecimalReturnsNullWhenGivenNull() { decimal? nullDecimal = null; - Acceleration? acceleration = Acceleration.FromMeterPerSecondSquared(nullDecimal); + Acceleration? acceleration = Acceleration.FromMetersPerSecondSquared(nullDecimal); Assert.Null(acceleration); } @@ -56,24 +56,24 @@ public static void CreatingQuantityWithDoubleBackingFieldFromNullableDecimalRetu public static void CreatingQuantityWithDoubleBackingFieldFromDecimalWithExtensionMethodReturnsCorrectValue() { decimal oneMeterPerSecondSquared = 1m; - Acceleration acceleration = oneMeterPerSecondSquared.MeterPerSecondSquared(); - Assert.Equal(1.0, acceleration.MeterPerSecondSquared); + Acceleration acceleration = oneMeterPerSecondSquared.MetersPerSecondSquared(); + Assert.Equal(1.0, acceleration.MetersPerSecondSquared); } [Fact] public static void CreatingQuantityWithDoubleBackingFieldFromNullableDecimalWithExtensionMethodReturnsCorrectValue() { decimal? oneMeterPerSecondSquared = 1m; - Acceleration? acceleration = oneMeterPerSecondSquared.MeterPerSecondSquared(); + Acceleration? acceleration = oneMeterPerSecondSquared.MetersPerSecondSquared(); Assert.NotNull(acceleration); - Assert.Equal(1.0, acceleration.Value.MeterPerSecondSquared); + Assert.Equal(1.0, acceleration.Value.MetersPerSecondSquared); } [Fact] public static void CreatingQuantityWithDoubleBackingFieldFromNullableDecimalWithExtensionMethodReturnsNullWhenGivenNull() { decimal? nullDecimal = null; - Acceleration? acceleration = nullDecimal.MeterPerSecondSquared(); + Acceleration? acceleration = nullDecimal.MetersPerSecondSquared(); Assert.Null(acceleration); } diff --git a/UnitsNet.Tests/GeneratedCode/AccelerationTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/AccelerationTestsBase.g.cs index c420fd59ce..84fd930c76 100644 --- a/UnitsNet.Tests/GeneratedCode/AccelerationTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/AccelerationTestsBase.g.cs @@ -52,170 +52,170 @@ namespace UnitsNet.Tests // ReSharper disable once PartialTypeWithSinglePart public abstract partial class AccelerationTestsBase { - protected abstract double CentimeterPerSecondSquaredInOneMeterPerSecondSquared { get; } - protected abstract double DecimeterPerSecondSquaredInOneMeterPerSecondSquared { get; } - protected abstract double FeetPerSecondSquaredInOneMeterPerSecondSquared { get; } - protected abstract double InchesPerSecondSquaredInOneMeterPerSecondSquared { get; } - protected abstract double KilometerPerSecondSquaredInOneMeterPerSecondSquared { get; } - protected abstract double KnotsPerHourInOneMeterPerSecondSquared { get; } - protected abstract double KnotsPerMinuteInOneMeterPerSecondSquared { get; } - protected abstract double KnotsPerSecondInOneMeterPerSecondSquared { get; } - protected abstract double MeterPerSecondSquaredInOneMeterPerSecondSquared { get; } - protected abstract double MicrometerPerSecondSquaredInOneMeterPerSecondSquared { get; } - protected abstract double MillimeterPerSecondSquaredInOneMeterPerSecondSquared { get; } - protected abstract double NanometerPerSecondSquaredInOneMeterPerSecondSquared { get; } - protected abstract double StandardGravityInOneMeterPerSecondSquared { get; } + protected abstract double CentimetersPerSecondSquaredInOneMetersPerSecondSquared { get; } + protected abstract double DecimetersPerSecondSquaredInOneMetersPerSecondSquared { get; } + protected abstract double FeetPerSecondSquaredInOneMetersPerSecondSquared { get; } + protected abstract double InchesPerSecondSquaredInOneMetersPerSecondSquared { get; } + protected abstract double KilometersPerSecondSquaredInOneMetersPerSecondSquared { get; } + protected abstract double KnotsPerHourInOneMetersPerSecondSquared { get; } + protected abstract double KnotsPerMinuteInOneMetersPerSecondSquared { get; } + protected abstract double KnotsPerSecondInOneMetersPerSecondSquared { get; } + protected abstract double MetersPerSecondSquaredInOneMetersPerSecondSquared { get; } + protected abstract double MicrometersPerSecondSquaredInOneMetersPerSecondSquared { get; } + protected abstract double MillimetersPerSecondSquaredInOneMetersPerSecondSquared { get; } + protected abstract double NanometersPerSecondSquaredInOneMetersPerSecondSquared { get; } + protected abstract double StandardGravityInOneMetersPerSecondSquared { get; } // ReSharper disable VirtualMemberNeverOverriden.Global - protected virtual double CentimeterPerSecondSquaredTolerance { get { return 1e-5; } } - protected virtual double DecimeterPerSecondSquaredTolerance { get { return 1e-5; } } + protected virtual double CentimetersPerSecondSquaredTolerance { get { return 1e-5; } } + protected virtual double DecimetersPerSecondSquaredTolerance { get { return 1e-5; } } protected virtual double FeetPerSecondSquaredTolerance { get { return 1e-5; } } protected virtual double InchesPerSecondSquaredTolerance { get { return 1e-5; } } - protected virtual double KilometerPerSecondSquaredTolerance { get { return 1e-5; } } + protected virtual double KilometersPerSecondSquaredTolerance { get { return 1e-5; } } protected virtual double KnotsPerHourTolerance { get { return 1e-5; } } protected virtual double KnotsPerMinuteTolerance { get { return 1e-5; } } protected virtual double KnotsPerSecondTolerance { get { return 1e-5; } } - protected virtual double MeterPerSecondSquaredTolerance { get { return 1e-5; } } - protected virtual double MicrometerPerSecondSquaredTolerance { get { return 1e-5; } } - protected virtual double MillimeterPerSecondSquaredTolerance { get { return 1e-5; } } - protected virtual double NanometerPerSecondSquaredTolerance { get { return 1e-5; } } + protected virtual double MetersPerSecondSquaredTolerance { get { return 1e-5; } } + protected virtual double MicrometersPerSecondSquaredTolerance { get { return 1e-5; } } + protected virtual double MillimetersPerSecondSquaredTolerance { get { return 1e-5; } } + protected virtual double NanometersPerSecondSquaredTolerance { get { return 1e-5; } } protected virtual double StandardGravityTolerance { get { return 1e-5; } } // ReSharper restore VirtualMemberNeverOverriden.Global [Fact] - public void MeterPerSecondSquaredToAccelerationUnits() + public void MetersPerSecondSquaredToAccelerationUnits() { - Acceleration meterpersecondsquared = Acceleration.FromMeterPerSecondSquared(1); - AssertEx.EqualTolerance(CentimeterPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.CentimeterPerSecondSquared, CentimeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(DecimeterPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.DecimeterPerSecondSquared, DecimeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(FeetPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.FeetPerSecondSquared, FeetPerSecondSquaredTolerance); - AssertEx.EqualTolerance(InchesPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.InchesPerSecondSquared, InchesPerSecondSquaredTolerance); - AssertEx.EqualTolerance(KilometerPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.KilometerPerSecondSquared, KilometerPerSecondSquaredTolerance); - AssertEx.EqualTolerance(KnotsPerHourInOneMeterPerSecondSquared, meterpersecondsquared.KnotsPerHour, KnotsPerHourTolerance); - AssertEx.EqualTolerance(KnotsPerMinuteInOneMeterPerSecondSquared, meterpersecondsquared.KnotsPerMinute, KnotsPerMinuteTolerance); - AssertEx.EqualTolerance(KnotsPerSecondInOneMeterPerSecondSquared, meterpersecondsquared.KnotsPerSecond, KnotsPerSecondTolerance); - AssertEx.EqualTolerance(MeterPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.MeterPerSecondSquared, MeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(MicrometerPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.MicrometerPerSecondSquared, MicrometerPerSecondSquaredTolerance); - AssertEx.EqualTolerance(MillimeterPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.MillimeterPerSecondSquared, MillimeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(NanometerPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.NanometerPerSecondSquared, NanometerPerSecondSquaredTolerance); - AssertEx.EqualTolerance(StandardGravityInOneMeterPerSecondSquared, meterpersecondsquared.StandardGravity, StandardGravityTolerance); + Acceleration MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); + AssertEx.EqualTolerance(CentimetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.CentimetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(DecimetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.DecimetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(FeetPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.FeetPerSecondSquared, FeetPerSecondSquaredTolerance); + AssertEx.EqualTolerance(InchesPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.InchesPerSecondSquared, InchesPerSecondSquaredTolerance); + AssertEx.EqualTolerance(KilometersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.KilometersPerSecondSquared, KilometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(KnotsPerHourInOneMetersPerSecondSquared, MetersPerSecondSquared.KnotsPerHour, KnotsPerHourTolerance); + AssertEx.EqualTolerance(KnotsPerMinuteInOneMetersPerSecondSquared, MetersPerSecondSquared.KnotsPerMinute, KnotsPerMinuteTolerance); + AssertEx.EqualTolerance(KnotsPerSecondInOneMetersPerSecondSquared, MetersPerSecondSquared.KnotsPerSecond, KnotsPerSecondTolerance); + AssertEx.EqualTolerance(MetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.MetersPerSecondSquared, MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(MicrometersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.MicrometersPerSecondSquared, MicrometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(MillimetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.MillimetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(NanometersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.NanometersPerSecondSquared, NanometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(StandardGravityInOneMetersPerSecondSquared, MetersPerSecondSquared.StandardGravity, StandardGravityTolerance); } [Fact] public void FromValueAndUnit() { - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.CentimeterPerSecondSquared).CentimeterPerSecondSquared, CentimeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.DecimeterPerSecondSquared).DecimeterPerSecondSquared, DecimeterPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.CentiMetersPerSecondSquared).CentimetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.DeciMetersPerSecondSquared).DecimetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.FootPerSecondSquared).FeetPerSecondSquared, FeetPerSecondSquaredTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.InchPerSecondSquared).InchesPerSecondSquared, InchesPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KilometerPerSecondSquared).KilometerPerSecondSquared, KilometerPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KiloMetersPerSecondSquared).KilometersPerSecondSquared, KilometersPerSecondSquaredTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KnotPerHour).KnotsPerHour, KnotsPerHourTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KnotPerMinute).KnotsPerMinute, KnotsPerMinuteTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KnotPerSecond).KnotsPerSecond, KnotsPerSecondTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MeterPerSecondSquared).MeterPerSecondSquared, MeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MicrometerPerSecondSquared).MicrometerPerSecondSquared, MicrometerPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MillimeterPerSecondSquared).MillimeterPerSecondSquared, MillimeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.NanometerPerSecondSquared).NanometerPerSecondSquared, NanometerPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MetersPerSecondSquared).MetersPerSecondSquared, MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MicroMetersPerSecondSquared).MicrometersPerSecondSquared, MicrometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MilliMetersPerSecondSquared).MillimetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.NanoMetersPerSecondSquared).NanometersPerSecondSquared, NanometersPerSecondSquaredTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.StandardGravity).StandardGravity, StandardGravityTolerance); } [Fact] public void As() { - var meterpersecondsquared = Acceleration.FromMeterPerSecondSquared(1); - AssertEx.EqualTolerance(CentimeterPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.CentimeterPerSecondSquared), CentimeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(DecimeterPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.DecimeterPerSecondSquared), DecimeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(FeetPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.FootPerSecondSquared), FeetPerSecondSquaredTolerance); - AssertEx.EqualTolerance(InchesPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.InchPerSecondSquared), InchesPerSecondSquaredTolerance); - AssertEx.EqualTolerance(KilometerPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.KilometerPerSecondSquared), KilometerPerSecondSquaredTolerance); - AssertEx.EqualTolerance(KnotsPerHourInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.KnotPerHour), KnotsPerHourTolerance); - AssertEx.EqualTolerance(KnotsPerMinuteInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.KnotPerMinute), KnotsPerMinuteTolerance); - AssertEx.EqualTolerance(KnotsPerSecondInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.KnotPerSecond), KnotsPerSecondTolerance); - AssertEx.EqualTolerance(MeterPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.MeterPerSecondSquared), MeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(MicrometerPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.MicrometerPerSecondSquared), MicrometerPerSecondSquaredTolerance); - AssertEx.EqualTolerance(MillimeterPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.MillimeterPerSecondSquared), MillimeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(NanometerPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.NanometerPerSecondSquared), NanometerPerSecondSquaredTolerance); - AssertEx.EqualTolerance(StandardGravityInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.StandardGravity), StandardGravityTolerance); + var MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); + AssertEx.EqualTolerance(CentimetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.CentiMetersPerSecondSquared), CentimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(DecimetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.DeciMetersPerSecondSquared), DecimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(FeetPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.FootPerSecondSquared), FeetPerSecondSquaredTolerance); + AssertEx.EqualTolerance(InchesPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.InchPerSecondSquared), InchesPerSecondSquaredTolerance); + AssertEx.EqualTolerance(KilometersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.KiloMetersPerSecondSquared), KilometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(KnotsPerHourInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.KnotPerHour), KnotsPerHourTolerance); + AssertEx.EqualTolerance(KnotsPerMinuteInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.KnotPerMinute), KnotsPerMinuteTolerance); + AssertEx.EqualTolerance(KnotsPerSecondInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.KnotPerSecond), KnotsPerSecondTolerance); + AssertEx.EqualTolerance(MetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.MetersPerSecondSquared), MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(MicrometersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.MicroMetersPerSecondSquared), MicrometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(MillimetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.MilliMetersPerSecondSquared), MillimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(NanometersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.NanoMetersPerSecondSquared), NanometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(StandardGravityInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.StandardGravity), StandardGravityTolerance); } [Fact] public void ConversionRoundTrip() { - Acceleration meterpersecondsquared = Acceleration.FromMeterPerSecondSquared(1); - AssertEx.EqualTolerance(1, Acceleration.FromCentimeterPerSecondSquared(meterpersecondsquared.CentimeterPerSecondSquared).MeterPerSecondSquared, CentimeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromDecimeterPerSecondSquared(meterpersecondsquared.DecimeterPerSecondSquared).MeterPerSecondSquared, DecimeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromFeetPerSecondSquared(meterpersecondsquared.FeetPerSecondSquared).MeterPerSecondSquared, FeetPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromInchesPerSecondSquared(meterpersecondsquared.InchesPerSecondSquared).MeterPerSecondSquared, InchesPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromKilometerPerSecondSquared(meterpersecondsquared.KilometerPerSecondSquared).MeterPerSecondSquared, KilometerPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerHour(meterpersecondsquared.KnotsPerHour).MeterPerSecondSquared, KnotsPerHourTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerMinute(meterpersecondsquared.KnotsPerMinute).MeterPerSecondSquared, KnotsPerMinuteTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerSecond(meterpersecondsquared.KnotsPerSecond).MeterPerSecondSquared, KnotsPerSecondTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromMeterPerSecondSquared(meterpersecondsquared.MeterPerSecondSquared).MeterPerSecondSquared, MeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromMicrometerPerSecondSquared(meterpersecondsquared.MicrometerPerSecondSquared).MeterPerSecondSquared, MicrometerPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromMillimeterPerSecondSquared(meterpersecondsquared.MillimeterPerSecondSquared).MeterPerSecondSquared, MillimeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromNanometerPerSecondSquared(meterpersecondsquared.NanometerPerSecondSquared).MeterPerSecondSquared, NanometerPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromStandardGravity(meterpersecondsquared.StandardGravity).MeterPerSecondSquared, StandardGravityTolerance); + Acceleration MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); + AssertEx.EqualTolerance(1, Acceleration.FromCentimetersPerSecondSquared(MetersPerSecondSquared.CentimetersPerSecondSquared).MetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromDecimetersPerSecondSquared(MetersPerSecondSquared.DecimetersPerSecondSquared).MetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromFeetPerSecondSquared(MetersPerSecondSquared.FeetPerSecondSquared).MetersPerSecondSquared, FeetPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromInchesPerSecondSquared(MetersPerSecondSquared.InchesPerSecondSquared).MetersPerSecondSquared, InchesPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromKilometersPerSecondSquared(MetersPerSecondSquared.KilometersPerSecondSquared).MetersPerSecondSquared, KilometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerHour(MetersPerSecondSquared.KnotsPerHour).MetersPerSecondSquared, KnotsPerHourTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerMinute(MetersPerSecondSquared.KnotsPerMinute).MetersPerSecondSquared, KnotsPerMinuteTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerSecond(MetersPerSecondSquared.KnotsPerSecond).MetersPerSecondSquared, KnotsPerSecondTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromMetersPerSecondSquared(MetersPerSecondSquared.MetersPerSecondSquared).MetersPerSecondSquared, MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromMicrometersPerSecondSquared(MetersPerSecondSquared.MicrometersPerSecondSquared).MetersPerSecondSquared, MicrometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromMillimetersPerSecondSquared(MetersPerSecondSquared.MillimetersPerSecondSquared).MetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromNanometersPerSecondSquared(MetersPerSecondSquared.NanometersPerSecondSquared).MetersPerSecondSquared, NanometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromStandardGravity(MetersPerSecondSquared.StandardGravity).MetersPerSecondSquared, StandardGravityTolerance); } [Fact] public void ArithmeticOperators() { - Acceleration v = Acceleration.FromMeterPerSecondSquared(1); - AssertEx.EqualTolerance(-1, -v.MeterPerSecondSquared, MeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(2, (Acceleration.FromMeterPerSecondSquared(3)-v).MeterPerSecondSquared, MeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(2, (v + v).MeterPerSecondSquared, MeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(10, (v*10).MeterPerSecondSquared, MeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(10, (10*v).MeterPerSecondSquared, MeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(2, (Acceleration.FromMeterPerSecondSquared(10)/5).MeterPerSecondSquared, MeterPerSecondSquaredTolerance); - AssertEx.EqualTolerance(2, Acceleration.FromMeterPerSecondSquared(10)/Acceleration.FromMeterPerSecondSquared(5), MeterPerSecondSquaredTolerance); + Acceleration v = Acceleration.FromMetersPerSecondSquared(1); + AssertEx.EqualTolerance(-1, -v.MetersPerSecondSquared, MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(2, (Acceleration.FromMetersPerSecondSquared(3)-v).MetersPerSecondSquared, MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(2, (v + v).MetersPerSecondSquared, MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(10, (v*10).MetersPerSecondSquared, MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(10, (10*v).MetersPerSecondSquared, MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(2, (Acceleration.FromMetersPerSecondSquared(10)/5).MetersPerSecondSquared, MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(2, Acceleration.FromMetersPerSecondSquared(10)/Acceleration.FromMetersPerSecondSquared(5), MetersPerSecondSquaredTolerance); } [Fact] public void ComparisonOperators() { - Acceleration oneMeterPerSecondSquared = Acceleration.FromMeterPerSecondSquared(1); - Acceleration twoMeterPerSecondSquared = Acceleration.FromMeterPerSecondSquared(2); - - Assert.True(oneMeterPerSecondSquared < twoMeterPerSecondSquared); - Assert.True(oneMeterPerSecondSquared <= twoMeterPerSecondSquared); - Assert.True(twoMeterPerSecondSquared > oneMeterPerSecondSquared); - Assert.True(twoMeterPerSecondSquared >= oneMeterPerSecondSquared); - - Assert.False(oneMeterPerSecondSquared > twoMeterPerSecondSquared); - Assert.False(oneMeterPerSecondSquared >= twoMeterPerSecondSquared); - Assert.False(twoMeterPerSecondSquared < oneMeterPerSecondSquared); - Assert.False(twoMeterPerSecondSquared <= oneMeterPerSecondSquared); + Acceleration oneMeterPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); + Acceleration twoMetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(2); + + Assert.True(oneMeterPerSecondSquared < twoMetersPerSecondSquared); + Assert.True(oneMeterPerSecondSquared <= twoMetersPerSecondSquared); + Assert.True(twoMetersPerSecondSquared > oneMeterPerSecondSquared); + Assert.True(twoMetersPerSecondSquared >= oneMeterPerSecondSquared); + + Assert.False(oneMeterPerSecondSquared > twoMetersPerSecondSquared); + Assert.False(oneMeterPerSecondSquared >= twoMetersPerSecondSquared); + Assert.False(twoMetersPerSecondSquared < oneMeterPerSecondSquared); + Assert.False(twoMetersPerSecondSquared <= oneMeterPerSecondSquared); } [Fact] public void CompareToIsImplemented() { - Acceleration meterpersecondsquared = Acceleration.FromMeterPerSecondSquared(1); - Assert.Equal(0, meterpersecondsquared.CompareTo(meterpersecondsquared)); - Assert.True(meterpersecondsquared.CompareTo(Acceleration.Zero) > 0); - Assert.True(Acceleration.Zero.CompareTo(meterpersecondsquared) < 0); + Acceleration MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.Equal(0, MetersPerSecondSquared.CompareTo(MetersPerSecondSquared)); + Assert.True(MetersPerSecondSquared.CompareTo(Acceleration.Zero) > 0); + Assert.True(Acceleration.Zero.CompareTo(MetersPerSecondSquared) < 0); } [Fact] public void CompareToThrowsOnTypeMismatch() { - Acceleration meterpersecondsquared = Acceleration.FromMeterPerSecondSquared(1); - Assert.Throws(() => meterpersecondsquared.CompareTo(new object())); + Acceleration MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.Throws(() => MetersPerSecondSquared.CompareTo(new object())); } [Fact] public void CompareToThrowsOnNull() { - Acceleration meterpersecondsquared = Acceleration.FromMeterPerSecondSquared(1); - Assert.Throws(() => meterpersecondsquared.CompareTo(null)); + Acceleration MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.Throws(() => MetersPerSecondSquared.CompareTo(null)); } [Fact] public void EqualityOperators() { - Acceleration a = Acceleration.FromMeterPerSecondSquared(1); - Acceleration b = Acceleration.FromMeterPerSecondSquared(2); + Acceleration a = Acceleration.FromMetersPerSecondSquared(1); + Acceleration b = Acceleration.FromMetersPerSecondSquared(2); // ReSharper disable EqualExpressionComparison Assert.True(a == a); @@ -229,23 +229,23 @@ public void EqualityOperators() [Fact] public void EqualsIsImplemented() { - Acceleration v = Acceleration.FromMeterPerSecondSquared(1); - Assert.True(v.Equals(Acceleration.FromMeterPerSecondSquared(1), Acceleration.FromMeterPerSecondSquared(MeterPerSecondSquaredTolerance))); - Assert.False(v.Equals(Acceleration.Zero, Acceleration.FromMeterPerSecondSquared(MeterPerSecondSquaredTolerance))); + Acceleration v = Acceleration.FromMetersPerSecondSquared(1); + Assert.True(v.Equals(Acceleration.FromMetersPerSecondSquared(1), Acceleration.FromMetersPerSecondSquared(MetersPerSecondSquaredTolerance))); + Assert.False(v.Equals(Acceleration.Zero, Acceleration.FromMetersPerSecondSquared(MetersPerSecondSquaredTolerance))); } [Fact] public void EqualsReturnsFalseOnTypeMismatch() { - Acceleration meterpersecondsquared = Acceleration.FromMeterPerSecondSquared(1); - Assert.False(meterpersecondsquared.Equals(new object())); + Acceleration MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.False(MetersPerSecondSquared.Equals(new object())); } [Fact] public void EqualsReturnsFalseOnNull() { - Acceleration meterpersecondsquared = Acceleration.FromMeterPerSecondSquared(1); - Assert.False(meterpersecondsquared.Equals(null)); + Acceleration MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.False(MetersPerSecondSquared.Equals(null)); } } } diff --git a/UnitsNet.Tests/IntOverloadTests.cs b/UnitsNet.Tests/IntOverloadTests.cs index 9ab47bcd06..3a762ecb54 100644 --- a/UnitsNet.Tests/IntOverloadTests.cs +++ b/UnitsNet.Tests/IntOverloadTests.cs @@ -31,24 +31,24 @@ public class IntOverloadTests public static void CreatingQuantityWithDoubleBackingFieldFromIntReturnsCorrectValue() { int oneMeterPerSecondSquared = 1; - Acceleration acceleration = Acceleration.FromMeterPerSecondSquared(oneMeterPerSecondSquared); - Assert.Equal(1.0, acceleration.MeterPerSecondSquared); + Acceleration acceleration = Acceleration.FromMetersPerSecondSquared(oneMeterPerSecondSquared); + Assert.Equal(1.0, acceleration.MetersPerSecondSquared); } [Fact] public static void CreatingQuantityWithDoubleBackingFieldFromNullableIntReturnsCorrectValue() { int? oneMeterPerSecondSquared = 1; - Acceleration? acceleration = Acceleration.FromMeterPerSecondSquared(oneMeterPerSecondSquared); + Acceleration? acceleration = Acceleration.FromMetersPerSecondSquared(oneMeterPerSecondSquared); Assert.NotNull(acceleration); - Assert.Equal(1.0, acceleration.Value.MeterPerSecondSquared); + Assert.Equal(1.0, acceleration.Value.MetersPerSecondSquared); } [Fact] public static void CreatingQuantityWithDoubleBackingFieldFromNullableIntReturnsNullWhenGivenNull() { int? nullInt = null; - Acceleration? acceleration = Acceleration.FromMeterPerSecondSquared(nullInt); + Acceleration? acceleration = Acceleration.FromMetersPerSecondSquared(nullInt); Assert.Null(acceleration); } @@ -56,24 +56,24 @@ public static void CreatingQuantityWithDoubleBackingFieldFromNullableIntReturnsN public static void CreatingQuantityWithDoubleBackingFieldFromIntWithExtensionMethodReturnsCorrectValue() { int oneMeterPerSecondSquared = 1; - Acceleration acceleration = oneMeterPerSecondSquared.MeterPerSecondSquared(); - Assert.Equal(1.0, acceleration.MeterPerSecondSquared); + Acceleration acceleration = oneMeterPerSecondSquared.MetersPerSecondSquared(); + Assert.Equal(1.0, acceleration.MetersPerSecondSquared); } [Fact] public static void CreatingQuantityWithDoubleBackingFieldFromNullableIntWithExtensionMethodReturnsCorrectValue() { int? oneMeterPerSecondSquared = 1; - Acceleration? acceleration = oneMeterPerSecondSquared.MeterPerSecondSquared(); + Acceleration? acceleration = oneMeterPerSecondSquared.MetersPerSecondSquared(); Assert.NotNull(acceleration); - Assert.Equal(1.0, acceleration.Value.MeterPerSecondSquared); + Assert.Equal(1.0, acceleration.Value.MetersPerSecondSquared); } [Fact] public static void CreatingQuantityWithDoubleBackingFieldFromNullableIntWithExtensionMethodReturnsNullWhenGivenNull() { int? nullInt = null; - Acceleration? acceleration = nullInt.MeterPerSecondSquared(); + Acceleration? acceleration = nullInt.MetersPerSecondSquared(); Assert.Null(acceleration); } diff --git a/UnitsNet.Tests/LongOverloadTests.cs b/UnitsNet.Tests/LongOverloadTests.cs index cf8982ebe9..d64ee9fa03 100644 --- a/UnitsNet.Tests/LongOverloadTests.cs +++ b/UnitsNet.Tests/LongOverloadTests.cs @@ -31,24 +31,24 @@ public class LongOverloadTests public static void CreatingQuantityWithDoubleBackingFieldFromLongReturnsCorrectValue() { long oneMeterPerSecondSquared = 1; - Acceleration acceleration = Acceleration.FromMeterPerSecondSquared(oneMeterPerSecondSquared); - Assert.Equal(1.0, acceleration.MeterPerSecondSquared); + Acceleration acceleration = Acceleration.FromMetersPerSecondSquared(oneMeterPerSecondSquared); + Assert.Equal(1.0, acceleration.MetersPerSecondSquared); } [Fact] public static void CreatingQuantityWithDoubleBackingFieldFromNullableLongReturnsCorrectValue() { long? oneMeterPerSecondSquared = 1; - Acceleration? acceleration = Acceleration.FromMeterPerSecondSquared(oneMeterPerSecondSquared); + Acceleration? acceleration = Acceleration.FromMetersPerSecondSquared(oneMeterPerSecondSquared); Assert.NotNull(acceleration); - Assert.Equal(1.0, acceleration.Value.MeterPerSecondSquared); + Assert.Equal(1.0, acceleration.Value.MetersPerSecondSquared); } [Fact] public static void CreatingQuantityWithDoubleBackingFieldFromNullableLongReturnsNullWhenGivenNull() { long? nullLong = null; - Acceleration? acceleration = Acceleration.FromMeterPerSecondSquared(nullLong); + Acceleration? acceleration = Acceleration.FromMetersPerSecondSquared(nullLong); Assert.Null(acceleration); } @@ -56,24 +56,24 @@ public static void CreatingQuantityWithDoubleBackingFieldFromNullableLongReturns public static void CreatingQuantityWithDoubleBackingFieldFromLongWithExtensionMethodReturnsCorrectValue() { long oneMeterPerSecondSquared = 1; - Acceleration acceleration = oneMeterPerSecondSquared.MeterPerSecondSquared(); - Assert.Equal(1.0, acceleration.MeterPerSecondSquared); + Acceleration acceleration = oneMeterPerSecondSquared.MetersPerSecondSquared(); + Assert.Equal(1.0, acceleration.MetersPerSecondSquared); } [Fact] public static void CreatingQuantityWithDoubleBackingFieldFromNullableLongWithExtensionMethodReturnsCorrectValue() { long? oneMeterPerSecondSquared = 1; - Acceleration? acceleration = oneMeterPerSecondSquared.MeterPerSecondSquared(); + Acceleration? acceleration = oneMeterPerSecondSquared.MetersPerSecondSquared(); Assert.NotNull(acceleration); - Assert.Equal(1.0, acceleration.Value.MeterPerSecondSquared); + Assert.Equal(1.0, acceleration.Value.MetersPerSecondSquared); } [Fact] public static void CreatingQuantityWithDoubleBackingFieldFromNullableLongWithExtensionMethodReturnsNullWhenGivenNull() { long? nullLong = null; - Acceleration? acceleration = nullLong.MeterPerSecondSquared(); + Acceleration? acceleration = nullLong.MetersPerSecondSquared(); Assert.Null(acceleration); } diff --git a/UnitsNet.Tests/UnitSystemTests.cs b/UnitsNet.Tests/UnitSystemTests.cs index e5a97d5924..8e848343d0 100644 --- a/UnitsNet.Tests/UnitSystemTests.cs +++ b/UnitsNet.Tests/UnitSystemTests.cs @@ -254,7 +254,7 @@ public void ScientificNotationUpperIntervalFormatting(double value, string expec public void ShouldUseCorrectMicroSign() { // "\u00b5" = Micro sign - Assert.Equal(AccelerationUnit.MicrometerPerSecondSquared, Acceleration.ParseUnit("\u00b5m/s²")); + Assert.Equal(AccelerationUnit.MicroMetersPerSecondSquared, Acceleration.ParseUnit("\u00b5m/s²")); Assert.Equal(AmplitudeRatioUnit.DecibelMicrovolt, AmplitudeRatio.ParseUnit("dB\u00b5V")); Assert.Equal(AngleUnit.Microdegree, Angle.ParseUnit("\u00b5°")); Assert.Equal(AngleUnit.Microradian, Angle.ParseUnit("\u00b5rad")); diff --git a/UnitsNet/CustomCode/Quantities/Force.extra.cs b/UnitsNet/CustomCode/Quantities/Force.extra.cs index 60b8e750d3..6ae89c097c 100644 --- a/UnitsNet/CustomCode/Quantities/Force.extra.cs +++ b/UnitsNet/CustomCode/Quantities/Force.extra.cs @@ -44,12 +44,12 @@ public partial struct Force public static Acceleration operator /(Force force, Mass mass) { - return Acceleration.FromMeterPerSecondSquared(force.Newtons / mass.Kilograms); + return Acceleration.FromMetersPerSecondSquared(force.Newtons / mass.Kilograms); } public static Mass operator /(Force force, Acceleration mass) { - return Mass.FromKilograms(force.Newtons / mass.MeterPerSecondSquared); + return Mass.FromKilograms(force.Newtons / mass.MetersPerSecondSquared); } public static Pressure operator /(Force force, Area area) @@ -86,7 +86,7 @@ public static Force FromPressureByArea(Pressure p, Area area) public static Force FromMassByAcceleration(Mass mass, Acceleration acceleration) { - return new Force(mass.Kilograms * acceleration.MeterPerSecondSquared); + return new Force(mass.Kilograms * acceleration.MetersPerSecondSquared); } } -} \ No newline at end of file +} diff --git a/UnitsNet/CustomCode/Quantities/Mass.extra.cs b/UnitsNet/CustomCode/Quantities/Mass.extra.cs index c87eff453f..4609cbf0a6 100644 --- a/UnitsNet/CustomCode/Quantities/Mass.extra.cs +++ b/UnitsNet/CustomCode/Quantities/Mass.extra.cs @@ -98,12 +98,12 @@ public static Mass FromStonePounds(double stone, double pounds) public static Force operator *(Mass mass, Acceleration acceleration) { - return Force.FromNewtons(mass.Kilograms*acceleration.MeterPerSecondSquared); + return Force.FromNewtons(mass.Kilograms*acceleration.MetersPerSecondSquared); } public static Force operator *(Acceleration acceleration, Mass mass) { - return Force.FromNewtons(mass.Kilograms*acceleration.MeterPerSecondSquared); + return Force.FromNewtons(mass.Kilograms*acceleration.MetersPerSecondSquared); } #endif } @@ -137,4 +137,4 @@ public string ToString([CanBeNull] Culture cultureInfo) Stone, stoneUnit, Math.Round(Pounds), poundUnit); } } -} \ No newline at end of file +} diff --git a/UnitsNet/CustomCode/Quantities/Speed.extra.cs b/UnitsNet/CustomCode/Quantities/Speed.extra.cs index 12b7841004..267d1e9ffc 100644 --- a/UnitsNet/CustomCode/Quantities/Speed.extra.cs +++ b/UnitsNet/CustomCode/Quantities/Speed.extra.cs @@ -39,7 +39,7 @@ public partial struct Speed #if !WINDOWS_UWP public static Acceleration operator /(Speed speed, TimeSpan timeSpan) { - return Acceleration.FromMeterPerSecondSquared(speed.MetersPerSecond / timeSpan.TotalSeconds); + return Acceleration.FromMetersPerSecondSquared(speed.MetersPerSecond / timeSpan.TotalSeconds); } public static Length operator *(Speed speed, TimeSpan timeSpan) @@ -54,7 +54,7 @@ public partial struct Speed public static Acceleration operator /(Speed speed, Duration duration) { - return Acceleration.FromMeterPerSecondSquared(speed.MetersPerSecond / duration.Seconds); + return Acceleration.FromMetersPerSecondSquared(speed.MetersPerSecond / duration.Seconds); } public static Length operator *(Speed speed, Duration duration) diff --git a/UnitsNet/GeneratedCode/Extensions/Number/NumberToAccelerationExtensions.g.cs b/UnitsNet/GeneratedCode/Extensions/Number/NumberToAccelerationExtensions.g.cs index 4faf18fa9d..574b8e8c0c 100644 --- a/UnitsNet/GeneratedCode/Extensions/Number/NumberToAccelerationExtensions.g.cs +++ b/UnitsNet/GeneratedCode/Extensions/Number/NumberToAccelerationExtensions.g.cs @@ -44,71 +44,71 @@ namespace UnitsNet.Extensions.NumberToAcceleration { public static class NumberToAccelerationExtensions { - #region CentimeterPerSecondSquared + #region CentiMetersPerSecondSquared - /// - public static Acceleration CentimeterPerSecondSquared(this int value) => Acceleration.FromCentimeterPerSecondSquared(value); + /// + public static Acceleration CentimetersPerSecondSquared(this int value) => Acceleration.FromCentimetersPerSecondSquared(value); - /// - public static Acceleration? CentimeterPerSecondSquared(this int? value) => Acceleration.FromCentimeterPerSecondSquared(value); + /// + public static Acceleration? CentimetersPerSecondSquared(this int? value) => Acceleration.FromCentimetersPerSecondSquared(value); - /// - public static Acceleration CentimeterPerSecondSquared(this long value) => Acceleration.FromCentimeterPerSecondSquared(value); + /// + public static Acceleration CentimetersPerSecondSquared(this long value) => Acceleration.FromCentimetersPerSecondSquared(value); - /// - public static Acceleration? CentimeterPerSecondSquared(this long? value) => Acceleration.FromCentimeterPerSecondSquared(value); + /// + public static Acceleration? CentimetersPerSecondSquared(this long? value) => Acceleration.FromCentimetersPerSecondSquared(value); - /// - public static Acceleration CentimeterPerSecondSquared(this double value) => Acceleration.FromCentimeterPerSecondSquared(value); + /// + public static Acceleration CentimetersPerSecondSquared(this double value) => Acceleration.FromCentimetersPerSecondSquared(value); - /// - public static Acceleration? CentimeterPerSecondSquared(this double? value) => Acceleration.FromCentimeterPerSecondSquared(value); + /// + public static Acceleration? CentimetersPerSecondSquared(this double? value) => Acceleration.FromCentimetersPerSecondSquared(value); - /// - public static Acceleration CentimeterPerSecondSquared(this float value) => Acceleration.FromCentimeterPerSecondSquared(value); + /// + public static Acceleration CentimetersPerSecondSquared(this float value) => Acceleration.FromCentimetersPerSecondSquared(value); - /// - public static Acceleration? CentimeterPerSecondSquared(this float? value) => Acceleration.FromCentimeterPerSecondSquared(value); + /// + public static Acceleration? CentimetersPerSecondSquared(this float? value) => Acceleration.FromCentimetersPerSecondSquared(value); - /// - public static Acceleration CentimeterPerSecondSquared(this decimal value) => Acceleration.FromCentimeterPerSecondSquared(Convert.ToDouble(value)); + /// + public static Acceleration CentimetersPerSecondSquared(this decimal value) => Acceleration.FromCentimetersPerSecondSquared(Convert.ToDouble(value)); - /// - public static Acceleration? CentimeterPerSecondSquared(this decimal? value) => Acceleration.FromCentimeterPerSecondSquared(value == null ? (double?)null : Convert.ToDouble(value.Value)); + /// + public static Acceleration? CentimetersPerSecondSquared(this decimal? value) => Acceleration.FromCentimetersPerSecondSquared(value == null ? (double?)null : Convert.ToDouble(value.Value)); #endregion - #region DecimeterPerSecondSquared + #region DeciMetersPerSecondSquared - /// - public static Acceleration DecimeterPerSecondSquared(this int value) => Acceleration.FromDecimeterPerSecondSquared(value); + /// + public static Acceleration DecimetersPerSecondSquared(this int value) => Acceleration.FromDecimetersPerSecondSquared(value); - /// - public static Acceleration? DecimeterPerSecondSquared(this int? value) => Acceleration.FromDecimeterPerSecondSquared(value); + /// + public static Acceleration? DecimetersPerSecondSquared(this int? value) => Acceleration.FromDecimetersPerSecondSquared(value); - /// - public static Acceleration DecimeterPerSecondSquared(this long value) => Acceleration.FromDecimeterPerSecondSquared(value); + /// + public static Acceleration DecimetersPerSecondSquared(this long value) => Acceleration.FromDecimetersPerSecondSquared(value); - /// - public static Acceleration? DecimeterPerSecondSquared(this long? value) => Acceleration.FromDecimeterPerSecondSquared(value); + /// + public static Acceleration? DecimetersPerSecondSquared(this long? value) => Acceleration.FromDecimetersPerSecondSquared(value); - /// - public static Acceleration DecimeterPerSecondSquared(this double value) => Acceleration.FromDecimeterPerSecondSquared(value); + /// + public static Acceleration DecimetersPerSecondSquared(this double value) => Acceleration.FromDecimetersPerSecondSquared(value); - /// - public static Acceleration? DecimeterPerSecondSquared(this double? value) => Acceleration.FromDecimeterPerSecondSquared(value); + /// + public static Acceleration? DecimetersPerSecondSquared(this double? value) => Acceleration.FromDecimetersPerSecondSquared(value); - /// - public static Acceleration DecimeterPerSecondSquared(this float value) => Acceleration.FromDecimeterPerSecondSquared(value); + /// + public static Acceleration DecimetersPerSecondSquared(this float value) => Acceleration.FromDecimetersPerSecondSquared(value); - /// - public static Acceleration? DecimeterPerSecondSquared(this float? value) => Acceleration.FromDecimeterPerSecondSquared(value); + /// + public static Acceleration? DecimetersPerSecondSquared(this float? value) => Acceleration.FromDecimetersPerSecondSquared(value); - /// - public static Acceleration DecimeterPerSecondSquared(this decimal value) => Acceleration.FromDecimeterPerSecondSquared(Convert.ToDouble(value)); + /// + public static Acceleration DecimetersPerSecondSquared(this decimal value) => Acceleration.FromDecimetersPerSecondSquared(Convert.ToDouble(value)); - /// - public static Acceleration? DecimeterPerSecondSquared(this decimal? value) => Acceleration.FromDecimeterPerSecondSquared(value == null ? (double?)null : Convert.ToDouble(value.Value)); + /// + public static Acceleration? DecimetersPerSecondSquared(this decimal? value) => Acceleration.FromDecimetersPerSecondSquared(value == null ? (double?)null : Convert.ToDouble(value.Value)); #endregion @@ -180,37 +180,37 @@ public static class NumberToAccelerationExtensions #endregion - #region KilometerPerSecondSquared + #region KiloMetersPerSecondSquared - /// - public static Acceleration KilometerPerSecondSquared(this int value) => Acceleration.FromKilometerPerSecondSquared(value); + /// + public static Acceleration KilometersPerSecondSquared(this int value) => Acceleration.FromKilometersPerSecondSquared(value); - /// - public static Acceleration? KilometerPerSecondSquared(this int? value) => Acceleration.FromKilometerPerSecondSquared(value); + /// + public static Acceleration? KilometersPerSecondSquared(this int? value) => Acceleration.FromKilometersPerSecondSquared(value); - /// - public static Acceleration KilometerPerSecondSquared(this long value) => Acceleration.FromKilometerPerSecondSquared(value); + /// + public static Acceleration KilometersPerSecondSquared(this long value) => Acceleration.FromKilometersPerSecondSquared(value); - /// - public static Acceleration? KilometerPerSecondSquared(this long? value) => Acceleration.FromKilometerPerSecondSquared(value); + /// + public static Acceleration? KilometersPerSecondSquared(this long? value) => Acceleration.FromKilometersPerSecondSquared(value); - /// - public static Acceleration KilometerPerSecondSquared(this double value) => Acceleration.FromKilometerPerSecondSquared(value); + /// + public static Acceleration KilometersPerSecondSquared(this double value) => Acceleration.FromKilometersPerSecondSquared(value); - /// - public static Acceleration? KilometerPerSecondSquared(this double? value) => Acceleration.FromKilometerPerSecondSquared(value); + /// + public static Acceleration? KilometersPerSecondSquared(this double? value) => Acceleration.FromKilometersPerSecondSquared(value); - /// - public static Acceleration KilometerPerSecondSquared(this float value) => Acceleration.FromKilometerPerSecondSquared(value); + /// + public static Acceleration KilometersPerSecondSquared(this float value) => Acceleration.FromKilometersPerSecondSquared(value); - /// - public static Acceleration? KilometerPerSecondSquared(this float? value) => Acceleration.FromKilometerPerSecondSquared(value); + /// + public static Acceleration? KilometersPerSecondSquared(this float? value) => Acceleration.FromKilometersPerSecondSquared(value); - /// - public static Acceleration KilometerPerSecondSquared(this decimal value) => Acceleration.FromKilometerPerSecondSquared(Convert.ToDouble(value)); + /// + public static Acceleration KilometersPerSecondSquared(this decimal value) => Acceleration.FromKilometersPerSecondSquared(Convert.ToDouble(value)); - /// - public static Acceleration? KilometerPerSecondSquared(this decimal? value) => Acceleration.FromKilometerPerSecondSquared(value == null ? (double?)null : Convert.ToDouble(value.Value)); + /// + public static Acceleration? KilometersPerSecondSquared(this decimal? value) => Acceleration.FromKilometersPerSecondSquared(value == null ? (double?)null : Convert.ToDouble(value.Value)); #endregion @@ -316,139 +316,139 @@ public static class NumberToAccelerationExtensions #endregion - #region MeterPerSecondSquared + #region MetersPerSecondSquared - /// - public static Acceleration MeterPerSecondSquared(this int value) => Acceleration.FromMeterPerSecondSquared(value); + /// + public static Acceleration MetersPerSecondSquared(this int value) => Acceleration.FromMetersPerSecondSquared(value); - /// - public static Acceleration? MeterPerSecondSquared(this int? value) => Acceleration.FromMeterPerSecondSquared(value); + /// + public static Acceleration? MetersPerSecondSquared(this int? value) => Acceleration.FromMetersPerSecondSquared(value); - /// - public static Acceleration MeterPerSecondSquared(this long value) => Acceleration.FromMeterPerSecondSquared(value); + /// + public static Acceleration MetersPerSecondSquared(this long value) => Acceleration.FromMetersPerSecondSquared(value); - /// - public static Acceleration? MeterPerSecondSquared(this long? value) => Acceleration.FromMeterPerSecondSquared(value); + /// + public static Acceleration? MetersPerSecondSquared(this long? value) => Acceleration.FromMetersPerSecondSquared(value); - /// - public static Acceleration MeterPerSecondSquared(this double value) => Acceleration.FromMeterPerSecondSquared(value); + /// + public static Acceleration MetersPerSecondSquared(this double value) => Acceleration.FromMetersPerSecondSquared(value); - /// - public static Acceleration? MeterPerSecondSquared(this double? value) => Acceleration.FromMeterPerSecondSquared(value); + /// + public static Acceleration? MetersPerSecondSquared(this double? value) => Acceleration.FromMetersPerSecondSquared(value); - /// - public static Acceleration MeterPerSecondSquared(this float value) => Acceleration.FromMeterPerSecondSquared(value); + /// + public static Acceleration MetersPerSecondSquared(this float value) => Acceleration.FromMetersPerSecondSquared(value); - /// - public static Acceleration? MeterPerSecondSquared(this float? value) => Acceleration.FromMeterPerSecondSquared(value); + /// + public static Acceleration? MetersPerSecondSquared(this float? value) => Acceleration.FromMetersPerSecondSquared(value); - /// - public static Acceleration MeterPerSecondSquared(this decimal value) => Acceleration.FromMeterPerSecondSquared(Convert.ToDouble(value)); + /// + public static Acceleration MetersPerSecondSquared(this decimal value) => Acceleration.FromMetersPerSecondSquared(Convert.ToDouble(value)); - /// - public static Acceleration? MeterPerSecondSquared(this decimal? value) => Acceleration.FromMeterPerSecondSquared(value == null ? (double?)null : Convert.ToDouble(value.Value)); + /// + public static Acceleration? MetersPerSecondSquared(this decimal? value) => Acceleration.FromMetersPerSecondSquared(value == null ? (double?)null : Convert.ToDouble(value.Value)); #endregion - #region MicrometerPerSecondSquared + #region MicroMetersPerSecondSquared - /// - public static Acceleration MicrometerPerSecondSquared(this int value) => Acceleration.FromMicrometerPerSecondSquared(value); + /// + public static Acceleration MicrometersPerSecondSquared(this int value) => Acceleration.FromMicrometersPerSecondSquared(value); - /// - public static Acceleration? MicrometerPerSecondSquared(this int? value) => Acceleration.FromMicrometerPerSecondSquared(value); + /// + public static Acceleration? MicrometersPerSecondSquared(this int? value) => Acceleration.FromMicrometersPerSecondSquared(value); - /// - public static Acceleration MicrometerPerSecondSquared(this long value) => Acceleration.FromMicrometerPerSecondSquared(value); + /// + public static Acceleration MicrometersPerSecondSquared(this long value) => Acceleration.FromMicrometersPerSecondSquared(value); - /// - public static Acceleration? MicrometerPerSecondSquared(this long? value) => Acceleration.FromMicrometerPerSecondSquared(value); + /// + public static Acceleration? MicrometersPerSecondSquared(this long? value) => Acceleration.FromMicrometersPerSecondSquared(value); - /// - public static Acceleration MicrometerPerSecondSquared(this double value) => Acceleration.FromMicrometerPerSecondSquared(value); + /// + public static Acceleration MicrometersPerSecondSquared(this double value) => Acceleration.FromMicrometersPerSecondSquared(value); - /// - public static Acceleration? MicrometerPerSecondSquared(this double? value) => Acceleration.FromMicrometerPerSecondSquared(value); + /// + public static Acceleration? MicrometersPerSecondSquared(this double? value) => Acceleration.FromMicrometersPerSecondSquared(value); - /// - public static Acceleration MicrometerPerSecondSquared(this float value) => Acceleration.FromMicrometerPerSecondSquared(value); + /// + public static Acceleration MicrometersPerSecondSquared(this float value) => Acceleration.FromMicrometersPerSecondSquared(value); - /// - public static Acceleration? MicrometerPerSecondSquared(this float? value) => Acceleration.FromMicrometerPerSecondSquared(value); + /// + public static Acceleration? MicrometersPerSecondSquared(this float? value) => Acceleration.FromMicrometersPerSecondSquared(value); - /// - public static Acceleration MicrometerPerSecondSquared(this decimal value) => Acceleration.FromMicrometerPerSecondSquared(Convert.ToDouble(value)); + /// + public static Acceleration MicrometersPerSecondSquared(this decimal value) => Acceleration.FromMicrometersPerSecondSquared(Convert.ToDouble(value)); - /// - public static Acceleration? MicrometerPerSecondSquared(this decimal? value) => Acceleration.FromMicrometerPerSecondSquared(value == null ? (double?)null : Convert.ToDouble(value.Value)); + /// + public static Acceleration? MicrometersPerSecondSquared(this decimal? value) => Acceleration.FromMicrometersPerSecondSquared(value == null ? (double?)null : Convert.ToDouble(value.Value)); #endregion - #region MillimeterPerSecondSquared + #region MilliMetersPerSecondSquared - /// - public static Acceleration MillimeterPerSecondSquared(this int value) => Acceleration.FromMillimeterPerSecondSquared(value); + /// + public static Acceleration MillimetersPerSecondSquared(this int value) => Acceleration.FromMillimetersPerSecondSquared(value); - /// - public static Acceleration? MillimeterPerSecondSquared(this int? value) => Acceleration.FromMillimeterPerSecondSquared(value); + /// + public static Acceleration? MillimetersPerSecondSquared(this int? value) => Acceleration.FromMillimetersPerSecondSquared(value); - /// - public static Acceleration MillimeterPerSecondSquared(this long value) => Acceleration.FromMillimeterPerSecondSquared(value); + /// + public static Acceleration MillimetersPerSecondSquared(this long value) => Acceleration.FromMillimetersPerSecondSquared(value); - /// - public static Acceleration? MillimeterPerSecondSquared(this long? value) => Acceleration.FromMillimeterPerSecondSquared(value); + /// + public static Acceleration? MillimetersPerSecondSquared(this long? value) => Acceleration.FromMillimetersPerSecondSquared(value); - /// - public static Acceleration MillimeterPerSecondSquared(this double value) => Acceleration.FromMillimeterPerSecondSquared(value); + /// + public static Acceleration MillimetersPerSecondSquared(this double value) => Acceleration.FromMillimetersPerSecondSquared(value); - /// - public static Acceleration? MillimeterPerSecondSquared(this double? value) => Acceleration.FromMillimeterPerSecondSquared(value); + /// + public static Acceleration? MillimetersPerSecondSquared(this double? value) => Acceleration.FromMillimetersPerSecondSquared(value); - /// - public static Acceleration MillimeterPerSecondSquared(this float value) => Acceleration.FromMillimeterPerSecondSquared(value); + /// + public static Acceleration MillimetersPerSecondSquared(this float value) => Acceleration.FromMillimetersPerSecondSquared(value); - /// - public static Acceleration? MillimeterPerSecondSquared(this float? value) => Acceleration.FromMillimeterPerSecondSquared(value); + /// + public static Acceleration? MillimetersPerSecondSquared(this float? value) => Acceleration.FromMillimetersPerSecondSquared(value); - /// - public static Acceleration MillimeterPerSecondSquared(this decimal value) => Acceleration.FromMillimeterPerSecondSquared(Convert.ToDouble(value)); + /// + public static Acceleration MillimetersPerSecondSquared(this decimal value) => Acceleration.FromMillimetersPerSecondSquared(Convert.ToDouble(value)); - /// - public static Acceleration? MillimeterPerSecondSquared(this decimal? value) => Acceleration.FromMillimeterPerSecondSquared(value == null ? (double?)null : Convert.ToDouble(value.Value)); + /// + public static Acceleration? MillimetersPerSecondSquared(this decimal? value) => Acceleration.FromMillimetersPerSecondSquared(value == null ? (double?)null : Convert.ToDouble(value.Value)); #endregion - #region NanometerPerSecondSquared + #region NanoMetersPerSecondSquared - /// - public static Acceleration NanometerPerSecondSquared(this int value) => Acceleration.FromNanometerPerSecondSquared(value); + /// + public static Acceleration NanometersPerSecondSquared(this int value) => Acceleration.FromNanometersPerSecondSquared(value); - /// - public static Acceleration? NanometerPerSecondSquared(this int? value) => Acceleration.FromNanometerPerSecondSquared(value); + /// + public static Acceleration? NanometersPerSecondSquared(this int? value) => Acceleration.FromNanometersPerSecondSquared(value); - /// - public static Acceleration NanometerPerSecondSquared(this long value) => Acceleration.FromNanometerPerSecondSquared(value); + /// + public static Acceleration NanometersPerSecondSquared(this long value) => Acceleration.FromNanometersPerSecondSquared(value); - /// - public static Acceleration? NanometerPerSecondSquared(this long? value) => Acceleration.FromNanometerPerSecondSquared(value); + /// + public static Acceleration? NanometersPerSecondSquared(this long? value) => Acceleration.FromNanometersPerSecondSquared(value); - /// - public static Acceleration NanometerPerSecondSquared(this double value) => Acceleration.FromNanometerPerSecondSquared(value); + /// + public static Acceleration NanometersPerSecondSquared(this double value) => Acceleration.FromNanometersPerSecondSquared(value); - /// - public static Acceleration? NanometerPerSecondSquared(this double? value) => Acceleration.FromNanometerPerSecondSquared(value); + /// + public static Acceleration? NanometersPerSecondSquared(this double? value) => Acceleration.FromNanometersPerSecondSquared(value); - /// - public static Acceleration NanometerPerSecondSquared(this float value) => Acceleration.FromNanometerPerSecondSquared(value); + /// + public static Acceleration NanometersPerSecondSquared(this float value) => Acceleration.FromNanometersPerSecondSquared(value); - /// - public static Acceleration? NanometerPerSecondSquared(this float? value) => Acceleration.FromNanometerPerSecondSquared(value); + /// + public static Acceleration? NanometersPerSecondSquared(this float? value) => Acceleration.FromNanometersPerSecondSquared(value); - /// - public static Acceleration NanometerPerSecondSquared(this decimal value) => Acceleration.FromNanometerPerSecondSquared(Convert.ToDouble(value)); + /// + public static Acceleration NanometersPerSecondSquared(this decimal value) => Acceleration.FromNanometersPerSecondSquared(Convert.ToDouble(value)); - /// - public static Acceleration? NanometerPerSecondSquared(this decimal? value) => Acceleration.FromNanometerPerSecondSquared(value == null ? (double?)null : Convert.ToDouble(value.Value)); + /// + public static Acceleration? NanometersPerSecondSquared(this decimal? value) => Acceleration.FromNanometersPerSecondSquared(value == null ? (double?)null : Convert.ToDouble(value.Value)); #endregion diff --git a/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs b/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs index 8300b4c61c..b1ccabde79 100644 --- a/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs @@ -96,9 +96,9 @@ public Acceleration() #endif [Obsolete("Use the constructor that takes a unit parameter. This constructor will be removed in a future version.")] - public Acceleration(double meterpersecondsquared) + public Acceleration(double meterspersecondsquared) { - _value = Convert.ToDouble(meterpersecondsquared); + _value = Convert.ToDouble(meterspersecondsquared); _unit = BaseUnit; } @@ -121,30 +121,30 @@ public Acceleration(double meterpersecondsquared) // Windows Runtime Component does not allow public methods/ctors with same number of parameters: https://msdn.microsoft.com/en-us/library/br230301.aspx#Overloaded methods /// - /// Creates the quantity with the given value assuming the base unit MeterPerSecondSquared. + /// Creates the quantity with the given value assuming the base unit MetersPerSecondSquared. /// - /// Value assuming base unit MeterPerSecondSquared. + /// Value assuming base unit MetersPerSecondSquared. #if WINDOWS_UWP private #else [Obsolete("Use the constructor that takes a unit parameter. This constructor will be removed in a future version.")] public #endif - Acceleration(long meterpersecondsquared) : this(Convert.ToDouble(meterpersecondsquared), BaseUnit) { } + Acceleration(long meterspersecondsquared) : this(Convert.ToDouble(meterspersecondsquared), BaseUnit) { } // Windows Runtime Component does not allow public methods/ctors with same number of parameters: https://msdn.microsoft.com/en-us/library/br230301.aspx#Overloaded methods // Windows Runtime Component does not support decimal type /// - /// Creates the quantity with the given value assuming the base unit MeterPerSecondSquared. + /// Creates the quantity with the given value assuming the base unit MetersPerSecondSquared. /// - /// Value assuming base unit MeterPerSecondSquared. + /// Value assuming base unit MetersPerSecondSquared. #if WINDOWS_UWP private #else [Obsolete("Use the constructor that takes a unit parameter. This constructor will be removed in a future version.")] public #endif - Acceleration(decimal meterpersecondsquared) : this(Convert.ToDouble(meterpersecondsquared), BaseUnit) { } + Acceleration(decimal meterspersecondsquared) : this(Convert.ToDouble(meterspersecondsquared), BaseUnit) { } #region Properties @@ -156,20 +156,20 @@ public Acceleration(double meterpersecondsquared) /// /// The base unit representation of this quantity for the numeric value stored internally. All conversions go via this value. /// - public static AccelerationUnit BaseUnit => AccelerationUnit.MeterPerSecondSquared; + public static AccelerationUnit BaseUnit => AccelerationUnit.MetersPerSecondSquared; /// /// All units of measurement for the Acceleration quantity. /// public static AccelerationUnit[] Units { get; } = Enum.GetValues(typeof(AccelerationUnit)).Cast().ToArray(); /// - /// Get Acceleration in CentimeterPerSecondSquared. + /// Get Acceleration in CentimetersPerSecondSquared. /// - public double CentimeterPerSecondSquared => As(AccelerationUnit.CentimeterPerSecondSquared); + public double CentimetersPerSecondSquared => As(AccelerationUnit.CentiMetersPerSecondSquared); /// - /// Get Acceleration in DecimeterPerSecondSquared. + /// Get Acceleration in DecimetersPerSecondSquared. /// - public double DecimeterPerSecondSquared => As(AccelerationUnit.DecimeterPerSecondSquared); + public double DecimetersPerSecondSquared => As(AccelerationUnit.DeciMetersPerSecondSquared); /// /// Get Acceleration in FeetPerSecondSquared. /// @@ -179,9 +179,9 @@ public Acceleration(double meterpersecondsquared) /// public double InchesPerSecondSquared => As(AccelerationUnit.InchPerSecondSquared); /// - /// Get Acceleration in KilometerPerSecondSquared. + /// Get Acceleration in KilometersPerSecondSquared. /// - public double KilometerPerSecondSquared => As(AccelerationUnit.KilometerPerSecondSquared); + public double KilometersPerSecondSquared => As(AccelerationUnit.KiloMetersPerSecondSquared); /// /// Get Acceleration in KnotsPerHour. /// @@ -195,21 +195,21 @@ public Acceleration(double meterpersecondsquared) /// public double KnotsPerSecond => As(AccelerationUnit.KnotPerSecond); /// - /// Get Acceleration in MeterPerSecondSquared. + /// Get Acceleration in MetersPerSecondSquared. /// - public double MeterPerSecondSquared => As(AccelerationUnit.MeterPerSecondSquared); + public double MetersPerSecondSquared => As(AccelerationUnit.MetersPerSecondSquared); /// - /// Get Acceleration in MicrometerPerSecondSquared. + /// Get Acceleration in MicrometersPerSecondSquared. /// - public double MicrometerPerSecondSquared => As(AccelerationUnit.MicrometerPerSecondSquared); + public double MicrometersPerSecondSquared => As(AccelerationUnit.MicroMetersPerSecondSquared); /// - /// Get Acceleration in MillimeterPerSecondSquared. + /// Get Acceleration in MillimetersPerSecondSquared. /// - public double MillimeterPerSecondSquared => As(AccelerationUnit.MillimeterPerSecondSquared); + public double MillimetersPerSecondSquared => As(AccelerationUnit.MilliMetersPerSecondSquared); /// - /// Get Acceleration in NanometerPerSecondSquared. + /// Get Acceleration in NanometersPerSecondSquared. /// - public double NanometerPerSecondSquared => As(AccelerationUnit.NanometerPerSecondSquared); + public double NanometersPerSecondSquared => As(AccelerationUnit.NanoMetersPerSecondSquared); /// /// Get Acceleration in StandardGravity. /// @@ -222,31 +222,31 @@ public Acceleration(double meterpersecondsquared) public static Acceleration Zero => new Acceleration(0, BaseUnit); /// - /// Get Acceleration from CentimeterPerSecondSquared. + /// Get Acceleration from CentimetersPerSecondSquared. /// #if WINDOWS_UWP [Windows.Foundation.Metadata.DefaultOverload] - public static Acceleration FromCentimeterPerSecondSquared(double centimeterpersecondsquared) + public static Acceleration FromCentimetersPerSecondSquared(double centimeterspersecondsquared) #else - public static Acceleration FromCentimeterPerSecondSquared(QuantityValue centimeterpersecondsquared) + public static Acceleration FromCentimetersPerSecondSquared(QuantityValue centimeterspersecondsquared) #endif { - double value = (double) centimeterpersecondsquared; - return new Acceleration(value, AccelerationUnit.CentimeterPerSecondSquared); + double value = (double) centimeterspersecondsquared; + return new Acceleration(value, AccelerationUnit.CentiMetersPerSecondSquared); } /// - /// Get Acceleration from DecimeterPerSecondSquared. + /// Get Acceleration from DecimetersPerSecondSquared. /// #if WINDOWS_UWP [Windows.Foundation.Metadata.DefaultOverload] - public static Acceleration FromDecimeterPerSecondSquared(double decimeterpersecondsquared) + public static Acceleration FromDecimetersPerSecondSquared(double decimeterspersecondsquared) #else - public static Acceleration FromDecimeterPerSecondSquared(QuantityValue decimeterpersecondsquared) + public static Acceleration FromDecimetersPerSecondSquared(QuantityValue decimeterspersecondsquared) #endif { - double value = (double) decimeterpersecondsquared; - return new Acceleration(value, AccelerationUnit.DecimeterPerSecondSquared); + double value = (double) decimeterspersecondsquared; + return new Acceleration(value, AccelerationUnit.DeciMetersPerSecondSquared); } /// @@ -278,17 +278,17 @@ public static Acceleration FromInchesPerSecondSquared(QuantityValue inchespersec } /// - /// Get Acceleration from KilometerPerSecondSquared. + /// Get Acceleration from KilometersPerSecondSquared. /// #if WINDOWS_UWP [Windows.Foundation.Metadata.DefaultOverload] - public static Acceleration FromKilometerPerSecondSquared(double kilometerpersecondsquared) + public static Acceleration FromKilometersPerSecondSquared(double kilometerspersecondsquared) #else - public static Acceleration FromKilometerPerSecondSquared(QuantityValue kilometerpersecondsquared) + public static Acceleration FromKilometersPerSecondSquared(QuantityValue kilometerspersecondsquared) #endif { - double value = (double) kilometerpersecondsquared; - return new Acceleration(value, AccelerationUnit.KilometerPerSecondSquared); + double value = (double) kilometerspersecondsquared; + return new Acceleration(value, AccelerationUnit.KiloMetersPerSecondSquared); } /// @@ -334,59 +334,59 @@ public static Acceleration FromKnotsPerSecond(QuantityValue knotspersecond) } /// - /// Get Acceleration from MeterPerSecondSquared. + /// Get Acceleration from MetersPerSecondSquared. /// #if WINDOWS_UWP [Windows.Foundation.Metadata.DefaultOverload] - public static Acceleration FromMeterPerSecondSquared(double meterpersecondsquared) + public static Acceleration FromMetersPerSecondSquared(double meterspersecondsquared) #else - public static Acceleration FromMeterPerSecondSquared(QuantityValue meterpersecondsquared) + public static Acceleration FromMetersPerSecondSquared(QuantityValue meterspersecondsquared) #endif { - double value = (double) meterpersecondsquared; - return new Acceleration(value, AccelerationUnit.MeterPerSecondSquared); + double value = (double) meterspersecondsquared; + return new Acceleration(value, AccelerationUnit.MetersPerSecondSquared); } /// - /// Get Acceleration from MicrometerPerSecondSquared. + /// Get Acceleration from MicrometersPerSecondSquared. /// #if WINDOWS_UWP [Windows.Foundation.Metadata.DefaultOverload] - public static Acceleration FromMicrometerPerSecondSquared(double micrometerpersecondsquared) + public static Acceleration FromMicrometersPerSecondSquared(double micrometerspersecondsquared) #else - public static Acceleration FromMicrometerPerSecondSquared(QuantityValue micrometerpersecondsquared) + public static Acceleration FromMicrometersPerSecondSquared(QuantityValue micrometerspersecondsquared) #endif { - double value = (double) micrometerpersecondsquared; - return new Acceleration(value, AccelerationUnit.MicrometerPerSecondSquared); + double value = (double) micrometerspersecondsquared; + return new Acceleration(value, AccelerationUnit.MicroMetersPerSecondSquared); } /// - /// Get Acceleration from MillimeterPerSecondSquared. + /// Get Acceleration from MillimetersPerSecondSquared. /// #if WINDOWS_UWP [Windows.Foundation.Metadata.DefaultOverload] - public static Acceleration FromMillimeterPerSecondSquared(double millimeterpersecondsquared) + public static Acceleration FromMillimetersPerSecondSquared(double millimeterspersecondsquared) #else - public static Acceleration FromMillimeterPerSecondSquared(QuantityValue millimeterpersecondsquared) + public static Acceleration FromMillimetersPerSecondSquared(QuantityValue millimeterspersecondsquared) #endif { - double value = (double) millimeterpersecondsquared; - return new Acceleration(value, AccelerationUnit.MillimeterPerSecondSquared); + double value = (double) millimeterspersecondsquared; + return new Acceleration(value, AccelerationUnit.MilliMetersPerSecondSquared); } /// - /// Get Acceleration from NanometerPerSecondSquared. + /// Get Acceleration from NanometersPerSecondSquared. /// #if WINDOWS_UWP [Windows.Foundation.Metadata.DefaultOverload] - public static Acceleration FromNanometerPerSecondSquared(double nanometerpersecondsquared) + public static Acceleration FromNanometersPerSecondSquared(double nanometerspersecondsquared) #else - public static Acceleration FromNanometerPerSecondSquared(QuantityValue nanometerpersecondsquared) + public static Acceleration FromNanometersPerSecondSquared(QuantityValue nanometerspersecondsquared) #endif { - double value = (double) nanometerpersecondsquared; - return new Acceleration(value, AccelerationUnit.NanometerPerSecondSquared); + double value = (double) nanometerspersecondsquared; + return new Acceleration(value, AccelerationUnit.NanoMetersPerSecondSquared); } /// @@ -406,13 +406,13 @@ public static Acceleration FromStandardGravity(QuantityValue standardgravity) // Windows Runtime Component does not support nullable types (double?): https://msdn.microsoft.com/en-us/library/br230301.aspx #if !WINDOWS_UWP /// - /// Get nullable Acceleration from nullable CentimeterPerSecondSquared. + /// Get nullable Acceleration from nullable CentimetersPerSecondSquared. /// - public static Acceleration? FromCentimeterPerSecondSquared(QuantityValue? centimeterpersecondsquared) + public static Acceleration? FromCentimetersPerSecondSquared(QuantityValue? centimeterspersecondsquared) { - if (centimeterpersecondsquared.HasValue) + if (centimeterspersecondsquared.HasValue) { - return FromCentimeterPerSecondSquared(centimeterpersecondsquared.Value); + return FromCentimetersPerSecondSquared(centimeterspersecondsquared.Value); } else { @@ -421,13 +421,13 @@ public static Acceleration FromStandardGravity(QuantityValue standardgravity) } /// - /// Get nullable Acceleration from nullable DecimeterPerSecondSquared. + /// Get nullable Acceleration from nullable DecimetersPerSecondSquared. /// - public static Acceleration? FromDecimeterPerSecondSquared(QuantityValue? decimeterpersecondsquared) + public static Acceleration? FromDecimetersPerSecondSquared(QuantityValue? decimeterspersecondsquared) { - if (decimeterpersecondsquared.HasValue) + if (decimeterspersecondsquared.HasValue) { - return FromDecimeterPerSecondSquared(decimeterpersecondsquared.Value); + return FromDecimetersPerSecondSquared(decimeterspersecondsquared.Value); } else { @@ -466,13 +466,13 @@ public static Acceleration FromStandardGravity(QuantityValue standardgravity) } /// - /// Get nullable Acceleration from nullable KilometerPerSecondSquared. + /// Get nullable Acceleration from nullable KilometersPerSecondSquared. /// - public static Acceleration? FromKilometerPerSecondSquared(QuantityValue? kilometerpersecondsquared) + public static Acceleration? FromKilometersPerSecondSquared(QuantityValue? kilometerspersecondsquared) { - if (kilometerpersecondsquared.HasValue) + if (kilometerspersecondsquared.HasValue) { - return FromKilometerPerSecondSquared(kilometerpersecondsquared.Value); + return FromKilometersPerSecondSquared(kilometerspersecondsquared.Value); } else { @@ -526,13 +526,13 @@ public static Acceleration FromStandardGravity(QuantityValue standardgravity) } /// - /// Get nullable Acceleration from nullable MeterPerSecondSquared. + /// Get nullable Acceleration from nullable MetersPerSecondSquared. /// - public static Acceleration? FromMeterPerSecondSquared(QuantityValue? meterpersecondsquared) + public static Acceleration? FromMetersPerSecondSquared(QuantityValue? meterspersecondsquared) { - if (meterpersecondsquared.HasValue) + if (meterspersecondsquared.HasValue) { - return FromMeterPerSecondSquared(meterpersecondsquared.Value); + return FromMetersPerSecondSquared(meterspersecondsquared.Value); } else { @@ -541,13 +541,13 @@ public static Acceleration FromStandardGravity(QuantityValue standardgravity) } /// - /// Get nullable Acceleration from nullable MicrometerPerSecondSquared. + /// Get nullable Acceleration from nullable MicrometersPerSecondSquared. /// - public static Acceleration? FromMicrometerPerSecondSquared(QuantityValue? micrometerpersecondsquared) + public static Acceleration? FromMicrometersPerSecondSquared(QuantityValue? micrometerspersecondsquared) { - if (micrometerpersecondsquared.HasValue) + if (micrometerspersecondsquared.HasValue) { - return FromMicrometerPerSecondSquared(micrometerpersecondsquared.Value); + return FromMicrometersPerSecondSquared(micrometerspersecondsquared.Value); } else { @@ -556,13 +556,13 @@ public static Acceleration FromStandardGravity(QuantityValue standardgravity) } /// - /// Get nullable Acceleration from nullable MillimeterPerSecondSquared. + /// Get nullable Acceleration from nullable MillimetersPerSecondSquared. /// - public static Acceleration? FromMillimeterPerSecondSquared(QuantityValue? millimeterpersecondsquared) + public static Acceleration? FromMillimetersPerSecondSquared(QuantityValue? millimeterspersecondsquared) { - if (millimeterpersecondsquared.HasValue) + if (millimeterspersecondsquared.HasValue) { - return FromMillimeterPerSecondSquared(millimeterpersecondsquared.Value); + return FromMillimetersPerSecondSquared(millimeterspersecondsquared.Value); } else { @@ -571,13 +571,13 @@ public static Acceleration FromStandardGravity(QuantityValue standardgravity) } /// - /// Get nullable Acceleration from nullable NanometerPerSecondSquared. + /// Get nullable Acceleration from nullable NanometersPerSecondSquared. /// - public static Acceleration? FromNanometerPerSecondSquared(QuantityValue? nanometerpersecondsquared) + public static Acceleration? FromNanometersPerSecondSquared(QuantityValue? nanometerspersecondsquared) { - if (nanometerpersecondsquared.HasValue) + if (nanometerspersecondsquared.HasValue) { - return FromNanometerPerSecondSquared(nanometerpersecondsquared.Value); + return FromNanometersPerSecondSquared(nanometerspersecondsquared.Value); } else { @@ -716,7 +716,7 @@ public static string GetAbbreviation( public static double operator /(Acceleration left, Acceleration right) { - return left.MeterPerSecondSquared / right.MeterPerSecondSquared; + return left.MetersPerSecondSquared / right.MetersPerSecondSquared; } #endif @@ -739,7 +739,7 @@ public int CompareTo(object obj) #endif int CompareTo(Acceleration other) { - return AsBaseUnitMeterPerSecondSquared().CompareTo(other.AsBaseUnitMeterPerSecondSquared()); + return AsBaseUnitMetersPerSecondSquared().CompareTo(other.AsBaseUnitMetersPerSecondSquared()); } // Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx @@ -787,7 +787,7 @@ public override bool Equals(object obj) return false; } - return AsBaseUnitMeterPerSecondSquared().Equals(((Acceleration) obj).AsBaseUnitMeterPerSecondSquared()); + return AsBaseUnitMetersPerSecondSquared().Equals(((Acceleration) obj).AsBaseUnitMetersPerSecondSquared()); } /// @@ -800,7 +800,7 @@ public override bool Equals(object obj) /// True if the difference between the two values is not greater than the specified max. public bool Equals(Acceleration other, Acceleration maxError) { - return Math.Abs(AsBaseUnitMeterPerSecondSquared() - other.AsBaseUnitMeterPerSecondSquared()) <= maxError.AsBaseUnitMeterPerSecondSquared(); + return Math.Abs(AsBaseUnitMetersPerSecondSquared() - other.AsBaseUnitMetersPerSecondSquared()) <= maxError.AsBaseUnitMetersPerSecondSquared(); } public override int GetHashCode() @@ -823,22 +823,22 @@ public double As(AccelerationUnit unit) return (double)Value; } - double baseUnitValue = AsBaseUnitMeterPerSecondSquared(); + double baseUnitValue = AsBaseUnitMetersPerSecondSquared(); switch (unit) { - case AccelerationUnit.CentimeterPerSecondSquared: return (baseUnitValue) / 1e-2d; - case AccelerationUnit.DecimeterPerSecondSquared: return (baseUnitValue) / 1e-1d; + case AccelerationUnit.CentiMetersPerSecondSquared: return (baseUnitValue) / 1e-2d; + case AccelerationUnit.DeciMetersPerSecondSquared: return (baseUnitValue) / 1e-1d; case AccelerationUnit.FootPerSecondSquared: return baseUnitValue/0.304800; case AccelerationUnit.InchPerSecondSquared: return baseUnitValue/0.0254; - case AccelerationUnit.KilometerPerSecondSquared: return (baseUnitValue) / 1e3d; + case AccelerationUnit.KiloMetersPerSecondSquared: return (baseUnitValue) / 1e3d; case AccelerationUnit.KnotPerHour: return baseUnitValue/0.5144444444444*3600; case AccelerationUnit.KnotPerMinute: return baseUnitValue/0.5144444444444*60; case AccelerationUnit.KnotPerSecond: return baseUnitValue/0.5144444444444; - case AccelerationUnit.MeterPerSecondSquared: return baseUnitValue; - case AccelerationUnit.MicrometerPerSecondSquared: return (baseUnitValue) / 1e-6d; - case AccelerationUnit.MillimeterPerSecondSquared: return (baseUnitValue) / 1e-3d; - case AccelerationUnit.NanometerPerSecondSquared: return (baseUnitValue) / 1e-9d; + case AccelerationUnit.MetersPerSecondSquared: return baseUnitValue; + case AccelerationUnit.MicroMetersPerSecondSquared: return (baseUnitValue) / 1e-6d; + case AccelerationUnit.MilliMetersPerSecondSquared: return (baseUnitValue) / 1e-3d; + case AccelerationUnit.NanoMetersPerSecondSquared: return (baseUnitValue) / 1e-9d; case AccelerationUnit.StandardGravity: return baseUnitValue/9.80665; default: @@ -927,7 +927,7 @@ public static Acceleration Parse( double parsedValue = double.Parse(value, formatProvider2); AccelerationUnit parsedUnit = ParseUnit(unit, formatProvider2); return From(parsedValue, parsedUnit); - }, (x, y) => FromMeterPerSecondSquared(x.MeterPerSecondSquared + y.MeterPerSecondSquared)); + }, (x, y) => FromMetersPerSecondSquared(x.MetersPerSecondSquared + y.MetersPerSecondSquared)); } /// @@ -1060,9 +1060,9 @@ static AccelerationUnit ParseUnit(string str, IFormatProvider provider = null) [Obsolete("This is no longer used since we will instead use the quantity's Unit value as default.")] /// - /// Set the default unit used by ToString(). Default is MeterPerSecondSquared + /// Set the default unit used by ToString(). Default is MetersPerSecondSquared /// - public static AccelerationUnit ToStringDefaultUnit { get; set; } = AccelerationUnit.MeterPerSecondSquared; + public static AccelerationUnit ToStringDefaultUnit { get; set; } = AccelerationUnit.MetersPerSecondSquared; /// /// Get default string representation of value and unit. @@ -1197,24 +1197,24 @@ public string ToString( /// This is typically the first step in converting from one unit to another. /// /// The value in the base unit representation. - private double AsBaseUnitMeterPerSecondSquared() + private double AsBaseUnitMetersPerSecondSquared() { - if (Unit == AccelerationUnit.MeterPerSecondSquared) { return _value; } + if (Unit == AccelerationUnit.MetersPerSecondSquared) { return _value; } switch (Unit) { - case AccelerationUnit.CentimeterPerSecondSquared: return (_value) * 1e-2d; - case AccelerationUnit.DecimeterPerSecondSquared: return (_value) * 1e-1d; + case AccelerationUnit.CentiMetersPerSecondSquared: return (_value) * 1e-2d; + case AccelerationUnit.DeciMetersPerSecondSquared: return (_value) * 1e-1d; case AccelerationUnit.FootPerSecondSquared: return _value*0.304800; case AccelerationUnit.InchPerSecondSquared: return _value*0.0254; - case AccelerationUnit.KilometerPerSecondSquared: return (_value) * 1e3d; + case AccelerationUnit.KiloMetersPerSecondSquared: return (_value) * 1e3d; case AccelerationUnit.KnotPerHour: return _value*0.5144444444444/3600; case AccelerationUnit.KnotPerMinute: return _value*0.5144444444444/60; case AccelerationUnit.KnotPerSecond: return _value*0.5144444444444; - case AccelerationUnit.MeterPerSecondSquared: return _value; - case AccelerationUnit.MicrometerPerSecondSquared: return (_value) * 1e-6d; - case AccelerationUnit.MillimeterPerSecondSquared: return (_value) * 1e-3d; - case AccelerationUnit.NanometerPerSecondSquared: return (_value) * 1e-9d; + case AccelerationUnit.MetersPerSecondSquared: return _value; + case AccelerationUnit.MicroMetersPerSecondSquared: return (_value) * 1e-6d; + case AccelerationUnit.MilliMetersPerSecondSquared: return (_value) * 1e-3d; + case AccelerationUnit.NanoMetersPerSecondSquared: return (_value) * 1e-9d; case AccelerationUnit.StandardGravity: return _value*9.80665; default: throw new NotImplementedException("Unit not implemented: " + Unit); diff --git a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs index 06c9b46681..eddcd05712 100644 --- a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs +++ b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs @@ -54,12 +54,12 @@ private static readonly ReadOnlyCollection DefaultLocalization new UnitLocalization(typeof (AccelerationUnit), new[] { - new CulturesForEnumValue((int) AccelerationUnit.CentimeterPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.CentiMetersPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "cm/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.DecimeterPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.DeciMetersPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "dm/s²"), @@ -74,7 +74,7 @@ private static readonly ReadOnlyCollection DefaultLocalization { new AbbreviationsForCulture("en-US", "in/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.KilometerPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.KiloMetersPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "km/s²"), @@ -94,22 +94,22 @@ private static readonly ReadOnlyCollection DefaultLocalization { new AbbreviationsForCulture("en-US", "kn/s"), }), - new CulturesForEnumValue((int) AccelerationUnit.MeterPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.MetersPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "m/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.MicrometerPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.MicroMetersPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "µm/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.MillimeterPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.MilliMetersPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "mm/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.NanometerPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.NanoMetersPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "nm/s²"), diff --git a/UnitsNet/GeneratedCode/Units/AccelerationUnit.g.cs b/UnitsNet/GeneratedCode/Units/AccelerationUnit.g.cs index 8e9b8e861e..de41235364 100644 --- a/UnitsNet/GeneratedCode/Units/AccelerationUnit.g.cs +++ b/UnitsNet/GeneratedCode/Units/AccelerationUnit.g.cs @@ -42,18 +42,18 @@ namespace UnitsNet.Units public enum AccelerationUnit { Undefined = 0, - CentimeterPerSecondSquared, - DecimeterPerSecondSquared, + CentiMetersPerSecondSquared, + DeciMetersPerSecondSquared, FootPerSecondSquared, InchPerSecondSquared, - KilometerPerSecondSquared, + KiloMetersPerSecondSquared, KnotPerHour, KnotPerMinute, KnotPerSecond, - MeterPerSecondSquared, - MicrometerPerSecondSquared, - MillimeterPerSecondSquared, - NanometerPerSecondSquared, + MetersPerSecondSquared, + MicroMetersPerSecondSquared, + MilliMetersPerSecondSquared, + NanoMetersPerSecondSquared, StandardGravity, } } diff --git a/UnitsNet/UnitDefinitions/Acceleration.json b/UnitsNet/UnitDefinitions/Acceleration.json index 9d469729e5..6412c827d1 100644 --- a/UnitsNet/UnitDefinitions/Acceleration.json +++ b/UnitsNet/UnitDefinitions/Acceleration.json @@ -1,11 +1,11 @@ { "Name": "Acceleration", - "BaseUnit": "MeterPerSecondSquared", + "BaseUnit": "MetersPerSecondSquared", "XmlDoc": "Acceleration, in physics, is the rate at which the velocity of an object changes over time. An object's acceleration is the net result of any and all forces acting on the object, as described by Newton's Second Law. The SI unit for acceleration is the Meter per second squared (m/s²). Accelerations are vector quantities (they have magnitude and direction) and add according to the parallelogram law. As a vector, the calculated net force is equal to the product of the object's mass (a scalar quantity) and the acceleration.", "Units": [ { - "SingularName": "MeterPerSecondSquared", - "PluralName": "MeterPerSecondSquared", + "SingularName": "MetersPerSecondSquared", + "PluralName": "MetersPerSecondSquared", "FromUnitToBaseFunc": "x", "FromBaseToUnitFunc": "x", "Prefixes": [ "Nano", "Micro", "Milli", "Centi", "Deci", "Kilo" ], From 80a47b9bd75d55a042f5c5808fc6fccb09ebefcc Mon Sep 17 00:00:00 2001 From: Tristan Milnthorp Date: Wed, 2 May 2018 17:17:08 -0400 Subject: [PATCH 2/3] Find replace fix --- .../GeneratedCode/AccelerationTestsBase.g.cs | 138 +++++++++--------- UnitsNet.Tests/UnitSystemTests.cs | 2 +- .../NumberToAccelerationExtensions.g.cs | 12 +- .../Quantities/Acceleration.g.cs | 48 +++--- .../GeneratedCode/UnitSystem.Default.g.cs | 12 +- .../GeneratedCode/Units/AccelerationUnit.g.cs | 12 +- 6 files changed, 112 insertions(+), 112 deletions(-) diff --git a/UnitsNet.Tests/GeneratedCode/AccelerationTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/AccelerationTestsBase.g.cs index 84fd930c76..f26ef6f900 100644 --- a/UnitsNet.Tests/GeneratedCode/AccelerationTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/AccelerationTestsBase.g.cs @@ -85,76 +85,76 @@ public abstract partial class AccelerationTestsBase [Fact] public void MetersPerSecondSquaredToAccelerationUnits() { - Acceleration MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); - AssertEx.EqualTolerance(CentimetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.CentimetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(DecimetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.DecimetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(FeetPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.FeetPerSecondSquared, FeetPerSecondSquaredTolerance); - AssertEx.EqualTolerance(InchesPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.InchesPerSecondSquared, InchesPerSecondSquaredTolerance); - AssertEx.EqualTolerance(KilometersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.KilometersPerSecondSquared, KilometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(KnotsPerHourInOneMetersPerSecondSquared, MetersPerSecondSquared.KnotsPerHour, KnotsPerHourTolerance); - AssertEx.EqualTolerance(KnotsPerMinuteInOneMetersPerSecondSquared, MetersPerSecondSquared.KnotsPerMinute, KnotsPerMinuteTolerance); - AssertEx.EqualTolerance(KnotsPerSecondInOneMetersPerSecondSquared, MetersPerSecondSquared.KnotsPerSecond, KnotsPerSecondTolerance); - AssertEx.EqualTolerance(MetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.MetersPerSecondSquared, MetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(MicrometersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.MicrometersPerSecondSquared, MicrometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(MillimetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.MillimetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(NanometersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.NanometersPerSecondSquared, NanometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(StandardGravityInOneMetersPerSecondSquared, MetersPerSecondSquared.StandardGravity, StandardGravityTolerance); + Acceleration meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + AssertEx.EqualTolerance(CentimetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.CentimetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(DecimetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.DecimetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(FeetPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.FeetPerSecondSquared, FeetPerSecondSquaredTolerance); + AssertEx.EqualTolerance(InchesPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.InchesPerSecondSquared, InchesPerSecondSquaredTolerance); + AssertEx.EqualTolerance(KilometersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.KilometersPerSecondSquared, KilometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(KnotsPerHourInOneMetersPerSecondSquared, meterspersecondsquared.KnotsPerHour, KnotsPerHourTolerance); + AssertEx.EqualTolerance(KnotsPerMinuteInOneMetersPerSecondSquared, meterspersecondsquared.KnotsPerMinute, KnotsPerMinuteTolerance); + AssertEx.EqualTolerance(KnotsPerSecondInOneMetersPerSecondSquared, meterspersecondsquared.KnotsPerSecond, KnotsPerSecondTolerance); + AssertEx.EqualTolerance(MetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.MetersPerSecondSquared, MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(MicrometersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.MicrometersPerSecondSquared, MicrometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(MillimetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.MillimetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(NanometersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.NanometersPerSecondSquared, NanometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(StandardGravityInOneMetersPerSecondSquared, meterspersecondsquared.StandardGravity, StandardGravityTolerance); } [Fact] public void FromValueAndUnit() { - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.CentiMetersPerSecondSquared).CentimetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.DeciMetersPerSecondSquared).DecimetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.CentimetersPerSecondSquared).CentimetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.DecimetersPerSecondSquared).DecimetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.FootPerSecondSquared).FeetPerSecondSquared, FeetPerSecondSquaredTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.InchPerSecondSquared).InchesPerSecondSquared, InchesPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KiloMetersPerSecondSquared).KilometersPerSecondSquared, KilometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KilometersPerSecondSquared).KilometersPerSecondSquared, KilometersPerSecondSquaredTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KnotPerHour).KnotsPerHour, KnotsPerHourTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KnotPerMinute).KnotsPerMinute, KnotsPerMinuteTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KnotPerSecond).KnotsPerSecond, KnotsPerSecondTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MetersPerSecondSquared).MetersPerSecondSquared, MetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MicroMetersPerSecondSquared).MicrometersPerSecondSquared, MicrometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MilliMetersPerSecondSquared).MillimetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.NanoMetersPerSecondSquared).NanometersPerSecondSquared, NanometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MicrometersPerSecondSquared).MicrometersPerSecondSquared, MicrometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MillimetersPerSecondSquared).MillimetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.NanometersPerSecondSquared).NanometersPerSecondSquared, NanometersPerSecondSquaredTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.StandardGravity).StandardGravity, StandardGravityTolerance); } [Fact] public void As() { - var MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); - AssertEx.EqualTolerance(CentimetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.CentiMetersPerSecondSquared), CentimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(DecimetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.DeciMetersPerSecondSquared), DecimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(FeetPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.FootPerSecondSquared), FeetPerSecondSquaredTolerance); - AssertEx.EqualTolerance(InchesPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.InchPerSecondSquared), InchesPerSecondSquaredTolerance); - AssertEx.EqualTolerance(KilometersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.KiloMetersPerSecondSquared), KilometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(KnotsPerHourInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.KnotPerHour), KnotsPerHourTolerance); - AssertEx.EqualTolerance(KnotsPerMinuteInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.KnotPerMinute), KnotsPerMinuteTolerance); - AssertEx.EqualTolerance(KnotsPerSecondInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.KnotPerSecond), KnotsPerSecondTolerance); - AssertEx.EqualTolerance(MetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.MetersPerSecondSquared), MetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(MicrometersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.MicroMetersPerSecondSquared), MicrometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(MillimetersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.MilliMetersPerSecondSquared), MillimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(NanometersPerSecondSquaredInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.NanoMetersPerSecondSquared), NanometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(StandardGravityInOneMetersPerSecondSquared, MetersPerSecondSquared.As(AccelerationUnit.StandardGravity), StandardGravityTolerance); + var meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + AssertEx.EqualTolerance(CentimetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.CentimetersPerSecondSquared), CentimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(DecimetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.DecimetersPerSecondSquared), DecimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(FeetPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.FootPerSecondSquared), FeetPerSecondSquaredTolerance); + AssertEx.EqualTolerance(InchesPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.InchPerSecondSquared), InchesPerSecondSquaredTolerance); + AssertEx.EqualTolerance(KilometersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.KilometersPerSecondSquared), KilometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(KnotsPerHourInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.KnotPerHour), KnotsPerHourTolerance); + AssertEx.EqualTolerance(KnotsPerMinuteInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.KnotPerMinute), KnotsPerMinuteTolerance); + AssertEx.EqualTolerance(KnotsPerSecondInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.KnotPerSecond), KnotsPerSecondTolerance); + AssertEx.EqualTolerance(MetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.MetersPerSecondSquared), MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(MicrometersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.MicrometersPerSecondSquared), MicrometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(MillimetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.MillimetersPerSecondSquared), MillimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(NanometersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.NanometersPerSecondSquared), NanometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(StandardGravityInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.StandardGravity), StandardGravityTolerance); } [Fact] public void ConversionRoundTrip() { - Acceleration MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); - AssertEx.EqualTolerance(1, Acceleration.FromCentimetersPerSecondSquared(MetersPerSecondSquared.CentimetersPerSecondSquared).MetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromDecimetersPerSecondSquared(MetersPerSecondSquared.DecimetersPerSecondSquared).MetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromFeetPerSecondSquared(MetersPerSecondSquared.FeetPerSecondSquared).MetersPerSecondSquared, FeetPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromInchesPerSecondSquared(MetersPerSecondSquared.InchesPerSecondSquared).MetersPerSecondSquared, InchesPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromKilometersPerSecondSquared(MetersPerSecondSquared.KilometersPerSecondSquared).MetersPerSecondSquared, KilometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerHour(MetersPerSecondSquared.KnotsPerHour).MetersPerSecondSquared, KnotsPerHourTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerMinute(MetersPerSecondSquared.KnotsPerMinute).MetersPerSecondSquared, KnotsPerMinuteTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerSecond(MetersPerSecondSquared.KnotsPerSecond).MetersPerSecondSquared, KnotsPerSecondTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromMetersPerSecondSquared(MetersPerSecondSquared.MetersPerSecondSquared).MetersPerSecondSquared, MetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromMicrometersPerSecondSquared(MetersPerSecondSquared.MicrometersPerSecondSquared).MetersPerSecondSquared, MicrometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromMillimetersPerSecondSquared(MetersPerSecondSquared.MillimetersPerSecondSquared).MetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromNanometersPerSecondSquared(MetersPerSecondSquared.NanometersPerSecondSquared).MetersPerSecondSquared, NanometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromStandardGravity(MetersPerSecondSquared.StandardGravity).MetersPerSecondSquared, StandardGravityTolerance); + Acceleration meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + AssertEx.EqualTolerance(1, Acceleration.FromCentimetersPerSecondSquared(meterspersecondsquared.CentimetersPerSecondSquared).MetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromDecimetersPerSecondSquared(meterspersecondsquared.DecimetersPerSecondSquared).MetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromFeetPerSecondSquared(meterspersecondsquared.FeetPerSecondSquared).MetersPerSecondSquared, FeetPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromInchesPerSecondSquared(meterspersecondsquared.InchesPerSecondSquared).MetersPerSecondSquared, InchesPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromKilometersPerSecondSquared(meterspersecondsquared.KilometersPerSecondSquared).MetersPerSecondSquared, KilometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerHour(meterspersecondsquared.KnotsPerHour).MetersPerSecondSquared, KnotsPerHourTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerMinute(meterspersecondsquared.KnotsPerMinute).MetersPerSecondSquared, KnotsPerMinuteTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerSecond(meterspersecondsquared.KnotsPerSecond).MetersPerSecondSquared, KnotsPerSecondTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromMetersPerSecondSquared(meterspersecondsquared.MetersPerSecondSquared).MetersPerSecondSquared, MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromMicrometersPerSecondSquared(meterspersecondsquared.MicrometersPerSecondSquared).MetersPerSecondSquared, MicrometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromMillimetersPerSecondSquared(meterspersecondsquared.MillimetersPerSecondSquared).MetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromNanometersPerSecondSquared(meterspersecondsquared.NanometersPerSecondSquared).MetersPerSecondSquared, NanometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromStandardGravity(meterspersecondsquared.StandardGravity).MetersPerSecondSquared, StandardGravityTolerance); } [Fact] @@ -173,41 +173,41 @@ public void ArithmeticOperators() [Fact] public void ComparisonOperators() { - Acceleration oneMeterPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); + Acceleration oneMetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); Acceleration twoMetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(2); - Assert.True(oneMeterPerSecondSquared < twoMetersPerSecondSquared); - Assert.True(oneMeterPerSecondSquared <= twoMetersPerSecondSquared); - Assert.True(twoMetersPerSecondSquared > oneMeterPerSecondSquared); - Assert.True(twoMetersPerSecondSquared >= oneMeterPerSecondSquared); + Assert.True(oneMetersPerSecondSquared < twoMetersPerSecondSquared); + Assert.True(oneMetersPerSecondSquared <= twoMetersPerSecondSquared); + Assert.True(twoMetersPerSecondSquared > oneMetersPerSecondSquared); + Assert.True(twoMetersPerSecondSquared >= oneMetersPerSecondSquared); - Assert.False(oneMeterPerSecondSquared > twoMetersPerSecondSquared); - Assert.False(oneMeterPerSecondSquared >= twoMetersPerSecondSquared); - Assert.False(twoMetersPerSecondSquared < oneMeterPerSecondSquared); - Assert.False(twoMetersPerSecondSquared <= oneMeterPerSecondSquared); + Assert.False(oneMetersPerSecondSquared > twoMetersPerSecondSquared); + Assert.False(oneMetersPerSecondSquared >= twoMetersPerSecondSquared); + Assert.False(twoMetersPerSecondSquared < oneMetersPerSecondSquared); + Assert.False(twoMetersPerSecondSquared <= oneMetersPerSecondSquared); } [Fact] public void CompareToIsImplemented() { - Acceleration MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); - Assert.Equal(0, MetersPerSecondSquared.CompareTo(MetersPerSecondSquared)); - Assert.True(MetersPerSecondSquared.CompareTo(Acceleration.Zero) > 0); - Assert.True(Acceleration.Zero.CompareTo(MetersPerSecondSquared) < 0); + Acceleration meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.Equal(0, meterspersecondsquared.CompareTo(meterspersecondsquared)); + Assert.True(meterspersecondsquared.CompareTo(Acceleration.Zero) > 0); + Assert.True(Acceleration.Zero.CompareTo(meterspersecondsquared) < 0); } [Fact] public void CompareToThrowsOnTypeMismatch() { - Acceleration MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); - Assert.Throws(() => MetersPerSecondSquared.CompareTo(new object())); + Acceleration meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.Throws(() => meterspersecondsquared.CompareTo(new object())); } [Fact] public void CompareToThrowsOnNull() { - Acceleration MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); - Assert.Throws(() => MetersPerSecondSquared.CompareTo(null)); + Acceleration meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.Throws(() => meterspersecondsquared.CompareTo(null)); } @@ -237,15 +237,15 @@ public void EqualsIsImplemented() [Fact] public void EqualsReturnsFalseOnTypeMismatch() { - Acceleration MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); - Assert.False(MetersPerSecondSquared.Equals(new object())); + Acceleration meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.False(meterspersecondsquared.Equals(new object())); } [Fact] public void EqualsReturnsFalseOnNull() { - Acceleration MetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); - Assert.False(MetersPerSecondSquared.Equals(null)); + Acceleration meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.False(meterspersecondsquared.Equals(null)); } } } diff --git a/UnitsNet.Tests/UnitSystemTests.cs b/UnitsNet.Tests/UnitSystemTests.cs index 8e848343d0..6b0629668d 100644 --- a/UnitsNet.Tests/UnitSystemTests.cs +++ b/UnitsNet.Tests/UnitSystemTests.cs @@ -254,7 +254,7 @@ public void ScientificNotationUpperIntervalFormatting(double value, string expec public void ShouldUseCorrectMicroSign() { // "\u00b5" = Micro sign - Assert.Equal(AccelerationUnit.MicroMetersPerSecondSquared, Acceleration.ParseUnit("\u00b5m/s²")); + Assert.Equal(AccelerationUnit.MicrometersPerSecondSquared, Acceleration.ParseUnit("\u00b5m/s²")); Assert.Equal(AmplitudeRatioUnit.DecibelMicrovolt, AmplitudeRatio.ParseUnit("dB\u00b5V")); Assert.Equal(AngleUnit.Microdegree, Angle.ParseUnit("\u00b5°")); Assert.Equal(AngleUnit.Microradian, Angle.ParseUnit("\u00b5rad")); diff --git a/UnitsNet/GeneratedCode/Extensions/Number/NumberToAccelerationExtensions.g.cs b/UnitsNet/GeneratedCode/Extensions/Number/NumberToAccelerationExtensions.g.cs index 574b8e8c0c..669e807d1f 100644 --- a/UnitsNet/GeneratedCode/Extensions/Number/NumberToAccelerationExtensions.g.cs +++ b/UnitsNet/GeneratedCode/Extensions/Number/NumberToAccelerationExtensions.g.cs @@ -44,7 +44,7 @@ namespace UnitsNet.Extensions.NumberToAcceleration { public static class NumberToAccelerationExtensions { - #region CentiMetersPerSecondSquared + #region CentimetersPerSecondSquared /// public static Acceleration CentimetersPerSecondSquared(this int value) => Acceleration.FromCentimetersPerSecondSquared(value); @@ -78,7 +78,7 @@ public static class NumberToAccelerationExtensions #endregion - #region DeciMetersPerSecondSquared + #region DecimetersPerSecondSquared /// public static Acceleration DecimetersPerSecondSquared(this int value) => Acceleration.FromDecimetersPerSecondSquared(value); @@ -180,7 +180,7 @@ public static class NumberToAccelerationExtensions #endregion - #region KiloMetersPerSecondSquared + #region KilometersPerSecondSquared /// public static Acceleration KilometersPerSecondSquared(this int value) => Acceleration.FromKilometersPerSecondSquared(value); @@ -350,7 +350,7 @@ public static class NumberToAccelerationExtensions #endregion - #region MicroMetersPerSecondSquared + #region MicrometersPerSecondSquared /// public static Acceleration MicrometersPerSecondSquared(this int value) => Acceleration.FromMicrometersPerSecondSquared(value); @@ -384,7 +384,7 @@ public static class NumberToAccelerationExtensions #endregion - #region MilliMetersPerSecondSquared + #region MillimetersPerSecondSquared /// public static Acceleration MillimetersPerSecondSquared(this int value) => Acceleration.FromMillimetersPerSecondSquared(value); @@ -418,7 +418,7 @@ public static class NumberToAccelerationExtensions #endregion - #region NanoMetersPerSecondSquared + #region NanometersPerSecondSquared /// public static Acceleration NanometersPerSecondSquared(this int value) => Acceleration.FromNanometersPerSecondSquared(value); diff --git a/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs b/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs index b1ccabde79..4a459a234e 100644 --- a/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs @@ -165,11 +165,11 @@ public Acceleration(double meterspersecondsquared) /// /// Get Acceleration in CentimetersPerSecondSquared. /// - public double CentimetersPerSecondSquared => As(AccelerationUnit.CentiMetersPerSecondSquared); + public double CentimetersPerSecondSquared => As(AccelerationUnit.CentimetersPerSecondSquared); /// /// Get Acceleration in DecimetersPerSecondSquared. /// - public double DecimetersPerSecondSquared => As(AccelerationUnit.DeciMetersPerSecondSquared); + public double DecimetersPerSecondSquared => As(AccelerationUnit.DecimetersPerSecondSquared); /// /// Get Acceleration in FeetPerSecondSquared. /// @@ -181,7 +181,7 @@ public Acceleration(double meterspersecondsquared) /// /// Get Acceleration in KilometersPerSecondSquared. /// - public double KilometersPerSecondSquared => As(AccelerationUnit.KiloMetersPerSecondSquared); + public double KilometersPerSecondSquared => As(AccelerationUnit.KilometersPerSecondSquared); /// /// Get Acceleration in KnotsPerHour. /// @@ -201,15 +201,15 @@ public Acceleration(double meterspersecondsquared) /// /// Get Acceleration in MicrometersPerSecondSquared. /// - public double MicrometersPerSecondSquared => As(AccelerationUnit.MicroMetersPerSecondSquared); + public double MicrometersPerSecondSquared => As(AccelerationUnit.MicrometersPerSecondSquared); /// /// Get Acceleration in MillimetersPerSecondSquared. /// - public double MillimetersPerSecondSquared => As(AccelerationUnit.MilliMetersPerSecondSquared); + public double MillimetersPerSecondSquared => As(AccelerationUnit.MillimetersPerSecondSquared); /// /// Get Acceleration in NanometersPerSecondSquared. /// - public double NanometersPerSecondSquared => As(AccelerationUnit.NanoMetersPerSecondSquared); + public double NanometersPerSecondSquared => As(AccelerationUnit.NanometersPerSecondSquared); /// /// Get Acceleration in StandardGravity. /// @@ -232,7 +232,7 @@ public static Acceleration FromCentimetersPerSecondSquared(QuantityValue centime #endif { double value = (double) centimeterspersecondsquared; - return new Acceleration(value, AccelerationUnit.CentiMetersPerSecondSquared); + return new Acceleration(value, AccelerationUnit.CentimetersPerSecondSquared); } /// @@ -246,7 +246,7 @@ public static Acceleration FromDecimetersPerSecondSquared(QuantityValue decimete #endif { double value = (double) decimeterspersecondsquared; - return new Acceleration(value, AccelerationUnit.DeciMetersPerSecondSquared); + return new Acceleration(value, AccelerationUnit.DecimetersPerSecondSquared); } /// @@ -288,7 +288,7 @@ public static Acceleration FromKilometersPerSecondSquared(QuantityValue kilomete #endif { double value = (double) kilometerspersecondsquared; - return new Acceleration(value, AccelerationUnit.KiloMetersPerSecondSquared); + return new Acceleration(value, AccelerationUnit.KilometersPerSecondSquared); } /// @@ -358,7 +358,7 @@ public static Acceleration FromMicrometersPerSecondSquared(QuantityValue microme #endif { double value = (double) micrometerspersecondsquared; - return new Acceleration(value, AccelerationUnit.MicroMetersPerSecondSquared); + return new Acceleration(value, AccelerationUnit.MicrometersPerSecondSquared); } /// @@ -372,7 +372,7 @@ public static Acceleration FromMillimetersPerSecondSquared(QuantityValue millime #endif { double value = (double) millimeterspersecondsquared; - return new Acceleration(value, AccelerationUnit.MilliMetersPerSecondSquared); + return new Acceleration(value, AccelerationUnit.MillimetersPerSecondSquared); } /// @@ -386,7 +386,7 @@ public static Acceleration FromNanometersPerSecondSquared(QuantityValue nanomete #endif { double value = (double) nanometerspersecondsquared; - return new Acceleration(value, AccelerationUnit.NanoMetersPerSecondSquared); + return new Acceleration(value, AccelerationUnit.NanometersPerSecondSquared); } /// @@ -827,18 +827,18 @@ public double As(AccelerationUnit unit) switch (unit) { - case AccelerationUnit.CentiMetersPerSecondSquared: return (baseUnitValue) / 1e-2d; - case AccelerationUnit.DeciMetersPerSecondSquared: return (baseUnitValue) / 1e-1d; + case AccelerationUnit.CentimetersPerSecondSquared: return (baseUnitValue) / 1e-2d; + case AccelerationUnit.DecimetersPerSecondSquared: return (baseUnitValue) / 1e-1d; case AccelerationUnit.FootPerSecondSquared: return baseUnitValue/0.304800; case AccelerationUnit.InchPerSecondSquared: return baseUnitValue/0.0254; - case AccelerationUnit.KiloMetersPerSecondSquared: return (baseUnitValue) / 1e3d; + case AccelerationUnit.KilometersPerSecondSquared: return (baseUnitValue) / 1e3d; case AccelerationUnit.KnotPerHour: return baseUnitValue/0.5144444444444*3600; case AccelerationUnit.KnotPerMinute: return baseUnitValue/0.5144444444444*60; case AccelerationUnit.KnotPerSecond: return baseUnitValue/0.5144444444444; case AccelerationUnit.MetersPerSecondSquared: return baseUnitValue; - case AccelerationUnit.MicroMetersPerSecondSquared: return (baseUnitValue) / 1e-6d; - case AccelerationUnit.MilliMetersPerSecondSquared: return (baseUnitValue) / 1e-3d; - case AccelerationUnit.NanoMetersPerSecondSquared: return (baseUnitValue) / 1e-9d; + case AccelerationUnit.MicrometersPerSecondSquared: return (baseUnitValue) / 1e-6d; + case AccelerationUnit.MillimetersPerSecondSquared: return (baseUnitValue) / 1e-3d; + case AccelerationUnit.NanometersPerSecondSquared: return (baseUnitValue) / 1e-9d; case AccelerationUnit.StandardGravity: return baseUnitValue/9.80665; default: @@ -1203,18 +1203,18 @@ private double AsBaseUnitMetersPerSecondSquared() switch (Unit) { - case AccelerationUnit.CentiMetersPerSecondSquared: return (_value) * 1e-2d; - case AccelerationUnit.DeciMetersPerSecondSquared: return (_value) * 1e-1d; + case AccelerationUnit.CentimetersPerSecondSquared: return (_value) * 1e-2d; + case AccelerationUnit.DecimetersPerSecondSquared: return (_value) * 1e-1d; case AccelerationUnit.FootPerSecondSquared: return _value*0.304800; case AccelerationUnit.InchPerSecondSquared: return _value*0.0254; - case AccelerationUnit.KiloMetersPerSecondSquared: return (_value) * 1e3d; + case AccelerationUnit.KilometersPerSecondSquared: return (_value) * 1e3d; case AccelerationUnit.KnotPerHour: return _value*0.5144444444444/3600; case AccelerationUnit.KnotPerMinute: return _value*0.5144444444444/60; case AccelerationUnit.KnotPerSecond: return _value*0.5144444444444; case AccelerationUnit.MetersPerSecondSquared: return _value; - case AccelerationUnit.MicroMetersPerSecondSquared: return (_value) * 1e-6d; - case AccelerationUnit.MilliMetersPerSecondSquared: return (_value) * 1e-3d; - case AccelerationUnit.NanoMetersPerSecondSquared: return (_value) * 1e-9d; + case AccelerationUnit.MicrometersPerSecondSquared: return (_value) * 1e-6d; + case AccelerationUnit.MillimetersPerSecondSquared: return (_value) * 1e-3d; + case AccelerationUnit.NanometersPerSecondSquared: return (_value) * 1e-9d; case AccelerationUnit.StandardGravity: return _value*9.80665; default: throw new NotImplementedException("Unit not implemented: " + Unit); diff --git a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs index eddcd05712..e23036fbe0 100644 --- a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs +++ b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs @@ -54,12 +54,12 @@ private static readonly ReadOnlyCollection DefaultLocalization new UnitLocalization(typeof (AccelerationUnit), new[] { - new CulturesForEnumValue((int) AccelerationUnit.CentiMetersPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.CentimetersPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "cm/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.DeciMetersPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.DecimetersPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "dm/s²"), @@ -74,7 +74,7 @@ private static readonly ReadOnlyCollection DefaultLocalization { new AbbreviationsForCulture("en-US", "in/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.KiloMetersPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.KilometersPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "km/s²"), @@ -99,17 +99,17 @@ private static readonly ReadOnlyCollection DefaultLocalization { new AbbreviationsForCulture("en-US", "m/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.MicroMetersPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.MicrometersPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "µm/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.MilliMetersPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.MillimetersPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "mm/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.NanoMetersPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.NanometersPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "nm/s²"), diff --git a/UnitsNet/GeneratedCode/Units/AccelerationUnit.g.cs b/UnitsNet/GeneratedCode/Units/AccelerationUnit.g.cs index de41235364..c124fa4263 100644 --- a/UnitsNet/GeneratedCode/Units/AccelerationUnit.g.cs +++ b/UnitsNet/GeneratedCode/Units/AccelerationUnit.g.cs @@ -42,18 +42,18 @@ namespace UnitsNet.Units public enum AccelerationUnit { Undefined = 0, - CentiMetersPerSecondSquared, - DeciMetersPerSecondSquared, + CentimetersPerSecondSquared, + DecimetersPerSecondSquared, FootPerSecondSquared, InchPerSecondSquared, - KiloMetersPerSecondSquared, + KilometersPerSecondSquared, KnotPerHour, KnotPerMinute, KnotPerSecond, MetersPerSecondSquared, - MicroMetersPerSecondSquared, - MilliMetersPerSecondSquared, - NanoMetersPerSecondSquared, + MicrometersPerSecondSquared, + MillimetersPerSecondSquared, + NanometersPerSecondSquared, StandardGravity, } } From 1cbc8983b8d76904a6faf11da53e1aa5c1ce800c Mon Sep 17 00:00:00 2001 From: Tristan Milnthorp Date: Mon, 7 May 2018 13:02:55 -0400 Subject: [PATCH 3/3] A bit overagressive with find replace again --- .../CustomCode/AccelerationTests.cs | 26 +-- .../GeneratedCode/AccelerationTestsBase.g.cs | 168 +++++++++--------- UnitsNet.Tests/UnitSystemTests.cs | 2 +- .../NumberToAccelerationExtensions.g.cs | 14 +- .../Quantities/Acceleration.g.cs | 72 ++++---- .../GeneratedCode/UnitSystem.Default.g.cs | 14 +- .../GeneratedCode/Units/AccelerationUnit.g.cs | 14 +- UnitsNet/UnitDefinitions/Acceleration.json | 4 +- 8 files changed, 157 insertions(+), 157 deletions(-) diff --git a/UnitsNet.Tests/CustomCode/AccelerationTests.cs b/UnitsNet.Tests/CustomCode/AccelerationTests.cs index dca7a88613..0f1826b338 100644 --- a/UnitsNet.Tests/CustomCode/AccelerationTests.cs +++ b/UnitsNet.Tests/CustomCode/AccelerationTests.cs @@ -23,30 +23,30 @@ namespace UnitsNet.Tests.CustomCode { public class AccelerationTests : AccelerationTestsBase { - protected override double KilometersPerSecondSquaredInOneMetersPerSecondSquared => 1E-3; + protected override double KilometersPerSecondSquaredInOneMeterPerSecondSquared => 1E-3; - protected override double MetersPerSecondSquaredInOneMetersPerSecondSquared => 1; + protected override double MetersPerSecondSquaredInOneMeterPerSecondSquared => 1; - protected override double DecimetersPerSecondSquaredInOneMetersPerSecondSquared => 1E1; + protected override double DecimetersPerSecondSquaredInOneMeterPerSecondSquared => 1E1; - protected override double CentimetersPerSecondSquaredInOneMetersPerSecondSquared => 1E2; + protected override double CentimetersPerSecondSquaredInOneMeterPerSecondSquared => 1E2; - protected override double MillimetersPerSecondSquaredInOneMetersPerSecondSquared => 1E3; + protected override double MillimetersPerSecondSquaredInOneMeterPerSecondSquared => 1E3; - protected override double MicrometersPerSecondSquaredInOneMetersPerSecondSquared => 1E6; + protected override double MicrometersPerSecondSquaredInOneMeterPerSecondSquared => 1E6; - protected override double NanometersPerSecondSquaredInOneMetersPerSecondSquared => 1E9; + protected override double NanometersPerSecondSquaredInOneMeterPerSecondSquared => 1E9; - protected override double StandardGravityInOneMetersPerSecondSquared => 0.1019727; + protected override double StandardGravityInOneMeterPerSecondSquared => 0.1019727; - protected override double InchesPerSecondSquaredInOneMetersPerSecondSquared => 39.3700787; + protected override double InchesPerSecondSquaredInOneMeterPerSecondSquared => 39.3700787; - protected override double FeetPerSecondSquaredInOneMetersPerSecondSquared => 3.28084; + protected override double FeetPerSecondSquaredInOneMeterPerSecondSquared => 3.28084; - protected override double KnotsPerHourInOneMetersPerSecondSquared => 6.99784017278618E3; + protected override double KnotsPerHourInOneMeterPerSecondSquared => 6.99784017278618E3; - protected override double KnotsPerMinuteInOneMetersPerSecondSquared => 1.16630669546436E2; + protected override double KnotsPerMinuteInOneMeterPerSecondSquared => 1.16630669546436E2; - protected override double KnotsPerSecondInOneMetersPerSecondSquared => 1.94384449244060; + protected override double KnotsPerSecondInOneMeterPerSecondSquared => 1.94384449244060; } } diff --git a/UnitsNet.Tests/GeneratedCode/AccelerationTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/AccelerationTestsBase.g.cs index f26ef6f900..f7b4a7548d 100644 --- a/UnitsNet.Tests/GeneratedCode/AccelerationTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/AccelerationTestsBase.g.cs @@ -52,19 +52,19 @@ namespace UnitsNet.Tests // ReSharper disable once PartialTypeWithSinglePart public abstract partial class AccelerationTestsBase { - protected abstract double CentimetersPerSecondSquaredInOneMetersPerSecondSquared { get; } - protected abstract double DecimetersPerSecondSquaredInOneMetersPerSecondSquared { get; } - protected abstract double FeetPerSecondSquaredInOneMetersPerSecondSquared { get; } - protected abstract double InchesPerSecondSquaredInOneMetersPerSecondSquared { get; } - protected abstract double KilometersPerSecondSquaredInOneMetersPerSecondSquared { get; } - protected abstract double KnotsPerHourInOneMetersPerSecondSquared { get; } - protected abstract double KnotsPerMinuteInOneMetersPerSecondSquared { get; } - protected abstract double KnotsPerSecondInOneMetersPerSecondSquared { get; } - protected abstract double MetersPerSecondSquaredInOneMetersPerSecondSquared { get; } - protected abstract double MicrometersPerSecondSquaredInOneMetersPerSecondSquared { get; } - protected abstract double MillimetersPerSecondSquaredInOneMetersPerSecondSquared { get; } - protected abstract double NanometersPerSecondSquaredInOneMetersPerSecondSquared { get; } - protected abstract double StandardGravityInOneMetersPerSecondSquared { get; } + protected abstract double CentimetersPerSecondSquaredInOneMeterPerSecondSquared { get; } + protected abstract double DecimetersPerSecondSquaredInOneMeterPerSecondSquared { get; } + protected abstract double FeetPerSecondSquaredInOneMeterPerSecondSquared { get; } + protected abstract double InchesPerSecondSquaredInOneMeterPerSecondSquared { get; } + protected abstract double KilometersPerSecondSquaredInOneMeterPerSecondSquared { get; } + protected abstract double KnotsPerHourInOneMeterPerSecondSquared { get; } + protected abstract double KnotsPerMinuteInOneMeterPerSecondSquared { get; } + protected abstract double KnotsPerSecondInOneMeterPerSecondSquared { get; } + protected abstract double MetersPerSecondSquaredInOneMeterPerSecondSquared { get; } + protected abstract double MicrometersPerSecondSquaredInOneMeterPerSecondSquared { get; } + protected abstract double MillimetersPerSecondSquaredInOneMeterPerSecondSquared { get; } + protected abstract double NanometersPerSecondSquaredInOneMeterPerSecondSquared { get; } + protected abstract double StandardGravityInOneMeterPerSecondSquared { get; } // ReSharper disable VirtualMemberNeverOverriden.Global protected virtual double CentimetersPerSecondSquaredTolerance { get { return 1e-5; } } @@ -83,78 +83,78 @@ public abstract partial class AccelerationTestsBase // ReSharper restore VirtualMemberNeverOverriden.Global [Fact] - public void MetersPerSecondSquaredToAccelerationUnits() + public void MeterPerSecondSquaredToAccelerationUnits() { - Acceleration meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); - AssertEx.EqualTolerance(CentimetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.CentimetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(DecimetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.DecimetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(FeetPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.FeetPerSecondSquared, FeetPerSecondSquaredTolerance); - AssertEx.EqualTolerance(InchesPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.InchesPerSecondSquared, InchesPerSecondSquaredTolerance); - AssertEx.EqualTolerance(KilometersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.KilometersPerSecondSquared, KilometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(KnotsPerHourInOneMetersPerSecondSquared, meterspersecondsquared.KnotsPerHour, KnotsPerHourTolerance); - AssertEx.EqualTolerance(KnotsPerMinuteInOneMetersPerSecondSquared, meterspersecondsquared.KnotsPerMinute, KnotsPerMinuteTolerance); - AssertEx.EqualTolerance(KnotsPerSecondInOneMetersPerSecondSquared, meterspersecondsquared.KnotsPerSecond, KnotsPerSecondTolerance); - AssertEx.EqualTolerance(MetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.MetersPerSecondSquared, MetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(MicrometersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.MicrometersPerSecondSquared, MicrometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(MillimetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.MillimetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(NanometersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.NanometersPerSecondSquared, NanometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(StandardGravityInOneMetersPerSecondSquared, meterspersecondsquared.StandardGravity, StandardGravityTolerance); + Acceleration meterpersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + AssertEx.EqualTolerance(CentimetersPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.CentimetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(DecimetersPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.DecimetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(FeetPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.FeetPerSecondSquared, FeetPerSecondSquaredTolerance); + AssertEx.EqualTolerance(InchesPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.InchesPerSecondSquared, InchesPerSecondSquaredTolerance); + AssertEx.EqualTolerance(KilometersPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.KilometersPerSecondSquared, KilometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(KnotsPerHourInOneMeterPerSecondSquared, meterpersecondsquared.KnotsPerHour, KnotsPerHourTolerance); + AssertEx.EqualTolerance(KnotsPerMinuteInOneMeterPerSecondSquared, meterpersecondsquared.KnotsPerMinute, KnotsPerMinuteTolerance); + AssertEx.EqualTolerance(KnotsPerSecondInOneMeterPerSecondSquared, meterpersecondsquared.KnotsPerSecond, KnotsPerSecondTolerance); + AssertEx.EqualTolerance(MetersPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.MetersPerSecondSquared, MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(MicrometersPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.MicrometersPerSecondSquared, MicrometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(MillimetersPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.MillimetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(NanometersPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.NanometersPerSecondSquared, NanometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(StandardGravityInOneMeterPerSecondSquared, meterpersecondsquared.StandardGravity, StandardGravityTolerance); } [Fact] public void FromValueAndUnit() { - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.CentimetersPerSecondSquared).CentimetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.DecimetersPerSecondSquared).DecimetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.CentimeterPerSecondSquared).CentimetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.DecimeterPerSecondSquared).DecimetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.FootPerSecondSquared).FeetPerSecondSquared, FeetPerSecondSquaredTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.InchPerSecondSquared).InchesPerSecondSquared, InchesPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KilometersPerSecondSquared).KilometersPerSecondSquared, KilometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KilometerPerSecondSquared).KilometersPerSecondSquared, KilometersPerSecondSquaredTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KnotPerHour).KnotsPerHour, KnotsPerHourTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KnotPerMinute).KnotsPerMinute, KnotsPerMinuteTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.KnotPerSecond).KnotsPerSecond, KnotsPerSecondTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MetersPerSecondSquared).MetersPerSecondSquared, MetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MicrometersPerSecondSquared).MicrometersPerSecondSquared, MicrometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MillimetersPerSecondSquared).MillimetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.NanometersPerSecondSquared).NanometersPerSecondSquared, NanometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MeterPerSecondSquared).MetersPerSecondSquared, MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MicrometerPerSecondSquared).MicrometersPerSecondSquared, MicrometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.MillimeterPerSecondSquared).MillimetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.NanometerPerSecondSquared).NanometersPerSecondSquared, NanometersPerSecondSquaredTolerance); AssertEx.EqualTolerance(1, Acceleration.From(1, AccelerationUnit.StandardGravity).StandardGravity, StandardGravityTolerance); } [Fact] public void As() { - var meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); - AssertEx.EqualTolerance(CentimetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.CentimetersPerSecondSquared), CentimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(DecimetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.DecimetersPerSecondSquared), DecimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(FeetPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.FootPerSecondSquared), FeetPerSecondSquaredTolerance); - AssertEx.EqualTolerance(InchesPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.InchPerSecondSquared), InchesPerSecondSquaredTolerance); - AssertEx.EqualTolerance(KilometersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.KilometersPerSecondSquared), KilometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(KnotsPerHourInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.KnotPerHour), KnotsPerHourTolerance); - AssertEx.EqualTolerance(KnotsPerMinuteInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.KnotPerMinute), KnotsPerMinuteTolerance); - AssertEx.EqualTolerance(KnotsPerSecondInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.KnotPerSecond), KnotsPerSecondTolerance); - AssertEx.EqualTolerance(MetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.MetersPerSecondSquared), MetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(MicrometersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.MicrometersPerSecondSquared), MicrometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(MillimetersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.MillimetersPerSecondSquared), MillimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(NanometersPerSecondSquaredInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.NanometersPerSecondSquared), NanometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(StandardGravityInOneMetersPerSecondSquared, meterspersecondsquared.As(AccelerationUnit.StandardGravity), StandardGravityTolerance); + var meterpersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + AssertEx.EqualTolerance(CentimetersPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.CentimeterPerSecondSquared), CentimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(DecimetersPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.DecimeterPerSecondSquared), DecimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(FeetPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.FootPerSecondSquared), FeetPerSecondSquaredTolerance); + AssertEx.EqualTolerance(InchesPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.InchPerSecondSquared), InchesPerSecondSquaredTolerance); + AssertEx.EqualTolerance(KilometersPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.KilometerPerSecondSquared), KilometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(KnotsPerHourInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.KnotPerHour), KnotsPerHourTolerance); + AssertEx.EqualTolerance(KnotsPerMinuteInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.KnotPerMinute), KnotsPerMinuteTolerance); + AssertEx.EqualTolerance(KnotsPerSecondInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.KnotPerSecond), KnotsPerSecondTolerance); + AssertEx.EqualTolerance(MetersPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.MeterPerSecondSquared), MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(MicrometersPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.MicrometerPerSecondSquared), MicrometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(MillimetersPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.MillimeterPerSecondSquared), MillimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(NanometersPerSecondSquaredInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.NanometerPerSecondSquared), NanometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(StandardGravityInOneMeterPerSecondSquared, meterpersecondsquared.As(AccelerationUnit.StandardGravity), StandardGravityTolerance); } [Fact] public void ConversionRoundTrip() { - Acceleration meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); - AssertEx.EqualTolerance(1, Acceleration.FromCentimetersPerSecondSquared(meterspersecondsquared.CentimetersPerSecondSquared).MetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromDecimetersPerSecondSquared(meterspersecondsquared.DecimetersPerSecondSquared).MetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromFeetPerSecondSquared(meterspersecondsquared.FeetPerSecondSquared).MetersPerSecondSquared, FeetPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromInchesPerSecondSquared(meterspersecondsquared.InchesPerSecondSquared).MetersPerSecondSquared, InchesPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromKilometersPerSecondSquared(meterspersecondsquared.KilometersPerSecondSquared).MetersPerSecondSquared, KilometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerHour(meterspersecondsquared.KnotsPerHour).MetersPerSecondSquared, KnotsPerHourTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerMinute(meterspersecondsquared.KnotsPerMinute).MetersPerSecondSquared, KnotsPerMinuteTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerSecond(meterspersecondsquared.KnotsPerSecond).MetersPerSecondSquared, KnotsPerSecondTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromMetersPerSecondSquared(meterspersecondsquared.MetersPerSecondSquared).MetersPerSecondSquared, MetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromMicrometersPerSecondSquared(meterspersecondsquared.MicrometersPerSecondSquared).MetersPerSecondSquared, MicrometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromMillimetersPerSecondSquared(meterspersecondsquared.MillimetersPerSecondSquared).MetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromNanometersPerSecondSquared(meterspersecondsquared.NanometersPerSecondSquared).MetersPerSecondSquared, NanometersPerSecondSquaredTolerance); - AssertEx.EqualTolerance(1, Acceleration.FromStandardGravity(meterspersecondsquared.StandardGravity).MetersPerSecondSquared, StandardGravityTolerance); + Acceleration meterpersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + AssertEx.EqualTolerance(1, Acceleration.FromCentimetersPerSecondSquared(meterpersecondsquared.CentimetersPerSecondSquared).MetersPerSecondSquared, CentimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromDecimetersPerSecondSquared(meterpersecondsquared.DecimetersPerSecondSquared).MetersPerSecondSquared, DecimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromFeetPerSecondSquared(meterpersecondsquared.FeetPerSecondSquared).MetersPerSecondSquared, FeetPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromInchesPerSecondSquared(meterpersecondsquared.InchesPerSecondSquared).MetersPerSecondSquared, InchesPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromKilometersPerSecondSquared(meterpersecondsquared.KilometersPerSecondSquared).MetersPerSecondSquared, KilometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerHour(meterpersecondsquared.KnotsPerHour).MetersPerSecondSquared, KnotsPerHourTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerMinute(meterpersecondsquared.KnotsPerMinute).MetersPerSecondSquared, KnotsPerMinuteTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromKnotsPerSecond(meterpersecondsquared.KnotsPerSecond).MetersPerSecondSquared, KnotsPerSecondTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromMetersPerSecondSquared(meterpersecondsquared.MetersPerSecondSquared).MetersPerSecondSquared, MetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromMicrometersPerSecondSquared(meterpersecondsquared.MicrometersPerSecondSquared).MetersPerSecondSquared, MicrometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromMillimetersPerSecondSquared(meterpersecondsquared.MillimetersPerSecondSquared).MetersPerSecondSquared, MillimetersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromNanometersPerSecondSquared(meterpersecondsquared.NanometersPerSecondSquared).MetersPerSecondSquared, NanometersPerSecondSquaredTolerance); + AssertEx.EqualTolerance(1, Acceleration.FromStandardGravity(meterpersecondsquared.StandardGravity).MetersPerSecondSquared, StandardGravityTolerance); } [Fact] @@ -173,41 +173,41 @@ public void ArithmeticOperators() [Fact] public void ComparisonOperators() { - Acceleration oneMetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); + Acceleration oneMeterPerSecondSquared = Acceleration.FromMetersPerSecondSquared(1); Acceleration twoMetersPerSecondSquared = Acceleration.FromMetersPerSecondSquared(2); - Assert.True(oneMetersPerSecondSquared < twoMetersPerSecondSquared); - Assert.True(oneMetersPerSecondSquared <= twoMetersPerSecondSquared); - Assert.True(twoMetersPerSecondSquared > oneMetersPerSecondSquared); - Assert.True(twoMetersPerSecondSquared >= oneMetersPerSecondSquared); + Assert.True(oneMeterPerSecondSquared < twoMetersPerSecondSquared); + Assert.True(oneMeterPerSecondSquared <= twoMetersPerSecondSquared); + Assert.True(twoMetersPerSecondSquared > oneMeterPerSecondSquared); + Assert.True(twoMetersPerSecondSquared >= oneMeterPerSecondSquared); - Assert.False(oneMetersPerSecondSquared > twoMetersPerSecondSquared); - Assert.False(oneMetersPerSecondSquared >= twoMetersPerSecondSquared); - Assert.False(twoMetersPerSecondSquared < oneMetersPerSecondSquared); - Assert.False(twoMetersPerSecondSquared <= oneMetersPerSecondSquared); + Assert.False(oneMeterPerSecondSquared > twoMetersPerSecondSquared); + Assert.False(oneMeterPerSecondSquared >= twoMetersPerSecondSquared); + Assert.False(twoMetersPerSecondSquared < oneMeterPerSecondSquared); + Assert.False(twoMetersPerSecondSquared <= oneMeterPerSecondSquared); } [Fact] public void CompareToIsImplemented() { - Acceleration meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); - Assert.Equal(0, meterspersecondsquared.CompareTo(meterspersecondsquared)); - Assert.True(meterspersecondsquared.CompareTo(Acceleration.Zero) > 0); - Assert.True(Acceleration.Zero.CompareTo(meterspersecondsquared) < 0); + Acceleration meterpersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.Equal(0, meterpersecondsquared.CompareTo(meterpersecondsquared)); + Assert.True(meterpersecondsquared.CompareTo(Acceleration.Zero) > 0); + Assert.True(Acceleration.Zero.CompareTo(meterpersecondsquared) < 0); } [Fact] public void CompareToThrowsOnTypeMismatch() { - Acceleration meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); - Assert.Throws(() => meterspersecondsquared.CompareTo(new object())); + Acceleration meterpersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.Throws(() => meterpersecondsquared.CompareTo(new object())); } [Fact] public void CompareToThrowsOnNull() { - Acceleration meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); - Assert.Throws(() => meterspersecondsquared.CompareTo(null)); + Acceleration meterpersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.Throws(() => meterpersecondsquared.CompareTo(null)); } @@ -237,15 +237,15 @@ public void EqualsIsImplemented() [Fact] public void EqualsReturnsFalseOnTypeMismatch() { - Acceleration meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); - Assert.False(meterspersecondsquared.Equals(new object())); + Acceleration meterpersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.False(meterpersecondsquared.Equals(new object())); } [Fact] public void EqualsReturnsFalseOnNull() { - Acceleration meterspersecondsquared = Acceleration.FromMetersPerSecondSquared(1); - Assert.False(meterspersecondsquared.Equals(null)); + Acceleration meterpersecondsquared = Acceleration.FromMetersPerSecondSquared(1); + Assert.False(meterpersecondsquared.Equals(null)); } } } diff --git a/UnitsNet.Tests/UnitSystemTests.cs b/UnitsNet.Tests/UnitSystemTests.cs index 6b0629668d..e5a97d5924 100644 --- a/UnitsNet.Tests/UnitSystemTests.cs +++ b/UnitsNet.Tests/UnitSystemTests.cs @@ -254,7 +254,7 @@ public void ScientificNotationUpperIntervalFormatting(double value, string expec public void ShouldUseCorrectMicroSign() { // "\u00b5" = Micro sign - Assert.Equal(AccelerationUnit.MicrometersPerSecondSquared, Acceleration.ParseUnit("\u00b5m/s²")); + Assert.Equal(AccelerationUnit.MicrometerPerSecondSquared, Acceleration.ParseUnit("\u00b5m/s²")); Assert.Equal(AmplitudeRatioUnit.DecibelMicrovolt, AmplitudeRatio.ParseUnit("dB\u00b5V")); Assert.Equal(AngleUnit.Microdegree, Angle.ParseUnit("\u00b5°")); Assert.Equal(AngleUnit.Microradian, Angle.ParseUnit("\u00b5rad")); diff --git a/UnitsNet/GeneratedCode/Extensions/Number/NumberToAccelerationExtensions.g.cs b/UnitsNet/GeneratedCode/Extensions/Number/NumberToAccelerationExtensions.g.cs index 669e807d1f..00bc3e4153 100644 --- a/UnitsNet/GeneratedCode/Extensions/Number/NumberToAccelerationExtensions.g.cs +++ b/UnitsNet/GeneratedCode/Extensions/Number/NumberToAccelerationExtensions.g.cs @@ -44,7 +44,7 @@ namespace UnitsNet.Extensions.NumberToAcceleration { public static class NumberToAccelerationExtensions { - #region CentimetersPerSecondSquared + #region CentimeterPerSecondSquared /// public static Acceleration CentimetersPerSecondSquared(this int value) => Acceleration.FromCentimetersPerSecondSquared(value); @@ -78,7 +78,7 @@ public static class NumberToAccelerationExtensions #endregion - #region DecimetersPerSecondSquared + #region DecimeterPerSecondSquared /// public static Acceleration DecimetersPerSecondSquared(this int value) => Acceleration.FromDecimetersPerSecondSquared(value); @@ -180,7 +180,7 @@ public static class NumberToAccelerationExtensions #endregion - #region KilometersPerSecondSquared + #region KilometerPerSecondSquared /// public static Acceleration KilometersPerSecondSquared(this int value) => Acceleration.FromKilometersPerSecondSquared(value); @@ -316,7 +316,7 @@ public static class NumberToAccelerationExtensions #endregion - #region MetersPerSecondSquared + #region MeterPerSecondSquared /// public static Acceleration MetersPerSecondSquared(this int value) => Acceleration.FromMetersPerSecondSquared(value); @@ -350,7 +350,7 @@ public static class NumberToAccelerationExtensions #endregion - #region MicrometersPerSecondSquared + #region MicrometerPerSecondSquared /// public static Acceleration MicrometersPerSecondSquared(this int value) => Acceleration.FromMicrometersPerSecondSquared(value); @@ -384,7 +384,7 @@ public static class NumberToAccelerationExtensions #endregion - #region MillimetersPerSecondSquared + #region MillimeterPerSecondSquared /// public static Acceleration MillimetersPerSecondSquared(this int value) => Acceleration.FromMillimetersPerSecondSquared(value); @@ -418,7 +418,7 @@ public static class NumberToAccelerationExtensions #endregion - #region NanometersPerSecondSquared + #region NanometerPerSecondSquared /// public static Acceleration NanometersPerSecondSquared(this int value) => Acceleration.FromNanometersPerSecondSquared(value); diff --git a/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs b/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs index 4a459a234e..3a9872cd8a 100644 --- a/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs @@ -121,9 +121,9 @@ public Acceleration(double meterspersecondsquared) // Windows Runtime Component does not allow public methods/ctors with same number of parameters: https://msdn.microsoft.com/en-us/library/br230301.aspx#Overloaded methods /// - /// Creates the quantity with the given value assuming the base unit MetersPerSecondSquared. + /// Creates the quantity with the given value assuming the base unit MeterPerSecondSquared. /// - /// Value assuming base unit MetersPerSecondSquared. + /// Value assuming base unit MeterPerSecondSquared. #if WINDOWS_UWP private #else @@ -135,9 +135,9 @@ public Acceleration(double meterspersecondsquared) // Windows Runtime Component does not allow public methods/ctors with same number of parameters: https://msdn.microsoft.com/en-us/library/br230301.aspx#Overloaded methods // Windows Runtime Component does not support decimal type /// - /// Creates the quantity with the given value assuming the base unit MetersPerSecondSquared. + /// Creates the quantity with the given value assuming the base unit MeterPerSecondSquared. /// - /// Value assuming base unit MetersPerSecondSquared. + /// Value assuming base unit MeterPerSecondSquared. #if WINDOWS_UWP private #else @@ -156,7 +156,7 @@ public Acceleration(double meterspersecondsquared) /// /// The base unit representation of this quantity for the numeric value stored internally. All conversions go via this value. /// - public static AccelerationUnit BaseUnit => AccelerationUnit.MetersPerSecondSquared; + public static AccelerationUnit BaseUnit => AccelerationUnit.MeterPerSecondSquared; /// /// All units of measurement for the Acceleration quantity. @@ -165,11 +165,11 @@ public Acceleration(double meterspersecondsquared) /// /// Get Acceleration in CentimetersPerSecondSquared. /// - public double CentimetersPerSecondSquared => As(AccelerationUnit.CentimetersPerSecondSquared); + public double CentimetersPerSecondSquared => As(AccelerationUnit.CentimeterPerSecondSquared); /// /// Get Acceleration in DecimetersPerSecondSquared. /// - public double DecimetersPerSecondSquared => As(AccelerationUnit.DecimetersPerSecondSquared); + public double DecimetersPerSecondSquared => As(AccelerationUnit.DecimeterPerSecondSquared); /// /// Get Acceleration in FeetPerSecondSquared. /// @@ -181,7 +181,7 @@ public Acceleration(double meterspersecondsquared) /// /// Get Acceleration in KilometersPerSecondSquared. /// - public double KilometersPerSecondSquared => As(AccelerationUnit.KilometersPerSecondSquared); + public double KilometersPerSecondSquared => As(AccelerationUnit.KilometerPerSecondSquared); /// /// Get Acceleration in KnotsPerHour. /// @@ -197,19 +197,19 @@ public Acceleration(double meterspersecondsquared) /// /// Get Acceleration in MetersPerSecondSquared. /// - public double MetersPerSecondSquared => As(AccelerationUnit.MetersPerSecondSquared); + public double MetersPerSecondSquared => As(AccelerationUnit.MeterPerSecondSquared); /// /// Get Acceleration in MicrometersPerSecondSquared. /// - public double MicrometersPerSecondSquared => As(AccelerationUnit.MicrometersPerSecondSquared); + public double MicrometersPerSecondSquared => As(AccelerationUnit.MicrometerPerSecondSquared); /// /// Get Acceleration in MillimetersPerSecondSquared. /// - public double MillimetersPerSecondSquared => As(AccelerationUnit.MillimetersPerSecondSquared); + public double MillimetersPerSecondSquared => As(AccelerationUnit.MillimeterPerSecondSquared); /// /// Get Acceleration in NanometersPerSecondSquared. /// - public double NanometersPerSecondSquared => As(AccelerationUnit.NanometersPerSecondSquared); + public double NanometersPerSecondSquared => As(AccelerationUnit.NanometerPerSecondSquared); /// /// Get Acceleration in StandardGravity. /// @@ -232,7 +232,7 @@ public static Acceleration FromCentimetersPerSecondSquared(QuantityValue centime #endif { double value = (double) centimeterspersecondsquared; - return new Acceleration(value, AccelerationUnit.CentimetersPerSecondSquared); + return new Acceleration(value, AccelerationUnit.CentimeterPerSecondSquared); } /// @@ -246,7 +246,7 @@ public static Acceleration FromDecimetersPerSecondSquared(QuantityValue decimete #endif { double value = (double) decimeterspersecondsquared; - return new Acceleration(value, AccelerationUnit.DecimetersPerSecondSquared); + return new Acceleration(value, AccelerationUnit.DecimeterPerSecondSquared); } /// @@ -288,7 +288,7 @@ public static Acceleration FromKilometersPerSecondSquared(QuantityValue kilomete #endif { double value = (double) kilometerspersecondsquared; - return new Acceleration(value, AccelerationUnit.KilometersPerSecondSquared); + return new Acceleration(value, AccelerationUnit.KilometerPerSecondSquared); } /// @@ -344,7 +344,7 @@ public static Acceleration FromMetersPerSecondSquared(QuantityValue meterspersec #endif { double value = (double) meterspersecondsquared; - return new Acceleration(value, AccelerationUnit.MetersPerSecondSquared); + return new Acceleration(value, AccelerationUnit.MeterPerSecondSquared); } /// @@ -358,7 +358,7 @@ public static Acceleration FromMicrometersPerSecondSquared(QuantityValue microme #endif { double value = (double) micrometerspersecondsquared; - return new Acceleration(value, AccelerationUnit.MicrometersPerSecondSquared); + return new Acceleration(value, AccelerationUnit.MicrometerPerSecondSquared); } /// @@ -372,7 +372,7 @@ public static Acceleration FromMillimetersPerSecondSquared(QuantityValue millime #endif { double value = (double) millimeterspersecondsquared; - return new Acceleration(value, AccelerationUnit.MillimetersPerSecondSquared); + return new Acceleration(value, AccelerationUnit.MillimeterPerSecondSquared); } /// @@ -386,7 +386,7 @@ public static Acceleration FromNanometersPerSecondSquared(QuantityValue nanomete #endif { double value = (double) nanometerspersecondsquared; - return new Acceleration(value, AccelerationUnit.NanometersPerSecondSquared); + return new Acceleration(value, AccelerationUnit.NanometerPerSecondSquared); } /// @@ -827,18 +827,18 @@ public double As(AccelerationUnit unit) switch (unit) { - case AccelerationUnit.CentimetersPerSecondSquared: return (baseUnitValue) / 1e-2d; - case AccelerationUnit.DecimetersPerSecondSquared: return (baseUnitValue) / 1e-1d; + case AccelerationUnit.CentimeterPerSecondSquared: return (baseUnitValue) / 1e-2d; + case AccelerationUnit.DecimeterPerSecondSquared: return (baseUnitValue) / 1e-1d; case AccelerationUnit.FootPerSecondSquared: return baseUnitValue/0.304800; case AccelerationUnit.InchPerSecondSquared: return baseUnitValue/0.0254; - case AccelerationUnit.KilometersPerSecondSquared: return (baseUnitValue) / 1e3d; + case AccelerationUnit.KilometerPerSecondSquared: return (baseUnitValue) / 1e3d; case AccelerationUnit.KnotPerHour: return baseUnitValue/0.5144444444444*3600; case AccelerationUnit.KnotPerMinute: return baseUnitValue/0.5144444444444*60; case AccelerationUnit.KnotPerSecond: return baseUnitValue/0.5144444444444; - case AccelerationUnit.MetersPerSecondSquared: return baseUnitValue; - case AccelerationUnit.MicrometersPerSecondSquared: return (baseUnitValue) / 1e-6d; - case AccelerationUnit.MillimetersPerSecondSquared: return (baseUnitValue) / 1e-3d; - case AccelerationUnit.NanometersPerSecondSquared: return (baseUnitValue) / 1e-9d; + case AccelerationUnit.MeterPerSecondSquared: return baseUnitValue; + case AccelerationUnit.MicrometerPerSecondSquared: return (baseUnitValue) / 1e-6d; + case AccelerationUnit.MillimeterPerSecondSquared: return (baseUnitValue) / 1e-3d; + case AccelerationUnit.NanometerPerSecondSquared: return (baseUnitValue) / 1e-9d; case AccelerationUnit.StandardGravity: return baseUnitValue/9.80665; default: @@ -1060,9 +1060,9 @@ static AccelerationUnit ParseUnit(string str, IFormatProvider provider = null) [Obsolete("This is no longer used since we will instead use the quantity's Unit value as default.")] /// - /// Set the default unit used by ToString(). Default is MetersPerSecondSquared + /// Set the default unit used by ToString(). Default is MeterPerSecondSquared /// - public static AccelerationUnit ToStringDefaultUnit { get; set; } = AccelerationUnit.MetersPerSecondSquared; + public static AccelerationUnit ToStringDefaultUnit { get; set; } = AccelerationUnit.MeterPerSecondSquared; /// /// Get default string representation of value and unit. @@ -1199,22 +1199,22 @@ public string ToString( /// The value in the base unit representation. private double AsBaseUnitMetersPerSecondSquared() { - if (Unit == AccelerationUnit.MetersPerSecondSquared) { return _value; } + if (Unit == AccelerationUnit.MeterPerSecondSquared) { return _value; } switch (Unit) { - case AccelerationUnit.CentimetersPerSecondSquared: return (_value) * 1e-2d; - case AccelerationUnit.DecimetersPerSecondSquared: return (_value) * 1e-1d; + case AccelerationUnit.CentimeterPerSecondSquared: return (_value) * 1e-2d; + case AccelerationUnit.DecimeterPerSecondSquared: return (_value) * 1e-1d; case AccelerationUnit.FootPerSecondSquared: return _value*0.304800; case AccelerationUnit.InchPerSecondSquared: return _value*0.0254; - case AccelerationUnit.KilometersPerSecondSquared: return (_value) * 1e3d; + case AccelerationUnit.KilometerPerSecondSquared: return (_value) * 1e3d; case AccelerationUnit.KnotPerHour: return _value*0.5144444444444/3600; case AccelerationUnit.KnotPerMinute: return _value*0.5144444444444/60; case AccelerationUnit.KnotPerSecond: return _value*0.5144444444444; - case AccelerationUnit.MetersPerSecondSquared: return _value; - case AccelerationUnit.MicrometersPerSecondSquared: return (_value) * 1e-6d; - case AccelerationUnit.MillimetersPerSecondSquared: return (_value) * 1e-3d; - case AccelerationUnit.NanometersPerSecondSquared: return (_value) * 1e-9d; + case AccelerationUnit.MeterPerSecondSquared: return _value; + case AccelerationUnit.MicrometerPerSecondSquared: return (_value) * 1e-6d; + case AccelerationUnit.MillimeterPerSecondSquared: return (_value) * 1e-3d; + case AccelerationUnit.NanometerPerSecondSquared: return (_value) * 1e-9d; case AccelerationUnit.StandardGravity: return _value*9.80665; default: throw new NotImplementedException("Unit not implemented: " + Unit); diff --git a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs index e23036fbe0..06c9b46681 100644 --- a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs +++ b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs @@ -54,12 +54,12 @@ private static readonly ReadOnlyCollection DefaultLocalization new UnitLocalization(typeof (AccelerationUnit), new[] { - new CulturesForEnumValue((int) AccelerationUnit.CentimetersPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.CentimeterPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "cm/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.DecimetersPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.DecimeterPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "dm/s²"), @@ -74,7 +74,7 @@ private static readonly ReadOnlyCollection DefaultLocalization { new AbbreviationsForCulture("en-US", "in/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.KilometersPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.KilometerPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "km/s²"), @@ -94,22 +94,22 @@ private static readonly ReadOnlyCollection DefaultLocalization { new AbbreviationsForCulture("en-US", "kn/s"), }), - new CulturesForEnumValue((int) AccelerationUnit.MetersPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.MeterPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "m/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.MicrometersPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.MicrometerPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "µm/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.MillimetersPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.MillimeterPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "mm/s²"), }), - new CulturesForEnumValue((int) AccelerationUnit.NanometersPerSecondSquared, + new CulturesForEnumValue((int) AccelerationUnit.NanometerPerSecondSquared, new[] { new AbbreviationsForCulture("en-US", "nm/s²"), diff --git a/UnitsNet/GeneratedCode/Units/AccelerationUnit.g.cs b/UnitsNet/GeneratedCode/Units/AccelerationUnit.g.cs index c124fa4263..8e9b8e861e 100644 --- a/UnitsNet/GeneratedCode/Units/AccelerationUnit.g.cs +++ b/UnitsNet/GeneratedCode/Units/AccelerationUnit.g.cs @@ -42,18 +42,18 @@ namespace UnitsNet.Units public enum AccelerationUnit { Undefined = 0, - CentimetersPerSecondSquared, - DecimetersPerSecondSquared, + CentimeterPerSecondSquared, + DecimeterPerSecondSquared, FootPerSecondSquared, InchPerSecondSquared, - KilometersPerSecondSquared, + KilometerPerSecondSquared, KnotPerHour, KnotPerMinute, KnotPerSecond, - MetersPerSecondSquared, - MicrometersPerSecondSquared, - MillimetersPerSecondSquared, - NanometersPerSecondSquared, + MeterPerSecondSquared, + MicrometerPerSecondSquared, + MillimeterPerSecondSquared, + NanometerPerSecondSquared, StandardGravity, } } diff --git a/UnitsNet/UnitDefinitions/Acceleration.json b/UnitsNet/UnitDefinitions/Acceleration.json index 6412c827d1..9f76570ce7 100644 --- a/UnitsNet/UnitDefinitions/Acceleration.json +++ b/UnitsNet/UnitDefinitions/Acceleration.json @@ -1,10 +1,10 @@ { "Name": "Acceleration", - "BaseUnit": "MetersPerSecondSquared", + "BaseUnit": "MeterPerSecondSquared", "XmlDoc": "Acceleration, in physics, is the rate at which the velocity of an object changes over time. An object's acceleration is the net result of any and all forces acting on the object, as described by Newton's Second Law. The SI unit for acceleration is the Meter per second squared (m/s²). Accelerations are vector quantities (they have magnitude and direction) and add according to the parallelogram law. As a vector, the calculated net force is equal to the product of the object's mass (a scalar quantity) and the acceleration.", "Units": [ { - "SingularName": "MetersPerSecondSquared", + "SingularName": "MeterPerSecondSquared", "PluralName": "MetersPerSecondSquared", "FromUnitToBaseFunc": "x", "FromBaseToUnitFunc": "x",