Skip to content

Commit 0ae3079

Browse files
angularsenangularsen
authored
Merge pull request #177 from dtsvetkov/feature/LitersPerHour
New flow unit added - LitersPerHour
2 parents c6b09f7 + 0faaf19 commit 0ae3079

File tree

6 files changed

+68
-0
lines changed

6 files changed

+68
-0
lines changed

‎UnitsNet.Tests/CustomCode/FlowTests.cs‎

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

3838
protected override double LitersPerMinuteInOneCubicMeterPerSecond => 60000.00000;
3939

40+
protected override double LitersPerHourInOneCubicMeterPerSecond => 3600000.00000;
41+
4042
protected override double NanolitersPerMinuteInOneCubicMeterPerSecond => 60000000000000.00000;
4143

4244
protected override double MicrolitersPerMinuteInOneCubicMeterPerSecond => 60000000000.00000;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public abstract partial class FlowTestsBase
4343
protected abstract double CubicMetersPerSecondInOneCubicMeterPerSecond { get; }
4444
protected abstract double DecilitersPerMinuteInOneCubicMeterPerSecond { get; }
4545
protected abstract double KilolitersPerMinuteInOneCubicMeterPerSecond { get; }
46+
protected abstract double LitersPerHourInOneCubicMeterPerSecond { get; }
4647
protected abstract double LitersPerMinuteInOneCubicMeterPerSecond { get; }
4748
protected abstract double MicrolitersPerMinuteInOneCubicMeterPerSecond { get; }
4849
protected abstract double MillilitersPerMinuteInOneCubicMeterPerSecond { get; }
@@ -58,6 +59,7 @@ public abstract partial class FlowTestsBase
5859
protected virtual double CubicMetersPerSecondTolerance { get { return 1e-5; } }
5960
protected virtual double DecilitersPerMinuteTolerance { get { return 1e-5; } }
6061
protected virtual double KilolitersPerMinuteTolerance { get { return 1e-5; } }
62+
protected virtual double LitersPerHourTolerance { get { return 1e-5; } }
6163
protected virtual double LitersPerMinuteTolerance { get { return 1e-5; } }
6264
protected virtual double MicrolitersPerMinuteTolerance { get { return 1e-5; } }
6365
protected virtual double MillilitersPerMinuteTolerance { get { return 1e-5; } }
@@ -77,6 +79,7 @@ public void CubicMeterPerSecondToFlowUnits()
7779
Assert.AreEqual(CubicMetersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.CubicMetersPerSecond, CubicMetersPerSecondTolerance);
7880
Assert.AreEqual(DecilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.DecilitersPerMinute, DecilitersPerMinuteTolerance);
7981
Assert.AreEqual(KilolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.KilolitersPerMinute, KilolitersPerMinuteTolerance);
82+
Assert.AreEqual(LitersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.LitersPerHour, LitersPerHourTolerance);
8083
Assert.AreEqual(LitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.LitersPerMinute, LitersPerMinuteTolerance);
8184
Assert.AreEqual(MicrolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.MicrolitersPerMinute, MicrolitersPerMinuteTolerance);
8285
Assert.AreEqual(MillilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.MillilitersPerMinute, MillilitersPerMinuteTolerance);
@@ -95,6 +98,7 @@ public void FromValueAndUnit()
9598
Assert.AreEqual(1, Flow.From(1, FlowUnit.CubicMeterPerSecond).CubicMetersPerSecond, CubicMetersPerSecondTolerance);
9699
Assert.AreEqual(1, Flow.From(1, FlowUnit.DecilitersPerMinute).DecilitersPerMinute, DecilitersPerMinuteTolerance);
97100
Assert.AreEqual(1, Flow.From(1, FlowUnit.KilolitersPerMinute).KilolitersPerMinute, KilolitersPerMinuteTolerance);
101+
Assert.AreEqual(1, Flow.From(1, FlowUnit.LitersPerHour).LitersPerHour, LitersPerHourTolerance);
98102
Assert.AreEqual(1, Flow.From(1, FlowUnit.LitersPerMinute).LitersPerMinute, LitersPerMinuteTolerance);
99103
Assert.AreEqual(1, Flow.From(1, FlowUnit.MicrolitersPerMinute).MicrolitersPerMinute, MicrolitersPerMinuteTolerance);
100104
Assert.AreEqual(1, Flow.From(1, FlowUnit.MillilitersPerMinute).MillilitersPerMinute, MillilitersPerMinuteTolerance);
@@ -114,6 +118,7 @@ public void As()
114118
Assert.AreEqual(CubicMetersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicMeterPerSecond), CubicMetersPerSecondTolerance);
115119
Assert.AreEqual(DecilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.DecilitersPerMinute), DecilitersPerMinuteTolerance);
116120
Assert.AreEqual(KilolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.KilolitersPerMinute), KilolitersPerMinuteTolerance);
121+
Assert.AreEqual(LitersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.LitersPerHour), LitersPerHourTolerance);
117122
Assert.AreEqual(LitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.LitersPerMinute), LitersPerMinuteTolerance);
118123
Assert.AreEqual(MicrolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.MicrolitersPerMinute), MicrolitersPerMinuteTolerance);
119124
Assert.AreEqual(MillilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.MillilitersPerMinute), MillilitersPerMinuteTolerance);
@@ -133,6 +138,7 @@ public void ConversionRoundTrip()
133138
Assert.AreEqual(1, Flow.FromCubicMetersPerSecond(cubicmeterpersecond.CubicMetersPerSecond).CubicMetersPerSecond, CubicMetersPerSecondTolerance);
134139
Assert.AreEqual(1, Flow.FromDecilitersPerMinute(cubicmeterpersecond.DecilitersPerMinute).CubicMetersPerSecond, DecilitersPerMinuteTolerance);
135140
Assert.AreEqual(1, Flow.FromKilolitersPerMinute(cubicmeterpersecond.KilolitersPerMinute).CubicMetersPerSecond, KilolitersPerMinuteTolerance);
141+
Assert.AreEqual(1, Flow.FromLitersPerHour(cubicmeterpersecond.LitersPerHour).CubicMetersPerSecond, LitersPerHourTolerance);
136142
Assert.AreEqual(1, Flow.FromLitersPerMinute(cubicmeterpersecond.LitersPerMinute).CubicMetersPerSecond, LitersPerMinuteTolerance);
137143
Assert.AreEqual(1, Flow.FromMicrolitersPerMinute(cubicmeterpersecond.MicrolitersPerMinute).CubicMetersPerSecond, MicrolitersPerMinuteTolerance);
138144
Assert.AreEqual(1, Flow.FromMillilitersPerMinute(cubicmeterpersecond.MillilitersPerMinute).CubicMetersPerSecond, MillilitersPerMinuteTolerance);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public enum FlowUnit
3232
CubicMeterPerSecond,
3333
DecilitersPerMinute,
3434
KilolitersPerMinute,
35+
LitersPerHour,
3536
LitersPerMinute,
3637
MicrolitersPerMinute,
3738
MillilitersPerMinute,

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,14 @@ public double KilolitersPerMinute
149149
get { return (_cubicMetersPerSecond*60000.00000) / 1e3d; }
150150
}
151151

152+
/// <summary>
153+
/// Get Flow in LitersPerHour.
154+
/// </summary>
155+
public double LitersPerHour
156+
{
157+
get { return _cubicMetersPerSecond*3600000.000; }
158+
}
159+
152160
/// <summary>
153161
/// Get Flow in LitersPerMinute.
154162
/// </summary>
@@ -262,6 +270,14 @@ public static Flow FromKilolitersPerMinute(double kilolitersperminute)
262270
return new Flow((kilolitersperminute/60000.00000) * 1e3d);
263271
}
264272

273+
/// <summary>
274+
/// Get Flow from LitersPerHour.
275+
/// </summary>
276+
public static Flow FromLitersPerHour(double litersperhour)
277+
{
278+
return new Flow(litersperhour/3600000.000);
279+
}
280+
265281
/// <summary>
266282
/// Get Flow from LitersPerMinute.
267283
/// </summary>
@@ -416,6 +432,21 @@ public static Flow FromUsGallonsPerMinute(double usgallonsperminute)
416432
}
417433
}
418434

435+
/// <summary>
436+
/// Get nullable Flow from nullable LitersPerHour.
437+
/// </summary>
438+
public static Flow? FromLitersPerHour(double? litersperhour)
439+
{
440+
if (litersperhour.HasValue)
441+
{
442+
return FromLitersPerHour(litersperhour.Value);
443+
}
444+
else
445+
{
446+
return null;
447+
}
448+
}
449+
419450
/// <summary>
420451
/// Get nullable Flow from nullable LitersPerMinute.
421452
/// </summary>
@@ -532,6 +563,8 @@ public static Flow From(double val, FlowUnit fromUnit)
532563
return FromDecilitersPerMinute(val);
533564
case FlowUnit.KilolitersPerMinute:
534565
return FromKilolitersPerMinute(val);
566+
case FlowUnit.LitersPerHour:
567+
return FromLitersPerHour(val);
535568
case FlowUnit.LitersPerMinute:
536569
return FromLitersPerMinute(val);
537570
case FlowUnit.MicrolitersPerMinute:
@@ -579,6 +612,8 @@ public static Flow From(double val, FlowUnit fromUnit)
579612
return FromDecilitersPerMinute(value.Value);
580613
case FlowUnit.KilolitersPerMinute:
581614
return FromKilolitersPerMinute(value.Value);
615+
case FlowUnit.LitersPerHour:
616+
return FromLitersPerHour(value.Value);
582617
case FlowUnit.LitersPerMinute:
583618
return FromLitersPerMinute(value.Value);
584619
case FlowUnit.MicrolitersPerMinute:
@@ -759,6 +794,8 @@ public double As(FlowUnit unit)
759794
return DecilitersPerMinute;
760795
case FlowUnit.KilolitersPerMinute:
761796
return KilolitersPerMinute;
797+
case FlowUnit.LitersPerHour:
798+
return LitersPerHour;
762799
case FlowUnit.LitersPerMinute:
763800
return LitersPerMinute;
764801
case FlowUnit.MicrolitersPerMinute:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,12 @@ private static readonly ReadOnlyCollection<UnitLocalization> DefaultLocalization
600600
{
601601
new AbbreviationsForCulture("en-US", "kLPM"),
602602
}),
603+
new CulturesForEnumValue((int) FlowUnit.LitersPerHour,
604+
new[]
605+
{
606+
new AbbreviationsForCulture("en-US", "LPH"),
607+
new AbbreviationsForCulture("ru-RU", "л/ч"),
608+
}),
603609
new CulturesForEnumValue((int) FlowUnit.LitersPerMinute,
604610
new[]
605611
{

‎UnitsNet/Scripts/UnitDefinitions/Flow.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,22 @@
7373
}
7474
]
7575
},
76+
{
77+
"SingularName": "LitersPerHour",
78+
"PluralName": "LitersPerHour",
79+
"FromUnitToBaseFunc": "x/3600000.000",
80+
"FromBaseToUnitFunc": "x*3600000.000",
81+
"Localization": [
82+
{
83+
"Culture": "en-US",
84+
"Abbreviations": [ "LPH" ]
85+
},
86+
{
87+
"Culture": "ru-RU",
88+
"Abbreviations": [ "л/ч" ]
89+
}
90+
]
91+
},
7692
{
7793
"SingularName": "UsGallonsPerMinute",
7894
"PluralName": "UsGallonsPerMinute",

0 commit comments

Comments
 (0)