Changeset 14659

Timestamp:

02/10/17 21:42:31 (8 years ago)

Author:

abeham

Message:

#2730: Added similarity calculators and equality comparers

Location:

trunk/sources

Files:

• HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorEqualityComparer.cs (added)
• HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SimilarityCalculators (added)
• HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SimilarityCalculators/HammingSimilarityCalculator.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/HammingSimilarityCalculator.cs)
• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorEqualityComparer.cs (added)
• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/SimilarityCalculators (added)
• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/SimilarityCalculators/HammingSimilarityCalculator.cs (copied) (copied from trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/HammingSimilarityCalculator.cs) (4 diffs)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/LinearLinkageEqualityComparer.cs (added)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/SimilarityCalculators (added)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.3/SimilarityCalculators/HammingSimilarityCalculator.cs (added)
• HeuristicLab.Encodings.PermutationEncoding/3.3/SimilarityCalculators (added)
• HeuristicLab.Encodings.PermutationEncoding/3.3/SimilarityCalculators/HammingSimilarityCalculator.cs (added)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorEqualityComparer.cs (added)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/SimilarityCalculators (added)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/SimilarityCalculators/HammingSimilarityCalculator.cs (copied) (copied from trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/HammingSimilarityCalculator.cs) (4 diffs)

trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/SimilarityCalculators/HammingSimilarityCalculator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.BinaryVectorEncoding {
-  [Item("Hamming Similarity Calculator for BinaryVector", "Calculates the solution similarity based on the Hamming distance between two binary vectors.")]
+namespace HeuristicLab.Encodings.IntegerVectorEncoding {
+  [Item("Hamming Similarity Calculator for IntegerVector", "Calculates the solution similarity based on the Hamming distance between two integer vectors.")]
   [StorableClass]
   public sealed class HammingSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
@@ -43 +43 @@
     }
 
-    public static double CalculateSimilarity(BinaryVector left, BinaryVector right) {
+    public static double CalculateSimilarity(IntegerVector left, IntegerVector right) {
       if (left == null || right == null)
         throw new ArgumentException("Cannot calculate similarity because one or both of the provided scopes is null.");
@@ -58 +58 @@
 
     public override double CalculateSolutionSimilarity(IScope leftSolution, IScope rightSolution) {
-      var left = leftSolution.Variables[SolutionVariableName].Value as BinaryVector;
-      var right = rightSolution.Variables[SolutionVariableName].Value as BinaryVector;
+      var left = leftSolution.Variables[SolutionVariableName].Value as IntegerVector;
+      var right = rightSolution.Variables[SolutionVariableName].Value as IntegerVector;
 
       return CalculateSimilarity(left, right);

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.BinaryVectorEncoding {
-  [Item("Hamming Similarity Calculator for BinaryVector", "Calculates the solution similarity based on the Hamming distance between two binary vectors.")]
+namespace HeuristicLab.Encodings.RealVectorEncoding {
+  [Item("Hamming Similarity Calculator for RealVector", "Calculates the solution similarity based on the Hamming distance between two real vectors.")]
   [StorableClass]
   public sealed class HammingSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
@@ -43 +43 @@
     }
 
-    public static double CalculateSimilarity(BinaryVector left, BinaryVector right) {
+    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.");
@@ -58 +58 @@
 
     public override double CalculateSolutionSimilarity(IScope leftSolution, IScope rightSolution) {
-      var left = leftSolution.Variables[SolutionVariableName].Value as BinaryVector;
-      var right = rightSolution.Variables[SolutionVariableName].Value as BinaryVector;
+      var left = leftSolution.Variables[SolutionVariableName].Value as RealVector;
+      var right = rightSolution.Variables[SolutionVariableName].Value as RealVector;
 
       return CalculateSimilarity(left, right);