Add joules/hour, GigaJoule and MegaCalorie (angularsen#725)

AgileoAutomation · Dec 8, 2019 · d9d352c · d9d352c
1 parent 8ea1dbb
commit d9d352c
Show file tree

Hide file tree

Showing 17 changed files with 380 additions and 3 deletions.
diff --git a/Common/UnitDefinitions/Energy.json b/Common/UnitDefinitions/Energy.json
@@ -18,7 +18,7 @@
       },
       "FromUnitToBaseFunc": "x",
       "FromBaseToUnitFunc": "x",
-      "Prefixes": [ "Milli", "Kilo", "Mega" ],
+      "Prefixes": [ "Milli", "Kilo", "Mega", "Giga" ],
       "Localization": [
         {
           "Culture": "en-US",
@@ -31,7 +31,7 @@
       "PluralName": "Calories",
       "FromUnitToBaseFunc": "x*4.184",
       "FromBaseToUnitFunc": "x/4.184",
-      "Prefixes": [ "Kilo" ],
+      "Prefixes": [ "Kilo", "Mega" ],
       "Localization": [
         {
           "Culture": "en-US",

diff --git a/Common/UnitDefinitions/Power.json b/Common/UnitDefinitions/Power.json
@@ -94,6 +94,19 @@
           "Abbreviations": [ "Btu/h", "Btu/hr" ]
         }
       ]
-    }
+    },
+    {
+      "SingularName": "JoulePerHour",
+      "PluralName": "JoulesPerHour",
+      "FromUnitToBaseFunc": "x/3600m",
+      "FromBaseToUnitFunc": "x*3600m",
+      "Prefixes": [ "Milli", "Kilo", "Mega", "Giga" ],
+      "Localization": [
+        {
+          "Culture": "en-US",
+          "Abbreviations": [ "J/h" ]
+        }
+      ]
+    },
   ]
 }
diff --git a/UnitsNet.Tests/CustomCode/EnergyTests.cs b/UnitsNet.Tests/CustomCode/EnergyTests.cs
@@ -18,6 +18,8 @@ public class EnergyTests : EnergyTestsBase
 
         protected override double MegabritishThermalUnitsInOneJoule => 9.4781712e-10;
 
+        protected override double MegacaloriesInOneJoule => 0.239005736e-6;
+
         protected override double MegajoulesInOneJoule => 1E-6;
 
         protected override double BritishThermalUnitsInOneJoule => 0.00094781712;
@@ -44,6 +46,8 @@ public class EnergyTests : EnergyTestsBase
 
         protected override double GigabritishThermalUnitsInOneJoule => 9.4781712e-13;
 
+        protected override double GigajoulesInOneJoule => 1e-9;
+
         protected override double GigawattHoursInOneJoule => 2.77777778e-13;
 
         protected override double KilocaloriesInOneJoule => 0.00023900573614;

diff --git a/UnitsNet.Tests/CustomCode/PowerTests.cs b/UnitsNet.Tests/CustomCode/PowerTests.cs
@@ -10,12 +10,16 @@ public class PowerTests : PowerTestsBase
     {
         protected override double FemtowattsInOneWatt => 1e15;
 
+        protected override double GigajoulesPerHourInOneWatt => 3600e-9;
+
         protected override double PicowattsInOneWatt => 1e12;
 
         protected override double NanowattsInOneWatt => 1e9;
 
         protected override double MicrowattsInOneWatt => 1e6;
 
+        protected override double MillijoulesPerHourInOneWatt => 3600e3;
+
         protected override double MilliwattsInOneWatt => 1e3;
 
         protected override double DeciwattsInOneWatt => 1e1;
@@ -24,8 +28,12 @@ public class PowerTests : PowerTestsBase
 
         protected override double DecawattsInOneWatt => 1e-1;
 
+        protected override double KilojoulesPerHourInOneWatt => 3600e-3;
+
         protected override double KilowattsInOneWatt => 1e-3;
 
+        protected override double MegajoulesPerHourInOneWatt => 3600e-6;
+
         protected override double MegawattsInOneWatt => 1e-6;
 
         protected override double GigawattsInOneWatt => 1e-9;
@@ -34,6 +42,8 @@ public class PowerTests : PowerTestsBase
 
         protected override double PetawattsInOneWatt => 1e-15;
 
+        protected override double JoulesPerHourInOneWatt => 3600;
+
         protected override double KilobritishThermalUnitsPerHourInOneWatt => 3.412141633e-3;
 
         protected override double BoilerHorsepowerInOneWatt => 1.0191082802547770700636942675159e-4;

diff --git a/UnitsNet.Tests/GeneratedCode/EnergyTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/EnergyTestsBase.g.cs