Changeset 8971 for branches/RuntimeOptimizer/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

11/29/12 09:57:15 (12 years ago)

Author:

abeham

Message:

#1985: Synchronized with trunk

Location:

branches/RuntimeOptimizer

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (10 diffs)

branches/RuntimeOptimizer/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

@@ -45 +45 @@
 
       executionState = ExecutionState.Stopped;
-      runs = new RunCollection { AlgorithmName = name };
+      runs = new RunCollection { OptimizerName = name };
       runsCounter = 0;
 
@@ -120 +120 @@
           }
           OnAlgorithmChanged();
-          if (algorithm != null) OnProblemChanged();
           Prepare();
         }
@@ -249 +248 @@
     protected override void OnNameChanged() {
       base.OnNameChanged();
-      Runs.AlgorithmName = Name;
+      Runs.OptimizerName = Name;
     }
 
@@ -521 +520 @@
     private void RegisterEvents() {
       Folds.ValueChanged += new EventHandler(Folds_ValueChanged);
-      SamplesStart.ValueChanged += new EventHandler(SamplesStart_ValueChanged);
-      SamplesEnd.ValueChanged += new EventHandler(SamplesEnd_ValueChanged);
       RegisterClonedAlgorithmsEvents();
     }
@@ -530 +527 @@
     }
 
-    private bool samplesChanged = false;
-    private void SamplesStart_ValueChanged(object sender, EventArgs e) {
-      samplesChanged = true;
-      if (Problem != null) Problem.ProblemData.TrainingPartition.Start = SamplesStart.Value;
-      samplesChanged = false;
-    }
-    private void SamplesEnd_ValueChanged(object sender, EventArgs e) {
-      samplesChanged = true;
-      if (Problem != null) Problem.ProblemData.TrainingPartition.End = SamplesEnd.Value;
-      samplesChanged = false;
-    }
 
     #region template algorithms events
@@ -553 +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) {
@@ -563 +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();
@@ -571 +560 @@
       EventHandler handler = ProblemChanged;
       if (handler != null) handler(this, EventArgs.Empty);
-      if (samplesChanged) return;
-
+      ConfigureProblem();
+    }
+
+    private void Problem_Reset(object sender, EventArgs e) {
+      ConfigureProblem();
+    }
+
+    private void ConfigureProblem() {
       SamplesStart.Value = 0;
       if (Problem != null) {
@@ -593 +588 @@
       } else
         SamplesEnd.Value = 0;
-
-      SamplesStart_ValueChanged(this, EventArgs.Empty);
-      SamplesEnd_ValueChanged(this, EventArgs.Empty);
     }
 
@@ -689 +681 @@
       lock (locker) {
         if (!stopPending && ExecutionState == ExecutionState.Started) {
-          IAlgorithm preparedAlgorithm = clonedAlgorithms.Where(alg => alg.ExecutionState == ExecutionState.Prepared ||
-                                                                       alg.ExecutionState == ExecutionState.Paused).FirstOrDefault();
+          IAlgorithm preparedAlgorithm = clonedAlgorithms.FirstOrDefault(alg => alg.ExecutionState == ExecutionState.Prepared ||
+                                                                                alg.ExecutionState == ExecutionState.Paused);
           if (preparedAlgorithm != null) preparedAlgorithm.Start();
         }