Changeset 3635

Timestamp:

05/05/10 14:48:55 (15 years ago)

Author:

swagner

Message:

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

Location:

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3

Files:

• Analyzers/BestTSPSolutionAnalyzer.cs (modified) (1 diff)
• Analyzers/MultiPopulationBestTSPSolutionAnalyzer.cs (modified) (1 diff)
• Analyzers/PopulationBestTSPSolutionAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.TravelingSalesman-3.3.csproj (modified) (1 diff)
• Interfaces/IBestTSPSolutionAnalyzer.cs (added)
• TravelingSalesmanProblem.cs (modified) (6 diffs)

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, ISolutionAnalyzer {
-    public LookupParameter<DoubleMatrix> CoordinatesParameter {
-      get { return (LookupParameter<DoubleMatrix>)Parameters["Coordinates"]; }
+  public sealed class BestTSPSolutionAnalyzer : SingleSuccessorOperator, IBestTSPSolutionAnalyzer, ISolutionAnalyzer {
+    public ILookupParameter<DoubleMatrix> CoordinatesParameter {
+      get { return (ILookupParameter<DoubleMatrix>)Parameters["Coordinates"]; }
     }
-    public LookupParameter<Permutation> PermutationParameter {
-      get { return (LookupParameter<Permutation>)Parameters["Permutation"]; }
+    public ILookupParameter<Permutation> PermutationParameter {
+      get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
     }
-    public LookupParameter<DoubleValue> QualityParameter {
-      get { return (LookupParameter<DoubleValue>)Parameters["Quality"]; }
+    ILookupParameter IBestTSPSolutionAnalyzer.PermutationParameter {
+      get { return PermutationParameter; }
     }
-    public LookupParameter<PathTSPTour> BestSolutionParameter {
-      get { return (LookupParameter<PathTSPTour>)Parameters["BestSolution"]; }
+    public ILookupParameter<DoubleValue> QualityParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
-    public ValueLookupParameter<ResultCollection> ResultsParameter {
-      get { return (ValueLookupParameter<ResultCollection>)Parameters["Results"]; }
+    ILookupParameter IBestTSPSolutionAnalyzer.QualityParameter {
+      get { return QualityParameter; }
+    }
+    public ILookupParameter<PathTSPTour> BestSolutionParameter {
+      get { return (ILookupParameter<PathTSPTour>)Parameters["BestSolution"]; }
+    }
+    public IValueLookupParameter<ResultCollection> ResultsParameter {
+      get { return (IValueLookupParameter<ResultCollection>)Parameters["Results"]; }
     }
 

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

@@ -38 +38 @@
   [Item("MultiPopulationBestTSPSolutionAnalyzer", "An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.")]
   [StorableClass]
-  public sealed class MultiPopulationBestTSPSolutionAnalyzer : SingleSuccessorOperator, IMultiPopulationAnalyzer {
-    public LookupParameter<DoubleMatrix> CoordinatesParameter {
-      get { return (LookupParameter<DoubleMatrix>)Parameters["Coordinates"]; }
+  public sealed class MultiPopulationBestTSPSolutionAnalyzer : SingleSuccessorOperator, IBestTSPSolutionAnalyzer, IMultiPopulationAnalyzer {
+    public ILookupParameter<DoubleMatrix> CoordinatesParameter {
+      get { return (ILookupParameter<DoubleMatrix>)Parameters["Coordinates"]; }
     }
-    public SubScopesSubScopesLookupParameter<Permutation> PermutationParameter {
-      get { return (SubScopesSubScopesLookupParameter<Permutation>)Parameters["Permutation"]; }
+    public ILookupParameter<ItemArray<ItemArray<Permutation>>> PermutationParameter {
+      get { return (ILookupParameter<ItemArray<ItemArray<Permutation>>>)Parameters["Permutation"]; }
     }
-    public SubScopesSubScopesLookupParameter<DoubleValue> QualityParameter {
-      get { return (SubScopesSubScopesLookupParameter<DoubleValue>)Parameters["Quality"]; }
+    ILookupParameter IBestTSPSolutionAnalyzer.PermutationParameter {
+      get { return PermutationParameter; }
     }
-    public LookupParameter<PathTSPTour> BestSolutionParameter {
-      get { return (LookupParameter<PathTSPTour>)Parameters["BestSolution"]; }
+    public ILookupParameter<ItemArray<ItemArray<DoubleValue>>> QualityParameter {
+      get { return (ILookupParameter<ItemArray<ItemArray<DoubleValue>>>)Parameters["Quality"]; }
     }
-    public ValueLookupParameter<ResultCollection> ResultsParameter {
-      get { return (ValueLookupParameter<ResultCollection>)Parameters["Results"]; }
+    ILookupParameter IBestTSPSolutionAnalyzer.QualityParameter {
+      get { return QualityParameter; }
+    }
+    public ILookupParameter<PathTSPTour> BestSolutionParameter {
+      get { return (ILookupParameter<PathTSPTour>)Parameters["BestSolution"]; }
+    }
+    public IValueLookupParameter<ResultCollection> ResultsParameter {
+      get { return (IValueLookupParameter<ResultCollection>)Parameters["Results"]; }
     }
 

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

@@ -36 +36 @@
   [Item("PopulationBestTSPSolutionAnalyzer", "An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.")]
   [StorableClass]
-  public sealed class PopulationBestTSPSolutionAnalyzer : SingleSuccessorOperator, IPopulationAnalyzer {
-    public LookupParameter<DoubleMatrix> CoordinatesParameter {
-      get { return (LookupParameter<DoubleMatrix>)Parameters["Coordinates"]; }
+  public sealed class PopulationBestTSPSolutionAnalyzer : SingleSuccessorOperator, IBestTSPSolutionAnalyzer, IPopulationAnalyzer {
+    public ILookupParameter<DoubleMatrix> CoordinatesParameter {
+      get { return (ILookupParameter<DoubleMatrix>)Parameters["Coordinates"]; }
     }
-    public SubScopesLookupParameter<Permutation> PermutationParameter {
-      get { return (SubScopesLookupParameter<Permutation>)Parameters["Permutation"]; }
+    public ILookupParameter<ItemArray<Permutation>> PermutationParameter {
+      get { return (ILookupParameter<ItemArray<Permutation>>)Parameters["Permutation"]; }
     }
-    public SubScopesLookupParameter<DoubleValue> QualityParameter {
-      get { return (SubScopesLookupParameter<DoubleValue>)Parameters["Quality"]; }
+    ILookupParameter IBestTSPSolutionAnalyzer.PermutationParameter {
+      get { return PermutationParameter; }
     }
-    public LookupParameter<PathTSPTour> BestSolutionParameter {
-      get { return (LookupParameter<PathTSPTour>)Parameters["BestSolution"]; }
+    public ILookupParameter<ItemArray<DoubleValue>> QualityParameter {
+      get { return (ILookupParameter<ItemArray<DoubleValue>>)Parameters["Quality"]; }
     }
-    public ValueLookupParameter<ResultCollection> ResultsParameter {
-      get { return (ValueLookupParameter<ResultCollection>)Parameters["Results"]; }
+    ILookupParameter IBestTSPSolutionAnalyzer.QualityParameter {
+      get { return QualityParameter; }
+    }
+    public ILookupParameter<PathTSPTour> BestSolutionParameter {
+      get { return (ILookupParameter<PathTSPTour>)Parameters["BestSolution"]; }
+    }
+    public IValueLookupParameter<ResultCollection> ResultsParameter {
+      get { return (IValueLookupParameter<ResultCollection>)Parameters["Results"]; }
     }
 

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

@@ -90 +90 @@
     <Compile Include="Evaluators\TSPGeoPathEvaluator.cs" />
     <Compile Include="HeuristicLabProblemsTravelingSalesmanPlugin.cs" />
+    <Compile Include="Interfaces\IBestTSPSolutionAnalyzer.cs" />
     <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveEuclideanPathEvaluator.cs" />
     <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveGeoPathEvaluator.cs" />

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

@@ -124 +124 @@
       get { return operators; }
     }
-    private BestTSPSolutionAnalyzer Analyzer {
-      get { return operators.OfType<BestTSPSolutionAnalyzer>().FirstOrDefault(); }
+    private IEnumerable<IBestTSPSolutionAnalyzer> BestTSPSolutionAnalyzers {
+      get { return operators.OfType<IBestTSPSolutionAnalyzer>(); }
     }
     #endregion
@@ -231 +231 @@
       ParameterizeSolutionCreator();
       ParameterizeEvaluator();
-      ParameterizeAnalyzer();
+      ParameterizeAnalyzers();
       ParameterizeOperators();
       OnSolutionCreatorChanged();
@@ -237 +237 @@
     private void SolutionCreator_PermutationParameter_ActualNameChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeAnalyzer();
+      ParameterizeAnalyzers();
       ParameterizeOperators();
     }
@@ -244 +244 @@
       ParameterizeEvaluator();
       UpdateMoveEvaluators();
-      ParameterizeAnalyzer();
+      ParameterizeAnalyzers();
       ClearDistanceMatrix();
       OnEvaluatorChanged();
     }
     private void Evaluator_QualityParameter_ActualNameChanged(object sender, EventArgs e) {
-      ParameterizeAnalyzer();
+      ParameterizeAnalyzers();
     }
     private void MoveGenerator_InversionMoveParameter_ActualNameChanged(object sender, EventArgs e) {
@@ -281 +281 @@
       operators = new List<IOperator>();
       operators.Add(new BestTSPSolutionAnalyzer());
-      ParameterizeAnalyzer();
+      operators.Add(new PopulationBestTSPSolutionAnalyzer());
+      operators.Add(new MultiPopulationBestTSPSolutionAnalyzer());
+      ParameterizeAnalyzers();
       operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>().Cast<IOperator>());
       ParameterizeOperators();
@@ -323 +325 @@
       }
     }
-    private void ParameterizeAnalyzer() {
-      if (Analyzer != null) {
-        Analyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-        Analyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
-        Analyzer.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
-        Analyzer.ResultsParameter.ActualName = "Results";
+    private void ParameterizeAnalyzers() {
+      foreach (IBestTSPSolutionAnalyzer analyzer in BestTSPSolutionAnalyzers) {
+        analyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        analyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
+        analyzer.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
+        analyzer.ResultsParameter.ActualName = "Results";
       }
     }