Changeset 8965 for trunk/sources

Timestamp:

11/28/12 12:19:01 (12 years ago)

Author:

mkommend

Message:

#1917: Added missing event registration in AfterDeserialization of CrossValidation and clean up code if a problem changes in the crossvalidation. Additionally, I removed explicit calls to OnReset in the Load methods of IDataAnalysisProblems the reset event is automatically fired when the problem data is changed.

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (6 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanAndVarianceCalculator.cs (modified) (1 diff)

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

@@ -73 +73 @@
       RegisterEvents();
       if (Algorithm != null) RegisterAlgorithmEvents();
+      if (Problem != null) Problem.Reset += (o, e) => OnProblemChanged();
     }
 
@@ -521 +522 @@
     private void RegisterEvents() {
       Folds.ValueChanged += new EventHandler(Folds_ValueChanged);
-      SamplesStart.ValueChanged += new EventHandler(SamplesStart_ValueChanged);
-      SamplesEnd.ValueChanged += new EventHandler(SamplesEnd_ValueChanged);
       RegisterClonedAlgorithmsEvents();
     }
@@ -530 +529 @@
     }
 
-    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
@@ -571 +559 @@
       EventHandler handler = ProblemChanged;
       if (handler != null) handler(this, EventArgs.Empty);
-      if (samplesChanged) return;
 
       SamplesStart.Value = 0;
@@ -593 +580 @@
       } else
         SamplesEnd.Value = 0;
-
-      SamplesStart_ValueChanged(this, EventArgs.Empty);
-      SamplesEnd_ValueChanged(this, EventArgs.Empty);
     }
 
@@ -689 +673 @@
       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();
         }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

@@ -357 +357 @@
       Description = data.Description;
       ProblemData = data;
-      OnReset();
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblem.cs

@@ -102 +102 @@
       Description = data.Description;
       ProblemData = data;
-      OnReset();
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlineMeanAndVarianceCalculator.cs

@@ -73 +73 @@
 
     public void Add(double x) {
-      if (double.IsNaN(x) || double.IsInfinity(x) || x > 1E13 || x < -1E13 || (errorState & OnlineCalculatorError.InvalidValueAdded) > 0) {
+      if (double.IsNaN(x) || double.IsInfinity(x) || (errorState & OnlineCalculatorError.InvalidValueAdded) > 0) {
         errorState = errorState | OnlineCalculatorError.InvalidValueAdded;
         varianceErrorState = errorState | OnlineCalculatorError.InvalidValueAdded;