Skip to content

Dimensionless #528

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.

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

Merged
merged 5 commits into from
Oct 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions UnitsNet.Tests/BaseDimensionsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -721,5 +721,24 @@ public void GetHashCodeWorksProperly()
Assert.True(baseDimensions1.GetHashCode() != baseDimensions2.GetHashCode());
Assert.True(baseDimensions1.GetHashCode() == baseDimensions3.GetHashCode());
}

[Fact]
public void DimensionlessPropertyIsCorrect()
{
Assert.True(BaseDimensions.Dimensionless == new BaseDimensions(0, 0, 0, 0, 0, 0, 0));
}

[Fact]
public void IsDimensionlessMethodImplementedCorrectly()
{
Assert.True(BaseDimensions.Dimensionless.IsDimensionless());
Assert.True(new BaseDimensions(0, 0, 0, 0, 0, 0, 0).IsDimensionless());

Assert.False(BaseDimensions.Dimensionless.IsBaseQuantity());
Assert.False(BaseDimensions.Dimensionless.IsDerivedQuantity());

// Example case
Assert.True(Level.BaseDimensions.IsDimensionless());
}
}
}
8 changes: 7 additions & 1 deletion UnitsNet.Tests/GeneratedCode/InformationTestsBase.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ public void UnitsDoesNotContainUndefined()
}

[Fact]
public void AllUnitsHaveAtLeastOneAbbreviationSpecified()
public void HasAtLeastOneAbbreviationSpecified()
{
var units = Enum.GetValues(typeof(InformationUnit)).Cast<InformationUnit>();
foreach(var unit in units)
Expand All @@ -446,5 +446,11 @@ public void AllUnitsHaveAtLeastOneAbbreviationSpecified()
var defaultAbbreviation = UnitAbbreviationsCache.Default.GetDefaultAbbreviation(unit);
}
}

[Fact]
public void BaseDimensionsShouldNeverBeNull()
{
Assert.False(Information.BaseDimensions is null);
}
}
}
8 changes: 7 additions & 1 deletion UnitsNet.Tests/GeneratedCode/LengthTestsBase.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ public void UnitsDoesNotContainUndefined()
}

[Fact]
public void AllUnitsHaveAtLeastOneAbbreviationSpecified()
public void HasAtLeastOneAbbreviationSpecified()
{
var units = Enum.GetValues(typeof(LengthUnit)).Cast<LengthUnit>();
foreach(var unit in units)
Expand All @@ -430,5 +430,11 @@ public void AllUnitsHaveAtLeastOneAbbreviationSpecified()
var defaultAbbreviation = UnitAbbreviationsCache.Default.GetDefaultAbbreviation(unit);
}
}

[Fact]
public void BaseDimensionsShouldNeverBeNull()
{
Assert.False(Length.BaseDimensions is null);
}
}
}
8 changes: 7 additions & 1 deletion UnitsNet.Tests/GeneratedCode/LevelTestsBase.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public void UnitsDoesNotContainUndefined()
}

[Fact]
public void AllUnitsHaveAtLeastOneAbbreviationSpecified()
public void HasAtLeastOneAbbreviationSpecified()
{
var units = Enum.GetValues(typeof(LevelUnit)).Cast<LevelUnit>();
foreach(var unit in units)
Expand All @@ -235,5 +235,11 @@ public void AllUnitsHaveAtLeastOneAbbreviationSpecified()
var defaultAbbreviation = UnitAbbreviationsCache.Default.GetDefaultAbbreviation(unit);
}
}

[Fact]
public void BaseDimensionsShouldNeverBeNull()
{
Assert.False(Level.BaseDimensions is null);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public sealed partial class Information : IQuantity

static Information()
{
BaseDimensions = new BaseDimensions(0, 0, 0, 0, 0, 0, 0);
BaseDimensions = BaseDimensions.Dimensionless;
}
/// <summary>
/// Creates the quantity with a value of 0 in the base unit Bit.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public sealed partial class Level : IQuantity

static Level()
{
BaseDimensions = new BaseDimensions(0, 0, 0, 0, 0, 0, 0);
BaseDimensions = BaseDimensions.Dimensionless;
}
/// <summary>
/// Creates the quantity with a value of 0 in the base unit Decibel.
Expand Down
18 changes: 16 additions & 2 deletions UnitsNet/BaseDimensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,21 @@ public bool IsBaseQuantity()
}

/// <summary>
/// Checks the dimensions represent a derived quantity.
/// Checks if the dimensions represent a derived quantity.
/// </summary>
/// <returns>True if the dimensions represent a derived quantity, otherwise false.</returns>
public bool IsDerivedQuantity()
{
return !IsBaseQuantity();
return !IsBaseQuantity() && !IsDimensionless();
}

/// <summary>
/// Checks if this base dimensions object represents a dimensionless quantity.
/// </summary>
/// <returns>True if this object represents a dimensionless quantity, otherwise false.</returns>
public bool IsDimensionless()
{
return this == Dimensionless;
}

/// <inheritdoc />
Expand Down Expand Up @@ -246,5 +255,10 @@ private static void AppendDimensionString(StringBuilder sb, string name, int val
/// Gets the luminous intensity dimensions (J).
/// </summary>
public int LuminousIntensity{ get; }

/// <summary>
/// Represents a dimensionless (unitless) quantity.
/// </summary>
public static BaseDimensions Dimensionless { get; } = new BaseDimensions(0, 0, 0, 0, 0, 0, 0);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public partial struct Information : IQuantity<InformationUnit>, IComparable, ICo

static Information()
{
BaseDimensions = new BaseDimensions(0, 0, 0, 0, 0, 0, 0);
BaseDimensions = BaseDimensions.Dimensionless;
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion UnitsNet/GeneratedCode/Quantities/Level.NetFramework.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public partial struct Level : IQuantity<LevelUnit>, IComparable, IComparable<Lev

static Level()
{
BaseDimensions = new BaseDimensions(0, 0, 0, 0, 0, 0, 0);
BaseDimensions = BaseDimensions.Dimensionless;
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ function GenerateQuantitySourceCodeNetFramework([Quantity]$quantity, [string]$ta
$unitEnumName = "$quantityName" + "Unit"
$wrc = $target -eq "WindowsRuntimeComponent"
$privateAccessModifierIfWrc = if ($wrc) { "private" } else { "public" }

$baseDimensions = $quantity.BaseDimensions;
$isDimensionless = $baseDimensions -eq $null -or ( $baseDimensions.Length -eq 0 -and $baseDimensions.Mass -eq 0 -and $baseDimensions.Time -eq 0 -and $baseDimensions.ElectricCurrent -eq 0 -and $baseDimensions.Temperature -eq 0 -and $baseDimensions.AmountOfSubstance -eq 0 -and $baseDimensions.LuminousIntensity -eq 0 )

[GeneratorArgs]$genArgs = New-Object GeneratorArgs -Property @{
Quantity = $quantity;
Expand Down Expand Up @@ -112,10 +114,15 @@ if ($obsoleteAttribute)

static $quantityName()
{
"@; if($baseDimensions)
"@; if($isDimensionless)
{@"
BaseDimensions = BaseDimensions.Dimensionless;
"@; }
else
{@"
BaseDimensions = new BaseDimensions($($baseDimensions.Length), $($baseDimensions.Mass), $($baseDimensions.Time), $($baseDimensions.ElectricCurrent), $($baseDimensions.Temperature), $($baseDimensions.AmountOfSubstance), $($baseDimensions.LuminousIntensity));
"@; }@"
"@; }
@"
}
"@; # Windows Runtime Component requires a default constructor
if ($wrc) {@"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ namespace UnitsNet.Tests
}

[Fact]
public void AllUnitsHaveAtLeastOneAbbreviationSpecified()
public void HasAtLeastOneAbbreviationSpecified()
{
var units = Enum.GetValues(typeof($unitEnumName)).Cast<$unitEnumName>();
foreach(var unit in units)
Expand All @@ -275,6 +275,12 @@ namespace UnitsNet.Tests
var defaultAbbreviation = UnitAbbreviationsCache.Default.GetDefaultAbbreviation(unit);
}
}

[Fact]
public void BaseDimensionsShouldNeverBeNull()
{
Assert.False($quantityName.BaseDimensions is null);
}
}
}
"@;
Expand Down