Changeset 11907 for stable/HeuristicLab.Tests/HeuristicLab.Scripting-3.3
- Timestamp:
- 02/05/15 10:51:29 (9 years ago)
- Location:
- stable
- Files:
-
- 1 deleted
- 4 edited
- 10 copied
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Tests
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Tests merged: 11450,11466,11483,11514-11515,11545,11547,11735,11789,11890
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/GridSearchRFClassificationScriptTest.cs
r11789 r11907 57 57 58 58 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); 61 61 } 62 62 -
stable/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/GridSearchRFRegressionScriptTest.cs
r11789 r11907 57 57 58 58 var bestSolution = ScriptingUtils.GetVariable<IRegressionSolution>(script, BestSolutionVariableName); 59 Assert.AreEqual( 1.0, bestSolution.TrainingRSquared, 1E-8);60 Assert.AreEqual(0.9 66618401251492, bestSolution.TestRSquared, 1E-8);59 Assert.AreEqual(0.968329534139836, bestSolution.TrainingRSquared, 1E-8); 60 Assert.AreEqual(0.982380790563445, bestSolution.TestRSquared, 1E-8); 61 61 } 62 62 -
stable/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/Script Sources/GridSearchRFClassificationScriptSource.cs
r11789 r11907 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 }; -
stable/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/Script Sources/GridSearchRFRegressionScriptSource.cs
r11789 r11907 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 }; -
stable/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/ScriptingUtils.cs
r11515 r11907 21 21 22 22 using System; 23 using System.IO;24 23 using System.Threading; 25 24 using HeuristicLab.Scripting; … … 38 37 39 38 s.ScriptExecutionFinished += (sender, e) => { ex = e.Value; trigger.Set(); }; 40 s.Execute ();39 s.ExecuteAsync(); 41 40 trigger.WaitOne(); 42 41 … … 47 46 return (T)a.VariableStore[resultName]; 48 47 } 49 50 public static string LoadScriptCodeFromFile(string scriptName) {51 string path = Path.Combine(ScriptSourcesDirectory, scriptName + ScriptSourceFileExtension);52 return File.ReadAllText(path);53 }54 48 } 55 49 }
Note: See TracChangeset
for help on using the changeset viewer.