Changeset 2975 for trunk/sources/HeuristicLab.Problems.TSP/3.3/TSPPathEvaluator.cs

Timestamp:

03/09/10 05:45:39 (15 years ago)

Author:

swagner

Message:

Worked on linkage between algorithms and problems (#898)

• finished TSP and started to work on SGA

File:

• trunk/sources/HeuristicLab.Problems.TSP/3.3/TSPPathEvaluator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.TSP/3.3/TSPPathEvaluator.cs

@@ -32 +32 @@
   [Item("TSPPathEvaluator", "A base class for operators which evaluate TSP solutions given in path representation.")]
   [EmptyStorableClass]
-  public abstract class TSPPathEvaluator : TSPEvaluator {
-    public LookupParameter<DoubleMatrixData> CoordinatesParameter {
-      get { return (LookupParameter<DoubleMatrixData>)Parameters["Coordinates"]; }
-    }
-    public LookupParameter<Permutation> PermutationParameter {
-      get { return (LookupParameter<Permutation>)Parameters["Permutation"]; }
+  public abstract class TSPPathEvaluator : TSPEvaluator, ITSPPathEvaluator {
+    public ILookupParameter<Permutation> PermutationParameter {
+      get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
     }
 
     protected TSPPathEvaluator()
       : base() {
-      Parameters.Add(new LookupParameter<DoubleMatrixData>("Coordinates", "The x- and y-Coordinates of the cities."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The TSP solution given in path representation which should be evaluated."));
     }
 
-    public override IOperation Apply() {
-      DoubleMatrixData coordinates = CoordinatesParameter.ActualValue;
+    public sealed override IOperation Apply() {
       Permutation permutation = PermutationParameter.ActualValue;
 
       double length = 0;
       for (int i = 0; i < permutation.Length - 1; i++)
-        length += CalculateDistance(coordinates[permutation[i], 0],
-                                    coordinates[permutation[i], 1],
-                                    coordinates[permutation[i + 1], 0],
-                                    coordinates[permutation[i + 1], 1]);
-      length += CalculateDistance(coordinates[permutation[permutation.Length - 1], 0],
-                                  coordinates[permutation[permutation.Length - 1], 1],
-                                  coordinates[permutation[0], 0],
-                                  coordinates[permutation[0], 1]);
+        length += CalculateDistance(permutation[i], permutation[i + 1]);
+      length += CalculateDistance(permutation[permutation.Length - 1], permutation[0]);
       QualityParameter.ActualValue = new DoubleData(length);
 
@@ -66 +55 @@
 
     /// <summary>
-    /// Calculates the distance between two points.
+    /// Calculates the distance between two cities.
     /// </summary>
-    /// <param name="x1">The x-coordinate of point 1.</param>
-    /// <param name="y1">The y-coordinate of point 1.</param>
-    /// <param name="x2">The x-coordinate of point 2.</param>
-    /// <param name="y2">The y-coordinate of point 2.</param>
+    /// <param name="a">The index of the first city.</param>
+    /// <param name="b">The index of the second city.</param>
     /// <returns>The calculated distance.</returns>
-    protected abstract double CalculateDistance(double x1, double y1, double x2, double y2);
+    protected abstract double CalculateDistance(int a, int b);
   }
 }