Changeset 6241 for trunk/sources

Timestamp:

05/20/11 18:54:39 (14 years ago)

Author:

gkronber

Message:

#1473: implemented random forest wrapper for classification.

Location:

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (2 diffs)
• Interfaces/IRandomForestClassificationSolution.cs (added)
• Interfaces/IRandomForestModel.cs (moved) (moved from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/IRandomForestRegressionModel.cs) (1 diff)
• Interfaces/IRandomForestRegressionSolution.cs (modified) (1 diff)
• RandomForest/RandomForestClassification.cs (added)
• RandomForest/RandomForestClassificationSolution.cs (added)
• RandomForest/RandomForestModel.cs (moved) (moved from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestRegressionModel.cs) (5 diffs)
• RandomForest/RandomForestRegression.cs (modified) (2 diffs)
• RandomForest/RandomForestRegressionSolution.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

@@ -112 +112 @@
     <Compile Include="HeuristicLabAlgorithmsDataAnalysisPlugin.cs" />
     <Compile Include="FixedDataAnalysisAlgorithm.cs" />
-    <Compile Include="Interfaces\IRandomForestRegressionModel.cs" />
+    <Compile Include="Interfaces\IRandomForestClassificationSolution.cs" />
+    <Compile Include="Interfaces\IRandomForestModel.cs" />
     <Compile Include="Interfaces\IRandomForestRegressionSolution.cs" />
     <Compile Include="Interfaces\ISupportVectorMachineModel.cs" />
@@ -129 +130 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RandomForest\RandomForestClassificationSolution.cs" />
+    <Compile Include="RandomForest\RandomForestClassification.cs" />
+    <Compile Include="RandomForest\RandomForestModel.cs" />
     <Compile Include="RandomForest\RandomForestRegression.cs" />
     <Compile Include="RandomForest\RandomForestRegressionSolution.cs" />
-    <Compile Include="RandomForest\RandomForestRegressionModel.cs" />
     <Compile Include="SupportVectorMachine\SupportVectorClassification.cs" />
     <Compile Include="SupportVectorMachine\SupportVectorClassificationSolution.cs" />

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/IRandomForestModel.cs

@@ -27 +27 @@
 namespace HeuristicLab.Algorithms.DataAnalysis {
   /// <summary>
-  /// Interface to represent a random forest regression model
+  /// Interface to represent a random forest model for either regression or classification
   /// </summary>
-  public interface IRandomForestRegressionModel : IRegressionModel {
+  public interface IRandomForestModel : IRegressionModel, IClassificationModel {
   }
 }

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/IRandomForestRegressionSolution.cs

@@ -29 +29 @@
   /// </summary>
   public interface IRandomForestRegressionSolution : IRegressionSolution {
-    new IRandomForestRegressionModel Model { get; }
+    new IRandomForestModel Model { get; }
   }
 }

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestModel.cs

@@ -33 +33 @@
 namespace HeuristicLab.Algorithms.DataAnalysis {
   /// <summary>
-  /// Represents a random forest regression model.
+  /// Represents a random forest model for regression and classification
   /// </summary>
   [StorableClass]
-  [Item("RandomForestRegressionModel", "Represents a random forest regression model.")]
-  public sealed class RandomForestRegressionModel : NamedItem, IRandomForestRegressionModel {
+  [Item("RandomForestModel", "Represents a random forest for regression and classification.")]
+  public sealed class RandomForestModel : NamedItem, IRandomForestModel {
 
     private alglib.decisionforest randomForest;
-    /// <summary>
-    /// Gets or sets the SVM model.
-    /// </summary>
     public alglib.decisionforest RandomForest {
       get { return randomForest; }
@@ -58 +55 @@
     [Storable]
     private string[] allowedInputVariables;
-
+    [Storable]
+    private double[] classValues;
     [StorableConstructor]
-    private RandomForestRegressionModel(bool deserializing)
+    private RandomForestModel(bool deserializing)
       : base(deserializing) {
       if (deserializing)
         randomForest = new alglib.decisionforest();
     }
-    private RandomForestRegressionModel(RandomForestRegressionModel original, Cloner cloner)
+    private RandomForestModel(RandomForestModel original, Cloner cloner)
       : base(original, cloner) {
       randomForest = new alglib.decisionforest();
@@ -75 +73 @@
       targetVariable = original.targetVariable;
       allowedInputVariables = (string[])original.allowedInputVariables.Clone();
+      if (original.classValues != null)
+        this.classValues = (double[])original.classValues.Clone();
     }
-    public RandomForestRegressionModel(alglib.decisionforest randomForest, string targetVariable, IEnumerable<string> allowedInputVariables)
+    public RandomForestModel(alglib.decisionforest randomForest, string targetVariable, IEnumerable<string> allowedInputVariables, double[] classValues = null)
       : base() {
       this.name = ItemName;
@@ -83 +83 @@
       this.targetVariable = targetVariable;
       this.allowedInputVariables = allowedInputVariables.ToArray();
+      if (classValues != null)
+        this.classValues = (double[])classValues.Clone();
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new RandomForestRegressionModel(this, cloner);
+      return new RandomForestModel(this, cloner);
     }
 
@@ -103 +105 @@
         alglib.dfprocess(randomForest, x, ref y);
         yield return y[0];
+      }
+    }
+
+    public IEnumerable<double> GetEstimatedClassValues(Dataset dataset, IEnumerable<int> rows) {
+      double[,] inputData = AlglibUtil.PrepareInputMatrix(dataset, allowedInputVariables, rows);
+
+      int n = inputData.GetLength(0);
+      int columns = inputData.GetLength(1);
+      double[] x = new double[columns];
+      double[] y = new double[randomForest.innerobj.nclasses];
+
+      for (int row = 0; row < n; row++) {
+        for (int column = 0; column < columns; column++) {
+          x[column] = inputData[row, column];
+        }
+        alglib.dfprocess(randomForest, x, ref y);
+        // find class for with the largest probability value
+        int maxProbClassIndex = 0;
+        double maxProb = y[0];
+        for (int i = 1; i < y.Length; i++) {
+          if (maxProb < y[i]) {
+            maxProb = y[i];
+            maxProbClassIndex = i;
+          }
+        }
+        yield return classValues[maxProbClassIndex];
       }
     }

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestRegression.cs

@@ -87 +87 @@
       Results.Add(new Result(RandomForestRegressionModelResultName, "The random forest regression solution.", solution));
       Results.Add(new Result("Root mean square error", "The root of the mean of squared errors of the random forest regression solution on the training set.", new DoubleValue(rmsError)));
-      Results.Add(new Result("Average relative error", "The average of relative errors of the random forest regression solution on the training set.", new DoubleValue(avgRelError)));
-      Results.Add(new Result("Root mean square error (out-of-bag)", "The out-of-bag root of the mean of squared errors of the random forest regression solution on the training set.", new DoubleValue(outOfBagRmsError)));
-      Results.Add(new Result("Average relative error (out-of-bag)", "The out-of-bag average of relative errors of the random forest regression solution on the training set.", new DoubleValue(outOfBagAvgRelError)));
+      Results.Add(new Result("Average relative error", "The average of relative errors of the random forest regression solution on the training set.", new PercentValue(avgRelError)));
+      Results.Add(new Result("Root mean square error (out-of-bag)", "The out-of-bag root of the mean of squared errors of the random forest regression solution.", new DoubleValue(outOfBagRmsError)));
+      Results.Add(new Result("Average relative error (out-of-bag)", "The out-of-bag average of relative errors of the random forest regression solution.", new PercentValue(outOfBagAvgRelError)));
     }
 
@@ -116 +116 @@
       outOfBagRmsError = rep.oobrmserror;
 
-      return new RandomForestRegressionSolution(problemData, new RandomForestRegressionModel(dforest, targetVariable, allowedInputVariables));
+      return new RandomForestRegressionSolution(problemData, new RandomForestModel(dforest, targetVariable, allowedInputVariables));
     }
     #endregion

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestRegressionSolution.cs

@@ -37 +37 @@
   public sealed class RandomForestRegressionSolution : RegressionSolution, IRandomForestRegressionSolution {
 
-    public new IRandomForestRegressionModel Model {
-      get { return (IRandomForestRegressionModel)base.Model; }
+    public new IRandomForestModel Model {
+      get { return (IRandomForestModel)base.Model; }
       set { base.Model = value; }
     }
@@ -47 +47 @@
       : base(original, cloner) {
     }
-    public RandomForestRegressionSolution(IRegressionProblemData problemData, IRandomForestRegressionModel randomForestModel)
+    public RandomForestRegressionSolution(IRegressionProblemData problemData, IRandomForestModel randomForestModel)
       : base(randomForestModel, problemData) {
     }