Context Navigation

Changeset 11890

Timestamp:

02/04/15 16:13:47 (10 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:

-                      r11789
+                      r11890
       var bestSolution = ScriptingUtils.GetVariable<IClassificationSolution>(script, BestSolutionVariableName);
       Assert.AreEqual(0.946957878315133, bestSolution.TrainingAccuracy, 1E-8);
       Assert.AreEqual(0.734375, bestSolution.TestAccuracy, 1E-8);
+      Assert.AreEqual(0.85179407176287, bestSolution.TrainingAccuracy, 1E-8);
+      Assert.AreEqual(0.81875, bestSolution.TestAccuracy, 1E-8);
+    }

-                      r11789
+                      r11890
       var bestSolution = ScriptingUtils.GetVariable<IRegressionSolution>(script, BestSolutionVariableName);
       Assert.AreEqual(1.0, bestSolution.TrainingRSquared, 1E-8);
       Assert.AreEqual(0.966618401251492, bestSolution.TestRSquared, 1E-8);
+      Assert.AreEqual(0.968329534139836, bestSolution.TrainingRSquared, 1E-8);
+      Assert.AreEqual(0.982380790563445, bestSolution.TestRSquared, 1E-8);
+    }

r11789	r11890
30	30	static Dictionary<string, IEnumerable<double>> randomForestParameterRanges = new Dictionary<string, IEnumerable<double>> {
31	31	{ "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) },
33	33	{ "M", ValueGenerator.GenerateSteps(0.1m, 1, 0.1m).Select(x => (double)x) }
34	34	};

r11789	r11890
31	31	static Dictionary<string, IEnumerable<double>> randomForestParameterRanges = new Dictionary<string, IEnumerable<double>> {
32	32	{ "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) },
34	34	{ "M", ValueGenerator.GenerateSteps(0.1m, 1, 0.1m).Select(x => (double)x) }
35	35	};

Note: See TracChangeset for help on using the changeset viewer.