Changeset 15464


Ignore:
Timestamp:
11/08/17 17:01:50 (2 years ago)
Author:
mkommend
Message:

#2854: Corrected results and parameter assignment of random forest model for regression and classification.

Location:
trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestClassification.cs

    r14523 r15464  
    152152    public static RandomForestClassificationSolution CreateRandomForestClassificationSolution(IClassificationProblemData problemData, int nTrees, double r, double m, int seed,
    153153      out double rmsError, out double relClassificationError, out double outOfBagRmsError, out double outOfBagRelClassificationError) {
    154       var model = CreateRandomForestClassificationModel(problemData, nTrees, r, m, seed, out rmsError, out relClassificationError, out outOfBagRmsError, out outOfBagRelClassificationError);
     154      var model = CreateRandomForestClassificationModel(problemData, nTrees, r, m, seed,
     155        out rmsError, out relClassificationError, out outOfBagRmsError, out outOfBagRelClassificationError);
    155156      return new RandomForestClassificationSolution(model, (IClassificationProblemData)problemData.Clone());
    156157    }
     
    158159    public static RandomForestModel CreateRandomForestClassificationModel(IClassificationProblemData problemData, int nTrees, double r, double m, int seed,
    159160      out double rmsError, out double relClassificationError, out double outOfBagRmsError, out double outOfBagRelClassificationError) {
    160       return RandomForestModel.CreateClassificationModel(problemData, nTrees, r, m, seed, out rmsError, out relClassificationError, out outOfBagRmsError, out outOfBagRelClassificationError);
     161      return RandomForestModel.CreateClassificationModel(problemData, nTrees, r, m, seed,
     162       rmsError: out rmsError, relClassificationError: out relClassificationError, outOfBagRmsError: out outOfBagRmsError, outOfBagRelClassificationError: out outOfBagRelClassificationError);
    161163    }
    162164    #endregion
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestModel.cs

    r14843 r15464  
    288288    public static RandomForestModel CreateRegressionModel(IRegressionProblemData problemData, int nTrees, double r, double m, int seed,
    289289      out double rmsError, out double outOfBagRmsError, out double avgRelError, out double outOfBagAvgRelError) {
    290       return CreateRegressionModel(problemData, problemData.TrainingIndices, nTrees, r, m, seed, out rmsError, out avgRelError, out outOfBagAvgRelError, out outOfBagRmsError);
     290      return CreateRegressionModel(problemData, problemData.TrainingIndices, nTrees, r, m, seed,
     291       rmsError: out rmsError, outOfBagRmsError: out outOfBagRmsError, avgRelError: out avgRelError, outOfBagAvgRelError: out outOfBagAvgRelError);
    291292    }
    292293
     
    300301
    301302      rmsError = rep.rmserror;
     303      outOfBagRmsError = rep.oobrmserror;
    302304      avgRelError = rep.avgrelerror;
    303305      outOfBagAvgRelError = rep.oobavgrelerror;
    304       outOfBagRmsError = rep.oobrmserror;
    305306
    306307      return new RandomForestModel(problemData.TargetVariable, dForest, seed, problemData, nTrees, r, m);
     
    309310    public static RandomForestModel CreateClassificationModel(IClassificationProblemData problemData, int nTrees, double r, double m, int seed,
    310311      out double rmsError, out double outOfBagRmsError, out double relClassificationError, out double outOfBagRelClassificationError) {
    311       return CreateClassificationModel(problemData, problemData.TrainingIndices, nTrees, r, m, seed, out rmsError, out outOfBagRmsError, out relClassificationError, out outOfBagRelClassificationError);
     312      return CreateClassificationModel(problemData, problemData.TrainingIndices, nTrees, r, m, seed,
     313        out rmsError, out outOfBagRmsError, out relClassificationError, out outOfBagRelClassificationError);
    312314    }
    313315
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestRegression.cs

    r14523 r15464  
    160160      double r, double m, int seed,
    161161      out double rmsError, out double avgRelError, out double outOfBagRmsError, out double outOfBagAvgRelError) {
    162       return RandomForestModel.CreateRegressionModel(problemData, nTrees, r, m, seed, out rmsError, out avgRelError, out outOfBagRmsError, out outOfBagAvgRelError);
     162      return RandomForestModel.CreateRegressionModel(problemData, nTrees, r, m, seed,
     163        rmsError: out rmsError, avgRelError: out avgRelError, outOfBagRmsError: out outOfBagRmsError, outOfBagAvgRelError: out outOfBagAvgRelError);
    163164    }
    164165
Note: See TracChangeset for help on using the changeset viewer.