Ticket #2221: AnalyticalPTSP.cs.patch

HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs

@@ -44 +44 @@
 
     public override double Evaluate(Permutation tour, IRandom random) {
       // Analytical evaluation
+      var probabilities = Probabilities;
+      var distanceMatrix = DistanceMatrix;
+
       double firstSum = 0;
       for (int i = 0; i < tour.Length - 1; i++) {
         for (int j = i + 1; j < tour.Length - 1; j++) {
-          double sum1 = DistanceMatrix[tour[i], tour[j]] * Probabilities[tour[i]] * Probabilities[tour[j]];
+          double sum1 = distanceMatrix[tour[i], tour[j]] * probabilities[tour[i]] * probabilities[tour[j]];
           for (int k = i + 1; k < j; k++) {
-            sum1 = sum1 * (1 - Probabilities[tour[k]]);
+            sum1 = sum1 * (1 - probabilities[tour[k]]);
           }
           firstSum += sum1;
         }
@@ -57 +60 @@
       double secondSum = 0;
       for (int j = 0; j < tour.Length - 1; j++) {
         for (int i = 0; i < j; i++) {
-          double sum2 = DistanceMatrix[tour[j], tour[i]] * Probabilities[tour[i]] * Probabilities[tour[j]];
+          double sum2 = distanceMatrix[tour[j], tour[i]] * probabilities[tour[i]] * probabilities[tour[j]];
           for (int k = j + 1; k < tour.Length - 1; k++) {
-            sum2 = sum2 * (1 - Probabilities[tour[k]]);
+            sum2 = sum2 * (1 - probabilities[tour[k]]);
           }
           for (int k = 1; k < i; k++) {
-            sum2 = sum2 * (1 - Probabilities[tour[k]]);
+            sum2 = sum2 * (1 - probabilities[tour[k]]);
           }
           secondSum += sum2;
         }