Changeset 15069 for trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/QAPSimilarityCalculator.cs

Timestamp:

06/27/17 13:45:50 (7 years ago)

Author:

abeham

Message:

#2706:

• Added or updated similarity calculators and population similarity analysis for several problems (BinPacking, LAP, Orienteering, Parameter optimization, PTSP, QAP, TF, TSP, VRP)
• Made TSPSimilarityCalculator obsolete since it's essentially the same as the one in the permutation plugin
• Made QAPPopulationDiversityAnalyzer obsolete as it is replaced by the newer PopulationSimilarityAnalyzer
• Removed genotype specific similarity code in QAPPermutationProximityCalculator (again identical to the permutation plugin)
• Changed QAPSimilarityCalculator to perform phenotype similarity instead of genotype similarity (has not been previously used)

File:

• trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/QAPSimilarityCalculator.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/QAPSimilarityCalculator.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization.Operators;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.QuadraticAssignment {
@@ -34 +36 @@
   /// </remarks>
   [Item("QAPSimilarityCalculator", "An operator that performs similarity calculation between two quadratic assignment solutions. The operator calculates the similarity based on the number of edges the two solutions have in common.")]
+  [StorableClass]
   public sealed class QAPSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
     protected override bool IsCommutative { get { return true; } }
 
+    [Storable]
+    public DoubleMatrix Weights { get; set; }
+    [Storable]
+    public DoubleMatrix Distances { get; set; }
+
     private QAPSimilarityCalculator(bool deserializing) : base(deserializing) { }
-    private QAPSimilarityCalculator(QAPSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
+    private QAPSimilarityCalculator(QAPSimilarityCalculator original, Cloner cloner)
+      : base(original, cloner) {
+      Weights = cloner.Clone(original.Weights);
+      Distances = cloner.Clone(original.Distances);
+    }
     public QAPSimilarityCalculator() : base() { }
 
@@ -45 +57 @@
     }
 
-    public static double CalculateSimilarity(Permutation left, Permutation right) {
+    public static double CalculateSimilarity(Permutation left, Permutation right, DoubleMatrix weights, DoubleMatrix distances) {
       if (left == null || right == null)
         throw new ArgumentException("Cannot calculate similarity because one of the provided solutions or both are null.");
@@ -52 +64 @@
       if (object.ReferenceEquals(left, right)) return 1.0;
 
-      return QAPPermutationProximityCalculator.CalculateGenotypeSimilarity(left, right);
+      return QAPPermutationProximityCalculator.CalculatePhenotypeSimilarity(left, right, weights, distances);
     }
 
@@ -59 +71 @@
       var sol2 = rightSolution.Variables[SolutionVariableName].Value as Permutation;
 
-      return CalculateSimilarity(sol1, sol2);
+      return CalculateSimilarity(sol1, sol2, Weights, Distances);
     }
   }