Changeset 15067 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationEqualityComparer.cs

Timestamp:

06/26/17 23:13:15 (7 years ago)

Author:

abeham

Message:

#2730:

• Unified implementation of all equality comparers and similarity calculators in BinaryVector, IntegerVector, RealVector, Permutation, and LinearLinkage encodings
• Added Euclidean distance-based similarity calculators for real and integer vectors using a transformation function with scaling parameter

File:

• trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationEqualityComparer.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationEqualityComparer.cs

@@ -30 +30 @@
   public class PermutationEqualityComparer : EqualityComparer<Permutation> {
     public override bool Equals(Permutation x, Permutation y) {
+      if (x == null && y == null) return true;
+      if (x == null || y == null) return false;
+      if (ReferenceEquals(x, y)) return true;
+      if (x.Length != y.Length) return false;
       if (x.PermutationType != y.PermutationType) return false;
-      if (x.Length != y.Length) return false;
       switch (x.PermutationType) {
         case PermutationTypes.Absolute:
@@ -67 +70 @@
 
     public override int GetHashCode(Permutation obj) {
-      if (obj == null) return 0;
+      if (obj == null) throw new ArgumentNullException("obj", "PermutationEqualityComparer: Cannot compute hash value of null.");
       return GenerateHashString(obj).GetHashCode();
     }