Skip to content

Added "Deca", "Deci" and "Hecto" prefixes for "UsGallon" unit with tests #779

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 23 commits into from
Apr 28, 2020
Merged

Added "Deca", "Deci" and "Hecto" prefixes for "UsGallon" unit with tests #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
fbfdb00
Add Therm unit
Sep 14, 2017
121f6c0
Typo fixed
Sep 14, 2017
6064445
Generated code and tests
Sep 14, 2017
a09f66b
Some code. formating
Sep 14, 2017
38f7f76
Add nex prefixes and a few addreviations for russian culture.
Sep 14, 2017
5aa9472
Add test and some prefixes abbreviations for pound. Misplaced code re…
Sep 15, 2017
1c4614e
Add improved name scheme
Sep 25, 2017
5c7bb61
Merge branch 'master' into NewPrefixes
Sep 25, 2017
6eb6688
Add 'TonPerHour' unit and tests
Sep 25, 2017
5e0903b
Update for ThermsEC
Sep 28, 2017
15baeef
Update for ThermsEC
Sep 28, 2017
eb03a6d
Add 'BTU/hr' unit of measure.
Sep 28, 2017
3328370
Add 'cf/hr' Unit of measure.
Sep 28, 2017
38801de
Add new prefixes.
Sep 28, 2017
56d4a5e
Merge branch 'NewPrefixes'
Sep 29, 2017
22c2df0
Merge branch 'master' of https://github.com/angularsen/UnitsNet
Oct 2, 2017
51cc39b
Dublication removed from Energy.json
Oct 3, 2017
0f8c226
Changed test values for KilobritishThermalUnitsInOneJoule and Megabri…
Oct 4, 2017
9bbcab5
Some more adjustments
Oct 4, 2017
fb8f405
Some corrections for 'CubicFootPerSecond' and 'CubicFootPerHour' values.
Oct 5, 2017
b3f4b7e
Merge branch 'master' of https://github.com/angularsen/UnitsNet into …
DInozemtsev Apr 24, 2020
997a383
Added 'Deca', 'Hecto' prefixes for 'UsGallons'
DInozemtsev Apr 24, 2020
b83b8d2
Added "Deci" prefix and tests
Apr 24, 2020
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
2 changes: 1 addition & 1 deletion Common/UnitDefinitions/Volume.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
"PluralName": "UsGallons",
"FromUnitToBaseFunc": "x*0.00378541",
"FromBaseToUnitFunc": "x/0.00378541",
"Prefixes": [ "Kilo", "Mega" ],
"Prefixes": [ "Deca", "Deci", "Hecto", "Kilo", "Mega" ],
Copy link
Owner

@angularsen angularsen Apr 27, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mentioned reports using 'cGal'/'100 Gal' and 'kGal'/'1000 Gal'.

Please note:

  1. The abbreviations used by ToString() will in this PR be dgal (U.S.) and hgal (U.S.) etc.
  2. Volume.Parse("5 cGal (U.S.)") will throw an exception, because parsing is currently case sensitive.

If you really want ToString() and Parse() to support using uppercase Gal, then you need to add that Gal (U.S.) abbreviation to the end of the Abbreviations array below. It would still need the (U.S.) suffix to be consistent with our naming conventions though..

To use a specific abbreviation in ToString(), take a look at custom string formatting.

If you are fine with the existing lowercase gal (U.S.) abbreviation, then I recommend not adding Gal (U.S.) unless it will actually be used.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#781 is now merged, so this is point is no longer relevant :-) This PR is then good to go!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@angularsen Sorry for delay with my reply. You see, in our system exists a few different names for the same unit. First company names it "kGal", the second - "100 Gal", the third - "Hundred Gallons" and so on. Thus I don't think that there is any standard name of those units in the States, and if there is actually one, looks like no one really respects it. So I would leave it as it is now. :-)

"Localization": [
{
"Culture": "en-US",
Expand Down
12 changes: 12 additions & 0 deletions UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToVolumeExtensionsTest.g.cs
View file
Open in desktop

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

12 changes: 12 additions & 0 deletions UnitsNet.NumberExtensions/GeneratedCode/NumberToVolumeExtensions.g.cs
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions UnitsNet.Tests/CustomCode/VolumeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,17 @@ public class VolumeTests : VolumeTestsBase

protected override double CubicYardsInOneCubicMeter => 1.30795062;

protected override double DecausGallonsInOneCubicMeter => 2.6417217e+1;

protected override double DecilitersInOneCubicMeter => 1E4;
protected override double DeciusGallonsInOneCubicMeter => 2.6417217e+3;
protected override double HectocubicFeetInOneCubicMeter => 3.531472e-1;
protected override double HectocubicMetersInOneCubicMeter => 0.01;

protected override double HectolitersInOneCubicMeter => 1E1;

protected override double HectousGallonsInOneCubicMeter => 2.6417217;

protected override double ImperialGallonsInOneCubicMeter => 219.96924;

protected override double ImperialOuncesInOneCubicMeter => 35195.07972;
Expand Down
243 changes: 144 additions & 99 deletions UnitsNet.Tests/GeneratedCode/TestsBase/VolumeTestsBase.g.cs
View file
Open in desktop

Large diffs are not rendered by default.

51 changes: 51 additions & 0 deletions UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Volume.g.cs
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions UnitsNet.WindowsRuntimeComponent/GeneratedCode/UnitAbbreviationsCache.g.cs
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions UnitsNet.WindowsRuntimeComponent/GeneratedCode/Units/VolumeUnit.g.cs
View file
Open in desktop

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

51 changes: 51 additions & 0 deletions UnitsNet/GeneratedCode/Quantities/Volume.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