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

Timestamp:

12/01/11 13:49:59 (12 years ago)

Author:

mkommend

Message:

#1694: Corrected bugs in CrossValidation.

File:

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

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

@@ -278 +278 @@
             int testEnd = (i + 1) == Folds.Value ? SamplesEnd.Value : (i + 1) * testSamplesCount + SamplesStart.Value;
 
+            problem.ProblemData.TrainingPartition.Start = SamplesStart.Value;
+            problem.ProblemData.TrainingPartition.End = SamplesEnd.Value;
             problem.ProblemData.TestPartition.Start = testStart;
             problem.ProblemData.TestPartition.End = testEnd;
@@ -515 +517 @@
         throw new InvalidOperationException("Can not change number of folds if the execution state is not prepared.");
     }
+
+    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) {
-      if (Problem != null) Problem.ProblemData.TrainingPartition.End = SamplesEnd.Value;
+      samplesChanged = true;
+      if (Problem != null) problem.ProblemData.TrainingPartition.End = SamplesEnd.Value;
+      samplesChanged = false;
     }
 
@@ -543 +551 @@
         throw new ArgumentException("A cross validation algorithm can only contain DataAnalysisProblems.");
       }
-      algorithm.Problem.Reset += (x,y) => OnProblemChanged();
+      algorithm.Problem.Reset += (x, y) => OnProblemChanged();
       problem = (IDataAnalysisProblem)algorithm.Problem;
       OnProblemChanged();
@@ -551 +559 @@
       EventHandler handler = ProblemChanged;
       if (handler != null) handler(this, EventArgs.Empty);
+      if (samplesChanged) return;
 
       SamplesStart.Value = 0;