Skip to content

Commit b99444a

Browse files
Dmitriy Inozemtseveriove
Dmitriy Inozemtsev
authored and
eriove
committed
Add improved name scheme
1 parent 12b57d8 commit b99444a

File tree

7 files changed

+375
-369
lines changed

7 files changed

+375
-369
lines changed

‎UnitsNet.Tests/CustomCode/EnergyTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace UnitsNet.Tests.CustomCode
2424
public class EnergyTests : EnergyTestsBase
2525
{
2626
// TODO Override properties in base class here
27-
protected override double ImperialThermsInOneJoule => 9.478171203551087813109937767482e-15;
27+
protected override double ThermsImperialInOneJoule => 9.478171203551087813109937767482e-15;
2828

2929
protected override double JoulesInOneJoule => 1;
3030

@@ -36,17 +36,17 @@ public class EnergyTests : EnergyTestsBase
3636

3737
protected override double CaloriesInOneJoule => 0.239005736;
3838

39-
protected override double DecaeuThermsInOneJoule => 9.4781339449889105832843629746176e-10;
39+
protected override double DecathermsEcInOneJoule => 9.47816988e-10;
4040

41-
protected override double DecaimperialThermsInOneJoule => 9.478171203551087813109937767482e-15;
41+
protected override double DecathermsImperialInOneJoule => 9.478171203551087813109937767482e-15;
4242

43-
protected override double DecausThermsInOneJoule => 9.4804342797334860315281322406817e-10;
43+
protected override double DecathermsUsInOneJoule => 9.4804342797334860315281322406817e-10;
4444

4545
protected override double ElectronVoltsInOneJoule => 6.241509343260179e18;
4646

4747
protected override double ErgsInOneJoule => 10000000;
4848

49-
protected override double EuThermsInOneJoule => 9.4781339449889105832843629746176e-9;
49+
protected override double ThermsEcInOneJoule => 9.47816988e-9;
5050

5151
protected override double FootPoundsInOneJoule => 0.737562149;
5252

@@ -58,7 +58,7 @@ public class EnergyTests : EnergyTestsBase
5858

5959
protected override double MegawattHoursInOneJoule => 2.77777778e-10;
6060

61-
protected override double UsThermsInOneJoule => 9.4804342797334860315281322406817e-9;
61+
protected override double ThermsUsInOneJoule => 9.4804342797334860315281322406817e-9;
6262

6363
protected override double WattHoursInOneJoule => 0.000277777778;
6464
}

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

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -54,43 +54,43 @@ public abstract partial class EnergyTestsBase
5454
{
5555
protected abstract double BritishThermalUnitsInOneJoule { get; }
5656
protected abstract double CaloriesInOneJoule { get; }
57-
protected abstract double DecaeuThermsInOneJoule { get; }
58-
protected abstract double DecaimperialThermsInOneJoule { get; }
59-
protected abstract double DecausThermsInOneJoule { get; }
57+
protected abstract double DecathermsEcInOneJoule { get; }
58+
protected abstract double DecathermsImperialInOneJoule { get; }
59+
protected abstract double DecathermsUsInOneJoule { get; }
6060
protected abstract double ElectronVoltsInOneJoule { get; }
6161
protected abstract double ErgsInOneJoule { get; }
62-
protected abstract double EuThermsInOneJoule { get; }
6362
protected abstract double FootPoundsInOneJoule { get; }
6463
protected abstract double GigawattHoursInOneJoule { get; }
65-
protected abstract double ImperialThermsInOneJoule { get; }
6664
protected abstract double JoulesInOneJoule { get; }
6765
protected abstract double KilocaloriesInOneJoule { get; }
6866
protected abstract double KilojoulesInOneJoule { get; }
6967
protected abstract double KilowattHoursInOneJoule { get; }
7068
protected abstract double MegajoulesInOneJoule { get; }
7169
protected abstract double MegawattHoursInOneJoule { get; }
72-
protected abstract double UsThermsInOneJoule { get; }
70+
protected abstract double ThermsEcInOneJoule { get; }
71+
protected abstract double ThermsImperialInOneJoule { get; }
72+
protected abstract double ThermsUsInOneJoule { get; }
7373
protected abstract double WattHoursInOneJoule { get; }
7474

7575
// ReSharper disable VirtualMemberNeverOverriden.Global
7676
protected virtual double BritishThermalUnitsTolerance { get { return 1e-5; } }
7777
protected virtual double CaloriesTolerance { get { return 1e-5; } }
78-
protected virtual double DecaeuThermsTolerance { get { return 1e-5; } }
79-
protected virtual double DecaimperialThermsTolerance { get { return 1e-5; } }
80-
protected virtual double DecausThermsTolerance { get { return 1e-5; } }
78+
protected virtual double DecathermsEcTolerance { get { return 1e-5; } }
79+
protected virtual double DecathermsImperialTolerance { get { return 1e-5; } }
80+
protected virtual double DecathermsUsTolerance { get { return 1e-5; } }
8181
protected virtual double ElectronVoltsTolerance { get { return 1e-5; } }
8282
protected virtual double ErgsTolerance { get { return 1e-5; } }
83-
protected virtual double EuThermsTolerance { get { return 1e-5; } }
8483
protected virtual double FootPoundsTolerance { get { return 1e-5; } }
8584
protected virtual double GigawattHoursTolerance { get { return 1e-5; } }
86-
protected virtual double ImperialThermsTolerance { get { return 1e-5; } }
8785
protected virtual double JoulesTolerance { get { return 1e-5; } }
8886
protected virtual double KilocaloriesTolerance { get { return 1e-5; } }
8987
protected virtual double KilojoulesTolerance { get { return 1e-5; } }
9088
protected virtual double KilowattHoursTolerance { get { return 1e-5; } }
9189
protected virtual double MegajoulesTolerance { get { return 1e-5; } }
9290
protected virtual double MegawattHoursTolerance { get { return 1e-5; } }
93-
protected virtual double UsThermsTolerance { get { return 1e-5; } }
91+
protected virtual double ThermsEcTolerance { get { return 1e-5; } }
92+
protected virtual double ThermsImperialTolerance { get { return 1e-5; } }
93+
protected virtual double ThermsUsTolerance { get { return 1e-5; } }
9494
protected virtual double WattHoursTolerance { get { return 1e-5; } }
9595
// ReSharper restore VirtualMemberNeverOverriden.Global
9696

@@ -100,22 +100,22 @@ public void JouleToEnergyUnits()
100100
Energy joule = Energy.FromJoules(1);
101101
AssertEx.EqualTolerance(BritishThermalUnitsInOneJoule, joule.BritishThermalUnits, BritishThermalUnitsTolerance);
102102
AssertEx.EqualTolerance(CaloriesInOneJoule, joule.Calories, CaloriesTolerance);
103-
AssertEx.EqualTolerance(DecaeuThermsInOneJoule, joule.DecaeuTherms, DecaeuThermsTolerance);
104-
AssertEx.EqualTolerance(DecaimperialThermsInOneJoule, joule.DecaimperialTherms, DecaimperialThermsTolerance);
105-
AssertEx.EqualTolerance(DecausThermsInOneJoule, joule.DecausTherms, DecausThermsTolerance);
103+
AssertEx.EqualTolerance(DecathermsEcInOneJoule, joule.DecathermsEc, DecathermsEcTolerance);
104+
AssertEx.EqualTolerance(DecathermsImperialInOneJoule, joule.DecathermsImperial, DecathermsImperialTolerance);
105+
AssertEx.EqualTolerance(DecathermsUsInOneJoule, joule.DecathermsUs, DecathermsUsTolerance);
106106
AssertEx.EqualTolerance(ElectronVoltsInOneJoule, joule.ElectronVolts, ElectronVoltsTolerance);
107107
AssertEx.EqualTolerance(ErgsInOneJoule, joule.Ergs, ErgsTolerance);
108-
AssertEx.EqualTolerance(EuThermsInOneJoule, joule.EuTherms, EuThermsTolerance);
109108
AssertEx.EqualTolerance(FootPoundsInOneJoule, joule.FootPounds, FootPoundsTolerance);
110109
AssertEx.EqualTolerance(GigawattHoursInOneJoule, joule.GigawattHours, GigawattHoursTolerance);
111-
AssertEx.EqualTolerance(ImperialThermsInOneJoule, joule.ImperialTherms, ImperialThermsTolerance);
112110
AssertEx.EqualTolerance(JoulesInOneJoule, joule.Joules, JoulesTolerance);
113111
AssertEx.EqualTolerance(KilocaloriesInOneJoule, joule.Kilocalories, KilocaloriesTolerance);
114112
AssertEx.EqualTolerance(KilojoulesInOneJoule, joule.Kilojoules, KilojoulesTolerance);
115113
AssertEx.EqualTolerance(KilowattHoursInOneJoule, joule.KilowattHours, KilowattHoursTolerance);
116114
AssertEx.EqualTolerance(MegajoulesInOneJoule, joule.Megajoules, MegajoulesTolerance);
117115
AssertEx.EqualTolerance(MegawattHoursInOneJoule, joule.MegawattHours, MegawattHoursTolerance);
118-
AssertEx.EqualTolerance(UsThermsInOneJoule, joule.UsTherms, UsThermsTolerance);
116+
AssertEx.EqualTolerance(ThermsEcInOneJoule, joule.ThermsEc, ThermsEcTolerance);
117+
AssertEx.EqualTolerance(ThermsImperialInOneJoule, joule.ThermsImperial, ThermsImperialTolerance);
118+
AssertEx.EqualTolerance(ThermsUsInOneJoule, joule.ThermsUs, ThermsUsTolerance);
119119
AssertEx.EqualTolerance(WattHoursInOneJoule, joule.WattHours, WattHoursTolerance);
120120
}
121121

@@ -124,22 +124,22 @@ public void FromValueAndUnit()
124124
{
125125
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.BritishThermalUnit).BritishThermalUnits, BritishThermalUnitsTolerance);
126126
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.Calorie).Calories, CaloriesTolerance);
127-
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.DecaeuTherm).DecaeuTherms, DecaeuThermsTolerance);
128-
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.DecaimperialTherm).DecaimperialTherms, DecaimperialThermsTolerance);
129-
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.DecausTherm).DecausTherms, DecausThermsTolerance);
127+
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.DecathermEc).DecathermsEc, DecathermsEcTolerance);
128+
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.DecathermImperial).DecathermsImperial, DecathermsImperialTolerance);
129+
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.DecathermUs).DecathermsUs, DecathermsUsTolerance);
130130
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.ElectronVolt).ElectronVolts, ElectronVoltsTolerance);
131131
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.Erg).Ergs, ErgsTolerance);
132-
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.EuTherm).EuTherms, EuThermsTolerance);
133132
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.FootPound).FootPounds, FootPoundsTolerance);
134133
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.GigawattHour).GigawattHours, GigawattHoursTolerance);
135-
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.ImperialTherm).ImperialTherms, ImperialThermsTolerance);
136134
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.Joule).Joules, JoulesTolerance);
137135
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.Kilocalorie).Kilocalories, KilocaloriesTolerance);
138136
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.Kilojoule).Kilojoules, KilojoulesTolerance);
139137
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.KilowattHour).KilowattHours, KilowattHoursTolerance);
140138
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.Megajoule).Megajoules, MegajoulesTolerance);
141139
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.MegawattHour).MegawattHours, MegawattHoursTolerance);
142-
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.UsTherm).UsTherms, UsThermsTolerance);
140+
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.ThermEc).ThermsEc, ThermsEcTolerance);
141+
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.ThermImperial).ThermsImperial, ThermsImperialTolerance);
142+
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.ThermUs).ThermsUs, ThermsUsTolerance);
143143
AssertEx.EqualTolerance(1, Energy.From(1, EnergyUnit.WattHour).WattHours, WattHoursTolerance);
144144
}
145145

@@ -149,22 +149,22 @@ public void As()
149149
var joule = Energy.FromJoules(1);
150150
AssertEx.EqualTolerance(BritishThermalUnitsInOneJoule, joule.As(EnergyUnit.BritishThermalUnit), BritishThermalUnitsTolerance);
151151
AssertEx.EqualTolerance(CaloriesInOneJoule, joule.As(EnergyUnit.Calorie), CaloriesTolerance);
152-
AssertEx.EqualTolerance(DecaeuThermsInOneJoule, joule.As(EnergyUnit.DecaeuTherm), DecaeuThermsTolerance);
153-
AssertEx.EqualTolerance(DecaimperialThermsInOneJoule, joule.As(EnergyUnit.DecaimperialTherm), DecaimperialThermsTolerance);
154-
AssertEx.EqualTolerance(DecausThermsInOneJoule, joule.As(EnergyUnit.DecausTherm), DecausThermsTolerance);
152+
AssertEx.EqualTolerance(DecathermsEcInOneJoule, joule.As(EnergyUnit.DecathermEc), DecathermsEcTolerance);
153+
AssertEx.EqualTolerance(DecathermsImperialInOneJoule, joule.As(EnergyUnit.DecathermImperial), DecathermsImperialTolerance);
154+
AssertEx.EqualTolerance(DecathermsUsInOneJoule, joule.As(EnergyUnit.DecathermUs), DecathermsUsTolerance);
155155
AssertEx.EqualTolerance(ElectronVoltsInOneJoule, joule.As(EnergyUnit.ElectronVolt), ElectronVoltsTolerance);
156156
AssertEx.EqualTolerance(ErgsInOneJoule, joule.As(EnergyUnit.Erg), ErgsTolerance);
157-
AssertEx.EqualTolerance(EuThermsInOneJoule, joule.As(EnergyUnit.EuTherm), EuThermsTolerance);
158157
AssertEx.EqualTolerance(FootPoundsInOneJoule, joule.As(EnergyUnit.FootPound), FootPoundsTolerance);
159158
AssertEx.EqualTolerance(GigawattHoursInOneJoule, joule.As(EnergyUnit.GigawattHour), GigawattHoursTolerance);
160-
AssertEx.EqualTolerance(ImperialThermsInOneJoule, joule.As(EnergyUnit.ImperialTherm), ImperialThermsTolerance);
161159
AssertEx.EqualTolerance(JoulesInOneJoule, joule.As(EnergyUnit.Joule), JoulesTolerance);
162160
AssertEx.EqualTolerance(KilocaloriesInOneJoule, joule.As(EnergyUnit.Kilocalorie), KilocaloriesTolerance);
163161
AssertEx.EqualTolerance(KilojoulesInOneJoule, joule.As(EnergyUnit.Kilojoule), KilojoulesTolerance);
164162
AssertEx.EqualTolerance(KilowattHoursInOneJoule, joule.As(EnergyUnit.KilowattHour), KilowattHoursTolerance);
165163
AssertEx.EqualTolerance(MegajoulesInOneJoule, joule.As(EnergyUnit.Megajoule), MegajoulesTolerance);
166164
AssertEx.EqualTolerance(MegawattHoursInOneJoule, joule.As(EnergyUnit.MegawattHour), MegawattHoursTolerance);
167-
AssertEx.EqualTolerance(UsThermsInOneJoule, joule.As(EnergyUnit.UsTherm), UsThermsTolerance);
165+
AssertEx.EqualTolerance(ThermsEcInOneJoule, joule.As(EnergyUnit.ThermEc), ThermsEcTolerance);
166+
AssertEx.EqualTolerance(ThermsImperialInOneJoule, joule.As(EnergyUnit.ThermImperial), ThermsImperialTolerance);
167+
AssertEx.EqualTolerance(ThermsUsInOneJoule, joule.As(EnergyUnit.ThermUs), ThermsUsTolerance);
168168
AssertEx.EqualTolerance(WattHoursInOneJoule, joule.As(EnergyUnit.WattHour), WattHoursTolerance);
169169
}
170170

@@ -174,22 +174,22 @@ public void ConversionRoundTrip()
174174
Energy joule = Energy.FromJoules(1);
175175
AssertEx.EqualTolerance(1, Energy.FromBritishThermalUnits(joule.BritishThermalUnits).Joules, BritishThermalUnitsTolerance);
176176
AssertEx.EqualTolerance(1, Energy.FromCalories(joule.Calories).Joules, CaloriesTolerance);
177-
AssertEx.EqualTolerance(1, Energy.FromDecaeuTherms(joule.DecaeuTherms).Joules, DecaeuThermsTolerance);
178-
AssertEx.EqualTolerance(1, Energy.FromDecaimperialTherms(joule.DecaimperialTherms).Joules, DecaimperialThermsTolerance);
179-
AssertEx.EqualTolerance(1, Energy.FromDecausTherms(joule.DecausTherms).Joules, DecausThermsTolerance);
177+
AssertEx.EqualTolerance(1, Energy.FromDecathermsEc(joule.DecathermsEc).Joules, DecathermsEcTolerance);
178+
AssertEx.EqualTolerance(1, Energy.FromDecathermsImperial(joule.DecathermsImperial).Joules, DecathermsImperialTolerance);
179+
AssertEx.EqualTolerance(1, Energy.FromDecathermsUs(joule.DecathermsUs).Joules, DecathermsUsTolerance);
180180
AssertEx.EqualTolerance(1, Energy.FromElectronVolts(joule.ElectronVolts).Joules, ElectronVoltsTolerance);
181181
AssertEx.EqualTolerance(1, Energy.FromErgs(joule.Ergs).Joules, ErgsTolerance);
182-
AssertEx.EqualTolerance(1, Energy.FromEuTherms(joule.EuTherms).Joules, EuThermsTolerance);
183182
AssertEx.EqualTolerance(1, Energy.FromFootPounds(joule.FootPounds).Joules, FootPoundsTolerance);
184183
AssertEx.EqualTolerance(1, Energy.FromGigawattHours(joule.GigawattHours).Joules, GigawattHoursTolerance);
185-
AssertEx.EqualTolerance(1, Energy.FromImperialTherms(joule.ImperialTherms).Joules, ImperialThermsTolerance);
186184
AssertEx.EqualTolerance(1, Energy.FromJoules(joule.Joules).Joules, JoulesTolerance);
187185
AssertEx.EqualTolerance(1, Energy.FromKilocalories(joule.Kilocalories).Joules, KilocaloriesTolerance);
188186
AssertEx.EqualTolerance(1, Energy.FromKilojoules(joule.Kilojoules).Joules, KilojoulesTolerance);
189187
AssertEx.EqualTolerance(1, Energy.FromKilowattHours(joule.KilowattHours).Joules, KilowattHoursTolerance);
190188
AssertEx.EqualTolerance(1, Energy.FromMegajoules(joule.Megajoules).Joules, MegajoulesTolerance);
191189
AssertEx.EqualTolerance(1, Energy.FromMegawattHours(joule.MegawattHours).Joules, MegawattHoursTolerance);
192-
AssertEx.EqualTolerance(1, Energy.FromUsTherms(joule.UsTherms).Joules, UsThermsTolerance);
190+
AssertEx.EqualTolerance(1, Energy.FromThermsEc(joule.ThermsEc).Joules, ThermsEcTolerance);
191+
AssertEx.EqualTolerance(1, Energy.FromThermsImperial(joule.ThermsImperial).Joules, ThermsImperialTolerance);
192+
AssertEx.EqualTolerance(1, Energy.FromThermsUs(joule.ThermsUs).Joules, ThermsUsTolerance);
193193
AssertEx.EqualTolerance(1, Energy.FromWattHours(joule.WattHours).Joules, WattHoursTolerance);
194194
}
195195

‎UnitsNet/GeneratedCode/Enums/EnergyUnit.g.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,22 @@ public enum EnergyUnit
4444
Undefined = 0,
4545
BritishThermalUnit,
4646
Calorie,
47-
DecaeuTherm,
48-
DecaimperialTherm,
49-
DecausTherm,
47+
DecathermEc,
48+
DecathermImperial,
49+
DecathermUs,
5050
ElectronVolt,
5151
Erg,
52-
EuTherm,
5352
FootPound,
5453
GigawattHour,
55-
ImperialTherm,
5654
Joule,
5755
Kilocalorie,
5856
Kilojoule,
5957
KilowattHour,
6058
Megajoule,
6159
MegawattHour,
62-
UsTherm,
60+
ThermEc,
61+
ThermImperial,
62+
ThermUs,
6363
WattHour,
6464
}
6565
}

0 commit comments

Comments
 (0)