Changeset 8086 for branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TravelingSalesman/3.3/SimilarityCalculators/TSPSimilarityCalculator.cs

Timestamp:

06/22/12 11:11:38 (12 years ago)

Author:

jkarder

Message:

#1331:

• synced branch with trunk
• added custom interface (ISimilarityBasedOperator) to mark operators that conduct similarity calculation
• similarity calculators are now parameterized by the algorithm
• deleted SolutionPool2TierUpdateMethod
• deleted KnapsackMultipleGuidesPathRelinker
• moved IImprovementOperator, IPathRelinker and ISimilarityCalculator to HeuristicLab.Optimization
• added parameter descriptions
• fixed plugin references
• fixed count of EvaluatedSolutions
• fixed check for duplicate solutions
• minor code improvements

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.TravelingSalesman/3.3/SimilarityCalculators/TSPSimilarityCalculator.cs (modified) (2 diffs)

branches/ScatterSearch (trunk integration)

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TravelingSalesman/3.3/SimilarityCalculators/TSPSimilarityCalculator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization.Operators;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.TravelingSalesman {
@@ -31 +31 @@
   /// </summary>
   [Item("TSPSimilarityCalculator", "An operator that performs similarity calculation between two traveling salesman solutions.")]
-  [StorableClass]
   public sealed class TSPSimilarityCalculator : SimilarityCalculator {
-    [StorableConstructor]
     private TSPSimilarityCalculator(bool deserializing) : base(deserializing) { }
     private TSPSimilarityCalculator(TSPSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
     public TSPSimilarityCalculator() : base() { }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new TSPSimilarityCalculator(this, cloner);
+    public static double CalculateSimilarity(Permutation left, Permutation right) {
+      if (left == null || right == null)
+        throw new ArgumentException("Cannot calculate similarity because one of the provided solutions or both are null.");
+
+      int[,] edges = new int[right.Length, 2];
+      for (int i = 0; i < right.Length; i++) {
+        edges[right[i], 0] = right[(i + 1) % right.Length];
+        edges[right[i], 1] = right[(i - 1 + right.Length) % right.Length];
+      }
+
+      double similarity = 0.0;
+      for (int i = 0; i < left.Length; i++) {
+        int targetCity = left[(i + 1) % left.Length];
+        if (targetCity == edges[left[i], 0] || targetCity == edges[left[i], 1])
+          similarity++;
+      }
+
+      return similarity / left.Length;
     }
 
     protected override double CalculateSimilarity(IScope left, IScope right) {
-      Permutation v1 = left.Variables[TargetParameter.ActualName].Value as Permutation;
-      Permutation v2 = right.Variables[TargetParameter.ActualName].Value as Permutation;
+      Permutation sol1 = left.Variables[Target].Value as Permutation;
+      Permutation sol2 = right.Variables[Target].Value as Permutation;
 
-      int[,] edges = new int[v2.Length, 2];
-      for (int i = 0; i < v2.Length; i++) {
-        edges[v2[i], 0] = v2[(i + 1) % v2.Length];
-        edges[v2[i], 1] = v2[(i - 1 + v2.Length) % v2.Length];
-      }
-
-      double similarity = 0.0;
-      for (int i = 0; i < v1.Length; i++) {
-        int targetCity = v1[(i + 1) % v1.Length];
-        if (targetCity == edges[v1[i], 0] || targetCity == edges[v1[i], 1])
-          similarity++;
-      }
-
-      return similarity / v1.Length;
+      return CalculateSimilarity(sol1, sol2);
     }
   }

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests