Changeset 4420

Timestamp:

09/16/10 23:39:51 (14 years ago)

Author:

swinkler

Message:

Implemented population diversity analyzer for TSP. (#1188)

Location:

branches/HeuristicLab.DiversityAnalysis/HeuristicLab.Problems.TravelingSalesman/3.3

Files:

• Analyzers/TSPPopulationDiversityAnalyzer.cs (added)
• HeuristicLab.Problems.TravelingSalesman-3.3.csproj (modified) (1 diff)
• TravelingSalesmanProblem.cs (modified) (7 diffs)

branches/HeuristicLab.DiversityAnalysis/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj

@@ -151 +151 @@
   <ItemGroup>
     <Compile Include="Analyzers\BestTSPSolutionAnalyzer.cs" />
+    <Compile Include="Analyzers\TSPPopulationDiversityAnalyzer.cs" />
     <Compile Include="Evaluators\TSPEuclideanPathEvaluator.cs" />
     <Compile Include="Evaluators\TSPGeoPathEvaluator.cs" />

branches/HeuristicLab.DiversityAnalysis/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

@@ -126 +126 @@
       get { return operators.OfType<BestTSPSolutionAnalyzer>().FirstOrDefault(); }
     }
+    private TSPPopulationDiversityAnalyzer TSPPopulationDiversityAnalyzer {
+      get { return operators.OfType<TSPPopulationDiversityAnalyzer>().FirstOrDefault(); }
+    }
     #endregion
 
@@ -210 +213 @@
       ParameterizeSolutionCreator();
       ParameterizeEvaluator();
-      ParameterizeAnalyzer();
+      ParameterizeAnalyzers();
       ParameterizeOperators();
       OnSolutionCreatorChanged();
@@ -216 +219 @@
     private void SolutionCreator_PermutationParameter_ActualNameChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
-      ParameterizeAnalyzer();
+      ParameterizeAnalyzers();
       ParameterizeOperators();
     }
@@ -223 +226 @@
       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) {
@@ -267 +270 @@
       operators = new List<IOperator>();
       operators.Add(new BestTSPSolutionAnalyzer());
-      ParameterizeAnalyzer();
+      operators.Add(new TSPPopulationDiversityAnalyzer());
+      ParameterizeAnalyzers();
       operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>().Cast<IOperator>());
       ParameterizeOperators();
@@ -308 +312 @@
       }
     }
-    private void ParameterizeAnalyzer() {
+    private void ParameterizeAnalyzers() {
       BestTSPSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
       BestTSPSolutionAnalyzer.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
@@ -316 +320 @@
       BestTSPSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
       BestTSPSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
+      TSPPopulationDiversityAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+      TSPPopulationDiversityAnalyzer.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
     }
     private void ParameterizeOperators() {