Changeset 9172 for branches/DataAnalysis.IslandAlgorithms

Timestamp:

01/17/13 10:51:01 (12 years ago)

Author:

mkommend

Message:

#1997: Improved wiring of SymbolicDataAnalysisIslandGA.

File:

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

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

@@ -111 +111 @@
       Parameters.Add(new LookupParameter<ISingleObjectiveEvaluator>(ProblemEvaluatorParameterName, "Internal parameter for name translation", "Evaluator"));
 
+      Elites.Value = 0;
+      ElitesParameter.Hidden = true;
+
       ScopeTreeAssigner<IntRange> fixedSamplesPartitionCreator = new ScopeTreeAssigner<IntRange>();
       fixedSamplesPartitionCreator.LeftSideParameter.ActualName = FixedSamplesPartitionParameterName;
@@ -121 +124 @@
       RegisterParameterEvents();
       RecalculateFixedSamplesPartitions();
+    }
+
+    private void RegisterParameterEvents() {
+      if (Problem != null) Problem.FitnessCalculationPartition.ValueChanged += Problem_Reset;
+      NumberOfIslandsParameter.ValueChanged += NumberOfIslandsParameter_ValueChanged;
+      NumberOfIslandsParameter.Value.ValueChanged += (o, ev) => RecalculateFixedSamplesPartitions();
+      FixedSamplesParameter.Value.ValueChanged += (o, e) => RecalculateFixedSamplesPartitions();
+      Analyzer.Operators.PropertyChanged += (o, e) => ParameterizeAnalyzers();
     }
 
@@ -150 +161 @@
     }
 
-    private void RegisterParameterEvents() {
-      NumberOfIslandsParameter.ValueChanged += NumberOfIslandsParameter_ValueChanged;
-      NumberOfIslandsParameter.Value.ValueChanged += (o, ev) => RecalculateFixedSamplesPartitions();
-      FixedSamplesParameter.Value.ValueChanged += (o, e) => RecalculateFixedSamplesPartitions();
+   
+    private void ParameterizeAnalyzers() {
+      foreach (var analyzer in Analyzer.Operators.OfType<ISymbolicDataAnalysisAnalyzer>()) {
+        IParameter evaluatorParameter;
+        if (analyzer.Parameters.TryGetValue("Evaluator", out evaluatorParameter)) {
+          ILookupParameter param = evaluatorParameter as ILookupParameter;
+          if (evaluatorParameter != null) param.ActualName = ProblemEvaluatorParameterName;
+        }
+      }
     }
 
@@ -162 +178 @@
 
     protected override void Problem_Reset(object sender, EventArgs e) {
+      FixedSamples = Problem.FitnessCalculationPartition.Size / NumberOfIslands.Value;
+      RandomSamples = Problem.FitnessCalculationPartition.Size / NumberOfIslands.Value;
       RecalculateFixedSamplesPartitions();
       ParameterizeProblemEvaluator();
@@ -168 +186 @@
 
     protected override void OnProblemChanged() {
-      Problem.FitnessCalculationPartition.ValueChanged += (o, e) => RecalculateFixedSamplesPartitions();
-
-      ParameterizeProblemEvaluator();
+      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>();
@@ -184 +203 @@
         EvaluatorParameter.Value = null;
 
+      ParameterizeProblemEvaluator();
       ParameterizeStochasticOperatorForIsland(EvaluatorParameter.Value);