Skip to content

Commit 7303a54

Browse files
author
Andreas Gullberg Larsen
authored
Revert "Add a few new units and new prefixes for existing units. (#291)" (#294)
This reverts commit 83aeaca.
1 parent 83aeaca commit 7303a54

37 files changed

+4
-1682
lines changed

‎UnitsNet.Tests/CustomCode/EnergyTests.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,8 @@ public class EnergyTests : EnergyTestsBase
2828

2929
protected override double JoulesInOneJoule => 1;
3030

31-
protected override double KilobritishThermalUnitsInOneJoule => 9.4781339449889105832843629746176e-7;
32-
3331
protected override double KilojoulesInOneJoule => 1E-3;
3432

35-
protected override double MegabritishThermalUnitsInOneJoule => 9.4781339449889105832843629746176e-10;
36-
3733
protected override double MegajoulesInOneJoule => 1E-6;
3834

3935
protected override double BritishThermalUnitsInOneJoule => 0.00094781712;
@@ -54,8 +50,6 @@ public class EnergyTests : EnergyTestsBase
5450

5551
protected override double FootPoundsInOneJoule => 0.737562149;
5652

57-
protected override double GigabritishThermalUnitsInOneJoule => 9.4781339449889105832843629746176e-13;
58-
5953
protected override double GigawattHoursInOneJoule => 2.77777778e-13;
6054

6155
protected override double KilocaloriesInOneJoule => 0.00023900573614;

‎UnitsNet.Tests/CustomCode/FlowTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ public class FlowTests : FlowTestsBase
2727

2828
protected override double CubicDecimetersPerMinuteInOneCubicMeterPerSecond => 60000.00000;
2929

30-
protected override double CubicFeetPerHourInOneCubicMeterPerSecond => 1.2713300937959091422759633856933e+5;
31-
3230
protected override double CubicFeetPerSecondInOneCubicMeterPerSecond => 35.314666213;
3331

3432
protected override double MillionUsGallonsPerDayInOneCubicMeterPerSecond => 22.824465227;

‎UnitsNet.Tests/CustomCode/MassFlowTests.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public class MassFlowTests : MassFlowTestsBase
3636

3737
protected override double KilogramsPerSecondInOneGramPerSecond => 1E-3;
3838

39-
protected override double MegapoundsPerHourInOneGramPerSecond => 7.93664e-6;
40-
4139
protected override double DecigramsPerSecondInOneGramPerSecond => 1E1;
4240

4341
protected override double CentigramsPerSecondInOneGramPerSecond => 1E2;
@@ -48,8 +46,6 @@ public class MassFlowTests : MassFlowTestsBase
4846

4947
protected override double NanogramsPerSecondInOneGramPerSecond => 1E9;
5048

51-
protected override double ShortTonsPerHourInOneGramPerSecond => 3.96832e-3;
52-
5349
protected override double TonnesPerDayInOneGramPerSecond => 60.0*60*24/1E6;
5450

5551
protected override double PoundsPerHourInOneGramPerSecond => 7.93664;

‎UnitsNet.Tests/CustomCode/MassTests.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,10 @@ public class MassTests : MassTestsBase
3838

3939
protected override double KilogramsInOneKilogram => 1;
4040

41-
protected override double KilopoundsInOneKilogram => 2.2046226218487757e-3;
42-
4341
protected override double KilotonnesInOneKilogram => 1E-6;
4442

4543
protected override double LongTonsInOneKilogram => 0.000984207;
4644

47-
protected override double MegapoundsInOneKilogram => 2.2046226218487757e-6;
48-
4945
protected override double MegatonnesInOneKilogram => 1E-6;
5046

5147
protected override double MicrogramsInOneKilogram => 1E9;

‎UnitsNet.Tests/CustomCode/PowerTests.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ public class PowerTests : PowerTestsBase
3838

3939
protected override double WattsInOneWatt => 1;
4040

41-
protected override double KilobritishThermalUnitsPerHourInOneWatt => 3.412141633e-3;
42-
4341
protected override double KilowattsInOneWatt => 1e-3;
4442

4543
protected override double MegawattsInOneWatt => 1e-6;
@@ -51,7 +49,6 @@ public class PowerTests : PowerTestsBase
5149
protected override double PetawattsInOneWatt => 1e-15;
5250

5351
protected override double BoilerHorsepowerInOneWatt => 1.0191082802547770700636942675159e-4;
54-
protected override double BritishThermalUnitsPerHourInOneWatt => 3.412141633;
5552

5653
protected override double ElectricalHorsepowerInOneWatt => 0.00134048257372654155495978552279;
5754

‎UnitsNet.Tests/CustomCode/VolumeTests.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,24 +48,14 @@ public class VolumeTests : VolumeTestsBase
4848
protected override double CubicYardsInOneCubicMeter => 1.30795062;
4949

5050
protected override double DecilitersInOneCubicMeter => 1E4;
51-
protected override double HectocubicFeetInOneCubicMeter => 3.531472e-1;
52-
protected override double HectocubicMetersInOneCubicMeter => 0.01;
5351

5452
protected override double HectolitersInOneCubicMeter => 1E1;
5553

5654
protected override double ImperialGallonsInOneCubicMeter => 219.96924;
5755

5856
protected override double ImperialOuncesInOneCubicMeter => 35195.07972;
5957

60-
protected override double KilocubicFeetInOneCubicMeter => 3.531472e-2;
61-
protected override double KilocubicMetersInOneCubicMeter => 0.001;
62-
protected override double KiloimperialGallonsInOneCubicMeter => 2.1996924e-1;
63-
protected override double KilousGallonsInOneCubicMeter => 2.6417217e-1;
64-
6558
protected override double LitersInOneCubicMeter => 1E3;
66-
protected override double MegacubicFeetInOneCubicMeter => 3.531472e-5;
67-
protected override double MegaimperialGallonsInOneCubicMeter => 2.1996924e-4;
68-
protected override double MegausGallonsInOneCubicMeter => 2.6417217e-4;
6959

7060
protected override double MicrolitersInOneCubicMeter => 1E9;
7161

‎UnitsNet.Tests/GeneratedCode/EnergyTestsBase.g.cs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,11 @@ public abstract partial class EnergyTestsBase
6060
protected abstract double ElectronVoltsInOneJoule { get; }
6161
protected abstract double ErgsInOneJoule { get; }
6262
protected abstract double FootPoundsInOneJoule { get; }
63-
protected abstract double GigabritishThermalUnitsInOneJoule { get; }
6463
protected abstract double GigawattHoursInOneJoule { get; }
6564
protected abstract double JoulesInOneJoule { get; }
66-
protected abstract double KilobritishThermalUnitsInOneJoule { get; }
6765
protected abstract double KilocaloriesInOneJoule { get; }
6866
protected abstract double KilojoulesInOneJoule { get; }
6967
protected abstract double KilowattHoursInOneJoule { get; }
70-
protected abstract double MegabritishThermalUnitsInOneJoule { get; }
7168
protected abstract double MegajoulesInOneJoule { get; }
7269
protected abstract double MegawattHoursInOneJoule { get; }
7370
protected abstract double ThermsEcInOneJoule { get; }
@@ -84,14 +81,11 @@ public abstract partial class EnergyTestsBase
8481
protected virtual double ElectronVoltsTolerance { get { return 1e-5; } }
8582
protected virtual double ErgsTolerance { get { return 1e-5; } }
8683
protected virtual double FootPoundsTolerance { get { return 1e-5; } }
87-
protected virtual double GigabritishThermalUnitsTolerance { get { return 1e-5; } }
8884
protected virtual double GigawattHoursTolerance { get { return 1e-5; } }
8985
protected virtual double JoulesTolerance { get { return 1e-5; } }
90-
protected virtual double KilobritishThermalUnitsTolerance { get { return 1e-5; } }
9186
protected virtual double KilocaloriesTolerance { get { return 1e-5; } }
9287
protected virtual double KilojoulesTolerance { get { return 1e-5; } }
9388
protected virtual double KilowattHoursTolerance { get { return 1e-5; } }
94-
protected virtual double MegabritishThermalUnitsTolerance { get { return 1e-5; } }
9589
protected virtual double MegajoulesTolerance { get { return 1e-5; } }
9690
protected virtual double MegawattHoursTolerance { get { return 1e-5; } }
9791
protected virtual double ThermsEcTolerance { get { return 1e-5; } }
@@ -112,14 +106,11 @@ public void JouleToEnergyUnits()
112106
AssertEx.EqualTolerance(ElectronVoltsInOneJoule, joule.ElectronVolts, ElectronVoltsTolerance);
113107
AssertEx.EqualTolerance(ErgsInOneJoule, joule.Ergs, ErgsTolerance);
114108
AssertEx.EqualTolerance(FootPoundsInOneJoule, joule.FootPounds, FootPoundsTolerance);
115-
AssertEx.EqualTolerance(GigabritishThermalUnitsInOneJoule, joule.GigabritishThermalUnits, GigabritishThermalUnitsTolerance);
116109
AssertEx.EqualTolerance(GigawattHoursInOneJoule, joule.GigawattHours, GigawattHoursTolerance);
117110
AssertEx.EqualTolerance(JoulesInOneJoule, joule.Joules, JoulesTolerance);
118-
AssertEx.EqualTolerance(KilobritishThermalUnitsInOneJoule, joule.KilobritishThermalUnits, KilobritishThermalUnitsTolerance);
119111
AssertEx.EqualTolerance(KilocaloriesInOneJoule, joule.Kilocalories, KilocaloriesTolerance);
120112
AssertEx.EqualTolerance(KilojoulesInOneJoule, joule.Kilojoules, KilojoulesTolerance);
121113
AssertEx.EqualTolerance(KilowattHoursInOneJoule, joule.KilowattHours, KilowattHoursTolerance);
122-
AssertEx.EqualTolerance(MegabritishThermalUnitsInOneJoule, joule.MegabritishThermalUnits, MegabritishThermalUnitsTolerance);
123114
AssertEx.EqualTolerance(MegajoulesInOneJoule, joule.Megajoules, MegajoulesTolerance);
124115
AssertEx.EqualTolerance(MegawattHoursInOneJoule, joule.MegawattHours, MegawattHoursTolerance);
125116
AssertEx.EqualTolerance(ThermsEcInOneJoule, joule.ThermsEc, ThermsEcTolerance);
@@ -139,14 +130,11 @@ public void FromValueAndUnit()
139130
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.ElectronVolt).ElectronVolts, ElectronVoltsTolerance);
140131
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.Erg).Ergs, ErgsTolerance);
141132
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.FootPound).FootPounds, FootPoundsTolerance);
142-
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.GigabritishThermalUnit).GigabritishThermalUnits, GigabritishThermalUnitsTolerance);
143133
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.GigawattHour).GigawattHours, GigawattHoursTolerance);
144134
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.Joule).Joules, JoulesTolerance);
145-
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.KilobritishThermalUnit).KilobritishThermalUnits, KilobritishThermalUnitsTolerance);
146135
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.Kilocalorie).Kilocalories, KilocaloriesTolerance);
147136
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.Kilojoule).Kilojoules, KilojoulesTolerance);
148137
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.KilowattHour).KilowattHours, KilowattHoursTolerance);
149-
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.MegabritishThermalUnit).MegabritishThermalUnits, MegabritishThermalUnitsTolerance);
150138
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.Megajoule).Megajoules, MegajoulesTolerance);
151139
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.MegawattHour).MegawattHours, MegawattHoursTolerance);
152140
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.ThermEc).ThermsEc, ThermsEcTolerance);
@@ -167,14 +155,11 @@ public void As()
167155
AssertEx.EqualTolerance(ElectronVoltsInOneJoule, joule.As(EnergyUnit.ElectronVolt), ElectronVoltsTolerance);
168156
AssertEx.EqualTolerance(ErgsInOneJoule, joule.As(EnergyUnit.Erg), ErgsTolerance);
169157
AssertEx.EqualTolerance(FootPoundsInOneJoule, joule.As(EnergyUnit.FootPound), FootPoundsTolerance);
170-
AssertEx.EqualTolerance(GigabritishThermalUnitsInOneJoule, joule.As(EnergyUnit.GigabritishThermalUnit), GigabritishThermalUnitsTolerance);
171158
AssertEx.EqualTolerance(GigawattHoursInOneJoule, joule.As(EnergyUnit.GigawattHour), GigawattHoursTolerance);
172159
AssertEx.EqualTolerance(JoulesInOneJoule, joule.As(EnergyUnit.Joule), JoulesTolerance);
173-
AssertEx.EqualTolerance(KilobritishThermalUnitsInOneJoule, joule.As(EnergyUnit.KilobritishThermalUnit), KilobritishThermalUnitsTolerance);
174160
AssertEx.EqualTolerance(KilocaloriesInOneJoule, joule.As(EnergyUnit.Kilocalorie), KilocaloriesTolerance);
175161
AssertEx.EqualTolerance(KilojoulesInOneJoule, joule.As(EnergyUnit.Kilojoule), KilojoulesTolerance);
176162
AssertEx.EqualTolerance(KilowattHoursInOneJoule, joule.As(EnergyUnit.KilowattHour), KilowattHoursTolerance);
177-
AssertEx.EqualTolerance(MegabritishThermalUnitsInOneJoule, joule.As(EnergyUnit.MegabritishThermalUnit), MegabritishThermalUnitsTolerance);
178163
AssertEx.EqualTolerance(MegajoulesInOneJoule, joule.As(EnergyUnit.Megajoule), MegajoulesTolerance);
179164
AssertEx.EqualTolerance(MegawattHoursInOneJoule, joule.As(EnergyUnit.MegawattHour), MegawattHoursTolerance);
180165
AssertEx.EqualTolerance(ThermsEcInOneJoule, joule.As(EnergyUnit.ThermEc), ThermsEcTolerance);
@@ -195,14 +180,11 @@ public void ConversionRoundTrip()
195180
AssertEx.EqualTolerance(1, Energy.FromElectronVolts(joule.ElectronVolts).Joules, ElectronVoltsTolerance);
196181
AssertEx.EqualTolerance(1, Energy.FromErgs(joule.Ergs).Joules, ErgsTolerance);
197182
AssertEx.EqualTolerance(1, Energy.FromFootPounds(joule.FootPounds).Joules, FootPoundsTolerance);
198-
AssertEx.EqualTolerance(1, Energy.FromGigabritishThermalUnits(joule.GigabritishThermalUnits).Joules, GigabritishThermalUnitsTolerance);
199183
AssertEx.EqualTolerance(1, Energy.FromGigawattHours(joule.GigawattHours).Joules, GigawattHoursTolerance);
200184
AssertEx.EqualTolerance(1, Energy.FromJoules(joule.Joules).Joules, JoulesTolerance);
201-
AssertEx.EqualTolerance(1, Energy.FromKilobritishThermalUnits(joule.KilobritishThermalUnits).Joules, KilobritishThermalUnitsTolerance);
202185
AssertEx.EqualTolerance(1, Energy.FromKilocalories(joule.Kilocalories).Joules, KilocaloriesTolerance);
203186
AssertEx.EqualTolerance(1, Energy.FromKilojoules(joule.Kilojoules).Joules, KilojoulesTolerance);
204187
AssertEx.EqualTolerance(1, Energy.FromKilowattHours(joule.KilowattHours).Joules, KilowattHoursTolerance);
205-
AssertEx.EqualTolerance(1, Energy.FromMegabritishThermalUnits(joule.MegabritishThermalUnits).Joules, MegabritishThermalUnitsTolerance);
206188
AssertEx.EqualTolerance(1, Energy.FromMegajoules(joule.Megajoules).Joules, MegajoulesTolerance);
207189
AssertEx.EqualTolerance(1, Energy.FromMegawattHours(joule.MegawattHours).Joules, MegawattHoursTolerance);
208190
AssertEx.EqualTolerance(1, Energy.FromThermsEc(joule.ThermsEc).Joules, ThermsEcTolerance);

‎UnitsNet.Tests/GeneratedCode/FlowTestsBase.g.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public abstract partial class FlowTestsBase
5454
{
5555
protected abstract double CentilitersPerMinuteInOneCubicMeterPerSecond { get; }
5656
protected abstract double CubicDecimetersPerMinuteInOneCubicMeterPerSecond { get; }
57-
protected abstract double CubicFeetPerHourInOneCubicMeterPerSecond { get; }
5857
protected abstract double CubicFeetPerSecondInOneCubicMeterPerSecond { get; }
5958
protected abstract double CubicMetersPerHourInOneCubicMeterPerSecond { get; }
6059
protected abstract double CubicMetersPerSecondInOneCubicMeterPerSecond { get; }
@@ -73,7 +72,6 @@ public abstract partial class FlowTestsBase
7372
// ReSharper disable VirtualMemberNeverOverriden.Global
7473
protected virtual double CentilitersPerMinuteTolerance { get { return 1e-5; } }
7574
protected virtual double CubicDecimetersPerMinuteTolerance { get { return 1e-5; } }
76-
protected virtual double CubicFeetPerHourTolerance { get { return 1e-5; } }
7775
protected virtual double CubicFeetPerSecondTolerance { get { return 1e-5; } }
7876
protected virtual double CubicMetersPerHourTolerance { get { return 1e-5; } }
7977
protected virtual double CubicMetersPerSecondTolerance { get { return 1e-5; } }
@@ -96,7 +94,6 @@ public void CubicMeterPerSecondToFlowUnits()
9694
Flow cubicmeterpersecond = Flow.FromCubicMetersPerSecond(1);
9795
AssertEx.EqualTolerance(CentilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.CentilitersPerMinute, CentilitersPerMinuteTolerance);
9896
AssertEx.EqualTolerance(CubicDecimetersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.CubicDecimetersPerMinute, CubicDecimetersPerMinuteTolerance);
99-
AssertEx.EqualTolerance(CubicFeetPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.CubicFeetPerHour, CubicFeetPerHourTolerance);
10097
AssertEx.EqualTolerance(CubicFeetPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.CubicFeetPerSecond, CubicFeetPerSecondTolerance);
10198
AssertEx.EqualTolerance(CubicMetersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.CubicMetersPerHour, CubicMetersPerHourTolerance);
10299
AssertEx.EqualTolerance(CubicMetersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.CubicMetersPerSecond, CubicMetersPerSecondTolerance);
@@ -118,7 +115,6 @@ public void FromValueAndUnit()
118115
{
119116
AssertEx.EqualTolerance(1, Flow.From(1, FlowUnit.CentilitersPerMinute).CentilitersPerMinute, CentilitersPerMinuteTolerance);
120117
AssertEx.EqualTolerance(1, Flow.From(1, FlowUnit.CubicDecimeterPerMinute).CubicDecimetersPerMinute, CubicDecimetersPerMinuteTolerance);
121-
AssertEx.EqualTolerance(1, Flow.From(1, FlowUnit.CubicFootPerHour).CubicFeetPerHour, CubicFeetPerHourTolerance);
122118
AssertEx.EqualTolerance(1, Flow.From(1, FlowUnit.CubicFootPerSecond).CubicFeetPerSecond, CubicFeetPerSecondTolerance);
123119
AssertEx.EqualTolerance(1, Flow.From(1, FlowUnit.CubicMeterPerHour).CubicMetersPerHour, CubicMetersPerHourTolerance);
124120
AssertEx.EqualTolerance(1, Flow.From(1, FlowUnit.CubicMeterPerSecond).CubicMetersPerSecond, CubicMetersPerSecondTolerance);
@@ -141,7 +137,6 @@ public void As()
141137
var cubicmeterpersecond = Flow.FromCubicMetersPerSecond(1);
142138
AssertEx.EqualTolerance(CentilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CentilitersPerMinute), CentilitersPerMinuteTolerance);
143139
AssertEx.EqualTolerance(CubicDecimetersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicDecimeterPerMinute), CubicDecimetersPerMinuteTolerance);
144-
AssertEx.EqualTolerance(CubicFeetPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicFootPerHour), CubicFeetPerHourTolerance);
145140
AssertEx.EqualTolerance(CubicFeetPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicFootPerSecond), CubicFeetPerSecondTolerance);
146141
AssertEx.EqualTolerance(CubicMetersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicMeterPerHour), CubicMetersPerHourTolerance);
147142
AssertEx.EqualTolerance(CubicMetersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicMeterPerSecond), CubicMetersPerSecondTolerance);
@@ -164,7 +159,6 @@ public void ConversionRoundTrip()
164159
Flow cubicmeterpersecond = Flow.FromCubicMetersPerSecond(1);
165160
AssertEx.EqualTolerance(1, Flow.FromCentilitersPerMinute(cubicmeterpersecond.CentilitersPerMinute).CubicMetersPerSecond, CentilitersPerMinuteTolerance);
166161
AssertEx.EqualTolerance(1, Flow.FromCubicDecimetersPerMinute(cubicmeterpersecond.CubicDecimetersPerMinute).CubicMetersPerSecond, CubicDecimetersPerMinuteTolerance);
167-
AssertEx.EqualTolerance(1, Flow.FromCubicFeetPerHour(cubicmeterpersecond.CubicFeetPerHour).CubicMetersPerSecond, CubicFeetPerHourTolerance);
168162
AssertEx.EqualTolerance(1, Flow.FromCubicFeetPerSecond(cubicmeterpersecond.CubicFeetPerSecond).CubicMetersPerSecond, CubicFeetPerSecondTolerance);
169163
AssertEx.EqualTolerance(1, Flow.FromCubicMetersPerHour(cubicmeterpersecond.CubicMetersPerHour).CubicMetersPerSecond, CubicMetersPerHourTolerance);
170164
AssertEx.EqualTolerance(1, Flow.FromCubicMetersPerSecond(cubicmeterpersecond.CubicMetersPerSecond).CubicMetersPerSecond, CubicMetersPerSecondTolerance);

0 commit comments

Comments
 (0)