Changeset 11466


Ignore:
Timestamp:
10/15/14 11:54:34 (5 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:
1 added
5 edited
1 moved

Legend:

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

    r11464 r11466  
    5252
    5353    [TestMethod]
    54     [TestCategory("Samples.Execute")]
     54    [TestCategory("Scripting")]
    5555    public void RunRandomForestRegressionScriptTest() {
    5656      var assembly = new StartPage().GetType().Assembly;
     
    7878
    7979    [TestMethod]
    80     [TestCategory("Samples.Execute")]
     80    [TestCategory("Scripting")]
    8181    public void RunRandomForestClassificationScriptTest() {
    8282      var assembly = new StartPage().GetType().Assembly;
     
    9999        var vs = script.VariableStore;
    100100        var solution = (IClassificationSolution)vs["demo_bestSolution"];
    101         Assert.IsTrue(solution.TrainingAccuracy.IsAlmost(1));
     101        Assert.IsTrue(solution.TrainingAccuracy.IsAlmost(1) && solution.TestAccuracy.IsAlmost(0.953125));
    102102      }
    103103    }
    104104
    105105    [TestMethod]
    106     [TestCategory("Samples.Execute")]
     106    [TestCategory("Scripting")]
    107107    public void RunSvmRegressionScriptTest() {
    108108      var assembly = new StartPage().GetType().Assembly;
     
    125125        var vs = script.VariableStore;
    126126        var solution = (IRegressionSolution)vs["demo_bestSolution"];
    127         Assert.IsTrue(solution.TrainingRSquared.IsAlmost(0.0662227492685859));
     127        Assert.IsTrue(solution.TrainingRSquared.IsAlmost(0.066221959224331) && solution.TestRSquared.IsAlmost(0.0794407638195883));
    128128      }
    129129    }
    130130
    131131    [TestMethod]
    132     [TestCategory("Samples.Execute")]
     132    [TestCategory("Scripting")]
    133133    public void RunSvmClassificationScriptTest() {
    134134      var assembly = new StartPage().GetType().Assembly;
     
    151151        var vs = script.VariableStore;
    152152        var solution = (IClassificationSolution)vs["demo_bestSolution"];
    153         Assert.IsTrue(solution.TrainingAccuracy.IsAlmost(0.814352574102964));
     153        Assert.IsTrue(solution.TrainingAccuracy.IsAlmost(0.817472698907956) && solution.TestAccuracy.IsAlmost(0.809375));
    154154      }
    155155    }
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r11457 r11466  
    504504    <Compile Include="HeuristicLab.Problems.VehicleRouting-3.4\VRPInstancesTest.cs" />
    505505    <Compile Include="HeuristicLab.Random-3.3\RandomEnumerableSampleTest.cs" />
    506     <Compile Include="HeuristicLab-3.3\Samples\GridSearchScriptTest.cs" />
     506    <Compile Include="HeuristicLab.Scripting-3.3\GridSearchScriptTest.cs" />
    507507    <Compile Include="Properties\AssemblyInfo.cs" />
    508508    <Compile Include="TestRandom.cs" />
     
    546546    </Content>
    547547  </ItemGroup>
    548   <ItemGroup>
    549     <Folder Include="HeuristicLab.Scripting-3.3\" />
    550   </ItemGroup>
     548  <ItemGroup />
    551549  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    552550  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.