Changeset 6618 for branches/GP.Grammar.Editor/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

Timestamp:

08/01/11 17:48:53 (13 years ago)

Author:

mkommend

Message:

#1479: Integrated trunk changes.

File:

• branches/GP.Grammar.Editor/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (6 diffs)

branches/GP.Grammar.Editor/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

@@ -34 +34 @@
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
-  [Item("Cross Validation", "Cross Validation wrapper for data analysis algorithms.")]
+  [Item("Cross Validation", "Cross-validation wrapper for data analysis algorithms.")]
   [Creatable("Data Analysis")]
   [StorableClass]
@@ -363 +363 @@
 
     public void CollectResultValues(IDictionary<string, IItem> results) {
+      var clonedResults = (ResultCollection)this.results.Clone();
+      foreach (var result in clonedResults) {
+        results.Add(result.Name, result.Value);
+      }
+    }
+
+    private void AggregateResultValues(IDictionary<string, IItem> results) {
       Dictionary<string, List<double>> resultValues = new Dictionary<string, List<double>>();
       IEnumerable<IRun> runs = clonedAlgorithms.Select(alg => alg.Runs.FirstOrDefault()).Where(run => run != null);
@@ -397 +404 @@
       List<IResult> aggregatedResults = new List<IResult>();
       foreach (KeyValuePair<string, List<IRegressionSolution>> solutions in resultSolutions) {
-        var problemDataClone = (IRegressionProblemData)Problem.ProblemData.Clone();
+        // clone manually to correctly clone references between cloned root objects 
+        Cloner cloner = new Cloner();
+        var problemDataClone = (IRegressionProblemData)cloner.Clone(Problem.ProblemData);
+        // set partitions of problem data clone correctly
         problemDataClone.TrainingPartition.Start = SamplesStart.Value; problemDataClone.TrainingPartition.End = SamplesEnd.Value;
         problemDataClone.TestPartition.Start = SamplesStart.Value; problemDataClone.TestPartition.End = SamplesEnd.Value;
-        var ensembleSolution = new RegressionEnsembleSolution(solutions.Value.Select(x => x.Model), problemDataClone,
-          solutions.Value.Select(x => x.ProblemData.TrainingPartition),
-          solutions.Value.Select(x => x.ProblemData.TestPartition));
+        // clone models
+        var ensembleSolution = new RegressionEnsembleSolution(
+          solutions.Value.Select(x => cloner.Clone(x.Model)),
+          problemDataClone,
+          solutions.Value.Select(x => cloner.Clone(x.ProblemData.TrainingPartition)),
+          solutions.Value.Select(x => cloner.Clone(x.ProblemData.TestPartition)));
 
         aggregatedResults.Add(new Result(solutions.Key + " (ensemble)", ensembleSolution));
@@ -425 +438 @@
       var aggregatedResults = new List<IResult>();
       foreach (KeyValuePair<string, List<IClassificationSolution>> solutions in resultSolutions) {
-        var problemDataClone = (IClassificationProblemData)Problem.ProblemData.Clone();
+        // clone manually to correctly clone references between cloned root objects 
+        Cloner cloner = new Cloner();
+        var problemDataClone = (IClassificationProblemData)cloner.Clone(Problem.ProblemData);
+        // set partitions of problem data clone correctly
         problemDataClone.TrainingPartition.Start = SamplesStart.Value; problemDataClone.TrainingPartition.End = SamplesEnd.Value;
         problemDataClone.TestPartition.Start = SamplesStart.Value; problemDataClone.TestPartition.End = SamplesEnd.Value;
-        var ensembleSolution = new ClassificationEnsembleSolution(solutions.Value.Select(x => x.Model), problemDataClone,
-          solutions.Value.Select(x => x.ProblemData.TrainingPartition),
-          solutions.Value.Select(x => x.ProblemData.TestPartition));
+        // clone models
+        var ensembleSolution = new ClassificationEnsembleSolution(
+          solutions.Value.Select(x => cloner.Clone(x.Model)), 
+          problemDataClone,
+          solutions.Value.Select(x => cloner.Clone(x.ProblemData.TrainingPartition)),
+          solutions.Value.Select(x => cloner.Clone(x.ProblemData.TestPartition)));
 
         aggregatedResults.Add(new Result(solutions.Key + " (ensemble)", ensembleSolution));
@@ -553 +572 @@
       } else
         SamplesEnd.Value = 0;
+
+      SamplesStart_ValueChanged(this, EventArgs.Empty);
+      SamplesEnd_ValueChanged(this, EventArgs.Empty);
     }
 
@@ -699 +721 @@
       stopPending = false;
       Dictionary<string, IItem> collectedResults = new Dictionary<string, IItem>();
-      CollectResultValues(collectedResults);
+      AggregateResultValues(collectedResults);
       results.AddRange(collectedResults.Select(x => new Result(x.Key, x.Value)).Cast<IResult>().ToArray());
       runsCounter++;