Changeset 6627 for branches/QAPAlgorithms/HeuristicLab.Problems.QuadraticAssignment

Timestamp:

08/04/11 08:27:35 (13 years ago)

Author:

abeham

Message:

#1541

• updated from trunk

Location:

branches/QAPAlgorithms

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.QuadraticAssignment/3.3/QAPPermutationProximityCalculator.cs (modified) (1 diff)

branches/QAPAlgorithms/HeuristicLab.Problems.QuadraticAssignment/3.3/QAPPermutationProximityCalculator.cs

@@ -44 +44 @@
 
     public static double CalculatePhenotypeDistance(Permutation a, Permutation b, DoubleMatrix weights, DoubleMatrix distances) {
-      Dictionary<string, int> alleles = new Dictionary<string, int>();
-      int distance = 0;
-      for (int x = 0; x < a.Length; x++) {
-        for (int y = 0; y < a.Length; y++) {
-          string alleleA = weights[x, y].ToString() + ">" + distances[a[x], a[y]].ToString();
-          string alleleB = weights[x, y].ToString() + ">" + distances[b[x], b[y]].ToString();
-          if (alleleA == alleleB) continue;
+      Dictionary<double, Dictionary<double, int>> alleles = new Dictionary<double, Dictionary<double, int>>();
+      int distance = 0, len = a.Length;
+      for (int x = 0; x < len; x++) {
+        for (int y = 0; y < len; y++) {
+          // there's a limited universe of double values as they're all drawn from the same matrix
+          double dA = distances[a[x], a[y]], dB = distances[b[x], b[y]];
+          if (dA == dB) continue;
+
+          Dictionary<double, int> dAlleles;
+          if (!alleles.ContainsKey(weights[x, y])) {
+            dAlleles = new Dictionary<double, int>();
+            alleles.Add(weights[x, y], dAlleles);
+          } else dAlleles = alleles[weights[x, y]];
 
           int countA = 1, countB = -1;
-          if (alleles.ContainsKey(alleleA)) countA += alleles[alleleA];
-          if (alleles.ContainsKey(alleleB)) countB += alleles[alleleB];
+
+          if (dAlleles.ContainsKey(dA)) countA += dAlleles[dA];
+          if (dAlleles.ContainsKey(dB)) countB += dAlleles[dB];
 
           if (countA <= 0) distance--; // we've found in A an allele that was present in B
           else distance++; // we've found in A a new allele
-          alleles[alleleA] = countA;
+          dAlleles[dA] = countA;
 
           if (countB >= 0) distance--; // we've found in B an allele that was present in A
           else distance++; // we've found in B a new allele
-          alleles[alleleB] = countB;
+          dAlleles[dB] = countB;
         }
       }
-      return distance / (double)(2 * a.Length * a.Length);
+      return distance / (double)(2 * len * len);
     }
   }