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

Timestamp:

11/28/15 23:38:51 (9 years ago)

Author:

abeham

Message:

#2221:

• Completely refactored PTSP branch
  • Added two sets of problem instances based on TSPLIB: homogeneous and heterogeneous
  • Implemented missing EvaluateByCoordinates for 1-shift moves
  • Made it clear that move evaluators are for estimated PTSP only
  • Changed parameter realization from a rather strange list of list of ints to a list of bool arrays
  • Reusing code of the 2-opt and 1-shift move evaluators in 2.5 move evaluator
  • Introducing distance calculators to properly handle the case when no distance matrix is given (previous code only worked with distance matrix and without only with euclidean distance in some settings)
  • Fixed several smaller code issues: protected, static, method parameters, copy & paste, interfaces, naming, parameters, serialization hooks, license headers, doc comments, data types

File:

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

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

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HeuristicLab.Optimization;
-using HeuristicLab.PluginInfrastructure;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.Instances;
-using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Common;
-using HeuristicLab.Parameters;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.PTSP {
-  [Item("Analytical Probabilistic Traveling Salesman Problem", "Represents an analytical Probabilistic Traveling Salesman Problem.")]
-  [Creatable("Problems")]
+  [Item("Analytical Probabilistic Traveling Salesman Problem (PTSP)", "Represents a probabilistic traveling salesman problem where the expected tour length is calculated exactly.")]
+  [Creatable(CreatableAttribute.Categories.CombinatorialProblems)]
   [StorableClass]
-  public sealed class AnalyticalProbabilisticTravelingSalesmanProblem : ProbabilisticTravelingSalesmanProblem, IStorableContent,
-  IProblemInstanceConsumer<PTSPData> {
+  public sealed class AnalyticalProbabilisticTravelingSalesmanProblem : ProbabilisticTravelingSalesmanProblem {
 
     [StorableConstructor]
     private AnalyticalProbabilisticTravelingSalesmanProblem(bool deserializing) : base(deserializing) { }
-    private AnalyticalProbabilisticTravelingSalesmanProblem(AnalyticalProbabilisticTravelingSalesmanProblem original, Cloner cloner)
-      : base(original, cloner) {
+    private AnalyticalProbabilisticTravelingSalesmanProblem(AnalyticalProbabilisticTravelingSalesmanProblem original, Cloner cloner) : base(original, cloner) { }
+    public AnalyticalProbabilisticTravelingSalesmanProblem() {
+      Operators.Add(new BestPTSPSolutionAnalyzer());
     }
 
@@ -31 +43 @@
     }
 
-    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;
-      //  }
-      //}
-      
+    public override double Evaluate(Permutation tour, IRandom random) {
       // 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[p[i]] * ProbabilityMatrix[p[j]];
+      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]];
           for (int k = i + 1; k < j; k++) {
-            sum1 = sum1 * (1 - ProbabilityMatrix[p[k]]);
+            sum1 = sum1 * (1 - Probabilities[tour[k]]);
           }
-          A[i, j - 1] = sum1;
           firstSum += sum1;
         }
       }
       double secondSum = 0;
-      for (int j = 0; j < p.Length - 1; j++) {
+      for (int j = 0; j < tour.Length - 1; j++) {
         for (int i = 0; i < j; i++) {
-          double sum2 = DistanceMatrix[p[j], p[i]] * ProbabilityMatrix[p[i]] * ProbabilityMatrix[p[j]];
-          for (int k = j + 1; k < p.Length - 1; k++) {
-            sum2 = sum2 * (1 - ProbabilityMatrix[p[k]]);
+          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]]);
           }
           for (int k = 1; k < i; k++) {
-            sum2 = sum2 * (1 - ProbabilityMatrix[p[k]]);
+            sum2 = sum2 * (1 - Probabilities[tour[k]]);
           }
-          B[i, j] = sum2;
           secondSum += sum2;
         }
-      }
-      foreach (var op in Operators.OfType<PTSPAnalyticalInversionMovePathEvaluator>()) {
-        op.AParameter.Value = A;
-        op.BParameter.Value = B;
       }
       return firstSum + secondSum;
     }
 
-    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);
+    public static double Evaluate(Permutation tour, DistanceMatrix distanceMatrix, DoubleArray probabilities) {
       // 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]]);
+      var firstSum = 0.0;
+      for (var i = 0; i < tour.Length; i++) {
+        for (var j = i + 1; j < tour.Length; j++) {
+          var sum1 = distanceMatrix[tour[i], tour[j]] * probabilities[tour[i]] * probabilities[tour[j]];
+          for (var k = i + 1; k < j; k++) {
+            sum1 = sum1 * (1 - probabilities[tour[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]]);
+      var secondSum = 0.0;
+      for (var j = 0; j < tour.Length; j++) {
+        for (var i = 0; i < j; i++) {
+          var sum2 = distanceMatrix[tour[j], tour[i]] * probabilities[tour[i]] * probabilities[tour[j]];
+          for (var k = j + 1; k < tour.Length; k++) {
+            sum2 = sum2 * (1 - probabilities[tour[k]]);
           }
-          for (int k = 0; k < i; k++) {
-            sum2 = sum2 * (1 - probabilities[p[k]]);
+          for (var k = 0; k < i; k++) {
+            sum2 = sum2 * (1 - probabilities[tour[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());
-    }
-
-    public override void Load(PTSPData data) {
-      base.Load(data);
-      foreach (var op in Operators.OfType<PTSPAnalyticalInversionMovePathEvaluator>()) {
-        op.ProbabilitiesParameter.Value = ProbabilityMatrix;
-      }
-    }
-
   }
 }