Changeset 2988 for trunk/sources/HeuristicLab.Problems.TSP/3.3/Evaluators/TSPDistanceMatrixPathEvaluator.cs

Timestamp:

03/10/10 04:16:18 (14 years ago)

Author:

swagner

Message:

Worked on linkage between algorithms and problems (#898)

• restructured HeuristicLab.Problems.TSP project
• adapted TSP evaluators class hierarchy to avoid performance problems

Location:

trunk/sources/HeuristicLab.Problems.TSP/3.3/Evaluators

Files:

• . (added)
• TSPDistanceMatrixPathEvaluator.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.TSP/3.3/TSPDistanceMatrixPathEvaluator.cs) (3 diffs)

trunk/sources/HeuristicLab.Problems.TSP/3.3/Evaluators/TSPDistanceMatrixPathEvaluator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.Permutation;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -32 +33 @@
   [Creatable("Test")]
   [EmptyStorableClass]
-  public sealed class TSPDistanceMatrixPathEvaluator : TSPPathEvaluator, ITSPDistanceMatrixPathEvaluator {
+  public sealed class TSPDistanceMatrixPathEvaluator : TSPEvaluator, ITSPDistanceMatrixPathEvaluator {
+    public ILookupParameter<Permutation> PermutationParameter {
+      get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
+    }
     public ILookupParameter<DoubleMatrixData> DistanceMatrixParameter {
       get { return (ILookupParameter<DoubleMatrixData>)Parameters["DistanceMatrix"]; }
@@ -39 +43 @@
     public TSPDistanceMatrixPathEvaluator()
       : base() {
+      Parameters.Add(new LookupParameter<Permutation>("Permutation", "The TSP solution given in path representation which should be evaluated."));
       Parameters.Add(new LookupParameter<DoubleMatrixData>("DistanceMatrix", "The distance matrix of the cities."));
     }
 
-    protected override double CalculateDistance(int a, int b) {
-      DoubleMatrixData distanceMatrix = DistanceMatrixParameter.ActualValue;
-      return distanceMatrix[a, b];
+    public sealed override IOperation Apply() {
+      Permutation p = PermutationParameter.ActualValue;
+      DoubleMatrixData d = DistanceMatrixParameter.ActualValue;
+
+      double length = 0;
+      for (int i = 0; i < p.Length - 1; i++)
+        length += d[p[i], p[i + 1]];
+      length += d[p[p.Length - 1], p[0]];
+      QualityParameter.ActualValue = new DoubleData(length);
+
+      return base.Apply();
     }
   }