Changeset 10593

Timestamp:

03/12/14 21:06:17 (11 years ago)

Author:

mkommend

Message:

#2160: Merged r10526 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/CreateEnsembleMenuItem.cs (modified) (5 diffs)

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/CreateEnsembleMenuItem.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Forms;
-using HeuristicLab.Core;
+using HeuristicLab.Common;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -68 +67 @@
         if (group.All(s => s is IRegressionSolution)) {
           // show all regression ensembles
-          // clone problemdata (N.B. this assumes all solutions are based on the same problem data!)
-          var problemData = (RegressionProblemData)group
-            .OfType<IRegressionSolution>()
-            .First()
-            .ProblemData.Clone();
+          // N.B. this assumes all solutions are based on the same problem data!
+          // the problem data is not cloned because the individual solutions were already cloned
+          var problemData = group.OfType<IRegressionSolution>().First().ProblemData;
           var ensemble = new RegressionEnsembleSolution(problemData);
           ensemble.Name = group.Key + " ensemble";
@@ -81 +78 @@
         } else if (group.All(s => s is IClassificationSolution)) {
           // show all classification ensembles
-          var problemData = (ClassificationProblemData)group
-            .OfType<IClassificationSolution>()
-            .First()
-            .ProblemData.Clone();
+          // N.B. this assumes all solutions are based on the same problem data!
+          // the problem data is not cloned because the individual solutions were already cloned
+          var problemData = (ClassificationProblemData)group.OfType<IClassificationSolution>().First().ProblemData;
           var ensemble = new ClassificationEnsembleSolution(Enumerable.Empty<IClassificationModel>(), problemData);
           ensemble.Name = group.Key + " ensemble";
@@ -95 +91 @@
     }
 
-    private IEnumerable<KeyValuePair<string, IItem>> GetDataAnalysisResults(IContentView view) {
-      var empty = Enumerable.Empty<KeyValuePair<string, IItem>>();
+    private IEnumerable<KeyValuePair<string, IDataAnalysisSolution>> GetDataAnalysisResults(IContentView view) {
+      var empty = Enumerable.Empty<KeyValuePair<string, IDataAnalysisSolution>>();
       if (view == null) return empty;
       if (view.Content == null) return empty;
@@ -114 +110 @@
     }
 
-    private IEnumerable<KeyValuePair<string, IItem>> GetDataAnalysisResults(IEnumerable<IRun> runs) {
+    private IEnumerable<KeyValuePair<string, IDataAnalysisSolution>> GetDataAnalysisResults(IEnumerable<IRun> runs) {
+      var cloner = new Cloner();
       var allResults = from r in runs
                        select r.Results;
       return from r in allResults
              from result in r
-             let s = result.Value as IDataAnalysisSolution
+             let s = cloner.Clone(result.Value) as IDataAnalysisSolution
              where s != null
-             select result;
+             select new KeyValuePair<string, IDataAnalysisSolution>(result.Key, s);
     }
   }