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

Timestamp:

07/25/12 10:14:58 (12 years ago)

Author:

jkarder

Message:

#1331:

• applied some of the changes suggested by ascheibe in comment:32:ticket:1331
• minor code improvements

File:

• branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TravelingSalesman/3.3/SimilarityCalculators/TSPSimilarityCalculator.cs (modified) (1 diff)

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

@@ -67 +67 @@
     private static double CalculateAbsolute(Permutation left, Permutation right) {
       double similarity = 0.0;
-      for (int i = 0; i < left.Length && left[i] == right[i]; similarity = ++i) ;
+      for (int i = 0; i < left.Length; i++)
+        if (left[i] == right[i]) similarity++;
+
       return similarity / left.Length;
     }
 
     private static double CalculateRelativeDirected(Permutation left, Permutation right) {
-      throw new NotImplementedException();
+      int[] edges = new int[right.Length];
+      for (int i = 0; i < right.Length; i++)
+        edges[right[i]] = right[(i + 1) % right.Length];
+
+      double similarity = 0.0;
+      for (int i = 0; i < left.Length; i++)
+        if (left[(i + 1) % left.Length] == edges[left[i]]) similarity++;
+
+      return similarity / left.Length;
     }