Changeset 4459


Ignore:
Timestamp:
09/21/10 14:12:27 (9 years ago)
Author:
gkronber
Message:

Fixed data analysis test cases. #1142

Location:
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Tests
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Tests/HeuristicLab.Problems.DataAnalysis.Tests-3.3.csproj

    r4236 r4459  
    6969    <ErrorReport>prompt</ErrorReport>
    7070  </PropertyGroup>
     71  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     72    <DebugSymbols>true</DebugSymbols>
     73    <OutputPath>bin\x86\Debug\</OutputPath>
     74    <DefineConstants>DEBUG;TRACE</DefineConstants>
     75    <DebugType>full</DebugType>
     76    <PlatformTarget>x86</PlatformTarget>
     77    <CodeAnalysisLogFile>bin\Debug\HeuristicLab.Problems.DataAnalysis.Tests-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     78    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     79    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
     80    <ErrorReport>prompt</ErrorReport>
     81    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     82    <CodeAnalysisRuleSetDirectories>;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
     83    <CodeAnalysisRuleDirectories>;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     84    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     85    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
     86  </PropertyGroup>
     87  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     88    <OutputPath>bin\x86\Release\</OutputPath>
     89    <DefineConstants>TRACE</DefineConstants>
     90    <Optimize>true</Optimize>
     91    <DebugType>pdbonly</DebugType>
     92    <PlatformTarget>x86</PlatformTarget>
     93    <CodeAnalysisLogFile>bin\Release\HeuristicLab.Problems.DataAnalysis.Tests-3.3.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
     94    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
     95    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
     96    <ErrorReport>prompt</ErrorReport>
     97    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     98    <CodeAnalysisRuleSetDirectories>;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
     99    <CodeAnalysisRuleDirectories>;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     100    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     101    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
     102  </PropertyGroup>
    71103  <ItemGroup>
    72104    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     
    118150      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    119151      <Name>HeuristicLab.Optimization-3.3</Name>
     152    </ProjectReference>
     153    <ProjectReference Include="..\..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     154      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     155      <Name>HeuristicLab.Parameters-3.3</Name>
    120156    </ProjectReference>
    121157    <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Tests/LinearScalingTest.cs

    r4001 r4459  
    3636  [TestClass()]
    3737  public class LinearScalingTest {
    38     [TestMethod()]
     38    [TestMethod]
    3939    public void CalculateScalingParametersTest() {
    4040      var testData = new double[,] {
  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Tests/SimpleArithmeticExpressionInterpreterTest.cs

    r4068 r4459  
    7070    }
    7171
    72 
    73     [TestMethod()]
     72    [TestMethod]
    7473    public void SimpleArithmeticExpressionInterpreterPerformanceTest() {
    7574      double[] estimation = new double[Rows];
     
    8584    ///A test for Evaluate
    8685    ///</summary>
    87     [TestMethod()]
     86    [TestMethod]
    8887    public void SimpleArithmeticExpressionInterpreterEvaluateTest() {
    8988
  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Tests/StatisticCalculatorsTest.cs

    r4122 r4459  
    6161      };
    6262
    63     [TestMethod()]
     63    [TestMethod]
    6464    public void CalculateMeanAndVarianceTest() {
    6565      System.Random random = new System.Random(31415);
     
    9292    }
    9393
    94     [TestMethod()]
     94    [TestMethod]
    9595    public void CalculatePearsonsRSquaredTest() {
    9696      System.Random random = new System.Random(31415);
  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Tests/SymbolicSimplifierTest.cs

    r4237 r4459  
    4040  [TestClass()]
    4141  public class SymbolicSimplifierTest {
    42     [TestMethod()]
    4342    [DeploymentItem(@"RegressionSolution01.hl")]
    4443    [DeploymentItem(@"RegressionSolution02.hl")]
     
    4746    [DeploymentItem(@"RegressionSolution05.hl")]
    4847    [DeploymentItem(@"RegressionSolution06.hl")]
     48    [TestMethod]
    4949    public void SimplifyRegressionSolutionsTest() {
    5050      ContentManager.Initialize(new PersistenceContentManager());
     
    9898    private SymbolicRegressionSolution SimplifySolution(SymbolicRegressionSolution original) {
    9999      SymbolicSimplifier simplifier = new SymbolicSimplifier();
    100       SymbolicExpressionTree simplifiedExpression = simplifier.Simplify(original.Model.SymbolicExpressionTree);
    101       SymbolicExpressionTreeNode root = new ProgramRootSymbol().CreateTreeNode();
    102       SymbolicExpressionTreeNode start = new StartSymbol().CreateTreeNode();
    103       root.AddSubTree(start);
    104       start.AddSubTree(simplifiedExpression.Root);
    105       SymbolicExpressionTree simplifiedTree = new SymbolicExpressionTree(root);
     100      SymbolicExpressionTree simplifiedTree = simplifier.Simplify(original.Model.SymbolicExpressionTree);
    106101      SymbolicRegressionModel simplifiedModel = new SymbolicRegressionModel(original.Model.Interpreter, simplifiedTree);
    107102      return new SymbolicRegressionSolution(original.ProblemData, simplifiedModel, original.LowerEstimationLimit, original.UpperEstimationLimit);
Note: See TracChangeset for help on using the changeset viewer.