Changeset 13994 for branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

07/04/16 23:40:44 (8 years ago)

Author:

bburlacu

Message:

#2597: Merged trunk changes.

Location:

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis

Files:

• . (modified) (1 prop)
• 3.4/BaselineClassifiers/ZeroR.cs (modified) (1 diff)
• 3.4/GBM/GradientBoostingRegressionAlgorithm.cs (modified) (2 diffs)
• 3.4/GaussianProcess/StudentTProcessRegressionModelCreator.cs (deleted)
• 3.4/GradientBoostedTrees/RegressionTreeBuilder.cs (modified) (4 diffs)
• 3.4/GradientBoostedTrees/RegressionTreeModel.cs (modified) (1 diff)
• 3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (1 diff)

branches/HeuristicLab.RegressionSolutionGradientView/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;

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis/3.4/GBM/GradientBoostingRegressionAlgorithm.cs

@@ -181 +181 @@
     public GradientBoostingRegressionAlgorithm() {
       Problem = new RegressionProblem(); // default problem
-      var mctsSymbReg = new MctsSymbolicRegressionAlgorithm();
-      mctsSymbReg.Iterations = 10000;
-      mctsSymbReg.StoreAlgorithmInEachRun = false;
-      var sgp = CreateOSGP();
+      var osgp = CreateOSGP();
       var regressionAlgs = new ItemSet<IAlgorithm>(new IAlgorithm[] {
         new RandomForestRegression(),
-        sgp,
-        mctsSymbReg
+        osgp,
       });
       foreach (var alg in regressionAlgs) alg.Prepare();
@@ -208 +204 @@
         new DoubleValue(0.5)));
       Parameters.Add(new ConstrainedValueParameter<IAlgorithm>(RegressionAlgorithmParameterName,
-        "The regression algorithm to use as a base learner", regressionAlgs, mctsSymbReg));
+        "The regression algorithm to use as a base learner", regressionAlgs, osgp));
       Parameters.Add(new FixedValueParameter<StringValue>(RegressionAlgorithmSolutionResultParameterName,
         "The name of the solution produced by the regression algorithm", new StringValue("Solution")));

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeBuilder.cs

@@ -22 +22 @@
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -129 +128 @@
 
       // y and curPred are changed in gradient boosting
-      this.y = y; 
-      this.curPred = curPred; 
+      this.y = y;
+      this.curPred = curPred;
 
       // shuffle row idx
@@ -137 +136 @@
       int nRows = idx.Count();
 
-      // shuffle variable idx
+      // shuffle variable names
       HeuristicLab.Random.ListExtensions.ShuffleInPlace(allowedVariables, random);
 
@@ -176 +175 @@
       CreateRegressionTreeFromQueue(maxSize, lossFunction);
 
-      return new RegressionTreeModel(tree.ToArray());
+      return new RegressionTreeModel(tree.ToArray(), problemData.TargetVariable);
     }
 

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs

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

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

@@ -240 +240 @@
     </Compile>
     <Compile Include="FixedDataAnalysisAlgorithm.cs" />
-    <Compile Include="GaussianProcess\StudentTProcessRegressionModelCreator.cs" />
-    <Compile Include="GaussianProcess\StudentTProcessModel.cs" />
     <Compile Include="GaussianProcess\CovarianceFunctions\CovarianceSpectralMixture.cs" />
     <Compile Include="GaussianProcess\CovarianceFunctions\CovariancePiecewisePolynomial.cs" />