Changeset 15678 for branches

Timestamp:

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

Author:

fholzing

Message:

#2883: Implemented third option for complete storage

Location:

branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• GradientBoostedTrees/GradientBoostedTreesAlgorithm.cs (modified) (3 diffs)
• GradientBoostedTrees/GradientBoostedTreesAlgorithmStatic.cs (modified) (3 diffs)
• GradientBoostedTrees/GradientBoostedTreesModel.cs (modified) (1 diff)
• Plugin.cs (modified) (1 diff)

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");
       }
     }

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

@@ -33 +33 @@
 
     public interface IGbmState {
-      IRegressionModel GetModel();
+      IRegressionModel GetModel(bool shallow = true);
       double GetTrainLoss();
       double GetTestLoss();
@@ -100 +100 @@
       }
 
-      public IRegressionModel GetModel() {
+      public IRegressionModel GetModel(bool shallow = true) {
 #pragma warning disable 618
         var model = new GradientBoostedTreesModel(models, weights);
@@ -107 +107 @@
         // to the number of iterations + 1 (for the constant model)
         // wrap the actual model in a surrogate that enables persistence and lazy recalculation of the model if necessary
-        return new GradientBoostedTreesModelSurrogate(problemData, randSeed, lossFunction, weights.Count - 1, maxSize, r, m, nu, model);
+        if (shallow) {
+          return new GradientBoostedTreesModelSurrogate(problemData, randSeed, lossFunction, weights.Count - 1, maxSize, r, m, nu, model);
+        } else {
+          return model;
+        }
       }
       public IEnumerable<KeyValuePair<string, double>> GetVariableRelevance() {

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

@@ -37 +37 @@
     #region Backwards compatible code, remove with 3.5
     private bool isCompatibilityLoaded = false; // only set to true if the model is deserialized from the old format, needed to make sure that information is serialized again if it was loaded from the old format
+    internal bool IsCompatibilityLoaded { get { return this.isCompatibilityLoaded; } set { this.isCompatibilityLoaded = value; } }
 
     [Storable(Name = "models")]

branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis/3.4/Plugin.cs

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Algorithms.DataAnalysis plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Algorithms.DataAnalysis", "Provides wrappers for data analysis algorithms implemented in external libraries (linear regression, linear discriminant analysis, k-means clustering, support vector classification and regression)", "3.4.11.15670")]
+  [Plugin("HeuristicLab.Algorithms.DataAnalysis", "Provides wrappers for data analysis algorithms implemented in external libraries (linear regression, linear discriminant analysis, k-means clustering, support vector classification and regression)", "3.4.11.15675")]
   [PluginFile("HeuristicLab.Algorithms.DataAnalysis-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]