Changeset 3662 for trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm

Timestamp:

05/06/10 02:46:37 (15 years ago)

Author:

swagner

Message:

Worked on refactoring of algorithm analysis and tracing (#999)

• adapted analyzers

Location:

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

Files:

• GeneticAlgorithm.cs (modified) (4 diffs)
• IslandGeneticAlgorithm.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs

@@ -140 +140 @@
       get { return selectors; }
     }
-    private PopulationBestAverageWorstQualityAnalyzer qualityAnalyzer;
+    private BestAverageWorstQualityAnalyzer qualityAnalyzer;
     #endregion
 
@@ -291 +291 @@
     }
     private void InitializeAnalyzers() {
-      qualityAnalyzer = new PopulationBestAverageWorstQualityAnalyzer();
+      qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
       ParameterizeAnalyzers();
     }
@@ -312 +312 @@
         qualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
         qualityAnalyzer.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
+        qualityAnalyzer.QualityParameter.Depth = 1;
         qualityAnalyzer.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name;
       }
@@ -353 +354 @@
       Analyzer.Operators.Add(qualityAnalyzer);
       if (Problem != null) {
-        foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>().OrderBy(x => x.Name))
+        foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>().OrderBy(x => x.Name)) {
           Analyzer.Operators.Add(analyzer);
+        }
       }
     }

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs

@@ -204 +204 @@
       get { return (IslandGeneticAlgorithmMainLoop)IslandProcessor.Successor; }
     }
-    private PopulationBestAverageWorstQualityAnalyzer islandQualityAnalyzer;
+    private BestAverageWorstQualityAnalyzer islandQualityAnalyzer;
     //private MultipopulationBestAverageWorstQualityAnalyzer qualityAnalyzer;
     #endregion
@@ -398 +398 @@
     }
     private void InitializeAnalyzers() {
-      islandQualityAnalyzer = new PopulationBestAverageWorstQualityAnalyzer();
+      islandQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
       //qualityAnalyzer = new MultipopulationBestAverageWorstQualityAnalyzer();
       ParameterizeAnalyzers();