Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VolumeConcentration: fix the SingularName for LiterPerLiter and LiterPerMilliliter #1504

Open
wants to merge 1 commit into
base: release/v6
Choose a base branch
from
Open

VolumeConcentration: fix the SingularName for LiterPerLiter and LiterPerMilliliter #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Common/UnitDefinitions/VolumeConcentration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
]
},
{
"SingularName": "LitersPerLiter",
"SingularName": "LiterPerLiter",
"PluralName": "LitersPerLiter",
"FromUnitToBaseFunc": "{x}",
"FromBaseToUnitFunc": "{x}",
Expand All @@ -30,7 +30,7 @@
]
},
{
"SingularName": "LitersPerMilliliter",
"SingularName": "LiterPerMilliliter",
"PluralName": "LitersPerMilliliter",
"FromUnitToBaseFunc": "{x} / 1e-3",
"FromBaseToUnitFunc": "{x} * 1e-3",
Expand Down
28 changes: 14 additions & 14 deletions Common/UnitEnumValues.g.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1579,26 +1579,26 @@
"ImperialQuart": 57
},
"VolumeConcentration": {
"CentilitersPerLiter": 1,
"CentilitersPerMilliliter": 2,
"DecilitersPerLiter": 3,
"DecilitersPerMilliliter": 4,
"CentiliterPerLiter": 1,
"CentiliterPerMilliliter": 2,
"DeciliterPerLiter": 3,
"DeciliterPerMilliliter": 4,
"DecimalFraction": 5,
"LitersPerLiter": 6,
"LitersPerMilliliter": 7,
"MicrolitersPerLiter": 8,
"MicrolitersPerMilliliter": 9,
"MillilitersPerLiter": 10,
"MillilitersPerMilliliter": 11,
"NanolitersPerLiter": 12,
"NanolitersPerMilliliter": 13,
"LiterPerLiter": 6,
"LiterPerMilliliter": 7,
"MicroliterPerLiter": 8,
"MicroliterPerMilliliter": 9,
"MilliliterPerLiter": 10,
"MilliliterPerMilliliter": 11,
"NanoliterPerLiter": 12,
"NanoliterPerMilliliter": 13,
"PartPerBillion": 14,
"PartPerMillion": 15,
"PartPerThousand": 16,
"PartPerTrillion": 17,
"Percent": 18,
"PicolitersPerLiter": 19,
"PicolitersPerMilliliter": 20
"PicoliterPerLiter": 19,
"PicoliterPerMilliliter": 20
},
"VolumeFlow": {
"AcreFootPerDay": 1,
Expand Down
168 changes: 84 additions & 84 deletions UnitsNet.NanoFramework/GeneratedCode/Quantities/VolumeConcentration.g.cs
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions UnitsNet.NanoFramework/GeneratedCode/Units/VolumeConcentrationUnit.g.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion UnitsNet.Tests/CustomCode/MolarityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class MolarityTests : MolarityTestsBase
[InlineData(0.5, MolarityUnit.MolePerLiter,
KnownQuantities.DensityOfEthanolInKgPerCubicMeter, DensityUnit.KilogramPerCubicMeter,
KnownQuantities.MolarMassOfEthanolInGramsPerMole, MolarMassUnit.GramPerMole,
29.19419518377693, VolumeConcentrationUnit.MillilitersPerLiter)] // 0.5M ethanol
29.19419518377693, VolumeConcentrationUnit.MilliliterPerLiter)] // 0.5M ethanol
public void VolumeConcentrationFromComponentDensityAndMolarity(
double molarityValue, MolarityUnit molarityUnit,
double componentDensityValue, DensityUnit componentDensityUnit,
Expand Down
4 changes: 2 additions & 2 deletions UnitsNet.Tests/CustomCode/VolumeConcentrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public class VolumeConcentrationTests : VolumeConcentrationTestsBase
[InlineData(50, VolumeConcentrationUnit.Percent,
10, DensityUnit.GramPerCubicMeter,
5, MassConcentrationUnit.GramPerCubicMeter)] // synthetic data
[InlineData(29.19419518377693, VolumeConcentrationUnit.MillilitersPerLiter,
[InlineData(29.19419518377693, VolumeConcentrationUnit.MilliliterPerLiter,
KnownQuantities.DensityOfEthanolInKgPerCubicMeter, DensityUnit.KilogramPerCubicMeter,
23.03422, MassConcentrationUnit.GramPerLiter)] // 29.19419518377693 = VolumeConcentration_0_5M_Ethanol
public void MassConcentrationFromVolumeConcentrationAndComponentDensity(
Expand All @@ -78,7 +78,7 @@ public void MassConcentrationFromVolumeConcentrationAndComponentDensity(
}

[Theory]
[InlineData(29.19419518377693, VolumeConcentrationUnit.MillilitersPerLiter,
[InlineData(29.19419518377693, VolumeConcentrationUnit.MilliliterPerLiter,
KnownQuantities.DensityOfEthanolInKgPerCubicMeter, DensityUnit.KilogramPerCubicMeter,
KnownQuantities.MolarMassOfEthanolInGramsPerMole, MolarMassUnit.GramPerMole,
0.5, MolarityUnit.MolePerLiter)] // 29.19419518377693 = VolumeConcentration_0_5M_Ethanol
Expand Down
2 changes: 1 addition & 1 deletion UnitsNet.Tests/GeneratedCode/IQuantityTests.g.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading