Changeset 9182 for branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandGeneticAlgorithm.cs

Timestamp:

01/23/13 10:18:22 (12 years ago)

Author:

mkommend

Message:

#1997: Added reevaluation of elits to symbolic data analysis island ga and changed evaluator to combine the fixed and random samples.

File:

• branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandGeneticAlgorithm.cs (modified) (5 diffs)

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandGeneticAlgorithm.cs

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -33 +34 @@
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
 using HeuristicLab.Random;
+using HeuristicLab.Selection;
 
 namespace HeuristicLab.Algorithms.DataAnalysis.Symbolic {
   [Item("Symbolic DataAnalysis Island Genetic Algorithm", "A symbolic data analysis island genetic algorithm.")]
-  [Creatable("Algorithms")]
+  [Creatable("Data Analysis")]
   [StorableClass]
   public sealed class SymbolicDataAnalysisIslandGeneticAlgorithm : IslandGeneticAlgorithm {
@@ -122 +124 @@
       insertionPoint.Successor = fixedSamplesPartitionCreator;
 
+      //necessary to reevaluate elites 
+      var evaluatorPlaceHolder = new Placeholder();
+      evaluatorPlaceHolder.OperatorParameter.ActualName = "Evaluator";
+
+      UniformSubScopesProcessor subScopesProcessor = new UniformSubScopesProcessor();
+      subScopesProcessor.Name = "Reevaluate elites";
+      subScopesProcessor.Parallel.Value = true;
+      subScopesProcessor.Operator = evaluatorPlaceHolder;
+      OperatorGraph.Iterate().OfType<RightReducer>().First().Successor = subScopesProcessor;
+
       RegisterParameterEvents();
       RecalculateFixedSamplesPartitions();
@@ -161 +173 @@
     }
 
-   
+
     private void ParameterizeAnalyzers() {
       foreach (var analyzer in Analyzer.Operators.OfType<ISymbolicDataAnalysisAnalyzer>()) {
@@ -192 +204 @@
       if (Problem is IRegressionProblem) {
         var evaluator = new SymbolicDataAnalysisIslandGAEvaluator<IRegressionProblemData>();
-        evaluator.FixedSamplesParameter.ActualName = FixedSamplesParameterName;
         evaluator.RandomSamplesParameter.ActualName = RandomSamplesParameterName;
         EvaluatorParameter.Value = evaluator;
       } else if (Problem is IClassificationProblem) {
         var evaluator = new SymbolicDataAnalysisIslandGAEvaluator<IClassificationProblemData>();
-        evaluator.FixedSamplesParameter.ActualName = FixedSamplesParameterName;
         evaluator.RandomSamplesParameter.ActualName = RandomSamplesParameterName;
         EvaluatorParameter.Value = evaluator;