Skip to content

Support multiple abbreviations #658

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

Merged
merged 13 commits into from
Apr 22, 2019
Merged

Support multiple abbreviations #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
60e9a7c
Concentration Units (mixtures/solutions)
lipchev Apr 3, 2019
4bacbff
Merge remote-tracking branch 'upstream/master'
lipchev Apr 13, 2019
cb8da0a
updated uppercase 'L' & BaseUnits in json
lipchev Apr 13, 2019
bfeaf7b
BaseUnits, Obsolete methods & cosmetics
lipchev Apr 14, 2019
40c1638
Removed Molarity.Molar as redundant (added abbreviation instead)
lipchev Apr 15, 2019
0171b0a
Added a KnownQuantities class
lipchev Apr 15, 2019
fc3e7be
Merge remote-tracking branch 'upstream/master'
lipchev Apr 18, 2019
69a0ee1
Testing with Theory + InlineData
lipchev Apr 18, 2019
0f6e251
Tests refactoring (Theory + InlineData)
lipchev Apr 18, 2019
a425566
Make single line act-statements in tests
angularsen Apr 21, 2019
8f45d9e
Merge remote-tracking branch 'upstream/master'
lipchev Apr 21, 2019
d6ac17b
Updated scripts to iterate over abbreviations
lipchev Apr 21, 2019
145751c
Update scripts WRC
lipchev Apr 22, 2019
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/Duration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@
},
{
"Culture": "ru-RU",
"Abbreviations": [ "с" ],
"AbbreviationsWithPrefixes": [ "нс", "мкс", "мс" ]
"Abbreviations": [ "с", "сек" ],
"AbbreviationsWithPrefixes": [ ["нс", "нсек"], ["мкс", "мксек"], ["мс", "мсек"] ]
}
]
}
Expand Down
17 changes: 17 additions & 0 deletions UnitsNet.Tests/CustomCode/DurationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using Xunit;
using System;
using System.Globalization;

namespace UnitsNet.Tests.CustomCode
{
Expand Down Expand Up @@ -164,5 +165,21 @@ public void DurationTimesVolumeFlowEqualsVolume()
Volume volume = Duration.FromSeconds(20) * VolumeFlow.FromCubicMetersPerSecond(2);
Assert.Equal(Volume.FromCubicMeters(40), volume);
}

[Theory]
[InlineData("1s", 1)]
[InlineData("2 seconds", 2)]
[InlineData("1 ms", 1e-3)]
[InlineData("1000 msec", 1)]
[InlineData("1 с", 1, "ru-RU")]
[InlineData("1 сек", 1, "ru-RU")]
[InlineData("1000 мс", 1, "ru-RU")]
[InlineData("1000 мсек", 1, "ru-RU")]
public void DurationFromStringUsingMultipleAbbreviationsParsedCorrectly(string textValue, double expectedSeconds, string culture = null)
{
var cultureInfo = culture == null ? null : new CultureInfo(culture);

AssertEx.EqualTolerance(expectedSeconds, Duration.Parse(textValue, cultureInfo).Seconds, SecondsTolerance);
}
}
}
6 changes: 2 additions & 4 deletions UnitsNet.Tests/CustomCode/MolarityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,10 @@ public void OneMolarFromStringParsedCorrectly()
Assert.Equal(Molarity.Parse("1M"), Molarity.Parse("1 mol/L"));
}

[Fact(Skip = "Awaiting fix for https://github.com/angularsen/UnitsNet/issues/344")]
[Fact]
public void OneMilliMolarFromStringParsedCorrectly()
{
var one_mM = Molarity.Parse("1000 mM");

Assert.Equal(1, one_mM.MolesPerLiter);
Assert.Equal(1, Molarity.Parse("1000 mM").MolesPerLiter);
}

}
Expand Down
70 changes: 69 additions & 1 deletion UnitsNet.WindowsRuntimeComponent/GeneratedCode/UnitAbbreviationsCache.g.cs
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 23 additions & 10 deletions UnitsNet.WindowsRuntimeComponent/Scripts/GenerateUnits.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,16 +192,29 @@ function Add-PrefixUnits {
FromUnitToBaseFunc="("+$unit.FromUnitToBaseFunc+") * $prefixFactor"
FromBaseToUnitFunc="("+$unit.FromBaseToUnitFunc+") / $prefixFactor"

Localization=$unit.Localization | % {
$abbrev = $prefixAbbreviation + $_.Abbreviations[0]
if ($_.AbbreviationsWithPrefixes) {
$abbrev = $_.AbbreviationsWithPrefixes[$prefixIndex]
}

New-Object PsObject -Property @{
Culture=$_.Culture
Abbreviations= $abbrev
}}
Localization=$unit.Localization | % {
foreach ($abbrSyno in $_.Abbreviations) {
$abbrev = $prefixAbbreviation + $abbrSyno
if ($_.AbbreviationsWithPrefixes) {
if($_.AbbreviationsWithPrefixes[$prefixIndex] -isnot [System.String]){
foreach($synoWithPrefix in $_.AbbreviationsWithPrefixes[$prefixIndex]){
New-Object PsObject -Property @{
Culture=$_.Culture
Abbreviations= $synoWithPrefix
}
}
continue
}
else{
$abbrev = $_.AbbreviationsWithPrefixes[$prefixIndex]
}
}
New-Object PsObject -Property @{
Culture=$_.Culture
Abbreviations= $abbrev
}
}
}
}

# Append prefix unit
Expand Down
2 changes: 1 addition & 1 deletion UnitsNet.WindowsRuntimeComponent/Scripts/Types.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Localization
{
[string]$Culture
[string[]]$Abbreviations = @()
[string[]]$AbbreviationsWithPrefixes = @()
[object[]]$AbbreviationsWithPrefixes = @()
}

class BaseDimensions
Expand Down
70 changes: 69 additions & 1 deletion UnitsNet/GeneratedCode/UnitAbbreviationsCache.g.cs
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 23 additions & 10 deletions UnitsNet/Scripts/GenerateUnits.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,16 +197,29 @@ function Add-PrefixUnits {
FromUnitToBaseFunc="("+$unit.FromUnitToBaseFunc+") * $prefixFactor"
FromBaseToUnitFunc="("+$unit.FromBaseToUnitFunc+") / $prefixFactor"

Localization=$unit.Localization | % {
$abbrev = $prefixAbbreviation + $_.Abbreviations[0]
if ($_.AbbreviationsWithPrefixes) {
$abbrev = $_.AbbreviationsWithPrefixes[$prefixIndex]
}

New-Object PsObject -Property @{
Culture=$_.Culture
Abbreviations= $abbrev
}}
Localization=$unit.Localization | % {
foreach ($abbrSyno in $_.Abbreviations) {
$abbrev = $prefixAbbreviation + $abbrSyno
if ($_.AbbreviationsWithPrefixes) {
if($_.AbbreviationsWithPrefixes[$prefixIndex] -isnot [System.String]){
foreach($synoWithPrefix in $_.AbbreviationsWithPrefixes[$prefixIndex]){
New-Object PsObject -Property @{
Culture=$_.Culture
Abbreviations= $synoWithPrefix
}
}
continue
}
else{
$abbrev = $_.AbbreviationsWithPrefixes[$prefixIndex]
}
}
New-Object PsObject -Property @{
Culture=$_.Culture
Abbreviations= $abbrev
}
}
}
}

# Append prefix unit
Expand Down
2 changes: 1 addition & 1 deletion UnitsNet/Scripts/Types.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class Localization
{
[string]$Culture
[string[]]$Abbreviations = @()
[string[]]$AbbreviationsWithPrefixes = @()
[object[]]$AbbreviationsWithPrefixes = @()
}

class BaseDimensions
Expand Down