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

Timestamp:

03/14/16 17:50:15 (9 years ago)

Author:

mkommend

Message:

#1795: Adapted creation of regression ensemble to new ctors (see also #2590 r13698).

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GBM/GradientBoostingRegressionAlgorithm.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GBM/GradientBoostingRegressionAlgorithm.cs

@@ -26 +26 @@
 using System.Threading;
 using HeuristicLab.Analysis;
-using HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -316 +315 @@
           }
           // just produce an ensemble solution for now (TODO: correct scaling or linear regression for ensemble model weights)
-          Results.Add(new Result("EnsembleSolution", new RegressionEnsembleSolution(models, (IRegressionProblemData)problemData.Clone())));
+
+          var ensembleModel = new RegressionEnsembleModel(models);
+          var ensembleSolution = ensembleModel.CreateRegressionSolution((IRegressionProblemData)problemData.Clone());
+          Results.Add(new Result("EnsembleSolution", ensembleSolution));
         }
-      } finally {
+      }
+      finally {
         // reset everything
         alg.Prepare(true);
@@ -432 +435 @@
             model = sol.Model;
           }
-        } finally {
+        }
+        finally {
           alg.ExceptionOccurred -= handler;
           alg.Stopped -= handler2;