Changeset 12269 for branches/PTSP/HeuristicLab.Problems.PTSP

Timestamp:

03/30/15 15:53:20 (10 years ago)

Author:

apolidur

Message:

#2221: Adding Tests and Views for PTSP

Location:

branches/PTSP/HeuristicLab.Problems.PTSP/3.3

Files:

• AnalyticalPTSP.cs (modified) (1 diff)
• EstimatedPTSP.cs (modified) (1 diff)

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs

@@ -95 +95 @@
     }
 
+    public double EvaluateWithParams(DistanceMatrix distances, DoubleArray probabilities, Permutation individual) {
+      Permutation p = individual;
+      // Compute A and B matrices
+      DoubleMatrix A = new DoubleMatrix(p.Length, p.Length - 1);
+      DoubleMatrix B = new DoubleMatrix(p.Length, p.Length - 1);
+      // Analytical evaluation
+      double firstSum = 0;
+      for (int i = 0; i < p.Length; i++) {
+        for (int j = i + 1; j < p.Length; j++) {
+          double sum1 = distances[p[i], p[j]] * probabilities[p[i]] * probabilities[p[j]];
+          for (int k = i + 1; k < j; k++) {
+            sum1 = sum1 * (1 - probabilities[p[k]]);
+          }
+          A[i, j - 1] = sum1;
+          firstSum += sum1;
+        }
+      }
+      double secondSum = 0;
+      for (int j = 0; j < p.Length; j++) {
+        for (int i = 0; i < j; i++) {
+          double sum2 = distances[p[j], p[i]] * probabilities[p[i]] * probabilities[p[j]];
+          for (int k = j + 1; k < p.Length; k++) {
+            sum2 = sum2 * (1 - probabilities[p[k]]);
+          }
+          for (int k = 0; k < i; k++) {
+            sum2 = sum2 * (1 - probabilities[p[k]]);
+          }
+          B[j,i] = sum2;
+          secondSum += sum2;
+        }
+      }
+      foreach (var op in Operators.OfType<PTSPAnalyticalInversionMovePathEvaluator>()) {
+        op.AParameter.Value = A;
+        op.BParameter.Value = B;
+      }
+      return firstSum + secondSum;
+    }
+
     public AnalyticalProbabilisticTravelingSalesmanProblem() {
       Operators.Add(new PTSPAnalyticalInversionMovePathEvaluator());

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs

@@ -128 +128 @@
       // For now uses sample size of 20 but should use Student's t-test
       //Ttest(data.Dimension);
-      SampleSize = new IntValue(25);
+      SampleSize = new IntValue(100);
       MersenneTwister r = new MersenneTwister();
       int countOnes = 0;