Changeset 15067 for trunk/sources/HeuristicLab.Encodings.LinearLinkageEncoding

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

Location:

trunk/sources/HeuristicLab.Encodings.LinearLinkageEncoding/3.4

Files:

• LinearLinkageEqualityComparer.cs (modified) (2 diffs)
• SimilarityCalculators/HammingSimilarityCalculator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/LinearLinkageEqualityComparer.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Encodings.LinearLinkageEncoding {
+  [NonDiscoverableType]
   public class LinearLinkageEqualityComparer : EqualityComparer<LinearLinkage> {
     public override bool Equals(LinearLinkage x, LinearLinkage 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;
       for (var i = 0; i < x.Length; i++)
@@ -34 +38 @@
 
     public override int GetHashCode(LinearLinkage obj) {
+      if (obj == null) throw new ArgumentNullException("obj", "LinearLinkageEqualityComparer: Cannot compute hash value of null.");
       unchecked {
         int hash = 17;

trunk/sources/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/SimilarityCalculators/HammingSimilarityCalculator.cs

@@ -30 +30 @@
   [StorableClass]
   public sealed class HammingSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
-
-    protected override bool IsCommutative {
-      get { return true; }
-    }
+    protected override bool IsCommutative { get { return true; } }
 
     [StorableConstructor]
     private HammingSimilarityCalculator(bool deserializing) : base(deserializing) { }
     private HammingSimilarityCalculator(HammingSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
-    public HammingSimilarityCalculator() { }
+    public HammingSimilarityCalculator() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -45 +42 @@
 
     public static double CalculateSimilarity(LinearLinkage left, LinearLinkage right) {
-      if (left.Length != right.Length) throw new ArgumentException("Comparing encodings of unequal length");
+      if (left == null || right == null)
+        throw new ArgumentException("Cannot calculate similarity because one or both of the provided solutions is null.");
+      if (left.Length != right.Length)
+        throw new ArgumentException("Cannot calculate similarity because the provided solutions have different lengths.");
+      if (left.Length == 0)
+        throw new ArgumentException("Cannot calculate similarity because solutions are of length 0.");
+      if (ReferenceEquals(left, right)) return 1.0;
+
       var similarity = 0;
       for (var i = 0; i < left.Length; i++) {