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

Timestamp:

08/05/16 17:40:11 (8 years ago)

Author:

gkronber

Message:

#2650: merged r14234:14236 from trunk to branch

Location:

branches/symbreg-factors-2650

Files:

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

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

@@ -57 +57 @@
 
     public override IEnumerable<string> VariablesUsedForPrediction {
-      get { return actualModel.Models.SelectMany(x => x.VariablesUsedForPrediction).Distinct().OrderBy(x => x); }
+      get
+      {
+        lock (actualModel) { if (actualModel == null) actualModel = RecalculateModel(); }
+        return actualModel.Models.SelectMany(x => x.VariablesUsedForPrediction).Distinct().OrderBy(x => x);
+      }
     }
 
@@ -105 +109 @@
     // forward message to actual model (recalculate model first if necessary)
     public override IEnumerable<double> GetEstimatedValues(IDataset dataset, IEnumerable<int> rows) {
-      if (actualModel == null) actualModel = RecalculateModel();
+      lock (actualModel) { if (actualModel == null) actualModel = RecalculateModel(); }
       return actualModel.GetEstimatedValues(dataset, rows);
     }
@@ -119 +123 @@
     public IEnumerable<IRegressionModel> Models {
       get {
-        if (actualModel == null) actualModel = RecalculateModel();
+        lock(actualModel) { if (actualModel == null) actualModel = RecalculateModel();}
         return actualModel.Models;
       }
@@ -126 +130 @@
     public IEnumerable<double> Weights {
       get {
-        if (actualModel == null) actualModel = RecalculateModel();
+        lock(actualModel) { if (actualModel == null) actualModel = RecalculateModel();}
         return actualModel.Weights;
       }