Changeset 8969 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

11/28/12 17:21:55 (12 years ago)

Author:

mkommend

Message:

#1917: Corrected event registration for problem changes in CrossValidation.

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

@@ -73 +73 @@
       RegisterEvents();
       if (Algorithm != null) RegisterAlgorithmEvents();
-      if (Problem != null) Problem.Reset += (o, e) => OnProblemChanged();
     }
 
@@ -121 +120 @@
           }
           OnAlgorithmChanged();
-          if (algorithm != null) OnProblemChanged();
           Prepare();
         }
@@ -541 +539 @@
       algorithm.ProblemChanged += new EventHandler(Algorithm_ProblemChanged);
       algorithm.ExecutionStateChanged += new EventHandler(Algorithm_ExecutionStateChanged);
+      if (Problem != null) Problem.Reset += new EventHandler(Problem_Reset);
     }
     private void DeregisterAlgorithmEvents() {
       algorithm.ProblemChanged -= new EventHandler(Algorithm_ProblemChanged);
       algorithm.ExecutionStateChanged -= new EventHandler(Algorithm_ExecutionStateChanged);
+      if (Problem != null) Problem.Reset -= new EventHandler(Problem_Reset);
     }
     private void Algorithm_ProblemChanged(object sender, EventArgs e) {
@@ -551 +551 @@
         throw new ArgumentException("A cross validation algorithm can only contain DataAnalysisProblems.");
       }
-      algorithm.Problem.Reset += (x, y) => OnProblemChanged();
+      if(problem!= null) problem.Reset -= new EventHandler(Problem_Reset);
+      if (Problem != null) Problem.Reset += new EventHandler(Problem_Reset);
       problem = (IDataAnalysisProblem)algorithm.Problem;
       OnProblemChanged();
@@ -559 +560 @@
       EventHandler handler = ProblemChanged;
       if (handler != null) handler(this, EventArgs.Empty);
-
-      SamplesStart.Value = 0;
+      ConfigureProblem();
+    }
+
+    private void Problem_Reset(object sender, EventArgs e) {
+      ConfigureProblem();
+    }
+
+    private void ConfigureProblem(){
+    SamplesStart.Value = 0;
       if (Problem != null) {
         SamplesEnd.Value = Problem.ProblemData.Dataset.Rows;