Changeset 13992 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4

Timestamp:

07/04/16 22:29:23 (8 years ago)

Author:

gkronber

Message:

#2604: set default target variable to string.Empty in AfterDeserialization hook for regression and classification models and changed a few ctor calls to correctly pass the target variable

Location:

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• BaselineClassifiers/ZeroR.cs (modified) (1 diff)
• GradientBoostedTrees/RegressionTreeBuilder.cs (modified) (2 diffs)
• GradientBoostedTrees/RegressionTreeModel.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/ZeroR.cs

@@ -64 +64 @@
         .MaxItems(kvp => kvp.Value).Select(x => x.Key).First();
 
-      var model = new ConstantModel(dominantClass);
+      var model = new ConstantModel(dominantClass, target);
       var solution = model.CreateClassificationSolution(problemData);
       return solution;

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeBuilder.cs

@@ -137 +137 @@
       int nRows = idx.Count();
 
-      // shuffle variable idx
+      // shuffle variable names
       HeuristicLab.Random.ListExtensions.ShuffleInPlace(allowedVariables, random);
 
@@ -176 +176 @@
       CreateRegressionTreeFromQueue(maxSize, lossFunction);
 
-      return new RegressionTreeModel(tree.ToArray());
+      return new RegressionTreeModel(tree.ToArray(), problemData.TargetVariable, );
     }
 

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs

@@ -149 +149 @@
     #endregion
 
-
-
-
     [StorableConstructor]
     private RegressionTreeModel(bool serializing) : base(serializing) { }