Skip to content

Commit 0d943b7

Browse files
angularsenangularsen
committed
Merge pull request #138 from AgileoAutomation/add-CubicMicrometer-Unit
Add cubic micrometer unit
2 parents 268b30a + 68e67b2 commit 0d943b7

File tree

6 files changed

+55
-4
lines changed

6 files changed

+55
-4
lines changed

‎UnitsNet.Tests/CustomCode/VolumeTests.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ public class VolumeTests : VolumeTestsBase
4343

4444
protected override double CubicMillimetersInOneCubicMeter => 1E9;
4545

46+
protected override double CubicMicrometersInOneCubicMeter => 1E18;
47+
4648
protected override double CubicYardsInOneCubicMeter => 1.30795062;
4749

4850
protected override double DecilitersInOneCubicMeter => 1E4;

‎UnitsNet.Tests/GeneratedCode/VolumeTestsBase.g.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public abstract partial class VolumeTestsBase
4343
protected abstract double CubicInchesInOneCubicMeter { get; }
4444
protected abstract double CubicKilometersInOneCubicMeter { get; }
4545
protected abstract double CubicMetersInOneCubicMeter { get; }
46+
protected abstract double CubicMicrometersInOneCubicMeter { get; }
4647
protected abstract double CubicMilesInOneCubicMeter { get; }
4748
protected abstract double CubicMillimetersInOneCubicMeter { get; }
4849
protected abstract double CubicYardsInOneCubicMeter { get; }
@@ -68,6 +69,7 @@ public abstract partial class VolumeTestsBase
6869
protected virtual double CubicInchesTolerance { get { return 1e-5; } }
6970
protected virtual double CubicKilometersTolerance { get { return 1e-5; } }
7071
protected virtual double CubicMetersTolerance { get { return 1e-5; } }
72+
protected virtual double CubicMicrometersTolerance { get { return 1e-5; } }
7173
protected virtual double CubicMilesTolerance { get { return 1e-5; } }
7274
protected virtual double CubicMillimetersTolerance { get { return 1e-5; } }
7375
protected virtual double CubicYardsTolerance { get { return 1e-5; } }
@@ -97,6 +99,7 @@ public void CubicMeterToVolumeUnits()
9799
Assert.AreEqual(CubicInchesInOneCubicMeter, cubicmeter.CubicInches, CubicInchesTolerance);
98100
Assert.AreEqual(CubicKilometersInOneCubicMeter, cubicmeter.CubicKilometers, CubicKilometersTolerance);
99101
Assert.AreEqual(CubicMetersInOneCubicMeter, cubicmeter.CubicMeters, CubicMetersTolerance);
102+
Assert.AreEqual(CubicMicrometersInOneCubicMeter, cubicmeter.CubicMicrometers, CubicMicrometersTolerance);
100103
Assert.AreEqual(CubicMilesInOneCubicMeter, cubicmeter.CubicMiles, CubicMilesTolerance);
101104
Assert.AreEqual(CubicMillimetersInOneCubicMeter, cubicmeter.CubicMillimeters, CubicMillimetersTolerance);
102105
Assert.AreEqual(CubicYardsInOneCubicMeter, cubicmeter.CubicYards, CubicYardsTolerance);
@@ -125,6 +128,7 @@ public void FromValueAndUnit()
125128
Assert.AreEqual(1, Volume.From(1, VolumeUnit.CubicInch).CubicInches, CubicInchesTolerance);
126129
Assert.AreEqual(1, Volume.From(1, VolumeUnit.CubicKilometer).CubicKilometers, CubicKilometersTolerance);
127130
Assert.AreEqual(1, Volume.From(1, VolumeUnit.CubicMeter).CubicMeters, CubicMetersTolerance);
131+
Assert.AreEqual(1, Volume.From(1, VolumeUnit.CubicMicrometer).CubicMicrometers, CubicMicrometersTolerance);
128132
Assert.AreEqual(1, Volume.From(1, VolumeUnit.CubicMile).CubicMiles, CubicMilesTolerance);
129133
Assert.AreEqual(1, Volume.From(1, VolumeUnit.CubicMillimeter).CubicMillimeters, CubicMillimetersTolerance);
130134
Assert.AreEqual(1, Volume.From(1, VolumeUnit.CubicYard).CubicYards, CubicYardsTolerance);
@@ -154,6 +158,7 @@ public void As()
154158
Assert.AreEqual(CubicInchesInOneCubicMeter, cubicmeter.As(VolumeUnit.CubicInch), CubicInchesTolerance);
155159
Assert.AreEqual(CubicKilometersInOneCubicMeter, cubicmeter.As(VolumeUnit.CubicKilometer), CubicKilometersTolerance);
156160
Assert.AreEqual(CubicMetersInOneCubicMeter, cubicmeter.As(VolumeUnit.CubicMeter), CubicMetersTolerance);
161+
Assert.AreEqual(CubicMicrometersInOneCubicMeter, cubicmeter.As(VolumeUnit.CubicMicrometer), CubicMicrometersTolerance);
157162
Assert.AreEqual(CubicMilesInOneCubicMeter, cubicmeter.As(VolumeUnit.CubicMile), CubicMilesTolerance);
158163
Assert.AreEqual(CubicMillimetersInOneCubicMeter, cubicmeter.As(VolumeUnit.CubicMillimeter), CubicMillimetersTolerance);
159164
Assert.AreEqual(CubicYardsInOneCubicMeter, cubicmeter.As(VolumeUnit.CubicYard), CubicYardsTolerance);
@@ -183,6 +188,7 @@ public void ConversionRoundTrip()
183188
Assert.AreEqual(1, Volume.FromCubicInches(cubicmeter.CubicInches).CubicMeters, CubicInchesTolerance);
184189
Assert.AreEqual(1, Volume.FromCubicKilometers(cubicmeter.CubicKilometers).CubicMeters, CubicKilometersTolerance);
185190
Assert.AreEqual(1, Volume.FromCubicMeters(cubicmeter.CubicMeters).CubicMeters, CubicMetersTolerance);
191+
Assert.AreEqual(1, Volume.FromCubicMicrometers(cubicmeter.CubicMicrometers).CubicMeters, CubicMicrometersTolerance);
186192
Assert.AreEqual(1, Volume.FromCubicMiles(cubicmeter.CubicMiles).CubicMeters, CubicMilesTolerance);
187193
Assert.AreEqual(1, Volume.FromCubicMillimeters(cubicmeter.CubicMillimeters).CubicMeters, CubicMillimetersTolerance);
188194
Assert.AreEqual(1, Volume.FromCubicYards(cubicmeter.CubicYards).CubicMeters, CubicYardsTolerance);

‎UnitsNet/GeneratedCode/Enums/VolumeUnit.g.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public enum VolumeUnit
3232
CubicInch,
3333
CubicKilometer,
3434
CubicMeter,
35+
CubicMicrometer,
3536
CubicMile,
3637
CubicMillimeter,
3738
CubicYard,

‎UnitsNet/GeneratedCode/UnitClasses/Volume.g.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,14 @@ public double CubicMeters
110110
get { return _cubicMeters; }
111111
}
112112

113+
/// <summary>
114+
/// Get Volume in CubicMicrometers.
115+
/// </summary>
116+
public double CubicMicrometers
117+
{
118+
get { return _cubicMeters*1e18; }
119+
}
120+
113121
/// <summary>
114122
/// Get Volume in CubicMiles.
115123
/// </summary>
@@ -303,6 +311,14 @@ public static Volume FromCubicMeters(double cubicmeters)
303311
return new Volume(cubicmeters);
304312
}
305313

314+
/// <summary>
315+
/// Get Volume from CubicMicrometers.
316+
/// </summary>
317+
public static Volume FromCubicMicrometers(double cubicmicrometers)
318+
{
319+
return new Volume(cubicmicrometers/1e18);
320+
}
321+
306322
/// <summary>
307323
/// Get Volume from CubicMiles.
308324
/// </summary>
@@ -456,6 +472,8 @@ public static Volume From(double value, VolumeUnit fromUnit)
456472
return FromCubicKilometers(value);
457473
case VolumeUnit.CubicMeter:
458474
return FromCubicMeters(value);
475+
case VolumeUnit.CubicMicrometer:
476+
return FromCubicMicrometers(value);
459477
case VolumeUnit.CubicMile:
460478
return FromCubicMiles(value);
461479
case VolumeUnit.CubicMillimeter:
@@ -635,6 +653,8 @@ public double As(VolumeUnit unit)
635653
return CubicKilometers;
636654
case VolumeUnit.CubicMeter:
637655
return CubicMeters;
656+
case VolumeUnit.CubicMicrometer:
657+
return CubicMicrometers;
638658
case VolumeUnit.CubicMile:
639659
return CubicMiles;
640660
case VolumeUnit.CubicMillimeter:

‎UnitsNet/GeneratedCode/UnitSystem.Default.g.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1911,6 +1911,12 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
19111911
new AbbreviationsForCulture("en-US", "m³"),
19121912
new AbbreviationsForCulture("ru-RU", "м³"),
19131913
}),
1914+
new CulturesForEnumValue((int) VolumeUnit.CubicMicrometer,
1915+
new[]
1916+
{
1917+
new AbbreviationsForCulture("en-US", "µm³"),
1918+
new AbbreviationsForCulture("ru-RU", "мкм³"),
1919+
}),
19141920
new CulturesForEnumValue((int) VolumeUnit.CubicMile,
19151921
new[]
19161922
{

‎UnitsNet/Scripts/UnitDefinitions/Volume.json‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,22 @@
101101
}
102102
]
103103
},
104+
{
105+
"SingularName": "CubicMicrometer",
106+
"PluralName": "CubicMicrometers",
107+
"FromUnitToBaseFunc": "x/1e18",
108+
"FromBaseToUnitFunc": "x*1e18",
109+
"Localization": [
110+
{
111+
"Culture": "en-US",
112+
"Abbreviations": ["µm³"]
113+
},
114+
{
115+
"Culture": "ru-RU",
116+
"Abbreviations": ["мкм³"]
117+
}
118+
]
119+
},
104120
{
105121
"SingularName": "CubicMile",
106122
"PluralName": "CubicMiles",
@@ -287,10 +303,10 @@
287303
"FromUnitToBaseFunc": "x*0.0002365882365",
288304
"FromBaseToUnitFunc": "x/0.0002365882365",
289305
"Localization": [
290-
{
291-
"Culture": "en-US",
292-
"Abbreviations": []
293-
}
306+
{
307+
"Culture": "en-US",
308+
"Abbreviations": [ ]
309+
}
294310
]
295311
},
296312
{

0 commit comments

Comments
 (0)