diff --git a/Common/UnitDefinitions/Energy.json b/Common/UnitDefinitions/Energy.json index c1ea45e421..3795c4e1ad 100644 --- a/Common/UnitDefinitions/Energy.json +++ b/Common/UnitDefinitions/Energy.json @@ -57,10 +57,20 @@ "PluralName": "ElectronVolts", "FromUnitToBaseFunc": "x*1.602176565e-19", "FromBaseToUnitFunc": "x/1.602176565e-19", + "Prefixes": [ + "Kilo", + "Mega", + "Giga", + "Tera" + ], "Localization": [ { "Culture": "en-US", "Abbreviations": [ "eV" ] + }, + { + "Culture": "ru-RU", + "Abbreviations": [ "эВ" ] } ] }, diff --git a/UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToEnergyExtensionsTest.g.cs b/UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToEnergyExtensionsTest.g.cs index 3c5b460aba..bbb82cb2a9 100644 --- a/UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToEnergyExtensionsTest.g.cs +++ b/UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToEnergyExtensionsTest.g.cs @@ -60,6 +60,10 @@ public void NumberToFootPoundsTest() => public void NumberToGigabritishThermalUnitsTest() => Assert.Equal(Energy.FromGigabritishThermalUnits(2), 2.GigabritishThermalUnits()); + [Fact] + public void NumberToGigaelectronVoltsTest() => + Assert.Equal(Energy.FromGigaelectronVolts(2), 2.GigaelectronVolts()); + [Fact] public void NumberToGigajoulesTest() => Assert.Equal(Energy.FromGigajoules(2), 2.Gigajoules()); @@ -80,6 +84,10 @@ public void NumberToKilobritishThermalUnitsTest() => public void NumberToKilocaloriesTest() => Assert.Equal(Energy.FromKilocalories(2), 2.Kilocalories()); + [Fact] + public void NumberToKiloelectronVoltsTest() => + Assert.Equal(Energy.FromKiloelectronVolts(2), 2.KiloelectronVolts()); + [Fact] public void NumberToKilojoulesTest() => Assert.Equal(Energy.FromKilojoules(2), 2.Kilojoules()); @@ -96,6 +104,10 @@ public void NumberToMegabritishThermalUnitsTest() => public void NumberToMegacaloriesTest() => Assert.Equal(Energy.FromMegacalories(2), 2.Megacalories()); + [Fact] + public void NumberToMegaelectronVoltsTest() => + Assert.Equal(Energy.FromMegaelectronVolts(2), 2.MegaelectronVolts()); + [Fact] public void NumberToMegajoulesTest() => Assert.Equal(Energy.FromMegajoules(2), 2.Megajoules()); @@ -108,6 +120,10 @@ public void NumberToMegawattHoursTest() => public void NumberToMillijoulesTest() => Assert.Equal(Energy.FromMillijoules(2), 2.Millijoules()); + [Fact] + public void NumberToTeraelectronVoltsTest() => + Assert.Equal(Energy.FromTeraelectronVolts(2), 2.TeraelectronVolts()); + [Fact] public void NumberToTerawattHoursTest() => Assert.Equal(Energy.FromTerawattHours(2), 2.TerawattHours()); diff --git a/UnitsNet.NumberExtensions/GeneratedCode/NumberToEnergyExtensions.g.cs b/UnitsNet.NumberExtensions/GeneratedCode/NumberToEnergyExtensions.g.cs index 6f5b2bcb86..f77975062d 100644 --- a/UnitsNet.NumberExtensions/GeneratedCode/NumberToEnergyExtensions.g.cs +++ b/UnitsNet.NumberExtensions/GeneratedCode/NumberToEnergyExtensions.g.cs @@ -62,6 +62,10 @@ public static Energy FootPounds(this T value) => public static Energy GigabritishThermalUnits(this T value) => Energy.FromGigabritishThermalUnits(Convert.ToDouble(value)); + /// + public static Energy GigaelectronVolts(this T value) => + Energy.FromGigaelectronVolts(Convert.ToDouble(value)); + /// public static Energy Gigajoules(this T value) => Energy.FromGigajoules(Convert.ToDouble(value)); @@ -82,6 +86,10 @@ public static Energy KilobritishThermalUnits(this T value) => public static Energy Kilocalories(this T value) => Energy.FromKilocalories(Convert.ToDouble(value)); + /// + public static Energy KiloelectronVolts(this T value) => + Energy.FromKiloelectronVolts(Convert.ToDouble(value)); + /// public static Energy Kilojoules(this T value) => Energy.FromKilojoules(Convert.ToDouble(value)); @@ -98,6 +106,10 @@ public static Energy MegabritishThermalUnits(this T value) => public static Energy Megacalories(this T value) => Energy.FromMegacalories(Convert.ToDouble(value)); + /// + public static Energy MegaelectronVolts(this T value) => + Energy.FromMegaelectronVolts(Convert.ToDouble(value)); + /// public static Energy Megajoules(this T value) => Energy.FromMegajoules(Convert.ToDouble(value)); @@ -110,6 +122,10 @@ public static Energy MegawattHours(this T value) => public static Energy Millijoules(this T value) => Energy.FromMillijoules(Convert.ToDouble(value)); + /// + public static Energy TeraelectronVolts(this T value) => + Energy.FromTeraelectronVolts(Convert.ToDouble(value)); + /// public static Energy TerawattHours(this T value) => Energy.FromTerawattHours(Convert.ToDouble(value)); diff --git a/UnitsNet.Tests/CustomCode/EnergyTests.cs b/UnitsNet.Tests/CustomCode/EnergyTests.cs index 40c00b6547..e23431960b 100644 --- a/UnitsNet.Tests/CustomCode/EnergyTests.cs +++ b/UnitsNet.Tests/CustomCode/EnergyTests.cs @@ -1,4 +1,4 @@ -// Licensed under MIT No Attribution, see LICENSE file at the root. +// Licensed under MIT No Attribution, see LICENSE file at the root. // Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet. using UnitsNet.Units; @@ -32,8 +32,6 @@ public class EnergyTests : EnergyTestsBase protected override double DecathermsUsInOneJoule => 9.480434279733486e-10; - protected override double ElectronVoltsInOneJoule => 6.241509343260179e18; - protected override double ErgsInOneJoule => 10000000; protected override double MillijoulesInOneJoule => 1000; @@ -60,6 +58,17 @@ public class EnergyTests : EnergyTestsBase protected override double WattHoursInOneJoule => 0.000277777778; + protected override double ElectronVoltsInOneJoule => 6.241509343260179e18; + + protected override double KiloelectronVoltsInOneJoule => 6.2415093433e+15; + + protected override double MegaelectronVoltsInOneJoule => 6.2415093433e+12; + + protected override double GigaelectronVoltsInOneJoule => 6.2415093433e+9; + + protected override double TeraelectronVoltsInOneJoule => 6.2415093433e+6; + + [Fact] public void Constructor_UnitSystemSI_AssignsSIUnit() { diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/EnergyTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/EnergyTestsBase.g.cs index 058784b1a6..092a019875 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/EnergyTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/EnergyTestsBase.g.cs @@ -45,18 +45,22 @@ public abstract partial class EnergyTestsBase protected abstract double ErgsInOneJoule { get; } protected abstract double FootPoundsInOneJoule { get; } protected abstract double GigabritishThermalUnitsInOneJoule { get; } + protected abstract double GigaelectronVoltsInOneJoule { get; } protected abstract double GigajoulesInOneJoule { get; } protected abstract double GigawattHoursInOneJoule { get; } protected abstract double JoulesInOneJoule { get; } protected abstract double KilobritishThermalUnitsInOneJoule { get; } protected abstract double KilocaloriesInOneJoule { get; } + protected abstract double KiloelectronVoltsInOneJoule { get; } protected abstract double KilojoulesInOneJoule { get; } protected abstract double KilowattHoursInOneJoule { get; } protected abstract double MegabritishThermalUnitsInOneJoule { get; } protected abstract double MegacaloriesInOneJoule { get; } + protected abstract double MegaelectronVoltsInOneJoule { get; } protected abstract double MegajoulesInOneJoule { get; } protected abstract double MegawattHoursInOneJoule { get; } protected abstract double MillijoulesInOneJoule { get; } + protected abstract double TeraelectronVoltsInOneJoule { get; } protected abstract double TerawattHoursInOneJoule { get; } protected abstract double ThermsEcInOneJoule { get; } protected abstract double ThermsImperialInOneJoule { get; } @@ -73,18 +77,22 @@ public abstract partial class EnergyTestsBase protected virtual double ErgsTolerance { get { return 1e-5; } } protected virtual double FootPoundsTolerance { get { return 1e-5; } } protected virtual double GigabritishThermalUnitsTolerance { get { return 1e-5; } } + protected virtual double GigaelectronVoltsTolerance { get { return 1e-5; } } protected virtual double GigajoulesTolerance { get { return 1e-5; } } protected virtual double GigawattHoursTolerance { get { return 1e-5; } } protected virtual double JoulesTolerance { get { return 1e-5; } } protected virtual double KilobritishThermalUnitsTolerance { get { return 1e-5; } } protected virtual double KilocaloriesTolerance { get { return 1e-5; } } + protected virtual double KiloelectronVoltsTolerance { get { return 1e-5; } } protected virtual double KilojoulesTolerance { get { return 1e-5; } } protected virtual double KilowattHoursTolerance { get { return 1e-5; } } protected virtual double MegabritishThermalUnitsTolerance { get { return 1e-5; } } protected virtual double MegacaloriesTolerance { get { return 1e-5; } } + protected virtual double MegaelectronVoltsTolerance { get { return 1e-5; } } protected virtual double MegajoulesTolerance { get { return 1e-5; } } protected virtual double MegawattHoursTolerance { get { return 1e-5; } } protected virtual double MillijoulesTolerance { get { return 1e-5; } } + protected virtual double TeraelectronVoltsTolerance { get { return 1e-5; } } protected virtual double TerawattHoursTolerance { get { return 1e-5; } } protected virtual double ThermsEcTolerance { get { return 1e-5; } } protected virtual double ThermsImperialTolerance { get { return 1e-5; } } @@ -160,18 +168,22 @@ public void JouleToEnergyUnits() AssertEx.EqualTolerance(ErgsInOneJoule, joule.Ergs, ErgsTolerance); AssertEx.EqualTolerance(FootPoundsInOneJoule, joule.FootPounds, FootPoundsTolerance); AssertEx.EqualTolerance(GigabritishThermalUnitsInOneJoule, joule.GigabritishThermalUnits, GigabritishThermalUnitsTolerance); + AssertEx.EqualTolerance(GigaelectronVoltsInOneJoule, joule.GigaelectronVolts, GigaelectronVoltsTolerance); AssertEx.EqualTolerance(GigajoulesInOneJoule, joule.Gigajoules, GigajoulesTolerance); AssertEx.EqualTolerance(GigawattHoursInOneJoule, joule.GigawattHours, GigawattHoursTolerance); AssertEx.EqualTolerance(JoulesInOneJoule, joule.Joules, JoulesTolerance); AssertEx.EqualTolerance(KilobritishThermalUnitsInOneJoule, joule.KilobritishThermalUnits, KilobritishThermalUnitsTolerance); AssertEx.EqualTolerance(KilocaloriesInOneJoule, joule.Kilocalories, KilocaloriesTolerance); + AssertEx.EqualTolerance(KiloelectronVoltsInOneJoule, joule.KiloelectronVolts, KiloelectronVoltsTolerance); AssertEx.EqualTolerance(KilojoulesInOneJoule, joule.Kilojoules, KilojoulesTolerance); AssertEx.EqualTolerance(KilowattHoursInOneJoule, joule.KilowattHours, KilowattHoursTolerance); AssertEx.EqualTolerance(MegabritishThermalUnitsInOneJoule, joule.MegabritishThermalUnits, MegabritishThermalUnitsTolerance); AssertEx.EqualTolerance(MegacaloriesInOneJoule, joule.Megacalories, MegacaloriesTolerance); + AssertEx.EqualTolerance(MegaelectronVoltsInOneJoule, joule.MegaelectronVolts, MegaelectronVoltsTolerance); AssertEx.EqualTolerance(MegajoulesInOneJoule, joule.Megajoules, MegajoulesTolerance); AssertEx.EqualTolerance(MegawattHoursInOneJoule, joule.MegawattHours, MegawattHoursTolerance); AssertEx.EqualTolerance(MillijoulesInOneJoule, joule.Millijoules, MillijoulesTolerance); + AssertEx.EqualTolerance(TeraelectronVoltsInOneJoule, joule.TeraelectronVolts, TeraelectronVoltsTolerance); AssertEx.EqualTolerance(TerawattHoursInOneJoule, joule.TerawattHours, TerawattHoursTolerance); AssertEx.EqualTolerance(ThermsEcInOneJoule, joule.ThermsEc, ThermsEcTolerance); AssertEx.EqualTolerance(ThermsImperialInOneJoule, joule.ThermsImperial, ThermsImperialTolerance); @@ -218,73 +230,89 @@ public void From_ValueAndUnit_ReturnsQuantityWithSameValueAndUnit() AssertEx.EqualTolerance(1, quantity08.GigabritishThermalUnits, GigabritishThermalUnitsTolerance); Assert.Equal(EnergyUnit.GigabritishThermalUnit, quantity08.Unit); - var quantity09 = Energy.From(1, EnergyUnit.Gigajoule); - AssertEx.EqualTolerance(1, quantity09.Gigajoules, GigajoulesTolerance); - Assert.Equal(EnergyUnit.Gigajoule, quantity09.Unit); + var quantity09 = Energy.From(1, EnergyUnit.GigaelectronVolt); + AssertEx.EqualTolerance(1, quantity09.GigaelectronVolts, GigaelectronVoltsTolerance); + Assert.Equal(EnergyUnit.GigaelectronVolt, quantity09.Unit); - var quantity10 = Energy.From(1, EnergyUnit.GigawattHour); - AssertEx.EqualTolerance(1, quantity10.GigawattHours, GigawattHoursTolerance); - Assert.Equal(EnergyUnit.GigawattHour, quantity10.Unit); + var quantity10 = Energy.From(1, EnergyUnit.Gigajoule); + AssertEx.EqualTolerance(1, quantity10.Gigajoules, GigajoulesTolerance); + Assert.Equal(EnergyUnit.Gigajoule, quantity10.Unit); - var quantity11 = Energy.From(1, EnergyUnit.Joule); - AssertEx.EqualTolerance(1, quantity11.Joules, JoulesTolerance); - Assert.Equal(EnergyUnit.Joule, quantity11.Unit); + var quantity11 = Energy.From(1, EnergyUnit.GigawattHour); + AssertEx.EqualTolerance(1, quantity11.GigawattHours, GigawattHoursTolerance); + Assert.Equal(EnergyUnit.GigawattHour, quantity11.Unit); - var quantity12 = Energy.From(1, EnergyUnit.KilobritishThermalUnit); - AssertEx.EqualTolerance(1, quantity12.KilobritishThermalUnits, KilobritishThermalUnitsTolerance); - Assert.Equal(EnergyUnit.KilobritishThermalUnit, quantity12.Unit); + var quantity12 = Energy.From(1, EnergyUnit.Joule); + AssertEx.EqualTolerance(1, quantity12.Joules, JoulesTolerance); + Assert.Equal(EnergyUnit.Joule, quantity12.Unit); - var quantity13 = Energy.From(1, EnergyUnit.Kilocalorie); - AssertEx.EqualTolerance(1, quantity13.Kilocalories, KilocaloriesTolerance); - Assert.Equal(EnergyUnit.Kilocalorie, quantity13.Unit); + var quantity13 = Energy.From(1, EnergyUnit.KilobritishThermalUnit); + AssertEx.EqualTolerance(1, quantity13.KilobritishThermalUnits, KilobritishThermalUnitsTolerance); + Assert.Equal(EnergyUnit.KilobritishThermalUnit, quantity13.Unit); - var quantity14 = Energy.From(1, EnergyUnit.Kilojoule); - AssertEx.EqualTolerance(1, quantity14.Kilojoules, KilojoulesTolerance); - Assert.Equal(EnergyUnit.Kilojoule, quantity14.Unit); + var quantity14 = Energy.From(1, EnergyUnit.Kilocalorie); + AssertEx.EqualTolerance(1, quantity14.Kilocalories, KilocaloriesTolerance); + Assert.Equal(EnergyUnit.Kilocalorie, quantity14.Unit); - var quantity15 = Energy.From(1, EnergyUnit.KilowattHour); - AssertEx.EqualTolerance(1, quantity15.KilowattHours, KilowattHoursTolerance); - Assert.Equal(EnergyUnit.KilowattHour, quantity15.Unit); + var quantity15 = Energy.From(1, EnergyUnit.KiloelectronVolt); + AssertEx.EqualTolerance(1, quantity15.KiloelectronVolts, KiloelectronVoltsTolerance); + Assert.Equal(EnergyUnit.KiloelectronVolt, quantity15.Unit); - var quantity16 = Energy.From(1, EnergyUnit.MegabritishThermalUnit); - AssertEx.EqualTolerance(1, quantity16.MegabritishThermalUnits, MegabritishThermalUnitsTolerance); - Assert.Equal(EnergyUnit.MegabritishThermalUnit, quantity16.Unit); + var quantity16 = Energy.From(1, EnergyUnit.Kilojoule); + AssertEx.EqualTolerance(1, quantity16.Kilojoules, KilojoulesTolerance); + Assert.Equal(EnergyUnit.Kilojoule, quantity16.Unit); - var quantity17 = Energy.From(1, EnergyUnit.Megacalorie); - AssertEx.EqualTolerance(1, quantity17.Megacalories, MegacaloriesTolerance); - Assert.Equal(EnergyUnit.Megacalorie, quantity17.Unit); + var quantity17 = Energy.From(1, EnergyUnit.KilowattHour); + AssertEx.EqualTolerance(1, quantity17.KilowattHours, KilowattHoursTolerance); + Assert.Equal(EnergyUnit.KilowattHour, quantity17.Unit); - var quantity18 = Energy.From(1, EnergyUnit.Megajoule); - AssertEx.EqualTolerance(1, quantity18.Megajoules, MegajoulesTolerance); - Assert.Equal(EnergyUnit.Megajoule, quantity18.Unit); + var quantity18 = Energy.From(1, EnergyUnit.MegabritishThermalUnit); + AssertEx.EqualTolerance(1, quantity18.MegabritishThermalUnits, MegabritishThermalUnitsTolerance); + Assert.Equal(EnergyUnit.MegabritishThermalUnit, quantity18.Unit); - var quantity19 = Energy.From(1, EnergyUnit.MegawattHour); - AssertEx.EqualTolerance(1, quantity19.MegawattHours, MegawattHoursTolerance); - Assert.Equal(EnergyUnit.MegawattHour, quantity19.Unit); + var quantity19 = Energy.From(1, EnergyUnit.Megacalorie); + AssertEx.EqualTolerance(1, quantity19.Megacalories, MegacaloriesTolerance); + Assert.Equal(EnergyUnit.Megacalorie, quantity19.Unit); - var quantity20 = Energy.From(1, EnergyUnit.Millijoule); - AssertEx.EqualTolerance(1, quantity20.Millijoules, MillijoulesTolerance); - Assert.Equal(EnergyUnit.Millijoule, quantity20.Unit); + var quantity20 = Energy.From(1, EnergyUnit.MegaelectronVolt); + AssertEx.EqualTolerance(1, quantity20.MegaelectronVolts, MegaelectronVoltsTolerance); + Assert.Equal(EnergyUnit.MegaelectronVolt, quantity20.Unit); - var quantity21 = Energy.From(1, EnergyUnit.TerawattHour); - AssertEx.EqualTolerance(1, quantity21.TerawattHours, TerawattHoursTolerance); - Assert.Equal(EnergyUnit.TerawattHour, quantity21.Unit); + var quantity21 = Energy.From(1, EnergyUnit.Megajoule); + AssertEx.EqualTolerance(1, quantity21.Megajoules, MegajoulesTolerance); + Assert.Equal(EnergyUnit.Megajoule, quantity21.Unit); - var quantity22 = Energy.From(1, EnergyUnit.ThermEc); - AssertEx.EqualTolerance(1, quantity22.ThermsEc, ThermsEcTolerance); - Assert.Equal(EnergyUnit.ThermEc, quantity22.Unit); + var quantity22 = Energy.From(1, EnergyUnit.MegawattHour); + AssertEx.EqualTolerance(1, quantity22.MegawattHours, MegawattHoursTolerance); + Assert.Equal(EnergyUnit.MegawattHour, quantity22.Unit); - var quantity23 = Energy.From(1, EnergyUnit.ThermImperial); - AssertEx.EqualTolerance(1, quantity23.ThermsImperial, ThermsImperialTolerance); - Assert.Equal(EnergyUnit.ThermImperial, quantity23.Unit); + var quantity23 = Energy.From(1, EnergyUnit.Millijoule); + AssertEx.EqualTolerance(1, quantity23.Millijoules, MillijoulesTolerance); + Assert.Equal(EnergyUnit.Millijoule, quantity23.Unit); - var quantity24 = Energy.From(1, EnergyUnit.ThermUs); - AssertEx.EqualTolerance(1, quantity24.ThermsUs, ThermsUsTolerance); - Assert.Equal(EnergyUnit.ThermUs, quantity24.Unit); + var quantity24 = Energy.From(1, EnergyUnit.TeraelectronVolt); + AssertEx.EqualTolerance(1, quantity24.TeraelectronVolts, TeraelectronVoltsTolerance); + Assert.Equal(EnergyUnit.TeraelectronVolt, quantity24.Unit); - var quantity25 = Energy.From(1, EnergyUnit.WattHour); - AssertEx.EqualTolerance(1, quantity25.WattHours, WattHoursTolerance); - Assert.Equal(EnergyUnit.WattHour, quantity25.Unit); + var quantity25 = Energy.From(1, EnergyUnit.TerawattHour); + AssertEx.EqualTolerance(1, quantity25.TerawattHours, TerawattHoursTolerance); + Assert.Equal(EnergyUnit.TerawattHour, quantity25.Unit); + + var quantity26 = Energy.From(1, EnergyUnit.ThermEc); + AssertEx.EqualTolerance(1, quantity26.ThermsEc, ThermsEcTolerance); + Assert.Equal(EnergyUnit.ThermEc, quantity26.Unit); + + var quantity27 = Energy.From(1, EnergyUnit.ThermImperial); + AssertEx.EqualTolerance(1, quantity27.ThermsImperial, ThermsImperialTolerance); + Assert.Equal(EnergyUnit.ThermImperial, quantity27.Unit); + + var quantity28 = Energy.From(1, EnergyUnit.ThermUs); + AssertEx.EqualTolerance(1, quantity28.ThermsUs, ThermsUsTolerance); + Assert.Equal(EnergyUnit.ThermUs, quantity28.Unit); + + var quantity29 = Energy.From(1, EnergyUnit.WattHour); + AssertEx.EqualTolerance(1, quantity29.WattHours, WattHoursTolerance); + Assert.Equal(EnergyUnit.WattHour, quantity29.Unit); } @@ -314,18 +342,22 @@ public void As() AssertEx.EqualTolerance(ErgsInOneJoule, joule.As(EnergyUnit.Erg), ErgsTolerance); AssertEx.EqualTolerance(FootPoundsInOneJoule, joule.As(EnergyUnit.FootPound), FootPoundsTolerance); AssertEx.EqualTolerance(GigabritishThermalUnitsInOneJoule, joule.As(EnergyUnit.GigabritishThermalUnit), GigabritishThermalUnitsTolerance); + AssertEx.EqualTolerance(GigaelectronVoltsInOneJoule, joule.As(EnergyUnit.GigaelectronVolt), GigaelectronVoltsTolerance); AssertEx.EqualTolerance(GigajoulesInOneJoule, joule.As(EnergyUnit.Gigajoule), GigajoulesTolerance); AssertEx.EqualTolerance(GigawattHoursInOneJoule, joule.As(EnergyUnit.GigawattHour), GigawattHoursTolerance); AssertEx.EqualTolerance(JoulesInOneJoule, joule.As(EnergyUnit.Joule), JoulesTolerance); AssertEx.EqualTolerance(KilobritishThermalUnitsInOneJoule, joule.As(EnergyUnit.KilobritishThermalUnit), KilobritishThermalUnitsTolerance); AssertEx.EqualTolerance(KilocaloriesInOneJoule, joule.As(EnergyUnit.Kilocalorie), KilocaloriesTolerance); + AssertEx.EqualTolerance(KiloelectronVoltsInOneJoule, joule.As(EnergyUnit.KiloelectronVolt), KiloelectronVoltsTolerance); AssertEx.EqualTolerance(KilojoulesInOneJoule, joule.As(EnergyUnit.Kilojoule), KilojoulesTolerance); AssertEx.EqualTolerance(KilowattHoursInOneJoule, joule.As(EnergyUnit.KilowattHour), KilowattHoursTolerance); AssertEx.EqualTolerance(MegabritishThermalUnitsInOneJoule, joule.As(EnergyUnit.MegabritishThermalUnit), MegabritishThermalUnitsTolerance); AssertEx.EqualTolerance(MegacaloriesInOneJoule, joule.As(EnergyUnit.Megacalorie), MegacaloriesTolerance); + AssertEx.EqualTolerance(MegaelectronVoltsInOneJoule, joule.As(EnergyUnit.MegaelectronVolt), MegaelectronVoltsTolerance); AssertEx.EqualTolerance(MegajoulesInOneJoule, joule.As(EnergyUnit.Megajoule), MegajoulesTolerance); AssertEx.EqualTolerance(MegawattHoursInOneJoule, joule.As(EnergyUnit.MegawattHour), MegawattHoursTolerance); AssertEx.EqualTolerance(MillijoulesInOneJoule, joule.As(EnergyUnit.Millijoule), MillijoulesTolerance); + AssertEx.EqualTolerance(TeraelectronVoltsInOneJoule, joule.As(EnergyUnit.TeraelectronVolt), TeraelectronVoltsTolerance); AssertEx.EqualTolerance(TerawattHoursInOneJoule, joule.As(EnergyUnit.TerawattHour), TerawattHoursTolerance); AssertEx.EqualTolerance(ThermsEcInOneJoule, joule.As(EnergyUnit.ThermEc), ThermsEcTolerance); AssertEx.EqualTolerance(ThermsImperialInOneJoule, joule.As(EnergyUnit.ThermImperial), ThermsImperialTolerance); @@ -374,6 +406,10 @@ public void ToUnit() AssertEx.EqualTolerance(GigabritishThermalUnitsInOneJoule, (double)gigabritishthermalunitQuantity.Value, GigabritishThermalUnitsTolerance); Assert.Equal(EnergyUnit.GigabritishThermalUnit, gigabritishthermalunitQuantity.Unit); + var gigaelectronvoltQuantity = joule.ToUnit(EnergyUnit.GigaelectronVolt); + AssertEx.EqualTolerance(GigaelectronVoltsInOneJoule, (double)gigaelectronvoltQuantity.Value, GigaelectronVoltsTolerance); + Assert.Equal(EnergyUnit.GigaelectronVolt, gigaelectronvoltQuantity.Unit); + var gigajouleQuantity = joule.ToUnit(EnergyUnit.Gigajoule); AssertEx.EqualTolerance(GigajoulesInOneJoule, (double)gigajouleQuantity.Value, GigajoulesTolerance); Assert.Equal(EnergyUnit.Gigajoule, gigajouleQuantity.Unit); @@ -394,6 +430,10 @@ public void ToUnit() AssertEx.EqualTolerance(KilocaloriesInOneJoule, (double)kilocalorieQuantity.Value, KilocaloriesTolerance); Assert.Equal(EnergyUnit.Kilocalorie, kilocalorieQuantity.Unit); + var kiloelectronvoltQuantity = joule.ToUnit(EnergyUnit.KiloelectronVolt); + AssertEx.EqualTolerance(KiloelectronVoltsInOneJoule, (double)kiloelectronvoltQuantity.Value, KiloelectronVoltsTolerance); + Assert.Equal(EnergyUnit.KiloelectronVolt, kiloelectronvoltQuantity.Unit); + var kilojouleQuantity = joule.ToUnit(EnergyUnit.Kilojoule); AssertEx.EqualTolerance(KilojoulesInOneJoule, (double)kilojouleQuantity.Value, KilojoulesTolerance); Assert.Equal(EnergyUnit.Kilojoule, kilojouleQuantity.Unit); @@ -410,6 +450,10 @@ public void ToUnit() AssertEx.EqualTolerance(MegacaloriesInOneJoule, (double)megacalorieQuantity.Value, MegacaloriesTolerance); Assert.Equal(EnergyUnit.Megacalorie, megacalorieQuantity.Unit); + var megaelectronvoltQuantity = joule.ToUnit(EnergyUnit.MegaelectronVolt); + AssertEx.EqualTolerance(MegaelectronVoltsInOneJoule, (double)megaelectronvoltQuantity.Value, MegaelectronVoltsTolerance); + Assert.Equal(EnergyUnit.MegaelectronVolt, megaelectronvoltQuantity.Unit); + var megajouleQuantity = joule.ToUnit(EnergyUnit.Megajoule); AssertEx.EqualTolerance(MegajoulesInOneJoule, (double)megajouleQuantity.Value, MegajoulesTolerance); Assert.Equal(EnergyUnit.Megajoule, megajouleQuantity.Unit); @@ -422,6 +466,10 @@ public void ToUnit() AssertEx.EqualTolerance(MillijoulesInOneJoule, (double)millijouleQuantity.Value, MillijoulesTolerance); Assert.Equal(EnergyUnit.Millijoule, millijouleQuantity.Unit); + var teraelectronvoltQuantity = joule.ToUnit(EnergyUnit.TeraelectronVolt); + AssertEx.EqualTolerance(TeraelectronVoltsInOneJoule, (double)teraelectronvoltQuantity.Value, TeraelectronVoltsTolerance); + Assert.Equal(EnergyUnit.TeraelectronVolt, teraelectronvoltQuantity.Unit); + var terawatthourQuantity = joule.ToUnit(EnergyUnit.TerawattHour); AssertEx.EqualTolerance(TerawattHoursInOneJoule, (double)terawatthourQuantity.Value, TerawattHoursTolerance); Assert.Equal(EnergyUnit.TerawattHour, terawatthourQuantity.Unit); @@ -456,18 +504,22 @@ public void ConversionRoundTrip() AssertEx.EqualTolerance(1, Energy.FromErgs(joule.Ergs).Joules, ErgsTolerance); AssertEx.EqualTolerance(1, Energy.FromFootPounds(joule.FootPounds).Joules, FootPoundsTolerance); AssertEx.EqualTolerance(1, Energy.FromGigabritishThermalUnits(joule.GigabritishThermalUnits).Joules, GigabritishThermalUnitsTolerance); + AssertEx.EqualTolerance(1, Energy.FromGigaelectronVolts(joule.GigaelectronVolts).Joules, GigaelectronVoltsTolerance); AssertEx.EqualTolerance(1, Energy.FromGigajoules(joule.Gigajoules).Joules, GigajoulesTolerance); AssertEx.EqualTolerance(1, Energy.FromGigawattHours(joule.GigawattHours).Joules, GigawattHoursTolerance); AssertEx.EqualTolerance(1, Energy.FromJoules(joule.Joules).Joules, JoulesTolerance); AssertEx.EqualTolerance(1, Energy.FromKilobritishThermalUnits(joule.KilobritishThermalUnits).Joules, KilobritishThermalUnitsTolerance); AssertEx.EqualTolerance(1, Energy.FromKilocalories(joule.Kilocalories).Joules, KilocaloriesTolerance); + AssertEx.EqualTolerance(1, Energy.FromKiloelectronVolts(joule.KiloelectronVolts).Joules, KiloelectronVoltsTolerance); AssertEx.EqualTolerance(1, Energy.FromKilojoules(joule.Kilojoules).Joules, KilojoulesTolerance); AssertEx.EqualTolerance(1, Energy.FromKilowattHours(joule.KilowattHours).Joules, KilowattHoursTolerance); AssertEx.EqualTolerance(1, Energy.FromMegabritishThermalUnits(joule.MegabritishThermalUnits).Joules, MegabritishThermalUnitsTolerance); AssertEx.EqualTolerance(1, Energy.FromMegacalories(joule.Megacalories).Joules, MegacaloriesTolerance); + AssertEx.EqualTolerance(1, Energy.FromMegaelectronVolts(joule.MegaelectronVolts).Joules, MegaelectronVoltsTolerance); AssertEx.EqualTolerance(1, Energy.FromMegajoules(joule.Megajoules).Joules, MegajoulesTolerance); AssertEx.EqualTolerance(1, Energy.FromMegawattHours(joule.MegawattHours).Joules, MegawattHoursTolerance); AssertEx.EqualTolerance(1, Energy.FromMillijoules(joule.Millijoules).Joules, MillijoulesTolerance); + AssertEx.EqualTolerance(1, Energy.FromTeraelectronVolts(joule.TeraelectronVolts).Joules, TeraelectronVoltsTolerance); AssertEx.EqualTolerance(1, Energy.FromTerawattHours(joule.TerawattHours).Joules, TerawattHoursTolerance); AssertEx.EqualTolerance(1, Energy.FromThermsEc(joule.ThermsEc).Joules, ThermsEcTolerance); AssertEx.EqualTolerance(1, Energy.FromThermsImperial(joule.ThermsImperial).Joules, ThermsImperialTolerance); @@ -621,18 +673,22 @@ public void ToString_ReturnsValueAndUnitAbbreviationInCurrentCulture() Assert.Equal("1 erg", new Energy(1, EnergyUnit.Erg).ToString()); Assert.Equal("1 ft·lb", new Energy(1, EnergyUnit.FootPound).ToString()); Assert.Equal("1 GBTU", new Energy(1, EnergyUnit.GigabritishThermalUnit).ToString()); + Assert.Equal("1 GeV", new Energy(1, EnergyUnit.GigaelectronVolt).ToString()); Assert.Equal("1 GJ", new Energy(1, EnergyUnit.Gigajoule).ToString()); Assert.Equal("1 GWh", new Energy(1, EnergyUnit.GigawattHour).ToString()); Assert.Equal("1 J", new Energy(1, EnergyUnit.Joule).ToString()); Assert.Equal("1 kBTU", new Energy(1, EnergyUnit.KilobritishThermalUnit).ToString()); Assert.Equal("1 kcal", new Energy(1, EnergyUnit.Kilocalorie).ToString()); + Assert.Equal("1 keV", new Energy(1, EnergyUnit.KiloelectronVolt).ToString()); Assert.Equal("1 kJ", new Energy(1, EnergyUnit.Kilojoule).ToString()); Assert.Equal("1 kWh", new Energy(1, EnergyUnit.KilowattHour).ToString()); Assert.Equal("1 MBTU", new Energy(1, EnergyUnit.MegabritishThermalUnit).ToString()); Assert.Equal("1 Mcal", new Energy(1, EnergyUnit.Megacalorie).ToString()); + Assert.Equal("1 MeV", new Energy(1, EnergyUnit.MegaelectronVolt).ToString()); Assert.Equal("1 MJ", new Energy(1, EnergyUnit.Megajoule).ToString()); Assert.Equal("1 MWh", new Energy(1, EnergyUnit.MegawattHour).ToString()); Assert.Equal("1 mJ", new Energy(1, EnergyUnit.Millijoule).ToString()); + Assert.Equal("1 TeV", new Energy(1, EnergyUnit.TeraelectronVolt).ToString()); Assert.Equal("1 TWh", new Energy(1, EnergyUnit.TerawattHour).ToString()); Assert.Equal("1 th (E.C.)", new Energy(1, EnergyUnit.ThermEc).ToString()); Assert.Equal("1 th (imp.)", new Energy(1, EnergyUnit.ThermImperial).ToString()); @@ -660,18 +716,22 @@ public void ToString_WithSwedishCulture_ReturnsUnitAbbreviationForEnglishCulture Assert.Equal("1 erg", new Energy(1, EnergyUnit.Erg).ToString(swedishCulture)); Assert.Equal("1 ft·lb", new Energy(1, EnergyUnit.FootPound).ToString(swedishCulture)); Assert.Equal("1 GBTU", new Energy(1, EnergyUnit.GigabritishThermalUnit).ToString(swedishCulture)); + Assert.Equal("1 GeV", new Energy(1, EnergyUnit.GigaelectronVolt).ToString(swedishCulture)); Assert.Equal("1 GJ", new Energy(1, EnergyUnit.Gigajoule).ToString(swedishCulture)); Assert.Equal("1 GWh", new Energy(1, EnergyUnit.GigawattHour).ToString(swedishCulture)); Assert.Equal("1 J", new Energy(1, EnergyUnit.Joule).ToString(swedishCulture)); Assert.Equal("1 kBTU", new Energy(1, EnergyUnit.KilobritishThermalUnit).ToString(swedishCulture)); Assert.Equal("1 kcal", new Energy(1, EnergyUnit.Kilocalorie).ToString(swedishCulture)); + Assert.Equal("1 keV", new Energy(1, EnergyUnit.KiloelectronVolt).ToString(swedishCulture)); Assert.Equal("1 kJ", new Energy(1, EnergyUnit.Kilojoule).ToString(swedishCulture)); Assert.Equal("1 kWh", new Energy(1, EnergyUnit.KilowattHour).ToString(swedishCulture)); Assert.Equal("1 MBTU", new Energy(1, EnergyUnit.MegabritishThermalUnit).ToString(swedishCulture)); Assert.Equal("1 Mcal", new Energy(1, EnergyUnit.Megacalorie).ToString(swedishCulture)); + Assert.Equal("1 MeV", new Energy(1, EnergyUnit.MegaelectronVolt).ToString(swedishCulture)); Assert.Equal("1 MJ", new Energy(1, EnergyUnit.Megajoule).ToString(swedishCulture)); Assert.Equal("1 MWh", new Energy(1, EnergyUnit.MegawattHour).ToString(swedishCulture)); Assert.Equal("1 mJ", new Energy(1, EnergyUnit.Millijoule).ToString(swedishCulture)); + Assert.Equal("1 TeV", new Energy(1, EnergyUnit.TeraelectronVolt).ToString(swedishCulture)); Assert.Equal("1 TWh", new Energy(1, EnergyUnit.TerawattHour).ToString(swedishCulture)); Assert.Equal("1 th (E.C.)", new Energy(1, EnergyUnit.ThermEc).ToString(swedishCulture)); Assert.Equal("1 th (imp.)", new Energy(1, EnergyUnit.ThermImperial).ToString(swedishCulture)); diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Energy.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Energy.g.cs index 857253545d..4b88a7acf3 100644 --- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Energy.g.cs +++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Energy.g.cs @@ -200,6 +200,11 @@ private Energy(double value, EnergyUnit unit) /// public double GigabritishThermalUnits => As(EnergyUnit.GigabritishThermalUnit); + /// + /// Get Energy in GigaelectronVolts. + /// + public double GigaelectronVolts => As(EnergyUnit.GigaelectronVolt); + /// /// Get Energy in Gigajoules. /// @@ -225,6 +230,11 @@ private Energy(double value, EnergyUnit unit) /// public double Kilocalories => As(EnergyUnit.Kilocalorie); + /// + /// Get Energy in KiloelectronVolts. + /// + public double KiloelectronVolts => As(EnergyUnit.KiloelectronVolt); + /// /// Get Energy in Kilojoules. /// @@ -245,6 +255,11 @@ private Energy(double value, EnergyUnit unit) /// public double Megacalories => As(EnergyUnit.Megacalorie); + /// + /// Get Energy in MegaelectronVolts. + /// + public double MegaelectronVolts => As(EnergyUnit.MegaelectronVolt); + /// /// Get Energy in Megajoules. /// @@ -260,6 +275,11 @@ private Energy(double value, EnergyUnit unit) /// public double Millijoules => As(EnergyUnit.Millijoule); + /// + /// Get Energy in TeraelectronVolts. + /// + public double TeraelectronVolts => As(EnergyUnit.TeraelectronVolt); + /// /// Get Energy in TerawattHours. /// @@ -406,6 +426,16 @@ public static Energy FromGigabritishThermalUnits(double gigabritishthermalunits) return new Energy(value, EnergyUnit.GigabritishThermalUnit); } /// + /// Get Energy from GigaelectronVolts. + /// + /// If value is NaN or Infinity. + [Windows.Foundation.Metadata.DefaultOverload] + public static Energy FromGigaelectronVolts(double gigaelectronvolts) + { + double value = (double) gigaelectronvolts; + return new Energy(value, EnergyUnit.GigaelectronVolt); + } + /// /// Get Energy from Gigajoules. /// /// If value is NaN or Infinity. @@ -456,6 +486,16 @@ public static Energy FromKilocalories(double kilocalories) return new Energy(value, EnergyUnit.Kilocalorie); } /// + /// Get Energy from KiloelectronVolts. + /// + /// If value is NaN or Infinity. + [Windows.Foundation.Metadata.DefaultOverload] + public static Energy FromKiloelectronVolts(double kiloelectronvolts) + { + double value = (double) kiloelectronvolts; + return new Energy(value, EnergyUnit.KiloelectronVolt); + } + /// /// Get Energy from Kilojoules. /// /// If value is NaN or Infinity. @@ -496,6 +536,16 @@ public static Energy FromMegacalories(double megacalories) return new Energy(value, EnergyUnit.Megacalorie); } /// + /// Get Energy from MegaelectronVolts. + /// + /// If value is NaN or Infinity. + [Windows.Foundation.Metadata.DefaultOverload] + public static Energy FromMegaelectronVolts(double megaelectronvolts) + { + double value = (double) megaelectronvolts; + return new Energy(value, EnergyUnit.MegaelectronVolt); + } + /// /// Get Energy from Megajoules. /// /// If value is NaN or Infinity. @@ -526,6 +576,16 @@ public static Energy FromMillijoules(double millijoules) return new Energy(value, EnergyUnit.Millijoule); } /// + /// Get Energy from TeraelectronVolts. + /// + /// If value is NaN or Infinity. + [Windows.Foundation.Metadata.DefaultOverload] + public static Energy FromTeraelectronVolts(double teraelectronvolts) + { + double value = (double) teraelectronvolts; + return new Energy(value, EnergyUnit.TeraelectronVolt); + } + /// /// Get Energy from TerawattHours. /// /// If value is NaN or Infinity. @@ -875,18 +935,22 @@ private double AsBaseUnit() case EnergyUnit.Erg: return _value*1e-7; case EnergyUnit.FootPound: return _value*1.355817948; case EnergyUnit.GigabritishThermalUnit: return (_value*1055.05585262) * 1e9d; + case EnergyUnit.GigaelectronVolt: return (_value*1.602176565e-19) * 1e9d; case EnergyUnit.Gigajoule: return (_value) * 1e9d; case EnergyUnit.GigawattHour: return (_value*3600d) * 1e9d; case EnergyUnit.Joule: return _value; case EnergyUnit.KilobritishThermalUnit: return (_value*1055.05585262) * 1e3d; case EnergyUnit.Kilocalorie: return (_value*4.184) * 1e3d; + case EnergyUnit.KiloelectronVolt: return (_value*1.602176565e-19) * 1e3d; case EnergyUnit.Kilojoule: return (_value) * 1e3d; case EnergyUnit.KilowattHour: return (_value*3600d) * 1e3d; case EnergyUnit.MegabritishThermalUnit: return (_value*1055.05585262) * 1e6d; case EnergyUnit.Megacalorie: return (_value*4.184) * 1e6d; + case EnergyUnit.MegaelectronVolt: return (_value*1.602176565e-19) * 1e6d; case EnergyUnit.Megajoule: return (_value) * 1e6d; case EnergyUnit.MegawattHour: return (_value*3600d) * 1e6d; case EnergyUnit.Millijoule: return (_value) * 1e-3d; + case EnergyUnit.TeraelectronVolt: return (_value*1.602176565e-19) * 1e12d; case EnergyUnit.TerawattHour: return (_value*3600d) * 1e12d; case EnergyUnit.ThermEc: return _value*1.05505585262e8; case EnergyUnit.ThermImperial: return _value*1.05505585257348e8; @@ -915,18 +979,22 @@ private double AsBaseNumericType(EnergyUnit unit) case EnergyUnit.Erg: return baseUnitValue/1e-7; case EnergyUnit.FootPound: return baseUnitValue/1.355817948; case EnergyUnit.GigabritishThermalUnit: return (baseUnitValue/1055.05585262) / 1e9d; + case EnergyUnit.GigaelectronVolt: return (baseUnitValue/1.602176565e-19) / 1e9d; case EnergyUnit.Gigajoule: return (baseUnitValue) / 1e9d; case EnergyUnit.GigawattHour: return (baseUnitValue/3600d) / 1e9d; case EnergyUnit.Joule: return baseUnitValue; case EnergyUnit.KilobritishThermalUnit: return (baseUnitValue/1055.05585262) / 1e3d; case EnergyUnit.Kilocalorie: return (baseUnitValue/4.184) / 1e3d; + case EnergyUnit.KiloelectronVolt: return (baseUnitValue/1.602176565e-19) / 1e3d; case EnergyUnit.Kilojoule: return (baseUnitValue) / 1e3d; case EnergyUnit.KilowattHour: return (baseUnitValue/3600d) / 1e3d; case EnergyUnit.MegabritishThermalUnit: return (baseUnitValue/1055.05585262) / 1e6d; case EnergyUnit.Megacalorie: return (baseUnitValue/4.184) / 1e6d; + case EnergyUnit.MegaelectronVolt: return (baseUnitValue/1.602176565e-19) / 1e6d; case EnergyUnit.Megajoule: return (baseUnitValue) / 1e6d; case EnergyUnit.MegawattHour: return (baseUnitValue/3600d) / 1e6d; case EnergyUnit.Millijoule: return (baseUnitValue) / 1e-3d; + case EnergyUnit.TeraelectronVolt: return (baseUnitValue/1.602176565e-19) / 1e12d; case EnergyUnit.TerawattHour: return (baseUnitValue/3600d) / 1e12d; case EnergyUnit.ThermEc: return baseUnitValue/1.05505585262e8; case EnergyUnit.ThermImperial: return baseUnitValue/1.05505585257348e8; diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/UnitAbbreviationsCache.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/UnitAbbreviationsCache.g.cs index ee5d4903d4..31b0279ea9 100644 --- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/UnitAbbreviationsCache.g.cs +++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/UnitAbbreviationsCache.g.cs @@ -321,24 +321,33 @@ private static readonly (string CultureName, Type UnitType, int UnitValue, strin ("en-US", typeof(EnergyUnit), (int)EnergyUnit.DecathermUs, new string[]{"Dth (U.S.)"}), ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.DecathermUs, new string[]{"Американский декатерм"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.ElectronVolt, new string[]{"eV"}), + ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.ElectronVolt, new string[]{"эВ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Erg, new string[]{"erg"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.FootPound, new string[]{"ft·lb"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.GigabritishThermalUnit, new string[]{"GBTU"}), + ("en-US", typeof(EnergyUnit), (int)EnergyUnit.GigaelectronVolt, new string[]{"GeV"}), + ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.GigaelectronVolt, new string[]{"ГэВ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Gigajoule, new string[]{"GJ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.GigawattHour, new string[]{"GWh"}), ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.GigawattHour, new string[]{"ГВт/ч"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Joule, new string[]{"J"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.KilobritishThermalUnit, new string[]{"kBTU"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Kilocalorie, new string[]{"kcal"}), + ("en-US", typeof(EnergyUnit), (int)EnergyUnit.KiloelectronVolt, new string[]{"keV"}), + ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.KiloelectronVolt, new string[]{"кэВ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Kilojoule, new string[]{"kJ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.KilowattHour, new string[]{"kWh"}), ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.KilowattHour, new string[]{"кВт/ч"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.MegabritishThermalUnit, new string[]{"MBTU"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Megacalorie, new string[]{"Mcal"}), + ("en-US", typeof(EnergyUnit), (int)EnergyUnit.MegaelectronVolt, new string[]{"MeV"}), + ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.MegaelectronVolt, new string[]{"МэВ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Megajoule, new string[]{"MJ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.MegawattHour, new string[]{"MWh"}), ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.MegawattHour, new string[]{"МВт/ч"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Millijoule, new string[]{"mJ"}), + ("en-US", typeof(EnergyUnit), (int)EnergyUnit.TeraelectronVolt, new string[]{"TeV"}), + ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.TeraelectronVolt, new string[]{"ТэВ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.TerawattHour, new string[]{"TWh"}), ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.TerawattHour, new string[]{"ТВт/ч"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.ThermEc, new string[]{"th (E.C.)"}), diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Units/EnergyUnit.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Units/EnergyUnit.g.cs index 090f3cffc0..a8373d564c 100644 --- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Units/EnergyUnit.g.cs +++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Units/EnergyUnit.g.cs @@ -35,18 +35,22 @@ public enum EnergyUnit Erg, FootPound, GigabritishThermalUnit, + GigaelectronVolt, Gigajoule, GigawattHour, Joule, KilobritishThermalUnit, Kilocalorie, + KiloelectronVolt, Kilojoule, KilowattHour, MegabritishThermalUnit, Megacalorie, + MegaelectronVolt, Megajoule, MegawattHour, Millijoule, + TeraelectronVolt, TerawattHour, ThermEc, ThermImperial, diff --git a/UnitsNet/GeneratedCode/Quantities/Energy.g.cs b/UnitsNet/GeneratedCode/Quantities/Energy.g.cs index 7bf7575669..509f64780b 100644 --- a/UnitsNet/GeneratedCode/Quantities/Energy.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Energy.g.cs @@ -59,18 +59,22 @@ static Energy() new UnitInfo(EnergyUnit.Erg, BaseUnits.Undefined), new UnitInfo(EnergyUnit.FootPound, BaseUnits.Undefined), new UnitInfo(EnergyUnit.GigabritishThermalUnit, BaseUnits.Undefined), + new UnitInfo(EnergyUnit.GigaelectronVolt, BaseUnits.Undefined), new UnitInfo(EnergyUnit.Gigajoule, BaseUnits.Undefined), new UnitInfo(EnergyUnit.GigawattHour, BaseUnits.Undefined), new UnitInfo(EnergyUnit.Joule, new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second)), new UnitInfo(EnergyUnit.KilobritishThermalUnit, BaseUnits.Undefined), new UnitInfo(EnergyUnit.Kilocalorie, BaseUnits.Undefined), + new UnitInfo(EnergyUnit.KiloelectronVolt, BaseUnits.Undefined), new UnitInfo(EnergyUnit.Kilojoule, BaseUnits.Undefined), new UnitInfo(EnergyUnit.KilowattHour, BaseUnits.Undefined), new UnitInfo(EnergyUnit.MegabritishThermalUnit, BaseUnits.Undefined), new UnitInfo(EnergyUnit.Megacalorie, BaseUnits.Undefined), + new UnitInfo(EnergyUnit.MegaelectronVolt, BaseUnits.Undefined), new UnitInfo(EnergyUnit.Megajoule, BaseUnits.Undefined), new UnitInfo(EnergyUnit.MegawattHour, BaseUnits.Undefined), new UnitInfo(EnergyUnit.Millijoule, BaseUnits.Undefined), + new UnitInfo(EnergyUnit.TeraelectronVolt, BaseUnits.Undefined), new UnitInfo(EnergyUnit.TerawattHour, BaseUnits.Undefined), new UnitInfo(EnergyUnit.ThermEc, BaseUnits.Undefined), new UnitInfo(EnergyUnit.ThermImperial, BaseUnits.Undefined), @@ -233,6 +237,11 @@ public Energy(double value, UnitSystem unitSystem) /// public double GigabritishThermalUnits => As(EnergyUnit.GigabritishThermalUnit); + /// + /// Get Energy in GigaelectronVolts. + /// + public double GigaelectronVolts => As(EnergyUnit.GigaelectronVolt); + /// /// Get Energy in Gigajoules. /// @@ -258,6 +267,11 @@ public Energy(double value, UnitSystem unitSystem) /// public double Kilocalories => As(EnergyUnit.Kilocalorie); + /// + /// Get Energy in KiloelectronVolts. + /// + public double KiloelectronVolts => As(EnergyUnit.KiloelectronVolt); + /// /// Get Energy in Kilojoules. /// @@ -278,6 +292,11 @@ public Energy(double value, UnitSystem unitSystem) /// public double Megacalories => As(EnergyUnit.Megacalorie); + /// + /// Get Energy in MegaelectronVolts. + /// + public double MegaelectronVolts => As(EnergyUnit.MegaelectronVolt); + /// /// Get Energy in Megajoules. /// @@ -293,6 +312,11 @@ public Energy(double value, UnitSystem unitSystem) /// public double Millijoules => As(EnergyUnit.Millijoule); + /// + /// Get Energy in TeraelectronVolts. + /// + public double TeraelectronVolts => As(EnergyUnit.TeraelectronVolt); + /// /// Get Energy in TerawattHours. /// @@ -429,6 +453,15 @@ public static Energy FromGigabritishThermalUnits(QuantityValue gigabritishtherma return new Energy(value, EnergyUnit.GigabritishThermalUnit); } /// + /// Get Energy from GigaelectronVolts. + /// + /// If value is NaN or Infinity. + public static Energy FromGigaelectronVolts(QuantityValue gigaelectronvolts) + { + double value = (double) gigaelectronvolts; + return new Energy(value, EnergyUnit.GigaelectronVolt); + } + /// /// Get Energy from Gigajoules. /// /// If value is NaN or Infinity. @@ -474,6 +507,15 @@ public static Energy FromKilocalories(QuantityValue kilocalories) return new Energy(value, EnergyUnit.Kilocalorie); } /// + /// Get Energy from KiloelectronVolts. + /// + /// If value is NaN or Infinity. + public static Energy FromKiloelectronVolts(QuantityValue kiloelectronvolts) + { + double value = (double) kiloelectronvolts; + return new Energy(value, EnergyUnit.KiloelectronVolt); + } + /// /// Get Energy from Kilojoules. /// /// If value is NaN or Infinity. @@ -510,6 +552,15 @@ public static Energy FromMegacalories(QuantityValue megacalories) return new Energy(value, EnergyUnit.Megacalorie); } /// + /// Get Energy from MegaelectronVolts. + /// + /// If value is NaN or Infinity. + public static Energy FromMegaelectronVolts(QuantityValue megaelectronvolts) + { + double value = (double) megaelectronvolts; + return new Energy(value, EnergyUnit.MegaelectronVolt); + } + /// /// Get Energy from Megajoules. /// /// If value is NaN or Infinity. @@ -537,6 +588,15 @@ public static Energy FromMillijoules(QuantityValue millijoules) return new Energy(value, EnergyUnit.Millijoule); } /// + /// Get Energy from TeraelectronVolts. + /// + /// If value is NaN or Infinity. + public static Energy FromTeraelectronVolts(QuantityValue teraelectronvolts) + { + double value = (double) teraelectronvolts; + return new Energy(value, EnergyUnit.TeraelectronVolt); + } + /// /// Get Energy from TerawattHours. /// /// If value is NaN or Infinity. @@ -1019,18 +1079,22 @@ private double GetValueInBaseUnit() case EnergyUnit.Erg: return _value*1e-7; case EnergyUnit.FootPound: return _value*1.355817948; case EnergyUnit.GigabritishThermalUnit: return (_value*1055.05585262) * 1e9d; + case EnergyUnit.GigaelectronVolt: return (_value*1.602176565e-19) * 1e9d; case EnergyUnit.Gigajoule: return (_value) * 1e9d; case EnergyUnit.GigawattHour: return (_value*3600d) * 1e9d; case EnergyUnit.Joule: return _value; case EnergyUnit.KilobritishThermalUnit: return (_value*1055.05585262) * 1e3d; case EnergyUnit.Kilocalorie: return (_value*4.184) * 1e3d; + case EnergyUnit.KiloelectronVolt: return (_value*1.602176565e-19) * 1e3d; case EnergyUnit.Kilojoule: return (_value) * 1e3d; case EnergyUnit.KilowattHour: return (_value*3600d) * 1e3d; case EnergyUnit.MegabritishThermalUnit: return (_value*1055.05585262) * 1e6d; case EnergyUnit.Megacalorie: return (_value*4.184) * 1e6d; + case EnergyUnit.MegaelectronVolt: return (_value*1.602176565e-19) * 1e6d; case EnergyUnit.Megajoule: return (_value) * 1e6d; case EnergyUnit.MegawattHour: return (_value*3600d) * 1e6d; case EnergyUnit.Millijoule: return (_value) * 1e-3d; + case EnergyUnit.TeraelectronVolt: return (_value*1.602176565e-19) * 1e12d; case EnergyUnit.TerawattHour: return (_value*3600d) * 1e12d; case EnergyUnit.ThermEc: return _value*1.05505585262e8; case EnergyUnit.ThermImperial: return _value*1.05505585257348e8; @@ -1070,18 +1134,22 @@ private double GetValueAs(EnergyUnit unit) case EnergyUnit.Erg: return baseUnitValue/1e-7; case EnergyUnit.FootPound: return baseUnitValue/1.355817948; case EnergyUnit.GigabritishThermalUnit: return (baseUnitValue/1055.05585262) / 1e9d; + case EnergyUnit.GigaelectronVolt: return (baseUnitValue/1.602176565e-19) / 1e9d; case EnergyUnit.Gigajoule: return (baseUnitValue) / 1e9d; case EnergyUnit.GigawattHour: return (baseUnitValue/3600d) / 1e9d; case EnergyUnit.Joule: return baseUnitValue; case EnergyUnit.KilobritishThermalUnit: return (baseUnitValue/1055.05585262) / 1e3d; case EnergyUnit.Kilocalorie: return (baseUnitValue/4.184) / 1e3d; + case EnergyUnit.KiloelectronVolt: return (baseUnitValue/1.602176565e-19) / 1e3d; case EnergyUnit.Kilojoule: return (baseUnitValue) / 1e3d; case EnergyUnit.KilowattHour: return (baseUnitValue/3600d) / 1e3d; case EnergyUnit.MegabritishThermalUnit: return (baseUnitValue/1055.05585262) / 1e6d; case EnergyUnit.Megacalorie: return (baseUnitValue/4.184) / 1e6d; + case EnergyUnit.MegaelectronVolt: return (baseUnitValue/1.602176565e-19) / 1e6d; case EnergyUnit.Megajoule: return (baseUnitValue) / 1e6d; case EnergyUnit.MegawattHour: return (baseUnitValue/3600d) / 1e6d; case EnergyUnit.Millijoule: return (baseUnitValue) / 1e-3d; + case EnergyUnit.TeraelectronVolt: return (baseUnitValue/1.602176565e-19) / 1e12d; case EnergyUnit.TerawattHour: return (baseUnitValue/3600d) / 1e12d; case EnergyUnit.ThermEc: return baseUnitValue/1.05505585262e8; case EnergyUnit.ThermImperial: return baseUnitValue/1.05505585257348e8; diff --git a/UnitsNet/GeneratedCode/UnitAbbreviationsCache.g.cs b/UnitsNet/GeneratedCode/UnitAbbreviationsCache.g.cs index d6e7c7e9ef..d17aba49a4 100644 --- a/UnitsNet/GeneratedCode/UnitAbbreviationsCache.g.cs +++ b/UnitsNet/GeneratedCode/UnitAbbreviationsCache.g.cs @@ -321,24 +321,33 @@ private static readonly (string CultureName, Type UnitType, int UnitValue, strin ("en-US", typeof(EnergyUnit), (int)EnergyUnit.DecathermUs, new string[]{"Dth (U.S.)"}), ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.DecathermUs, new string[]{"Американский декатерм"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.ElectronVolt, new string[]{"eV"}), + ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.ElectronVolt, new string[]{"эВ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Erg, new string[]{"erg"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.FootPound, new string[]{"ft·lb"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.GigabritishThermalUnit, new string[]{"GBTU"}), + ("en-US", typeof(EnergyUnit), (int)EnergyUnit.GigaelectronVolt, new string[]{"GeV"}), + ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.GigaelectronVolt, new string[]{"ГэВ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Gigajoule, new string[]{"GJ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.GigawattHour, new string[]{"GWh"}), ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.GigawattHour, new string[]{"ГВт/ч"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Joule, new string[]{"J"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.KilobritishThermalUnit, new string[]{"kBTU"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Kilocalorie, new string[]{"kcal"}), + ("en-US", typeof(EnergyUnit), (int)EnergyUnit.KiloelectronVolt, new string[]{"keV"}), + ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.KiloelectronVolt, new string[]{"кэВ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Kilojoule, new string[]{"kJ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.KilowattHour, new string[]{"kWh"}), ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.KilowattHour, new string[]{"кВт/ч"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.MegabritishThermalUnit, new string[]{"MBTU"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Megacalorie, new string[]{"Mcal"}), + ("en-US", typeof(EnergyUnit), (int)EnergyUnit.MegaelectronVolt, new string[]{"MeV"}), + ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.MegaelectronVolt, new string[]{"МэВ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Megajoule, new string[]{"MJ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.MegawattHour, new string[]{"MWh"}), ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.MegawattHour, new string[]{"МВт/ч"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.Millijoule, new string[]{"mJ"}), + ("en-US", typeof(EnergyUnit), (int)EnergyUnit.TeraelectronVolt, new string[]{"TeV"}), + ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.TeraelectronVolt, new string[]{"ТэВ"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.TerawattHour, new string[]{"TWh"}), ("ru-RU", typeof(EnergyUnit), (int)EnergyUnit.TerawattHour, new string[]{"ТВт/ч"}), ("en-US", typeof(EnergyUnit), (int)EnergyUnit.ThermEc, new string[]{"th (E.C.)"}), diff --git a/UnitsNet/GeneratedCode/UnitConverter.g.cs b/UnitsNet/GeneratedCode/UnitConverter.g.cs index b150789b53..7fbe57cfd0 100644 --- a/UnitsNet/GeneratedCode/UnitConverter.g.cs +++ b/UnitsNet/GeneratedCode/UnitConverter.g.cs @@ -502,6 +502,8 @@ public static void RegisterDefaultConversions(UnitConverter unitConverter) unitConverter.SetConversionFunction(EnergyUnit.FootPound, Energy.BaseUnit, q => q.ToBaseUnit()); unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.GigabritishThermalUnit, q => q.ToUnit(EnergyUnit.GigabritishThermalUnit)); unitConverter.SetConversionFunction(EnergyUnit.GigabritishThermalUnit, Energy.BaseUnit, q => q.ToBaseUnit()); + unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.GigaelectronVolt, q => q.ToUnit(EnergyUnit.GigaelectronVolt)); + unitConverter.SetConversionFunction(EnergyUnit.GigaelectronVolt, Energy.BaseUnit, q => q.ToBaseUnit()); unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.Gigajoule, q => q.ToUnit(EnergyUnit.Gigajoule)); unitConverter.SetConversionFunction(EnergyUnit.Gigajoule, Energy.BaseUnit, q => q.ToBaseUnit()); unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.GigawattHour, q => q.ToUnit(EnergyUnit.GigawattHour)); @@ -511,6 +513,8 @@ public static void RegisterDefaultConversions(UnitConverter unitConverter) unitConverter.SetConversionFunction(EnergyUnit.KilobritishThermalUnit, Energy.BaseUnit, q => q.ToBaseUnit()); unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.Kilocalorie, q => q.ToUnit(EnergyUnit.Kilocalorie)); unitConverter.SetConversionFunction(EnergyUnit.Kilocalorie, Energy.BaseUnit, q => q.ToBaseUnit()); + unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.KiloelectronVolt, q => q.ToUnit(EnergyUnit.KiloelectronVolt)); + unitConverter.SetConversionFunction(EnergyUnit.KiloelectronVolt, Energy.BaseUnit, q => q.ToBaseUnit()); unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.Kilojoule, q => q.ToUnit(EnergyUnit.Kilojoule)); unitConverter.SetConversionFunction(EnergyUnit.Kilojoule, Energy.BaseUnit, q => q.ToBaseUnit()); unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.KilowattHour, q => q.ToUnit(EnergyUnit.KilowattHour)); @@ -519,12 +523,16 @@ public static void RegisterDefaultConversions(UnitConverter unitConverter) unitConverter.SetConversionFunction(EnergyUnit.MegabritishThermalUnit, Energy.BaseUnit, q => q.ToBaseUnit()); unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.Megacalorie, q => q.ToUnit(EnergyUnit.Megacalorie)); unitConverter.SetConversionFunction(EnergyUnit.Megacalorie, Energy.BaseUnit, q => q.ToBaseUnit()); + unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.MegaelectronVolt, q => q.ToUnit(EnergyUnit.MegaelectronVolt)); + unitConverter.SetConversionFunction(EnergyUnit.MegaelectronVolt, Energy.BaseUnit, q => q.ToBaseUnit()); unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.Megajoule, q => q.ToUnit(EnergyUnit.Megajoule)); unitConverter.SetConversionFunction(EnergyUnit.Megajoule, Energy.BaseUnit, q => q.ToBaseUnit()); unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.MegawattHour, q => q.ToUnit(EnergyUnit.MegawattHour)); unitConverter.SetConversionFunction(EnergyUnit.MegawattHour, Energy.BaseUnit, q => q.ToBaseUnit()); unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.Millijoule, q => q.ToUnit(EnergyUnit.Millijoule)); unitConverter.SetConversionFunction(EnergyUnit.Millijoule, Energy.BaseUnit, q => q.ToBaseUnit()); + unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.TeraelectronVolt, q => q.ToUnit(EnergyUnit.TeraelectronVolt)); + unitConverter.SetConversionFunction(EnergyUnit.TeraelectronVolt, Energy.BaseUnit, q => q.ToBaseUnit()); unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.TerawattHour, q => q.ToUnit(EnergyUnit.TerawattHour)); unitConverter.SetConversionFunction(EnergyUnit.TerawattHour, Energy.BaseUnit, q => q.ToBaseUnit()); unitConverter.SetConversionFunction(Energy.BaseUnit, EnergyUnit.ThermEc, q => q.ToUnit(EnergyUnit.ThermEc)); diff --git a/UnitsNet/GeneratedCode/Units/EnergyUnit.g.cs b/UnitsNet/GeneratedCode/Units/EnergyUnit.g.cs index 090f3cffc0..a8373d564c 100644 --- a/UnitsNet/GeneratedCode/Units/EnergyUnit.g.cs +++ b/UnitsNet/GeneratedCode/Units/EnergyUnit.g.cs @@ -35,18 +35,22 @@ public enum EnergyUnit Erg, FootPound, GigabritishThermalUnit, + GigaelectronVolt, Gigajoule, GigawattHour, Joule, KilobritishThermalUnit, Kilocalorie, + KiloelectronVolt, Kilojoule, KilowattHour, MegabritishThermalUnit, Megacalorie, + MegaelectronVolt, Megajoule, MegawattHour, Millijoule, + TeraelectronVolt, TerawattHour, ThermEc, ThermImperial,