Changeset 11466 for trunk/sources

Timestamp:

10/15/14 11:54:34 (10 years ago)

Author:

bburlacu

Message:

#2211: Updated grid search start page scripts and unit tests, which now reside in HeuristicLab.Scripting and belong to test category "Scripting".

Location:

trunk/sources

Files:

• HeuristicLab.Optimizer/3.3/Documents/GridSearch_RF_Classification.hl (modified) (previous)
• HeuristicLab.Optimizer/3.3/Documents/GridSearch_RF_Regression.hl (modified) (previous)
• HeuristicLab.Optimizer/3.3/Documents/GridSearch_SVM_Classification.hl (modified) (previous)
• HeuristicLab.Optimizer/3.3/Documents/GridSearch_SVM_Regression.hl (modified) (previous)
• HeuristicLab.Tests/HeuristicLab.Scripting-3.3 (added)
• HeuristicLab.Tests/HeuristicLab.Scripting-3.3/GridSearchScriptTest.cs (moved) (moved from trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GridSearchScriptTest.cs) (5 diffs)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (2 diffs)

trunk/sources/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/GridSearchScriptTest.cs

@@ -52 +52 @@
 
     [TestMethod]
-    [TestCategory("Samples.Execute")]
+    [TestCategory("Scripting")]
     public void RunRandomForestRegressionScriptTest() {
       var assembly = new StartPage().GetType().Assembly;
@@ -78 +78 @@
 
     [TestMethod]
-    [TestCategory("Samples.Execute")]
+    [TestCategory("Scripting")]
     public void RunRandomForestClassificationScriptTest() {
       var assembly = new StartPage().GetType().Assembly;
@@ -99 +99 @@
         var vs = script.VariableStore;
         var solution = (IClassificationSolution)vs["demo_bestSolution"];
-        Assert.IsTrue(solution.TrainingAccuracy.IsAlmost(1));
+        Assert.IsTrue(solution.TrainingAccuracy.IsAlmost(1) && solution.TestAccuracy.IsAlmost(0.953125));
       }
     }
 
     [TestMethod]
-    [TestCategory("Samples.Execute")]
+    [TestCategory("Scripting")]
     public void RunSvmRegressionScriptTest() {
       var assembly = new StartPage().GetType().Assembly;
@@ -125 +125 @@
         var vs = script.VariableStore;
         var solution = (IRegressionSolution)vs["demo_bestSolution"];
-        Assert.IsTrue(solution.TrainingRSquared.IsAlmost(0.0662227492685859));
+        Assert.IsTrue(solution.TrainingRSquared.IsAlmost(0.066221959224331) && solution.TestRSquared.IsAlmost(0.0794407638195883));
       }
     }
 
     [TestMethod]
-    [TestCategory("Samples.Execute")]
+    [TestCategory("Scripting")]
     public void RunSvmClassificationScriptTest() {
       var assembly = new StartPage().GetType().Assembly;
@@ -151 +151 @@
         var vs = script.VariableStore;
         var solution = (IClassificationSolution)vs["demo_bestSolution"];
-        Assert.IsTrue(solution.TrainingAccuracy.IsAlmost(0.814352574102964));
+        Assert.IsTrue(solution.TrainingAccuracy.IsAlmost(0.817472698907956) && solution.TestAccuracy.IsAlmost(0.809375));
       }
     }

trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -504 +504 @@
     <Compile Include="HeuristicLab.Problems.VehicleRouting-3.4\VRPInstancesTest.cs" />
     <Compile Include="HeuristicLab.Random-3.3\RandomEnumerableSampleTest.cs" />
-    <Compile Include="HeuristicLab-3.3\Samples\GridSearchScriptTest.cs" />
+    <Compile Include="HeuristicLab.Scripting-3.3\GridSearchScriptTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestRandom.cs" />
@@ -546 +546 @@
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="HeuristicLab.Scripting-3.3\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.