Skip to content

Replace GetHashCode implementation to match library. Fixing exception… #523

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

Merged
merged 2 commits into from
Oct 15, 2018
Merged

Replace GetHashCode implementation to match library. Fixing exception… #523

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
17acea8
tmilnthorp Oct 15, 2018
283c6b6
tmilnthorp Oct 15, 2018
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
92 changes: 90 additions & 2 deletions UnitsNet.Tests/BaseDimensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,83 @@
using Xunit;
using System;
using System.Collections.Generic;
using Xunit;

namespace UnitsNet.Tests
{
public class BaseDimensionsTests
{
[Fact]
public void EqualityWorksAsExpected()
public void EqualsWorksAsExpected()
{
var baseDimensions1 = new BaseDimensions(1, 2, 3, 4, 5, 6, 7);
var baseDimensions2 = new BaseDimensions(1, 2, 3, 4, 5, 6, 7);

Assert.True(baseDimensions1.Equals(baseDimensions2));
Assert.True(baseDimensions2.Equals(baseDimensions1));

Assert.False(baseDimensions1.Equals(null));
}

[Fact]
public void EqualityOperatorsWorkAsExpected()
{
var baseDimensions1 = new BaseDimensions(1, 2, 3, 4, 5, 6, 7);
var baseDimensions2 = new BaseDimensions(1, 2, 3, 4, 5, 6, 7);

Assert.True(baseDimensions1 == baseDimensions2);
Assert.True(baseDimensions2 == baseDimensions1);

Assert.False(baseDimensions1 == null);
Assert.False(null == baseDimensions1);

Assert.False(baseDimensions2 == null);
Assert.False(null == baseDimensions2);
}

[Fact]
public void InequalityOperatorsWorkAsExpected()
{
var baseDimensions1 = new BaseDimensions(1, 2, 3, 4, 5, 6, 7);
var baseDimensions2 = new BaseDimensions(7, 6, 5, 4, 3, 2, 1);

Assert.True(baseDimensions1 != baseDimensions2);
Assert.True(baseDimensions2 != baseDimensions1);

Assert.True(baseDimensions1 != null);
Assert.True(null != baseDimensions1);

Assert.True(baseDimensions2 != null);
Assert.True(null != baseDimensions2);
}

[Fact]
public void MultiplyThrowsExceptionIfPassedNull()
{
var baseDimensions1 = new BaseDimensions(1, 0, 0, 0, 0, 0, 0);
Assert.Throws<ArgumentNullException>(() => baseDimensions1.Multiply(null));
}

[Fact]
public void DivideThrowsExceptionIfPassedNull()
{
var baseDimensions1 = new BaseDimensions(1, 0, 0, 0, 0, 0, 0);
Assert.Throws<ArgumentNullException>(() => baseDimensions1.Divide(null));
}

[Fact]
public void MultiplyOperatorThrowsExceptionWithNull()
{
var baseDimensions1 = new BaseDimensions(1, 0, 0, 0, 0, 0, 0);
Assert.Throws<ArgumentNullException>(() => baseDimensions1 / null);
Assert.Throws<ArgumentNullException>(() => null / baseDimensions1);
}

[Fact]
public void DivideOperatorThrowsExceptionWithNull()
{
var baseDimensions1 = new BaseDimensions(1, 0, 0, 0, 0, 0, 0);
Assert.Throws<ArgumentNullException>(() => baseDimensions1 * null);
Assert.Throws<ArgumentNullException>(() => null * baseDimensions1);
}

[Fact]
Expand Down Expand Up @@ -575,5 +641,27 @@ public void CheckToStringUsingMolarEntropy()
{
Assert.Equal("[Length]^2[Mass][Time]^-2[Temperature][Amount]", MolarEntropy.BaseDimensions.ToString());
}

[Fact]
public void GetHashCodeWorksProperly()
{
var baseDimensions1 = new BaseDimensions(1, 2, 3, 4, 5, 6, 7);
var baseDimensions2 = new BaseDimensions(7, 6, 5, 4, 3, 2, 1);
var baseDimensions3 = new BaseDimensions(1, 2, 3, 4, 5, 6, 7);

var hashSet = new HashSet<BaseDimensions>();

hashSet.Add(baseDimensions1);
Assert.True(hashSet.Contains(baseDimensions1));

hashSet.Add(baseDimensions2);
Assert.True(hashSet.Contains(baseDimensions2));

// Should be the same as baseDimensions1
Assert.True(hashSet.Contains(baseDimensions3));

Assert.True(baseDimensions1.GetHashCode() != baseDimensions2.GetHashCode());
Assert.True(baseDimensions1.GetHashCode() == baseDimensions3.GetHashCode());
}
}
}
56 changes: 32 additions & 24 deletions UnitsNet/BaseDimensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,29 +47,21 @@ public override bool Equals(object obj)
if(obj is null || !(obj is BaseDimensions))
return false;

var baseDimensionsObj = (BaseDimensions)obj;

return Length == baseDimensionsObj.Length &&
Mass == baseDimensionsObj.Mass &&
Time == baseDimensionsObj.Time &&
Current == baseDimensionsObj.Current &&
Temperature == baseDimensionsObj.Temperature &&
Amount == baseDimensionsObj.Amount &&
LuminousIntensity == baseDimensionsObj.LuminousIntensity;
var other = (BaseDimensions)obj;

return Length == other.Length &&
Mass == other.Mass &&
Time == other.Time &&
Current == other.Current &&
Temperature == other.Temperature &&
Amount == other.Amount &&
LuminousIntensity == other.LuminousIntensity;
}

/// <inheritdoc />
public override int GetHashCode()
{
int hash = 17;
hash = hash * 23 + Length;
hash = hash * 23 + Mass;
hash = hash * 23 + Time;
hash = hash * 23 + Current;
hash = hash * 23 + Temperature;
hash = hash * 23 + Amount;
hash = hash * 23 + LuminousIntensity;
return hash;
return new {Length, Mass, Time, Current, Temperature, Amount, LuminousIntensity}.GetHashCode();
Copy link
Owner

Choose a reason for hiding this comment

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

Nice.

}

/// <summary>
Expand All @@ -79,6 +71,9 @@ public override int GetHashCode()
/// <returns>Resulting dimensions.</returns>
public BaseDimensions Multiply(BaseDimensions right)
{
if(right is null)
throw new ArgumentNullException(nameof(right));

return new BaseDimensions(
Length + right.Length,
Mass + right.Mass,
Expand All @@ -96,6 +91,9 @@ public BaseDimensions Multiply(BaseDimensions right)
/// <returns>Resulting dimensions.</returns>
public BaseDimensions Divide(BaseDimensions right)
{
if(right is null)
throw new ArgumentNullException(nameof(right));

return new BaseDimensions(
Length - right.Length,
Mass - right.Mass,
Expand Down Expand Up @@ -137,6 +135,11 @@ public BaseDimensions Divide(BaseDimensions right)
/// <returns>Resulting dimensions.</returns>
public static BaseDimensions operator *(BaseDimensions left, BaseDimensions right)
{
if(left is null)
throw new ArgumentNullException(nameof(left));
else if(right is null)
throw new ArgumentNullException(nameof(right));

return left.Multiply(right);
}

Expand All @@ -148,6 +151,11 @@ public BaseDimensions Divide(BaseDimensions right)
/// <returns>Resulting dimensions.</returns>
public static BaseDimensions operator /(BaseDimensions left, BaseDimensions right)
{
if(left is null)
throw new ArgumentNullException(nameof(left));
else if(right is null)
throw new ArgumentNullException(nameof(right));

return left.Divide(right);
}
#endif
Expand All @@ -168,16 +176,16 @@ public override string ToString()
return sb.ToString();
}

private static void AppendDimensionString( StringBuilder sb, string name, int value )
private static void AppendDimensionString(StringBuilder sb, string name, int value)
{
var absoluteValue = Math.Abs( value );
var absoluteValue = Math.Abs(value);

if( absoluteValue > 0 )
if(absoluteValue > 0)
{
sb.AppendFormat( "[{0}]", name );
sb.AppendFormat("[{0}]", name);

if( absoluteValue > 1 )
sb.AppendFormat( "^{0}", value );
if(absoluteValue > 1)
sb.AppendFormat("^{0}", value);
}
}

Expand Down