Changeset 3634

Timestamp:

05/05/10 14:28:22 (15 years ago)

Author:

swagner

Message:

Worked on best solution analysis for the TSP (#999)

Location:

trunk/sources

Files:

• HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj (modified) (1 diff)
• HeuristicLab.Parameters/3.3/SubScopesLookupParameter.cs (modified) (1 diff)
• HeuristicLab.Parameters/3.3/SubScopesSubScopesLookupParameter.cs (copied) (copied from trunk/sources/HeuristicLab.Parameters/3.3/SubScopesLookupParameter.cs) (3 diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/BestTSPSolutionAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/MultiPopulationBestTSPSolutionAnalyzer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/BestTSPSolutionAnalyzer.cs) (5 diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/PopulationBestTSPSolutionAnalyzer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/BestTSPSolutionAnalyzer.cs) (2 diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj

@@ -86 +86 @@
     <None Include="HeuristicLabParametersPlugin.cs.frame" />
     <Compile Include="ConstrainedValueParameter.cs" />
+    <Compile Include="SubScopesSubScopesLookupParameter.cs" />
     <Compile Include="OptionalConstrainedValueParameter.cs" />
     <Compile Include="ValueParameter.cs" />

trunk/sources/HeuristicLab.Parameters/3.3/SubScopesLookupParameter.cs

@@ -27 +27 @@
 namespace HeuristicLab.Parameters {
   /// <summary>
-  /// A generic parameter representing instances of type T which are collected from the sub-scopes of the current scope.
+  /// A generic parameter representing instances of type T which are collected from or written to the sub-scopes of the current scope.
   /// </summary>
   [Item("SubScopesLookupParameter<T>", "A generic parameter representing instances of type T which are collected from or written to the sub-scopes of the current scope.")]

trunk/sources/HeuristicLab.Parameters/3.3/SubScopesSubScopesLookupParameter.cs

@@ -27 +27 @@
 namespace HeuristicLab.Parameters {
   /// <summary>
-  /// A generic parameter representing instances of type T which are collected from the sub-scopes of the current scope.
+  /// A generic parameter representing instances of type T which are collected from or written to the sub-scopes of the sub-scopes of the current scope.
   /// </summary>
-  [Item("SubScopesLookupParameter<T>", "A generic parameter representing instances of type T which are collected from or written to the sub-scopes of the current scope.")]
+  [Item("SubScopesSubScopesLookupParameter<T>", "A generic parameter representing instances of type T which are collected from or written to the sub-scopes of the sub-scopes of the current scope.")]
   [StorableClass]
-  public class SubScopesLookupParameter<T> : LookupParameter<ItemArray<T>> where T : class, IItem {
-    public SubScopesLookupParameter() : base() { }
-    public SubScopesLookupParameter(string name) : base(name) { }
-    public SubScopesLookupParameter(string name, string description) : base(name, description) { }
-    public SubScopesLookupParameter(string name, string description, string actualName) : base(name, description, actualName) { }
+  public class SubScopesSubScopesLookupParameter<T> : LookupParameter<ItemArray<ItemArray<T>>> where T : class, IItem {
+    public SubScopesSubScopesLookupParameter() : base() { }
+    public SubScopesSubScopesLookupParameter(string name) : base(name) { }
+    public SubScopesSubScopesLookupParameter(string name, string description) : base(name, description) { }
+    public SubScopesSubScopesLookupParameter(string name, string description, string actualName) : base(name, description, actualName) { }
 
     protected override IItem GetActualValue() {
-      string name = LookupParameter<ItemArray<T>>.TranslateName(Name, ExecutionContext);
+      string name = LookupParameter<ItemArray<ItemArray<T>>>.TranslateName(Name, ExecutionContext);
       IScope scope = ExecutionContext.Scope;
-      ItemArray<T> values = new ItemArray<T>(scope.SubScopes.Count);
+      ItemArray<ItemArray<T>> values = new ItemArray<ItemArray<T>>(scope.SubScopes.Count);
       IVariable var;
       T value;
 
       for (int i = 0; i < values.Length; i++) {
-        scope.SubScopes[i].Variables.TryGetValue(name, out var);
-        if (var != null) {
-          value = var.Value as T;
-          if ((var.Value != null) && (value == null))
-            throw new InvalidOperationException(
-              string.Format("Type mismatch. Variable \"{0}\" does not contain a \"{1}\".",
-                            name,
-                            typeof(T).GetPrettyName())
-            );
-          values[i] = value;
+        values[i] = new ItemArray<T>(scope.SubScopes[i].SubScopes.Count);
+        for (int j = 0; j < values[i].Length; j++) {
+          scope.SubScopes[i].SubScopes[j].Variables.TryGetValue(name, out var);
+          if (var != null) {
+            value = var.Value as T;
+            if ((var.Value != null) && (value == null))
+              throw new InvalidOperationException(
+                string.Format("Type mismatch. Variable \"{0}\" does not contain a \"{1}\".",
+                              name,
+                              typeof(T).GetPrettyName())
+              );
+            values[i][j] = value;
+          }
         }
       }
@@ -60 +63 @@
     }
     protected override void SetActualValue(IItem value) {
-      ItemArray<T> values = value as ItemArray<T>;
+      ItemArray<ItemArray<T>> values = value as ItemArray<ItemArray<T>>;
       if (values == null)
         throw new InvalidOperationException(
@@ -67 +70 @@
         );
 
-      string name = LookupParameter<ItemArray<T>>.TranslateName(Name, ExecutionContext);
+      string name = LookupParameter<ItemArray<ItemArray<T>>>.TranslateName(Name, ExecutionContext);
       IScope scope = ExecutionContext.Scope;
       IVariable var;
 
       for (int i = 0; i < values.Length; i++) {
-        scope.SubScopes[i].Variables.TryGetValue(name, out var);
-        if (var != null) var.Value = values[i];
-        else scope.SubScopes[i].Variables.Add(new Variable(name, values[i]));
+        for (int j = 0; j < values[i].Length; j++) {
+          scope.SubScopes[i].SubScopes[j].Variables.TryGetValue(name, out var);
+          if (var != null) var.Value = values[i][j];
+          else scope.SubScopes[i].SubScopes[j].Variables.Add(new Variable(name, values[i][j]));
+        }
       }
     }

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

@@ -36 +36 @@
   [Item("BestTSPSolutionAnalyzer", "An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.")]
   [StorableClass]
-  public sealed class BestTSPSolutionAnalyzer : SingleSuccessorOperator, IPopulationAnalyzer {
+  public sealed class BestTSPSolutionAnalyzer : SingleSuccessorOperator, ISolutionAnalyzer {
     public LookupParameter<DoubleMatrix> CoordinatesParameter {
       get { return (LookupParameter<DoubleMatrix>)Parameters["Coordinates"]; }
     }
-    public SubScopesLookupParameter<Permutation> PermutationParameter {
-      get { return (SubScopesLookupParameter<Permutation>)Parameters["Permutation"]; }
+    public LookupParameter<Permutation> PermutationParameter {
+      get { return (LookupParameter<Permutation>)Parameters["Permutation"]; }
     }
-    public SubScopesLookupParameter<DoubleValue> QualityParameter {
-      get { return (SubScopesLookupParameter<DoubleValue>)Parameters["Quality"]; }
+    public LookupParameter<DoubleValue> QualityParameter {
+      get { return (LookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
     public LookupParameter<PathTSPTour> BestSolutionParameter {
@@ -56 +56 @@
       : base() {
       Parameters.Add(new LookupParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the cities."));
-      Parameters.Add(new SubScopesLookupParameter<Permutation>("Permutation", "The TSP solutions given in path representation from which the best solution should be analyzed."));
-      Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The qualities of the TSP solutions which should be analyzed."));
+      Parameters.Add(new LookupParameter<Permutation>("Permutation", "The TSP solution given in path representation which should be analyzed."));
+      Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the TSP solution which should be analyzed."));
       Parameters.Add(new LookupParameter<PathTSPTour>("BestSolution", "The best TSP solution."));
-      Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the best TSP solution should be stored."));
+      Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the TSP solution should be stored."));
     }
 
     public override IOperation Apply() {
       DoubleMatrix coordinates = CoordinatesParameter.ActualValue;
-      ItemArray<Permutation> permutations = PermutationParameter.ActualValue;
-      ItemArray<DoubleValue> qualities = QualityParameter.ActualValue;
+      Permutation permutation = PermutationParameter.ActualValue;
+      DoubleValue quality = QualityParameter.ActualValue;
       ResultCollection results = ResultsParameter.ActualValue;
-
-      int i = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
 
       PathTSPTour tour = BestSolutionParameter.ActualValue;
       if (tour == null) {
-        tour = new PathTSPTour(coordinates, permutations[i], qualities[i]);
+        tour = new PathTSPTour(coordinates, permutation, quality);
         BestSolutionParameter.ActualValue = tour;
         results.Add(new Result("Best TSP Solution", tour));
       } else {
-        if (tour.Quality.Value > qualities[i].Value) {
+        if (tour.Quality.Value > quality.Value) {
           tour.Coordinates = coordinates;
-          tour.Permutation = permutations[i];
-          tour.Quality = qualities[i];
+          tour.Permutation = permutation;
+          tour.Quality = quality;
           results["Best TSP Solution"].Value = tour;
         }

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Linq;
 using HeuristicLab.Common;
@@ -29 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Problems.TravelingSalesman {
@@ -34 +36 @@
   /// An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.
   /// </summary>
-  [Item("BestTSPSolutionAnalyzer", "An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.")]
+  [Item("MultiPopulationBestTSPSolutionAnalyzer", "An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.")]
   [StorableClass]
-  public sealed class BestTSPSolutionAnalyzer : SingleSuccessorOperator, IPopulationAnalyzer {
+  public sealed class MultiPopulationBestTSPSolutionAnalyzer : SingleSuccessorOperator, IMultiPopulationAnalyzer {
     public LookupParameter<DoubleMatrix> CoordinatesParameter {
       get { return (LookupParameter<DoubleMatrix>)Parameters["Coordinates"]; }
     }
-    public SubScopesLookupParameter<Permutation> PermutationParameter {
-      get { return (SubScopesLookupParameter<Permutation>)Parameters["Permutation"]; }
+    public SubScopesSubScopesLookupParameter<Permutation> PermutationParameter {
+      get { return (SubScopesSubScopesLookupParameter<Permutation>)Parameters["Permutation"]; }
     }
-    public SubScopesLookupParameter<DoubleValue> QualityParameter {
-      get { return (SubScopesLookupParameter<DoubleValue>)Parameters["Quality"]; }
+    public SubScopesSubScopesLookupParameter<DoubleValue> QualityParameter {
+      get { return (SubScopesSubScopesLookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
     public LookupParameter<PathTSPTour> BestSolutionParameter {
@@ -53 +55 @@
     }
 
-    public BestTSPSolutionAnalyzer()
+    public MultiPopulationBestTSPSolutionAnalyzer()
       : base() {
       Parameters.Add(new LookupParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the cities."));
-      Parameters.Add(new SubScopesLookupParameter<Permutation>("Permutation", "The TSP solutions given in path representation from which the best solution should be analyzed."));
-      Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The qualities of the TSP solutions which should be analyzed."));
+      Parameters.Add(new SubScopesSubScopesLookupParameter<Permutation>("Permutation", "The TSP solutions given in path representation from which the best solution should be analyzed."));
+      Parameters.Add(new SubScopesSubScopesLookupParameter<DoubleValue>("Quality", "The qualities of the TSP solutions which should be analyzed."));
       Parameters.Add(new LookupParameter<PathTSPTour>("BestSolution", "The best TSP solution."));
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the best TSP solution should be stored."));
@@ -64 +66 @@
     public override IOperation Apply() {
       DoubleMatrix coordinates = CoordinatesParameter.ActualValue;
-      ItemArray<Permutation> permutations = PermutationParameter.ActualValue;
-      ItemArray<DoubleValue> qualities = QualityParameter.ActualValue;
+      ItemArray<ItemArray<Permutation>> permutations = PermutationParameter.ActualValue;
+      ItemArray<ItemArray<DoubleValue>> qualities = QualityParameter.ActualValue;
       ResultCollection results = ResultsParameter.ActualValue;
 
-      int i = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
+      DoubleValue bestQuality = new DoubleValue(double.MaxValue);
+      Permutation bestPermutation = null;
+
+      for (int i = 0; i < qualities.Length; i++) {
+        for (int j = 0; j < qualities[i].Length; j++) {
+          if (qualities[i][j].Value < bestQuality.Value) {
+            bestQuality = qualities[i][j];
+            bestPermutation = permutations[i][j];
+          }
+        }
+      }
 
       PathTSPTour tour = BestSolutionParameter.ActualValue;
       if (tour == null) {
-        tour = new PathTSPTour(coordinates, permutations[i], qualities[i]);
+        tour = new PathTSPTour(coordinates, bestPermutation, bestQuality);
         BestSolutionParameter.ActualValue = tour;
         results.Add(new Result("Best TSP Solution", tour));
       } else {
-        if (tour.Quality.Value > qualities[i].Value) {
+        if (tour.Quality.Value > bestQuality.Value) {
           tour.Coordinates = coordinates;
-          tour.Permutation = permutations[i];
-          tour.Quality = qualities[i];
+          tour.Permutation = bestPermutation;
+          tour.Quality = bestQuality;
           results["Best TSP Solution"].Value = tour;
         }

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

@@ -34 +34 @@
   /// An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.
   /// </summary>
-  [Item("BestTSPSolutionAnalyzer", "An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.")]
+  [Item("PopulationBestTSPSolutionAnalyzer", "An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.")]
   [StorableClass]
-  public sealed class BestTSPSolutionAnalyzer : SingleSuccessorOperator, IPopulationAnalyzer {
+  public sealed class PopulationBestTSPSolutionAnalyzer : SingleSuccessorOperator, IPopulationAnalyzer {
     public LookupParameter<DoubleMatrix> CoordinatesParameter {
       get { return (LookupParameter<DoubleMatrix>)Parameters["Coordinates"]; }
@@ -53 +53 @@
     }
 
-    public BestTSPSolutionAnalyzer()
+    public PopulationBestTSPSolutionAnalyzer()
       : base() {
       Parameters.Add(new LookupParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the cities."));

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj

@@ -84 +84 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Analyzers\MultiPopulationBestTSPSolutionAnalyzer.cs" />
+    <Compile Include="Analyzers\PopulationBestTSPSolutionAnalyzer.cs" />
     <Compile Include="Analyzers\BestTSPSolutionAnalyzer.cs" />
     <Compile Include="Evaluators\TSPEuclideanPathEvaluator.cs" />