Changeset 8385 for branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.cs

Timestamp:

08/02/12 13:22:47 (12 years ago)

Author:

jkarder

Message:

#1247:

• added operator that evaluates expressions
• added selection pressure analyzer
• fixed bug in counting of evaluated solutions

File:

• branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.cs (modified) (5 diffs)

branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.cs

@@ -185 +185 @@
     [Storable]
     private OffspringSuccessAnalyzer offspringSuccessAnalyzer;
+    [Storable]
+    private SelectionPressureAnalyzer selectionPressureAnalyzer;
     #endregion
 
@@ -196 +198 @@
       populationSizeAnalyzer = cloner.Clone(original.populationSizeAnalyzer);
       offspringSuccessAnalyzer = cloner.Clone(original.offspringSuccessAnalyzer);
+      selectionPressureAnalyzer = cloner.Clone(original.selectionPressureAnalyzer);
       Initialize();
     }
@@ -263 +266 @@
       populationSizeAnalyzer = new PopulationSizeAnalyzer();
       offspringSuccessAnalyzer = new OffspringSuccessAnalyzer();
+      selectionPressureAnalyzer = new SelectionPressureAnalyzer();
       ParameterizeAnalyzers();
       UpdateAnalyzers();
@@ -401 +405 @@
       offspringSuccessAnalyzer.ResultsParameter.ActualName = "Results";
       offspringSuccessAnalyzer.ResultsParameter.Hidden = true;
+      selectionPressureAnalyzer.ResultsParameter.ActualName = "Results";
+      selectionPressureAnalyzer.ResultsParameter.Hidden = true;
       if (Problem != null) {
         qualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
@@ -459 +465 @@
       Analyzer.Operators.Add(populationSizeAnalyzer, populationSizeAnalyzer.EnabledByDefault);
       Analyzer.Operators.Add(offspringSuccessAnalyzer, offspringSuccessAnalyzer.EnabledByDefault);
+      Analyzer.Operators.Add(selectionPressureAnalyzer, selectionPressureAnalyzer.EnabledByDefault);
     }
     private void UpdateSimilarityCalculators() {