Added a few new units and new prefixes for existing units. #291

DInozemtsev · 2017-09-29T12:44:32Z

BritishThermalUnits: added new prefixes 'Kilo', 'Mega' and 'Giga' to support 'kBTU', 'mBTU', 'mmBTU'
Added a new unit 'CubicFootPerHour'
Pound: added new prefixes 'Kilo' and 'Mega' to support 'KLbs' and 'MLbs'
PoundsPerHour: added new prefixes 'Mega' to support 'Mlb/h'
Added a new unit 'ShortTonPerHour'
Added a new unit 'BritishThermalUnitPerHour'
CubicMeters: added new prefixes 'Hecto' and 'Kilo'
CubicFoot: added new prefixes 'Hecto', 'Kilo' and 'Mega'
ImperialGallons: added new prefixes 'Kilo' and 'Mega'
UsGallons: added new prefixes 'Kilo' and 'Mega'

…moved

angularsen · 2017-09-29T20:58:18Z

Awesome stuff, there is just a merge conflict you need to address. Please merge in latest from origin/master or rebase on top of it and fix the conflicts that arise, then push these new changes so the pull request is updated.

I think I saw you were a first-time github contributor, so if you are unsure about these things just ask and I'll help you out.

DInozemtsev · 2017-10-02T10:06:34Z

Hmm... I did merge from your master into mine and there was not any conflicts. However AppVeyor build fails with errors like this:

GeneratedCode\UnitClasses\Energy.g.cs(159,23): error CS0102: The type 'Energy' already contains a definition for 'DecathermsEc' [C:\projects\unitsnet\UnitsNet\UnitsNet.NetStandard10.csproj]

Which is quite odd, because I can not find any duplication of DecathermsEc definition in Energy.g.cs. More than that, it builds perfectly on my local box. Am I missing something here? @angularsen could you please help me on this?

angularsen · 2017-10-02T13:15:53Z

I can check back in later today, but are you sure you merged in master from angularsen repo and not your own fork/repo's master? `git remote - v` to list remotes `git branch - avv` to list all branches including remote branches Assuming you cloned your own fork instead of the official repo you have to add angularsen/UnitsNet as a remote then merge in changes from its master.

…

On Mon, Oct 2, 2017, 12:06 Dmitriy Inozemtsev ***@***.***> wrote: Hmm... I did merge from your master into mine and there was not any conflicts. However AppVeyor build fails with errors like this: GeneratedCode\UnitClasses\Energy.g.cs(159,23): error CS0102: The type 'Energy' already contains a definition for 'DecathermsEc' [C:\projects\unitsnet\UnitsNet\UnitsNet.NetStandard10.csproj] Which is quite odd, because I can not find any duplication of DecathermsEc definition in Energy.g.cs. More than that, it builds perfectly on my local box. Am I missing something here? @angularsen <https://github.com/angularsen> could you please help me on this? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#291 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAwFaIxsxmS2tGpyzeCh0Ytfvd12nTsKks5soLWrgaJpZM4Ponte> .

DInozemtsev · 2017-10-02T13:29:43Z

I've used following command to do merge into my branch:

git pull https://github.com/angularsen/UnitsNet.git master

And I can definitely see your latest commits in my master now.

DInozemtsev · 2017-10-03T10:53:21Z

Yay! Everything is green now. @angularsen thank you so much for pointing at the problem :)

angularsen · 2017-10-03T18:07:03Z

Awesome, good job :-)

This reverts commit 83aeaca.

angularsen

Found some issues after merging. I will revert the merge and you will have to create a new pull request with the update changes. Sorry for not catching this before merging.

angularsen · 2017-10-03T18:10:50Z

UnitsNet.Tests/CustomCode/EnergyTests.cs

@@ -28,8 +28,12 @@ public class EnergyTests : EnergyTestsBase

        protected override double JoulesInOneJoule => 1;

+        protected override double KilobritishThermalUnitsInOneJoule => 9.4781339449889105832843629746176e-7;


I forgot to verify the latest units, I see a difference here with google (BTU, not kBTU): 9.47817...e-7
https://www.google.no/search?q=britishThermalUnitsInOneJoule&oq=britishThermalUnitsInOneJoule&aqs=chrome..69i57.224j0j7&sourceid=chrome&ie=UTF-8

angularsen · 2017-10-03T18:21:54Z

UnitsNet.Tests/CustomCode/VolumeTests.cs


        protected override double HectolitersInOneCubicMeter => 1E1;

        protected override double ImperialGallonsInOneCubicMeter => 219.96924;

        protected override double ImperialOuncesInOneCubicMeter => 35195.07972;

+        protected override double KilocubicFeetInOneCubicMeter => 3.531472e-2;


Wait, is this really a unit? Kilocubic feet? Sure this is not just 1000 cubicfeet? I can't find kilocubic feet on google.

Hi @angularsen This is a unit of measure, that used in this product https://portfoliomanager.energystar.gov/ and called kcf (thousand cubic feet)
And, yeah, it sounds weird for me too, but guys in the States seems to be absolutely in love with some strange units of measure. Take it or leave it - it's up to you of course.

angularsen · 2017-10-03T18:22:18Z

UnitsNet.Tests/CustomCode/VolumeTests.cs


        protected override double HectolitersInOneCubicMeter => 1E1;

        protected override double ImperialGallonsInOneCubicMeter => 219.96924;

        protected override double ImperialOuncesInOneCubicMeter => 35195.07972;

+        protected override double KilocubicFeetInOneCubicMeter => 3.531472e-2;
+        protected override double KilocubicMetersInOneCubicMeter => 0.001;


Same with kilocubic meters. Doesn't sound right?

angularsen · 2017-10-03T18:24:00Z

UnitsNet.Tests/CustomCode/VolumeTests.cs

        protected override double LitersInOneCubicMeter => 1E3;
+        protected override double MegacubicFeetInOneCubicMeter => 3.531472e-5;


And the megacubic ones too.

The same here, they called it Kcm (Thousand Cubic meters)

angularsen · 2017-10-03T18:25:01Z

UnitsNet.Tests/CustomCode/VolumeTests.cs

        protected override double LitersInOneCubicMeter => 1E3;
+        protected override double MegacubicFeetInOneCubicMeter => 3.531472e-5;
+        protected override double MegaimperialGallonsInOneCubicMeter => 2.1996924e-4;


I do find megaimperial gallons though so this one should be OK, still sounds funny to me :-)

And that means mega US gallons probably also is OK.

Looks like in U.S. they call them KGal (thousand gallons) (US) and KGal (thousand gallons) (UK)

…" (#294) This reverts commit 83aeaca.

Dmitriy Inozemtsev added 15 commits September 14, 2017 14:11

Add Therm unit

fbfdb00

Typo fixed

121f6c0

Generated code and tests

6064445

Some code. formating

a09f66b

Add nex prefixes and a few addreviations for russian culture.

38f7f76

Add test and some prefixes abbreviations for pound. Misplaced code re…

5aa9472

…moved

Add improved name scheme

1c4614e

Merge branch 'master' into NewPrefixes

5c7bb61

Add 'TonPerHour' unit and tests

6eb6688

Update for ThermsEC

5e0903b

Update for ThermsEC

15baeef

Add 'BTU/hr' unit of measure.

eb03a6d

Add 'cf/hr' Unit of measure.

3328370

Add new prefixes.

38801de

Merge branch 'NewPrefixes'

56d4a5e

Merge branch 'master' of https://github.com/angularsen/UnitsNet

22c2df0

Dublication removed from Energy.json

51cc39b

angularsen merged commit 83aeaca into angularsen:master Oct 3, 2017

angularsen pushed a commit that referenced this pull request Oct 3, 2017

Revert "Add a few new units and new prefixes for existing units. (#291)"

1e6eeaf

This reverts commit 83aeaca.

angularsen mentioned this pull request Oct 3, 2017

Revert "Added a few new units and new prefixes for existing units." #294

Merged

angularsen reviewed Oct 3, 2017

View reviewed changes

angularsen pushed a commit that referenced this pull request Oct 3, 2017

Revert "Add a few new units and new prefixes for existing units. (#291)…

7303a54

…" (#294) This reverts commit 83aeaca.

		@@ -28,8 +28,12 @@ public class EnergyTests : EnergyTestsBase

		protected override double JoulesInOneJoule => 1;

		protected override double KilobritishThermalUnitsInOneJoule => 9.4781339449889105832843629746176e-7;

		protected override double LitersInOneCubicMeter => 1E3;
		protected override double MegacubicFeetInOneCubicMeter => 3.531472e-5;

Added a few new units and new prefixes for existing units. #291

Added a few new units and new prefixes for existing units. #291

Uh oh!

Conversation

DInozemtsev commented Sep 29, 2017

Uh oh!

angularsen commented Sep 29, 2017

Uh oh!

DInozemtsev commented Oct 2, 2017

Uh oh!

angularsen commented Oct 2, 2017 via email

Uh oh!

DInozemtsev commented Oct 2, 2017

Uh oh!

DInozemtsev commented Oct 3, 2017

Uh oh!

angularsen commented Oct 3, 2017

Uh oh!

angularsen left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!