Skip to content

Commit 52529c5

Browse files
ngeslinngeslin
committed
Merge remote-tracking branch 'refs/remotes/anjdreas/master' into master-anjdreas
2 parents 6ea6d06 + a6cb704 commit 52529c5

File tree

8 files changed

+98
-1
lines changed

8 files changed

+98
-1
lines changed

‎UnitsNet.Tests/CustomCode/TemperatureChangeRateTests.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,7 @@ public class TemperatureChangeRateTests : TemperatureChangeRateTestsBase
4040
protected override double MicrodegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond => 1E6;
4141

4242
protected override double NanodegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond => 1E9;
43+
44+
protected override double DegreesCelsiusPerMinuteInOneDegreeCelsiusPerSecond => 60;
4345
}
4446
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public abstract partial class TemperatureChangeRateTestsBase
5555
protected abstract double CentidegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond { get; }
5656
protected abstract double DecadegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond { get; }
5757
protected abstract double DecidegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond { get; }
58+
protected abstract double DegreesCelsiusPerMinuteInOneDegreeCelsiusPerSecond { get; }
5859
protected abstract double DegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond { get; }
5960
protected abstract double HectodegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond { get; }
6061
protected abstract double KilodegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond { get; }
@@ -66,6 +67,7 @@ public abstract partial class TemperatureChangeRateTestsBase
6667
protected virtual double CentidegreesCelsiusPerSecondTolerance { get { return 1e-5; } }
6768
protected virtual double DecadegreesCelsiusPerSecondTolerance { get { return 1e-5; } }
6869
protected virtual double DecidegreesCelsiusPerSecondTolerance { get { return 1e-5; } }
70+
protected virtual double DegreesCelsiusPerMinuteTolerance { get { return 1e-5; } }
6971
protected virtual double DegreesCelsiusPerSecondTolerance { get { return 1e-5; } }
7072
protected virtual double HectodegreesCelsiusPerSecondTolerance { get { return 1e-5; } }
7173
protected virtual double KilodegreesCelsiusPerSecondTolerance { get { return 1e-5; } }
@@ -81,6 +83,7 @@ public void DegreeCelsiusPerSecondToTemperatureChangeRateUnits()
8183
AssertEx.EqualTolerance(CentidegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond, degreecelsiuspersecond.CentidegreesCelsiusPerSecond, CentidegreesCelsiusPerSecondTolerance);
8284
AssertEx.EqualTolerance(DecadegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond, degreecelsiuspersecond.DecadegreesCelsiusPerSecond, DecadegreesCelsiusPerSecondTolerance);
8385
AssertEx.EqualTolerance(DecidegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond, degreecelsiuspersecond.DecidegreesCelsiusPerSecond, DecidegreesCelsiusPerSecondTolerance);
86+
AssertEx.EqualTolerance(DegreesCelsiusPerMinuteInOneDegreeCelsiusPerSecond, degreecelsiuspersecond.DegreesCelsiusPerMinute, DegreesCelsiusPerMinuteTolerance);
8487
AssertEx.EqualTolerance(DegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond, degreecelsiuspersecond.DegreesCelsiusPerSecond, DegreesCelsiusPerSecondTolerance);
8588
AssertEx.EqualTolerance(HectodegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond, degreecelsiuspersecond.HectodegreesCelsiusPerSecond, HectodegreesCelsiusPerSecondTolerance);
8689
AssertEx.EqualTolerance(KilodegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond, degreecelsiuspersecond.KilodegreesCelsiusPerSecond, KilodegreesCelsiusPerSecondTolerance);
@@ -95,6 +98,7 @@ public void FromValueAndUnit()
9598
AssertEx.EqualTolerance(1, TemperatureChangeRate.From(1, TemperatureChangeRateUnit.CentidegreeCelsiusPerSecond).CentidegreesCelsiusPerSecond, CentidegreesCelsiusPerSecondTolerance);
9699
AssertEx.EqualTolerance(1, TemperatureChangeRate.From(1, TemperatureChangeRateUnit.DecadegreeCelsiusPerSecond).DecadegreesCelsiusPerSecond, DecadegreesCelsiusPerSecondTolerance);
97100
AssertEx.EqualTolerance(1, TemperatureChangeRate.From(1, TemperatureChangeRateUnit.DecidegreeCelsiusPerSecond).DecidegreesCelsiusPerSecond, DecidegreesCelsiusPerSecondTolerance);
101+
AssertEx.EqualTolerance(1, TemperatureChangeRate.From(1, TemperatureChangeRateUnit.DegreeCelsiusPerMinute).DegreesCelsiusPerMinute, DegreesCelsiusPerMinuteTolerance);
98102
AssertEx.EqualTolerance(1, TemperatureChangeRate.From(1, TemperatureChangeRateUnit.DegreeCelsiusPerSecond).DegreesCelsiusPerSecond, DegreesCelsiusPerSecondTolerance);
99103
AssertEx.EqualTolerance(1, TemperatureChangeRate.From(1, TemperatureChangeRateUnit.HectodegreeCelsiusPerSecond).HectodegreesCelsiusPerSecond, HectodegreesCelsiusPerSecondTolerance);
100104
AssertEx.EqualTolerance(1, TemperatureChangeRate.From(1, TemperatureChangeRateUnit.KilodegreeCelsiusPerSecond).KilodegreesCelsiusPerSecond, KilodegreesCelsiusPerSecondTolerance);
@@ -110,6 +114,7 @@ public void As()
110114
AssertEx.EqualTolerance(CentidegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond, degreecelsiuspersecond.As(TemperatureChangeRateUnit.CentidegreeCelsiusPerSecond), CentidegreesCelsiusPerSecondTolerance);
111115
AssertEx.EqualTolerance(DecadegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond, degreecelsiuspersecond.As(TemperatureChangeRateUnit.DecadegreeCelsiusPerSecond), DecadegreesCelsiusPerSecondTolerance);
112116
AssertEx.EqualTolerance(DecidegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond, degreecelsiuspersecond.As(TemperatureChangeRateUnit.DecidegreeCelsiusPerSecond), DecidegreesCelsiusPerSecondTolerance);
117+
AssertEx.EqualTolerance(DegreesCelsiusPerMinuteInOneDegreeCelsiusPerSecond, degreecelsiuspersecond.As(TemperatureChangeRateUnit.DegreeCelsiusPerMinute), DegreesCelsiusPerMinuteTolerance);
113118
AssertEx.EqualTolerance(DegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond, degreecelsiuspersecond.As(TemperatureChangeRateUnit.DegreeCelsiusPerSecond), DegreesCelsiusPerSecondTolerance);
114119
AssertEx.EqualTolerance(HectodegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond, degreecelsiuspersecond.As(TemperatureChangeRateUnit.HectodegreeCelsiusPerSecond), HectodegreesCelsiusPerSecondTolerance);
115120
AssertEx.EqualTolerance(KilodegreesCelsiusPerSecondInOneDegreeCelsiusPerSecond, degreecelsiuspersecond.As(TemperatureChangeRateUnit.KilodegreeCelsiusPerSecond), KilodegreesCelsiusPerSecondTolerance);
@@ -125,6 +130,7 @@ public void ConversionRoundTrip()
125130
AssertEx.EqualTolerance(1, TemperatureChangeRate.FromCentidegreesCelsiusPerSecond(degreecelsiuspersecond.CentidegreesCelsiusPerSecond).DegreesCelsiusPerSecond, CentidegreesCelsiusPerSecondTolerance);
126131
AssertEx.EqualTolerance(1, TemperatureChangeRate.FromDecadegreesCelsiusPerSecond(degreecelsiuspersecond.DecadegreesCelsiusPerSecond).DegreesCelsiusPerSecond, DecadegreesCelsiusPerSecondTolerance);
127132
AssertEx.EqualTolerance(1, TemperatureChangeRate.FromDecidegreesCelsiusPerSecond(degreecelsiuspersecond.DecidegreesCelsiusPerSecond).DegreesCelsiusPerSecond, DecidegreesCelsiusPerSecondTolerance);
133+
AssertEx.EqualTolerance(1, TemperatureChangeRate.FromDegreesCelsiusPerMinute(degreecelsiuspersecond.DegreesCelsiusPerMinute).DegreesCelsiusPerSecond, DegreesCelsiusPerMinuteTolerance);
128134
AssertEx.EqualTolerance(1, TemperatureChangeRate.FromDegreesCelsiusPerSecond(degreecelsiuspersecond.DegreesCelsiusPerSecond).DegreesCelsiusPerSecond, DegreesCelsiusPerSecondTolerance);
129135
AssertEx.EqualTolerance(1, TemperatureChangeRate.FromHectodegreesCelsiusPerSecond(degreecelsiuspersecond.HectodegreesCelsiusPerSecond).DegreesCelsiusPerSecond, HectodegreesCelsiusPerSecondTolerance);
130136
AssertEx.EqualTolerance(1, TemperatureChangeRate.FromKilodegreesCelsiusPerSecond(degreecelsiuspersecond.KilodegreesCelsiusPerSecond).DegreesCelsiusPerSecond, KilodegreesCelsiusPerSecondTolerance);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public enum TemperatureChangeRateUnit
4545
CentidegreeCelsiusPerSecond,
4646
DecadegreeCelsiusPerSecond,
4747
DecidegreeCelsiusPerSecond,
48+
DegreeCelsiusPerMinute,
4849
DegreeCelsiusPerSecond,
4950
HectodegreeCelsiusPerSecond,
5051
KilodegreeCelsiusPerSecond,

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,40 @@ public static class NumberToTemperatureChangeRateExtensions
146146

147147
#endregion
148148

149+
#region DegreeCelsiusPerMinute
150+
151+
/// <inheritdoc cref="TemperatureChangeRate.FromDegreesCelsiusPerMinute(double)"/>
152+
public static TemperatureChangeRate DegreesCelsiusPerMinute(this int value) => TemperatureChangeRate.FromDegreesCelsiusPerMinute(value);
153+
154+
/// <inheritdoc cref="TemperatureChangeRate.FromDegreesCelsiusPerMinute(double?)"/>
155+
public static TemperatureChangeRate? DegreesCelsiusPerMinute(this int? value) => TemperatureChangeRate.FromDegreesCelsiusPerMinute(value);
156+
157+
/// <inheritdoc cref="TemperatureChangeRate.FromDegreesCelsiusPerMinute(double)"/>
158+
public static TemperatureChangeRate DegreesCelsiusPerMinute(this long value) => TemperatureChangeRate.FromDegreesCelsiusPerMinute(value);
159+
160+
/// <inheritdoc cref="TemperatureChangeRate.FromDegreesCelsiusPerMinute(double?)"/>
161+
public static TemperatureChangeRate? DegreesCelsiusPerMinute(this long? value) => TemperatureChangeRate.FromDegreesCelsiusPerMinute(value);
162+
163+
/// <inheritdoc cref="TemperatureChangeRate.FromDegreesCelsiusPerMinute(double)"/>
164+
public static TemperatureChangeRate DegreesCelsiusPerMinute(this double value) => TemperatureChangeRate.FromDegreesCelsiusPerMinute(value);
165+
166+
/// <inheritdoc cref="TemperatureChangeRate.FromDegreesCelsiusPerMinute(double?)"/>
167+
public static TemperatureChangeRate? DegreesCelsiusPerMinute(this double? value) => TemperatureChangeRate.FromDegreesCelsiusPerMinute(value);
168+
169+
/// <inheritdoc cref="TemperatureChangeRate.FromDegreesCelsiusPerMinute(double)"/>
170+
public static TemperatureChangeRate DegreesCelsiusPerMinute(this float value) => TemperatureChangeRate.FromDegreesCelsiusPerMinute(value);
171+
172+
/// <inheritdoc cref="TemperatureChangeRate.FromDegreesCelsiusPerMinute(double?)"/>
173+
public static TemperatureChangeRate? DegreesCelsiusPerMinute(this float? value) => TemperatureChangeRate.FromDegreesCelsiusPerMinute(value);
174+
175+
/// <inheritdoc cref="TemperatureChangeRate.FromDegreesCelsiusPerMinute(double)"/>
176+
public static TemperatureChangeRate DegreesCelsiusPerMinute(this decimal value) => TemperatureChangeRate.FromDegreesCelsiusPerMinute(Convert.ToDouble(value));
177+
178+
/// <inheritdoc cref="TemperatureChangeRate.FromDegreesCelsiusPerMinute(double?)"/>
179+
public static TemperatureChangeRate? DegreesCelsiusPerMinute(this decimal? value) => TemperatureChangeRate.FromDegreesCelsiusPerMinute(value == null ? (double?)null : Convert.ToDouble(value.Value));
180+
181+
#endregion
182+
149183
#region DegreeCelsiusPerSecond
150184

151185
/// <inheritdoc cref="TemperatureChangeRate.FromDegreesCelsiusPerSecond(double)"/>

‎UnitsNet/GeneratedCode/UnitClasses/TemperatureChangeRate.g.cs‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,14 @@ public double DecidegreesCelsiusPerSecond
153153
get { return (_degreesCelsiusPerSecond) / 1e-1d; }
154154
}
155155

156+
/// <summary>
157+
/// Get TemperatureChangeRate in DegreesCelsiusPerMinute.
158+
/// </summary>
159+
public double DegreesCelsiusPerMinute
160+
{
161+
get { return _degreesCelsiusPerSecond*60; }
162+
}
163+
156164
/// <summary>
157165
/// Get TemperatureChangeRate in DegreesCelsiusPerSecond.
158166
/// </summary>
@@ -234,6 +242,14 @@ public static TemperatureChangeRate FromDecidegreesCelsiusPerSecond(double decid
234242
return new TemperatureChangeRate((decidegreescelsiuspersecond) * 1e-1d);
235243
}
236244

245+
/// <summary>
246+
/// Get TemperatureChangeRate from DegreesCelsiusPerMinute.
247+
/// </summary>
248+
public static TemperatureChangeRate FromDegreesCelsiusPerMinute(double degreescelsiusperminute)
249+
{
250+
return new TemperatureChangeRate(degreescelsiusperminute/60);
251+
}
252+
237253
/// <summary>
238254
/// Get TemperatureChangeRate from DegreesCelsiusPerSecond.
239255
/// </summary>
@@ -329,6 +345,21 @@ public static TemperatureChangeRate FromNanodegreesCelsiusPerSecond(double nanod
329345
}
330346
}
331347

348+
/// <summary>
349+
/// Get nullable TemperatureChangeRate from nullable DegreesCelsiusPerMinute.
350+
/// </summary>
351+
public static TemperatureChangeRate? FromDegreesCelsiusPerMinute(double? degreescelsiusperminute)
352+
{
353+
if (degreescelsiusperminute.HasValue)
354+
{
355+
return FromDegreesCelsiusPerMinute(degreescelsiusperminute.Value);
356+
}
357+
else
358+
{
359+
return null;
360+
}
361+
}
362+
332363
/// <summary>
333364
/// Get nullable TemperatureChangeRate from nullable DegreesCelsiusPerSecond.
334365
/// </summary>
@@ -437,6 +468,8 @@ public static TemperatureChangeRate From(double val, TemperatureChangeRateUnit f
437468
return FromDecadegreesCelsiusPerSecond(val);
438469
case TemperatureChangeRateUnit.DecidegreeCelsiusPerSecond:
439470
return FromDecidegreesCelsiusPerSecond(val);
471+
case TemperatureChangeRateUnit.DegreeCelsiusPerMinute:
472+
return FromDegreesCelsiusPerMinute(val);
440473
case TemperatureChangeRateUnit.DegreeCelsiusPerSecond:
441474
return FromDegreesCelsiusPerSecond(val);
442475
case TemperatureChangeRateUnit.HectodegreeCelsiusPerSecond:
@@ -477,6 +510,8 @@ public static TemperatureChangeRate From(double val, TemperatureChangeRateUnit f
477510
return FromDecadegreesCelsiusPerSecond(value.Value);
478511
case TemperatureChangeRateUnit.DecidegreeCelsiusPerSecond:
479512
return FromDecidegreesCelsiusPerSecond(value.Value);
513+
case TemperatureChangeRateUnit.DegreeCelsiusPerMinute:
514+
return FromDegreesCelsiusPerMinute(value.Value);
480515
case TemperatureChangeRateUnit.DegreeCelsiusPerSecond:
481516
return FromDegreesCelsiusPerSecond(value.Value);
482517
case TemperatureChangeRateUnit.HectodegreeCelsiusPerSecond:
@@ -652,6 +687,8 @@ public double As(TemperatureChangeRateUnit unit)
652687
return DecadegreesCelsiusPerSecond;
653688
case TemperatureChangeRateUnit.DecidegreeCelsiusPerSecond:
654689
return DecidegreesCelsiusPerSecond;
690+
case TemperatureChangeRateUnit.DegreeCelsiusPerMinute:
691+
return DegreesCelsiusPerMinute;
655692
case TemperatureChangeRateUnit.DegreeCelsiusPerSecond:
656693
return DegreesCelsiusPerSecond;
657694
case TemperatureChangeRateUnit.HectodegreeCelsiusPerSecond:

‎UnitsNet/GeneratedCode/UnitSystem.Default.g.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2543,6 +2543,11 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
25432543
{
25442544
new AbbreviationsForCulture("en-US", "d°C/s"),
25452545
}),
2546+
new CulturesForEnumValue((int) TemperatureChangeRateUnit.DegreeCelsiusPerMinute,
2547+
new[]
2548+
{
2549+
new AbbreviationsForCulture("en-US", "°C/m"),
2550+
}),
25462551
new CulturesForEnumValue((int) TemperatureChangeRateUnit.DegreeCelsiusPerSecond,
25472552
new[]
25482553
{

‎UnitsNet/UnitDefinitions/TemperatureChangeRate.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,18 @@
1515
"Abbreviations": [ "°C/s" ]
1616
}
1717
]
18+
},
19+
{
20+
"SingularName": "DegreeCelsiusPerMinute",
21+
"PluralName": "DegreesCelsiusPerMinute",
22+
"FromUnitToBaseFunc": "x/60",
23+
"FromBaseToUnitFunc": "x*60",
24+
"Localization": [
25+
{
26+
"Culture": "en-US",
27+
"Abbreviations": [ "°C/m" ]
28+
}
29+
]
1830
}
1931
]
2032
}

‎UnitsNet/UnitsNet.Common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<AssemblyName>UnitsNet</AssemblyName>
44
<RootNamespace>UnitsNet</RootNamespace>
55
<PackageId>UnitsNet</PackageId>
6-
<Version>3.70.0</Version>
6+
<Version>3.71.0</Version>
77
<Authors>Andreas Gullberg Larsen</Authors>
88
<Title>Units.NET</Title>
99
<Description>Get all the common units of measurement and the conversions between them. It is light-weight and thoroughly tested.</Description>

0 commit comments

Comments
 (0)