Changeset 12219 for branches/PTSP/HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs

Timestamp:

03/18/15 12:01:21 (9 years ago)

Author:

apolidur

Message:

#2221: First version of 1-shift and 2-p-opt moves

File:

• branches/PTSP/HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs (modified) (3 diffs)

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

@@ -33 +33 @@
     public override double Evaluate(Individual individual, IRandom random) {
       Permutation p = individual.Permutation();
+      // Compute A and B matrices
+      DoubleMatrix A = new DoubleMatrix(p.Length, p.Length - 1);
+      DoubleMatrix B = new DoubleMatrix(p.Length, p.Length - 1);
+      //for (int i = 0; i < p.Length; i++) {
+      //  for (int k = 0; k < p.Length - 1; k++) {
+      //    double firstPartial = 0;
+      //    for (int r = k; k < p.Length - 1; r++) {
+      //       double sum0 = DistanceMatrix[p[i],p[i+r]]* ProbabilityMatrix[0, p[i]] * ProbabilityMatrix[0, p[i+r]];
+      //       for(int s = i+1; s < i+r; s++) {
+      //         sum0 = sum0 * (1 - ProbabilityMatrix[0, p[s]]);
+      //       }
+      //       firstPartial+=sum0;
+      //    }
+      //    double secondPartial = 0;
+      //    for (int r = k; k < p.Length - 1; r++) {
+      //       double sum1 = DistanceMatrix[p[i-r],p[i]]* ProbabilityMatrix[0, p[i-r]] * ProbabilityMatrix[0, p[i]];
+      //       for (int s = i + 1; s < p.Length-1; s++) {
+      //         sum1 = sum1 * (1 - ProbabilityMatrix[0, p[s]]);
+      //       }
+      //       for (int t = 1; t < i-1; t++) {
+      //         sum1 = sum1 * (1 - ProbabilityMatrix[0, p[t]]);
+      //       }
+      //       secondPartial+=sum1;
+      //    }
+      //    A[i, k] = firstPartial;
+      //    B[i, k] = secondPartial;
+      //  }
+      //}
+      
       // Analytical evaluation
       double firstSum = 0;
       for (int i = 0; i < p.Length - 1; i++) {
         for (int j = i + 1; j < p.Length - 1; j++) {
-          double sum1 = DistanceMatrix[p[i], p[j]] * ProbabilityMatrix[0, p[i]] * ProbabilityMatrix[0, p[j]];
+          double sum1 = DistanceMatrix[p[i], p[j]] * ProbabilityMatrix[p[i]].Value * ProbabilityMatrix[p[j]].Value;
           for (int k = i + 1; k < j; k++) {
-            sum1 = sum1 * (1 - ProbabilityMatrix[0, p[k]]);
+            sum1 = sum1 * (1 - ProbabilityMatrix[p[k]].Value);
           }
+          A[i, j - 1] = sum1;
           firstSum += sum1;
         }
@@ -47 +77 @@
       for (int j = 0; j < p.Length - 1; j++) {
         for (int i = 0; i < j; i++) {
-          double sum2 = DistanceMatrix[p[j], p[i]] * ProbabilityMatrix[0, p[i]] * ProbabilityMatrix[0, p[j]];
+          double sum2 = DistanceMatrix[p[j], p[i]] * ProbabilityMatrix[p[i]].Value * ProbabilityMatrix[p[j]].Value;
           for (int k = j + 1; k < p.Length - 1; k++) {
-            sum2 = sum2 * (1 - ProbabilityMatrix[0, p[k]]);
+            sum2 = sum2 * (1 - ProbabilityMatrix[p[k]].Value);
           }
           for (int k = 1; k < i; k++) {
-            sum2 = sum2 * (1 - ProbabilityMatrix[0, p[k]]);
+            sum2 = sum2 * (1 - ProbabilityMatrix[p[k]].Value);
           }
+          B[i, j] = sum2;
           secondSum += sum2;
         }
+      }
+      foreach (var op in Operators.OfType<PTSPAnalyticalInversionMovePathEvaluator>()) {
+        op.AParameter.Value = A;
+        op.BParameter.Value = B;
       }
       return firstSum + secondSum;
@@ -61 +96 @@
 
     public AnalyticalProbabilisticTravelingSalesmanProblem() {
-      Operators.Add(new PTSPInversionMovePathEvaluator());
+      Operators.Add(new PTSPAnalyticalInversionMovePathEvaluator());
     }
 
     public override void Load(TSPData data) {
       base.Load(data);
-      // Compute A and B matrices
+      foreach (var op in Operators.OfType<PTSPAnalyticalInversionMovePathEvaluator>()) {
+        op.ProbabilitiesParameter.Value = ProbabilityMatrix;
+      }
     }