Changeset 2988 for trunk/sources/HeuristicLab.Problems.TSP/3.3/Evaluators/TSPCoordinatesPathEvaluator.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)
• TSPCoordinatesPathEvaluator.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.TSP/3.3/TSPCoordinatesPathEvaluator.cs) (3 diffs)

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

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.Permutation;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -31 +32 @@
   [Item("TSPCoordinatesPathEvaluator", "A base class for operators which evaluate TSP solutions given in path representation using city coordinates.")]
   [EmptyStorableClass]
-  public abstract class TSPCoordinatesPathEvaluator : TSPPathEvaluator, ITSPCoordinatesPathEvaluator {
+  public abstract class TSPCoordinatesPathEvaluator : TSPEvaluator, ITSPCoordinatesPathEvaluator {
+    public ILookupParameter<Permutation> PermutationParameter {
+      get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
+    }
     public ILookupParameter<DoubleMatrixData> CoordinatesParameter {
       get { return (ILookupParameter<DoubleMatrixData>)Parameters["Coordinates"]; }
@@ -38 +42 @@
     protected TSPCoordinatesPathEvaluator()
       : base() {
+      Parameters.Add(new LookupParameter<Permutation>("Permutation", "The TSP solution given in path representation which should be evaluated."));
       Parameters.Add(new LookupParameter<DoubleMatrixData>("Coordinates", "The x- and y-Coordinates of the cities."));
     }
 
-    protected sealed override double CalculateDistance(int a, int b) {
-      DoubleMatrixData coordinates = CoordinatesParameter.ActualValue;
-      return CalculateDistance(coordinates[a, 0], coordinates[a, 1],
-                               coordinates[b, 0], coordinates[b, 1]);
+    public sealed override IOperation Apply() {
+      Permutation p = PermutationParameter.ActualValue;
+      DoubleMatrixData c = CoordinatesParameter.ActualValue;
+
+      double length = 0;
+      for (int i = 0; i < p.Length - 1; i++)
+        length += CalculateDistance(c[p[i], 0], c[p[i], 1], c[p[i + 1], 0], c[p[i + 1], 1]);
+      length += CalculateDistance(c[p[p.Length - 1], 0], c[p[p.Length - 1], 1], c[p[0], 0], c[p[0], 1]);
+      QualityParameter.ActualValue = new DoubleData(length);
+
+      return base.Apply();
     }