Changeset 5598 for branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPEvaluator.cs

Timestamp:

03/02/11 22:33:30 (13 years ago)

Author:

abeham

Message:

#1330

• Updated solution view
• Made distance matrix a mandatory parameter (solution instances are small anyway)
• Added and set best known solution if available for a QAPLIB instance

File:

• branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPEvaluator.cs (modified) (5 diffs)

branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPEvaluator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -35 +34 @@
     public ILookupParameter<Permutation> PermutationParameter {
       get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
-    }
-    public ILookupParameter<BoolValue> UseDistanceMatrixParameter {
-      get { return (ILookupParameter<BoolValue>)Parameters["UseDistanceMatrix"]; }
     }
     public ILookupParameter<DoubleMatrix> DistanceMatrixParameter {
@@ -57 +53 @@
     public QAPEvaluator() {
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The permutation that represents the current solution."));
-      Parameters.Add(new ValueLookupParameter<BoolValue>("UseDistanceMatrix", "True if the distance matrix should be used, false if the distances should be caluclated by taking the euclidean distance between the coordinates."));
       Parameters.Add(new LookupParameter<DoubleMatrix>("DistanceMatrix", "The distance matrix that contains the distances between the locations."));
       Parameters.Add(new LookupParameter<DoubleMatrix>("Coordinates", "The coordinates in case the distance matrix should not be used."));
@@ -68 +63 @@
     }
 
-    public static double Apply(Permutation assignment, DoubleMatrix weights, Func<int, int, double> distance) {
+    public static double Apply(Permutation assignment, DoubleMatrix weights, DoubleMatrix distances) {
       double quality = 0;
       for (int i = 0; i < assignment.Length; i++) {
         for (int j = 0; j < assignment.Length; j++) {
-          quality += weights[i, j] * distance(assignment[i], assignment[j]);
+          quality += weights[i, j] * distances[assignment[i], assignment[j]];
         }
       }
@@ -80 +75 @@
     public override IOperation Apply() {
       Permutation assignment = PermutationParameter.ActualValue;
-      bool useDistanceMatrix = UseDistanceMatrixParameter.ActualValue.Value;
       DoubleMatrix weights = WeightsParameter.ActualValue;
-      double quality;
+      DoubleMatrix distanceMatrix = DistanceMatrixParameter.ActualValue;
 
-      if (useDistanceMatrix) {
-        DoubleMatrix distanceMatrix = DistanceMatrixParameter.ActualValue;
-        quality = Apply(assignment, weights, (x, y) => distanceMatrix[x, y]);
-      } else {
-        DoubleMatrix coordinates = CoordinatesParameter.ActualValue;
-        quality = Apply(assignment, weights, (x, y) => Distance(coordinates, x, y));
-      }
-
+      double quality = Apply(assignment, weights, distanceMatrix);
       QualityParameter.ActualValue = new DoubleValue(quality);
 
       return base.Apply();
     }
-
-    private double Distance(DoubleMatrix coordinates, int row1, int row2) {
-      double dx = coordinates[row1, 0] - coordinates[row2, 0];
-      double dy = coordinates[row1, 1] - coordinates[row2, 1];
-      return Math.Sqrt(dx * dx + dy * dy);
-    }
   }
 }