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

Timestamp:

06/26/17 23:13:15 (8 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.RealVectorEncoding/3.3

Files:

• HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj (modified) (1 diff)
• RealVectorEqualityComparer.cs (modified) (2 diffs)
• SimilarityCalculators/EuclideanSimilarityCalculator.cs (added)
• SimilarityCalculators/HammingSimilarityCalculator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj ¶

@@ -183 +183 @@
     <Compile Include="ReflectiveBoundsChecker.cs" />
     <Compile Include="ShakingOperators\RealVectorShakingOperator.cs" />
+    <Compile Include="SimilarityCalculators\EuclideanSimilarityCalculator.cs" />
     <Compile Include="SimilarityCalculators\HammingSimilarityCalculator.cs" />
     <Compile Include="StrategyParameters\StdDevStrategyVectorCreator.cs" />

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorEqualityComparer.cs ¶

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [NonDiscoverableType]
   public class RealVectorEqualityComparer : EqualityComparer<RealVector> {
     public override bool Equals(RealVector x, RealVector 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(RealVector obj) {
+      if (obj == null) throw new ArgumentNullException("obj", "RealVectorEqualityComparer: Cannot compute hash value of null.");
       unchecked {
         int hash = 17;

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/SimilarityCalculators/HammingSimilarityCalculator.cs ¶

@@ -45 +45 @@
     public static double CalculateSimilarity(RealVector left, RealVector right) {
       if (left == null || right == null)
-        throw new ArgumentException("Cannot calculate similarity because one or both of the provided scopes is 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 == right) return 1.0;
+      if (left.Length == 0)
+        throw new ArgumentException("Cannot calculate similarity because solutions are of length 0.");
+      if (ReferenceEquals(left, right)) return 1.0;
 
       double similarity = 0.0;