Skip to content

Commit

Permalink
Merge pull request #177 from dtsvetkov/feature/LitersPerHour
Browse files Browse the repository at this point in the history 
New flow unit added - LitersPerHour
  • Loading branch information
@angularsen
angularsen committed Aug 2, 2016
2 parents c6b09f7 + 0faaf19 commit 0ae3079
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 0 deletions.
2 changes: 2 additions & 0 deletions UnitsNet.Tests/CustomCode/FlowTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public class FlowTests : FlowTestsBase

protected override double LitersPerMinuteInOneCubicMeterPerSecond => 60000.00000;

protected override double LitersPerHourInOneCubicMeterPerSecond => 3600000.00000;

protected override double NanolitersPerMinuteInOneCubicMeterPerSecond => 60000000000000.00000;

protected override double MicrolitersPerMinuteInOneCubicMeterPerSecond => 60000000000.00000;
Expand Down
6 changes: 6 additions & 0 deletions UnitsNet.Tests/GeneratedCode/FlowTestsBase.g.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public abstract partial class FlowTestsBase
protected abstract double CubicMetersPerSecondInOneCubicMeterPerSecond { get; }
protected abstract double DecilitersPerMinuteInOneCubicMeterPerSecond { get; }
protected abstract double KilolitersPerMinuteInOneCubicMeterPerSecond { get; }
protected abstract double LitersPerHourInOneCubicMeterPerSecond { get; }
protected abstract double LitersPerMinuteInOneCubicMeterPerSecond { get; }
protected abstract double MicrolitersPerMinuteInOneCubicMeterPerSecond { get; }
protected abstract double MillilitersPerMinuteInOneCubicMeterPerSecond { get; }
Expand All @@ -58,6 +59,7 @@ public abstract partial class FlowTestsBase
protected virtual double CubicMetersPerSecondTolerance { get { return 1e-5; } }
protected virtual double DecilitersPerMinuteTolerance { get { return 1e-5; } }
protected virtual double KilolitersPerMinuteTolerance { get { return 1e-5; } }
protected virtual double LitersPerHourTolerance { get { return 1e-5; } }
protected virtual double LitersPerMinuteTolerance { get { return 1e-5; } }
protected virtual double MicrolitersPerMinuteTolerance { get { return 1e-5; } }
protected virtual double MillilitersPerMinuteTolerance { get { return 1e-5; } }
Expand All @@ -77,6 +79,7 @@ public void CubicMeterPerSecondToFlowUnits()
Assert.AreEqual(CubicMetersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.CubicMetersPerSecond, CubicMetersPerSecondTolerance);
Assert.AreEqual(DecilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.DecilitersPerMinute, DecilitersPerMinuteTolerance);
Assert.AreEqual(KilolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.KilolitersPerMinute, KilolitersPerMinuteTolerance);
Assert.AreEqual(LitersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.LitersPerHour, LitersPerHourTolerance);
Assert.AreEqual(LitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.LitersPerMinute, LitersPerMinuteTolerance);
Assert.AreEqual(MicrolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.MicrolitersPerMinute, MicrolitersPerMinuteTolerance);
Assert.AreEqual(MillilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.MillilitersPerMinute, MillilitersPerMinuteTolerance);
Expand All @@ -95,6 +98,7 @@ public void FromValueAndUnit()
Assert.AreEqual(1, Flow.From(1, FlowUnit.CubicMeterPerSecond).CubicMetersPerSecond, CubicMetersPerSecondTolerance);
Assert.AreEqual(1, Flow.From(1, FlowUnit.DecilitersPerMinute).DecilitersPerMinute, DecilitersPerMinuteTolerance);
Assert.AreEqual(1, Flow.From(1, FlowUnit.KilolitersPerMinute).KilolitersPerMinute, KilolitersPerMinuteTolerance);
Assert.AreEqual(1, Flow.From(1, FlowUnit.LitersPerHour).LitersPerHour, LitersPerHourTolerance);
Assert.AreEqual(1, Flow.From(1, FlowUnit.LitersPerMinute).LitersPerMinute, LitersPerMinuteTolerance);
Assert.AreEqual(1, Flow.From(1, FlowUnit.MicrolitersPerMinute).MicrolitersPerMinute, MicrolitersPerMinuteTolerance);
Assert.AreEqual(1, Flow.From(1, FlowUnit.MillilitersPerMinute).MillilitersPerMinute, MillilitersPerMinuteTolerance);
Expand All @@ -114,6 +118,7 @@ public void As()
Assert.AreEqual(CubicMetersPerSecondInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.CubicMeterPerSecond), CubicMetersPerSecondTolerance);
Assert.AreEqual(DecilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.DecilitersPerMinute), DecilitersPerMinuteTolerance);
Assert.AreEqual(KilolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.KilolitersPerMinute), KilolitersPerMinuteTolerance);
Assert.AreEqual(LitersPerHourInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.LitersPerHour), LitersPerHourTolerance);
Assert.AreEqual(LitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.LitersPerMinute), LitersPerMinuteTolerance);
Assert.AreEqual(MicrolitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.MicrolitersPerMinute), MicrolitersPerMinuteTolerance);
Assert.AreEqual(MillilitersPerMinuteInOneCubicMeterPerSecond, cubicmeterpersecond.As(FlowUnit.MillilitersPerMinute), MillilitersPerMinuteTolerance);
Expand All @@ -133,6 +138,7 @@ public void ConversionRoundTrip()
Assert.AreEqual(1, Flow.FromCubicMetersPerSecond(cubicmeterpersecond.CubicMetersPerSecond).CubicMetersPerSecond, CubicMetersPerSecondTolerance);
Assert.AreEqual(1, Flow.FromDecilitersPerMinute(cubicmeterpersecond.DecilitersPerMinute).CubicMetersPerSecond, DecilitersPerMinuteTolerance);
Assert.AreEqual(1, Flow.FromKilolitersPerMinute(cubicmeterpersecond.KilolitersPerMinute).CubicMetersPerSecond, KilolitersPerMinuteTolerance);
Assert.AreEqual(1, Flow.FromLitersPerHour(cubicmeterpersecond.LitersPerHour).CubicMetersPerSecond, LitersPerHourTolerance);
Assert.AreEqual(1, Flow.FromLitersPerMinute(cubicmeterpersecond.LitersPerMinute).CubicMetersPerSecond, LitersPerMinuteTolerance);
Assert.AreEqual(1, Flow.FromMicrolitersPerMinute(cubicmeterpersecond.MicrolitersPerMinute).CubicMetersPerSecond, MicrolitersPerMinuteTolerance);
Assert.AreEqual(1, Flow.FromMillilitersPerMinute(cubicmeterpersecond.MillilitersPerMinute).CubicMetersPerSecond, MillilitersPerMinuteTolerance);
Expand Down
1 change: 1 addition & 0 deletions UnitsNet/GeneratedCode/Enums/FlowUnit.g.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public enum FlowUnit
CubicMeterPerSecond,
DecilitersPerMinute,
KilolitersPerMinute,
LitersPerHour,
LitersPerMinute,
MicrolitersPerMinute,
MillilitersPerMinute,
Expand Down
37 changes: 37 additions & 0 deletions UnitsNet/GeneratedCode/UnitClasses/Flow.g.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,14 @@ public double KilolitersPerMinute
get { return (_cubicMetersPerSecond*60000.00000) / 1e3d; }
}

/// <summary>
/// Get Flow in LitersPerHour.
/// </summary>
public double LitersPerHour
{
get { return _cubicMetersPerSecond*3600000.000; }
}

/// <summary>
/// Get Flow in LitersPerMinute.
/// </summary>
Expand Down Expand Up @@ -262,6 +270,14 @@ public static Flow FromKilolitersPerMinute(double kilolitersperminute)
return new Flow((kilolitersperminute/60000.00000) * 1e3d);
}

/// <summary>
/// Get Flow from LitersPerHour.
/// </summary>
public static Flow FromLitersPerHour(double litersperhour)
{
return new Flow(litersperhour/3600000.000);
}

/// <summary>
/// Get Flow from LitersPerMinute.
/// </summary>
Expand Down Expand Up @@ -416,6 +432,21 @@ public static Flow FromUsGallonsPerMinute(double usgallonsperminute)
}
}

/// <summary>
/// Get nullable Flow from nullable LitersPerHour.
/// </summary>
public static Flow? FromLitersPerHour(double? litersperhour)
{
if (litersperhour.HasValue)
{
return FromLitersPerHour(litersperhour.Value);
}
else
{
return null;
}
}

/// <summary>
/// Get nullable Flow from nullable LitersPerMinute.
/// </summary>
Expand Down Expand Up @@ -532,6 +563,8 @@ public static Flow From(double val, FlowUnit fromUnit)
return FromDecilitersPerMinute(val);
case FlowUnit.KilolitersPerMinute:
return FromKilolitersPerMinute(val);
case FlowUnit.LitersPerHour:
return FromLitersPerHour(val);
case FlowUnit.LitersPerMinute:
return FromLitersPerMinute(val);
case FlowUnit.MicrolitersPerMinute:
Expand Down Expand Up @@ -579,6 +612,8 @@ public static Flow From(double val, FlowUnit fromUnit)
return FromDecilitersPerMinute(value.Value);
case FlowUnit.KilolitersPerMinute:
return FromKilolitersPerMinute(value.Value);
case FlowUnit.LitersPerHour:
return FromLitersPerHour(value.Value);
case FlowUnit.LitersPerMinute:
return FromLitersPerMinute(value.Value);
case FlowUnit.MicrolitersPerMinute:
Expand Down Expand Up @@ -759,6 +794,8 @@ public double As(FlowUnit unit)
return DecilitersPerMinute;
case FlowUnit.KilolitersPerMinute:
return KilolitersPerMinute;
case FlowUnit.LitersPerHour:
return LitersPerHour;
case FlowUnit.LitersPerMinute:
return LitersPerMinute;
case FlowUnit.MicrolitersPerMinute:
Expand Down
6 changes: 6 additions & 0 deletions UnitsNet/GeneratedCode/UnitSystem.Default.g.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,12 @@ public sealed partial class UnitSystem
{
new AbbreviationsForCulture("en-US", "kLPM"),
}),
new CulturesForEnumValue((int) FlowUnit.LitersPerHour,
new[]
{
new AbbreviationsForCulture("en-US", "LPH"),
new AbbreviationsForCulture("ru-RU", "л/ч"),
}),
new CulturesForEnumValue((int) FlowUnit.LitersPerMinute,
new[]
{
Expand Down
16 changes: 16 additions & 0 deletions UnitsNet/Scripts/UnitDefinitions/Flow.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,22 @@
}
]
},
{
"SingularName": "LitersPerHour",
"PluralName": "LitersPerHour",
"FromUnitToBaseFunc": "x/3600000.000",
"FromBaseToUnitFunc": "x*3600000.000",
"Localization": [
{
"Culture": "en-US",
"Abbreviations": [ "LPH" ]
},
{
"Culture": "ru-RU",
"Abbreviations": [ "л/ч" ]
}
]
},
{
"SingularName": "UsGallonsPerMinute",
"PluralName": "UsGallonsPerMinute",
Expand Down

2 comments on commit 0ae3079

@angularsen
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Units.NET :: Master Build 66 is now running

@angularsen
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Units.NET :: Master Build 66 outcome was SUCCESS
Summary: Tests passed: 820 Build time: 0:0:36

Please sign in to comment.