Changeset 4866

Timestamp:

11/20/10 00:35:05 (14 years ago)

Author:

swagner

Message:

Modified TSPAlleleFrequencyAnalyzer to use the distance matrix if available (#1234)

Location:

trunk/sources

Files:

• HeuristicLab.Optimizer/3.3/Documents/GA_TSP.hl (modified) (previous)
• HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPAlleleFrequencyAnalyzer.cs (modified) (3 diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPAlleleFrequencyAnalyzer.cs

@@ -39 +39 @@
       get { return (LookupParameter<DoubleMatrix>)Parameters["Coordinates"]; }
     }
+    public LookupParameter<DistanceMatrix> DistanceMatrixParameter {
+      get { return (LookupParameter<DistanceMatrix>)Parameters["DistanceMatrix"]; }
+    }
 
     [StorableConstructor]
@@ -46 +49 @@
       : base() {
       Parameters.Add(new LookupParameter<DoubleMatrix>("Coordinates", "The x- and y-coordinates of the cities."));
+      Parameters.Add(new LookupParameter<DistanceMatrix>("DistanceMatrix", "The matrix which contains the distances between the cities."));
     }
 
@@ -55 +59 @@
       Allele[] alleles = new Allele[solution.Length];
       DoubleMatrix coords = CoordinatesParameter.ActualValue;
+      DistanceMatrix dm = DistanceMatrixParameter.ActualValue;
+      int source, target, h;
+      double impact;
 
-      for (int i = 0; i < solution.Length - 1; i++)
-        alleles[i] = CreateAllele(solution[i], solution[i + 1], coords);
-      alleles[alleles.Length - 1] = CreateAllele(solution[solution.Length - 1], solution[0], coords);
+      for (int i = 0; i < solution.Length - 1; i++) {
+        source = solution[i];
+        target = solution[i + 1];
+        if (source > target) { h = source; source = target; target = h; }
+        impact = dm != null ? dm[source, target] : CalculateLength(coords[source, 0], coords[source, 1], coords[target, 0], coords[target, 1]);
+        alleles[i] = new Allele(source.ToString() + "-" + target.ToString(), impact);
+      }
+      source = solution[solution.Length - 1];
+      target = solution[0];
+      if (source > target) { h = source; source = target; target = h; }
+      impact = dm != null ? dm[source, target] : CalculateLength(coords[source, 0], coords[source, 1], coords[target, 0], coords[target, 1]);
+      alleles[alleles.Length - 1] = new Allele(source.ToString() + "-" + target.ToString(), impact);
 
       return alleles;
-    }
-
-    private Allele CreateAllele(int source, int target, DoubleMatrix coords) {
-      if (source > target) {
-        int h = source;
-        source = target;
-        target = h;
-      }
-
-      return new Allele(source.ToString() + "-" + target.ToString(),
-                        CalculateLength(coords[source, 0], coords[source, 1], coords[target, 0], coords[target, 1]));
     }
 

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

@@ -351 +351 @@
         TSPAlleleFrequencyAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
         TSPAlleleFrequencyAnalyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
+        TSPAlleleFrequencyAnalyzer.DistanceMatrixParameter.ActualName = DistanceMatrixParameter.Name;
         TSPAlleleFrequencyAnalyzer.SolutionParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
         TSPAlleleFrequencyAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;