Changeset 14330 for branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesModelSurrogate.cs

Timestamp:

10/13/16 19:47:41 (8 years ago)

Author:

gkronber

Message:

#2650 Merged r14282:14322 from trunk to branch (fixing conflicts)

Location:

branches/symbreg-factors-2650

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesModelSurrogate.cs (modified) (8 diffs)

branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesModelSurrogate.cs

@@ -21 +21 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
+using System.Diagnostics.Eventing.Reader;
 using System.Linq;
 using HeuristicLab.Common;
@@ -36 +38 @@
   public sealed class GradientBoostedTreesModelSurrogate : RegressionModel, IGradientBoostedTreesModel {
     // don't store the actual model!
-    private IGradientBoostedTreesModel actualModel; // the actual model is only recalculated when necessary
+    // the actual model is only recalculated when necessary
+    private readonly Lazy<IGradientBoostedTreesModel> actualModel;
+    private IGradientBoostedTreesModel ActualModel {
+      get { return actualModel.Value; }
+    }
 
     [Storable]
@@ -57 +63 @@
 
     public override IEnumerable<string> VariablesUsedForPrediction {
-      get
-      {
-        lock (actualModel) { if (actualModel == null) actualModel = RecalculateModel(); }
-        return actualModel.Models.SelectMany(x => x.VariablesUsedForPrediction).Distinct().OrderBy(x => x);
+      get {
+        return ActualModel.Models.SelectMany(x => x.VariablesUsedForPrediction).Distinct().OrderBy(x => x);
       }
     }
 
     [StorableConstructor]
-    private GradientBoostedTreesModelSurrogate(bool deserializing) : base(deserializing) { }
+    private GradientBoostedTreesModelSurrogate(bool deserializing)
+      : base(deserializing) {
+      actualModel = new Lazy<IGradientBoostedTreesModel>(() => RecalculateModel());
+    }
 
     private GradientBoostedTreesModelSurrogate(GradientBoostedTreesModelSurrogate original, Cloner cloner)
       : base(original, cloner) {
-      if (original.actualModel != null) this.actualModel = cloner.Clone(original.actualModel);
+      IGradientBoostedTreesModel clonedModel = null;
+      if (original.ActualModel != null) clonedModel = cloner.Clone(original.ActualModel);
+      actualModel = new Lazy<IGradientBoostedTreesModel>(CreateLazyInitFunc(clonedModel)); // only capture clonedModel in the closure
 
       this.trainingProblemData = cloner.Clone(original.trainingProblemData);
@@ -79 +88 @@
       this.m = original.m;
       this.nu = original.nu;
+    }
+
+    private Func<IGradientBoostedTreesModel> CreateLazyInitFunc(IGradientBoostedTreesModel clonedModel) {
+      return () => {
+        return clonedModel == null ? RecalculateModel() : clonedModel;
+      };
     }
 
@@ -100 +115 @@
       IGradientBoostedTreesModel model)
       : this(trainingProblemData, seed, lossFunction, iterations, maxSize, r, m, nu) {
-      this.actualModel = model;
+      actualModel = new Lazy<IGradientBoostedTreesModel>(() => model);
     }
 
@@ -109 +124 @@
     // forward message to actual model (recalculate model first if necessary)
     public override IEnumerable<double> GetEstimatedValues(IDataset dataset, IEnumerable<int> rows) {
-      lock (actualModel) { if (actualModel == null) actualModel = RecalculateModel(); }
-      return actualModel.GetEstimatedValues(dataset, rows);
+      return ActualModel.GetEstimatedValues(dataset, rows);
     }
 
@@ -123 +137 @@
     public IEnumerable<IRegressionModel> Models {
       get {
-        lock(actualModel) { if (actualModel == null) actualModel = RecalculateModel();}
-        return actualModel.Models;
+        return ActualModel.Models;
       }
     }
@@ -130 +143 @@
     public IEnumerable<double> Weights {
       get {
-        lock(actualModel) { if (actualModel == null) actualModel = RecalculateModel();}
-        return actualModel.Weights;
+        return ActualModel.Weights;
       }
     }