Added HashCode methods to light spectrum objects

Author: castarco

CHANGELOG.md

@@ -1,12 +1,23 @@
 ColorSharp's Changelog
 ======================
 
+## 2014-12-19 : 0.8.3 Release
+
+### Contributors
+* Andrés Correa Casablanca <castarco@gmail.com , castarco@litipk.com>
+
+### Changes
+ * Updated MathNet.Numerics dependency
+ * Added HashCode to light spectrum objects
+ * Minor performance tweaks
+
+
 ## 2014-12-05 : 0.8.2 Release
 
 ### Contributors
  * Andrés Correa Casablanca <castarco@gmail.com , castarco@litipk.com>
 
-## Minor changes
+### Minor changes
  * Added new constructor to the RegularLightSpectrum class.
 
 ## 2014-11-12 : 0.8.1 Release

ColorSharp.sln

@@ -34,6 +34,6 @@ Global
 		$0.VersionControlPolicy = $2
 		$2.inheritsSet = Mono
 		description = A .Net/Mono library to handle color spaces (and light spectrums!)
-		version = 0.8.2
+		version = 0.8.3
 	EndGlobalSection
 EndGlobal

ColorSharp/ColorSharp.csproj

@@ -11,7 +11,7 @@
     <SignAssembly>true</SignAssembly>
     <DelaySign>false</DelaySign>
     <AssemblyOriginatorKeyFile>colorsharp.snk</AssemblyOriginatorKeyFile>
-    <ReleaseVersion>0.8.2</ReleaseVersion>
+    <ReleaseVersion>0.8.3</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,10 +42,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Numerics" />
     <Reference Include="MathNet.Numerics">
-      <HintPath>..\packages\MathNet.Numerics.Signed.3.2.3\lib\net40\MathNet.Numerics.dll</HintPath>
+      <HintPath>..\packages\MathNet.Numerics.Signed.3.3.0\lib\net40\MathNet.Numerics.dll</HintPath>
     </Reference>
-    <Reference Include="System.Numerics" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -81,9 +81,9 @@
     <Folder Include="src\Illuminants\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="ColorSharp.nuspec" />
     <None Include="build_nuget_pkg.sh" />
     <None Include="colorsharp.pub" />
+    <None Include="packages.config" />
   </ItemGroup>
 </Project>

ColorSharp/ColorSharp.nuspec

@@ -11,7 +11,9 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
     <releaseNotes>
- - Bugfix in the D65 Illuminant (spectrum sample)
+ - Updated MathNet.Numerics dependency
+ - Added HashCode to light spectrum objects
+ - Minor performance tweaks
     </releaseNotes>
     <copyright>Copyright 2014</copyright>
     <tags>Light Color Colour CIEXYZ CIExyY sRGB</tags>

ColorSharp/Properties/AssemblyInfo.cs

@@ -46,7 +46,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion ("0.8.2.*")]
+[assembly: AssemblyVersion ("0.8.3.*")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.

ColorSharp/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MathNet.Numerics.Signed" version="3.2.3" targetFramework="net40" />
+  <package id="MathNet.Numerics.Signed" version="3.3.0" targetFramework="net40" />
 </packages>

ColorSharp/src/ColorSpaces/CIEXYZ.cs

@@ -164,28 +164,26 @@ public override bool Equals(Object obj)
 			{
 				CIEXYZ xyzObj = obj as CIEXYZ; 
 
-				if (xyzObj == null || GetHashCode () != obj.GetHashCode ())
+				if (xyzObj == this) {
+					return true;
+				}
+				if (xyzObj == null || GetHashCode () != obj.GetHashCode ()) {
 					return false;
+				}
 
-				return (
-					Math.Abs (X - xyzObj.X) <= double.Epsilon &&
-					Math.Abs (Y - xyzObj.Y) <= double.Epsilon &&
-					Math.Abs (Z - xyzObj.Z) <= double.Epsilon
-				);
+				return (X == xyzObj.X && Y == xyzObj.Y && Z == xyzObj.Z);
 			}
 
 			/**
 			 * <inheritdoc />
 			 */
 			public override int GetHashCode ()
 			{
-				int hash = 23;
+				int hash = 30967 + X.GetHashCode ();  // 30967 == 173 * 179
 
-				hash = hash * 57 + X.GetHashCode ();
-				hash = hash * 57 + Y.GetHashCode ();
-				hash = hash * 57 + Z.GetHashCode ();
+				hash = hash * 179 + Y.GetHashCode ();
 
-				return hash;
+				return hash * 179 + Z.GetHashCode ();
 			}
 
 			#endregion

ColorSharp/src/ColorSpaces/CIExyY.cs

@@ -196,28 +196,26 @@ public override bool Equals(Object obj)
 			{
 				CIExyY xyYObj = obj as CIExyY; 
 
-				if (xyYObj == null || GetHashCode () != obj.GetHashCode ())
+				if (xyYObj == this) {
+					return true;
+				}
+				if (xyYObj == null || GetHashCode () != obj.GetHashCode ()) {
 					return false;
+				}
 
-				return (
-					Math.Abs (x - xyYObj.x) <= double.Epsilon &&
-					Math.Abs (y - xyYObj.y) <= double.Epsilon &&
-					Math.Abs (Y - xyYObj.Y) <= double.Epsilon
-				);
+				return (x == xyYObj.x && y == xyYObj.y && Y == xyYObj.Y);
 			}
 
 			/**
 			 *  <inheritdoc />
 			 */
 			public override int GetHashCode ()
 			{
-				int hash = 19;
+				int hash = 28891 + x.GetHashCode ();  // 28891 == 167 * 173
 
-				hash = hash * 31 + x.GetHashCode ();
-				hash = hash * 31 + y.GetHashCode ();
-				hash = hash * 31 + Y.GetHashCode ();
+				hash = hash * 173 + y.GetHashCode ();
 
-				return hash;
+				return hash * 173 + Y.GetHashCode ();
 			}
 
 			#endregion

ColorSharp/src/ColorSpaces/SRGB.cs

@@ -140,28 +140,26 @@ public override bool Equals(Object obj)
 			{
 				SRGB srgbObj = obj as SRGB; 
 
-				if (srgbObj == null || GetHashCode () != obj.GetHashCode ())
+				if (srgbObj == this) {
+					return true;
+				}
+				if (srgbObj == null || GetHashCode () != obj.GetHashCode ()) {
 					return false;
+				}
 
-				return (
-					Math.Abs (R - srgbObj.R) <= double.Epsilon &&
-					Math.Abs (G - srgbObj.G) <= double.Epsilon &&
-					Math.Abs (B - srgbObj.B) <= double.Epsilon
-				);
+				return (R == srgbObj.R && G == srgbObj.G && B == srgbObj.B);
 			}
 
 			/**
 			 * <inheritdoc />
 			 */
 			public override int GetHashCode ()
 			{
-				int hash = 17;
+				int hash = 32399 + R.GetHashCode (); // 32399 == 179 * 181
 
-				hash = hash * 19 + R.GetHashCode ();
-				hash = hash * 19 + G.GetHashCode ();
-				hash = hash * 19 + B.GetHashCode ();
+				hash = hash * 181 + G.GetHashCode ();
 
-				return hash;
+				return hash * 181 + B.GetHashCode ();
 			}
 
 			#endregion

ColorSharp/src/LightSpectrums/ALightSpectrum.cs

@@ -27,16 +27,13 @@
  */
 
 
-using System;
-using System.Collections.Generic;
+using Litipk.ColorSharp.ColorSpaces;
+using Litipk.ColorSharp.MatchingFunctions;
+using Litipk.ColorSharp.InternalUtils;
 
 
 namespace Litipk.ColorSharp
 {
-	using ColorSpaces;
-	using MatchingFunctions;
-	using InternalUtils;
-
 	namespace LightSpectrums
 	{
 		/**