Skip to content

Commit 8f503e9

Browse files
MuximizeMuximize
authored
Remove obsolete units (#1372)
See #1200
1 parent f7ce00b commit 8f503e9

21 files changed

+36
-364
lines changed

Diff for: ‎Common/UnitDefinitions/CoefficientOfThermalExpansion.json

-48
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,6 @@
66
"Θ": -1
77
},
88
"Units": [
9-
{
10-
"SingularName": "InverseKelvin",
11-
"PluralName": "InverseKelvin",
12-
"ObsoleteText": "Use PerKelvin instead.",
13-
"BaseUnits": {
14-
"Θ": "Kelvin"
15-
},
16-
"FromUnitToBaseFunc": "{x}",
17-
"FromBaseToUnitFunc": "{x}",
18-
"Localization": [
19-
{
20-
"Culture": "en-US",
21-
"Abbreviations": [ "1/K" ]
22-
}
23-
]
24-
},
25-
{
26-
"SingularName": "InverseDegreeCelsius",
27-
"PluralName": "InverseDegreeCelsius",
28-
"ObsoleteText": "Use PerDegreeCelsius instead.",
29-
"BaseUnits": {
30-
"Θ": "DegreeCelsius"
31-
},
32-
"FromUnitToBaseFunc": "{x}",
33-
"FromBaseToUnitFunc": "{x}",
34-
"Localization": [
35-
{
36-
"Culture": "en-US",
37-
"Abbreviations": [ "1/°C" ]
38-
}
39-
]
40-
},
41-
{
42-
"SingularName": "InverseDegreeFahrenheit",
43-
"PluralName": "InverseDegreeFahrenheit",
44-
"ObsoleteText": "Use PerDegreeFahrenheit instead.",
45-
"BaseUnits": {
46-
"Θ": "DegreeFahrenheit"
47-
},
48-
"FromUnitToBaseFunc": "{x} * 9 / 5",
49-
"FromBaseToUnitFunc": "{x} * 5 / 9",
50-
"Localization": [
51-
{
52-
"Culture": "en-US",
53-
"Abbreviations": [ "1/°F" ]
54-
}
55-
]
56-
},
579
{
5810
"SingularName": "PerKelvin",
5911
"PluralName": "PerKelvin",

Diff for: ‎Common/UnitDefinitions/HeatTransferCoefficient.json

-13
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,6 @@
3232
}
3333
]
3434
},
35-
{
36-
"SingularName": "BtuPerSquareFootDegreeFahrenheit",
37-
"PluralName": "BtusPerSquareFootDegreeFahrenheit",
38-
"ObsoleteText": "The name of this definition incorrectly omitted time as divisor, please use BtuPerHourSquareFootDegreeFahrenheit instead",
39-
"FromUnitToBaseFunc": "{x} * 5.6782633411134878",
40-
"FromBaseToUnitFunc": "{x} / 5.6782633411134878",
41-
"Localization": [
42-
{
43-
"Culture": "en-US",
44-
"Abbreviations": [ "Btu/ft²·°F" ]
45-
}
46-
]
47-
},
4835
{
4936
"SingularName": "BtuPerHourSquareFootDegreeFahrenheit",
5037
"PluralName": "BtusPerHourSquareFootDegreeFahrenheit",

Diff for: ‎UnitsNet.NanoFramework/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs

-42
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎UnitsNet.NanoFramework/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs

-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎UnitsNet.NanoFramework/GeneratedCode/Units/CoefficientOfThermalExpansionUnit.g.cs

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎UnitsNet.NanoFramework/GeneratedCode/Units/HeatTransferCoefficientUnit.g.cs

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToCoefficientOfThermalExpansionExtensionsTest.g.cs

-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎UnitsNet.NumberExtensions.Tests/GeneratedCode/NumberToHeatTransferCoefficientExtensionsTest.g.cs

-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎UnitsNet.NumberExtensions/GeneratedCode/NumberToCoefficientOfThermalExpansionExtensions.g.cs

-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎UnitsNet.NumberExtensions/GeneratedCode/NumberToHeatTransferCoefficientExtensions.g.cs

-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎UnitsNet.Tests/CustomCode/CoefficientOfThermalExpansionTests.cs

+2-8
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ public class CoefficientOfThermalExpansionTests : CoefficientOfThermalExpansionT
2929
{
3030
protected override bool SupportsSIUnitSystem => true;
3131

32-
protected override double InverseDegreeCelsiusInOnePerKelvin => 1.0;
33-
34-
protected override double InverseDegreeFahrenheitInOnePerKelvin => 0.5555555555555556;
35-
36-
protected override double InverseKelvinInOnePerKelvin => 1.0;
37-
3832
protected override double PerDegreeCelsiusInOnePerKelvin => 1.0;
3933

4034
protected override double PerDegreeFahrenheitInOnePerKelvin => 0.5555555555555556;
@@ -52,7 +46,7 @@ public void CoefficientOfThermalExpansionTimesTemperatureDelta()
5246
{
5347
double temperatureDeltaDegC = 2.0;
5448
double ctePerDegC = 0.001;
55-
CoefficientOfThermalExpansion cte = CoefficientOfThermalExpansion.FromInverseDegreeCelsius(ctePerDegC);
49+
CoefficientOfThermalExpansion cte = CoefficientOfThermalExpansion.FromPerDegreeCelsius(ctePerDegC);
5650
TemperatureDelta dT = TemperatureDelta.FromDegreesCelsius(temperatureDeltaDegC);
5751
AssertEx.EqualTolerance(cte * dT, ctePerDegC * temperatureDeltaDegC, 1e-10);
5852
}
@@ -62,7 +56,7 @@ public void TemperatureDeltaTimesCoefficientOfThermalExpansion()
6256
{
6357
double temperatureDeltaDegC = 2.0;
6458
double ctePerDegC = 0.001;
65-
CoefficientOfThermalExpansion cte = CoefficientOfThermalExpansion.FromInverseDegreeCelsius(ctePerDegC);
59+
CoefficientOfThermalExpansion cte = CoefficientOfThermalExpansion.FromPerDegreeCelsius(ctePerDegC);
6660
TemperatureDelta dT = TemperatureDelta.FromDegreesCelsius(temperatureDeltaDegC);
6761
AssertEx.EqualTolerance(dT * cte, temperatureDeltaDegC * ctePerDegC, 1e-10);
6862
}

Diff for: ‎UnitsNet.Tests/CustomCode/HeatTransferCoefficientTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public class HeatTransferCoefficientTests : HeatTransferCoefficientTestsBase
3232
protected override double WattsPerSquareMeterKelvinInOneWattPerSquareMeterKelvin => 1;
3333
protected override double BtusPerHourSquareFootDegreeFahrenheitInOneWattPerSquareMeterKelvin => 1.7611018368230584e-1;
3434
protected override double KilocaloriesPerHourSquareMeterDegreeCelsiusInOneWattPerSquareMeterKelvin => 0.859845227859;
35-
protected override double BtusPerSquareFootDegreeFahrenheitInOneWattPerSquareMeterKelvin => 1.7611018368230584e-1;
3635
protected override double CaloriesPerHourSquareMeterDegreeCelsiusInOneWattPerSquareMeterKelvin => 859.845227859;
3736
}
3837
}

0 commit comments

Comments
 (0)