Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding density units #205

Merged
merged 2 commits into from
Nov 11, 2016
Merged

Adding density units #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d02f03a
Converting KilogramPer* units to GramPer* and adding Kilo prefix
n-tiz Nov 10, 2016
c921860
Adding missing file
n-tiz Nov 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions UnitsNet.Tests/CustomCode/DensityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ namespace UnitsNet.Tests.CustomCode
{
public class DensityTests : DensityTestsBase
{
protected override double GramsPerCubicCentimeterInOneKilogramPerCubicMeter => 1e-3;
protected override double GramsPerCubicMeterInOneKilogramPerCubicMeter => 1e3;
protected override double GramsPerCubicMillimeterInOneKilogramPerCubicMeter => 1e-6;
protected override double KilogramsPerCubicCentimeterInOneKilogramPerCubicMeter => 1e-6;

protected override double KilogramsPerCubicMeterInOneKilogramPerCubicMeter => 1;
Expand Down
18 changes: 18 additions & 0 deletions UnitsNet.Tests/GeneratedCode/DensityTestsBase.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ namespace UnitsNet.Tests
// ReSharper disable once PartialTypeWithSinglePart
public abstract partial class DensityTestsBase
{
protected abstract double GramsPerCubicCentimeterInOneKilogramPerCubicMeter { get; }
protected abstract double GramsPerCubicMeterInOneKilogramPerCubicMeter { get; }
protected abstract double GramsPerCubicMillimeterInOneKilogramPerCubicMeter { get; }
protected abstract double KilogramsPerCubicCentimeterInOneKilogramPerCubicMeter { get; }
protected abstract double KilogramsPerCubicMeterInOneKilogramPerCubicMeter { get; }
protected abstract double KilogramsPerCubicMillimeterInOneKilogramPerCubicMeter { get; }
Expand All @@ -65,6 +68,9 @@ public abstract partial class DensityTestsBase
protected abstract double TonnesPerCubicMillimeterInOneKilogramPerCubicMeter { get; }

// ReSharper disable VirtualMemberNeverOverriden.Global
protected virtual double GramsPerCubicCentimeterTolerance { get { return 1e-5; } }
protected virtual double GramsPerCubicMeterTolerance { get { return 1e-5; } }
protected virtual double GramsPerCubicMillimeterTolerance { get { return 1e-5; } }
protected virtual double KilogramsPerCubicCentimeterTolerance { get { return 1e-5; } }
protected virtual double KilogramsPerCubicMeterTolerance { get { return 1e-5; } }
protected virtual double KilogramsPerCubicMillimeterTolerance { get { return 1e-5; } }
Expand All @@ -81,6 +87,9 @@ public abstract partial class DensityTestsBase
public void KilogramPerCubicMeterToDensityUnits()
{
Density kilogrampercubicmeter = Density.FromKilogramsPerCubicMeter(1);
Assert.AreEqual(GramsPerCubicCentimeterInOneKilogramPerCubicMeter, kilogrampercubicmeter.GramsPerCubicCentimeter, GramsPerCubicCentimeterTolerance);
Assert.AreEqual(GramsPerCubicMeterInOneKilogramPerCubicMeter, kilogrampercubicmeter.GramsPerCubicMeter, GramsPerCubicMeterTolerance);
Assert.AreEqual(GramsPerCubicMillimeterInOneKilogramPerCubicMeter, kilogrampercubicmeter.GramsPerCubicMillimeter, GramsPerCubicMillimeterTolerance);
Assert.AreEqual(KilogramsPerCubicCentimeterInOneKilogramPerCubicMeter, kilogrampercubicmeter.KilogramsPerCubicCentimeter, KilogramsPerCubicCentimeterTolerance);
Assert.AreEqual(KilogramsPerCubicMeterInOneKilogramPerCubicMeter, kilogrampercubicmeter.KilogramsPerCubicMeter, KilogramsPerCubicMeterTolerance);
Assert.AreEqual(KilogramsPerCubicMillimeterInOneKilogramPerCubicMeter, kilogrampercubicmeter.KilogramsPerCubicMillimeter, KilogramsPerCubicMillimeterTolerance);
Expand All @@ -96,6 +105,9 @@ public void KilogramPerCubicMeterToDensityUnits()
[Test]
public void FromValueAndUnit()
{
Assert.AreEqual(1, Density.From(1, DensityUnit.GramPerCubicCentimeter).GramsPerCubicCentimeter, GramsPerCubicCentimeterTolerance);
Assert.AreEqual(1, Density.From(1, DensityUnit.GramPerCubicMeter).GramsPerCubicMeter, GramsPerCubicMeterTolerance);
Assert.AreEqual(1, Density.From(1, DensityUnit.GramPerCubicMillimeter).GramsPerCubicMillimeter, GramsPerCubicMillimeterTolerance);
Assert.AreEqual(1, Density.From(1, DensityUnit.KilogramPerCubicCentimeter).KilogramsPerCubicCentimeter, KilogramsPerCubicCentimeterTolerance);
Assert.AreEqual(1, Density.From(1, DensityUnit.KilogramPerCubicMeter).KilogramsPerCubicMeter, KilogramsPerCubicMeterTolerance);
Assert.AreEqual(1, Density.From(1, DensityUnit.KilogramPerCubicMillimeter).KilogramsPerCubicMillimeter, KilogramsPerCubicMillimeterTolerance);
Expand All @@ -112,6 +124,9 @@ public void FromValueAndUnit()
public void As()
{
var kilogrampercubicmeter = Density.FromKilogramsPerCubicMeter(1);
Assert.AreEqual(GramsPerCubicCentimeterInOneKilogramPerCubicMeter, kilogrampercubicmeter.As(DensityUnit.GramPerCubicCentimeter), GramsPerCubicCentimeterTolerance);
Assert.AreEqual(GramsPerCubicMeterInOneKilogramPerCubicMeter, kilogrampercubicmeter.As(DensityUnit.GramPerCubicMeter), GramsPerCubicMeterTolerance);
Assert.AreEqual(GramsPerCubicMillimeterInOneKilogramPerCubicMeter, kilogrampercubicmeter.As(DensityUnit.GramPerCubicMillimeter), GramsPerCubicMillimeterTolerance);
Assert.AreEqual(KilogramsPerCubicCentimeterInOneKilogramPerCubicMeter, kilogrampercubicmeter.As(DensityUnit.KilogramPerCubicCentimeter), KilogramsPerCubicCentimeterTolerance);
Assert.AreEqual(KilogramsPerCubicMeterInOneKilogramPerCubicMeter, kilogrampercubicmeter.As(DensityUnit.KilogramPerCubicMeter), KilogramsPerCubicMeterTolerance);
Assert.AreEqual(KilogramsPerCubicMillimeterInOneKilogramPerCubicMeter, kilogrampercubicmeter.As(DensityUnit.KilogramPerCubicMillimeter), KilogramsPerCubicMillimeterTolerance);
Expand All @@ -128,6 +143,9 @@ public void As()
public void ConversionRoundTrip()
{
Density kilogrampercubicmeter = Density.FromKilogramsPerCubicMeter(1);
Assert.AreEqual(1, Density.FromGramsPerCubicCentimeter(kilogrampercubicmeter.GramsPerCubicCentimeter).KilogramsPerCubicMeter, GramsPerCubicCentimeterTolerance);
Assert.AreEqual(1, Density.FromGramsPerCubicMeter(kilogrampercubicmeter.GramsPerCubicMeter).KilogramsPerCubicMeter, GramsPerCubicMeterTolerance);
Assert.AreEqual(1, Density.FromGramsPerCubicMillimeter(kilogrampercubicmeter.GramsPerCubicMillimeter).KilogramsPerCubicMeter, GramsPerCubicMillimeterTolerance);
Assert.AreEqual(1, Density.FromKilogramsPerCubicCentimeter(kilogrampercubicmeter.KilogramsPerCubicCentimeter).KilogramsPerCubicMeter, KilogramsPerCubicCentimeterTolerance);
Assert.AreEqual(1, Density.FromKilogramsPerCubicMeter(kilogrampercubicmeter.KilogramsPerCubicMeter).KilogramsPerCubicMeter, KilogramsPerCubicMeterTolerance);
Assert.AreEqual(1, Density.FromKilogramsPerCubicMillimeter(kilogrampercubicmeter.KilogramsPerCubicMillimeter).KilogramsPerCubicMeter, KilogramsPerCubicMillimeterTolerance);
Expand Down
3 changes: 3 additions & 0 deletions UnitsNet/GeneratedCode/Enums/DensityUnit.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ namespace UnitsNet.Units
public enum DensityUnit
{
Undefined = 0,
GramPerCubicCentimeter,
GramPerCubicMeter,
GramPerCubicMillimeter,
KilogramPerCubicCentimeter,
KilogramPerCubicMeter,
KilogramPerCubicMillimeter,
Expand Down
102 changes: 102 additions & 0 deletions UnitsNet/GeneratedCode/Extensions/Number/NumberToDensityExtensions.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,108 @@ namespace UnitsNet.Extensions.NumberToDensity
{
public static class NumberToDensityExtensions
{
#region GramPerCubicCentimeter

/// <inheritdoc cref="Density.FromGramsPerCubicCentimeter(double)"/>
public static Density GramsPerCubicCentimeter(this int value) => Density.FromGramsPerCubicCentimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicCentimeter(double?)"/>
public static Density? GramsPerCubicCentimeter(this int? value) => Density.FromGramsPerCubicCentimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicCentimeter(double)"/>
public static Density GramsPerCubicCentimeter(this long value) => Density.FromGramsPerCubicCentimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicCentimeter(double?)"/>
public static Density? GramsPerCubicCentimeter(this long? value) => Density.FromGramsPerCubicCentimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicCentimeter(double)"/>
public static Density GramsPerCubicCentimeter(this double value) => Density.FromGramsPerCubicCentimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicCentimeter(double?)"/>
public static Density? GramsPerCubicCentimeter(this double? value) => Density.FromGramsPerCubicCentimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicCentimeter(double)"/>
public static Density GramsPerCubicCentimeter(this float value) => Density.FromGramsPerCubicCentimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicCentimeter(double?)"/>
public static Density? GramsPerCubicCentimeter(this float? value) => Density.FromGramsPerCubicCentimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicCentimeter(double)"/>
public static Density GramsPerCubicCentimeter(this decimal value) => Density.FromGramsPerCubicCentimeter(Convert.ToDouble(value));

/// <inheritdoc cref="Density.FromGramsPerCubicCentimeter(double?)"/>
public static Density? GramsPerCubicCentimeter(this decimal? value) => Density.FromGramsPerCubicCentimeter(value == null ? (double?)null : Convert.ToDouble(value.Value));

#endregion

#region GramPerCubicMeter

/// <inheritdoc cref="Density.FromGramsPerCubicMeter(double)"/>
public static Density GramsPerCubicMeter(this int value) => Density.FromGramsPerCubicMeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMeter(double?)"/>
public static Density? GramsPerCubicMeter(this int? value) => Density.FromGramsPerCubicMeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMeter(double)"/>
public static Density GramsPerCubicMeter(this long value) => Density.FromGramsPerCubicMeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMeter(double?)"/>
public static Density? GramsPerCubicMeter(this long? value) => Density.FromGramsPerCubicMeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMeter(double)"/>
public static Density GramsPerCubicMeter(this double value) => Density.FromGramsPerCubicMeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMeter(double?)"/>
public static Density? GramsPerCubicMeter(this double? value) => Density.FromGramsPerCubicMeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMeter(double)"/>
public static Density GramsPerCubicMeter(this float value) => Density.FromGramsPerCubicMeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMeter(double?)"/>
public static Density? GramsPerCubicMeter(this float? value) => Density.FromGramsPerCubicMeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMeter(double)"/>
public static Density GramsPerCubicMeter(this decimal value) => Density.FromGramsPerCubicMeter(Convert.ToDouble(value));

/// <inheritdoc cref="Density.FromGramsPerCubicMeter(double?)"/>
public static Density? GramsPerCubicMeter(this decimal? value) => Density.FromGramsPerCubicMeter(value == null ? (double?)null : Convert.ToDouble(value.Value));

#endregion

#region GramPerCubicMillimeter

/// <inheritdoc cref="Density.FromGramsPerCubicMillimeter(double)"/>
public static Density GramsPerCubicMillimeter(this int value) => Density.FromGramsPerCubicMillimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMillimeter(double?)"/>
public static Density? GramsPerCubicMillimeter(this int? value) => Density.FromGramsPerCubicMillimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMillimeter(double)"/>
public static Density GramsPerCubicMillimeter(this long value) => Density.FromGramsPerCubicMillimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMillimeter(double?)"/>
public static Density? GramsPerCubicMillimeter(this long? value) => Density.FromGramsPerCubicMillimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMillimeter(double)"/>
public static Density GramsPerCubicMillimeter(this double value) => Density.FromGramsPerCubicMillimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMillimeter(double?)"/>
public static Density? GramsPerCubicMillimeter(this double? value) => Density.FromGramsPerCubicMillimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMillimeter(double)"/>
public static Density GramsPerCubicMillimeter(this float value) => Density.FromGramsPerCubicMillimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMillimeter(double?)"/>
public static Density? GramsPerCubicMillimeter(this float? value) => Density.FromGramsPerCubicMillimeter(value);

/// <inheritdoc cref="Density.FromGramsPerCubicMillimeter(double)"/>
public static Density GramsPerCubicMillimeter(this decimal value) => Density.FromGramsPerCubicMillimeter(Convert.ToDouble(value));

/// <inheritdoc cref="Density.FromGramsPerCubicMillimeter(double?)"/>
public static Density? GramsPerCubicMillimeter(this decimal? value) => Density.FromGramsPerCubicMillimeter(value == null ? (double?)null : Convert.ToDouble(value.Value));

#endregion

#region KilogramPerCubicCentimeter

/// <inheritdoc cref="Density.FromKilogramsPerCubicCentimeter(double)"/>
Expand Down
Loading