Add imperial units for thermal conductivity (#432)

tmilnthorp · angularsen · commit ea1da4f9bdbd · 2018-05-05T12:30:32.000+02:00
diff --git a/UnitsNet.Tests/CustomCode/ThermalConductivityTests.cs b/UnitsNet.Tests/CustomCode/ThermalConductivityTests.cs
@@ -47,5 +47,6 @@ namespace UnitsNet.Tests.CustomCode
     public class ThermalConductivityTests : ThermalConductivityTestsBase
     {
         protected override double WattsPerMeterKelvinInOneWattPerMeterKelvin => 1;
+        protected override double BtusPerHourFootFahrenheitInOneWattPerMeterKelvin => 5.77789317e-1;
     }
 }
diff --git a/UnitsNet.Tests/GeneratedCode/ThermalConductivityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/ThermalConductivityTestsBase.g.cs
@@ -52,36 +52,42 @@ namespace UnitsNet.Tests
 // ReSharper disable once PartialTypeWithSinglePart
     public abstract partial class ThermalConductivityTestsBase
     {
+        protected abstract double BtusPerHourFootFahrenheitInOneWattPerMeterKelvin { get; }
         protected abstract double WattsPerMeterKelvinInOneWattPerMeterKelvin { get; }
 
 // ReSharper disable VirtualMemberNeverOverriden.Global
+        protected virtual double BtusPerHourFootFahrenheitTolerance { get { return 1e-5; } }
         protected virtual double WattsPerMeterKelvinTolerance { get { return 1e-5; } }
 // ReSharper restore VirtualMemberNeverOverriden.Global
 
         [Fact]
         public void WattPerMeterKelvinToThermalConductivityUnits()
         {
             ThermalConductivity wattpermeterkelvin = ThermalConductivity.FromWattsPerMeterKelvin(1);
+            AssertEx.EqualTolerance(BtusPerHourFootFahrenheitInOneWattPerMeterKelvin, wattpermeterkelvin.BtusPerHourFootFahrenheit, BtusPerHourFootFahrenheitTolerance);
             AssertEx.EqualTolerance(WattsPerMeterKelvinInOneWattPerMeterKelvin, wattpermeterkelvin.WattsPerMeterKelvin, WattsPerMeterKelvinTolerance);
         }
 
         [Fact]
         public void FromValueAndUnit()
         {
+            AssertEx.EqualTolerance(1, ThermalConductivity.From(1, ThermalConductivityUnit.BtuPerHourFootFahrenheit).BtusPerHourFootFahrenheit, BtusPerHourFootFahrenheitTolerance);
             AssertEx.EqualTolerance(1, ThermalConductivity.From(1, ThermalConductivityUnit.WattPerMeterKelvin).WattsPerMeterKelvin, WattsPerMeterKelvinTolerance);
         }
 
         [Fact]
         public void As()
         {
             var wattpermeterkelvin = ThermalConductivity.FromWattsPerMeterKelvin(1);
+            AssertEx.EqualTolerance(BtusPerHourFootFahrenheitInOneWattPerMeterKelvin, wattpermeterkelvin.As(ThermalConductivityUnit.BtuPerHourFootFahrenheit), BtusPerHourFootFahrenheitTolerance);
             AssertEx.EqualTolerance(WattsPerMeterKelvinInOneWattPerMeterKelvin, wattpermeterkelvin.As(ThermalConductivityUnit.WattPerMeterKelvin), WattsPerMeterKelvinTolerance);
         }
 
         [Fact]
         public void ConversionRoundTrip()
         {
             ThermalConductivity wattpermeterkelvin = ThermalConductivity.FromWattsPerMeterKelvin(1);
+            AssertEx.EqualTolerance(1, ThermalConductivity.FromBtusPerHourFootFahrenheit(wattpermeterkelvin.BtusPerHourFootFahrenheit).WattsPerMeterKelvin, BtusPerHourFootFahrenheitTolerance);
             AssertEx.EqualTolerance(1, ThermalConductivity.FromWattsPerMeterKelvin(wattpermeterkelvin.WattsPerMeterKelvin).WattsPerMeterKelvin, WattsPerMeterKelvinTolerance);
         }
 
diff --git a/UnitsNet/GeneratedCode/Extensions/Number/NumberToThermalConductivityExtensions.g.cs b/UnitsNet/GeneratedCode/Extensions/Number/NumberToThermalConductivityExtensions.g.cs
@@ -44,6 +44,40 @@ namespace UnitsNet.Extensions.NumberToThermalConductivity
 {
     public static class NumberToThermalConductivityExtensions
     {
+        #region BtuPerHourFootFahrenheit
+
+        /// <inheritdoc cref="ThermalConductivity.FromBtusPerHourFootFahrenheit(double)"/>
+        public static ThermalConductivity BtusPerHourFootFahrenheit(this int value) => ThermalConductivity.FromBtusPerHourFootFahrenheit(value);
+
+        /// <inheritdoc cref="ThermalConductivity.FromBtusPerHourFootFahrenheit(double?)"/>
+        public static ThermalConductivity? BtusPerHourFootFahrenheit(this int? value) => ThermalConductivity.FromBtusPerHourFootFahrenheit(value);
+
+        /// <inheritdoc cref="ThermalConductivity.FromBtusPerHourFootFahrenheit(double)"/>
+        public static ThermalConductivity BtusPerHourFootFahrenheit(this long value) => ThermalConductivity.FromBtusPerHourFootFahrenheit(value);
+
+        /// <inheritdoc cref="ThermalConductivity.FromBtusPerHourFootFahrenheit(double?)"/>
+        public static ThermalConductivity? BtusPerHourFootFahrenheit(this long? value) => ThermalConductivity.FromBtusPerHourFootFahrenheit(value);
+
+        /// <inheritdoc cref="ThermalConductivity.FromBtusPerHourFootFahrenheit(double)"/>
+        public static ThermalConductivity BtusPerHourFootFahrenheit(this double value) => ThermalConductivity.FromBtusPerHourFootFahrenheit(value);
+
+        /// <inheritdoc cref="ThermalConductivity.FromBtusPerHourFootFahrenheit(double?)"/>
+        public static ThermalConductivity? BtusPerHourFootFahrenheit(this double? value) => ThermalConductivity.FromBtusPerHourFootFahrenheit(value);
+
+        /// <inheritdoc cref="ThermalConductivity.FromBtusPerHourFootFahrenheit(double)"/>
+        public static ThermalConductivity BtusPerHourFootFahrenheit(this float value) => ThermalConductivity.FromBtusPerHourFootFahrenheit(value);
+
+        /// <inheritdoc cref="ThermalConductivity.FromBtusPerHourFootFahrenheit(double?)"/>
+        public static ThermalConductivity? BtusPerHourFootFahrenheit(this float? value) => ThermalConductivity.FromBtusPerHourFootFahrenheit(value);
+
+        /// <inheritdoc cref="ThermalConductivity.FromBtusPerHourFootFahrenheit(double)"/>
+        public static ThermalConductivity BtusPerHourFootFahrenheit(this decimal value) => ThermalConductivity.FromBtusPerHourFootFahrenheit(Convert.ToDouble(value));
+
+        /// <inheritdoc cref="ThermalConductivity.FromBtusPerHourFootFahrenheit(double?)"/>
+        public static ThermalConductivity? BtusPerHourFootFahrenheit(this decimal? value) => ThermalConductivity.FromBtusPerHourFootFahrenheit(value == null ? (double?)null : Convert.ToDouble(value.Value));
+
+        #endregion
+
         #region WattPerMeterKelvin
 
         /// <inheritdoc cref="ThermalConductivity.FromWattsPerMeterKelvin(double)"/>
diff --git a/UnitsNet/GeneratedCode/Quantities/ThermalConductivity.g.cs b/UnitsNet/GeneratedCode/Quantities/ThermalConductivity.g.cs
@@ -163,6 +163,10 @@ public ThermalConductivity(double wattspermeterkelvin)
         /// </summary>
         public static ThermalConductivityUnit[] Units { get; } = Enum.GetValues(typeof(ThermalConductivityUnit)).Cast<ThermalConductivityUnit>().ToArray();
         /// <summary>
+        ///     Get ThermalConductivity in BtusPerHourFootFahrenheit.
+        /// </summary>
+        public double BtusPerHourFootFahrenheit => As(ThermalConductivityUnit.BtuPerHourFootFahrenheit);
+        /// <summary>
         ///     Get ThermalConductivity in WattsPerMeterKelvin.
         /// </summary>
         public double WattsPerMeterKelvin => As(ThermalConductivityUnit.WattPerMeterKelvin);
@@ -173,6 +177,20 @@ public ThermalConductivity(double wattspermeterkelvin)
 
         public static ThermalConductivity Zero => new ThermalConductivity(0, BaseUnit);
 
+        /// <summary>
+        ///     Get ThermalConductivity from BtusPerHourFootFahrenheit.
+        /// </summary>
+#if WINDOWS_UWP
+        [Windows.Foundation.Metadata.DefaultOverload]
+        public static ThermalConductivity FromBtusPerHourFootFahrenheit(double btusperhourfootfahrenheit)
+#else
+        public static ThermalConductivity FromBtusPerHourFootFahrenheit(QuantityValue btusperhourfootfahrenheit)
+#endif
+        {
+            double value = (double) btusperhourfootfahrenheit;
+            return new ThermalConductivity(value, ThermalConductivityUnit.BtuPerHourFootFahrenheit);
+        }
+
         /// <summary>
         ///     Get ThermalConductivity from WattsPerMeterKelvin.
         /// </summary>
@@ -189,6 +207,21 @@ public static ThermalConductivity FromWattsPerMeterKelvin(QuantityValue wattsper
 
         // Windows Runtime Component does not support nullable types (double?): https://msdn.microsoft.com/en-us/library/br230301.aspx
 #if !WINDOWS_UWP
+        /// <summary>
+        ///     Get nullable ThermalConductivity from nullable BtusPerHourFootFahrenheit.
+        /// </summary>
+        public static ThermalConductivity? FromBtusPerHourFootFahrenheit(QuantityValue? btusperhourfootfahrenheit)
+        {
+            if (btusperhourfootfahrenheit.HasValue)
+            {
+                return FromBtusPerHourFootFahrenheit(btusperhourfootfahrenheit.Value);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
         /// <summary>
         ///     Get nullable ThermalConductivity from nullable WattsPerMeterKelvin.
         /// </summary>
@@ -431,6 +464,7 @@ public double As(ThermalConductivityUnit unit)
 
             switch (unit)
             {
+                case ThermalConductivityUnit.BtuPerHourFootFahrenheit: return baseUnitValue/1.73073467;
                 case ThermalConductivityUnit.WattPerMeterKelvin: return baseUnitValue;
 
                 default:
@@ -795,6 +829,7 @@ private double AsBaseUnitWattsPerMeterKelvin()
 
             switch (Unit)
             {
+                case ThermalConductivityUnit.BtuPerHourFootFahrenheit: return _value*1.73073467;
                 case ThermalConductivityUnit.WattPerMeterKelvin: return _value;
                 default:
                     throw new NotImplementedException("Unit not implemented: " + Unit);
diff --git a/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs b/UnitsNet/GeneratedCode/UnitSystem.Default.g.cs
@@ -3943,6 +3943,11 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
                 new UnitLocalization(typeof (ThermalConductivityUnit),
                     new[]
                     {
+                        new CulturesForEnumValue((int) ThermalConductivityUnit.BtuPerHourFootFahrenheit,
+                            new[]
+                            {
+                                new AbbreviationsForCulture("en-US", "BTU/h·ft·°F"),
+                            }),
                         new CulturesForEnumValue((int) ThermalConductivityUnit.WattPerMeterKelvin,
                             new[]
                             {
diff --git a/UnitsNet/GeneratedCode/Units/ThermalConductivityUnit.g.cs b/UnitsNet/GeneratedCode/Units/ThermalConductivityUnit.g.cs
@@ -42,6 +42,7 @@ namespace UnitsNet.Units
     public enum ThermalConductivityUnit
     {
         Undefined = 0,
+        BtuPerHourFootFahrenheit,
         WattPerMeterKelvin,
     }
 }
diff --git a/UnitsNet/UnitDefinitions/ThermalConductivity.json b/UnitsNet/UnitDefinitions/ThermalConductivity.json
@@ -15,6 +15,18 @@
           "Abbreviations": [ "W/m·K" ]
         }
       ]
+    },
+    {
+      "SingularName": "BtuPerHourFootFahrenheit",
+      "PluralName": "BtusPerHourFootFahrenheit",
+      "FromUnitToBaseFunc": "x*1.73073467",
+      "FromBaseToUnitFunc": "x/1.73073467",
+      "Localization": [
+        {
+          "Culture": "en-US",
+          "Abbreviations": [ "BTU/h·ft·°F" ]
+        }
+      ]
     }
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,6 @@ namespace UnitsNet.Tests.CustomCode`
`47`	`47`	`public class ThermalConductivityTests : ThermalConductivityTestsBase`
`48`	`48`	`{`
`49`	`49`	`protected override double WattsPerMeterKelvinInOneWattPerMeterKelvin => 1;`
	`50`	`+ protected override double BtusPerHourFootFahrenheitInOneWattPerMeterKelvin => 5.77789317e-1;`
`50`	`51`	`}`
`51`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,36 +52,42 @@ namespace UnitsNet.Tests`
`52`	`52`	`// ReSharper disable once PartialTypeWithSinglePart`
`53`	`53`	`public abstract partial class ThermalConductivityTestsBase`
`54`	`54`	`{`
	`55`	`+ protected abstract double BtusPerHourFootFahrenheitInOneWattPerMeterKelvin { get; }`
`55`	`56`	`protected abstract double WattsPerMeterKelvinInOneWattPerMeterKelvin { get; }`
`56`	`57`
`57`	`58`	`// ReSharper disable VirtualMemberNeverOverriden.Global`
	`59`	`+ protected virtual double BtusPerHourFootFahrenheitTolerance { get { return 1e-5; } }`
`58`	`60`	`protected virtual double WattsPerMeterKelvinTolerance { get { return 1e-5; } }`
`59`	`61`	`// ReSharper restore VirtualMemberNeverOverriden.Global`
`60`	`62`
`61`	`63`	`[Fact]`
`62`	`64`	`public void WattPerMeterKelvinToThermalConductivityUnits()`
`63`	`65`	`{`
`64`	`66`	`ThermalConductivity wattpermeterkelvin = ThermalConductivity.FromWattsPerMeterKelvin(1);`
	`67`	`+ AssertEx.EqualTolerance(BtusPerHourFootFahrenheitInOneWattPerMeterKelvin, wattpermeterkelvin.BtusPerHourFootFahrenheit, BtusPerHourFootFahrenheitTolerance);`
`65`	`68`	`AssertEx.EqualTolerance(WattsPerMeterKelvinInOneWattPerMeterKelvin, wattpermeterkelvin.WattsPerMeterKelvin, WattsPerMeterKelvinTolerance);`
`66`	`69`	`}`
`67`	`70`
`68`	`71`	`[Fact]`
`69`	`72`	`public void FromValueAndUnit()`
`70`	`73`	`{`
	`74`	`+ AssertEx.EqualTolerance(1, ThermalConductivity.From(1, ThermalConductivityUnit.BtuPerHourFootFahrenheit).BtusPerHourFootFahrenheit, BtusPerHourFootFahrenheitTolerance);`
`71`	`75`	`AssertEx.EqualTolerance(1, ThermalConductivity.From(1, ThermalConductivityUnit.WattPerMeterKelvin).WattsPerMeterKelvin, WattsPerMeterKelvinTolerance);`
`72`	`76`	`}`
`73`	`77`
`74`	`78`	`[Fact]`
`75`	`79`	`public void As()`
`76`	`80`	`{`
`77`	`81`	`var wattpermeterkelvin = ThermalConductivity.FromWattsPerMeterKelvin(1);`
	`82`	`+ AssertEx.EqualTolerance(BtusPerHourFootFahrenheitInOneWattPerMeterKelvin, wattpermeterkelvin.As(ThermalConductivityUnit.BtuPerHourFootFahrenheit), BtusPerHourFootFahrenheitTolerance);`
`78`	`83`	`AssertEx.EqualTolerance(WattsPerMeterKelvinInOneWattPerMeterKelvin, wattpermeterkelvin.As(ThermalConductivityUnit.WattPerMeterKelvin), WattsPerMeterKelvinTolerance);`
`79`	`84`	`}`
`80`	`85`
`81`	`86`	`[Fact]`
`82`	`87`	`public void ConversionRoundTrip()`
`83`	`88`	`{`
`84`	`89`	`ThermalConductivity wattpermeterkelvin = ThermalConductivity.FromWattsPerMeterKelvin(1);`
	`90`	`+ AssertEx.EqualTolerance(1, ThermalConductivity.FromBtusPerHourFootFahrenheit(wattpermeterkelvin.BtusPerHourFootFahrenheit).WattsPerMeterKelvin, BtusPerHourFootFahrenheitTolerance);`
`85`	`91`	`AssertEx.EqualTolerance(1, ThermalConductivity.FromWattsPerMeterKelvin(wattpermeterkelvin.WattsPerMeterKelvin).WattsPerMeterKelvin, WattsPerMeterKelvinTolerance);`
`86`	`92`	`}`
`87`	`93`
Original file line number	Diff line number	Diff line change
`@@ -3943,6 +3943,11 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization`
`3943`	`3943`	`new UnitLocalization(typeof (ThermalConductivityUnit),`
`3944`	`3944`	`new[]`
`3945`	`3945`	`{`
	`3946`	`+ new CulturesForEnumValue((int) ThermalConductivityUnit.BtuPerHourFootFahrenheit,`
	`3947`	`+ new[]`
	`3948`	`+ {`
	`3949`	`+ new AbbreviationsForCulture("en-US", "BTU/h·ft·°F"),`
	`3950`	`+ }),`
`3946`	`3951`	`new CulturesForEnumValue((int) ThermalConductivityUnit.WattPerMeterKelvin,`
`3947`	`3952`	`new[]`
`3948`	`3953`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ namespace UnitsNet.Units`
`42`	`42`	`public enum ThermalConductivityUnit`
`43`	`43`	`{`
`44`	`44`	`Undefined = 0,`
	`45`	`+ BtuPerHourFootFahrenheit,`
`45`	`46`	`WattPerMeterKelvin,`
`46`	`47`	`}`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,18 @@`
`15`	`15`	`"Abbreviations": [ "W/m·K" ]`
`16`	`16`	`}`
`17`	`17`	`]`
	`18`	`+ },`
	`19`	`+ {`
	`20`	`+ "SingularName": "BtuPerHourFootFahrenheit",`
	`21`	`+ "PluralName": "BtusPerHourFootFahrenheit",`
	`22`	`+ "FromUnitToBaseFunc": "x*1.73073467",`
	`23`	`+ "FromBaseToUnitFunc": "x/1.73073467",`
	`24`	`+ "Localization": [`
	`25`	`+ {`
	`26`	`+ "Culture": "en-US",`
	`27`	`+ "Abbreviations": [ "BTU/h·ft·°F" ]`
	`28`	`+ }`
	`29`	`+ ]`
`18`	`30`	`}`
`19`	`31`	`]`
`20`	`32`	`}`