Skip to content

Commit 90d5f93

Browse files
Ferit Tunçerangularsen
Ferit Tunçer
authored and
angularsen
committed
Fix LapseRate Units (#321)
1 parent c94c1d2 commit 90d5f93

File tree

7 files changed

+139
-299
lines changed

7 files changed

+139
-299
lines changed

‎UnitsNet.Tests/CustomCode/LapseRateTests.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// </auto-generated>
1919
//------------------------------------------------------------------------------
2020

21-
// Copyright (c) 2007 Andreas Gullberg Larsen (angularsen@gmail.com).
21+
// Copyright (c) 2007 Andreas Gullberg Larsen (andreas.larsen84@gmail.com).
2222
// https://github.com/angularsen/UnitsNet
2323
//
2424
// Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -46,7 +46,6 @@ namespace UnitsNet.Tests.CustomCode
4646
{
4747
public class LapseRateTests : LapseRateTestsBase
4848
{
49-
protected override double DegreesCelciusPerMeterInOneDegreeCelsiusPerMeter => 1e0;
50-
protected override double KilodegreesCelciusPerMeterInOneDegreeCelsiusPerMeter => 1e-3;
49+
protected override double DegreesCelciusPerKilometerInOneDegreeCelsiusPerKilometer => 1e0;
5150
}
5251
}

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

Lines changed: 46 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -52,104 +52,98 @@ namespace UnitsNet.Tests
5252
// ReSharper disable once PartialTypeWithSinglePart
5353
public abstract partial class LapseRateTestsBase
5454
{
55-
protected abstract double DegreesCelciusPerMeterInOneDegreeCelsiusPerMeter { get; }
56-
protected abstract double KilodegreesCelciusPerMeterInOneDegreeCelsiusPerMeter { get; }
55+
protected abstract double DegreesCelciusPerKilometerInOneDegreeCelsiusPerKilometer { get; }
5756

5857
// ReSharper disable VirtualMemberNeverOverriden.Global
59-
protected virtual double DegreesCelciusPerMeterTolerance { get { return 1e-5; } }
60-
protected virtual double KilodegreesCelciusPerMeterTolerance { get { return 1e-5; } }
58+
protected virtual double DegreesCelciusPerKilometerTolerance { get { return 1e-5; } }
6159
// ReSharper restore VirtualMemberNeverOverriden.Global
6260

6361
[Fact]
64-
public void DegreeCelsiusPerMeterToLapseRateUnits()
62+
public void DegreeCelsiusPerKilometerToLapseRateUnits()
6563
{
66-
LapseRate degreecelsiuspermeter = LapseRate.FromDegreesCelciusPerMeter(1);
67-
AssertEx.EqualTolerance(DegreesCelciusPerMeterInOneDegreeCelsiusPerMeter, degreecelsiuspermeter.DegreesCelciusPerMeter, DegreesCelciusPerMeterTolerance);
68-
AssertEx.EqualTolerance(KilodegreesCelciusPerMeterInOneDegreeCelsiusPerMeter, degreecelsiuspermeter.KilodegreesCelciusPerMeter, KilodegreesCelciusPerMeterTolerance);
64+
LapseRate degreecelsiusperkilometer = LapseRate.FromDegreesCelciusPerKilometer(1);
65+
AssertEx.EqualTolerance(DegreesCelciusPerKilometerInOneDegreeCelsiusPerKilometer, degreecelsiusperkilometer.DegreesCelciusPerKilometer, DegreesCelciusPerKilometerTolerance);
6966
}
7067

7168
[Fact]
7269
public void FromValueAndUnit()
7370
{
74-
AssertEx.EqualTolerance(1, LapseRate.From(1, LapseRateUnit.DegreeCelsiusPerMeter).DegreesCelciusPerMeter, DegreesCelciusPerMeterTolerance);
75-
AssertEx.EqualTolerance(1, LapseRate.From(1, LapseRateUnit.KilodegreeCelsiusPerMeter).KilodegreesCelciusPerMeter, KilodegreesCelciusPerMeterTolerance);
71+
AssertEx.EqualTolerance(1, LapseRate.From(1, LapseRateUnit.DegreeCelsiusPerKilometer).DegreesCelciusPerKilometer, DegreesCelciusPerKilometerTolerance);
7672
}
7773

7874
[Fact]
7975
public void As()
8076
{
81-
var degreecelsiuspermeter = LapseRate.FromDegreesCelciusPerMeter(1);
82-
AssertEx.EqualTolerance(DegreesCelciusPerMeterInOneDegreeCelsiusPerMeter, degreecelsiuspermeter.As(LapseRateUnit.DegreeCelsiusPerMeter), DegreesCelciusPerMeterTolerance);
83-
AssertEx.EqualTolerance(KilodegreesCelciusPerMeterInOneDegreeCelsiusPerMeter, degreecelsiuspermeter.As(LapseRateUnit.KilodegreeCelsiusPerMeter), KilodegreesCelciusPerMeterTolerance);
77+
var degreecelsiusperkilometer = LapseRate.FromDegreesCelciusPerKilometer(1);
78+
AssertEx.EqualTolerance(DegreesCelciusPerKilometerInOneDegreeCelsiusPerKilometer, degreecelsiusperkilometer.As(LapseRateUnit.DegreeCelsiusPerKilometer), DegreesCelciusPerKilometerTolerance);
8479
}
8580

8681
[Fact]
8782
public void ConversionRoundTrip()
8883
{
89-
LapseRate degreecelsiuspermeter = LapseRate.FromDegreesCelciusPerMeter(1);
90-
AssertEx.EqualTolerance(1, LapseRate.FromDegreesCelciusPerMeter(degreecelsiuspermeter.DegreesCelciusPerMeter).DegreesCelciusPerMeter, DegreesCelciusPerMeterTolerance);
91-
AssertEx.EqualTolerance(1, LapseRate.FromKilodegreesCelciusPerMeter(degreecelsiuspermeter.KilodegreesCelciusPerMeter).DegreesCelciusPerMeter, KilodegreesCelciusPerMeterTolerance);
84+
LapseRate degreecelsiusperkilometer = LapseRate.FromDegreesCelciusPerKilometer(1);
85+
AssertEx.EqualTolerance(1, LapseRate.FromDegreesCelciusPerKilometer(degreecelsiusperkilometer.DegreesCelciusPerKilometer).DegreesCelciusPerKilometer, DegreesCelciusPerKilometerTolerance);
9286
}
9387

9488
[Fact]
9589
public void ArithmeticOperators()
9690
{
97-
LapseRate v = LapseRate.FromDegreesCelciusPerMeter(1);
98-
AssertEx.EqualTolerance(-1, -v.DegreesCelciusPerMeter, DegreesCelciusPerMeterTolerance);
99-
AssertEx.EqualTolerance(2, (LapseRate.FromDegreesCelciusPerMeter(3)-v).DegreesCelciusPerMeter, DegreesCelciusPerMeterTolerance);
100-
AssertEx.EqualTolerance(2, (v + v).DegreesCelciusPerMeter, DegreesCelciusPerMeterTolerance);
101-
AssertEx.EqualTolerance(10, (v*10).DegreesCelciusPerMeter, DegreesCelciusPerMeterTolerance);
102-
AssertEx.EqualTolerance(10, (10*v).DegreesCelciusPerMeter, DegreesCelciusPerMeterTolerance);
103-
AssertEx.EqualTolerance(2, (LapseRate.FromDegreesCelciusPerMeter(10)/5).DegreesCelciusPerMeter, DegreesCelciusPerMeterTolerance);
104-
AssertEx.EqualTolerance(2, LapseRate.FromDegreesCelciusPerMeter(10)/LapseRate.FromDegreesCelciusPerMeter(5), DegreesCelciusPerMeterTolerance);
91+
LapseRate v = LapseRate.FromDegreesCelciusPerKilometer(1);
92+
AssertEx.EqualTolerance(-1, -v.DegreesCelciusPerKilometer, DegreesCelciusPerKilometerTolerance);
93+
AssertEx.EqualTolerance(2, (LapseRate.FromDegreesCelciusPerKilometer(3)-v).DegreesCelciusPerKilometer, DegreesCelciusPerKilometerTolerance);
94+
AssertEx.EqualTolerance(2, (v + v).DegreesCelciusPerKilometer, DegreesCelciusPerKilometerTolerance);
95+
AssertEx.EqualTolerance(10, (v*10).DegreesCelciusPerKilometer, DegreesCelciusPerKilometerTolerance);
96+
AssertEx.EqualTolerance(10, (10*v).DegreesCelciusPerKilometer, DegreesCelciusPerKilometerTolerance);
97+
AssertEx.EqualTolerance(2, (LapseRate.FromDegreesCelciusPerKilometer(10)/5).DegreesCelciusPerKilometer, DegreesCelciusPerKilometerTolerance);
98+
AssertEx.EqualTolerance(2, LapseRate.FromDegreesCelciusPerKilometer(10)/LapseRate.FromDegreesCelciusPerKilometer(5), DegreesCelciusPerKilometerTolerance);
10599
}
106100

107101
[Fact]
108102
public void ComparisonOperators()
109103
{
110-
LapseRate oneDegreeCelsiusPerMeter = LapseRate.FromDegreesCelciusPerMeter(1);
111-
LapseRate twoDegreesCelciusPerMeter = LapseRate.FromDegreesCelciusPerMeter(2);
112-
113-
Assert.True(oneDegreeCelsiusPerMeter < twoDegreesCelciusPerMeter);
114-
Assert.True(oneDegreeCelsiusPerMeter <= twoDegreesCelciusPerMeter);
115-
Assert.True(twoDegreesCelciusPerMeter > oneDegreeCelsiusPerMeter);
116-
Assert.True(twoDegreesCelciusPerMeter >= oneDegreeCelsiusPerMeter);
117-
118-
Assert.False(oneDegreeCelsiusPerMeter > twoDegreesCelciusPerMeter);
119-
Assert.False(oneDegreeCelsiusPerMeter >= twoDegreesCelciusPerMeter);
120-
Assert.False(twoDegreesCelciusPerMeter < oneDegreeCelsiusPerMeter);
121-
Assert.False(twoDegreesCelciusPerMeter <= oneDegreeCelsiusPerMeter);
104+
LapseRate oneDegreeCelsiusPerKilometer = LapseRate.FromDegreesCelciusPerKilometer(1);
105+
LapseRate twoDegreesCelciusPerKilometer = LapseRate.FromDegreesCelciusPerKilometer(2);
106+
107+
Assert.True(oneDegreeCelsiusPerKilometer < twoDegreesCelciusPerKilometer);
108+
Assert.True(oneDegreeCelsiusPerKilometer <= twoDegreesCelciusPerKilometer);
109+
Assert.True(twoDegreesCelciusPerKilometer > oneDegreeCelsiusPerKilometer);
110+
Assert.True(twoDegreesCelciusPerKilometer >= oneDegreeCelsiusPerKilometer);
111+
112+
Assert.False(oneDegreeCelsiusPerKilometer > twoDegreesCelciusPerKilometer);
113+
Assert.False(oneDegreeCelsiusPerKilometer >= twoDegreesCelciusPerKilometer);
114+
Assert.False(twoDegreesCelciusPerKilometer < oneDegreeCelsiusPerKilometer);
115+
Assert.False(twoDegreesCelciusPerKilometer <= oneDegreeCelsiusPerKilometer);
122116
}
123117

124118
[Fact]
125119
public void CompareToIsImplemented()
126120
{
127-
LapseRate degreecelsiuspermeter = LapseRate.FromDegreesCelciusPerMeter(1);
128-
Assert.Equal(0, degreecelsiuspermeter.CompareTo(degreecelsiuspermeter));
129-
Assert.True(degreecelsiuspermeter.CompareTo(LapseRate.Zero) > 0);
130-
Assert.True(LapseRate.Zero.CompareTo(degreecelsiuspermeter) < 0);
121+
LapseRate degreecelsiusperkilometer = LapseRate.FromDegreesCelciusPerKilometer(1);
122+
Assert.Equal(0, degreecelsiusperkilometer.CompareTo(degreecelsiusperkilometer));
123+
Assert.True(degreecelsiusperkilometer.CompareTo(LapseRate.Zero) > 0);
124+
Assert.True(LapseRate.Zero.CompareTo(degreecelsiusperkilometer) < 0);
131125
}
132126

133127
[Fact]
134128
public void CompareToThrowsOnTypeMismatch()
135129
{
136-
LapseRate degreecelsiuspermeter = LapseRate.FromDegreesCelciusPerMeter(1);
137-
Assert.Throws<ArgumentException>(() => degreecelsiuspermeter.CompareTo(new object()));
130+
LapseRate degreecelsiusperkilometer = LapseRate.FromDegreesCelciusPerKilometer(1);
131+
Assert.Throws<ArgumentException>(() => degreecelsiusperkilometer.CompareTo(new object()));
138132
}
139133

140134
[Fact]
141135
public void CompareToThrowsOnNull()
142136
{
143-
LapseRate degreecelsiuspermeter = LapseRate.FromDegreesCelciusPerMeter(1);
144-
Assert.Throws<ArgumentNullException>(() => degreecelsiuspermeter.CompareTo(null));
137+
LapseRate degreecelsiusperkilometer = LapseRate.FromDegreesCelciusPerKilometer(1);
138+
Assert.Throws<ArgumentNullException>(() => degreecelsiusperkilometer.CompareTo(null));
145139
}
146140

147141

148142
[Fact]
149143
public void EqualityOperators()
150144
{
151-
LapseRate a = LapseRate.FromDegreesCelciusPerMeter(1);
152-
LapseRate b = LapseRate.FromDegreesCelciusPerMeter(2);
145+
LapseRate a = LapseRate.FromDegreesCelciusPerKilometer(1);
146+
LapseRate b = LapseRate.FromDegreesCelciusPerKilometer(2);
153147

154148
// ReSharper disable EqualExpressionComparison
155149
Assert.True(a == a);
@@ -163,23 +157,23 @@ public void EqualityOperators()
163157
[Fact]
164158
public void EqualsIsImplemented()
165159
{
166-
LapseRate v = LapseRate.FromDegreesCelciusPerMeter(1);
167-
Assert.True(v.Equals(LapseRate.FromDegreesCelciusPerMeter(1)));
160+
LapseRate v = LapseRate.FromDegreesCelciusPerKilometer(1);
161+
Assert.True(v.Equals(LapseRate.FromDegreesCelciusPerKilometer(1)));
168162
Assert.False(v.Equals(LapseRate.Zero));
169163
}
170164

171165
[Fact]
172166
public void EqualsReturnsFalseOnTypeMismatch()
173167
{
174-
LapseRate degreecelsiuspermeter = LapseRate.FromDegreesCelciusPerMeter(1);
175-
Assert.False(degreecelsiuspermeter.Equals(new object()));
168+
LapseRate degreecelsiusperkilometer = LapseRate.FromDegreesCelciusPerKilometer(1);
169+
Assert.False(degreecelsiusperkilometer.Equals(new object()));
176170
}
177171

178172
[Fact]
179173
public void EqualsReturnsFalseOnNull()
180174
{
181-
LapseRate degreecelsiuspermeter = LapseRate.FromDegreesCelciusPerMeter(1);
182-
Assert.False(degreecelsiuspermeter.Equals(null));
175+
LapseRate degreecelsiusperkilometer = LapseRate.FromDegreesCelciusPerKilometer(1);
176+
Assert.False(degreecelsiusperkilometer.Equals(null));
183177
}
184178
}
185179
}

‎UnitsNet/GeneratedCode/Extensions/Number/NumberToLapseRateExtensions.g.cs‎

Lines changed: 21 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -44,71 +44,37 @@ namespace UnitsNet.Extensions.NumberToLapseRate
4444
{
4545
public static class NumberToLapseRateExtensions
4646
{
47-
#region DegreeCelsiusPerMeter
47+
#region DegreeCelsiusPerKilometer
4848

49-
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerMeter(double)"/>
50-
public static LapseRate DegreesCelciusPerMeter(this int value) => LapseRate.FromDegreesCelciusPerMeter(value);
49+
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerKilometer(double)"/>
50+
public static LapseRate DegreesCelciusPerKilometer(this int value) => LapseRate.FromDegreesCelciusPerKilometer(value);
5151

52-
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerMeter(double?)"/>
53-
public static LapseRate? DegreesCelciusPerMeter(this int? value) => LapseRate.FromDegreesCelciusPerMeter(value);
52+
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerKilometer(double?)"/>
53+
public static LapseRate? DegreesCelciusPerKilometer(this int? value) => LapseRate.FromDegreesCelciusPerKilometer(value);
5454

55-
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerMeter(double)"/>
56-
public static LapseRate DegreesCelciusPerMeter(this long value) => LapseRate.FromDegreesCelciusPerMeter(value);
55+
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerKilometer(double)"/>
56+
public static LapseRate DegreesCelciusPerKilometer(this long value) => LapseRate.FromDegreesCelciusPerKilometer(value);
5757

58-
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerMeter(double?)"/>
59-
public static LapseRate? DegreesCelciusPerMeter(this long? value) => LapseRate.FromDegreesCelciusPerMeter(value);
58+
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerKilometer(double?)"/>
59+
public static LapseRate? DegreesCelciusPerKilometer(this long? value) => LapseRate.FromDegreesCelciusPerKilometer(value);
6060

61-
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerMeter(double)"/>
62-
public static LapseRate DegreesCelciusPerMeter(this double value) => LapseRate.FromDegreesCelciusPerMeter(value);
61+
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerKilometer(double)"/>
62+
public static LapseRate DegreesCelciusPerKilometer(this double value) => LapseRate.FromDegreesCelciusPerKilometer(value);
6363

64-
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerMeter(double?)"/>
65-
public static LapseRate? DegreesCelciusPerMeter(this double? value) => LapseRate.FromDegreesCelciusPerMeter(value);
64+
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerKilometer(double?)"/>
65+
public static LapseRate? DegreesCelciusPerKilometer(this double? value) => LapseRate.FromDegreesCelciusPerKilometer(value);
6666

67-
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerMeter(double)"/>
68-
public static LapseRate DegreesCelciusPerMeter(this float value) => LapseRate.FromDegreesCelciusPerMeter(value);
67+
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerKilometer(double)"/>
68+
public static LapseRate DegreesCelciusPerKilometer(this float value) => LapseRate.FromDegreesCelciusPerKilometer(value);
6969

70-
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerMeter(double?)"/>
71-
public static LapseRate? DegreesCelciusPerMeter(this float? value) => LapseRate.FromDegreesCelciusPerMeter(value);
70+
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerKilometer(double?)"/>
71+
public static LapseRate? DegreesCelciusPerKilometer(this float? value) => LapseRate.FromDegreesCelciusPerKilometer(value);
7272

73-
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerMeter(double)"/>
74-
public static LapseRate DegreesCelciusPerMeter(this decimal value) => LapseRate.FromDegreesCelciusPerMeter(Convert.ToDouble(value));
73+
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerKilometer(double)"/>
74+
public static LapseRate DegreesCelciusPerKilometer(this decimal value) => LapseRate.FromDegreesCelciusPerKilometer(Convert.ToDouble(value));
7575

76-
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerMeter(double?)"/>
77-
public static LapseRate? DegreesCelciusPerMeter(this decimal? value) => LapseRate.FromDegreesCelciusPerMeter(value == null ? (double?)null : Convert.ToDouble(value.Value));
78-
79-
#endregion
80-
81-
#region KilodegreeCelsiusPerMeter
82-
83-
/// <inheritdoc cref="LapseRate.FromKilodegreesCelciusPerMeter(double)"/>
84-
public static LapseRate KilodegreesCelciusPerMeter(this int value) => LapseRate.FromKilodegreesCelciusPerMeter(value);
85-
86-
/// <inheritdoc cref="LapseRate.FromKilodegreesCelciusPerMeter(double?)"/>
87-
public static LapseRate? KilodegreesCelciusPerMeter(this int? value) => LapseRate.FromKilodegreesCelciusPerMeter(value);
88-
89-
/// <inheritdoc cref="LapseRate.FromKilodegreesCelciusPerMeter(double)"/>
90-
public static LapseRate KilodegreesCelciusPerMeter(this long value) => LapseRate.FromKilodegreesCelciusPerMeter(value);
91-
92-
/// <inheritdoc cref="LapseRate.FromKilodegreesCelciusPerMeter(double?)"/>
93-
public static LapseRate? KilodegreesCelciusPerMeter(this long? value) => LapseRate.FromKilodegreesCelciusPerMeter(value);
94-
95-
/// <inheritdoc cref="LapseRate.FromKilodegreesCelciusPerMeter(double)"/>
96-
public static LapseRate KilodegreesCelciusPerMeter(this double value) => LapseRate.FromKilodegreesCelciusPerMeter(value);
97-
98-
/// <inheritdoc cref="LapseRate.FromKilodegreesCelciusPerMeter(double?)"/>
99-
public static LapseRate? KilodegreesCelciusPerMeter(this double? value) => LapseRate.FromKilodegreesCelciusPerMeter(value);
100-
101-
/// <inheritdoc cref="LapseRate.FromKilodegreesCelciusPerMeter(double)"/>
102-
public static LapseRate KilodegreesCelciusPerMeter(this float value) => LapseRate.FromKilodegreesCelciusPerMeter(value);
103-
104-
/// <inheritdoc cref="LapseRate.FromKilodegreesCelciusPerMeter(double?)"/>
105-
public static LapseRate? KilodegreesCelciusPerMeter(this float? value) => LapseRate.FromKilodegreesCelciusPerMeter(value);
106-
107-
/// <inheritdoc cref="LapseRate.FromKilodegreesCelciusPerMeter(double)"/>
108-
public static LapseRate KilodegreesCelciusPerMeter(this decimal value) => LapseRate.FromKilodegreesCelciusPerMeter(Convert.ToDouble(value));
109-
110-
/// <inheritdoc cref="LapseRate.FromKilodegreesCelciusPerMeter(double?)"/>
111-
public static LapseRate? KilodegreesCelciusPerMeter(this decimal? value) => LapseRate.FromKilodegreesCelciusPerMeter(value == null ? (double?)null : Convert.ToDouble(value.Value));
76+
/// <inheritdoc cref="LapseRate.FromDegreesCelciusPerKilometer(double?)"/>
77+
public static LapseRate? DegreesCelciusPerKilometer(this decimal? value) => LapseRate.FromDegreesCelciusPerKilometer(value == null ? (double?)null : Convert.ToDouble(value.Value));
11278

11379
#endregion
11480

0 commit comments

Comments
 (0)