Changeset 10156 for branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandOffspringSelectionGeneticAlgorithm.cs

Timestamp:

11/26/13 15:32:09 (10 years ago)

Author:

mkommend

Message:

#1997: Removed generic type parameter from SymbolicDataAnylsisIslandGAEvaluator and added wiring code for the reevaluation of immigrants.

File:

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

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

@@ -31 +31 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
 
@@ -128 +127 @@
       NumberOfIslandsParameter.ValueChanged += NumberOfIslandsParameter_ValueChanged;
       NumberOfIslandsParameter.Value.ValueChanged += (o, ev) => RecalculateFixedSamplesPartitions();
-      FixedSamplesParameter.Value.ValueChanged += (o, e) => RecalculateFixedSamplesPartitions();
+      FixedSamplesParameter.Value.ValueChanged += (o, e) => {
+        RecalculateFixedSamplesPartitions();
+        ReevaluateImmigrants = FixedSamples >= Problem.FitnessCalculationPartition.Size;
+      };
       RandomSamplesParameter.Value.ValueChanged += (o, e) => { ReevaluteElites = RandomSamples != 0; };
       Analyzer.Operators.PropertyChanged += (o, e) => ParameterizeAnalyzers();
+      EvaluatorParameter.ValueChanged += (o, e) => ParameterizeEvaluator();
     }
 
@@ -155 +158 @@
     }
 
+    private void ParameterizeEvaluator() {
+      var evaluator = EvaluatorParameter.Value;
+      var islandGAEvaluator = evaluator as SymbolicDataAnalysisIslandGAEvaluator;
+      if (islandGAEvaluator != null) {
+        islandGAEvaluator.RandomSamplesParameter.ActualName = RandomSamplesParameterName;
+      }
+    }
+
     private void NumberOfIslandsParameter_ValueChanged(object sender, EventArgs e) {
       NumberOfIslands.ValueChanged += (o, ev) => RecalculateFixedSamplesPartitions();
@@ -162 +173 @@
     protected override void Problem_Reset(object sender, EventArgs e) {
       FixedSamples = Problem.FitnessCalculationPartition.Size / NumberOfIslands.Value;
-      RandomSamples = Problem.FitnessCalculationPartition.Size / NumberOfIslands.Value;
-      RecalculateFixedSamplesPartitions();
       base.Problem_Reset(sender, e);
     }
@@ -170 +179 @@
       Problem.FitnessCalculationPartition.ValueChanged += Problem_Reset;
       FixedSamples = Problem.FitnessCalculationPartition.Size / NumberOfIslands.Value;
-      RandomSamples = Problem.FitnessCalculationPartition.Size / NumberOfIslands.Value;
-
-      if (Problem is IRegressionProblem) {
-        var evaluator = new SymbolicDataAnalysisIslandGAEvaluator<IRegressionProblemData>();
-        evaluator.RandomSamplesParameter.ActualName = RandomSamplesParameterName;
-        EvaluatorParameter.Value = evaluator;
-      } else if (Problem is IClassificationProblem) {
-        var evaluator = new SymbolicDataAnalysisIslandGAEvaluator<IClassificationProblemData>();
-        evaluator.RandomSamplesParameter.ActualName = RandomSamplesParameterName;
-        EvaluatorParameter.Value = evaluator;
-      } else
+
+      if (Problem != null && EvaluatorParameter.Value == null) {
+        EvaluatorParameter.Value = new SymbolicDataAnalysisIslandGAEvaluator();
+      } else if (Problem == null)
         EvaluatorParameter.Value = null;