diff --git a/UnitsNet.Tests/CustomCode/VolumeTests.cs b/UnitsNet.Tests/CustomCode/VolumeTests.cs index 9d20fde52a..241889b9ab 100644 --- a/UnitsNet.Tests/CustomCode/VolumeTests.cs +++ b/UnitsNet.Tests/CustomCode/VolumeTests.cs @@ -43,6 +43,8 @@ public class VolumeTests : VolumeTestsBase protected override double CubicMillimetersInOneCubicMeter => 1E9; + protected override double CubicMicrometersInOneCubicMeter => 1E18; + protected override double CubicYardsInOneCubicMeter => 1.30795062; protected override double DecilitersInOneCubicMeter => 1E4; diff --git a/UnitsNet.Tests/GeneratedCode/VolumeTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/VolumeTestsBase.g.cs index 97a0f13a8b..ff47f26b60 100644 --- a/UnitsNet.Tests/GeneratedCode/VolumeTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/VolumeTestsBase.g.cs @@ -43,6 +43,7 @@ public abstract partial class VolumeTestsBase protected abstract double CubicInchesInOneCubicMeter { get; } protected abstract double CubicKilometersInOneCubicMeter { get; } protected abstract double CubicMetersInOneCubicMeter { get; } + protected abstract double CubicMicrometersInOneCubicMeter { get; } protected abstract double CubicMilesInOneCubicMeter { get; } protected abstract double CubicMillimetersInOneCubicMeter { get; } protected abstract double CubicYardsInOneCubicMeter { get; } @@ -68,6 +69,7 @@ public abstract partial class VolumeTestsBase protected virtual double CubicInchesTolerance { get { return 1e-5; } } protected virtual double CubicKilometersTolerance { get { return 1e-5; } } protected virtual double CubicMetersTolerance { get { return 1e-5; } } + protected virtual double CubicMicrometersTolerance { get { return 1e-5; } } protected virtual double CubicMilesTolerance { get { return 1e-5; } } protected virtual double CubicMillimetersTolerance { get { return 1e-5; } } protected virtual double CubicYardsTolerance { get { return 1e-5; } } @@ -97,6 +99,7 @@ public void CubicMeterToVolumeUnits() Assert.AreEqual(CubicInchesInOneCubicMeter, cubicmeter.CubicInches, CubicInchesTolerance); Assert.AreEqual(CubicKilometersInOneCubicMeter, cubicmeter.CubicKilometers, CubicKilometersTolerance); Assert.AreEqual(CubicMetersInOneCubicMeter, cubicmeter.CubicMeters, CubicMetersTolerance); + Assert.AreEqual(CubicMicrometersInOneCubicMeter, cubicmeter.CubicMicrometers, CubicMicrometersTolerance); Assert.AreEqual(CubicMilesInOneCubicMeter, cubicmeter.CubicMiles, CubicMilesTolerance); Assert.AreEqual(CubicMillimetersInOneCubicMeter, cubicmeter.CubicMillimeters, CubicMillimetersTolerance); Assert.AreEqual(CubicYardsInOneCubicMeter, cubicmeter.CubicYards, CubicYardsTolerance); @@ -125,6 +128,7 @@ public void FromValueAndUnit() Assert.AreEqual(1, Volume.From(1, VolumeUnit.CubicInch).CubicInches, CubicInchesTolerance); Assert.AreEqual(1, Volume.From(1, VolumeUnit.CubicKilometer).CubicKilometers, CubicKilometersTolerance); Assert.AreEqual(1, Volume.From(1, VolumeUnit.CubicMeter).CubicMeters, CubicMetersTolerance); + Assert.AreEqual(1, Volume.From(1, VolumeUnit.CubicMicrometer).CubicMicrometers, CubicMicrometersTolerance); Assert.AreEqual(1, Volume.From(1, VolumeUnit.CubicMile).CubicMiles, CubicMilesTolerance); Assert.AreEqual(1, Volume.From(1, VolumeUnit.CubicMillimeter).CubicMillimeters, CubicMillimetersTolerance); Assert.AreEqual(1, Volume.From(1, VolumeUnit.CubicYard).CubicYards, CubicYardsTolerance); @@ -154,6 +158,7 @@ public void As() Assert.AreEqual(CubicInchesInOneCubicMeter, cubicmeter.As(VolumeUnit.CubicInch), CubicInchesTolerance); Assert.AreEqual(CubicKilometersInOneCubicMeter, cubicmeter.As(VolumeUnit.CubicKilometer), CubicKilometersTolerance); Assert.AreEqual(CubicMetersInOneCubicMeter, cubicmeter.As(VolumeUnit.CubicMeter), CubicMetersTolerance); + Assert.AreEqual(CubicMicrometersInOneCubicMeter, cubicmeter.As(VolumeUnit.CubicMicrometer), CubicMicrometersTolerance); Assert.AreEqual(CubicMilesInOneCubicMeter, cubicmeter.As(VolumeUnit.CubicMile), CubicMilesTolerance); Assert.AreEqual(CubicMillimetersInOneCubicMeter, cubicmeter.As(VolumeUnit.CubicMillimeter), CubicMillimetersTolerance); Assert.AreEqual(CubicYardsInOneCubicMeter, cubicmeter.As(VolumeUnit.CubicYard), CubicYardsTolerance); @@ -183,6 +188,7 @@ public void ConversionRoundTrip() Assert.AreEqual(1, Volume.FromCubicInches(cubicmeter.CubicInches).CubicMeters, CubicInchesTolerance); Assert.AreEqual(1, Volume.FromCubicKilometers(cubicmeter.CubicKilometers).CubicMeters, CubicKilometersTolerance); Assert.AreEqual(1, Volume.FromCubicMeters(cubicmeter.CubicMeters).CubicMeters, CubicMetersTolerance); + Assert.AreEqual(1, Volume.FromCubicMicrometers(cubicmeter.CubicMicrometers).CubicMeters, CubicMicrometersTolerance); Assert.AreEqual(1, Volume.FromCubicMiles(cubicmeter.CubicMiles).CubicMeters, CubicMilesTolerance); Assert.AreEqual(1, Volume.FromCubicMillimeters(cubicmeter.CubicMillimeters).CubicMeters, CubicMillimetersTolerance); Assert.AreEqual(1, Volume.FromCubicYards(cubicmeter.CubicYards).CubicMeters, CubicYardsTolerance); diff --git a/UnitsNet/GeneratedCode/Enums/VolumeUnit.g.cs b/UnitsNet/GeneratedCode/Enums/VolumeUnit.g.cs index 36e409a7d3..16741221c6 100644 --- a/UnitsNet/GeneratedCode/Enums/VolumeUnit.g.cs +++ b/UnitsNet/GeneratedCode/Enums/VolumeUnit.g.cs @@ -32,6 +32,7 @@ public enum VolumeUnit CubicInch, CubicKilometer, CubicMeter, + CubicMicrometer, CubicMile, CubicMillimeter, CubicYard, diff --git a/UnitsNet/GeneratedCode/UnitClasses/Volume.g.cs b/UnitsNet/GeneratedCode/UnitClasses/Volume.g.cs index 53d824909f..d2fc288bff 100644 --- a/UnitsNet/GeneratedCode/UnitClasses/Volume.g.cs +++ b/UnitsNet/GeneratedCode/UnitClasses/Volume.g.cs @@ -110,6 +110,14 @@ public double CubicMeters get { return _cubicMeters; } } + /// + /// Get Volume in CubicMicrometers. + /// + public double CubicMicrometers + { + get { return _cubicMeters*1e18; } + } + /// /// Get Volume in CubicMiles. /// @@ -303,6 +311,14 @@ public static Volume FromCubicMeters(double cubicmeters) return new Volume(cubicmeters); } + /// + /// Get Volume from CubicMicrometers. + /// + public static Volume FromCubicMicrometers(double cubicmicrometers) + { + return new Volume(cubicmicrometers/1e18); + } + /// /// Get Volume from CubicMiles. /// @@ -456,6 +472,8 @@ public static Volume From(double value, VolumeUnit fromUnit) return FromCubicKilometers(value); case VolumeUnit.CubicMeter: return FromCubicMeters(value); + case VolumeUnit.CubicMicrometer: + return FromCubicMicrometers(value); case VolumeUnit.CubicMile: return FromCubicMiles(value); case VolumeUnit.CubicMillimeter: @@ -635,6 +653,8 @@ public double As(VolumeUnit unit) return CubicKilometers; case VolumeUnit.CubicMeter: return CubicMeters; + case VolumeUnit.CubicMicrometer: + return CubicMicrometers; case VolumeUnit.CubicMile: return CubicMiles; case VolumeUnit.CubicMillimeter: diff --git a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs index 34f44e565c..36d0f6fe45 100644 --- a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs +++ b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs @@ -1911,6 +1911,12 @@ private static readonly ReadOnlyCollection DefaultLocalization new AbbreviationsForCulture("en-US", "m³"), new AbbreviationsForCulture("ru-RU", "м³"), }), + new CulturesForEnumValue((int) VolumeUnit.CubicMicrometer, + new[] + { + new AbbreviationsForCulture("en-US", "µm³"), + new AbbreviationsForCulture("ru-RU", "мкм³"), + }), new CulturesForEnumValue((int) VolumeUnit.CubicMile, new[] { diff --git a/UnitsNet/Scripts/UnitDefinitions/Volume.json b/UnitsNet/Scripts/UnitDefinitions/Volume.json index 2f191efcb9..f1a49ec419 100644 --- a/UnitsNet/Scripts/UnitDefinitions/Volume.json +++ b/UnitsNet/Scripts/UnitDefinitions/Volume.json @@ -101,6 +101,22 @@ } ] }, + { + "SingularName": "CubicMicrometer", + "PluralName": "CubicMicrometers", + "FromUnitToBaseFunc": "x/1e18", + "FromBaseToUnitFunc": "x*1e18", + "Localization": [ + { + "Culture": "en-US", + "Abbreviations": ["µm³"] + }, + { + "Culture": "ru-RU", + "Abbreviations": ["мкм³"] + } + ] + }, { "SingularName": "CubicMile", "PluralName": "CubicMiles", @@ -287,10 +303,10 @@ "FromUnitToBaseFunc": "x*0.0002365882365", "FromBaseToUnitFunc": "x/0.0002365882365", "Localization": [ - { - "Culture": "en-US", - "Abbreviations": [] - } + { + "Culture": "en-US", + "Abbreviations": [ ] + } ] }, {