Changeset 4703 for trunk/sources/HeuristicLab.Problems.TravelingSalesman

Timestamp:

11/02/10 04:29:34 (14 years ago)

Author:

swagner

Message:

Reviewed diversity analysis branch and merged it into the trunk (#1188)

Location:

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3

Files:

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

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

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

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

@@ -131 +131 @@
       get { return operators.OfType<TSPAlleleFrequencyAnalyzer>().FirstOrDefault(); }
     }
+    private TSPPopulationDiversityAnalyzer TSPPopulationDiversityAnalyzer {
+      get { return operators.OfType<TSPPopulationDiversityAnalyzer>().FirstOrDefault(); }
+    }
     #endregion
 
@@ -273 +276 @@
       operators.Add(new BestTSPSolutionAnalyzer());
       operators.Add(new TSPAlleleFrequencyAnalyzer());
+      operators.Add(new TSPPopulationDiversityAnalyzer());
       ParameterizeAnalyzers();
       operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>().Cast<IOperator>());
@@ -332 +336 @@
         TSPAlleleFrequencyAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
         TSPAlleleFrequencyAnalyzer.ResultsParameter.ActualName = "Results";
+      }
+
+      if (TSPPopulationDiversityAnalyzer != null) {
+        TSPPopulationDiversityAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
+        TSPPopulationDiversityAnalyzer.SolutionParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
+        TSPPopulationDiversityAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        TSPPopulationDiversityAnalyzer.ResultsParameter.ActualName = "Results";
       }
     }