diff --git a/CodeGen/Generators/UnitsNetGen/IQuantityTestClassGenerator.cs b/CodeGen/Generators/UnitsNetGen/IQuantityTestClassGenerator.cs index 5469bfc504..c7546b2666 100644 --- a/CodeGen/Generators/UnitsNetGen/IQuantityTestClassGenerator.cs +++ b/CodeGen/Generators/UnitsNetGen/IQuantityTestClassGenerator.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 System; diff --git a/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs b/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs index 4d3942f9d5..e5ea1c72c9 100644 --- a/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs +++ b/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs @@ -117,7 +117,7 @@ private void GenerateStaticConstructor() "); Writer.WL($@" - Info = new QuantityInfo<{_unitEnumName}>(QuantityType.{_quantity.Name}, + Info = new QuantityInfo<{_unitEnumName}>(""{_quantity.Name}"", new UnitInfo<{_unitEnumName}>[] {{"); foreach (var unit in _quantity.Units) @@ -147,10 +147,10 @@ private void GenerateStaticConstructor() } } - Writer.WL(@" - }, - BaseUnit, Zero, BaseDimensions); - } + Writer.WL($@" + }}, + BaseUnit, Zero, BaseDimensions, QuantityType.{_quantity.Name}); + }} "); } @@ -236,6 +236,7 @@ private void GenerateStaticProperties() /// /// The of this quantity. /// + [Obsolete(""QuantityType will be removed in the future. Use Info property instead."")] public static QuantityType QuantityType {{ get; }} = QuantityType.{_quantity.Name}; /// @@ -792,7 +793,7 @@ public bool Equals({_quantity.Name} other, double tolerance, ComparisonType comp /// A hash code for the current {_quantity.Name}. public override int GetHashCode() {{ - return new {{ QuantityType, Value, Unit }}.GetHashCode(); + return new {{ Info.Name, Value, Unit }}.GetHashCode(); }} #endregion @@ -1106,6 +1107,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return {_quantity.Name}.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return {_quantity.Name}.Info; else if(conversionType == typeof(BaseDimensions)) return {_quantity.Name}.BaseDimensions; else diff --git a/CodeGen/Generators/UnitsNetGen/QuantityTypeGenerator.cs b/CodeGen/Generators/UnitsNetGen/QuantityTypeGenerator.cs index b105c5cbc6..72c1bbccef 100644 --- a/CodeGen/Generators/UnitsNetGen/QuantityTypeGenerator.cs +++ b/CodeGen/Generators/UnitsNetGen/QuantityTypeGenerator.cs @@ -1,4 +1,4 @@ -using CodeGen.JsonTypes; +using CodeGen.JsonTypes; namespace CodeGen.Generators.UnitsNetGen { diff --git a/CodeGen/Generators/UnitsNetGen/StaticQuantityGenerator.cs b/CodeGen/Generators/UnitsNetGen/StaticQuantityGenerator.cs index 066543d2de..5e646a0605 100644 --- a/CodeGen/Generators/UnitsNetGen/StaticQuantityGenerator.cs +++ b/CodeGen/Generators/UnitsNetGen/StaticQuantityGenerator.cs @@ -1,4 +1,4 @@ -using CodeGen.Helpers; +using CodeGen.Helpers; using CodeGen.JsonTypes; namespace CodeGen.Generators.UnitsNetGen @@ -21,6 +21,7 @@ public override string Generate() using JetBrains.Annotations; using UnitsNet.InternalHelpers; using UnitsNet.Units; +using System.Collections.Generic; #nullable enable @@ -31,12 +32,34 @@ namespace UnitsNet /// public static partial class Quantity { + /// + /// All QuantityInfo instances mapped by quantity name that are present in UnitsNet by default. + /// + public static readonly IDictionary ByName = new Dictionary + {"); + foreach (var quantity in _quantities) + Writer.WL($@" + {{ ""{quantity.Name}"", {quantity.Name}.Info }},"); + Writer.WL(@" + }; + + // Used by the QuantityInfo .ctor to map a name to a QuantityType. Will be removed when QuantityType + // will be removed. + internal static readonly IDictionary QuantityTypeByName = new Dictionary + {"); + foreach (var quantity in _quantities) + Writer.WL($@" + {{ ""{quantity.Name}"", QuantityType.{quantity.Name} }},"); + Writer.WL(@" + }; + /// /// Dynamically constructs a quantity of the given with the value in the quantity's base units. /// /// The of the quantity to create. /// The value to construct the quantity with. /// The created quantity. + [Obsolete(""QuantityType will be removed. Use FromQuantityInfo(QuantityInfo, QuantityValue) instead."")] public static IQuantity FromQuantityType(QuantityType quantityType, QuantityValue value) { switch(quantityType) @@ -55,6 +78,30 @@ public static IQuantity FromQuantityType(QuantityType quantityType, QuantityValu } } + /// + /// Dynamically constructs a quantity of the given with the value in the quantity's base units. + /// + /// The of the quantity to create. + /// The value to construct the quantity with. + /// The created quantity. + public static IQuantity FromQuantityInfo(QuantityInfo quantityInfo, QuantityValue value) + { + switch(quantityInfo.Name) + {"); + foreach (var quantity in _quantities) + { + var quantityName = quantity.Name; + Writer.WL($@" + case ""{quantityName}"": + return {quantityName}.From(value, {quantityName}.BaseUnit);"); + } + + Writer.WL(@" + default: + throw new ArgumentException($""{quantityInfo.Name} is not a supported quantity.""); + } + } + /// /// Try to dynamically construct a quantity. /// diff --git a/CodeGen/Generators/UnitsNetGen/UnitTestBaseClassGenerator.cs b/CodeGen/Generators/UnitsNetGen/UnitTestBaseClassGenerator.cs index c5748a5c4b..6256d3310d 100644 --- a/CodeGen/Generators/UnitsNetGen/UnitTestBaseClassGenerator.cs +++ b/CodeGen/Generators/UnitsNetGen/UnitTestBaseClassGenerator.cs @@ -662,6 +662,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.{_quantity.Name}, Convert.ChangeType(quantity, typeof(QuantityType))); }} + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + {{ + var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0); + Assert.Equal({_quantity.Name}.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + }} + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() {{ @@ -680,7 +687,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() {{ var quantity = {_quantity.Name}.From{_baseUnit.PluralName}(1.0); - Assert.Equal(new {{{_quantity.Name}.QuantityType, quantity.Value, quantity.Unit}}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {{{_quantity.Name}.Info.Name, quantity.Value, quantity.Unit}}.GetHashCode(), quantity.GetHashCode()); }} "); diff --git a/CodeGen/Generators/UnitsNetWrcGen/StaticQuantityGenerator.cs b/CodeGen/Generators/UnitsNetWrcGen/StaticQuantityGenerator.cs index 133a34850b..e32928a152 100644 --- a/CodeGen/Generators/UnitsNetWrcGen/StaticQuantityGenerator.cs +++ b/CodeGen/Generators/UnitsNetWrcGen/StaticQuantityGenerator.cs @@ -1,4 +1,4 @@ -using CodeGen.Helpers; +using CodeGen.Helpers; using CodeGen.JsonTypes; namespace CodeGen.Generators.UnitsNetWrcGen diff --git a/UnitsNet.Tests/CustomQuantities/HowMuch.cs b/UnitsNet.Tests/CustomQuantities/HowMuch.cs index 4d609fd714..0cc6abc0d5 100644 --- a/UnitsNet.Tests/CustomQuantities/HowMuch.cs +++ b/UnitsNet.Tests/CustomQuantities/HowMuch.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace UnitsNet.Tests.CustomQuantities { @@ -26,7 +26,7 @@ public HowMuch(double value, HowMuchUnit unit) public QuantityType Type => QuantityType.Undefined; public BaseDimensions Dimensions => BaseDimensions.Dimensionless; - public QuantityInfo QuantityInfo => new QuantityInfo(Type, + public QuantityInfo QuantityInfo => new QuantityInfo("HowMuch", new UnitInfo[] { new UnitInfo(HowMuchUnit.Some, BaseUnits.Undefined), diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/AccelerationTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/AccelerationTestsBase.g.cs index 015095b976..06781f66f7 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/AccelerationTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/AccelerationTestsBase.g.cs @@ -731,6 +731,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Acceleration, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Acceleration.FromMetersPerSecondSquared(1.0); + Assert.Equal(Acceleration.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -749,7 +756,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Acceleration.FromMetersPerSecondSquared(1.0); - Assert.Equal(new {Acceleration.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Acceleration.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/AmountOfSubstanceTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/AmountOfSubstanceTestsBase.g.cs index d8bd3f9805..caa8dfe820 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/AmountOfSubstanceTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/AmountOfSubstanceTestsBase.g.cs @@ -746,6 +746,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.AmountOfSubstance, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = AmountOfSubstance.FromMoles(1.0); + Assert.Equal(AmountOfSubstance.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -764,7 +771,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = AmountOfSubstance.FromMoles(1.0); - Assert.Equal(new {AmountOfSubstance.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {AmountOfSubstance.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/AmplitudeRatioTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/AmplitudeRatioTestsBase.g.cs index d23477dceb..31befffc43 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/AmplitudeRatioTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/AmplitudeRatioTestsBase.g.cs @@ -585,6 +585,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.AmplitudeRatio, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = AmplitudeRatio.FromDecibelVolts(1.0); + Assert.Equal(AmplitudeRatio.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -603,7 +610,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = AmplitudeRatio.FromDecibelVolts(1.0); - Assert.Equal(new {AmplitudeRatio.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {AmplitudeRatio.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/AngleTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/AngleTestsBase.g.cs index 53c57b4b11..d03cabb672 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/AngleTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/AngleTestsBase.g.cs @@ -731,6 +731,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Angle, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Angle.FromDegrees(1.0); + Assert.Equal(Angle.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -749,7 +756,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Angle.FromDegrees(1.0); - Assert.Equal(new {Angle.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Angle.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ApparentEnergyTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ApparentEnergyTestsBase.g.cs index 63cdd2bfac..2e3071c8da 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ApparentEnergyTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ApparentEnergyTestsBase.g.cs @@ -566,6 +566,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ApparentEnergy, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ApparentEnergy.FromVoltampereHours(1.0); + Assert.Equal(ApparentEnergy.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -584,7 +591,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ApparentEnergy.FromVoltampereHours(1.0); - Assert.Equal(new {ApparentEnergy.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ApparentEnergy.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ApparentPowerTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ApparentPowerTestsBase.g.cs index c7b3f24621..239de28b78 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ApparentPowerTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ApparentPowerTestsBase.g.cs @@ -581,6 +581,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ApparentPower, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ApparentPower.FromVoltamperes(1.0); + Assert.Equal(ApparentPower.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -599,7 +606,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ApparentPower.FromVoltamperes(1.0); - Assert.Equal(new {ApparentPower.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ApparentPower.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/AreaDensityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/AreaDensityTestsBase.g.cs index 22f46110a3..307c82af4e 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/AreaDensityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/AreaDensityTestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.AreaDensity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = AreaDensity.FromKilogramsPerSquareMeter(1.0); + Assert.Equal(AreaDensity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = AreaDensity.FromKilogramsPerSquareMeter(1.0); - Assert.Equal(new {AreaDensity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {AreaDensity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/AreaMomentOfInertiaTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/AreaMomentOfInertiaTestsBase.g.cs index fdca70cdd7..0fde2b3698 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/AreaMomentOfInertiaTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/AreaMomentOfInertiaTestsBase.g.cs @@ -611,6 +611,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.AreaMomentOfInertia, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = AreaMomentOfInertia.FromMetersToTheFourth(1.0); + Assert.Equal(AreaMomentOfInertia.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -629,7 +636,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = AreaMomentOfInertia.FromMetersToTheFourth(1.0); - Assert.Equal(new {AreaMomentOfInertia.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {AreaMomentOfInertia.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/AreaTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/AreaTestsBase.g.cs index 4f82b81f5f..bccc9d7614 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/AreaTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/AreaTestsBase.g.cs @@ -731,6 +731,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Area, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Area.FromSquareMeters(1.0); + Assert.Equal(Area.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -749,7 +756,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Area.FromSquareMeters(1.0); - Assert.Equal(new {Area.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Area.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/BitRateTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/BitRateTestsBase.g.cs index 1a4c1b0a39..8c009d089d 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/BitRateTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/BitRateTestsBase.g.cs @@ -885,6 +885,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.BitRate, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = BitRate.FromBitsPerSecond(1.0); + Assert.Equal(BitRate.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -903,7 +910,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = BitRate.FromBitsPerSecond(1.0); - Assert.Equal(new {BitRate.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {BitRate.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/BrakeSpecificFuelConsumptionTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/BrakeSpecificFuelConsumptionTestsBase.g.cs index b8e85decbc..30231fa5e2 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/BrakeSpecificFuelConsumptionTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/BrakeSpecificFuelConsumptionTestsBase.g.cs @@ -566,6 +566,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.BrakeSpecificFuelConsumption, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = BrakeSpecificFuelConsumption.FromKilogramsPerJoule(1.0); + Assert.Equal(BrakeSpecificFuelConsumption.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -584,7 +591,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = BrakeSpecificFuelConsumption.FromKilogramsPerJoule(1.0); - Assert.Equal(new {BrakeSpecificFuelConsumption.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {BrakeSpecificFuelConsumption.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/CapacitanceTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/CapacitanceTestsBase.g.cs index 92a8628acf..0164f114ac 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/CapacitanceTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/CapacitanceTestsBase.g.cs @@ -626,6 +626,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Capacitance, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Capacitance.FromFarads(1.0); + Assert.Equal(Capacitance.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -644,7 +651,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Capacitance.FromFarads(1.0); - Assert.Equal(new {Capacitance.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Capacitance.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/CoefficientOfThermalExpansionTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/CoefficientOfThermalExpansionTestsBase.g.cs index 1ac3f260ff..bb4af39bd0 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/CoefficientOfThermalExpansionTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/CoefficientOfThermalExpansionTestsBase.g.cs @@ -566,6 +566,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.CoefficientOfThermalExpansion, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = CoefficientOfThermalExpansion.FromInverseKelvin(1.0); + Assert.Equal(CoefficientOfThermalExpansion.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -584,7 +591,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = CoefficientOfThermalExpansion.FromInverseKelvin(1.0); - Assert.Equal(new {CoefficientOfThermalExpansion.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {CoefficientOfThermalExpansion.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/DensityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/DensityTestsBase.g.cs index c4dc4d4df8..7940becbfb 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/DensityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/DensityTestsBase.g.cs @@ -1121,6 +1121,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Density, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Density.FromKilogramsPerCubicMeter(1.0); + Assert.Equal(Density.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -1139,7 +1146,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Density.FromKilogramsPerCubicMeter(1.0); - Assert.Equal(new {Density.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Density.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/DurationTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/DurationTestsBase.g.cs index f123197530..567c3a8500 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/DurationTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/DurationTestsBase.g.cs @@ -671,6 +671,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Duration, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Duration.FromSeconds(1.0); + Assert.Equal(Duration.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -689,7 +696,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Duration.FromSeconds(1.0); - Assert.Equal(new {Duration.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Duration.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/DynamicViscosityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/DynamicViscosityTestsBase.g.cs index f081d0bd3f..2bc9f438bc 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/DynamicViscosityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/DynamicViscosityTestsBase.g.cs @@ -671,6 +671,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.DynamicViscosity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = DynamicViscosity.FromNewtonSecondsPerMeterSquared(1.0); + Assert.Equal(DynamicViscosity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -689,7 +696,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = DynamicViscosity.FromNewtonSecondsPerMeterSquared(1.0); - Assert.Equal(new {DynamicViscosity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {DynamicViscosity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricAdmittanceTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricAdmittanceTestsBase.g.cs index a972be4e2b..5ebbe0c836 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricAdmittanceTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricAdmittanceTestsBase.g.cs @@ -581,6 +581,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricAdmittance, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricAdmittance.FromSiemens(1.0); + Assert.Equal(ElectricAdmittance.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -599,7 +606,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricAdmittance.FromSiemens(1.0); - Assert.Equal(new {ElectricAdmittance.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricAdmittance.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricChargeDensityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricChargeDensityTestsBase.g.cs index a99382d4f6..f99e06cc8c 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricChargeDensityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricChargeDensityTestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricChargeDensity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricChargeDensity.FromCoulombsPerCubicMeter(1.0); + Assert.Equal(ElectricChargeDensity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricChargeDensity.FromCoulombsPerCubicMeter(1.0); - Assert.Equal(new {ElectricChargeDensity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricChargeDensity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricChargeTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricChargeTestsBase.g.cs index 023e302ae9..8c8e7fb08f 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricChargeTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricChargeTestsBase.g.cs @@ -596,6 +596,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricCharge, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricCharge.FromCoulombs(1.0); + Assert.Equal(ElectricCharge.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -614,7 +621,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricCharge.FromCoulombs(1.0); - Assert.Equal(new {ElectricCharge.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricCharge.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricConductanceTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricConductanceTestsBase.g.cs index 497f744c4e..bcdb3ecf9a 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricConductanceTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricConductanceTestsBase.g.cs @@ -566,6 +566,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricConductance, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricConductance.FromSiemens(1.0); + Assert.Equal(ElectricConductance.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -584,7 +591,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricConductance.FromSiemens(1.0); - Assert.Equal(new {ElectricConductance.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricConductance.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricConductivityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricConductivityTestsBase.g.cs index 3126bbe607..255593e2c6 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricConductivityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricConductivityTestsBase.g.cs @@ -566,6 +566,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricConductivity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricConductivity.FromSiemensPerMeter(1.0); + Assert.Equal(ElectricConductivity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -584,7 +591,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricConductivity.FromSiemensPerMeter(1.0); - Assert.Equal(new {ElectricConductivity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricConductivity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricCurrentDensityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricCurrentDensityTestsBase.g.cs index fb113ebfc9..4f2c5b9463 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricCurrentDensityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricCurrentDensityTestsBase.g.cs @@ -566,6 +566,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricCurrentDensity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricCurrentDensity.FromAmperesPerSquareMeter(1.0); + Assert.Equal(ElectricCurrentDensity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -584,7 +591,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricCurrentDensity.FromAmperesPerSquareMeter(1.0); - Assert.Equal(new {ElectricCurrentDensity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricCurrentDensity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricCurrentGradientTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricCurrentGradientTestsBase.g.cs index b002883020..e97420eb68 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricCurrentGradientTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricCurrentGradientTestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricCurrentGradient, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricCurrentGradient.FromAmperesPerSecond(1.0); + Assert.Equal(ElectricCurrentGradient.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricCurrentGradient.FromAmperesPerSecond(1.0); - Assert.Equal(new {ElectricCurrentGradient.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricCurrentGradient.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricCurrentTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricCurrentTestsBase.g.cs index 3882a49c88..cc0e631732 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricCurrentTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricCurrentTestsBase.g.cs @@ -641,6 +641,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricCurrent, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricCurrent.FromAmperes(1.0); + Assert.Equal(ElectricCurrent.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -659,7 +666,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricCurrent.FromAmperes(1.0); - Assert.Equal(new {ElectricCurrent.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricCurrent.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricFieldTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricFieldTestsBase.g.cs index 2858bb2522..4addc812cc 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricFieldTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricFieldTestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricField, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricField.FromVoltsPerMeter(1.0); + Assert.Equal(ElectricField.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricField.FromVoltsPerMeter(1.0); - Assert.Equal(new {ElectricField.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricField.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricInductanceTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricInductanceTestsBase.g.cs index 5312af56a2..391f99ff85 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricInductanceTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricInductanceTestsBase.g.cs @@ -581,6 +581,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricInductance, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricInductance.FromHenries(1.0); + Assert.Equal(ElectricInductance.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -599,7 +606,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricInductance.FromHenries(1.0); - Assert.Equal(new {ElectricInductance.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricInductance.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialAcTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialAcTestsBase.g.cs index 5c6f85be87..78023e6689 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialAcTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialAcTestsBase.g.cs @@ -596,6 +596,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricPotentialAc, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricPotentialAc.FromVoltsAc(1.0); + Assert.Equal(ElectricPotentialAc.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -614,7 +621,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricPotentialAc.FromVoltsAc(1.0); - Assert.Equal(new {ElectricPotentialAc.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricPotentialAc.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialChangeRateTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialChangeRateTestsBase.g.cs index b912001bdf..6693f2b0f8 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialChangeRateTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialChangeRateTestsBase.g.cs @@ -821,6 +821,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricPotentialChangeRate, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricPotentialChangeRate.FromVoltsPerSeconds(1.0); + Assert.Equal(ElectricPotentialChangeRate.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -839,7 +846,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricPotentialChangeRate.FromVoltsPerSeconds(1.0); - Assert.Equal(new {ElectricPotentialChangeRate.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricPotentialChangeRate.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialDcTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialDcTestsBase.g.cs index 940d7af570..e7f6771eba 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialDcTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialDcTestsBase.g.cs @@ -596,6 +596,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricPotentialDc, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricPotentialDc.FromVoltsDc(1.0); + Assert.Equal(ElectricPotentialDc.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -614,7 +621,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricPotentialDc.FromVoltsDc(1.0); - Assert.Equal(new {ElectricPotentialDc.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricPotentialDc.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialTestsBase.g.cs index adf4e6a121..841daf881c 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricPotentialTestsBase.g.cs @@ -596,6 +596,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricPotential, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricPotential.FromVolts(1.0); + Assert.Equal(ElectricPotential.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -614,7 +621,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricPotential.FromVolts(1.0); - Assert.Equal(new {ElectricPotential.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricPotential.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricResistanceTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricResistanceTestsBase.g.cs index 45de3768da..7d47b2dd4d 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricResistanceTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricResistanceTestsBase.g.cs @@ -611,6 +611,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricResistance, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricResistance.FromOhms(1.0); + Assert.Equal(ElectricResistance.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -629,7 +636,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricResistance.FromOhms(1.0); - Assert.Equal(new {ElectricResistance.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricResistance.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricResistivityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricResistivityTestsBase.g.cs index 4a66a4fa19..0d5cb21376 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricResistivityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricResistivityTestsBase.g.cs @@ -731,6 +731,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricResistivity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricResistivity.FromOhmMeters(1.0); + Assert.Equal(ElectricResistivity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -749,7 +756,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricResistivity.FromOhmMeters(1.0); - Assert.Equal(new {ElectricResistivity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricResistivity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricSurfaceChargeDensityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricSurfaceChargeDensityTestsBase.g.cs index 996b5dbf6d..3ac08a0753 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricSurfaceChargeDensityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ElectricSurfaceChargeDensityTestsBase.g.cs @@ -566,6 +566,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ElectricSurfaceChargeDensity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ElectricSurfaceChargeDensity.FromCoulombsPerSquareMeter(1.0); + Assert.Equal(ElectricSurfaceChargeDensity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -584,7 +591,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ElectricSurfaceChargeDensity.FromCoulombsPerSquareMeter(1.0); - Assert.Equal(new {ElectricSurfaceChargeDensity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ElectricSurfaceChargeDensity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/EnergyTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/EnergyTestsBase.g.cs index 20a3f7df39..bd2b2db264 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/EnergyTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/EnergyTestsBase.g.cs @@ -1061,6 +1061,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Energy, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Energy.FromJoules(1.0); + Assert.Equal(Energy.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -1079,7 +1086,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Energy.FromJoules(1.0); - Assert.Equal(new {Energy.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Energy.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/EntropyTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/EntropyTestsBase.g.cs index 4b9cff8d03..26b92ed9b4 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/EntropyTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/EntropyTestsBase.g.cs @@ -626,6 +626,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Entropy, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Entropy.FromJoulesPerKelvin(1.0); + Assert.Equal(Entropy.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -644,7 +651,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Entropy.FromJoulesPerKelvin(1.0); - Assert.Equal(new {Entropy.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Entropy.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ForceChangeRateTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ForceChangeRateTestsBase.g.cs index bfedd88bcc..f411068d8a 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ForceChangeRateTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ForceChangeRateTestsBase.g.cs @@ -686,6 +686,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ForceChangeRate, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ForceChangeRate.FromNewtonsPerSecond(1.0); + Assert.Equal(ForceChangeRate.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -704,7 +711,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ForceChangeRate.FromNewtonsPerSecond(1.0); - Assert.Equal(new {ForceChangeRate.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ForceChangeRate.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ForcePerLengthTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ForcePerLengthTestsBase.g.cs index e516d75475..bfd3fb4d3c 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ForcePerLengthTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ForcePerLengthTestsBase.g.cs @@ -1091,6 +1091,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ForcePerLength, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ForcePerLength.FromNewtonsPerMeter(1.0); + Assert.Equal(ForcePerLength.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -1109,7 +1116,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ForcePerLength.FromNewtonsPerMeter(1.0); - Assert.Equal(new {ForcePerLength.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ForcePerLength.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ForceTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ForceTestsBase.g.cs index ce9736b645..d31960ad7e 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ForceTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ForceTestsBase.g.cs @@ -746,6 +746,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Force, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Force.FromNewtons(1.0); + Assert.Equal(Force.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -764,7 +771,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Force.FromNewtons(1.0); - Assert.Equal(new {Force.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Force.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/FrequencyTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/FrequencyTestsBase.g.cs index 86c884577b..f0b085c479 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/FrequencyTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/FrequencyTestsBase.g.cs @@ -671,6 +671,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Frequency, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Frequency.FromHertz(1.0); + Assert.Equal(Frequency.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -689,7 +696,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Frequency.FromHertz(1.0); - Assert.Equal(new {Frequency.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Frequency.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/FuelEfficiencyTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/FuelEfficiencyTestsBase.g.cs index 070cc60fe8..ee4a4a5ac9 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/FuelEfficiencyTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/FuelEfficiencyTestsBase.g.cs @@ -581,6 +581,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.FuelEfficiency, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = FuelEfficiency.FromLitersPer100Kilometers(1.0); + Assert.Equal(FuelEfficiency.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -599,7 +606,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = FuelEfficiency.FromLitersPer100Kilometers(1.0); - Assert.Equal(new {FuelEfficiency.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {FuelEfficiency.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/HeatFluxTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/HeatFluxTestsBase.g.cs index 7e513394d9..4e74e0a109 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/HeatFluxTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/HeatFluxTestsBase.g.cs @@ -791,6 +791,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.HeatFlux, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = HeatFlux.FromWattsPerSquareMeter(1.0); + Assert.Equal(HeatFlux.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -809,7 +816,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = HeatFlux.FromWattsPerSquareMeter(1.0); - Assert.Equal(new {HeatFlux.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {HeatFlux.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/HeatTransferCoefficientTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/HeatTransferCoefficientTestsBase.g.cs index ca4b4e7237..b1f85918d7 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/HeatTransferCoefficientTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/HeatTransferCoefficientTestsBase.g.cs @@ -566,6 +566,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.HeatTransferCoefficient, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = HeatTransferCoefficient.FromWattsPerSquareMeterKelvin(1.0); + Assert.Equal(HeatTransferCoefficient.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -584,7 +591,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = HeatTransferCoefficient.FromWattsPerSquareMeterKelvin(1.0); - Assert.Equal(new {HeatTransferCoefficient.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {HeatTransferCoefficient.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/IlluminanceTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/IlluminanceTestsBase.g.cs index 3f3959dc07..46a4e9d9a0 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/IlluminanceTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/IlluminanceTestsBase.g.cs @@ -581,6 +581,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Illuminance, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Illuminance.FromLux(1.0); + Assert.Equal(Illuminance.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -599,7 +606,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Illuminance.FromLux(1.0); - Assert.Equal(new {Illuminance.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Illuminance.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/InformationTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/InformationTestsBase.g.cs index 665460c3e2..d3e12bb4d1 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/InformationTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/InformationTestsBase.g.cs @@ -885,6 +885,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Information, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Information.FromBits(1.0); + Assert.Equal(Information.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -903,7 +910,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Information.FromBits(1.0); - Assert.Equal(new {Information.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Information.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/IrradianceTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/IrradianceTestsBase.g.cs index 7725e9537c..4013a7bdeb 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/IrradianceTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/IrradianceTestsBase.g.cs @@ -731,6 +731,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Irradiance, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Irradiance.FromWattsPerSquareMeter(1.0); + Assert.Equal(Irradiance.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -749,7 +756,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Irradiance.FromWattsPerSquareMeter(1.0); - Assert.Equal(new {Irradiance.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Irradiance.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/IrradiationTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/IrradiationTestsBase.g.cs index cacadfe7d2..b3ff06e565 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/IrradiationTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/IrradiationTestsBase.g.cs @@ -626,6 +626,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Irradiation, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Irradiation.FromJoulesPerSquareMeter(1.0); + Assert.Equal(Irradiation.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -644,7 +651,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Irradiation.FromJoulesPerSquareMeter(1.0); - Assert.Equal(new {Irradiation.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Irradiation.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/KinematicViscosityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/KinematicViscosityTestsBase.g.cs index 2830f838c7..79710b63ce 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/KinematicViscosityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/KinematicViscosityTestsBase.g.cs @@ -641,6 +641,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.KinematicViscosity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = KinematicViscosity.FromSquareMetersPerSecond(1.0); + Assert.Equal(KinematicViscosity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -659,7 +666,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = KinematicViscosity.FromSquareMetersPerSecond(1.0); - Assert.Equal(new {KinematicViscosity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {KinematicViscosity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/LapseRateTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/LapseRateTestsBase.g.cs index c38cbb3dea..c6ce4cf2dd 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/LapseRateTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/LapseRateTestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.LapseRate, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = LapseRate.FromDegreesCelciusPerKilometer(1.0); + Assert.Equal(LapseRate.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = LapseRate.FromDegreesCelciusPerKilometer(1.0); - Assert.Equal(new {LapseRate.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {LapseRate.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/LengthTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/LengthTestsBase.g.cs index 7ede7abda1..bf271f68af 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/LengthTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/LengthTestsBase.g.cs @@ -1016,6 +1016,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Length, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Length.FromMeters(1.0); + Assert.Equal(Length.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -1034,7 +1041,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Length.FromMeters(1.0); - Assert.Equal(new {Length.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Length.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/LevelTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/LevelTestsBase.g.cs index 0626014028..045a83b8dc 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/LevelTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/LevelTestsBase.g.cs @@ -555,6 +555,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Level, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Level.FromDecibels(1.0); + Assert.Equal(Level.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -573,7 +580,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Level.FromDecibels(1.0); - Assert.Equal(new {Level.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Level.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/LinearDensityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/LinearDensityTestsBase.g.cs index 416e9468a2..9358d3f574 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/LinearDensityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/LinearDensityTestsBase.g.cs @@ -731,6 +731,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.LinearDensity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = LinearDensity.FromKilogramsPerMeter(1.0); + Assert.Equal(LinearDensity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -749,7 +756,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = LinearDensity.FromKilogramsPerMeter(1.0); - Assert.Equal(new {LinearDensity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {LinearDensity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/LinearPowerDensityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/LinearPowerDensityTestsBase.g.cs index a757f44056..a766ca22f2 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/LinearPowerDensityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/LinearPowerDensityTestsBase.g.cs @@ -896,6 +896,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.LinearPowerDensity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = LinearPowerDensity.FromWattsPerMeter(1.0); + Assert.Equal(LinearPowerDensity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -914,7 +921,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = LinearPowerDensity.FromWattsPerMeter(1.0); - Assert.Equal(new {LinearPowerDensity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {LinearPowerDensity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/LuminosityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/LuminosityTestsBase.g.cs index b476af7e00..73a8415d7f 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/LuminosityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/LuminosityTestsBase.g.cs @@ -731,6 +731,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Luminosity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Luminosity.FromWatts(1.0); + Assert.Equal(Luminosity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -749,7 +756,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Luminosity.FromWatts(1.0); - Assert.Equal(new {Luminosity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Luminosity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/LuminousFluxTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/LuminousFluxTestsBase.g.cs index ec79c95b55..8d4b78a299 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/LuminousFluxTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/LuminousFluxTestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.LuminousFlux, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = LuminousFlux.FromLumens(1.0); + Assert.Equal(LuminousFlux.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = LuminousFlux.FromLumens(1.0); - Assert.Equal(new {LuminousFlux.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {LuminousFlux.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/LuminousIntensityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/LuminousIntensityTestsBase.g.cs index f18bad0772..0e6e307400 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/LuminousIntensityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/LuminousIntensityTestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.LuminousIntensity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = LuminousIntensity.FromCandela(1.0); + Assert.Equal(LuminousIntensity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = LuminousIntensity.FromCandela(1.0); - Assert.Equal(new {LuminousIntensity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {LuminousIntensity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/MagneticFieldTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/MagneticFieldTestsBase.g.cs index fcbd65c8cb..95e3c606ff 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/MagneticFieldTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/MagneticFieldTestsBase.g.cs @@ -596,6 +596,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.MagneticField, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = MagneticField.FromTeslas(1.0); + Assert.Equal(MagneticField.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -614,7 +621,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = MagneticField.FromTeslas(1.0); - Assert.Equal(new {MagneticField.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {MagneticField.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/MagneticFluxTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/MagneticFluxTestsBase.g.cs index 790555ff8f..1771a18323 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/MagneticFluxTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/MagneticFluxTestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.MagneticFlux, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = MagneticFlux.FromWebers(1.0); + Assert.Equal(MagneticFlux.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = MagneticFlux.FromWebers(1.0); - Assert.Equal(new {MagneticFlux.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {MagneticFlux.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/MagnetizationTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/MagnetizationTestsBase.g.cs index 702b9919bb..d0b173b2fe 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/MagnetizationTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/MagnetizationTestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Magnetization, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Magnetization.FromAmperesPerMeter(1.0); + Assert.Equal(Magnetization.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Magnetization.FromAmperesPerMeter(1.0); - Assert.Equal(new {Magnetization.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Magnetization.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/MassConcentrationTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/MassConcentrationTestsBase.g.cs index 72ede238b3..8bcb3466a7 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/MassConcentrationTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/MassConcentrationTestsBase.g.cs @@ -1226,6 +1226,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.MassConcentration, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = MassConcentration.FromKilogramsPerCubicMeter(1.0); + Assert.Equal(MassConcentration.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -1244,7 +1251,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = MassConcentration.FromKilogramsPerCubicMeter(1.0); - Assert.Equal(new {MassConcentration.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {MassConcentration.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/MassFlowTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/MassFlowTestsBase.g.cs index 0fc7a6233c..7ded290846 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/MassFlowTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/MassFlowTestsBase.g.cs @@ -1016,6 +1016,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.MassFlow, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = MassFlow.FromGramsPerSecond(1.0); + Assert.Equal(MassFlow.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -1034,7 +1041,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = MassFlow.FromGramsPerSecond(1.0); - Assert.Equal(new {MassFlow.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {MassFlow.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/MassFluxTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/MassFluxTestsBase.g.cs index 4c446a81e9..ce2ec7301f 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/MassFluxTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/MassFluxTestsBase.g.cs @@ -701,6 +701,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.MassFlux, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = MassFlux.FromKilogramsPerSecondPerSquareMeter(1.0); + Assert.Equal(MassFlux.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -719,7 +726,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = MassFlux.FromKilogramsPerSecondPerSquareMeter(1.0); - Assert.Equal(new {MassFlux.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {MassFlux.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/MassFractionTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/MassFractionTestsBase.g.cs index 4f54ac7834..54fb4972ea 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/MassFractionTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/MassFractionTestsBase.g.cs @@ -881,6 +881,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.MassFraction, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = MassFraction.FromDecimalFractions(1.0); + Assert.Equal(MassFraction.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -899,7 +906,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = MassFraction.FromDecimalFractions(1.0); - Assert.Equal(new {MassFraction.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {MassFraction.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/MassMomentOfInertiaTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/MassMomentOfInertiaTestsBase.g.cs index 3c92293291..b2423f226e 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/MassMomentOfInertiaTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/MassMomentOfInertiaTestsBase.g.cs @@ -941,6 +941,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.MassMomentOfInertia, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = MassMomentOfInertia.FromKilogramSquareMeters(1.0); + Assert.Equal(MassMomentOfInertia.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -959,7 +966,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = MassMomentOfInertia.FromKilogramSquareMeters(1.0); - Assert.Equal(new {MassMomentOfInertia.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {MassMomentOfInertia.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/MassTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/MassTestsBase.g.cs index 3c968df8f1..e020aebb33 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/MassTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/MassTestsBase.g.cs @@ -896,6 +896,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Mass, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Mass.FromKilograms(1.0); + Assert.Equal(Mass.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -914,7 +921,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Mass.FromKilograms(1.0); - Assert.Equal(new {Mass.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Mass.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/MolarEnergyTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/MolarEnergyTestsBase.g.cs index a6dc9c342a..3130b4b64f 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/MolarEnergyTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/MolarEnergyTestsBase.g.cs @@ -566,6 +566,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.MolarEnergy, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = MolarEnergy.FromJoulesPerMole(1.0); + Assert.Equal(MolarEnergy.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -584,7 +591,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = MolarEnergy.FromJoulesPerMole(1.0); - Assert.Equal(new {MolarEnergy.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {MolarEnergy.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/MolarEntropyTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/MolarEntropyTestsBase.g.cs index 18618bc94f..c0d260dd18 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/MolarEntropyTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/MolarEntropyTestsBase.g.cs @@ -566,6 +566,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.MolarEntropy, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = MolarEntropy.FromJoulesPerMoleKelvin(1.0); + Assert.Equal(MolarEntropy.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -584,7 +591,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = MolarEntropy.FromJoulesPerMoleKelvin(1.0); - Assert.Equal(new {MolarEntropy.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {MolarEntropy.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/MolarMassTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/MolarMassTestsBase.g.cs index 0713461d81..69f50b23f5 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/MolarMassTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/MolarMassTestsBase.g.cs @@ -701,6 +701,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.MolarMass, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = MolarMass.FromKilogramsPerMole(1.0); + Assert.Equal(MolarMass.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -719,7 +726,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = MolarMass.FromKilogramsPerMole(1.0); - Assert.Equal(new {MolarMass.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {MolarMass.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/MolarityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/MolarityTestsBase.g.cs index 69c073bcd6..38096bde5c 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/MolarityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/MolarityTestsBase.g.cs @@ -641,6 +641,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Molarity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Molarity.FromMolesPerCubicMeter(1.0); + Assert.Equal(Molarity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -659,7 +666,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Molarity.FromMolesPerCubicMeter(1.0); - Assert.Equal(new {Molarity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Molarity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/PermeabilityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/PermeabilityTestsBase.g.cs index 0c33a2f56f..364757c8d3 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/PermeabilityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/PermeabilityTestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Permeability, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Permeability.FromHenriesPerMeter(1.0); + Assert.Equal(Permeability.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Permeability.FromHenriesPerMeter(1.0); - Assert.Equal(new {Permeability.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Permeability.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/PermittivityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/PermittivityTestsBase.g.cs index 6a9ce66ac2..68e9002427 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/PermittivityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/PermittivityTestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Permittivity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Permittivity.FromFaradsPerMeter(1.0); + Assert.Equal(Permittivity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Permittivity.FromFaradsPerMeter(1.0); - Assert.Equal(new {Permittivity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Permittivity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/PowerDensityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/PowerDensityTestsBase.g.cs index 6cf4e3bcfd..7854a934e3 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/PowerDensityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/PowerDensityTestsBase.g.cs @@ -1181,6 +1181,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.PowerDensity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = PowerDensity.FromWattsPerCubicMeter(1.0); + Assert.Equal(PowerDensity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -1199,7 +1206,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = PowerDensity.FromWattsPerCubicMeter(1.0); - Assert.Equal(new {PowerDensity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {PowerDensity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/PowerRatioTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/PowerRatioTestsBase.g.cs index 2bb4243146..15c4a9e82d 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/PowerRatioTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/PowerRatioTestsBase.g.cs @@ -555,6 +555,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.PowerRatio, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = PowerRatio.FromDecibelWatts(1.0); + Assert.Equal(PowerRatio.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -573,7 +580,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = PowerRatio.FromDecibelWatts(1.0); - Assert.Equal(new {PowerRatio.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {PowerRatio.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/PowerTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/PowerTestsBase.g.cs index 8303af01a1..8533e228f0 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/PowerTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/PowerTestsBase.g.cs @@ -870,6 +870,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Power, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Power.FromWatts(1.0); + Assert.Equal(Power.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -888,7 +895,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Power.FromWatts(1.0); - Assert.Equal(new {Power.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Power.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/PressureChangeRateTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/PressureChangeRateTestsBase.g.cs index 1bf4f4bd00..e75af9d61b 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/PressureChangeRateTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/PressureChangeRateTestsBase.g.cs @@ -626,6 +626,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.PressureChangeRate, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = PressureChangeRate.FromPascalsPerSecond(1.0); + Assert.Equal(PressureChangeRate.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -644,7 +651,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = PressureChangeRate.FromPascalsPerSecond(1.0); - Assert.Equal(new {PressureChangeRate.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {PressureChangeRate.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/PressureTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/PressureTestsBase.g.cs index 8716815b01..62b97ce04c 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/PressureTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/PressureTestsBase.g.cs @@ -1151,6 +1151,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Pressure, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Pressure.FromPascals(1.0); + Assert.Equal(Pressure.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -1169,7 +1176,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Pressure.FromPascals(1.0); - Assert.Equal(new {Pressure.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Pressure.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/RatioChangeRateTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/RatioChangeRateTestsBase.g.cs index 133927b546..3d2191fd88 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/RatioChangeRateTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/RatioChangeRateTestsBase.g.cs @@ -551,6 +551,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.RatioChangeRate, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = RatioChangeRate.FromDecimalFractionsPerSecond(1.0); + Assert.Equal(RatioChangeRate.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -569,7 +576,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = RatioChangeRate.FromDecimalFractionsPerSecond(1.0); - Assert.Equal(new {RatioChangeRate.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {RatioChangeRate.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/RatioTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/RatioTestsBase.g.cs index 382dc03188..313d7f0aa9 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/RatioTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/RatioTestsBase.g.cs @@ -611,6 +611,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Ratio, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Ratio.FromDecimalFractions(1.0); + Assert.Equal(Ratio.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -629,7 +636,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Ratio.FromDecimalFractions(1.0); - Assert.Equal(new {Ratio.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Ratio.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ReactiveEnergyTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ReactiveEnergyTestsBase.g.cs index 365d990987..0c39428f2d 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ReactiveEnergyTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ReactiveEnergyTestsBase.g.cs @@ -566,6 +566,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ReactiveEnergy, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ReactiveEnergy.FromVoltampereReactiveHours(1.0); + Assert.Equal(ReactiveEnergy.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -584,7 +591,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ReactiveEnergy.FromVoltampereReactiveHours(1.0); - Assert.Equal(new {ReactiveEnergy.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ReactiveEnergy.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ReactivePowerTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ReactivePowerTestsBase.g.cs index 57f26788ea..a88ac2558f 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ReactivePowerTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ReactivePowerTestsBase.g.cs @@ -581,6 +581,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ReactivePower, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ReactivePower.FromVoltamperesReactive(1.0); + Assert.Equal(ReactivePower.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -599,7 +606,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ReactivePower.FromVoltamperesReactive(1.0); - Assert.Equal(new {ReactivePower.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ReactivePower.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/RelativeHumidityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/RelativeHumidityTestsBase.g.cs index 7614a0faad..d535e4e0c2 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/RelativeHumidityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/RelativeHumidityTestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.RelativeHumidity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = RelativeHumidity.FromPercent(1.0); + Assert.Equal(RelativeHumidity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = RelativeHumidity.FromPercent(1.0); - Assert.Equal(new {RelativeHumidity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {RelativeHumidity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalAccelerationTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalAccelerationTestsBase.g.cs index aa9417faae..2f5cf84c57 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalAccelerationTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalAccelerationTestsBase.g.cs @@ -581,6 +581,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.RotationalAcceleration, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = RotationalAcceleration.FromRadiansPerSecondSquared(1.0); + Assert.Equal(RotationalAcceleration.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -599,7 +606,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = RotationalAcceleration.FromRadiansPerSecondSquared(1.0); - Assert.Equal(new {RotationalAcceleration.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {RotationalAcceleration.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalSpeedTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalSpeedTestsBase.g.cs index 8561cecc48..85cb84910a 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalSpeedTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalSpeedTestsBase.g.cs @@ -716,6 +716,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.RotationalSpeed, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = RotationalSpeed.FromRadiansPerSecond(1.0); + Assert.Equal(RotationalSpeed.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -734,7 +741,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = RotationalSpeed.FromRadiansPerSecond(1.0); - Assert.Equal(new {RotationalSpeed.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {RotationalSpeed.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalStiffnessPerLengthTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalStiffnessPerLengthTestsBase.g.cs index e814a70336..da6db73bf0 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalStiffnessPerLengthTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalStiffnessPerLengthTestsBase.g.cs @@ -596,6 +596,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.RotationalStiffnessPerLength, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = RotationalStiffnessPerLength.FromNewtonMetersPerRadianPerMeter(1.0); + Assert.Equal(RotationalStiffnessPerLength.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -614,7 +621,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = RotationalStiffnessPerLength.FromNewtonMetersPerRadianPerMeter(1.0); - Assert.Equal(new {RotationalStiffnessPerLength.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {RotationalStiffnessPerLength.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalStiffnessTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalStiffnessTestsBase.g.cs index 5cdc8b078a..d3c89d6dc9 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalStiffnessTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/RotationalStiffnessTestsBase.g.cs @@ -1016,6 +1016,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.RotationalStiffness, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = RotationalStiffness.FromNewtonMetersPerRadian(1.0); + Assert.Equal(RotationalStiffness.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -1034,7 +1041,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = RotationalStiffness.FromNewtonMetersPerRadian(1.0); - Assert.Equal(new {RotationalStiffness.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {RotationalStiffness.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/SolidAngleTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/SolidAngleTestsBase.g.cs index f2f0a00cae..65d9a0008c 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/SolidAngleTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/SolidAngleTestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.SolidAngle, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = SolidAngle.FromSteradians(1.0); + Assert.Equal(SolidAngle.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = SolidAngle.FromSteradians(1.0); - Assert.Equal(new {SolidAngle.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {SolidAngle.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificEnergyTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificEnergyTestsBase.g.cs index 7612e919d0..dd9c2664f0 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificEnergyTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificEnergyTestsBase.g.cs @@ -896,6 +896,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.SpecificEnergy, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = SpecificEnergy.FromJoulesPerKilogram(1.0); + Assert.Equal(SpecificEnergy.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -914,7 +921,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = SpecificEnergy.FromJoulesPerKilogram(1.0); - Assert.Equal(new {SpecificEnergy.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {SpecificEnergy.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificEntropyTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificEntropyTestsBase.g.cs index aede772b0d..8a47a53f74 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificEntropyTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificEntropyTestsBase.g.cs @@ -656,6 +656,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.SpecificEntropy, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = SpecificEntropy.FromJoulesPerKilogramKelvin(1.0); + Assert.Equal(SpecificEntropy.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -674,7 +681,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = SpecificEntropy.FromJoulesPerKilogramKelvin(1.0); - Assert.Equal(new {SpecificEntropy.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {SpecificEntropy.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificVolumeTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificVolumeTestsBase.g.cs index 03669fa8d5..b9d93260ce 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificVolumeTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificVolumeTestsBase.g.cs @@ -566,6 +566,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.SpecificVolume, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = SpecificVolume.FromCubicMetersPerKilogram(1.0); + Assert.Equal(SpecificVolume.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -584,7 +591,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = SpecificVolume.FromCubicMetersPerKilogram(1.0); - Assert.Equal(new {SpecificVolume.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {SpecificVolume.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificWeightTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificWeightTestsBase.g.cs index 317efee393..2e7dcd72cb 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificWeightTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/SpecificWeightTestsBase.g.cs @@ -776,6 +776,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.SpecificWeight, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = SpecificWeight.FromNewtonsPerCubicMeter(1.0); + Assert.Equal(SpecificWeight.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -794,7 +801,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = SpecificWeight.FromNewtonsPerCubicMeter(1.0); - Assert.Equal(new {SpecificWeight.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {SpecificWeight.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/SpeedTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/SpeedTestsBase.g.cs index a18dcffee0..66ed06e657 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/SpeedTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/SpeedTestsBase.g.cs @@ -1001,6 +1001,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Speed, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Speed.FromMetersPerSecond(1.0); + Assert.Equal(Speed.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -1019,7 +1026,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Speed.FromMetersPerSecond(1.0); - Assert.Equal(new {Speed.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Speed.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/TemperatureChangeRateTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/TemperatureChangeRateTestsBase.g.cs index 9b180c3230..1de2c9c846 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/TemperatureChangeRateTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/TemperatureChangeRateTestsBase.g.cs @@ -671,6 +671,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.TemperatureChangeRate, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = TemperatureChangeRate.FromDegreesCelsiusPerSecond(1.0); + Assert.Equal(TemperatureChangeRate.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -689,7 +696,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = TemperatureChangeRate.FromDegreesCelsiusPerSecond(1.0); - Assert.Equal(new {TemperatureChangeRate.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {TemperatureChangeRate.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/TemperatureDeltaTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/TemperatureDeltaTestsBase.g.cs index b71bf136ea..e67ca24273 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/TemperatureDeltaTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/TemperatureDeltaTestsBase.g.cs @@ -656,6 +656,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.TemperatureDelta, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = TemperatureDelta.FromKelvins(1.0); + Assert.Equal(TemperatureDelta.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -674,7 +681,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = TemperatureDelta.FromKelvins(1.0); - Assert.Equal(new {TemperatureDelta.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {TemperatureDelta.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/TemperatureTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/TemperatureTestsBase.g.cs index cf772fd5f5..e0cfb18096 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/TemperatureTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/TemperatureTestsBase.g.cs @@ -659,6 +659,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Temperature, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Temperature.FromKelvins(1.0); + Assert.Equal(Temperature.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -677,7 +684,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Temperature.FromKelvins(1.0); - Assert.Equal(new {Temperature.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Temperature.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } } diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ThermalConductivityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ThermalConductivityTestsBase.g.cs index 3fc5f56544..8d52205d81 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ThermalConductivityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ThermalConductivityTestsBase.g.cs @@ -551,6 +551,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ThermalConductivity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ThermalConductivity.FromWattsPerMeterKelvin(1.0); + Assert.Equal(ThermalConductivity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -569,7 +576,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ThermalConductivity.FromWattsPerMeterKelvin(1.0); - Assert.Equal(new {ThermalConductivity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ThermalConductivity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/ThermalResistanceTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/ThermalResistanceTestsBase.g.cs index 894940ddd7..da33a0a381 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/ThermalResistanceTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/ThermalResistanceTestsBase.g.cs @@ -596,6 +596,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.ThermalResistance, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = ThermalResistance.FromSquareMeterKelvinsPerKilowatt(1.0); + Assert.Equal(ThermalResistance.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -614,7 +621,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = ThermalResistance.FromSquareMeterKelvinsPerKilowatt(1.0); - Assert.Equal(new {ThermalResistance.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {ThermalResistance.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/TorquePerLengthTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/TorquePerLengthTestsBase.g.cs index 9774808c49..17746e4b5e 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/TorquePerLengthTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/TorquePerLengthTestsBase.g.cs @@ -836,6 +836,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.TorquePerLength, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = TorquePerLength.FromNewtonMetersPerMeter(1.0); + Assert.Equal(TorquePerLength.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -854,7 +861,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = TorquePerLength.FromNewtonMetersPerMeter(1.0); - Assert.Equal(new {TorquePerLength.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {TorquePerLength.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/TorqueTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/TorqueTestsBase.g.cs index f4ce54ef81..3c1d9ac1b2 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/TorqueTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/TorqueTestsBase.g.cs @@ -851,6 +851,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Torque, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Torque.FromNewtonMeters(1.0); + Assert.Equal(Torque.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -869,7 +876,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Torque.FromNewtonMeters(1.0); - Assert.Equal(new {Torque.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Torque.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/TurbidityTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/TurbidityTestsBase.g.cs index 3218594e2e..7298fce5e8 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/TurbidityTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/TurbidityTestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Turbidity, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Turbidity.FromNTU(1.0); + Assert.Equal(Turbidity.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Turbidity.FromNTU(1.0); - Assert.Equal(new {Turbidity.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Turbidity.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/VitaminATestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/VitaminATestsBase.g.cs index 0fcf67639d..27d141fa70 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/VitaminATestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/VitaminATestsBase.g.cs @@ -536,6 +536,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.VitaminA, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = VitaminA.FromInternationalUnits(1.0); + Assert.Equal(VitaminA.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -554,7 +561,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = VitaminA.FromInternationalUnits(1.0); - Assert.Equal(new {VitaminA.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {VitaminA.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/VolumeConcentrationTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/VolumeConcentrationTestsBase.g.cs index a4c69a3fcd..7f3bd7bac2 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/VolumeConcentrationTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/VolumeConcentrationTestsBase.g.cs @@ -821,6 +821,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.VolumeConcentration, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = VolumeConcentration.FromDecimalFractions(1.0); + Assert.Equal(VolumeConcentration.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -839,7 +846,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = VolumeConcentration.FromDecimalFractions(1.0); - Assert.Equal(new {VolumeConcentration.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {VolumeConcentration.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/VolumeFlowTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/VolumeFlowTestsBase.g.cs index e4590b47ed..27354831f6 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/VolumeFlowTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/VolumeFlowTestsBase.g.cs @@ -1361,6 +1361,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.VolumeFlow, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = VolumeFlow.FromCubicMetersPerSecond(1.0); + Assert.Equal(VolumeFlow.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -1379,7 +1386,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = VolumeFlow.FromCubicMetersPerSecond(1.0); - Assert.Equal(new {VolumeFlow.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {VolumeFlow.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/VolumePerLengthTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/VolumePerLengthTestsBase.g.cs index 94ccc26d88..3a8412b8fc 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/VolumePerLengthTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/VolumePerLengthTestsBase.g.cs @@ -626,6 +626,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.VolumePerLength, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = VolumePerLength.FromCubicMetersPerMeter(1.0); + Assert.Equal(VolumePerLength.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -644,7 +651,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = VolumePerLength.FromCubicMetersPerMeter(1.0); - Assert.Equal(new {VolumePerLength.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {VolumePerLength.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/VolumeTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/VolumeTestsBase.g.cs index 652641bfdd..641d95c65d 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/VolumeTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/VolumeTestsBase.g.cs @@ -1286,6 +1286,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.Volume, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = Volume.FromCubicMeters(1.0); + Assert.Equal(Volume.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -1304,7 +1311,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = Volume.FromCubicMeters(1.0); - Assert.Equal(new {Volume.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {Volume.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/GeneratedCode/TestsBase/WarpingMomentOfInertiaTestsBase.g.cs b/UnitsNet.Tests/GeneratedCode/TestsBase/WarpingMomentOfInertiaTestsBase.g.cs index 2aa246116e..8f2f874b69 100644 --- a/UnitsNet.Tests/GeneratedCode/TestsBase/WarpingMomentOfInertiaTestsBase.g.cs +++ b/UnitsNet.Tests/GeneratedCode/TestsBase/WarpingMomentOfInertiaTestsBase.g.cs @@ -611,6 +611,13 @@ public void Convert_ChangeType_QuantityType_EqualsQuantityType() Assert.Equal(QuantityType.WarpingMomentOfInertia, Convert.ChangeType(quantity, typeof(QuantityType))); } + [Fact] + public void Convert_ChangeType_QuantityInfo_EqualsQuantityInfo() + { + var quantity = WarpingMomentOfInertia.FromMetersToTheSixth(1.0); + Assert.Equal(WarpingMomentOfInertia.Info, Convert.ChangeType(quantity, typeof(QuantityInfo))); + } + [Fact] public void Convert_ChangeType_BaseDimensions_EqualsBaseDimensions() { @@ -629,7 +636,7 @@ public void Convert_ChangeType_InvalidType_ThrowsInvalidCastException() public void GetHashCode_Equals() { var quantity = WarpingMomentOfInertia.FromMetersToTheSixth(1.0); - Assert.Equal(new {WarpingMomentOfInertia.QuantityType, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); + Assert.Equal(new {WarpingMomentOfInertia.Info.Name, quantity.Value, quantity.Unit}.GetHashCode(), quantity.GetHashCode()); } [Theory] diff --git a/UnitsNet.Tests/QuantityIConvertibleTests.cs b/UnitsNet.Tests/QuantityIConvertibleTests.cs index 698d4ce9b9..5c5f7983a5 100644 --- a/UnitsNet.Tests/QuantityIConvertibleTests.cs +++ b/UnitsNet.Tests/QuantityIConvertibleTests.cs @@ -145,6 +145,10 @@ public void ToTypeTest() Assert.Equal(Length.QuantityType, lengthAsIConvertible.ToType(typeof(QuantityType), null)); Assert.Equal(Length.QuantityType, Convert.ChangeType(length, typeof(QuantityType))); + // QuantityInfo + Assert.Equal(Length.Info, lengthAsIConvertible.ToType(typeof(QuantityInfo), null)); + Assert.Equal(Length.Info, Convert.ChangeType(length, typeof(QuantityInfo))); + // BaseDimensions Assert.Equal(Length.BaseDimensions, lengthAsIConvertible.ToType(typeof(BaseDimensions), null)); Assert.Equal(Length.BaseDimensions, Convert.ChangeType(length, typeof(BaseDimensions))); diff --git a/UnitsNet.Tests/QuantityInfoTest.cs b/UnitsNet.Tests/QuantityInfoTest.cs index b6a65b6875..690912aa56 100644 --- a/UnitsNet.Tests/QuantityInfoTest.cs +++ b/UnitsNet.Tests/QuantityInfoTest.cs @@ -54,26 +54,13 @@ public void GenericsConstructor_AssignsProperties() Assert.Equal(expectedZero, info.Zero); Assert.Equal("Length", info.Name); Assert.Equal(expectedUnitInfos, info.UnitInfos); - Assert.Equal(expectedQuantityType, info.QuantityType); Assert.Equal(expectedBaseDimensions, info.BaseDimensions); // Obsolete members + Assert.Equal(expectedQuantityType, info.QuantityType); Assert.Equal( expectedBaseUnit, info.BaseUnit ); Assert.Equal( new[] { "Centimeter", "Kilometer" }, info.UnitNames ); } - [Fact] - public void Constructor_GivenUndefinedAsQuantityType_ThrowsArgumentException() - { - Assert.Throws(() => new QuantityInfo(QuantityType.Undefined, - Length.Info.UnitInfos, Length.BaseUnit, Length.Zero, Length.BaseDimensions)); - } - - [Fact] - public void GenericsConstructor_GivenUndefinedAsQuantityType_ThrowsArgumentException() - { - Assert.Throws(() => new QuantityInfo(QuantityType.Undefined, - Length.Info.UnitInfos, Length.BaseUnit, Length.Zero, Length.BaseDimensions)); - } [Fact] [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")] @@ -130,6 +117,61 @@ public void GenericsConstructor_GivenNullAsBaseDimensions_ThrowsArgumentNullExce Assert.Throws(() => new QuantityInfo(QuantityType.Length, Length.Info.UnitInfos, Length.BaseUnit, Length.Zero, null)); } + [Fact] + [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")] + public void Constructor2_GivenNullAsUnitInfos_ThrowsArgumentNullException() + { + Assert.Throws(() => new QuantityInfo(Length.Info.Name, + null, Length.BaseUnit, Length.Zero, Length.BaseDimensions)); + } + + [Fact] + [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")] + public void GenericsConstructor2_GivenNullAsUnitInfos_ThrowsArgumentNullException() + { + Assert.Throws(() => new QuantityInfo(Length.Info.Name, + null, Length.BaseUnit, Length.Zero, Length.BaseDimensions)); + } + + [Fact] + [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")] + public void Constructor2_GivenNullAsBaseUnit_ThrowsArgumentNullException() + { + Assert.Throws(() => new QuantityInfo(Length.Info.Name, + Length.Info.UnitInfos, null, Length.Zero, Length.BaseDimensions)); + } + + [Fact] + [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")] + public void Constructor2_GivenNullAsZero_ThrowsArgumentNullException() + { + Assert.Throws(() => new QuantityInfo(Length.Info.Name, + Length.Info.UnitInfos, Length.BaseUnit, null, Length.BaseDimensions)); + } + + [Fact] + [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")] + public void GenericsConstructor2_GivenNullAsZero_ThrowsArgumentNullException() + { + Assert.Throws(() => new QuantityInfo(Length.Info.Name, + Length.Info.UnitInfos, Length.BaseUnit, null, Length.BaseDimensions)); + } + + [Fact] + [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")] + public void Constructor2_GivenNullAsBaseDimensions_ThrowsArgumentNullException() + { + Assert.Throws(() => new QuantityInfo(Length.Info.Name, + Length.Info.UnitInfos, Length.BaseUnit, Length.Zero, null)); + } + + [Fact] + [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute")] + public void GenericsConstructor2_GivenNullAsBaseDimensions_ThrowsArgumentNullException() + { + Assert.Throws(() => new QuantityInfo(Length.Info.Name, + Length.Info.UnitInfos, Length.BaseUnit, Length.Zero, null)); + } [Fact] public void GetUnitInfoFor_GivenNullAsBaseUnits_ThrowsArgumentNullException() @@ -149,7 +191,7 @@ public void GetUnitInfoFor_GivenBaseUnitsWithMultipleMatches_ThrowsInvalidOperat { var baseUnits = new BaseUnits(LengthUnit.Meter); - var quantityInfo = new QuantityInfo(QuantityType.Length, + var quantityInfo = new QuantityInfo(Length.Info.Name, new UnitInfo[]{ new UnitInfo(LengthUnit.Meter, baseUnits), new UnitInfo(LengthUnit.Foot, baseUnits) }, @@ -185,7 +227,7 @@ public void GetUnitInfosFor_GivenBaseUnitsWithMultipleMatches_ReturnsMultipleMat { var baseUnits = new BaseUnits(LengthUnit.Meter); - var quantityInfo = new QuantityInfo(QuantityType.Length, + var quantityInfo = new QuantityInfo(Length.Info.Name, new UnitInfo[]{ new UnitInfo(LengthUnit.Meter, baseUnits), new UnitInfo(LengthUnit.Foot, baseUnits) }, diff --git a/UnitsNet.Tests/QuantityTest.cs b/UnitsNet.Tests/QuantityTest.cs index 177eab7c50..3667e56fe2 100644 --- a/UnitsNet.Tests/QuantityTest.cs +++ b/UnitsNet.Tests/QuantityTest.cs @@ -2,6 +2,7 @@ // Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet. using System; +using System.Collections.Generic; using System.Globalization; using System.Linq; using JetBrains.Annotations; @@ -13,7 +14,7 @@ namespace UnitsNet.Tests public class QuantityTest { // Exclude Undefined value - private static readonly int QuantityCount = Enum.GetValues(typeof(QuantityType)).Length - 1; + private static readonly int QuantityCount = Quantity.ByName.Count; [Theory] [InlineData(double.NaN)] @@ -45,15 +46,14 @@ public void From_GivenValueAndUnit_ReturnsQuantity() [Fact] public void GetInfo_GivenLength_ReturnsQuantityInfoForLength() { - var knownLengthUnits = new Enum[] {LengthUnit.Meter, LengthUnit.Centimeter, LengthUnit.Kilometer}; - var knownLengthUnitNames = new[] {"Meter", "Centimeter", "Kilometer"}; + var knownLengthUnits = new Enum[] { LengthUnit.Meter, LengthUnit.Centimeter, LengthUnit.Kilometer }; + var knownLengthUnitNames = new[] { "Meter", "Centimeter", "Kilometer" }; var lengthUnitCount = Enum.GetValues(typeof(LengthUnit)).Length - 1; // Exclude LengthUnit.Undefined QuantityInfo quantityInfo = Quantity.GetInfo(QuantityType.Length); Assert.Equal("Length", quantityInfo.Name); Assert.Equal(QuantityType.Length, quantityInfo.QuantityType); // Obsolete members -#pragma warning disable 618 Assert.Superset(knownLengthUnitNames.ToHashSet(), quantityInfo.UnitNames.ToHashSet()); Assert.Superset(knownLengthUnits.ToHashSet(), quantityInfo.Units.ToHashSet()); Assert.Equal(lengthUnitCount, quantityInfo.UnitNames.Length); @@ -66,14 +66,14 @@ public void GetInfo_GivenLength_ReturnsQuantityInfoForLength() [Fact] public void GetInfo_GivenMass_ReturnsQuantityInfoForMass() { - var knownMassUnits = new Enum[] {MassUnit.Kilogram, MassUnit.Gram, MassUnit.Tonne}; - var knownMassUnitNames = new[] {"Kilogram", "Gram", "Tonne"}; + var knownMassUnits = new Enum[] { MassUnit.Kilogram, MassUnit.Gram, MassUnit.Tonne }; + var knownMassUnitNames = new[] { "Kilogram", "Gram", "Tonne" }; var massUnitCount = Enum.GetValues(typeof(MassUnit)).Length - 1; // Exclude MassUnit.Undefined QuantityInfo quantityInfo = Quantity.GetInfo(QuantityType.Mass); Assert.Equal("Mass", quantityInfo.Name); - Assert.Equal(QuantityType.Mass, quantityInfo.QuantityType); // Obsolete members + Assert.Equal(QuantityType.Mass, quantityInfo.QuantityType); Assert.Superset(knownMassUnitNames.ToHashSet(), quantityInfo.UnitNames.ToHashSet()); Assert.Superset(knownMassUnits.ToHashSet(), quantityInfo.Units.ToHashSet()); Assert.Equal(massUnitCount, quantityInfo.UnitNames.Length); @@ -166,12 +166,11 @@ public void TryParse_GivenValueAndUnit_ReturnsQuantity() [Fact] public void Types_ReturnsKnownQuantityTypes() { - var knownQuantities = new[] {QuantityType.Length, QuantityType.Force, QuantityType.Mass}; + var knownQuantities = new List { Length.Info, Force.Info, Mass.Info }; - var types = Quantity.Types; + ICollection types = Quantity.ByName.Values; Assert.Superset(knownQuantities.ToHashSet(), types.ToHashSet()); - Assert.Equal(QuantityCount, types.Length); } [Fact] diff --git a/UnitsNet/CustomCode/Quantity.cs b/UnitsNet/CustomCode/Quantity.cs index 7b3693d270..d0ee9e929c 100644 --- a/UnitsNet/CustomCode/Quantity.cs +++ b/UnitsNet/CustomCode/Quantity.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using JetBrains.Annotations; using UnitsNet.InternalHelpers; namespace UnitsNet @@ -13,12 +12,11 @@ public partial class Quantity static Quantity() { - var quantityTypes = Enum.GetValues(typeof(QuantityType)).Cast().Except(new[] {QuantityType.Undefined}).ToArray(); - Types = quantityTypes; - Names = quantityTypes.Select(qt => qt.ToString()).ToArray(); + ICollection quantityInfos = ByName.Values; + Types = Enum.GetValues(typeof(QuantityType)).Cast().Except(new[] { QuantityType.Undefined }).ToArray(); + Names = quantityInfos.Select(qt => qt.Name).ToArray(); - InfosLazy = new Lazy(() => Types - .Select(quantityType => FromQuantityType(quantityType, 0.0).QuantityInfo) + InfosLazy = new Lazy(() => quantityInfos .OrderBy(quantityInfo => quantityInfo.Name) .ToArray()); } @@ -26,10 +24,11 @@ static Quantity() /// /// All enum values of , such as and . /// + [Obsolete("QuantityType will be removed in the future. Use Infos property instead.")] public static QuantityType[] Types { get; } /// - /// All enum value names of , such as "Length" and "Mass". + /// All enum value names of , such as "Length" and "Mass". /// public static string[] Names { get; } @@ -99,6 +98,7 @@ public static bool TryParse(Type quantityType, string quantityString, out IQuant /// /// The quantity type enum value. /// Information about the quantity and its units. + [Obsolete("QuantityType will be removed in the future.")] public static QuantityInfo GetInfo(QuantityType quantityType) { return Infos.First(qi => qi.QuantityType == quantityType); diff --git a/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs b/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs index c06cff33b4..f40bd32c21 100644 --- a/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs @@ -50,7 +50,7 @@ static Acceleration() { BaseDimensions = new BaseDimensions(1, 0, -2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Acceleration, + Info = new QuantityInfo("Acceleration", new UnitInfo[] { new UnitInfo(AccelerationUnit.CentimeterPerSecondSquared, BaseUnits.Undefined), new UnitInfo(AccelerationUnit.DecimeterPerSecondSquared, BaseUnits.Undefined), @@ -67,7 +67,7 @@ static Acceleration() new UnitInfo(AccelerationUnit.NanometerPerSecondSquared, BaseUnits.Undefined), new UnitInfo(AccelerationUnit.StandardGravity, new BaseUnits(length: LengthUnit.Meter, time: DurationUnit.Second)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Acceleration); } /// @@ -132,6 +132,7 @@ public Acceleration(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Acceleration; /// @@ -736,7 +737,7 @@ public bool Equals(Acceleration other, double tolerance, ComparisonType comparis /// A hash code for the current Acceleration. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1047,6 +1048,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Acceleration.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Acceleration.Info; else if(conversionType == typeof(BaseDimensions)) return Acceleration.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/AmountOfSubstance.g.cs b/UnitsNet/GeneratedCode/Quantities/AmountOfSubstance.g.cs index 94b3ca9fd8..969ee4af11 100644 --- a/UnitsNet/GeneratedCode/Quantities/AmountOfSubstance.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/AmountOfSubstance.g.cs @@ -50,7 +50,7 @@ static AmountOfSubstance() { BaseDimensions = new BaseDimensions(0, 0, 0, 0, 0, 1, 0); - Info = new QuantityInfo(QuantityType.AmountOfSubstance, + Info = new QuantityInfo("AmountOfSubstance", new UnitInfo[] { new UnitInfo(AmountOfSubstanceUnit.Centimole, BaseUnits.Undefined), new UnitInfo(AmountOfSubstanceUnit.CentipoundMole, BaseUnits.Undefined), @@ -68,7 +68,7 @@ static AmountOfSubstance() new UnitInfo(AmountOfSubstanceUnit.NanopoundMole, BaseUnits.Undefined), new UnitInfo(AmountOfSubstanceUnit.PoundMole, new BaseUnits(amount: AmountOfSubstanceUnit.PoundMole)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.AmountOfSubstance); } /// @@ -133,6 +133,7 @@ public AmountOfSubstance(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.AmountOfSubstance; /// @@ -751,7 +752,7 @@ public bool Equals(AmountOfSubstance other, double tolerance, ComparisonType com /// A hash code for the current AmountOfSubstance. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1064,6 +1065,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return AmountOfSubstance.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return AmountOfSubstance.Info; else if(conversionType == typeof(BaseDimensions)) return AmountOfSubstance.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/AmplitudeRatio.g.cs b/UnitsNet/GeneratedCode/Quantities/AmplitudeRatio.g.cs index 899d516ff6..315b035405 100644 --- a/UnitsNet/GeneratedCode/Quantities/AmplitudeRatio.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/AmplitudeRatio.g.cs @@ -50,14 +50,14 @@ static AmplitudeRatio() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.AmplitudeRatio, + Info = new QuantityInfo("AmplitudeRatio", new UnitInfo[] { new UnitInfo(AmplitudeRatioUnit.DecibelMicrovolt, BaseUnits.Undefined), new UnitInfo(AmplitudeRatioUnit.DecibelMillivolt, BaseUnits.Undefined), new UnitInfo(AmplitudeRatioUnit.DecibelUnloaded, BaseUnits.Undefined), new UnitInfo(AmplitudeRatioUnit.DecibelVolt, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.AmplitudeRatio); } /// @@ -122,6 +122,7 @@ public AmplitudeRatio(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.AmplitudeRatio; /// @@ -594,7 +595,7 @@ public bool Equals(AmplitudeRatio other, double tolerance, ComparisonType compar /// A hash code for the current AmplitudeRatio. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -885,6 +886,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return AmplitudeRatio.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return AmplitudeRatio.Info; else if(conversionType == typeof(BaseDimensions)) return AmplitudeRatio.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Angle.g.cs b/UnitsNet/GeneratedCode/Quantities/Angle.g.cs index 7299ad8473..f9e013df61 100644 --- a/UnitsNet/GeneratedCode/Quantities/Angle.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Angle.g.cs @@ -50,7 +50,7 @@ static Angle() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.Angle, + Info = new QuantityInfo("Angle", new UnitInfo[] { new UnitInfo(AngleUnit.Arcminute, BaseUnits.Undefined), new UnitInfo(AngleUnit.Arcsecond, BaseUnits.Undefined), @@ -67,7 +67,7 @@ static Angle() new UnitInfo(AngleUnit.Radian, BaseUnits.Undefined), new UnitInfo(AngleUnit.Revolution, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Angle); } /// @@ -132,6 +132,7 @@ public Angle(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Angle; /// @@ -736,7 +737,7 @@ public bool Equals(Angle other, double tolerance, ComparisonType comparisonType) /// A hash code for the current Angle. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1047,6 +1048,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Angle.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Angle.Info; else if(conversionType == typeof(BaseDimensions)) return Angle.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ApparentEnergy.g.cs b/UnitsNet/GeneratedCode/Quantities/ApparentEnergy.g.cs index 895523d500..071b53dfdd 100644 --- a/UnitsNet/GeneratedCode/Quantities/ApparentEnergy.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ApparentEnergy.g.cs @@ -50,13 +50,13 @@ static ApparentEnergy() { BaseDimensions = new BaseDimensions(2, 1, -2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ApparentEnergy, + Info = new QuantityInfo("ApparentEnergy", new UnitInfo[] { new UnitInfo(ApparentEnergyUnit.KilovoltampereHour, BaseUnits.Undefined), new UnitInfo(ApparentEnergyUnit.MegavoltampereHour, BaseUnits.Undefined), new UnitInfo(ApparentEnergyUnit.VoltampereHour, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ApparentEnergy); } /// @@ -121,6 +121,7 @@ public ApparentEnergy(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ApparentEnergy; /// @@ -571,7 +572,7 @@ public bool Equals(ApparentEnergy other, double tolerance, ComparisonType compar /// A hash code for the current ApparentEnergy. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -860,6 +861,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ApparentEnergy.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ApparentEnergy.Info; else if(conversionType == typeof(BaseDimensions)) return ApparentEnergy.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ApparentPower.g.cs b/UnitsNet/GeneratedCode/Quantities/ApparentPower.g.cs index 269c94cd4d..62da56ef09 100644 --- a/UnitsNet/GeneratedCode/Quantities/ApparentPower.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ApparentPower.g.cs @@ -50,14 +50,14 @@ static ApparentPower() { BaseDimensions = new BaseDimensions(2, 1, -3, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ApparentPower, + Info = new QuantityInfo("ApparentPower", new UnitInfo[] { new UnitInfo(ApparentPowerUnit.Gigavoltampere, BaseUnits.Undefined), new UnitInfo(ApparentPowerUnit.Kilovoltampere, BaseUnits.Undefined), new UnitInfo(ApparentPowerUnit.Megavoltampere, BaseUnits.Undefined), new UnitInfo(ApparentPowerUnit.Voltampere, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ApparentPower); } /// @@ -122,6 +122,7 @@ public ApparentPower(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ApparentPower; /// @@ -586,7 +587,7 @@ public bool Equals(ApparentPower other, double tolerance, ComparisonType compari /// A hash code for the current ApparentPower. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -877,6 +878,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ApparentPower.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ApparentPower.Info; else if(conversionType == typeof(BaseDimensions)) return ApparentPower.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Area.g.cs b/UnitsNet/GeneratedCode/Quantities/Area.g.cs index d5f3d94ed7..3c08afb818 100644 --- a/UnitsNet/GeneratedCode/Quantities/Area.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Area.g.cs @@ -50,7 +50,7 @@ static Area() { BaseDimensions = new BaseDimensions(2, 0, 0, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Area, + Info = new QuantityInfo("Area", new UnitInfo[] { new UnitInfo(AreaUnit.Acre, BaseUnits.Undefined), new UnitInfo(AreaUnit.Hectare, BaseUnits.Undefined), @@ -67,7 +67,7 @@ static Area() new UnitInfo(AreaUnit.SquareYard, new BaseUnits(length: LengthUnit.Yard)), new UnitInfo(AreaUnit.UsSurveySquareFoot, new BaseUnits(length: LengthUnit.UsSurveyFoot)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Area); } /// @@ -132,6 +132,7 @@ public Area(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Area; /// @@ -736,7 +737,7 @@ public bool Equals(Area other, double tolerance, ComparisonType comparisonType) /// A hash code for the current Area. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1047,6 +1048,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Area.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Area.Info; else if(conversionType == typeof(BaseDimensions)) return Area.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/AreaDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/AreaDensity.g.cs index e5b4215ceb..3dbdd60bd5 100644 --- a/UnitsNet/GeneratedCode/Quantities/AreaDensity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/AreaDensity.g.cs @@ -50,11 +50,11 @@ static AreaDensity() { BaseDimensions = new BaseDimensions(-2, 1, 0, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.AreaDensity, + Info = new QuantityInfo("AreaDensity", new UnitInfo[] { new UnitInfo(AreaDensityUnit.KilogramPerSquareMeter, new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.AreaDensity); } /// @@ -119,6 +119,7 @@ public AreaDensity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.AreaDensity; /// @@ -541,7 +542,7 @@ public bool Equals(AreaDensity other, double tolerance, ComparisonType compariso /// A hash code for the current AreaDensity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -826,6 +827,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return AreaDensity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return AreaDensity.Info; else if(conversionType == typeof(BaseDimensions)) return AreaDensity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs b/UnitsNet/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs index 8d9872efab..72a6da6a62 100644 --- a/UnitsNet/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs @@ -50,7 +50,7 @@ static AreaMomentOfInertia() { BaseDimensions = new BaseDimensions(4, 0, 0, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.AreaMomentOfInertia, + Info = new QuantityInfo("AreaMomentOfInertia", new UnitInfo[] { new UnitInfo(AreaMomentOfInertiaUnit.CentimeterToTheFourth, new BaseUnits(length: LengthUnit.Centimeter)), new UnitInfo(AreaMomentOfInertiaUnit.DecimeterToTheFourth, new BaseUnits(length: LengthUnit.Decimeter)), @@ -59,7 +59,7 @@ static AreaMomentOfInertia() new UnitInfo(AreaMomentOfInertiaUnit.MeterToTheFourth, new BaseUnits(length: LengthUnit.Meter)), new UnitInfo(AreaMomentOfInertiaUnit.MillimeterToTheFourth, new BaseUnits(length: LengthUnit.Millimeter)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.AreaMomentOfInertia); } /// @@ -124,6 +124,7 @@ public AreaMomentOfInertia(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.AreaMomentOfInertia; /// @@ -616,7 +617,7 @@ public bool Equals(AreaMomentOfInertia other, double tolerance, ComparisonType c /// A hash code for the current AreaMomentOfInertia. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -911,6 +912,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return AreaMomentOfInertia.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return AreaMomentOfInertia.Info; else if(conversionType == typeof(BaseDimensions)) return AreaMomentOfInertia.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/BitRate.g.cs b/UnitsNet/GeneratedCode/Quantities/BitRate.g.cs index c7e6ad0c0e..882a4e1608 100644 --- a/UnitsNet/GeneratedCode/Quantities/BitRate.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/BitRate.g.cs @@ -53,7 +53,7 @@ static BitRate() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.BitRate, + Info = new QuantityInfo("BitRate", new UnitInfo[] { new UnitInfo(BitRateUnit.BitPerSecond, BaseUnits.Undefined), new UnitInfo(BitRateUnit.BytePerSecond, BaseUnits.Undefined), @@ -82,7 +82,7 @@ static BitRate() new UnitInfo(BitRateUnit.TerabitPerSecond, BaseUnits.Undefined), new UnitInfo(BitRateUnit.TerabytePerSecond, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.BitRate); } /// @@ -147,6 +147,7 @@ public BitRate(decimal value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.BitRate; /// @@ -921,7 +922,7 @@ public bool Equals(BitRate other, double tolerance, ComparisonType comparisonTyp /// A hash code for the current BitRate. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1256,6 +1257,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return BitRate.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return BitRate.Info; else if(conversionType == typeof(BaseDimensions)) return BitRate.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs b/UnitsNet/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs index ec856aa869..6716f2a13a 100644 --- a/UnitsNet/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs @@ -50,13 +50,13 @@ static BrakeSpecificFuelConsumption() { BaseDimensions = new BaseDimensions(-2, 0, 2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.BrakeSpecificFuelConsumption, + Info = new QuantityInfo("BrakeSpecificFuelConsumption", new UnitInfo[] { new UnitInfo(BrakeSpecificFuelConsumptionUnit.GramPerKiloWattHour, BaseUnits.Undefined), new UnitInfo(BrakeSpecificFuelConsumptionUnit.KilogramPerJoule, BaseUnits.Undefined), new UnitInfo(BrakeSpecificFuelConsumptionUnit.PoundPerMechanicalHorsepowerHour, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.BrakeSpecificFuelConsumption); } /// @@ -121,6 +121,7 @@ public BrakeSpecificFuelConsumption(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.BrakeSpecificFuelConsumption; /// @@ -571,7 +572,7 @@ public bool Equals(BrakeSpecificFuelConsumption other, double tolerance, Compari /// A hash code for the current BrakeSpecificFuelConsumption. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -860,6 +861,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return BrakeSpecificFuelConsumption.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return BrakeSpecificFuelConsumption.Info; else if(conversionType == typeof(BaseDimensions)) return BrakeSpecificFuelConsumption.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Capacitance.g.cs b/UnitsNet/GeneratedCode/Quantities/Capacitance.g.cs index cfdce7831f..fc51d0b5d2 100644 --- a/UnitsNet/GeneratedCode/Quantities/Capacitance.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Capacitance.g.cs @@ -53,7 +53,7 @@ static Capacitance() { BaseDimensions = new BaseDimensions(-2, -1, 4, 2, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Capacitance, + Info = new QuantityInfo("Capacitance", new UnitInfo[] { new UnitInfo(CapacitanceUnit.Farad, new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second, current: ElectricCurrentUnit.Ampere)), new UnitInfo(CapacitanceUnit.Kilofarad, BaseUnits.Undefined), @@ -63,7 +63,7 @@ static Capacitance() new UnitInfo(CapacitanceUnit.Nanofarad, BaseUnits.Undefined), new UnitInfo(CapacitanceUnit.Picofarad, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Capacitance); } /// @@ -128,6 +128,7 @@ public Capacitance(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Capacitance; /// @@ -634,7 +635,7 @@ public bool Equals(Capacitance other, double tolerance, ComparisonType compariso /// A hash code for the current Capacitance. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -931,6 +932,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Capacitance.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Capacitance.Info; else if(conversionType == typeof(BaseDimensions)) return Capacitance.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs b/UnitsNet/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs index f0af9170e3..75be9432c4 100644 --- a/UnitsNet/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs @@ -50,13 +50,13 @@ static CoefficientOfThermalExpansion() { BaseDimensions = new BaseDimensions(0, 0, 0, 0, -1, 0, 0); - Info = new QuantityInfo(QuantityType.CoefficientOfThermalExpansion, + Info = new QuantityInfo("CoefficientOfThermalExpansion", new UnitInfo[] { new UnitInfo(CoefficientOfThermalExpansionUnit.InverseDegreeCelsius, new BaseUnits(temperature: TemperatureUnit.DegreeCelsius)), new UnitInfo(CoefficientOfThermalExpansionUnit.InverseDegreeFahrenheit, new BaseUnits(temperature: TemperatureUnit.DegreeFahrenheit)), new UnitInfo(CoefficientOfThermalExpansionUnit.InverseKelvin, new BaseUnits(temperature: TemperatureUnit.Kelvin)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.CoefficientOfThermalExpansion); } /// @@ -121,6 +121,7 @@ public CoefficientOfThermalExpansion(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.CoefficientOfThermalExpansion; /// @@ -571,7 +572,7 @@ public bool Equals(CoefficientOfThermalExpansion other, double tolerance, Compar /// A hash code for the current CoefficientOfThermalExpansion. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -860,6 +861,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return CoefficientOfThermalExpansion.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return CoefficientOfThermalExpansion.Info; else if(conversionType == typeof(BaseDimensions)) return CoefficientOfThermalExpansion.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Density.g.cs b/UnitsNet/GeneratedCode/Quantities/Density.g.cs index da5c1bbd5b..084fec6488 100644 --- a/UnitsNet/GeneratedCode/Quantities/Density.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Density.g.cs @@ -53,7 +53,7 @@ static Density() { BaseDimensions = new BaseDimensions(-3, 1, 0, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Density, + Info = new QuantityInfo("Density", new UnitInfo[] { new UnitInfo(DensityUnit.CentigramPerDeciliter, BaseUnits.Undefined), new UnitInfo(DensityUnit.CentigramPerLiter, BaseUnits.Undefined), @@ -96,7 +96,7 @@ static Density() new UnitInfo(DensityUnit.TonnePerCubicMeter, new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Tonne)), new UnitInfo(DensityUnit.TonnePerCubicMillimeter, new BaseUnits(length: LengthUnit.Millimeter, mass: MassUnit.Tonne)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Density); } /// @@ -161,6 +161,7 @@ public Density(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Density; /// @@ -1129,7 +1130,7 @@ public bool Equals(Density other, double tolerance, ComparisonType comparisonTyp /// A hash code for the current Density. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1492,6 +1493,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Density.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Density.Info; else if(conversionType == typeof(BaseDimensions)) return Density.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Duration.g.cs b/UnitsNet/GeneratedCode/Quantities/Duration.g.cs index 8dfbec5b24..29c660ed75 100644 --- a/UnitsNet/GeneratedCode/Quantities/Duration.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Duration.g.cs @@ -50,7 +50,7 @@ static Duration() { BaseDimensions = new BaseDimensions(0, 0, 1, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Duration, + Info = new QuantityInfo("Duration", new UnitInfo[] { new UnitInfo(DurationUnit.Day, new BaseUnits(time: DurationUnit.Day)), new UnitInfo(DurationUnit.Hour, new BaseUnits(time: DurationUnit.Hour)), @@ -63,7 +63,7 @@ static Duration() new UnitInfo(DurationUnit.Week, new BaseUnits(time: DurationUnit.Week)), new UnitInfo(DurationUnit.Year365, new BaseUnits(time: DurationUnit.Year365)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Duration); } /// @@ -128,6 +128,7 @@ public Duration(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Duration; /// @@ -676,7 +677,7 @@ public bool Equals(Duration other, double tolerance, ComparisonType comparisonTy /// A hash code for the current Duration. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -979,6 +980,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Duration.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Duration.Info; else if(conversionType == typeof(BaseDimensions)) return Duration.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/DynamicViscosity.g.cs b/UnitsNet/GeneratedCode/Quantities/DynamicViscosity.g.cs index 04de8c4043..e453ddcee5 100644 --- a/UnitsNet/GeneratedCode/Quantities/DynamicViscosity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/DynamicViscosity.g.cs @@ -53,7 +53,7 @@ static DynamicViscosity() { BaseDimensions = new BaseDimensions(-1, 1, -1, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.DynamicViscosity, + Info = new QuantityInfo("DynamicViscosity", new UnitInfo[] { new UnitInfo(DynamicViscosityUnit.Centipoise, BaseUnits.Undefined), new UnitInfo(DynamicViscosityUnit.MicropascalSecond, BaseUnits.Undefined), @@ -66,7 +66,7 @@ static DynamicViscosity() new UnitInfo(DynamicViscosityUnit.PoundPerFootSecond, BaseUnits.Undefined), new UnitInfo(DynamicViscosityUnit.Reyn, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.DynamicViscosity); } /// @@ -131,6 +131,7 @@ public DynamicViscosity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.DynamicViscosity; /// @@ -679,7 +680,7 @@ public bool Equals(DynamicViscosity other, double tolerance, ComparisonType comp /// A hash code for the current DynamicViscosity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -982,6 +983,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return DynamicViscosity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return DynamicViscosity.Info; else if(conversionType == typeof(BaseDimensions)) return DynamicViscosity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricAdmittance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricAdmittance.g.cs index 4d32562157..7b6bfb3e45 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricAdmittance.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricAdmittance.g.cs @@ -50,14 +50,14 @@ static ElectricAdmittance() { BaseDimensions = new BaseDimensions(-2, -1, 3, 2, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricAdmittance, + Info = new QuantityInfo("ElectricAdmittance", new UnitInfo[] { new UnitInfo(ElectricAdmittanceUnit.Microsiemens, BaseUnits.Undefined), new UnitInfo(ElectricAdmittanceUnit.Millisiemens, BaseUnits.Undefined), new UnitInfo(ElectricAdmittanceUnit.Nanosiemens, BaseUnits.Undefined), new UnitInfo(ElectricAdmittanceUnit.Siemens, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricAdmittance); } /// @@ -122,6 +122,7 @@ public ElectricAdmittance(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricAdmittance; /// @@ -586,7 +587,7 @@ public bool Equals(ElectricAdmittance other, double tolerance, ComparisonType co /// A hash code for the current ElectricAdmittance. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -877,6 +878,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricAdmittance.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricAdmittance.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricAdmittance.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricCharge.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricCharge.g.cs index d441ab525e..2110cc871a 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricCharge.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricCharge.g.cs @@ -53,7 +53,7 @@ static ElectricCharge() { BaseDimensions = new BaseDimensions(0, 0, 1, 1, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricCharge, + Info = new QuantityInfo("ElectricCharge", new UnitInfo[] { new UnitInfo(ElectricChargeUnit.AmpereHour, BaseUnits.Undefined), new UnitInfo(ElectricChargeUnit.Coulomb, BaseUnits.Undefined), @@ -61,7 +61,7 @@ static ElectricCharge() new UnitInfo(ElectricChargeUnit.MegaampereHour, BaseUnits.Undefined), new UnitInfo(ElectricChargeUnit.MilliampereHour, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricCharge); } /// @@ -126,6 +126,7 @@ public ElectricCharge(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricCharge; /// @@ -604,7 +605,7 @@ public bool Equals(ElectricCharge other, double tolerance, ComparisonType compar /// A hash code for the current ElectricCharge. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -897,6 +898,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricCharge.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricCharge.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricCharge.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricChargeDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricChargeDensity.g.cs index 7eee888c9e..b8b5a8262c 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricChargeDensity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricChargeDensity.g.cs @@ -53,11 +53,11 @@ static ElectricChargeDensity() { BaseDimensions = new BaseDimensions(-3, 0, 1, 1, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricChargeDensity, + Info = new QuantityInfo("ElectricChargeDensity", new UnitInfo[] { new UnitInfo(ElectricChargeDensityUnit.CoulombPerCubicMeter, new BaseUnits(length: LengthUnit.Meter, time: DurationUnit.Second, current: ElectricCurrentUnit.Ampere)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricChargeDensity); } /// @@ -122,6 +122,7 @@ public ElectricChargeDensity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricChargeDensity; /// @@ -544,7 +545,7 @@ public bool Equals(ElectricChargeDensity other, double tolerance, ComparisonType /// A hash code for the current ElectricChargeDensity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -829,6 +830,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricChargeDensity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricChargeDensity.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricChargeDensity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricConductance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricConductance.g.cs index 9057adb96e..d194b12478 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricConductance.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricConductance.g.cs @@ -53,13 +53,13 @@ static ElectricConductance() { BaseDimensions = new BaseDimensions(-2, -1, 3, 2, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricConductance, + Info = new QuantityInfo("ElectricConductance", new UnitInfo[] { new UnitInfo(ElectricConductanceUnit.Microsiemens, BaseUnits.Undefined), new UnitInfo(ElectricConductanceUnit.Millisiemens, BaseUnits.Undefined), new UnitInfo(ElectricConductanceUnit.Siemens, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricConductance); } /// @@ -124,6 +124,7 @@ public ElectricConductance(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricConductance; /// @@ -574,7 +575,7 @@ public bool Equals(ElectricConductance other, double tolerance, ComparisonType c /// A hash code for the current ElectricConductance. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -863,6 +864,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricConductance.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricConductance.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricConductance.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricConductivity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricConductivity.g.cs index d55f01f9c8..b2c2a9c1c6 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricConductivity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricConductivity.g.cs @@ -53,13 +53,13 @@ static ElectricConductivity() { BaseDimensions = new BaseDimensions(-3, -1, 3, 2, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricConductivity, + Info = new QuantityInfo("ElectricConductivity", new UnitInfo[] { new UnitInfo(ElectricConductivityUnit.SiemensPerFoot, BaseUnits.Undefined), new UnitInfo(ElectricConductivityUnit.SiemensPerInch, BaseUnits.Undefined), new UnitInfo(ElectricConductivityUnit.SiemensPerMeter, new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second, current: ElectricCurrentUnit.Ampere)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricConductivity); } /// @@ -124,6 +124,7 @@ public ElectricConductivity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricConductivity; /// @@ -574,7 +575,7 @@ public bool Equals(ElectricConductivity other, double tolerance, ComparisonType /// A hash code for the current ElectricConductivity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -863,6 +864,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricConductivity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricConductivity.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricConductivity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricCurrent.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricCurrent.g.cs index 23877d8b2b..a138e6df9a 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricCurrent.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricCurrent.g.cs @@ -50,7 +50,7 @@ static ElectricCurrent() { BaseDimensions = new BaseDimensions(0, 0, 0, 1, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricCurrent, + Info = new QuantityInfo("ElectricCurrent", new UnitInfo[] { new UnitInfo(ElectricCurrentUnit.Ampere, new BaseUnits(current: ElectricCurrentUnit.Ampere)), new UnitInfo(ElectricCurrentUnit.Centiampere, BaseUnits.Undefined), @@ -61,7 +61,7 @@ static ElectricCurrent() new UnitInfo(ElectricCurrentUnit.Nanoampere, BaseUnits.Undefined), new UnitInfo(ElectricCurrentUnit.Picoampere, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricCurrent); } /// @@ -126,6 +126,7 @@ public ElectricCurrent(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricCurrent; /// @@ -646,7 +647,7 @@ public bool Equals(ElectricCurrent other, double tolerance, ComparisonType compa /// A hash code for the current ElectricCurrent. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -945,6 +946,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricCurrent.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricCurrent.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricCurrent.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs index 25fbd5bc4c..ad6a6bdee0 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs @@ -53,13 +53,13 @@ static ElectricCurrentDensity() { BaseDimensions = new BaseDimensions(-2, 0, 0, 1, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricCurrentDensity, + Info = new QuantityInfo("ElectricCurrentDensity", new UnitInfo[] { new UnitInfo(ElectricCurrentDensityUnit.AmperePerSquareFoot, new BaseUnits(length: LengthUnit.Foot, current: ElectricCurrentUnit.Ampere)), new UnitInfo(ElectricCurrentDensityUnit.AmperePerSquareInch, new BaseUnits(length: LengthUnit.Inch, current: ElectricCurrentUnit.Ampere)), new UnitInfo(ElectricCurrentDensityUnit.AmperePerSquareMeter, new BaseUnits(length: LengthUnit.Meter, current: ElectricCurrentUnit.Ampere)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricCurrentDensity); } /// @@ -124,6 +124,7 @@ public ElectricCurrentDensity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricCurrentDensity; /// @@ -574,7 +575,7 @@ public bool Equals(ElectricCurrentDensity other, double tolerance, ComparisonTyp /// A hash code for the current ElectricCurrentDensity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -863,6 +864,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricCurrentDensity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricCurrentDensity.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricCurrentDensity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs index e76eaeaa5c..935641fefd 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs @@ -50,11 +50,11 @@ static ElectricCurrentGradient() { BaseDimensions = new BaseDimensions(0, 0, -1, 1, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricCurrentGradient, + Info = new QuantityInfo("ElectricCurrentGradient", new UnitInfo[] { new UnitInfo(ElectricCurrentGradientUnit.AmperePerSecond, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricCurrentGradient); } /// @@ -119,6 +119,7 @@ public ElectricCurrentGradient(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricCurrentGradient; /// @@ -541,7 +542,7 @@ public bool Equals(ElectricCurrentGradient other, double tolerance, ComparisonTy /// A hash code for the current ElectricCurrentGradient. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -826,6 +827,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricCurrentGradient.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricCurrentGradient.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricCurrentGradient.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricField.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricField.g.cs index 9a611d2ece..6c96205931 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricField.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricField.g.cs @@ -53,11 +53,11 @@ static ElectricField() { BaseDimensions = new BaseDimensions(1, 1, -3, -1, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricField, + Info = new QuantityInfo("ElectricField", new UnitInfo[] { new UnitInfo(ElectricFieldUnit.VoltPerMeter, new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second, current: ElectricCurrentUnit.Ampere)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricField); } /// @@ -122,6 +122,7 @@ public ElectricField(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricField; /// @@ -544,7 +545,7 @@ public bool Equals(ElectricField other, double tolerance, ComparisonType compari /// A hash code for the current ElectricField. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -829,6 +830,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricField.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricField.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricField.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricInductance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricInductance.g.cs index a35692e319..274c01939a 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricInductance.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricInductance.g.cs @@ -53,14 +53,14 @@ static ElectricInductance() { BaseDimensions = new BaseDimensions(2, 1, -2, -2, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricInductance, + Info = new QuantityInfo("ElectricInductance", new UnitInfo[] { new UnitInfo(ElectricInductanceUnit.Henry, BaseUnits.Undefined), new UnitInfo(ElectricInductanceUnit.Microhenry, BaseUnits.Undefined), new UnitInfo(ElectricInductanceUnit.Millihenry, BaseUnits.Undefined), new UnitInfo(ElectricInductanceUnit.Nanohenry, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricInductance); } /// @@ -125,6 +125,7 @@ public ElectricInductance(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricInductance; /// @@ -589,7 +590,7 @@ public bool Equals(ElectricInductance other, double tolerance, ComparisonType co /// A hash code for the current ElectricInductance. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -880,6 +881,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricInductance.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricInductance.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricInductance.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricPotential.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricPotential.g.cs index 7bbac7191b..3e55a9d60a 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricPotential.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricPotential.g.cs @@ -50,7 +50,7 @@ static ElectricPotential() { BaseDimensions = new BaseDimensions(2, 1, -3, -1, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricPotential, + Info = new QuantityInfo("ElectricPotential", new UnitInfo[] { new UnitInfo(ElectricPotentialUnit.Kilovolt, BaseUnits.Undefined), new UnitInfo(ElectricPotentialUnit.Megavolt, BaseUnits.Undefined), @@ -58,7 +58,7 @@ static ElectricPotential() new UnitInfo(ElectricPotentialUnit.Millivolt, BaseUnits.Undefined), new UnitInfo(ElectricPotentialUnit.Volt, new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second, current: ElectricCurrentUnit.Ampere)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricPotential); } /// @@ -123,6 +123,7 @@ public ElectricPotential(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricPotential; /// @@ -601,7 +602,7 @@ public bool Equals(ElectricPotential other, double tolerance, ComparisonType com /// A hash code for the current ElectricPotential. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -894,6 +895,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricPotential.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricPotential.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricPotential.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricPotentialAc.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricPotentialAc.g.cs index 652d9c8d04..e01e0f06c9 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricPotentialAc.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricPotentialAc.g.cs @@ -50,7 +50,7 @@ static ElectricPotentialAc() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.ElectricPotentialAc, + Info = new QuantityInfo("ElectricPotentialAc", new UnitInfo[] { new UnitInfo(ElectricPotentialAcUnit.KilovoltAc, BaseUnits.Undefined), new UnitInfo(ElectricPotentialAcUnit.MegavoltAc, BaseUnits.Undefined), @@ -58,7 +58,7 @@ static ElectricPotentialAc() new UnitInfo(ElectricPotentialAcUnit.MillivoltAc, BaseUnits.Undefined), new UnitInfo(ElectricPotentialAcUnit.VoltAc, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricPotentialAc); } /// @@ -123,6 +123,7 @@ public ElectricPotentialAc(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricPotentialAc; /// @@ -601,7 +602,7 @@ public bool Equals(ElectricPotentialAc other, double tolerance, ComparisonType c /// A hash code for the current ElectricPotentialAc. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -894,6 +895,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricPotentialAc.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricPotentialAc.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricPotentialAc.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs index dc66e7a1aa..d69a040bf5 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs @@ -50,7 +50,7 @@ static ElectricPotentialChangeRate() { BaseDimensions = new BaseDimensions(2, 1, -4, -1, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricPotentialChangeRate, + Info = new QuantityInfo("ElectricPotentialChangeRate", new UnitInfo[] { new UnitInfo(ElectricPotentialChangeRateUnit.KilovoltPerHour, BaseUnits.Undefined), new UnitInfo(ElectricPotentialChangeRateUnit.KilovoltPerMicrosecond, BaseUnits.Undefined), @@ -73,7 +73,7 @@ static ElectricPotentialChangeRate() new UnitInfo(ElectricPotentialChangeRateUnit.VoltPerMinute, new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Minute, current: ElectricCurrentUnit.Ampere)), new UnitInfo(ElectricPotentialChangeRateUnit.VoltPerSecond, new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second, current: ElectricCurrentUnit.Ampere)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricPotentialChangeRate); } /// @@ -138,6 +138,7 @@ public ElectricPotentialChangeRate(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricPotentialChangeRate; /// @@ -826,7 +827,7 @@ public bool Equals(ElectricPotentialChangeRate other, double tolerance, Comparis /// A hash code for the current ElectricPotentialChangeRate. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1149,6 +1150,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricPotentialChangeRate.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricPotentialChangeRate.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricPotentialChangeRate.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricPotentialDc.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricPotentialDc.g.cs index e22e2c3ad7..998adeb224 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricPotentialDc.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricPotentialDc.g.cs @@ -50,7 +50,7 @@ static ElectricPotentialDc() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.ElectricPotentialDc, + Info = new QuantityInfo("ElectricPotentialDc", new UnitInfo[] { new UnitInfo(ElectricPotentialDcUnit.KilovoltDc, BaseUnits.Undefined), new UnitInfo(ElectricPotentialDcUnit.MegavoltDc, BaseUnits.Undefined), @@ -58,7 +58,7 @@ static ElectricPotentialDc() new UnitInfo(ElectricPotentialDcUnit.MillivoltDc, BaseUnits.Undefined), new UnitInfo(ElectricPotentialDcUnit.VoltDc, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricPotentialDc); } /// @@ -123,6 +123,7 @@ public ElectricPotentialDc(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricPotentialDc; /// @@ -601,7 +602,7 @@ public bool Equals(ElectricPotentialDc other, double tolerance, ComparisonType c /// A hash code for the current ElectricPotentialDc. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -894,6 +895,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricPotentialDc.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricPotentialDc.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricPotentialDc.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricResistance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricResistance.g.cs index c55d1b88ef..3f7b425639 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricResistance.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricResistance.g.cs @@ -50,7 +50,7 @@ static ElectricResistance() { BaseDimensions = new BaseDimensions(2, 1, -3, -2, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricResistance, + Info = new QuantityInfo("ElectricResistance", new UnitInfo[] { new UnitInfo(ElectricResistanceUnit.Gigaohm, BaseUnits.Undefined), new UnitInfo(ElectricResistanceUnit.Kiloohm, BaseUnits.Undefined), @@ -59,7 +59,7 @@ static ElectricResistance() new UnitInfo(ElectricResistanceUnit.Milliohm, BaseUnits.Undefined), new UnitInfo(ElectricResistanceUnit.Ohm, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricResistance); } /// @@ -124,6 +124,7 @@ public ElectricResistance(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricResistance; /// @@ -616,7 +617,7 @@ public bool Equals(ElectricResistance other, double tolerance, ComparisonType co /// A hash code for the current ElectricResistance. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -911,6 +912,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricResistance.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricResistance.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricResistance.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricResistivity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricResistivity.g.cs index 41d0b2791d..56726eaeaf 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricResistivity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricResistivity.g.cs @@ -53,7 +53,7 @@ static ElectricResistivity() { BaseDimensions = new BaseDimensions(3, 1, -3, -2, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricResistivity, + Info = new QuantityInfo("ElectricResistivity", new UnitInfo[] { new UnitInfo(ElectricResistivityUnit.KiloohmCentimeter, BaseUnits.Undefined), new UnitInfo(ElectricResistivityUnit.KiloohmMeter, BaseUnits.Undefined), @@ -70,7 +70,7 @@ static ElectricResistivity() new UnitInfo(ElectricResistivityUnit.PicoohmCentimeter, BaseUnits.Undefined), new UnitInfo(ElectricResistivityUnit.PicoohmMeter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricResistivity); } /// @@ -135,6 +135,7 @@ public ElectricResistivity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricResistivity; /// @@ -739,7 +740,7 @@ public bool Equals(ElectricResistivity other, double tolerance, ComparisonType c /// A hash code for the current ElectricResistivity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1050,6 +1051,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricResistivity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricResistivity.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricResistivity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs index 98ce454741..4e3b431a64 100644 --- a/UnitsNet/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs @@ -53,13 +53,13 @@ static ElectricSurfaceChargeDensity() { BaseDimensions = new BaseDimensions(-2, 0, 1, 1, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ElectricSurfaceChargeDensity, + Info = new QuantityInfo("ElectricSurfaceChargeDensity", new UnitInfo[] { new UnitInfo(ElectricSurfaceChargeDensityUnit.CoulombPerSquareCentimeter, new BaseUnits(length: LengthUnit.Centimeter, time: DurationUnit.Second, current: ElectricCurrentUnit.Ampere)), new UnitInfo(ElectricSurfaceChargeDensityUnit.CoulombPerSquareInch, new BaseUnits(length: LengthUnit.Inch, time: DurationUnit.Second, current: ElectricCurrentUnit.Ampere)), new UnitInfo(ElectricSurfaceChargeDensityUnit.CoulombPerSquareMeter, new BaseUnits(length: LengthUnit.Meter, time: DurationUnit.Second, current: ElectricCurrentUnit.Ampere)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ElectricSurfaceChargeDensity); } /// @@ -124,6 +124,7 @@ public ElectricSurfaceChargeDensity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ElectricSurfaceChargeDensity; /// @@ -574,7 +575,7 @@ public bool Equals(ElectricSurfaceChargeDensity other, double tolerance, Compari /// A hash code for the current ElectricSurfaceChargeDensity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -863,6 +864,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ElectricSurfaceChargeDensity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ElectricSurfaceChargeDensity.Info; else if(conversionType == typeof(BaseDimensions)) return ElectricSurfaceChargeDensity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Energy.g.cs b/UnitsNet/GeneratedCode/Quantities/Energy.g.cs index ed0c2175c6..6e9e2d05f8 100644 --- a/UnitsNet/GeneratedCode/Quantities/Energy.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Energy.g.cs @@ -50,7 +50,7 @@ static Energy() { BaseDimensions = new BaseDimensions(2, 1, -2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Energy, + Info = new QuantityInfo("Energy", new UnitInfo[] { new UnitInfo(EnergyUnit.BritishThermalUnit, BaseUnits.Undefined), new UnitInfo(EnergyUnit.Calorie, BaseUnits.Undefined), @@ -89,7 +89,7 @@ static Energy() new UnitInfo(EnergyUnit.WattDay, BaseUnits.Undefined), new UnitInfo(EnergyUnit.WattHour, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Energy); } /// @@ -154,6 +154,7 @@ public Energy(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Energy; /// @@ -1066,7 +1067,7 @@ public bool Equals(Energy other, double tolerance, ComparisonType comparisonType /// A hash code for the current Energy. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1421,6 +1422,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Energy.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Energy.Info; else if(conversionType == typeof(BaseDimensions)) return Energy.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Entropy.g.cs b/UnitsNet/GeneratedCode/Quantities/Entropy.g.cs index 4d22327766..11da711023 100644 --- a/UnitsNet/GeneratedCode/Quantities/Entropy.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Entropy.g.cs @@ -50,7 +50,7 @@ static Entropy() { BaseDimensions = new BaseDimensions(2, 1, -2, 0, -1, 0, 0); - Info = new QuantityInfo(QuantityType.Entropy, + Info = new QuantityInfo("Entropy", new UnitInfo[] { new UnitInfo(EntropyUnit.CaloriePerKelvin, BaseUnits.Undefined), new UnitInfo(EntropyUnit.JoulePerDegreeCelsius, BaseUnits.Undefined), @@ -60,7 +60,7 @@ static Entropy() new UnitInfo(EntropyUnit.KilojoulePerKelvin, BaseUnits.Undefined), new UnitInfo(EntropyUnit.MegajoulePerKelvin, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Entropy); } /// @@ -125,6 +125,7 @@ public Entropy(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Entropy; /// @@ -631,7 +632,7 @@ public bool Equals(Entropy other, double tolerance, ComparisonType comparisonTyp /// A hash code for the current Entropy. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -928,6 +929,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Entropy.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Entropy.Info; else if(conversionType == typeof(BaseDimensions)) return Entropy.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Force.g.cs b/UnitsNet/GeneratedCode/Quantities/Force.g.cs index 7fe348fb78..78c58aff20 100644 --- a/UnitsNet/GeneratedCode/Quantities/Force.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Force.g.cs @@ -50,7 +50,7 @@ static Force() { BaseDimensions = new BaseDimensions(1, 1, -2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Force, + Info = new QuantityInfo("Force", new UnitInfo[] { new UnitInfo(ForceUnit.Decanewton, BaseUnits.Undefined), new UnitInfo(ForceUnit.Dyn, new BaseUnits(length: LengthUnit.Centimeter, mass: MassUnit.Gram, time: DurationUnit.Second)), @@ -68,7 +68,7 @@ static Force() new UnitInfo(ForceUnit.ShortTonForce, BaseUnits.Undefined), new UnitInfo(ForceUnit.TonneForce, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Force); } /// @@ -133,6 +133,7 @@ public Force(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Force; /// @@ -751,7 +752,7 @@ public bool Equals(Force other, double tolerance, ComparisonType comparisonType) /// A hash code for the current Force. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1064,6 +1065,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Force.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Force.Info; else if(conversionType == typeof(BaseDimensions)) return Force.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ForceChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/ForceChangeRate.g.cs index 6b0737e640..a43247ae43 100644 --- a/UnitsNet/GeneratedCode/Quantities/ForceChangeRate.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ForceChangeRate.g.cs @@ -50,7 +50,7 @@ static ForceChangeRate() { BaseDimensions = new BaseDimensions(1, 1, -3, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ForceChangeRate, + Info = new QuantityInfo("ForceChangeRate", new UnitInfo[] { new UnitInfo(ForceChangeRateUnit.CentinewtonPerSecond, BaseUnits.Undefined), new UnitInfo(ForceChangeRateUnit.DecanewtonPerMinute, BaseUnits.Undefined), @@ -64,7 +64,7 @@ static ForceChangeRate() new UnitInfo(ForceChangeRateUnit.NewtonPerMinute, BaseUnits.Undefined), new UnitInfo(ForceChangeRateUnit.NewtonPerSecond, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ForceChangeRate); } /// @@ -129,6 +129,7 @@ public ForceChangeRate(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ForceChangeRate; /// @@ -691,7 +692,7 @@ public bool Equals(ForceChangeRate other, double tolerance, ComparisonType compa /// A hash code for the current ForceChangeRate. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -996,6 +997,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ForceChangeRate.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ForceChangeRate.Info; else if(conversionType == typeof(BaseDimensions)) return ForceChangeRate.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ForcePerLength.g.cs b/UnitsNet/GeneratedCode/Quantities/ForcePerLength.g.cs index fd12e2a781..301c8bcc28 100644 --- a/UnitsNet/GeneratedCode/Quantities/ForcePerLength.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ForcePerLength.g.cs @@ -50,7 +50,7 @@ static ForcePerLength() { BaseDimensions = new BaseDimensions(0, 1, -2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ForcePerLength, + Info = new QuantityInfo("ForcePerLength", new UnitInfo[] { new UnitInfo(ForcePerLengthUnit.CentinewtonPerCentimeter, BaseUnits.Undefined), new UnitInfo(ForcePerLengthUnit.CentinewtonPerMeter, BaseUnits.Undefined), @@ -91,7 +91,7 @@ static ForcePerLength() new UnitInfo(ForcePerLengthUnit.TonneForcePerMeter, BaseUnits.Undefined), new UnitInfo(ForcePerLengthUnit.TonneForcePerMillimeter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ForcePerLength); } /// @@ -156,6 +156,7 @@ public ForcePerLength(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ForcePerLength; /// @@ -1096,7 +1097,7 @@ public bool Equals(ForcePerLength other, double tolerance, ComparisonType compar /// A hash code for the current ForcePerLength. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1455,6 +1456,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ForcePerLength.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ForcePerLength.Info; else if(conversionType == typeof(BaseDimensions)) return ForcePerLength.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Frequency.g.cs b/UnitsNet/GeneratedCode/Quantities/Frequency.g.cs index 665f183951..a93b883e77 100644 --- a/UnitsNet/GeneratedCode/Quantities/Frequency.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Frequency.g.cs @@ -50,7 +50,7 @@ static Frequency() { BaseDimensions = new BaseDimensions(0, 0, -1, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Frequency, + Info = new QuantityInfo("Frequency", new UnitInfo[] { new UnitInfo(FrequencyUnit.BeatPerMinute, BaseUnits.Undefined), new UnitInfo(FrequencyUnit.CyclePerHour, BaseUnits.Undefined), @@ -63,7 +63,7 @@ static Frequency() new UnitInfo(FrequencyUnit.RadianPerSecond, BaseUnits.Undefined), new UnitInfo(FrequencyUnit.Terahertz, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Frequency); } /// @@ -128,6 +128,7 @@ public Frequency(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Frequency; /// @@ -676,7 +677,7 @@ public bool Equals(Frequency other, double tolerance, ComparisonType comparisonT /// A hash code for the current Frequency. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -979,6 +980,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Frequency.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Frequency.Info; else if(conversionType == typeof(BaseDimensions)) return Frequency.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/FuelEfficiency.g.cs b/UnitsNet/GeneratedCode/Quantities/FuelEfficiency.g.cs index 6fd8492a34..509c0ed70b 100644 --- a/UnitsNet/GeneratedCode/Quantities/FuelEfficiency.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/FuelEfficiency.g.cs @@ -53,14 +53,14 @@ static FuelEfficiency() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.FuelEfficiency, + Info = new QuantityInfo("FuelEfficiency", new UnitInfo[] { new UnitInfo(FuelEfficiencyUnit.KilometerPerLiter, BaseUnits.Undefined), new UnitInfo(FuelEfficiencyUnit.LiterPer100Kilometers, BaseUnits.Undefined), new UnitInfo(FuelEfficiencyUnit.MilePerUkGallon, BaseUnits.Undefined), new UnitInfo(FuelEfficiencyUnit.MilePerUsGallon, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.FuelEfficiency); } /// @@ -125,6 +125,7 @@ public FuelEfficiency(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.FuelEfficiency; /// @@ -589,7 +590,7 @@ public bool Equals(FuelEfficiency other, double tolerance, ComparisonType compar /// A hash code for the current FuelEfficiency. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -880,6 +881,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return FuelEfficiency.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return FuelEfficiency.Info; else if(conversionType == typeof(BaseDimensions)) return FuelEfficiency.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs b/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs index 06ec38a224..0b8bca97b9 100644 --- a/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs @@ -50,7 +50,7 @@ static HeatFlux() { BaseDimensions = new BaseDimensions(0, 1, -3, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.HeatFlux, + Info = new QuantityInfo("HeatFlux", new UnitInfo[] { new UnitInfo(HeatFluxUnit.BtuPerHourSquareFoot, BaseUnits.Undefined), new UnitInfo(HeatFluxUnit.BtuPerMinuteSquareFoot, BaseUnits.Undefined), @@ -71,7 +71,7 @@ static HeatFlux() new UnitInfo(HeatFluxUnit.WattPerSquareInch, BaseUnits.Undefined), new UnitInfo(HeatFluxUnit.WattPerSquareMeter, new BaseUnits(mass: MassUnit.Kilogram, time: DurationUnit.Second)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.HeatFlux); } /// @@ -136,6 +136,7 @@ public HeatFlux(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.HeatFlux; /// @@ -796,7 +797,7 @@ public bool Equals(HeatFlux other, double tolerance, ComparisonType comparisonTy /// A hash code for the current HeatFlux. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1115,6 +1116,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return HeatFlux.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return HeatFlux.Info; else if(conversionType == typeof(BaseDimensions)) return HeatFlux.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs b/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs index 346bd88420..fab206d466 100644 --- a/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs @@ -50,13 +50,13 @@ static HeatTransferCoefficient() { BaseDimensions = new BaseDimensions(0, 1, -3, 0, -1, 0, 0); - Info = new QuantityInfo(QuantityType.HeatTransferCoefficient, + Info = new QuantityInfo("HeatTransferCoefficient", new UnitInfo[] { new UnitInfo(HeatTransferCoefficientUnit.BtuPerSquareFootDegreeFahrenheit, BaseUnits.Undefined), new UnitInfo(HeatTransferCoefficientUnit.WattPerSquareMeterCelsius, BaseUnits.Undefined), new UnitInfo(HeatTransferCoefficientUnit.WattPerSquareMeterKelvin, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.HeatTransferCoefficient); } /// @@ -121,6 +121,7 @@ public HeatTransferCoefficient(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.HeatTransferCoefficient; /// @@ -571,7 +572,7 @@ public bool Equals(HeatTransferCoefficient other, double tolerance, ComparisonTy /// A hash code for the current HeatTransferCoefficient. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -860,6 +861,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return HeatTransferCoefficient.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return HeatTransferCoefficient.Info; else if(conversionType == typeof(BaseDimensions)) return HeatTransferCoefficient.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Illuminance.g.cs b/UnitsNet/GeneratedCode/Quantities/Illuminance.g.cs index d18c6d8b5a..ef3e205cfd 100644 --- a/UnitsNet/GeneratedCode/Quantities/Illuminance.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Illuminance.g.cs @@ -53,14 +53,14 @@ static Illuminance() { BaseDimensions = new BaseDimensions(-2, 0, 0, 0, 0, 0, 1); - Info = new QuantityInfo(QuantityType.Illuminance, + Info = new QuantityInfo("Illuminance", new UnitInfo[] { new UnitInfo(IlluminanceUnit.Kilolux, BaseUnits.Undefined), new UnitInfo(IlluminanceUnit.Lux, BaseUnits.Undefined), new UnitInfo(IlluminanceUnit.Megalux, BaseUnits.Undefined), new UnitInfo(IlluminanceUnit.Millilux, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Illuminance); } /// @@ -125,6 +125,7 @@ public Illuminance(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Illuminance; /// @@ -589,7 +590,7 @@ public bool Equals(Illuminance other, double tolerance, ComparisonType compariso /// A hash code for the current Illuminance. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -880,6 +881,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Illuminance.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Illuminance.Info; else if(conversionType == typeof(BaseDimensions)) return Illuminance.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Information.g.cs b/UnitsNet/GeneratedCode/Quantities/Information.g.cs index 978d41bbbc..9867605918 100644 --- a/UnitsNet/GeneratedCode/Quantities/Information.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Information.g.cs @@ -50,7 +50,7 @@ static Information() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.Information, + Info = new QuantityInfo("Information", new UnitInfo[] { new UnitInfo(InformationUnit.Bit, BaseUnits.Undefined), new UnitInfo(InformationUnit.Byte, BaseUnits.Undefined), @@ -79,7 +79,7 @@ static Information() new UnitInfo(InformationUnit.Terabit, BaseUnits.Undefined), new UnitInfo(InformationUnit.Terabyte, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Information); } /// @@ -144,6 +144,7 @@ public Information(decimal value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Information; /// @@ -918,7 +919,7 @@ public bool Equals(Information other, double tolerance, ComparisonType compariso /// A hash code for the current Information. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1253,6 +1254,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Information.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Information.Info; else if(conversionType == typeof(BaseDimensions)) return Information.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Irradiance.g.cs b/UnitsNet/GeneratedCode/Quantities/Irradiance.g.cs index d6c42f7d9d..243e700262 100644 --- a/UnitsNet/GeneratedCode/Quantities/Irradiance.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Irradiance.g.cs @@ -50,7 +50,7 @@ static Irradiance() { BaseDimensions = new BaseDimensions(0, 1, -3, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Irradiance, + Info = new QuantityInfo("Irradiance", new UnitInfo[] { new UnitInfo(IrradianceUnit.KilowattPerSquareCentimeter, BaseUnits.Undefined), new UnitInfo(IrradianceUnit.KilowattPerSquareMeter, BaseUnits.Undefined), @@ -67,7 +67,7 @@ static Irradiance() new UnitInfo(IrradianceUnit.WattPerSquareCentimeter, BaseUnits.Undefined), new UnitInfo(IrradianceUnit.WattPerSquareMeter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Irradiance); } /// @@ -132,6 +132,7 @@ public Irradiance(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Irradiance; /// @@ -736,7 +737,7 @@ public bool Equals(Irradiance other, double tolerance, ComparisonType comparison /// A hash code for the current Irradiance. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1047,6 +1048,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Irradiance.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Irradiance.Info; else if(conversionType == typeof(BaseDimensions)) return Irradiance.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Irradiation.g.cs b/UnitsNet/GeneratedCode/Quantities/Irradiation.g.cs index aaa98eb2d5..2579a542fc 100644 --- a/UnitsNet/GeneratedCode/Quantities/Irradiation.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Irradiation.g.cs @@ -53,7 +53,7 @@ static Irradiation() { BaseDimensions = new BaseDimensions(0, 1, -2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Irradiation, + Info = new QuantityInfo("Irradiation", new UnitInfo[] { new UnitInfo(IrradiationUnit.JoulePerSquareCentimeter, BaseUnits.Undefined), new UnitInfo(IrradiationUnit.JoulePerSquareMeter, BaseUnits.Undefined), @@ -63,7 +63,7 @@ static Irradiation() new UnitInfo(IrradiationUnit.MillijoulePerSquareCentimeter, BaseUnits.Undefined), new UnitInfo(IrradiationUnit.WattHourPerSquareMeter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Irradiation); } /// @@ -128,6 +128,7 @@ public Irradiation(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Irradiation; /// @@ -634,7 +635,7 @@ public bool Equals(Irradiation other, double tolerance, ComparisonType compariso /// A hash code for the current Irradiation. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -931,6 +932,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Irradiation.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Irradiation.Info; else if(conversionType == typeof(BaseDimensions)) return Irradiation.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/KinematicViscosity.g.cs b/UnitsNet/GeneratedCode/Quantities/KinematicViscosity.g.cs index 03d75963b2..98764911b2 100644 --- a/UnitsNet/GeneratedCode/Quantities/KinematicViscosity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/KinematicViscosity.g.cs @@ -53,7 +53,7 @@ static KinematicViscosity() { BaseDimensions = new BaseDimensions(2, 0, -1, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.KinematicViscosity, + Info = new QuantityInfo("KinematicViscosity", new UnitInfo[] { new UnitInfo(KinematicViscosityUnit.Centistokes, BaseUnits.Undefined), new UnitInfo(KinematicViscosityUnit.Decistokes, BaseUnits.Undefined), @@ -64,7 +64,7 @@ static KinematicViscosity() new UnitInfo(KinematicViscosityUnit.SquareMeterPerSecond, BaseUnits.Undefined), new UnitInfo(KinematicViscosityUnit.Stokes, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.KinematicViscosity); } /// @@ -129,6 +129,7 @@ public KinematicViscosity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.KinematicViscosity; /// @@ -649,7 +650,7 @@ public bool Equals(KinematicViscosity other, double tolerance, ComparisonType co /// A hash code for the current KinematicViscosity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -948,6 +949,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return KinematicViscosity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return KinematicViscosity.Info; else if(conversionType == typeof(BaseDimensions)) return KinematicViscosity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/LapseRate.g.cs b/UnitsNet/GeneratedCode/Quantities/LapseRate.g.cs index 7d2099b3f5..632fa67ce5 100644 --- a/UnitsNet/GeneratedCode/Quantities/LapseRate.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/LapseRate.g.cs @@ -50,11 +50,11 @@ static LapseRate() { BaseDimensions = new BaseDimensions(-1, 0, 0, 0, 1, 0, 0); - Info = new QuantityInfo(QuantityType.LapseRate, + Info = new QuantityInfo("LapseRate", new UnitInfo[] { new UnitInfo(LapseRateUnit.DegreeCelsiusPerKilometer, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.LapseRate); } /// @@ -119,6 +119,7 @@ public LapseRate(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.LapseRate; /// @@ -541,7 +542,7 @@ public bool Equals(LapseRate other, double tolerance, ComparisonType comparisonT /// A hash code for the current LapseRate. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -826,6 +827,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return LapseRate.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return LapseRate.Info; else if(conversionType == typeof(BaseDimensions)) return LapseRate.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Length.g.cs b/UnitsNet/GeneratedCode/Quantities/Length.g.cs index c22db172d0..d6e2f06466 100644 --- a/UnitsNet/GeneratedCode/Quantities/Length.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Length.g.cs @@ -50,7 +50,7 @@ static Length() { BaseDimensions = new BaseDimensions(1, 0, 0, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Length, + Info = new QuantityInfo("Length", new UnitInfo[] { new UnitInfo(LengthUnit.AstronomicalUnit, BaseUnits.Undefined), new UnitInfo(LengthUnit.Centimeter, BaseUnits.Undefined), @@ -86,7 +86,7 @@ static Length() new UnitInfo(LengthUnit.UsSurveyFoot, new BaseUnits(length: LengthUnit.UsSurveyFoot)), new UnitInfo(LengthUnit.Yard, new BaseUnits(length: LengthUnit.Yard)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Length); } /// @@ -151,6 +151,7 @@ public Length(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Length; /// @@ -1021,7 +1022,7 @@ public bool Equals(Length other, double tolerance, ComparisonType comparisonType /// A hash code for the current Length. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1370,6 +1371,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Length.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Length.Info; else if(conversionType == typeof(BaseDimensions)) return Length.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Level.g.cs b/UnitsNet/GeneratedCode/Quantities/Level.g.cs index 18af1e4ca9..eca5f6df74 100644 --- a/UnitsNet/GeneratedCode/Quantities/Level.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Level.g.cs @@ -50,12 +50,12 @@ static Level() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.Level, + Info = new QuantityInfo("Level", new UnitInfo[] { new UnitInfo(LevelUnit.Decibel, BaseUnits.Undefined), new UnitInfo(LevelUnit.Neper, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Level); } /// @@ -120,6 +120,7 @@ public Level(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Level; /// @@ -564,7 +565,7 @@ public bool Equals(Level other, double tolerance, ComparisonType comparisonType) /// A hash code for the current Level. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -851,6 +852,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Level.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Level.Info; else if(conversionType == typeof(BaseDimensions)) return Level.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/LinearDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/LinearDensity.g.cs index 9b16f87531..2c12d61a3d 100644 --- a/UnitsNet/GeneratedCode/Quantities/LinearDensity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/LinearDensity.g.cs @@ -53,7 +53,7 @@ static LinearDensity() { BaseDimensions = new BaseDimensions(-1, 1, 0, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.LinearDensity, + Info = new QuantityInfo("LinearDensity", new UnitInfo[] { new UnitInfo(LinearDensityUnit.GramPerCentimeter, BaseUnits.Undefined), new UnitInfo(LinearDensityUnit.GramPerMeter, BaseUnits.Undefined), @@ -70,7 +70,7 @@ static LinearDensity() new UnitInfo(LinearDensityUnit.PoundPerFoot, BaseUnits.Undefined), new UnitInfo(LinearDensityUnit.PoundPerInch, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.LinearDensity); } /// @@ -135,6 +135,7 @@ public LinearDensity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.LinearDensity; /// @@ -739,7 +740,7 @@ public bool Equals(LinearDensity other, double tolerance, ComparisonType compari /// A hash code for the current LinearDensity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1050,6 +1051,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return LinearDensity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return LinearDensity.Info; else if(conversionType == typeof(BaseDimensions)) return LinearDensity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/LinearPowerDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/LinearPowerDensity.g.cs index 82a4b2473d..bcc7904b7f 100644 --- a/UnitsNet/GeneratedCode/Quantities/LinearPowerDensity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/LinearPowerDensity.g.cs @@ -53,7 +53,7 @@ static LinearPowerDensity() { BaseDimensions = new BaseDimensions(1, 1, -3, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.LinearPowerDensity, + Info = new QuantityInfo("LinearPowerDensity", new UnitInfo[] { new UnitInfo(LinearPowerDensityUnit.GigawattPerCentimeter, BaseUnits.Undefined), new UnitInfo(LinearPowerDensityUnit.GigawattPerFoot, BaseUnits.Undefined), @@ -81,7 +81,7 @@ static LinearPowerDensity() new UnitInfo(LinearPowerDensityUnit.WattPerMeter, BaseUnits.Undefined), new UnitInfo(LinearPowerDensityUnit.WattPerMillimeter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.LinearPowerDensity); } /// @@ -146,6 +146,7 @@ public LinearPowerDensity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.LinearPowerDensity; /// @@ -904,7 +905,7 @@ public bool Equals(LinearPowerDensity other, double tolerance, ComparisonType co /// A hash code for the current LinearPowerDensity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1237,6 +1238,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return LinearPowerDensity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return LinearPowerDensity.Info; else if(conversionType == typeof(BaseDimensions)) return LinearPowerDensity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs b/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs index 893315f5ad..c4475ff4b2 100644 --- a/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs @@ -53,7 +53,7 @@ static Luminosity() { BaseDimensions = new BaseDimensions(2, 1, -3, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Luminosity, + Info = new QuantityInfo("Luminosity", new UnitInfo[] { new UnitInfo(LuminosityUnit.Decawatt, BaseUnits.Undefined), new UnitInfo(LuminosityUnit.Deciwatt, BaseUnits.Undefined), @@ -70,7 +70,7 @@ static Luminosity() new UnitInfo(LuminosityUnit.Terawatt, BaseUnits.Undefined), new UnitInfo(LuminosityUnit.Watt, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Luminosity); } /// @@ -135,6 +135,7 @@ public Luminosity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Luminosity; /// @@ -739,7 +740,7 @@ public bool Equals(Luminosity other, double tolerance, ComparisonType comparison /// A hash code for the current Luminosity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1050,6 +1051,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Luminosity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Luminosity.Info; else if(conversionType == typeof(BaseDimensions)) return Luminosity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/LuminousFlux.g.cs b/UnitsNet/GeneratedCode/Quantities/LuminousFlux.g.cs index c0de33ed2c..5cabf81677 100644 --- a/UnitsNet/GeneratedCode/Quantities/LuminousFlux.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/LuminousFlux.g.cs @@ -53,11 +53,11 @@ static LuminousFlux() { BaseDimensions = new BaseDimensions(0, 0, 0, 0, 0, 0, 1); - Info = new QuantityInfo(QuantityType.LuminousFlux, + Info = new QuantityInfo("LuminousFlux", new UnitInfo[] { new UnitInfo(LuminousFluxUnit.Lumen, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.LuminousFlux); } /// @@ -122,6 +122,7 @@ public LuminousFlux(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.LuminousFlux; /// @@ -544,7 +545,7 @@ public bool Equals(LuminousFlux other, double tolerance, ComparisonType comparis /// A hash code for the current LuminousFlux. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -829,6 +830,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return LuminousFlux.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return LuminousFlux.Info; else if(conversionType == typeof(BaseDimensions)) return LuminousFlux.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/LuminousIntensity.g.cs b/UnitsNet/GeneratedCode/Quantities/LuminousIntensity.g.cs index bd25c55a5a..f6beb642b7 100644 --- a/UnitsNet/GeneratedCode/Quantities/LuminousIntensity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/LuminousIntensity.g.cs @@ -53,11 +53,11 @@ static LuminousIntensity() { BaseDimensions = new BaseDimensions(0, 0, 0, 0, 0, 0, 1); - Info = new QuantityInfo(QuantityType.LuminousIntensity, + Info = new QuantityInfo("LuminousIntensity", new UnitInfo[] { new UnitInfo(LuminousIntensityUnit.Candela, new BaseUnits(luminousIntensity: LuminousIntensityUnit.Candela)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.LuminousIntensity); } /// @@ -122,6 +122,7 @@ public LuminousIntensity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.LuminousIntensity; /// @@ -544,7 +545,7 @@ public bool Equals(LuminousIntensity other, double tolerance, ComparisonType com /// A hash code for the current LuminousIntensity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -829,6 +830,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return LuminousIntensity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return LuminousIntensity.Info; else if(conversionType == typeof(BaseDimensions)) return LuminousIntensity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/MagneticField.g.cs b/UnitsNet/GeneratedCode/Quantities/MagneticField.g.cs index 1d5d267b7e..b124240e24 100644 --- a/UnitsNet/GeneratedCode/Quantities/MagneticField.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/MagneticField.g.cs @@ -53,7 +53,7 @@ static MagneticField() { BaseDimensions = new BaseDimensions(0, 1, -2, -1, 0, 0, 0); - Info = new QuantityInfo(QuantityType.MagneticField, + Info = new QuantityInfo("MagneticField", new UnitInfo[] { new UnitInfo(MagneticFieldUnit.Gauss, BaseUnits.Undefined), new UnitInfo(MagneticFieldUnit.Microtesla, BaseUnits.Undefined), @@ -61,7 +61,7 @@ static MagneticField() new UnitInfo(MagneticFieldUnit.Nanotesla, BaseUnits.Undefined), new UnitInfo(MagneticFieldUnit.Tesla, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.MagneticField); } /// @@ -126,6 +126,7 @@ public MagneticField(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.MagneticField; /// @@ -604,7 +605,7 @@ public bool Equals(MagneticField other, double tolerance, ComparisonType compari /// A hash code for the current MagneticField. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -897,6 +898,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return MagneticField.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return MagneticField.Info; else if(conversionType == typeof(BaseDimensions)) return MagneticField.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/MagneticFlux.g.cs b/UnitsNet/GeneratedCode/Quantities/MagneticFlux.g.cs index 6a56f32260..2fc322f19f 100644 --- a/UnitsNet/GeneratedCode/Quantities/MagneticFlux.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/MagneticFlux.g.cs @@ -53,11 +53,11 @@ static MagneticFlux() { BaseDimensions = new BaseDimensions(2, 1, -2, -1, 0, 0, 0); - Info = new QuantityInfo(QuantityType.MagneticFlux, + Info = new QuantityInfo("MagneticFlux", new UnitInfo[] { new UnitInfo(MagneticFluxUnit.Weber, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.MagneticFlux); } /// @@ -122,6 +122,7 @@ public MagneticFlux(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.MagneticFlux; /// @@ -544,7 +545,7 @@ public bool Equals(MagneticFlux other, double tolerance, ComparisonType comparis /// A hash code for the current MagneticFlux. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -829,6 +830,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return MagneticFlux.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return MagneticFlux.Info; else if(conversionType == typeof(BaseDimensions)) return MagneticFlux.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Magnetization.g.cs b/UnitsNet/GeneratedCode/Quantities/Magnetization.g.cs index c0aab8d7e2..1fede64248 100644 --- a/UnitsNet/GeneratedCode/Quantities/Magnetization.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Magnetization.g.cs @@ -53,11 +53,11 @@ static Magnetization() { BaseDimensions = new BaseDimensions(-1, 0, 0, 1, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Magnetization, + Info = new QuantityInfo("Magnetization", new UnitInfo[] { new UnitInfo(MagnetizationUnit.AmperePerMeter, new BaseUnits(length: LengthUnit.Meter, current: ElectricCurrentUnit.Ampere)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Magnetization); } /// @@ -122,6 +122,7 @@ public Magnetization(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Magnetization; /// @@ -544,7 +545,7 @@ public bool Equals(Magnetization other, double tolerance, ComparisonType compari /// A hash code for the current Magnetization. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -829,6 +830,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Magnetization.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Magnetization.Info; else if(conversionType == typeof(BaseDimensions)) return Magnetization.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Mass.g.cs b/UnitsNet/GeneratedCode/Quantities/Mass.g.cs index 96ce9ba4e1..9056e68f35 100644 --- a/UnitsNet/GeneratedCode/Quantities/Mass.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Mass.g.cs @@ -50,7 +50,7 @@ static Mass() { BaseDimensions = new BaseDimensions(0, 1, 0, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Mass, + Info = new QuantityInfo("Mass", new UnitInfo[] { new UnitInfo(MassUnit.Centigram, BaseUnits.Undefined), new UnitInfo(MassUnit.Decagram, BaseUnits.Undefined), @@ -78,7 +78,7 @@ static Mass() new UnitInfo(MassUnit.Stone, new BaseUnits(mass: MassUnit.Stone)), new UnitInfo(MassUnit.Tonne, new BaseUnits(mass: MassUnit.Tonne)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Mass); } /// @@ -143,6 +143,7 @@ public Mass(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Mass; /// @@ -901,7 +902,7 @@ public bool Equals(Mass other, double tolerance, ComparisonType comparisonType) /// A hash code for the current Mass. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1234,6 +1235,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Mass.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Mass.Info; else if(conversionType == typeof(BaseDimensions)) return Mass.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/MassConcentration.g.cs b/UnitsNet/GeneratedCode/Quantities/MassConcentration.g.cs index 3485d38555..0118358461 100644 --- a/UnitsNet/GeneratedCode/Quantities/MassConcentration.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/MassConcentration.g.cs @@ -53,7 +53,7 @@ static MassConcentration() { BaseDimensions = new BaseDimensions(-3, 1, 0, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.MassConcentration, + Info = new QuantityInfo("MassConcentration", new UnitInfo[] { new UnitInfo(MassConcentrationUnit.CentigramPerDeciliter, BaseUnits.Undefined), new UnitInfo(MassConcentrationUnit.CentigramPerLiter, BaseUnits.Undefined), @@ -103,7 +103,7 @@ static MassConcentration() new UnitInfo(MassConcentrationUnit.TonnePerCubicMeter, new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Tonne)), new UnitInfo(MassConcentrationUnit.TonnePerCubicMillimeter, new BaseUnits(length: LengthUnit.Millimeter, mass: MassUnit.Tonne)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.MassConcentration); } /// @@ -168,6 +168,7 @@ public MassConcentration(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.MassConcentration; /// @@ -1234,7 +1235,7 @@ public bool Equals(MassConcentration other, double tolerance, ComparisonType com /// A hash code for the current MassConcentration. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1611,6 +1612,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return MassConcentration.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return MassConcentration.Info; else if(conversionType == typeof(BaseDimensions)) return MassConcentration.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/MassFlow.g.cs b/UnitsNet/GeneratedCode/Quantities/MassFlow.g.cs index cc95d72957..3a0c7a7000 100644 --- a/UnitsNet/GeneratedCode/Quantities/MassFlow.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/MassFlow.g.cs @@ -50,7 +50,7 @@ static MassFlow() { BaseDimensions = new BaseDimensions(0, 1, -1, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.MassFlow, + Info = new QuantityInfo("MassFlow", new UnitInfo[] { new UnitInfo(MassFlowUnit.CentigramPerDay, BaseUnits.Undefined), new UnitInfo(MassFlowUnit.CentigramPerSecond, BaseUnits.Undefined), @@ -86,7 +86,7 @@ static MassFlow() new UnitInfo(MassFlowUnit.TonnePerDay, BaseUnits.Undefined), new UnitInfo(MassFlowUnit.TonnePerHour, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.MassFlow); } /// @@ -151,6 +151,7 @@ public MassFlow(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.MassFlow; /// @@ -1021,7 +1022,7 @@ public bool Equals(MassFlow other, double tolerance, ComparisonType comparisonTy /// A hash code for the current MassFlow. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1370,6 +1371,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return MassFlow.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return MassFlow.Info; else if(conversionType == typeof(BaseDimensions)) return MassFlow.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/MassFlux.g.cs b/UnitsNet/GeneratedCode/Quantities/MassFlux.g.cs index cddac285fe..9bacd882cd 100644 --- a/UnitsNet/GeneratedCode/Quantities/MassFlux.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/MassFlux.g.cs @@ -50,7 +50,7 @@ static MassFlux() { BaseDimensions = new BaseDimensions(-2, 1, -1, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.MassFlux, + Info = new QuantityInfo("MassFlux", new UnitInfo[] { new UnitInfo(MassFluxUnit.GramPerHourPerSquareCentimeter, BaseUnits.Undefined), new UnitInfo(MassFluxUnit.GramPerHourPerSquareMeter, BaseUnits.Undefined), @@ -65,7 +65,7 @@ static MassFlux() new UnitInfo(MassFluxUnit.KilogramPerSecondPerSquareMeter, BaseUnits.Undefined), new UnitInfo(MassFluxUnit.KilogramPerSecondPerSquareMillimeter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.MassFlux); } /// @@ -130,6 +130,7 @@ public MassFlux(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.MassFlux; /// @@ -706,7 +707,7 @@ public bool Equals(MassFlux other, double tolerance, ComparisonType comparisonTy /// A hash code for the current MassFlux. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1013,6 +1014,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return MassFlux.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return MassFlux.Info; else if(conversionType == typeof(BaseDimensions)) return MassFlux.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/MassFraction.g.cs b/UnitsNet/GeneratedCode/Quantities/MassFraction.g.cs index d600750a73..7ff1a97651 100644 --- a/UnitsNet/GeneratedCode/Quantities/MassFraction.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/MassFraction.g.cs @@ -53,7 +53,7 @@ static MassFraction() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.MassFraction, + Info = new QuantityInfo("MassFraction", new UnitInfo[] { new UnitInfo(MassFractionUnit.CentigramPerGram, BaseUnits.Undefined), new UnitInfo(MassFractionUnit.CentigramPerKilogram, BaseUnits.Undefined), @@ -80,7 +80,7 @@ static MassFraction() new UnitInfo(MassFractionUnit.PartPerTrillion, BaseUnits.Undefined), new UnitInfo(MassFractionUnit.Percent, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.MassFraction); } /// @@ -145,6 +145,7 @@ public MassFraction(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.MassFraction; /// @@ -889,7 +890,7 @@ public bool Equals(MassFraction other, double tolerance, ComparisonType comparis /// A hash code for the current MassFraction. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1220,6 +1221,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return MassFraction.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return MassFraction.Info; else if(conversionType == typeof(BaseDimensions)) return MassFraction.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/MassMomentOfInertia.g.cs b/UnitsNet/GeneratedCode/Quantities/MassMomentOfInertia.g.cs index 7c835aded4..39483d0c8d 100644 --- a/UnitsNet/GeneratedCode/Quantities/MassMomentOfInertia.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/MassMomentOfInertia.g.cs @@ -50,7 +50,7 @@ static MassMomentOfInertia() { BaseDimensions = new BaseDimensions(2, 1, 0, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.MassMomentOfInertia, + Info = new QuantityInfo("MassMomentOfInertia", new UnitInfo[] { new UnitInfo(MassMomentOfInertiaUnit.GramSquareCentimeter, BaseUnits.Undefined), new UnitInfo(MassMomentOfInertiaUnit.GramSquareDecimeter, BaseUnits.Undefined), @@ -81,7 +81,7 @@ static MassMomentOfInertia() new UnitInfo(MassMomentOfInertiaUnit.TonneSquareMeter, BaseUnits.Undefined), new UnitInfo(MassMomentOfInertiaUnit.TonneSquareMilimeter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.MassMomentOfInertia); } /// @@ -146,6 +146,7 @@ public MassMomentOfInertia(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.MassMomentOfInertia; /// @@ -946,7 +947,7 @@ public bool Equals(MassMomentOfInertia other, double tolerance, ComparisonType c /// A hash code for the current MassMomentOfInertia. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1285,6 +1286,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return MassMomentOfInertia.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return MassMomentOfInertia.Info; else if(conversionType == typeof(BaseDimensions)) return MassMomentOfInertia.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/MolarEnergy.g.cs b/UnitsNet/GeneratedCode/Quantities/MolarEnergy.g.cs index e77db094c4..ec166846fc 100644 --- a/UnitsNet/GeneratedCode/Quantities/MolarEnergy.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/MolarEnergy.g.cs @@ -50,13 +50,13 @@ static MolarEnergy() { BaseDimensions = new BaseDimensions(2, 1, -2, 0, 0, -1, 0); - Info = new QuantityInfo(QuantityType.MolarEnergy, + Info = new QuantityInfo("MolarEnergy", new UnitInfo[] { new UnitInfo(MolarEnergyUnit.JoulePerMole, BaseUnits.Undefined), new UnitInfo(MolarEnergyUnit.KilojoulePerMole, BaseUnits.Undefined), new UnitInfo(MolarEnergyUnit.MegajoulePerMole, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.MolarEnergy); } /// @@ -121,6 +121,7 @@ public MolarEnergy(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.MolarEnergy; /// @@ -571,7 +572,7 @@ public bool Equals(MolarEnergy other, double tolerance, ComparisonType compariso /// A hash code for the current MolarEnergy. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -860,6 +861,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return MolarEnergy.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return MolarEnergy.Info; else if(conversionType == typeof(BaseDimensions)) return MolarEnergy.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/MolarEntropy.g.cs b/UnitsNet/GeneratedCode/Quantities/MolarEntropy.g.cs index 0a174a328c..3e9837ddcc 100644 --- a/UnitsNet/GeneratedCode/Quantities/MolarEntropy.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/MolarEntropy.g.cs @@ -50,13 +50,13 @@ static MolarEntropy() { BaseDimensions = new BaseDimensions(2, 1, -2, 0, -1, -1, 0); - Info = new QuantityInfo(QuantityType.MolarEntropy, + Info = new QuantityInfo("MolarEntropy", new UnitInfo[] { new UnitInfo(MolarEntropyUnit.JoulePerMoleKelvin, BaseUnits.Undefined), new UnitInfo(MolarEntropyUnit.KilojoulePerMoleKelvin, BaseUnits.Undefined), new UnitInfo(MolarEntropyUnit.MegajoulePerMoleKelvin, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.MolarEntropy); } /// @@ -121,6 +121,7 @@ public MolarEntropy(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.MolarEntropy; /// @@ -571,7 +572,7 @@ public bool Equals(MolarEntropy other, double tolerance, ComparisonType comparis /// A hash code for the current MolarEntropy. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -860,6 +861,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return MolarEntropy.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return MolarEntropy.Info; else if(conversionType == typeof(BaseDimensions)) return MolarEntropy.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/MolarMass.g.cs b/UnitsNet/GeneratedCode/Quantities/MolarMass.g.cs index afc0741065..92fb698145 100644 --- a/UnitsNet/GeneratedCode/Quantities/MolarMass.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/MolarMass.g.cs @@ -50,7 +50,7 @@ static MolarMass() { BaseDimensions = new BaseDimensions(0, 1, 0, 0, 0, -1, 0); - Info = new QuantityInfo(QuantityType.MolarMass, + Info = new QuantityInfo("MolarMass", new UnitInfo[] { new UnitInfo(MolarMassUnit.CentigramPerMole, BaseUnits.Undefined), new UnitInfo(MolarMassUnit.DecagramPerMole, BaseUnits.Undefined), @@ -65,7 +65,7 @@ static MolarMass() new UnitInfo(MolarMassUnit.NanogramPerMole, BaseUnits.Undefined), new UnitInfo(MolarMassUnit.PoundPerMole, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.MolarMass); } /// @@ -130,6 +130,7 @@ public MolarMass(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.MolarMass; /// @@ -706,7 +707,7 @@ public bool Equals(MolarMass other, double tolerance, ComparisonType comparisonT /// A hash code for the current MolarMass. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1013,6 +1014,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return MolarMass.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return MolarMass.Info; else if(conversionType == typeof(BaseDimensions)) return MolarMass.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Molarity.g.cs b/UnitsNet/GeneratedCode/Quantities/Molarity.g.cs index 441038cbae..eae1098573 100644 --- a/UnitsNet/GeneratedCode/Quantities/Molarity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Molarity.g.cs @@ -53,7 +53,7 @@ static Molarity() { BaseDimensions = new BaseDimensions(-3, 0, 0, 0, 0, 1, 0); - Info = new QuantityInfo(QuantityType.Molarity, + Info = new QuantityInfo("Molarity", new UnitInfo[] { new UnitInfo(MolarityUnit.CentimolesPerLiter, BaseUnits.Undefined), new UnitInfo(MolarityUnit.DecimolesPerLiter, BaseUnits.Undefined), @@ -64,7 +64,7 @@ static Molarity() new UnitInfo(MolarityUnit.NanomolesPerLiter, BaseUnits.Undefined), new UnitInfo(MolarityUnit.PicomolesPerLiter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Molarity); } /// @@ -129,6 +129,7 @@ public Molarity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Molarity; /// @@ -649,7 +650,7 @@ public bool Equals(Molarity other, double tolerance, ComparisonType comparisonTy /// A hash code for the current Molarity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -948,6 +949,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Molarity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Molarity.Info; else if(conversionType == typeof(BaseDimensions)) return Molarity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Permeability.g.cs b/UnitsNet/GeneratedCode/Quantities/Permeability.g.cs index 0c483a2e0b..b08c1634b4 100644 --- a/UnitsNet/GeneratedCode/Quantities/Permeability.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Permeability.g.cs @@ -53,11 +53,11 @@ static Permeability() { BaseDimensions = new BaseDimensions(1, 1, -2, -2, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Permeability, + Info = new QuantityInfo("Permeability", new UnitInfo[] { new UnitInfo(PermeabilityUnit.HenryPerMeter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Permeability); } /// @@ -122,6 +122,7 @@ public Permeability(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Permeability; /// @@ -544,7 +545,7 @@ public bool Equals(Permeability other, double tolerance, ComparisonType comparis /// A hash code for the current Permeability. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -829,6 +830,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Permeability.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Permeability.Info; else if(conversionType == typeof(BaseDimensions)) return Permeability.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Permittivity.g.cs b/UnitsNet/GeneratedCode/Quantities/Permittivity.g.cs index 22611dc34f..a9d0f53581 100644 --- a/UnitsNet/GeneratedCode/Quantities/Permittivity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Permittivity.g.cs @@ -53,11 +53,11 @@ static Permittivity() { BaseDimensions = new BaseDimensions(-3, -1, 4, 2, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Permittivity, + Info = new QuantityInfo("Permittivity", new UnitInfo[] { new UnitInfo(PermittivityUnit.FaradPerMeter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Permittivity); } /// @@ -122,6 +122,7 @@ public Permittivity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Permittivity; /// @@ -544,7 +545,7 @@ public bool Equals(Permittivity other, double tolerance, ComparisonType comparis /// A hash code for the current Permittivity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -829,6 +830,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Permittivity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Permittivity.Info; else if(conversionType == typeof(BaseDimensions)) return Permittivity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Power.g.cs b/UnitsNet/GeneratedCode/Quantities/Power.g.cs index 40e4f2b80d..474357f033 100644 --- a/UnitsNet/GeneratedCode/Quantities/Power.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Power.g.cs @@ -50,7 +50,7 @@ static Power() { BaseDimensions = new BaseDimensions(2, 1, -3, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Power, + Info = new QuantityInfo("Power", new UnitInfo[] { new UnitInfo(PowerUnit.BoilerHorsepower, BaseUnits.Undefined), new UnitInfo(PowerUnit.BritishThermalUnitPerHour, BaseUnits.Undefined), @@ -78,7 +78,7 @@ static Power() new UnitInfo(PowerUnit.Terawatt, BaseUnits.Undefined), new UnitInfo(PowerUnit.Watt, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Power); } /// @@ -143,6 +143,7 @@ public Power(decimal value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Power; /// @@ -903,7 +904,7 @@ public bool Equals(Power other, double tolerance, ComparisonType comparisonType) /// A hash code for the current Power. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1236,6 +1237,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Power.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Power.Info; else if(conversionType == typeof(BaseDimensions)) return Power.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/PowerDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/PowerDensity.g.cs index dc133e4b44..55350574ad 100644 --- a/UnitsNet/GeneratedCode/Quantities/PowerDensity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/PowerDensity.g.cs @@ -50,7 +50,7 @@ static PowerDensity() { BaseDimensions = new BaseDimensions(-1, 1, -3, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.PowerDensity, + Info = new QuantityInfo("PowerDensity", new UnitInfo[] { new UnitInfo(PowerDensityUnit.DecawattPerCubicFoot, BaseUnits.Undefined), new UnitInfo(PowerDensityUnit.DecawattPerCubicInch, BaseUnits.Undefined), @@ -97,7 +97,7 @@ static PowerDensity() new UnitInfo(PowerDensityUnit.WattPerCubicMeter, new BaseUnits(length: LengthUnit.Meter, mass: MassUnit.Kilogram, time: DurationUnit.Second)), new UnitInfo(PowerDensityUnit.WattPerLiter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.PowerDensity); } /// @@ -162,6 +162,7 @@ public PowerDensity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.PowerDensity; /// @@ -1186,7 +1187,7 @@ public bool Equals(PowerDensity other, double tolerance, ComparisonType comparis /// A hash code for the current PowerDensity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1557,6 +1558,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return PowerDensity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return PowerDensity.Info; else if(conversionType == typeof(BaseDimensions)) return PowerDensity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/PowerRatio.g.cs b/UnitsNet/GeneratedCode/Quantities/PowerRatio.g.cs index 9406f5e527..4bea934a26 100644 --- a/UnitsNet/GeneratedCode/Quantities/PowerRatio.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/PowerRatio.g.cs @@ -50,12 +50,12 @@ static PowerRatio() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.PowerRatio, + Info = new QuantityInfo("PowerRatio", new UnitInfo[] { new UnitInfo(PowerRatioUnit.DecibelMilliwatt, BaseUnits.Undefined), new UnitInfo(PowerRatioUnit.DecibelWatt, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.PowerRatio); } /// @@ -120,6 +120,7 @@ public PowerRatio(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.PowerRatio; /// @@ -564,7 +565,7 @@ public bool Equals(PowerRatio other, double tolerance, ComparisonType comparison /// A hash code for the current PowerRatio. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -851,6 +852,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return PowerRatio.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return PowerRatio.Info; else if(conversionType == typeof(BaseDimensions)) return PowerRatio.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs b/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs index 02efb5dda6..f0d45f6af0 100644 --- a/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs @@ -50,7 +50,7 @@ static Pressure() { BaseDimensions = new BaseDimensions(-1, 1, -2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Pressure, + Info = new QuantityInfo("Pressure", new UnitInfo[] { new UnitInfo(PressureUnit.Atmosphere, BaseUnits.Undefined), new UnitInfo(PressureUnit.Bar, BaseUnits.Undefined), @@ -95,7 +95,7 @@ static Pressure() new UnitInfo(PressureUnit.TonneForcePerSquareMillimeter, BaseUnits.Undefined), new UnitInfo(PressureUnit.Torr, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Pressure); } /// @@ -160,6 +160,7 @@ public Pressure(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Pressure; /// @@ -1156,7 +1157,7 @@ public bool Equals(Pressure other, double tolerance, ComparisonType comparisonTy /// A hash code for the current Pressure. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1523,6 +1524,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Pressure.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Pressure.Info; else if(conversionType == typeof(BaseDimensions)) return Pressure.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/PressureChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/PressureChangeRate.g.cs index 47a2a95a60..f1799435f5 100644 --- a/UnitsNet/GeneratedCode/Quantities/PressureChangeRate.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/PressureChangeRate.g.cs @@ -50,7 +50,7 @@ static PressureChangeRate() { BaseDimensions = new BaseDimensions(-1, 1, -3, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.PressureChangeRate, + Info = new QuantityInfo("PressureChangeRate", new UnitInfo[] { new UnitInfo(PressureChangeRateUnit.AtmospherePerSecond, BaseUnits.Undefined), new UnitInfo(PressureChangeRateUnit.KilopascalPerMinute, BaseUnits.Undefined), @@ -60,7 +60,7 @@ static PressureChangeRate() new UnitInfo(PressureChangeRateUnit.PascalPerMinute, BaseUnits.Undefined), new UnitInfo(PressureChangeRateUnit.PascalPerSecond, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.PressureChangeRate); } /// @@ -125,6 +125,7 @@ public PressureChangeRate(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.PressureChangeRate; /// @@ -631,7 +632,7 @@ public bool Equals(PressureChangeRate other, double tolerance, ComparisonType co /// A hash code for the current PressureChangeRate. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -928,6 +929,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return PressureChangeRate.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return PressureChangeRate.Info; else if(conversionType == typeof(BaseDimensions)) return PressureChangeRate.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Ratio.g.cs b/UnitsNet/GeneratedCode/Quantities/Ratio.g.cs index 4a78e8b313..35c8207aea 100644 --- a/UnitsNet/GeneratedCode/Quantities/Ratio.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Ratio.g.cs @@ -50,7 +50,7 @@ static Ratio() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.Ratio, + Info = new QuantityInfo("Ratio", new UnitInfo[] { new UnitInfo(RatioUnit.DecimalFraction, BaseUnits.Undefined), new UnitInfo(RatioUnit.PartPerBillion, BaseUnits.Undefined), @@ -59,7 +59,7 @@ static Ratio() new UnitInfo(RatioUnit.PartPerTrillion, BaseUnits.Undefined), new UnitInfo(RatioUnit.Percent, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Ratio); } /// @@ -124,6 +124,7 @@ public Ratio(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Ratio; /// @@ -616,7 +617,7 @@ public bool Equals(Ratio other, double tolerance, ComparisonType comparisonType) /// A hash code for the current Ratio. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -911,6 +912,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Ratio.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Ratio.Info; else if(conversionType == typeof(BaseDimensions)) return Ratio.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/RatioChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/RatioChangeRate.g.cs index 71f8f7652c..d76d1870d1 100644 --- a/UnitsNet/GeneratedCode/Quantities/RatioChangeRate.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/RatioChangeRate.g.cs @@ -50,12 +50,12 @@ static RatioChangeRate() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.RatioChangeRate, + Info = new QuantityInfo("RatioChangeRate", new UnitInfo[] { new UnitInfo(RatioChangeRateUnit.DecimalFractionPerSecond, BaseUnits.Undefined), new UnitInfo(RatioChangeRateUnit.PercentPerSecond, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.RatioChangeRate); } /// @@ -120,6 +120,7 @@ public RatioChangeRate(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.RatioChangeRate; /// @@ -556,7 +557,7 @@ public bool Equals(RatioChangeRate other, double tolerance, ComparisonType compa /// A hash code for the current RatioChangeRate. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -843,6 +844,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return RatioChangeRate.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return RatioChangeRate.Info; else if(conversionType == typeof(BaseDimensions)) return RatioChangeRate.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ReactiveEnergy.g.cs b/UnitsNet/GeneratedCode/Quantities/ReactiveEnergy.g.cs index f1a4e78f17..9b5e7b1001 100644 --- a/UnitsNet/GeneratedCode/Quantities/ReactiveEnergy.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ReactiveEnergy.g.cs @@ -50,13 +50,13 @@ static ReactiveEnergy() { BaseDimensions = new BaseDimensions(2, 1, -1, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ReactiveEnergy, + Info = new QuantityInfo("ReactiveEnergy", new UnitInfo[] { new UnitInfo(ReactiveEnergyUnit.KilovoltampereReactiveHour, BaseUnits.Undefined), new UnitInfo(ReactiveEnergyUnit.MegavoltampereReactiveHour, BaseUnits.Undefined), new UnitInfo(ReactiveEnergyUnit.VoltampereReactiveHour, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ReactiveEnergy); } /// @@ -121,6 +121,7 @@ public ReactiveEnergy(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ReactiveEnergy; /// @@ -571,7 +572,7 @@ public bool Equals(ReactiveEnergy other, double tolerance, ComparisonType compar /// A hash code for the current ReactiveEnergy. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -860,6 +861,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ReactiveEnergy.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ReactiveEnergy.Info; else if(conversionType == typeof(BaseDimensions)) return ReactiveEnergy.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ReactivePower.g.cs b/UnitsNet/GeneratedCode/Quantities/ReactivePower.g.cs index 54cb0b2510..801781f198 100644 --- a/UnitsNet/GeneratedCode/Quantities/ReactivePower.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ReactivePower.g.cs @@ -50,14 +50,14 @@ static ReactivePower() { BaseDimensions = new BaseDimensions(2, 1, -3, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.ReactivePower, + Info = new QuantityInfo("ReactivePower", new UnitInfo[] { new UnitInfo(ReactivePowerUnit.GigavoltampereReactive, BaseUnits.Undefined), new UnitInfo(ReactivePowerUnit.KilovoltampereReactive, BaseUnits.Undefined), new UnitInfo(ReactivePowerUnit.MegavoltampereReactive, BaseUnits.Undefined), new UnitInfo(ReactivePowerUnit.VoltampereReactive, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ReactivePower); } /// @@ -122,6 +122,7 @@ public ReactivePower(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ReactivePower; /// @@ -586,7 +587,7 @@ public bool Equals(ReactivePower other, double tolerance, ComparisonType compari /// A hash code for the current ReactivePower. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -877,6 +878,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ReactivePower.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ReactivePower.Info; else if(conversionType == typeof(BaseDimensions)) return ReactivePower.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/RelativeHumidity.g.cs b/UnitsNet/GeneratedCode/Quantities/RelativeHumidity.g.cs index 0c762f6dcd..5de132638c 100644 --- a/UnitsNet/GeneratedCode/Quantities/RelativeHumidity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/RelativeHumidity.g.cs @@ -50,11 +50,11 @@ static RelativeHumidity() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.RelativeHumidity, + Info = new QuantityInfo("RelativeHumidity", new UnitInfo[] { new UnitInfo(RelativeHumidityUnit.Percent, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.RelativeHumidity); } /// @@ -119,6 +119,7 @@ public RelativeHumidity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.RelativeHumidity; /// @@ -541,7 +542,7 @@ public bool Equals(RelativeHumidity other, double tolerance, ComparisonType comp /// A hash code for the current RelativeHumidity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -826,6 +827,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return RelativeHumidity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return RelativeHumidity.Info; else if(conversionType == typeof(BaseDimensions)) return RelativeHumidity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/RotationalAcceleration.g.cs b/UnitsNet/GeneratedCode/Quantities/RotationalAcceleration.g.cs index a509b07238..dc18da238f 100644 --- a/UnitsNet/GeneratedCode/Quantities/RotationalAcceleration.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/RotationalAcceleration.g.cs @@ -50,14 +50,14 @@ static RotationalAcceleration() { BaseDimensions = new BaseDimensions(0, 0, -2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.RotationalAcceleration, + Info = new QuantityInfo("RotationalAcceleration", new UnitInfo[] { new UnitInfo(RotationalAccelerationUnit.DegreePerSecondSquared, BaseUnits.Undefined), new UnitInfo(RotationalAccelerationUnit.RadianPerSecondSquared, BaseUnits.Undefined), new UnitInfo(RotationalAccelerationUnit.RevolutionPerMinutePerSecond, BaseUnits.Undefined), new UnitInfo(RotationalAccelerationUnit.RevolutionPerSecondSquared, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.RotationalAcceleration); } /// @@ -122,6 +122,7 @@ public RotationalAcceleration(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.RotationalAcceleration; /// @@ -586,7 +587,7 @@ public bool Equals(RotationalAcceleration other, double tolerance, ComparisonTyp /// A hash code for the current RotationalAcceleration. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -877,6 +878,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return RotationalAcceleration.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return RotationalAcceleration.Info; else if(conversionType == typeof(BaseDimensions)) return RotationalAcceleration.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/RotationalSpeed.g.cs b/UnitsNet/GeneratedCode/Quantities/RotationalSpeed.g.cs index 5b9a8a95c1..b0c98ccbbd 100644 --- a/UnitsNet/GeneratedCode/Quantities/RotationalSpeed.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/RotationalSpeed.g.cs @@ -50,7 +50,7 @@ static RotationalSpeed() { BaseDimensions = new BaseDimensions(0, 0, -1, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.RotationalSpeed, + Info = new QuantityInfo("RotationalSpeed", new UnitInfo[] { new UnitInfo(RotationalSpeedUnit.CentiradianPerSecond, BaseUnits.Undefined), new UnitInfo(RotationalSpeedUnit.DeciradianPerSecond, BaseUnits.Undefined), @@ -66,7 +66,7 @@ static RotationalSpeed() new UnitInfo(RotationalSpeedUnit.RevolutionPerMinute, BaseUnits.Undefined), new UnitInfo(RotationalSpeedUnit.RevolutionPerSecond, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.RotationalSpeed); } /// @@ -131,6 +131,7 @@ public RotationalSpeed(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.RotationalSpeed; /// @@ -721,7 +722,7 @@ public bool Equals(RotationalSpeed other, double tolerance, ComparisonType compa /// A hash code for the current RotationalSpeed. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1030,6 +1031,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return RotationalSpeed.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return RotationalSpeed.Info; else if(conversionType == typeof(BaseDimensions)) return RotationalSpeed.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/RotationalStiffness.g.cs b/UnitsNet/GeneratedCode/Quantities/RotationalStiffness.g.cs index 390a8b8cab..d8facb68b2 100644 --- a/UnitsNet/GeneratedCode/Quantities/RotationalStiffness.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/RotationalStiffness.g.cs @@ -50,7 +50,7 @@ static RotationalStiffness() { BaseDimensions = new BaseDimensions(2, 1, -2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.RotationalStiffness, + Info = new QuantityInfo("RotationalStiffness", new UnitInfo[] { new UnitInfo(RotationalStiffnessUnit.CentinewtonMeterPerDegree, BaseUnits.Undefined), new UnitInfo(RotationalStiffnessUnit.CentinewtonMillimeterPerDegree, BaseUnits.Undefined), @@ -86,7 +86,7 @@ static RotationalStiffness() new UnitInfo(RotationalStiffnessUnit.PoundForceFeetPerRadian, BaseUnits.Undefined), new UnitInfo(RotationalStiffnessUnit.PoundForceFootPerDegrees, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.RotationalStiffness); } /// @@ -151,6 +151,7 @@ public RotationalStiffness(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.RotationalStiffness; /// @@ -1021,7 +1022,7 @@ public bool Equals(RotationalStiffness other, double tolerance, ComparisonType c /// A hash code for the current RotationalStiffness. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1370,6 +1371,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return RotationalStiffness.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return RotationalStiffness.Info; else if(conversionType == typeof(BaseDimensions)) return RotationalStiffness.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs b/UnitsNet/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs index 01d17a8096..2fcf8b0a76 100644 --- a/UnitsNet/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs @@ -50,7 +50,7 @@ static RotationalStiffnessPerLength() { BaseDimensions = new BaseDimensions(1, 1, -2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.RotationalStiffnessPerLength, + Info = new QuantityInfo("RotationalStiffnessPerLength", new UnitInfo[] { new UnitInfo(RotationalStiffnessPerLengthUnit.KilonewtonMeterPerRadianPerMeter, BaseUnits.Undefined), new UnitInfo(RotationalStiffnessPerLengthUnit.KilopoundForceFootPerDegreesPerFoot, BaseUnits.Undefined), @@ -58,7 +58,7 @@ static RotationalStiffnessPerLength() new UnitInfo(RotationalStiffnessPerLengthUnit.NewtonMeterPerRadianPerMeter, BaseUnits.Undefined), new UnitInfo(RotationalStiffnessPerLengthUnit.PoundForceFootPerDegreesPerFoot, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.RotationalStiffnessPerLength); } /// @@ -123,6 +123,7 @@ public RotationalStiffnessPerLength(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.RotationalStiffnessPerLength; /// @@ -601,7 +602,7 @@ public bool Equals(RotationalStiffnessPerLength other, double tolerance, Compari /// A hash code for the current RotationalStiffnessPerLength. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -894,6 +895,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return RotationalStiffnessPerLength.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return RotationalStiffnessPerLength.Info; else if(conversionType == typeof(BaseDimensions)) return RotationalStiffnessPerLength.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/SolidAngle.g.cs b/UnitsNet/GeneratedCode/Quantities/SolidAngle.g.cs index 8ab2aad5ba..6146e2814c 100644 --- a/UnitsNet/GeneratedCode/Quantities/SolidAngle.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/SolidAngle.g.cs @@ -53,11 +53,11 @@ static SolidAngle() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.SolidAngle, + Info = new QuantityInfo("SolidAngle", new UnitInfo[] { new UnitInfo(SolidAngleUnit.Steradian, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.SolidAngle); } /// @@ -122,6 +122,7 @@ public SolidAngle(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.SolidAngle; /// @@ -544,7 +545,7 @@ public bool Equals(SolidAngle other, double tolerance, ComparisonType comparison /// A hash code for the current SolidAngle. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -829,6 +830,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return SolidAngle.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return SolidAngle.Info; else if(conversionType == typeof(BaseDimensions)) return SolidAngle.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificEnergy.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificEnergy.g.cs index 621840c989..c48f405406 100644 --- a/UnitsNet/GeneratedCode/Quantities/SpecificEnergy.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/SpecificEnergy.g.cs @@ -53,7 +53,7 @@ static SpecificEnergy() { BaseDimensions = new BaseDimensions(2, 0, -2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.SpecificEnergy, + Info = new QuantityInfo("SpecificEnergy", new UnitInfo[] { new UnitInfo(SpecificEnergyUnit.BtuPerPound, BaseUnits.Undefined), new UnitInfo(SpecificEnergyUnit.CaloriePerGram, BaseUnits.Undefined), @@ -81,7 +81,7 @@ static SpecificEnergy() new UnitInfo(SpecificEnergyUnit.WattDayPerTonne, BaseUnits.Undefined), new UnitInfo(SpecificEnergyUnit.WattHourPerKilogram, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.SpecificEnergy); } /// @@ -146,6 +146,7 @@ public SpecificEnergy(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.SpecificEnergy; /// @@ -904,7 +905,7 @@ public bool Equals(SpecificEnergy other, double tolerance, ComparisonType compar /// A hash code for the current SpecificEnergy. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1237,6 +1238,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return SpecificEnergy.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return SpecificEnergy.Info; else if(conversionType == typeof(BaseDimensions)) return SpecificEnergy.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificEntropy.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificEntropy.g.cs index dfd71b9c55..446b443485 100644 --- a/UnitsNet/GeneratedCode/Quantities/SpecificEntropy.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/SpecificEntropy.g.cs @@ -50,7 +50,7 @@ static SpecificEntropy() { BaseDimensions = new BaseDimensions(2, 0, -2, 0, -1, 0, 0); - Info = new QuantityInfo(QuantityType.SpecificEntropy, + Info = new QuantityInfo("SpecificEntropy", new UnitInfo[] { new UnitInfo(SpecificEntropyUnit.BtuPerPoundFahrenheit, BaseUnits.Undefined), new UnitInfo(SpecificEntropyUnit.CaloriePerGramKelvin, BaseUnits.Undefined), @@ -62,7 +62,7 @@ static SpecificEntropy() new UnitInfo(SpecificEntropyUnit.MegajoulePerKilogramDegreeCelsius, BaseUnits.Undefined), new UnitInfo(SpecificEntropyUnit.MegajoulePerKilogramKelvin, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.SpecificEntropy); } /// @@ -127,6 +127,7 @@ public SpecificEntropy(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.SpecificEntropy; /// @@ -661,7 +662,7 @@ public bool Equals(SpecificEntropy other, double tolerance, ComparisonType compa /// A hash code for the current SpecificEntropy. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -962,6 +963,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return SpecificEntropy.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return SpecificEntropy.Info; else if(conversionType == typeof(BaseDimensions)) return SpecificEntropy.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificVolume.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificVolume.g.cs index ea543e12f3..759a634e8c 100644 --- a/UnitsNet/GeneratedCode/Quantities/SpecificVolume.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/SpecificVolume.g.cs @@ -50,13 +50,13 @@ static SpecificVolume() { BaseDimensions = new BaseDimensions(3, -1, 0, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.SpecificVolume, + Info = new QuantityInfo("SpecificVolume", new UnitInfo[] { new UnitInfo(SpecificVolumeUnit.CubicFootPerPound, BaseUnits.Undefined), new UnitInfo(SpecificVolumeUnit.CubicMeterPerKilogram, BaseUnits.Undefined), new UnitInfo(SpecificVolumeUnit.MillicubicMeterPerKilogram, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.SpecificVolume); } /// @@ -121,6 +121,7 @@ public SpecificVolume(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.SpecificVolume; /// @@ -571,7 +572,7 @@ public bool Equals(SpecificVolume other, double tolerance, ComparisonType compar /// A hash code for the current SpecificVolume. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -860,6 +861,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return SpecificVolume.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return SpecificVolume.Info; else if(conversionType == typeof(BaseDimensions)) return SpecificVolume.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificWeight.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificWeight.g.cs index b54221b038..5d5e5ed153 100644 --- a/UnitsNet/GeneratedCode/Quantities/SpecificWeight.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/SpecificWeight.g.cs @@ -53,7 +53,7 @@ static SpecificWeight() { BaseDimensions = new BaseDimensions(-2, 1, -2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.SpecificWeight, + Info = new QuantityInfo("SpecificWeight", new UnitInfo[] { new UnitInfo(SpecificWeightUnit.KilogramForcePerCubicCentimeter, BaseUnits.Undefined), new UnitInfo(SpecificWeightUnit.KilogramForcePerCubicMeter, BaseUnits.Undefined), @@ -73,7 +73,7 @@ static SpecificWeight() new UnitInfo(SpecificWeightUnit.TonneForcePerCubicMeter, BaseUnits.Undefined), new UnitInfo(SpecificWeightUnit.TonneForcePerCubicMillimeter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.SpecificWeight); } /// @@ -138,6 +138,7 @@ public SpecificWeight(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.SpecificWeight; /// @@ -784,7 +785,7 @@ public bool Equals(SpecificWeight other, double tolerance, ComparisonType compar /// A hash code for the current SpecificWeight. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1101,6 +1102,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return SpecificWeight.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return SpecificWeight.Info; else if(conversionType == typeof(BaseDimensions)) return SpecificWeight.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Speed.g.cs b/UnitsNet/GeneratedCode/Quantities/Speed.g.cs index 12460402a7..f8c93c4ed9 100644 --- a/UnitsNet/GeneratedCode/Quantities/Speed.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Speed.g.cs @@ -50,7 +50,7 @@ static Speed() { BaseDimensions = new BaseDimensions(1, 0, -1, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Speed, + Info = new QuantityInfo("Speed", new UnitInfo[] { new UnitInfo(SpeedUnit.CentimeterPerHour, BaseUnits.Undefined), new UnitInfo(SpeedUnit.CentimeterPerMinute, BaseUnits.Undefined), @@ -85,7 +85,7 @@ static Speed() new UnitInfo(SpeedUnit.YardPerMinute, new BaseUnits(length: LengthUnit.Yard, time: DurationUnit.Minute)), new UnitInfo(SpeedUnit.YardPerSecond, new BaseUnits(length: LengthUnit.Yard, time: DurationUnit.Second)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Speed); } /// @@ -150,6 +150,7 @@ public Speed(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Speed; /// @@ -1006,7 +1007,7 @@ public bool Equals(Speed other, double tolerance, ComparisonType comparisonType) /// A hash code for the current Speed. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1353,6 +1354,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Speed.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Speed.Info; else if(conversionType == typeof(BaseDimensions)) return Speed.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Temperature.g.cs b/UnitsNet/GeneratedCode/Quantities/Temperature.g.cs index 457489ea95..1eff9c3275 100644 --- a/UnitsNet/GeneratedCode/Quantities/Temperature.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Temperature.g.cs @@ -50,7 +50,7 @@ static Temperature() { BaseDimensions = new BaseDimensions(0, 0, 0, 0, 1, 0, 0); - Info = new QuantityInfo(QuantityType.Temperature, + Info = new QuantityInfo("Temperature", new UnitInfo[] { new UnitInfo(TemperatureUnit.DegreeCelsius, new BaseUnits(temperature: TemperatureUnit.DegreeCelsius)), new UnitInfo(TemperatureUnit.DegreeDelisle, new BaseUnits(temperature: TemperatureUnit.DegreeDelisle)), @@ -63,7 +63,7 @@ static Temperature() new UnitInfo(TemperatureUnit.MillidegreeCelsius, new BaseUnits(temperature: TemperatureUnit.DegreeCelsius)), new UnitInfo(TemperatureUnit.SolarTemperature, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Temperature); } /// @@ -128,6 +128,7 @@ public Temperature(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Temperature; /// @@ -630,7 +631,7 @@ public bool Equals(Temperature other, double tolerance, ComparisonType compariso /// A hash code for the current Temperature. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -933,6 +934,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Temperature.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Temperature.Info; else if(conversionType == typeof(BaseDimensions)) return Temperature.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/TemperatureChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/TemperatureChangeRate.g.cs index d39c7fe412..cd276f47a8 100644 --- a/UnitsNet/GeneratedCode/Quantities/TemperatureChangeRate.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/TemperatureChangeRate.g.cs @@ -50,7 +50,7 @@ static TemperatureChangeRate() { BaseDimensions = new BaseDimensions(0, 0, -1, 0, 1, 0, 0); - Info = new QuantityInfo(QuantityType.TemperatureChangeRate, + Info = new QuantityInfo("TemperatureChangeRate", new UnitInfo[] { new UnitInfo(TemperatureChangeRateUnit.CentidegreeCelsiusPerSecond, BaseUnits.Undefined), new UnitInfo(TemperatureChangeRateUnit.DecadegreeCelsiusPerSecond, BaseUnits.Undefined), @@ -63,7 +63,7 @@ static TemperatureChangeRate() new UnitInfo(TemperatureChangeRateUnit.MillidegreeCelsiusPerSecond, BaseUnits.Undefined), new UnitInfo(TemperatureChangeRateUnit.NanodegreeCelsiusPerSecond, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.TemperatureChangeRate); } /// @@ -128,6 +128,7 @@ public TemperatureChangeRate(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.TemperatureChangeRate; /// @@ -676,7 +677,7 @@ public bool Equals(TemperatureChangeRate other, double tolerance, ComparisonType /// A hash code for the current TemperatureChangeRate. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -979,6 +980,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return TemperatureChangeRate.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return TemperatureChangeRate.Info; else if(conversionType == typeof(BaseDimensions)) return TemperatureChangeRate.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/TemperatureDelta.g.cs b/UnitsNet/GeneratedCode/Quantities/TemperatureDelta.g.cs index fe358ebe1a..af3d547f75 100644 --- a/UnitsNet/GeneratedCode/Quantities/TemperatureDelta.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/TemperatureDelta.g.cs @@ -50,7 +50,7 @@ static TemperatureDelta() { BaseDimensions = new BaseDimensions(0, 0, 0, 0, 1, 0, 0); - Info = new QuantityInfo(QuantityType.TemperatureDelta, + Info = new QuantityInfo("TemperatureDelta", new UnitInfo[] { new UnitInfo(TemperatureDeltaUnit.DegreeCelsius, BaseUnits.Undefined), new UnitInfo(TemperatureDeltaUnit.DegreeDelisle, BaseUnits.Undefined), @@ -62,7 +62,7 @@ static TemperatureDelta() new UnitInfo(TemperatureDeltaUnit.Kelvin, BaseUnits.Undefined), new UnitInfo(TemperatureDeltaUnit.MillidegreeCelsius, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.TemperatureDelta); } /// @@ -127,6 +127,7 @@ public TemperatureDelta(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.TemperatureDelta; /// @@ -661,7 +662,7 @@ public bool Equals(TemperatureDelta other, double tolerance, ComparisonType comp /// A hash code for the current TemperatureDelta. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -962,6 +963,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return TemperatureDelta.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return TemperatureDelta.Info; else if(conversionType == typeof(BaseDimensions)) return TemperatureDelta.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ThermalConductivity.g.cs b/UnitsNet/GeneratedCode/Quantities/ThermalConductivity.g.cs index 048426f900..ed9855f86d 100644 --- a/UnitsNet/GeneratedCode/Quantities/ThermalConductivity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ThermalConductivity.g.cs @@ -53,12 +53,12 @@ static ThermalConductivity() { BaseDimensions = new BaseDimensions(1, 1, -3, 0, -1, 0, 0); - Info = new QuantityInfo(QuantityType.ThermalConductivity, + Info = new QuantityInfo("ThermalConductivity", new UnitInfo[] { new UnitInfo(ThermalConductivityUnit.BtuPerHourFootFahrenheit, BaseUnits.Undefined), new UnitInfo(ThermalConductivityUnit.WattPerMeterKelvin, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ThermalConductivity); } /// @@ -123,6 +123,7 @@ public ThermalConductivity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ThermalConductivity; /// @@ -559,7 +560,7 @@ public bool Equals(ThermalConductivity other, double tolerance, ComparisonType c /// A hash code for the current ThermalConductivity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -846,6 +847,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ThermalConductivity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ThermalConductivity.Info; else if(conversionType == typeof(BaseDimensions)) return ThermalConductivity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/ThermalResistance.g.cs b/UnitsNet/GeneratedCode/Quantities/ThermalResistance.g.cs index 4f415cffc9..f52cc28ff4 100644 --- a/UnitsNet/GeneratedCode/Quantities/ThermalResistance.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/ThermalResistance.g.cs @@ -50,7 +50,7 @@ static ThermalResistance() { BaseDimensions = new BaseDimensions(0, -1, 3, 0, 1, 0, 0); - Info = new QuantityInfo(QuantityType.ThermalResistance, + Info = new QuantityInfo("ThermalResistance", new UnitInfo[] { new UnitInfo(ThermalResistanceUnit.HourSquareFeetDegreeFahrenheitPerBtu, BaseUnits.Undefined), new UnitInfo(ThermalResistanceUnit.SquareCentimeterHourDegreeCelsiusPerKilocalorie, BaseUnits.Undefined), @@ -58,7 +58,7 @@ static ThermalResistance() new UnitInfo(ThermalResistanceUnit.SquareMeterDegreeCelsiusPerWatt, BaseUnits.Undefined), new UnitInfo(ThermalResistanceUnit.SquareMeterKelvinPerKilowatt, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.ThermalResistance); } /// @@ -123,6 +123,7 @@ public ThermalResistance(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.ThermalResistance; /// @@ -601,7 +602,7 @@ public bool Equals(ThermalResistance other, double tolerance, ComparisonType com /// A hash code for the current ThermalResistance. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -894,6 +895,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return ThermalResistance.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return ThermalResistance.Info; else if(conversionType == typeof(BaseDimensions)) return ThermalResistance.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Torque.g.cs b/UnitsNet/GeneratedCode/Quantities/Torque.g.cs index 1d67759e76..66891854ab 100644 --- a/UnitsNet/GeneratedCode/Quantities/Torque.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Torque.g.cs @@ -50,7 +50,7 @@ static Torque() { BaseDimensions = new BaseDimensions(2, 1, -2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Torque, + Info = new QuantityInfo("Torque", new UnitInfo[] { new UnitInfo(TorqueUnit.KilogramForceCentimeter, BaseUnits.Undefined), new UnitInfo(TorqueUnit.KilogramForceMeter, BaseUnits.Undefined), @@ -75,7 +75,7 @@ static Torque() new UnitInfo(TorqueUnit.TonneForceMeter, BaseUnits.Undefined), new UnitInfo(TorqueUnit.TonneForceMillimeter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Torque); } /// @@ -140,6 +140,7 @@ public Torque(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Torque; /// @@ -856,7 +857,7 @@ public bool Equals(Torque other, double tolerance, ComparisonType comparisonType /// A hash code for the current Torque. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1183,6 +1184,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Torque.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Torque.Info; else if(conversionType == typeof(BaseDimensions)) return Torque.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/TorquePerLength.g.cs b/UnitsNet/GeneratedCode/Quantities/TorquePerLength.g.cs index a3cc53ac38..5f86782332 100644 --- a/UnitsNet/GeneratedCode/Quantities/TorquePerLength.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/TorquePerLength.g.cs @@ -50,7 +50,7 @@ static TorquePerLength() { BaseDimensions = new BaseDimensions(1, 1, -2, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.TorquePerLength, + Info = new QuantityInfo("TorquePerLength", new UnitInfo[] { new UnitInfo(TorquePerLengthUnit.KilogramForceCentimeterPerMeter, BaseUnits.Undefined), new UnitInfo(TorquePerLengthUnit.KilogramForceMeterPerMeter, BaseUnits.Undefined), @@ -74,7 +74,7 @@ static TorquePerLength() new UnitInfo(TorquePerLengthUnit.TonneForceMeterPerMeter, BaseUnits.Undefined), new UnitInfo(TorquePerLengthUnit.TonneForceMillimeterPerMeter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.TorquePerLength); } /// @@ -139,6 +139,7 @@ public TorquePerLength(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.TorquePerLength; /// @@ -841,7 +842,7 @@ public bool Equals(TorquePerLength other, double tolerance, ComparisonType compa /// A hash code for the current TorquePerLength. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1166,6 +1167,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return TorquePerLength.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return TorquePerLength.Info; else if(conversionType == typeof(BaseDimensions)) return TorquePerLength.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Turbidity.g.cs b/UnitsNet/GeneratedCode/Quantities/Turbidity.g.cs index a6cb383af6..880162dbfb 100644 --- a/UnitsNet/GeneratedCode/Quantities/Turbidity.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Turbidity.g.cs @@ -53,11 +53,11 @@ static Turbidity() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.Turbidity, + Info = new QuantityInfo("Turbidity", new UnitInfo[] { new UnitInfo(TurbidityUnit.NTU, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Turbidity); } /// @@ -122,6 +122,7 @@ public Turbidity(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Turbidity; /// @@ -544,7 +545,7 @@ public bool Equals(Turbidity other, double tolerance, ComparisonType comparisonT /// A hash code for the current Turbidity. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -829,6 +830,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Turbidity.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Turbidity.Info; else if(conversionType == typeof(BaseDimensions)) return Turbidity.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/VitaminA.g.cs b/UnitsNet/GeneratedCode/Quantities/VitaminA.g.cs index 1389e35218..38fc44918a 100644 --- a/UnitsNet/GeneratedCode/Quantities/VitaminA.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/VitaminA.g.cs @@ -50,11 +50,11 @@ static VitaminA() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.VitaminA, + Info = new QuantityInfo("VitaminA", new UnitInfo[] { new UnitInfo(VitaminAUnit.InternationalUnit, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.VitaminA); } /// @@ -119,6 +119,7 @@ public VitaminA(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.VitaminA; /// @@ -541,7 +542,7 @@ public bool Equals(VitaminA other, double tolerance, ComparisonType comparisonTy /// A hash code for the current VitaminA. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -826,6 +827,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return VitaminA.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return VitaminA.Info; else if(conversionType == typeof(BaseDimensions)) return VitaminA.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/Volume.g.cs b/UnitsNet/GeneratedCode/Quantities/Volume.g.cs index 40bc324b0d..f3f25c646f 100644 --- a/UnitsNet/GeneratedCode/Quantities/Volume.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/Volume.g.cs @@ -50,7 +50,7 @@ static Volume() { BaseDimensions = new BaseDimensions(3, 0, 0, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.Volume, + Info = new QuantityInfo("Volume", new UnitInfo[] { new UnitInfo(VolumeUnit.AcreFoot, BaseUnits.Undefined), new UnitInfo(VolumeUnit.AuTablespoon, BaseUnits.Undefined), @@ -104,7 +104,7 @@ static Volume() new UnitInfo(VolumeUnit.UsTablespoon, BaseUnits.Undefined), new UnitInfo(VolumeUnit.UsTeaspoon, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.Volume); } /// @@ -169,6 +169,7 @@ public Volume(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.Volume; /// @@ -1291,7 +1292,7 @@ public bool Equals(Volume other, double tolerance, ComparisonType comparisonType /// A hash code for the current Volume. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1676,6 +1677,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return Volume.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return Volume.Info; else if(conversionType == typeof(BaseDimensions)) return Volume.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/VolumeConcentration.g.cs b/UnitsNet/GeneratedCode/Quantities/VolumeConcentration.g.cs index 0a8e0c65ae..482aca1587 100644 --- a/UnitsNet/GeneratedCode/Quantities/VolumeConcentration.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/VolumeConcentration.g.cs @@ -53,7 +53,7 @@ static VolumeConcentration() { BaseDimensions = BaseDimensions.Dimensionless; - Info = new QuantityInfo(QuantityType.VolumeConcentration, + Info = new QuantityInfo("VolumeConcentration", new UnitInfo[] { new UnitInfo(VolumeConcentrationUnit.CentilitersPerLiter, BaseUnits.Undefined), new UnitInfo(VolumeConcentrationUnit.CentilitersPerMililiter, BaseUnits.Undefined), @@ -76,7 +76,7 @@ static VolumeConcentration() new UnitInfo(VolumeConcentrationUnit.PicolitersPerLiter, BaseUnits.Undefined), new UnitInfo(VolumeConcentrationUnit.PicolitersPerMililiter, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.VolumeConcentration); } /// @@ -141,6 +141,7 @@ public VolumeConcentration(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.VolumeConcentration; /// @@ -829,7 +830,7 @@ public bool Equals(VolumeConcentration other, double tolerance, ComparisonType c /// A hash code for the current VolumeConcentration. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1152,6 +1153,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return VolumeConcentration.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return VolumeConcentration.Info; else if(conversionType == typeof(BaseDimensions)) return VolumeConcentration.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/VolumeFlow.g.cs b/UnitsNet/GeneratedCode/Quantities/VolumeFlow.g.cs index 95fa031825..a07744f116 100644 --- a/UnitsNet/GeneratedCode/Quantities/VolumeFlow.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/VolumeFlow.g.cs @@ -50,7 +50,7 @@ static VolumeFlow() { BaseDimensions = new BaseDimensions(3, 0, -1, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.VolumeFlow, + Info = new QuantityInfo("VolumeFlow", new UnitInfo[] { new UnitInfo(VolumeFlowUnit.AcreFootPerDay, BaseUnits.Undefined), new UnitInfo(VolumeFlowUnit.AcreFootPerHour, BaseUnits.Undefined), @@ -109,7 +109,7 @@ static VolumeFlow() new UnitInfo(VolumeFlowUnit.UsGallonPerMinute, BaseUnits.Undefined), new UnitInfo(VolumeFlowUnit.UsGallonPerSecond, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.VolumeFlow); } /// @@ -174,6 +174,7 @@ public VolumeFlow(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.VolumeFlow; /// @@ -1366,7 +1367,7 @@ public bool Equals(VolumeFlow other, double tolerance, ComparisonType comparison /// A hash code for the current VolumeFlow. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -1761,6 +1762,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return VolumeFlow.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return VolumeFlow.Info; else if(conversionType == typeof(BaseDimensions)) return VolumeFlow.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/VolumePerLength.g.cs b/UnitsNet/GeneratedCode/Quantities/VolumePerLength.g.cs index 6efb549f0a..b59c91d8bd 100644 --- a/UnitsNet/GeneratedCode/Quantities/VolumePerLength.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/VolumePerLength.g.cs @@ -50,7 +50,7 @@ static VolumePerLength() { BaseDimensions = new BaseDimensions(2, 0, 0, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.VolumePerLength, + Info = new QuantityInfo("VolumePerLength", new UnitInfo[] { new UnitInfo(VolumePerLengthUnit.CubicMeterPerMeter, new BaseUnits(length: LengthUnit.Meter)), new UnitInfo(VolumePerLengthUnit.CubicYardPerFoot, BaseUnits.Undefined), @@ -60,7 +60,7 @@ static VolumePerLength() new UnitInfo(VolumePerLengthUnit.LiterPerMillimeter, BaseUnits.Undefined), new UnitInfo(VolumePerLengthUnit.OilBarrelPerFoot, BaseUnits.Undefined), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.VolumePerLength); } /// @@ -125,6 +125,7 @@ public VolumePerLength(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.VolumePerLength; /// @@ -631,7 +632,7 @@ public bool Equals(VolumePerLength other, double tolerance, ComparisonType compa /// A hash code for the current VolumePerLength. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -928,6 +929,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return VolumePerLength.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return VolumePerLength.Info; else if(conversionType == typeof(BaseDimensions)) return VolumePerLength.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs b/UnitsNet/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs index 645441b8de..3f2ec630e1 100644 --- a/UnitsNet/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs +++ b/UnitsNet/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs @@ -50,7 +50,7 @@ static WarpingMomentOfInertia() { BaseDimensions = new BaseDimensions(6, 0, 0, 0, 0, 0, 0); - Info = new QuantityInfo(QuantityType.WarpingMomentOfInertia, + Info = new QuantityInfo("WarpingMomentOfInertia", new UnitInfo[] { new UnitInfo(WarpingMomentOfInertiaUnit.CentimeterToTheSixth, new BaseUnits(length: LengthUnit.Centimeter)), new UnitInfo(WarpingMomentOfInertiaUnit.DecimeterToTheSixth, new BaseUnits(length: LengthUnit.Decimeter)), @@ -59,7 +59,7 @@ static WarpingMomentOfInertia() new UnitInfo(WarpingMomentOfInertiaUnit.MeterToTheSixth, new BaseUnits(length: LengthUnit.Meter)), new UnitInfo(WarpingMomentOfInertiaUnit.MillimeterToTheSixth, new BaseUnits(length: LengthUnit.Millimeter)), }, - BaseUnit, Zero, BaseDimensions); + BaseUnit, Zero, BaseDimensions, QuantityType.WarpingMomentOfInertia); } /// @@ -124,6 +124,7 @@ public WarpingMomentOfInertia(double value, UnitSystem unitSystem) /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use Info property instead.")] public static QuantityType QuantityType { get; } = QuantityType.WarpingMomentOfInertia; /// @@ -616,7 +617,7 @@ public bool Equals(WarpingMomentOfInertia other, double tolerance, ComparisonTyp /// A hash code for the current WarpingMomentOfInertia. public override int GetHashCode() { - return new { QuantityType, Value, Unit }.GetHashCode(); + return new { Info.Name, Value, Unit }.GetHashCode(); } #endregion @@ -911,6 +912,8 @@ object IConvertible.ToType(Type conversionType, IFormatProvider provider) return Unit; else if(conversionType == typeof(QuantityType)) return WarpingMomentOfInertia.QuantityType; + else if(conversionType == typeof(QuantityInfo)) + return WarpingMomentOfInertia.Info; else if(conversionType == typeof(BaseDimensions)) return WarpingMomentOfInertia.BaseDimensions; else diff --git a/UnitsNet/GeneratedCode/Quantity.g.cs b/UnitsNet/GeneratedCode/Quantity.g.cs index 14580c10ca..e81bf8a27a 100644 --- a/UnitsNet/GeneratedCode/Quantity.g.cs +++ b/UnitsNet/GeneratedCode/Quantity.g.cs @@ -22,6 +22,7 @@ using JetBrains.Annotations; using UnitsNet.InternalHelpers; using UnitsNet.Units; +using System.Collections.Generic; #nullable enable @@ -32,12 +33,234 @@ namespace UnitsNet /// public static partial class Quantity { + /// + /// All QuantityInfo instances mapped by quantity name that are present in UnitsNet by default. + /// + public static readonly IDictionary ByName = new Dictionary + { + { "Acceleration", Acceleration.Info }, + { "AmountOfSubstance", AmountOfSubstance.Info }, + { "AmplitudeRatio", AmplitudeRatio.Info }, + { "Angle", Angle.Info }, + { "ApparentEnergy", ApparentEnergy.Info }, + { "ApparentPower", ApparentPower.Info }, + { "Area", Area.Info }, + { "AreaDensity", AreaDensity.Info }, + { "AreaMomentOfInertia", AreaMomentOfInertia.Info }, + { "BitRate", BitRate.Info }, + { "BrakeSpecificFuelConsumption", BrakeSpecificFuelConsumption.Info }, + { "Capacitance", Capacitance.Info }, + { "CoefficientOfThermalExpansion", CoefficientOfThermalExpansion.Info }, + { "Density", Density.Info }, + { "Duration", Duration.Info }, + { "DynamicViscosity", DynamicViscosity.Info }, + { "ElectricAdmittance", ElectricAdmittance.Info }, + { "ElectricCharge", ElectricCharge.Info }, + { "ElectricChargeDensity", ElectricChargeDensity.Info }, + { "ElectricConductance", ElectricConductance.Info }, + { "ElectricConductivity", ElectricConductivity.Info }, + { "ElectricCurrent", ElectricCurrent.Info }, + { "ElectricCurrentDensity", ElectricCurrentDensity.Info }, + { "ElectricCurrentGradient", ElectricCurrentGradient.Info }, + { "ElectricField", ElectricField.Info }, + { "ElectricInductance", ElectricInductance.Info }, + { "ElectricPotential", ElectricPotential.Info }, + { "ElectricPotentialAc", ElectricPotentialAc.Info }, + { "ElectricPotentialChangeRate", ElectricPotentialChangeRate.Info }, + { "ElectricPotentialDc", ElectricPotentialDc.Info }, + { "ElectricResistance", ElectricResistance.Info }, + { "ElectricResistivity", ElectricResistivity.Info }, + { "ElectricSurfaceChargeDensity", ElectricSurfaceChargeDensity.Info }, + { "Energy", Energy.Info }, + { "Entropy", Entropy.Info }, + { "Force", Force.Info }, + { "ForceChangeRate", ForceChangeRate.Info }, + { "ForcePerLength", ForcePerLength.Info }, + { "Frequency", Frequency.Info }, + { "FuelEfficiency", FuelEfficiency.Info }, + { "HeatFlux", HeatFlux.Info }, + { "HeatTransferCoefficient", HeatTransferCoefficient.Info }, + { "Illuminance", Illuminance.Info }, + { "Information", Information.Info }, + { "Irradiance", Irradiance.Info }, + { "Irradiation", Irradiation.Info }, + { "KinematicViscosity", KinematicViscosity.Info }, + { "LapseRate", LapseRate.Info }, + { "Length", Length.Info }, + { "Level", Level.Info }, + { "LinearDensity", LinearDensity.Info }, + { "LinearPowerDensity", LinearPowerDensity.Info }, + { "Luminosity", Luminosity.Info }, + { "LuminousFlux", LuminousFlux.Info }, + { "LuminousIntensity", LuminousIntensity.Info }, + { "MagneticField", MagneticField.Info }, + { "MagneticFlux", MagneticFlux.Info }, + { "Magnetization", Magnetization.Info }, + { "Mass", Mass.Info }, + { "MassConcentration", MassConcentration.Info }, + { "MassFlow", MassFlow.Info }, + { "MassFlux", MassFlux.Info }, + { "MassFraction", MassFraction.Info }, + { "MassMomentOfInertia", MassMomentOfInertia.Info }, + { "MolarEnergy", MolarEnergy.Info }, + { "MolarEntropy", MolarEntropy.Info }, + { "Molarity", Molarity.Info }, + { "MolarMass", MolarMass.Info }, + { "Permeability", Permeability.Info }, + { "Permittivity", Permittivity.Info }, + { "Power", Power.Info }, + { "PowerDensity", PowerDensity.Info }, + { "PowerRatio", PowerRatio.Info }, + { "Pressure", Pressure.Info }, + { "PressureChangeRate", PressureChangeRate.Info }, + { "Ratio", Ratio.Info }, + { "RatioChangeRate", RatioChangeRate.Info }, + { "ReactiveEnergy", ReactiveEnergy.Info }, + { "ReactivePower", ReactivePower.Info }, + { "RelativeHumidity", RelativeHumidity.Info }, + { "RotationalAcceleration", RotationalAcceleration.Info }, + { "RotationalSpeed", RotationalSpeed.Info }, + { "RotationalStiffness", RotationalStiffness.Info }, + { "RotationalStiffnessPerLength", RotationalStiffnessPerLength.Info }, + { "SolidAngle", SolidAngle.Info }, + { "SpecificEnergy", SpecificEnergy.Info }, + { "SpecificEntropy", SpecificEntropy.Info }, + { "SpecificVolume", SpecificVolume.Info }, + { "SpecificWeight", SpecificWeight.Info }, + { "Speed", Speed.Info }, + { "Temperature", Temperature.Info }, + { "TemperatureChangeRate", TemperatureChangeRate.Info }, + { "TemperatureDelta", TemperatureDelta.Info }, + { "ThermalConductivity", ThermalConductivity.Info }, + { "ThermalResistance", ThermalResistance.Info }, + { "Torque", Torque.Info }, + { "TorquePerLength", TorquePerLength.Info }, + { "Turbidity", Turbidity.Info }, + { "VitaminA", VitaminA.Info }, + { "Volume", Volume.Info }, + { "VolumeConcentration", VolumeConcentration.Info }, + { "VolumeFlow", VolumeFlow.Info }, + { "VolumePerLength", VolumePerLength.Info }, + { "WarpingMomentOfInertia", WarpingMomentOfInertia.Info }, + }; + + // Used by the QuantityInfo .ctor to map a name to a QuantityType. Will be removed when QuantityType + // will be removed. + internal static readonly IDictionary QuantityTypeByName = new Dictionary + { + { "Acceleration", QuantityType.Acceleration }, + { "AmountOfSubstance", QuantityType.AmountOfSubstance }, + { "AmplitudeRatio", QuantityType.AmplitudeRatio }, + { "Angle", QuantityType.Angle }, + { "ApparentEnergy", QuantityType.ApparentEnergy }, + { "ApparentPower", QuantityType.ApparentPower }, + { "Area", QuantityType.Area }, + { "AreaDensity", QuantityType.AreaDensity }, + { "AreaMomentOfInertia", QuantityType.AreaMomentOfInertia }, + { "BitRate", QuantityType.BitRate }, + { "BrakeSpecificFuelConsumption", QuantityType.BrakeSpecificFuelConsumption }, + { "Capacitance", QuantityType.Capacitance }, + { "CoefficientOfThermalExpansion", QuantityType.CoefficientOfThermalExpansion }, + { "Density", QuantityType.Density }, + { "Duration", QuantityType.Duration }, + { "DynamicViscosity", QuantityType.DynamicViscosity }, + { "ElectricAdmittance", QuantityType.ElectricAdmittance }, + { "ElectricCharge", QuantityType.ElectricCharge }, + { "ElectricChargeDensity", QuantityType.ElectricChargeDensity }, + { "ElectricConductance", QuantityType.ElectricConductance }, + { "ElectricConductivity", QuantityType.ElectricConductivity }, + { "ElectricCurrent", QuantityType.ElectricCurrent }, + { "ElectricCurrentDensity", QuantityType.ElectricCurrentDensity }, + { "ElectricCurrentGradient", QuantityType.ElectricCurrentGradient }, + { "ElectricField", QuantityType.ElectricField }, + { "ElectricInductance", QuantityType.ElectricInductance }, + { "ElectricPotential", QuantityType.ElectricPotential }, + { "ElectricPotentialAc", QuantityType.ElectricPotentialAc }, + { "ElectricPotentialChangeRate", QuantityType.ElectricPotentialChangeRate }, + { "ElectricPotentialDc", QuantityType.ElectricPotentialDc }, + { "ElectricResistance", QuantityType.ElectricResistance }, + { "ElectricResistivity", QuantityType.ElectricResistivity }, + { "ElectricSurfaceChargeDensity", QuantityType.ElectricSurfaceChargeDensity }, + { "Energy", QuantityType.Energy }, + { "Entropy", QuantityType.Entropy }, + { "Force", QuantityType.Force }, + { "ForceChangeRate", QuantityType.ForceChangeRate }, + { "ForcePerLength", QuantityType.ForcePerLength }, + { "Frequency", QuantityType.Frequency }, + { "FuelEfficiency", QuantityType.FuelEfficiency }, + { "HeatFlux", QuantityType.HeatFlux }, + { "HeatTransferCoefficient", QuantityType.HeatTransferCoefficient }, + { "Illuminance", QuantityType.Illuminance }, + { "Information", QuantityType.Information }, + { "Irradiance", QuantityType.Irradiance }, + { "Irradiation", QuantityType.Irradiation }, + { "KinematicViscosity", QuantityType.KinematicViscosity }, + { "LapseRate", QuantityType.LapseRate }, + { "Length", QuantityType.Length }, + { "Level", QuantityType.Level }, + { "LinearDensity", QuantityType.LinearDensity }, + { "LinearPowerDensity", QuantityType.LinearPowerDensity }, + { "Luminosity", QuantityType.Luminosity }, + { "LuminousFlux", QuantityType.LuminousFlux }, + { "LuminousIntensity", QuantityType.LuminousIntensity }, + { "MagneticField", QuantityType.MagneticField }, + { "MagneticFlux", QuantityType.MagneticFlux }, + { "Magnetization", QuantityType.Magnetization }, + { "Mass", QuantityType.Mass }, + { "MassConcentration", QuantityType.MassConcentration }, + { "MassFlow", QuantityType.MassFlow }, + { "MassFlux", QuantityType.MassFlux }, + { "MassFraction", QuantityType.MassFraction }, + { "MassMomentOfInertia", QuantityType.MassMomentOfInertia }, + { "MolarEnergy", QuantityType.MolarEnergy }, + { "MolarEntropy", QuantityType.MolarEntropy }, + { "Molarity", QuantityType.Molarity }, + { "MolarMass", QuantityType.MolarMass }, + { "Permeability", QuantityType.Permeability }, + { "Permittivity", QuantityType.Permittivity }, + { "Power", QuantityType.Power }, + { "PowerDensity", QuantityType.PowerDensity }, + { "PowerRatio", QuantityType.PowerRatio }, + { "Pressure", QuantityType.Pressure }, + { "PressureChangeRate", QuantityType.PressureChangeRate }, + { "Ratio", QuantityType.Ratio }, + { "RatioChangeRate", QuantityType.RatioChangeRate }, + { "ReactiveEnergy", QuantityType.ReactiveEnergy }, + { "ReactivePower", QuantityType.ReactivePower }, + { "RelativeHumidity", QuantityType.RelativeHumidity }, + { "RotationalAcceleration", QuantityType.RotationalAcceleration }, + { "RotationalSpeed", QuantityType.RotationalSpeed }, + { "RotationalStiffness", QuantityType.RotationalStiffness }, + { "RotationalStiffnessPerLength", QuantityType.RotationalStiffnessPerLength }, + { "SolidAngle", QuantityType.SolidAngle }, + { "SpecificEnergy", QuantityType.SpecificEnergy }, + { "SpecificEntropy", QuantityType.SpecificEntropy }, + { "SpecificVolume", QuantityType.SpecificVolume }, + { "SpecificWeight", QuantityType.SpecificWeight }, + { "Speed", QuantityType.Speed }, + { "Temperature", QuantityType.Temperature }, + { "TemperatureChangeRate", QuantityType.TemperatureChangeRate }, + { "TemperatureDelta", QuantityType.TemperatureDelta }, + { "ThermalConductivity", QuantityType.ThermalConductivity }, + { "ThermalResistance", QuantityType.ThermalResistance }, + { "Torque", QuantityType.Torque }, + { "TorquePerLength", QuantityType.TorquePerLength }, + { "Turbidity", QuantityType.Turbidity }, + { "VitaminA", QuantityType.VitaminA }, + { "Volume", QuantityType.Volume }, + { "VolumeConcentration", QuantityType.VolumeConcentration }, + { "VolumeFlow", QuantityType.VolumeFlow }, + { "VolumePerLength", QuantityType.VolumePerLength }, + { "WarpingMomentOfInertia", QuantityType.WarpingMomentOfInertia }, + }; + /// /// Dynamically constructs a quantity of the given with the value in the quantity's base units. /// /// The of the quantity to create. /// The value to construct the quantity with. /// The created quantity. + [Obsolete("QuantityType will be removed. Use FromQuantityInfo(QuantityInfo, QuantityValue) instead.")] public static IQuantity FromQuantityType(QuantityType quantityType, QuantityValue value) { switch(quantityType) @@ -255,6 +478,229 @@ public static IQuantity FromQuantityType(QuantityType quantityType, QuantityValu } } + /// + /// Dynamically constructs a quantity of the given with the value in the quantity's base units. + /// + /// The of the quantity to create. + /// The value to construct the quantity with. + /// The created quantity. + public static IQuantity FromQuantityInfo(QuantityInfo quantityInfo, QuantityValue value) + { + switch(quantityInfo.Name) + { + case "Acceleration": + return Acceleration.From(value, Acceleration.BaseUnit); + case "AmountOfSubstance": + return AmountOfSubstance.From(value, AmountOfSubstance.BaseUnit); + case "AmplitudeRatio": + return AmplitudeRatio.From(value, AmplitudeRatio.BaseUnit); + case "Angle": + return Angle.From(value, Angle.BaseUnit); + case "ApparentEnergy": + return ApparentEnergy.From(value, ApparentEnergy.BaseUnit); + case "ApparentPower": + return ApparentPower.From(value, ApparentPower.BaseUnit); + case "Area": + return Area.From(value, Area.BaseUnit); + case "AreaDensity": + return AreaDensity.From(value, AreaDensity.BaseUnit); + case "AreaMomentOfInertia": + return AreaMomentOfInertia.From(value, AreaMomentOfInertia.BaseUnit); + case "BitRate": + return BitRate.From(value, BitRate.BaseUnit); + case "BrakeSpecificFuelConsumption": + return BrakeSpecificFuelConsumption.From(value, BrakeSpecificFuelConsumption.BaseUnit); + case "Capacitance": + return Capacitance.From(value, Capacitance.BaseUnit); + case "CoefficientOfThermalExpansion": + return CoefficientOfThermalExpansion.From(value, CoefficientOfThermalExpansion.BaseUnit); + case "Density": + return Density.From(value, Density.BaseUnit); + case "Duration": + return Duration.From(value, Duration.BaseUnit); + case "DynamicViscosity": + return DynamicViscosity.From(value, DynamicViscosity.BaseUnit); + case "ElectricAdmittance": + return ElectricAdmittance.From(value, ElectricAdmittance.BaseUnit); + case "ElectricCharge": + return ElectricCharge.From(value, ElectricCharge.BaseUnit); + case "ElectricChargeDensity": + return ElectricChargeDensity.From(value, ElectricChargeDensity.BaseUnit); + case "ElectricConductance": + return ElectricConductance.From(value, ElectricConductance.BaseUnit); + case "ElectricConductivity": + return ElectricConductivity.From(value, ElectricConductivity.BaseUnit); + case "ElectricCurrent": + return ElectricCurrent.From(value, ElectricCurrent.BaseUnit); + case "ElectricCurrentDensity": + return ElectricCurrentDensity.From(value, ElectricCurrentDensity.BaseUnit); + case "ElectricCurrentGradient": + return ElectricCurrentGradient.From(value, ElectricCurrentGradient.BaseUnit); + case "ElectricField": + return ElectricField.From(value, ElectricField.BaseUnit); + case "ElectricInductance": + return ElectricInductance.From(value, ElectricInductance.BaseUnit); + case "ElectricPotential": + return ElectricPotential.From(value, ElectricPotential.BaseUnit); + case "ElectricPotentialAc": + return ElectricPotentialAc.From(value, ElectricPotentialAc.BaseUnit); + case "ElectricPotentialChangeRate": + return ElectricPotentialChangeRate.From(value, ElectricPotentialChangeRate.BaseUnit); + case "ElectricPotentialDc": + return ElectricPotentialDc.From(value, ElectricPotentialDc.BaseUnit); + case "ElectricResistance": + return ElectricResistance.From(value, ElectricResistance.BaseUnit); + case "ElectricResistivity": + return ElectricResistivity.From(value, ElectricResistivity.BaseUnit); + case "ElectricSurfaceChargeDensity": + return ElectricSurfaceChargeDensity.From(value, ElectricSurfaceChargeDensity.BaseUnit); + case "Energy": + return Energy.From(value, Energy.BaseUnit); + case "Entropy": + return Entropy.From(value, Entropy.BaseUnit); + case "Force": + return Force.From(value, Force.BaseUnit); + case "ForceChangeRate": + return ForceChangeRate.From(value, ForceChangeRate.BaseUnit); + case "ForcePerLength": + return ForcePerLength.From(value, ForcePerLength.BaseUnit); + case "Frequency": + return Frequency.From(value, Frequency.BaseUnit); + case "FuelEfficiency": + return FuelEfficiency.From(value, FuelEfficiency.BaseUnit); + case "HeatFlux": + return HeatFlux.From(value, HeatFlux.BaseUnit); + case "HeatTransferCoefficient": + return HeatTransferCoefficient.From(value, HeatTransferCoefficient.BaseUnit); + case "Illuminance": + return Illuminance.From(value, Illuminance.BaseUnit); + case "Information": + return Information.From(value, Information.BaseUnit); + case "Irradiance": + return Irradiance.From(value, Irradiance.BaseUnit); + case "Irradiation": + return Irradiation.From(value, Irradiation.BaseUnit); + case "KinematicViscosity": + return KinematicViscosity.From(value, KinematicViscosity.BaseUnit); + case "LapseRate": + return LapseRate.From(value, LapseRate.BaseUnit); + case "Length": + return Length.From(value, Length.BaseUnit); + case "Level": + return Level.From(value, Level.BaseUnit); + case "LinearDensity": + return LinearDensity.From(value, LinearDensity.BaseUnit); + case "LinearPowerDensity": + return LinearPowerDensity.From(value, LinearPowerDensity.BaseUnit); + case "Luminosity": + return Luminosity.From(value, Luminosity.BaseUnit); + case "LuminousFlux": + return LuminousFlux.From(value, LuminousFlux.BaseUnit); + case "LuminousIntensity": + return LuminousIntensity.From(value, LuminousIntensity.BaseUnit); + case "MagneticField": + return MagneticField.From(value, MagneticField.BaseUnit); + case "MagneticFlux": + return MagneticFlux.From(value, MagneticFlux.BaseUnit); + case "Magnetization": + return Magnetization.From(value, Magnetization.BaseUnit); + case "Mass": + return Mass.From(value, Mass.BaseUnit); + case "MassConcentration": + return MassConcentration.From(value, MassConcentration.BaseUnit); + case "MassFlow": + return MassFlow.From(value, MassFlow.BaseUnit); + case "MassFlux": + return MassFlux.From(value, MassFlux.BaseUnit); + case "MassFraction": + return MassFraction.From(value, MassFraction.BaseUnit); + case "MassMomentOfInertia": + return MassMomentOfInertia.From(value, MassMomentOfInertia.BaseUnit); + case "MolarEnergy": + return MolarEnergy.From(value, MolarEnergy.BaseUnit); + case "MolarEntropy": + return MolarEntropy.From(value, MolarEntropy.BaseUnit); + case "Molarity": + return Molarity.From(value, Molarity.BaseUnit); + case "MolarMass": + return MolarMass.From(value, MolarMass.BaseUnit); + case "Permeability": + return Permeability.From(value, Permeability.BaseUnit); + case "Permittivity": + return Permittivity.From(value, Permittivity.BaseUnit); + case "Power": + return Power.From(value, Power.BaseUnit); + case "PowerDensity": + return PowerDensity.From(value, PowerDensity.BaseUnit); + case "PowerRatio": + return PowerRatio.From(value, PowerRatio.BaseUnit); + case "Pressure": + return Pressure.From(value, Pressure.BaseUnit); + case "PressureChangeRate": + return PressureChangeRate.From(value, PressureChangeRate.BaseUnit); + case "Ratio": + return Ratio.From(value, Ratio.BaseUnit); + case "RatioChangeRate": + return RatioChangeRate.From(value, RatioChangeRate.BaseUnit); + case "ReactiveEnergy": + return ReactiveEnergy.From(value, ReactiveEnergy.BaseUnit); + case "ReactivePower": + return ReactivePower.From(value, ReactivePower.BaseUnit); + case "RelativeHumidity": + return RelativeHumidity.From(value, RelativeHumidity.BaseUnit); + case "RotationalAcceleration": + return RotationalAcceleration.From(value, RotationalAcceleration.BaseUnit); + case "RotationalSpeed": + return RotationalSpeed.From(value, RotationalSpeed.BaseUnit); + case "RotationalStiffness": + return RotationalStiffness.From(value, RotationalStiffness.BaseUnit); + case "RotationalStiffnessPerLength": + return RotationalStiffnessPerLength.From(value, RotationalStiffnessPerLength.BaseUnit); + case "SolidAngle": + return SolidAngle.From(value, SolidAngle.BaseUnit); + case "SpecificEnergy": + return SpecificEnergy.From(value, SpecificEnergy.BaseUnit); + case "SpecificEntropy": + return SpecificEntropy.From(value, SpecificEntropy.BaseUnit); + case "SpecificVolume": + return SpecificVolume.From(value, SpecificVolume.BaseUnit); + case "SpecificWeight": + return SpecificWeight.From(value, SpecificWeight.BaseUnit); + case "Speed": + return Speed.From(value, Speed.BaseUnit); + case "Temperature": + return Temperature.From(value, Temperature.BaseUnit); + case "TemperatureChangeRate": + return TemperatureChangeRate.From(value, TemperatureChangeRate.BaseUnit); + case "TemperatureDelta": + return TemperatureDelta.From(value, TemperatureDelta.BaseUnit); + case "ThermalConductivity": + return ThermalConductivity.From(value, ThermalConductivity.BaseUnit); + case "ThermalResistance": + return ThermalResistance.From(value, ThermalResistance.BaseUnit); + case "Torque": + return Torque.From(value, Torque.BaseUnit); + case "TorquePerLength": + return TorquePerLength.From(value, TorquePerLength.BaseUnit); + case "Turbidity": + return Turbidity.From(value, Turbidity.BaseUnit); + case "VitaminA": + return VitaminA.From(value, VitaminA.BaseUnit); + case "Volume": + return Volume.From(value, Volume.BaseUnit); + case "VolumeConcentration": + return VolumeConcentration.From(value, VolumeConcentration.BaseUnit); + case "VolumeFlow": + return VolumeFlow.From(value, VolumeFlow.BaseUnit); + case "VolumePerLength": + return VolumePerLength.From(value, VolumePerLength.BaseUnit); + case "WarpingMomentOfInertia": + return WarpingMomentOfInertia.From(value, WarpingMomentOfInertia.BaseUnit); + default: + throw new ArgumentException($"{quantityInfo.Name} is not a supported quantity."); + } + } + /// /// Try to dynamically construct a quantity. /// diff --git a/UnitsNet/IQuantity.cs b/UnitsNet/IQuantity.cs index 47526f35ca..9146fe083a 100644 --- a/UnitsNet/IQuantity.cs +++ b/UnitsNet/IQuantity.cs @@ -16,6 +16,7 @@ public interface IQuantity : IFormattable /// /// The of this quantity. /// + [Obsolete("QuantityType will be removed in the future. Use QuantityInfo instead.")] QuantityType Type { get; } /// diff --git a/UnitsNet/QuantityInfo.cs b/UnitsNet/QuantityInfo.cs index 0d90c97ea9..a33616b687 100644 --- a/UnitsNet/QuantityInfo.cs +++ b/UnitsNet/QuantityInfo.cs @@ -40,17 +40,33 @@ public class QuantityInfo /// The base dimensions of the quantity. /// Quantity type can not be undefined. /// If units -or- baseUnit -or- zero -or- baseDimensions is null. + [Obsolete("QuantityType will be removed in the future. Use QuantityInfo(string, UnitInfo[], Enum, IQuantity, BaseDimensions) instead.")] public QuantityInfo(QuantityType quantityType, [NotNull] UnitInfo[] unitInfos, [NotNull] Enum baseUnit, [NotNull] IQuantity zero, [NotNull] BaseDimensions baseDimensions) + : this(quantityType.ToString(), unitInfos, baseUnit, zero, baseDimensions, quantityType) + { + } + + /// + /// Constructs an instance. + /// + /// Name of the quantity. + /// The information about the units for this quantity. + /// The base unit enum value. + /// The zero quantity. + /// The base dimensions of the quantity. + /// The the quantity type. Defaults to Undefined. + /// Quantity type can not be undefined. + /// If units -or- baseUnit -or- zero -or- baseDimensions is null. + public QuantityInfo([NotNull] string name, [NotNull] UnitInfo[] unitInfos, [NotNull] Enum baseUnit, [NotNull] IQuantity zero, [NotNull] BaseDimensions baseDimensions, + QuantityType quantityType = QuantityType.Undefined) { - if(quantityType == QuantityType.Undefined) throw new ArgumentException("Quantity type can not be undefined.", nameof(quantityType)); if(baseUnit == null) throw new ArgumentNullException(nameof(baseUnit)); BaseDimensions = baseDimensions ?? throw new ArgumentNullException(nameof(baseDimensions)); Zero = zero ?? throw new ArgumentNullException(nameof(zero)); - Name = quantityType.ToString(); - QuantityType = quantityType; - UnitType = UnitEnumTypes.First(t => t.Name == $"{quantityType}Unit"); + Name = name; + UnitType = UnitEnumTypes.First(t => t.Name == $"{name}Unit"); UnitInfos = unitInfos ?? throw new ArgumentNullException(nameof(unitInfos)); BaseUnitInfo = UnitInfos.First(unitInfo => unitInfo.Value.Equals(baseUnit)); Zero = zero ?? throw new ArgumentNullException(nameof(zero)); @@ -61,6 +77,7 @@ public QuantityInfo(QuantityType quantityType, [NotNull] UnitInfo[] unitInfos, [ UnitNames = UnitInfos.Select( unitInfo => unitInfo.Name ).ToArray(); Units = UnitInfos.Select( unitInfo => unitInfo.Value ).ToArray(); BaseUnit = BaseUnitInfo.Value; + QuantityType = quantityType; } /// @@ -71,6 +88,7 @@ public QuantityInfo(QuantityType quantityType, [NotNull] UnitInfo[] unitInfos, [ /// /// Quantity type, such as or . /// + [Obsolete("QuantityType will be removed in the future. Use QuantityInfo instead.")] public QuantityType QuantityType { get; } /// @@ -175,9 +193,17 @@ public IEnumerable GetUnitInfosFor(BaseUnits baseUnits) public class QuantityInfo : QuantityInfo where TUnit : Enum { - /// + /// + [Obsolete("QuantityType will be removed in the future. Use QuantityInfo(QuantityType, string, UnitInfo{TUnit}[], TUnit, IQuantity{TUnit}, BaseDimensions) instead.")] public QuantityInfo(QuantityType quantityType, UnitInfo[] unitInfos, TUnit baseUnit, IQuantity zero, BaseDimensions baseDimensions) - : base(quantityType, unitInfos, baseUnit, zero, baseDimensions) + : this(quantityType.ToString(), unitInfos, baseUnit, zero, baseDimensions, quantityType) + { + } + + /// + public QuantityInfo(string name, UnitInfo[] unitInfos, TUnit baseUnit, IQuantity zero, BaseDimensions baseDimensions, + QuantityType quantityType = QuantityType.Undefined) + : base(name, unitInfos, baseUnit, zero, baseDimensions, quantityType) { Zero = zero; UnitInfos = unitInfos ?? throw new ArgumentNullException(nameof(unitInfos)); @@ -185,7 +211,7 @@ public QuantityInfo(QuantityType quantityType, UnitInfo[] unitInfos, TUni UnitType = baseUnit; // Obsolete members - Units = UnitInfos.Select( unitInfo => unitInfo.Value ).ToArray(); + Units = UnitInfos.Select(unitInfo => unitInfo.Value).ToArray(); BaseUnit = BaseUnitInfo.Value; } diff --git a/UnitsNet/QuantityTypeConverter.cs b/UnitsNet/QuantityTypeConverter.cs index d9d8988092..dbbe2865ae 100644 --- a/UnitsNet/QuantityTypeConverter.cs +++ b/UnitsNet/QuantityTypeConverter.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 System; @@ -140,18 +140,19 @@ public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceT private static TAttribute? GetAttribute(ITypeDescriptorContext? context) where TAttribute : UnitAttributeBase { - if(context is null || context.PropertyDescriptor is null) - return null; + if (context?.PropertyDescriptor is null) return null; - TAttribute? attribute = (TAttribute)context.PropertyDescriptor.Attributes[typeof(TAttribute)]; - if (attribute != null) - { - QuantityType expected = default(TQuantity).Type; - QuantityType actual = QuantityType.Undefined; + var attribute = (TAttribute?)context.PropertyDescriptor.Attributes[typeof(TAttribute)]; - if (attribute.UnitType != null) actual = Quantity.From(1, attribute.UnitType).Type; - if (actual != QuantityType.Undefined && expected != actual) - throw new ArgumentException($"The specified UnitType:'{attribute.UnitType}' dose not match QuantityType:'{expected}'"); + // Ensure the attribute's unit is compatible with this converter's quantity. + if (attribute?.UnitType != null) + { + string converterQuantityName = default(TQuantity).QuantityInfo.Name; + string attributeQuantityName = Quantity.From(1, attribute.UnitType).QuantityInfo.Name; + if (converterQuantityName != attributeQuantityName) + { + throw new ArgumentException($"The {attribute.GetType()}'s UnitType [{attribute.UnitType}] is not compatible with the converter's quantity [{converterQuantityName}]."); + } } return attribute; diff --git a/UnitsNet/UnitConverter.cs b/UnitsNet/UnitConverter.cs index 781912cb36..09f55f3255 100644 --- a/UnitsNet/UnitConverter.cs +++ b/UnitsNet/UnitConverter.cs @@ -374,7 +374,7 @@ public static bool TryConvertByName(QuantityValue inputValue, string quantityNam /// convert from. /// /// - /// Name of quantity, such as "Length" and "Mass". for all + /// Name of quantity, such as "Length" and "Mass". for all /// values. /// /// diff --git a/UnitsNet/UnitsNet.csproj b/UnitsNet/UnitsNet.csproj index 7a4d046e62..2cfa11c1de 100644 --- a/UnitsNet/UnitsNet.csproj +++ b/UnitsNet/UnitsNet.csproj @@ -1,4 +1,4 @@ - + UnitsNet