Skip to content

Commit 3a106ac

Browse files
authored
VolumeConcentration: fix the SingularName for LiterPerLiter and LiterPerMilliliter (#1504)
fixes the `VolumeConcentration` units `LitersPerLiter` and `LitersPerMilliliter` (using the _PluralName_ for the `SingularName` property)
1 parent 143f087 commit 3a106ac

File tree

10 files changed

+498
-498
lines changed

10 files changed

+498
-498
lines changed

Common/UnitDefinitions/VolumeConcentration.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
]
1818
},
1919
{
20-
"SingularName": "LitersPerLiter",
20+
"SingularName": "LiterPerLiter",
2121
"PluralName": "LitersPerLiter",
2222
"FromUnitToBaseFunc": "{x}",
2323
"FromBaseToUnitFunc": "{x}",
@@ -30,7 +30,7 @@
3030
]
3131
},
3232
{
33-
"SingularName": "LitersPerMilliliter",
33+
"SingularName": "LiterPerMilliliter",
3434
"PluralName": "LitersPerMilliliter",
3535
"FromUnitToBaseFunc": "{x} / 1e-3",
3636
"FromBaseToUnitFunc": "{x} * 1e-3",

Common/UnitEnumValues.g.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,26 +1579,26 @@
15791579
"ImperialQuart": 57
15801580
},
15811581
"VolumeConcentration": {
1582-
"CentilitersPerLiter": 1,
1583-
"CentilitersPerMilliliter": 2,
1584-
"DecilitersPerLiter": 3,
1585-
"DecilitersPerMilliliter": 4,
1582+
"CentiliterPerLiter": 1,
1583+
"CentiliterPerMilliliter": 2,
1584+
"DeciliterPerLiter": 3,
1585+
"DeciliterPerMilliliter": 4,
15861586
"DecimalFraction": 5,
1587-
"LitersPerLiter": 6,
1588-
"LitersPerMilliliter": 7,
1589-
"MicrolitersPerLiter": 8,
1590-
"MicrolitersPerMilliliter": 9,
1591-
"MillilitersPerLiter": 10,
1592-
"MillilitersPerMilliliter": 11,
1593-
"NanolitersPerLiter": 12,
1594-
"NanolitersPerMilliliter": 13,
1587+
"LiterPerLiter": 6,
1588+
"LiterPerMilliliter": 7,
1589+
"MicroliterPerLiter": 8,
1590+
"MicroliterPerMilliliter": 9,
1591+
"MilliliterPerLiter": 10,
1592+
"MilliliterPerMilliliter": 11,
1593+
"NanoliterPerLiter": 12,
1594+
"NanoliterPerMilliliter": 13,
15951595
"PartPerBillion": 14,
15961596
"PartPerMillion": 15,
15971597
"PartPerThousand": 16,
15981598
"PartPerTrillion": 17,
15991599
"Percent": 18,
1600-
"PicolitersPerLiter": 19,
1601-
"PicolitersPerMilliliter": 20
1600+
"PicoliterPerLiter": 19,
1601+
"PicoliterPerMilliliter": 20
16021602
},
16031603
"VolumeFlow": {
16041604
"AcreFootPerDay": 1,

UnitsNet.NanoFramework/GeneratedCode/Quantities/VolumeConcentration.g.cs

Lines changed: 84 additions & 84 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet.NanoFramework/GeneratedCode/Units/VolumeConcentrationUnit.g.cs

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnitsNet.Tests/CustomCode/MolarityTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class MolarityTests : MolarityTestsBase
5050
[InlineData(0.5, MolarityUnit.MolePerLiter,
5151
KnownQuantities.DensityOfEthanolInKgPerCubicMeter, DensityUnit.KilogramPerCubicMeter,
5252
KnownQuantities.MolarMassOfEthanolInGramsPerMole, MolarMassUnit.GramPerMole,
53-
29.19419518377693, VolumeConcentrationUnit.MillilitersPerLiter)] // 0.5M ethanol
53+
29.19419518377693, VolumeConcentrationUnit.MilliliterPerLiter)] // 0.5M ethanol
5454
public void VolumeConcentrationFromComponentDensityAndMolarity(
5555
double molarityValue, MolarityUnit molarityUnit,
5656
double componentDensityValue, DensityUnit componentDensityUnit,

UnitsNet.Tests/CustomCode/VolumeConcentrationTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class VolumeConcentrationTests : VolumeConcentrationTestsBase
6060
[InlineData(50, VolumeConcentrationUnit.Percent,
6161
10, DensityUnit.GramPerCubicMeter,
6262
5, MassConcentrationUnit.GramPerCubicMeter)] // synthetic data
63-
[InlineData(29.19419518377693, VolumeConcentrationUnit.MillilitersPerLiter,
63+
[InlineData(29.19419518377693, VolumeConcentrationUnit.MilliliterPerLiter,
6464
KnownQuantities.DensityOfEthanolInKgPerCubicMeter, DensityUnit.KilogramPerCubicMeter,
6565
23.03422, MassConcentrationUnit.GramPerLiter)] // 29.19419518377693 = VolumeConcentration_0_5M_Ethanol
6666
public void MassConcentrationFromVolumeConcentrationAndComponentDensity(
@@ -78,7 +78,7 @@ public void MassConcentrationFromVolumeConcentrationAndComponentDensity(
7878
}
7979

8080
[Theory]
81-
[InlineData(29.19419518377693, VolumeConcentrationUnit.MillilitersPerLiter,
81+
[InlineData(29.19419518377693, VolumeConcentrationUnit.MilliliterPerLiter,
8282
KnownQuantities.DensityOfEthanolInKgPerCubicMeter, DensityUnit.KilogramPerCubicMeter,
8383
KnownQuantities.MolarMassOfEthanolInGramsPerMole, MolarMassUnit.GramPerMole,
8484
0.5, MolarityUnit.MolePerLiter)] // 29.19419518377693 = VolumeConcentration_0_5M_Ethanol

UnitsNet.Tests/GeneratedCode/IQuantityTests.g.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)