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

Timestamp:

04/17/12 17:40:46 (13 years ago)

Author:

gkronber

Message:

#1722 added an additional ctor for RegerssionEnsembleSolution to simplify code.

File:

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

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

@@ -295 +295 @@
               symbolicProblem.FitnessCalculationPartition.End = SamplesEnd.Value;
             }
-
+            clonedAlgorithm.Prepare();
             clonedAlgorithms.Add(clonedAlgorithm);
           }
@@ -416 +416 @@
         problemDataClone.TestPartition.Start = SamplesStart.Value; problemDataClone.TestPartition.End = SamplesEnd.Value;
         // 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)));
+        var ensembleSolution = new RegressionEnsembleSolution(problemDataClone);
+        ensembleSolution.AddRegressionSolutions(solutions.Value);
 
         aggregatedResults.Add(new Result(solutions.Key + " (ensemble)", ensembleSolution));