Changeset 6614 for trunk/sources

Timestamp:

07/29/11 14:48:54 (13 years ago)

Author:

mkommend

Message:

#1592: Prevented nested ensemble solutions, during ensemble creation by menu item.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/CreateEnsembleMenuItem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/CreateEnsembleMenuItem.cs

@@ -75 +75 @@
             var ensemble = new RegressionEnsembleSolution(Enumerable.Empty<IRegressionModel>(), problemData);
             ensemble.Name = group.Key + " ensemble";
-            ensemble.AddRegressionSolutions(group.OfType<IRegressionSolution>());
+            var nestedSolutions = group.OfType<RegressionEnsembleSolution>().SelectMany(e => e.RegressionSolutions);
+            var solutions = group.Where(s => !(s is RegressionEnsembleSolution)).OfType<IRegressionSolution>();
+            ensemble.AddRegressionSolutions(nestedSolutions.Concat(solutions));
             MainFormManager.MainForm.ShowContent(ensemble);
           } else if (group.All(s => s is IClassificationSolution)) {
@@ -85 +87 @@
             var ensemble = new ClassificationEnsembleSolution(Enumerable.Empty<IClassificationModel>(), problemData);
             ensemble.Name = group.Key + " ensemble";
-            ensemble.AddClassificationSolutions(group.OfType<IClassificationSolution>());
+            var nestedSolutions = group.OfType<ClassificationEnsembleSolution>().SelectMany(e => e.ClassificationSolutions);
+            var solutions = group.Where(s => !(s is ClassificationEnsembleSolution)).OfType<IClassificationSolution>();
+            ensemble.AddClassificationSolutions(nestedSolutions.Concat(solutions));
             MainFormManager.MainForm.ShowContent(ensemble);
           }