Changeset 15678 for branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesAlgorithm.cs

Timestamp:

01/30/18 16:39:01 (7 years ago)

Author:

fholzing

Message:

#2883: Implemented third option for complete storage

File:

• branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesAlgorithm.cs (modified) (3 diffs)

branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesAlgorithm.cs

@@ -21 +21 @@
 #endregion
 
+using System;
 using System.Linq;
 using System.Threading;
@@ -284 +285 @@
 
       // produce solution 
-      if (CreateSolution == ModelStorage.Parameter) {
-        var model = state.GetModel();
+      if (CreateSolution == ModelStorage.Parameter || CreateSolution == ModelStorage.Complete) {
+        IRegressionModel model = null;
+
+        if (CreateSolution == ModelStorage.Parameter) {
+          model = state.GetModel();
+        } else if (CreateSolution == ModelStorage.Complete) {
+          //If "Complete", a deep-copy is required, so no lazy lists
+          model = state.GetModel(false);
+          (model as GradientBoostedTreesModel).IsCompatibilityLoaded = true;
+        }
 
         // for logistic regression we produce a classification solution
@@ -307 +316 @@
           Results.Add(new Result("Solution", new GradientBoostedTreesSolution(model, problemData)));
         }
+      } else if (CreateSolution == ModelStorage.Quality) {
+        //Do nothing
+      } else {
+        throw new NotImplementedException("Selected parameter for CreateSolution isn't implemented yet");
       }
     }