Skip to content

Commit b1e372d

Browse files
jnyrupangularsen
authored andcommitted
Add operator overloads and fix abbrev for LapseRate (#324)
1 parent 026b329 commit b1e372d

File tree

5 files changed

+122
-2
lines changed

5 files changed

+122
-2
lines changed

UnitsNet.Tests/CustomCode/LapseRateTests.cs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,40 @@
4141

4242

4343
using System;
44+
using Xunit;
4445

4546
namespace UnitsNet.Tests.CustomCode
4647
{
4748
public class LapseRateTests : LapseRateTestsBase
4849
{
4950
protected override double DegreesCelciusPerKilometerInOneDegreeCelsiusPerKilometer => 1e0;
51+
52+
[Fact]
53+
public void TemperatureDeltaDividedByLapseRateEqualsLength()
54+
{
55+
Length length = TemperatureDelta.FromDegreesCelsiusDelta(50) / LapseRate.FromDegreesCelciusPerKilometer(5);
56+
Assert.Equal(length, Length.FromKilometers(10));
57+
}
58+
59+
[Fact]
60+
public void TemperatureDeltaDividedByLengthEqualsLapseRate()
61+
{
62+
LapseRate lapseRate = TemperatureDelta.FromDegreesCelsiusDelta(50) / Length.FromKilometers(10);
63+
Assert.Equal(lapseRate, LapseRate.FromDegreesCelciusPerKilometer(5));
64+
}
65+
66+
[Fact]
67+
public void LengthMultipliedByLapseRateEqualsTemperatureDelta()
68+
{
69+
TemperatureDelta temperatureDelta = Length.FromKilometers(10) * LapseRate.FromDegreesCelciusPerKilometer(5);
70+
Assert.Equal(temperatureDelta, TemperatureDelta.FromDegreesCelsiusDelta(50));
71+
}
72+
73+
[Fact]
74+
public void LapseRateMultipliedByLengthEqualsTemperatureDelta()
75+
{
76+
TemperatureDelta temperatureDelta = LapseRate.FromDegreesCelciusPerKilometer(5) * Length.FromKilometers(10);
77+
Assert.Equal(temperatureDelta, TemperatureDelta.FromDegreesCelsiusDelta(50));
78+
}
5079
}
5180
}
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// Copyright (c) 2013 Andreas Gullberg Larsen ([email protected]).
2+
// https://github.com/angularsen/UnitsNet
3+
//
4+
// Permission is hereby granted, free of charge, to any person obtaining a copy
5+
// of this software and associated documentation files (the "Software"), to deal
6+
// in the Software without restriction, including without limitation the rights
7+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
// copies of the Software, and to permit persons to whom the Software is
9+
// furnished to do so, subject to the following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included in
12+
// all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20+
// THE SOFTWARE.
21+
22+
namespace UnitsNet
23+
{
24+
// Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components
25+
// Public structures can't have any members other than public fields, and those fields must be value types or strings.
26+
// Public classes must be sealed (NotInheritable in Visual Basic). If your programming model requires polymorphism, you can create a public interface and implement that interface on the classes that must be polymorphic.
27+
#if WINDOWS_UWP
28+
public sealed partial class LapseRate
29+
#else
30+
public partial struct LapseRate
31+
#endif
32+
{
33+
// Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
34+
#if !WINDOWS_UWP
35+
public static Length operator /(TemperatureDelta left, LapseRate right)
36+
{
37+
return Length.FromKilometers(left.KelvinsDelta / right.DegreesCelciusPerKilometer);
38+
}
39+
40+
public static TemperatureDelta operator *(Length left, LapseRate right) => right * left;
41+
42+
public static TemperatureDelta operator *(LapseRate left, Length right)
43+
{
44+
return TemperatureDelta.FromDegreesCelsiusDelta(left.DegreesCelciusPerKilometer * right.Kilometers);
45+
}
46+
#endif
47+
}
48+
}
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Copyright (c) 2013 Andreas Gullberg Larsen ([email protected]).
2+
// https://github.com/angularsen/UnitsNet
3+
//
4+
// Permission is hereby granted, free of charge, to any person obtaining a copy
5+
// of this software and associated documentation files (the "Software"), to deal
6+
// in the Software without restriction, including without limitation the rights
7+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
// copies of the Software, and to permit persons to whom the Software is
9+
// furnished to do so, subject to the following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included in
12+
// all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20+
// THE SOFTWARE.
21+
22+
using UnitsNet.Units;
23+
24+
namespace UnitsNet
25+
{
26+
// Windows Runtime Component has constraints on public types: https://msdn.microsoft.com/en-us/library/br230301.aspx#Declaring types in Windows Runtime Components
27+
// Public structures can't have any members other than public fields, and those fields must be value types or strings.
28+
// Public classes must be sealed (NotInheritable in Visual Basic). If your programming model requires polymorphism, you can create a public interface and implement that interface on the classes that must be polymorphic.
29+
#if WINDOWS_UWP
30+
public sealed partial class TemperatureDelta
31+
#else
32+
public partial struct TemperatureDelta
33+
#endif
34+
{
35+
// Windows Runtime Component does not allow operator overloads: https://msdn.microsoft.com/en-us/library/br230301.aspx
36+
#if !WINDOWS_UWP
37+
public static LapseRate operator /(TemperatureDelta left, Length right)
38+
{
39+
return LapseRate.FromDegreesCelciusPerKilometer(left.DegreesCelsiusDelta / right.Kilometers);
40+
}
41+
#endif
42+
}
43+
}

UnitsNet/GeneratedCode/UnitSystem.Default.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,7 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
15261526
new CulturesForEnumValue((int) LapseRateUnit.DegreeCelsiusPerKilometer,
15271527
new[]
15281528
{
1529-
new AbbreviationsForCulture("en-US", "°C/m"),
1529+
new AbbreviationsForCulture("en-US", "°C/km"),
15301530
}),
15311531
}),
15321532
new UnitLocalization(typeof (LengthUnit),

UnitsNet/UnitDefinitions/LapseRate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"Localization": [
1212
{
1313
"Culture": "en-US",
14-
"Abbreviations": [ "°C/m" ]
14+
"Abbreviations": [ "°C/km" ]
1515
}
1616
]
1717
}

0 commit comments

Comments
 (0)