Changeset 11890


Ignore:
Timestamp:
02/04/15 16:13:47 (6 years ago)
Author:
bburlacu
Message:

#2211: Adjusted parameters ranges in the random forest grid search tests and fixed unit tests to match the new results.

Location:
trunk/sources/HeuristicLab.Tests/HeuristicLab.Scripting-3.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/GridSearchRFClassificationScriptTest.cs

    r11789 r11890  
    5757
    5858      var bestSolution = ScriptingUtils.GetVariable<IClassificationSolution>(script, BestSolutionVariableName);
    59       Assert.AreEqual(0.946957878315133, bestSolution.TrainingAccuracy, 1E-8);
    60       Assert.AreEqual(0.734375, bestSolution.TestAccuracy, 1E-8);
     59      Assert.AreEqual(0.85179407176287, bestSolution.TrainingAccuracy, 1E-8);
     60      Assert.AreEqual(0.81875, bestSolution.TestAccuracy, 1E-8);
    6161    }
    6262
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/GridSearchRFRegressionScriptTest.cs

    r11789 r11890  
    5757
    5858      var bestSolution = ScriptingUtils.GetVariable<IRegressionSolution>(script, BestSolutionVariableName);
    59       Assert.AreEqual(1.0, bestSolution.TrainingRSquared, 1E-8);
    60       Assert.AreEqual(0.966618401251492, bestSolution.TestRSquared, 1E-8);
     59      Assert.AreEqual(0.968329534139836, bestSolution.TrainingRSquared, 1E-8);
     60      Assert.AreEqual(0.982380790563445, bestSolution.TestRSquared, 1E-8);
    6161    }
    6262
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/Script Sources/GridSearchRFClassificationScriptSource.cs

    r11789 r11890  
    3030  static Dictionary<string, IEnumerable<double>> randomForestParameterRanges = new Dictionary<string, IEnumerable<double>> {
    3131    { "N", ValueGenerator.GenerateSteps(5m, 10, 1).Select(x => Math.Pow(2,(double)x)) },
    32     { "R", ValueGenerator.GenerateSteps(0.05m, 1, 0.05m).Select(x => (double)x) },
     32    { "R", ValueGenerator.GenerateSteps(0.05m, 0.66m, 0.05m).Select(x => (double)x) },
    3333    { "M", ValueGenerator.GenerateSteps(0.1m, 1, 0.1m).Select(x => (double)x) }
    3434  };
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/Script Sources/GridSearchRFRegressionScriptSource.cs

    r11789 r11890  
    3131  static Dictionary<string, IEnumerable<double>> randomForestParameterRanges = new Dictionary<string, IEnumerable<double>> {
    3232    { "N", ValueGenerator.GenerateSteps(5m, 10, 1).Select(x => Math.Pow(2,(double)x)) },
    33     { "R", ValueGenerator.GenerateSteps(0.05m, 1, 0.05m).Select(x => (double)x) },
     33    { "R", ValueGenerator.GenerateSteps(0.05m, 0.66m, 0.05m).Select(x => (double)x) },
    3434    { "M", ValueGenerator.GenerateSteps(0.1m, 1, 0.1m).Select(x => (double)x) }
    3535  };
Note: See TracChangeset for help on using the changeset viewer.