Changeset 13702 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression

Timestamp:

03/15/16 11:39:21 (9 years ago)

Author:

mkommend

Message:

#2590: Fixed bugs in RegressionEnsembleSolution when adding new solutions.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs

@@ -124 +124 @@
       testEvaluationCache = new Dictionary<int, double>(problemData.TestIndices.Count());
 
-      RegisterRegressionSolutionsEventHandler();
+
       var solutions = model.Models.Select(m => m.CreateRegressionSolution((IRegressionProblemData)problemData.Clone()));
-      regressionSolutions.AddRange(solutions);
+      foreach (var solution in solutions) {
+        regressionSolutions.Add(solution);
+        trainingPartitions.Add(solution.Model, solution.ProblemData.TrainingPartition);
+        testPartitions.Add(solution.Model, solution.ProblemData.TestPartition);
+      }
+
+      RecalculateResults();
+      RegisterRegressionSolutionsEventHandler();
     }
 
@@ -261 +268 @@
       if (Model.Models.Contains(solution.Model)) throw new ArgumentException();
       Model.Add(solution.Model);
+
       trainingPartitions[solution.Model] = solution.ProblemData.TrainingPartition;
       testPartitions[solution.Model] = solution.ProblemData.TestPartition;
@@ -272 +280 @@
       if (!Model.Models.Contains(solution.Model)) throw new ArgumentException();
       Model.Remove(solution.Model);
+
       trainingPartitions.Remove(solution.Model);
       testPartitions.Remove(solution.Model);