Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/20/13 17:03:31 (11 years ago)
Author:
mkommend
Message:

#2088: Merged all changesets regarding the unit test restructuring in the stable branch.

Location:
stable
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Tests

  • stable/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionCrossoverTest.cs

    r9462 r9885  
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    29 using HeuristicLab.Problems.DataAnalysis.Symbolic;
    3029using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
    3130using HeuristicLab.Random;
    … …  
    3332using ExecutionContext = HeuristicLab.Core.ExecutionContext;
    3433
    35 namespace HeuristicLab.Problems.DataAnalysis.Symbolic_34.Tests {
     34namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Tests {
    3635  [TestClass()]
    3736  public class SymbolicDataAnalysisExpressionCrossoverTest {
    … …  
    4948
    5049    [TestMethod]
     50    [TestCategory("Problems.DataAnalysis")]
     51    [TestProperty("Time", "long")]
    5152    public void SymbolicDataAnalysisExpressionSemanticSimilarityCrossoverPerformanceTest() {
    5253      var problem = new SymbolicRegressionSingleObjectiveProblem();
    … …  
    5657
    5758    [TestMethod]
     59    [TestCategory("Problems.DataAnalysis")]
     60    [TestProperty("Time", "long")]
    5861    public void SymbolicDataAnalysisExpressionProbabilisticFunctionalCrossoverPerformanceTest() {
    5962      var problem = new SymbolicRegressionSingleObjectiveProblem();
    … …  
    6366
    6467    [TestMethod]
     68    [TestCategory("Problems.DataAnalysis")]
     69    [TestProperty("Time", "long")]
    6570    public void SymbolicDataAnalysisExpressionDeterministicBestCrossoverPerformanceTest() {
    6671      var problem = new SymbolicRegressionSingleObjectiveProblem();
    … …  
    7075
    7176    [TestMethod]
     77    [TestCategory("Problems.DataAnalysis")]
     78    [TestProperty("Time", "long")]
    7279    public void SymbolicDataAnalysisExpressionContextAwareCrossoverPerformanceTest() {
    7380      var problem = new SymbolicRegressionSingleObjectiveProblem();
    … …  
    7784
    7885    [TestMethod]
     86    [TestCategory("Problems.DataAnalysis")]
     87    [TestProperty("Time", "long")]
    7988    public void SymbolicDataAnalysisExpressionDepthConstrainedCrossoverPerformanceTest() {
    8089      var problem = new SymbolicRegressionSingleObjectiveProblem();
    … …  
    137146
    138147      foreach (var tree in trees)
    139         HeuristicLab.Encodings.SymbolicExpressionTreeEncoding_34.Tests.Util.IsValid(tree);
     148        HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Tests.Util.IsValid(tree);
    140149    }
    141150  }

  • stable/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs

    r9456 r9885  
    2525using System.Linq;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2827using HeuristicLab.Random;
    2928using Microsoft.VisualStudio.TestTools.UnitTesting;
    30 namespace HeuristicLab.Problems.DataAnalysis.Symbolic_34.Tests {
     29namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Tests {
    3130
    3231
    … …  
    5251
    5352    [TestMethod]
     53    [TestCategory("Problems.DataAnalysis")]
     54    [TestProperty("Time", "long")]
    5455    public void SymbolicDataAnalysisExpressionTreeInterpreterTypeCoherentGrammarPerformanceTest() {
    5556      TypeCoherentGrammarPerformanceTest(new SymbolicDataAnalysisExpressionTreeInterpreter(), 12.5e6);
    5657    }
    57     [TestMethod]
     58
     59    [TestMethod]
     60    [TestCategory("Problems.DataAnalysis")]
     61    [TestProperty("Time", "long")]
    5862    public void SymbolicDataAnalysisExpressionTreeInterpreterFullGrammarPerformanceTest() {
    5963      FullGrammarPerformanceTest(new SymbolicDataAnalysisExpressionTreeInterpreter(), 12.5e6);
    6064    }
    61     [TestMethod]
     65
     66    [TestMethod]
     67    [TestCategory("Problems.DataAnalysis")]
     68    [TestProperty("Time", "long")]
    6269    public void SymbolicDataAnalysisExpressionTreeInterpreterArithmeticGrammarPerformanceTest() {
    6370      ArithmeticGrammarPerformanceTest(new SymbolicDataAnalysisExpressionTreeInterpreter(), 12.5e6);
    … …  
    6572
    6673    [TestMethod]
     74    [TestCategory("Problems.DataAnalysis")]
     75    [TestProperty("Time", "long")]
    6776    public void SymbolicDataAnalysisExpressionTreeILEmittingInterpreterTypeCoherentGrammarPerformanceTest() {
    6877      TypeCoherentGrammarPerformanceTest(new SymbolicDataAnalysisExpressionTreeILEmittingInterpreter(), 7.5e6);
    6978    }
    70     [TestMethod]
     79
     80    [TestMethod]
     81    [TestCategory("Problems.DataAnalysis")]
     82    [TestProperty("Time", "long")]
    7183    public void SymbolicDataAnalysisExpressionTreeILEmittingInterpreterFullGrammarPerformanceTest() {
    7284      FullGrammarPerformanceTest(new SymbolicDataAnalysisExpressionTreeILEmittingInterpreter(), 7.5e6);
    7385    }
     86
     87    [TestCategory("Problems.DataAnalysis")]
     88    [TestProperty("Time", "long")]
    7489    [TestMethod]
    7590    public void SymbolicDataAnalysisExpressionTreeILEmittingInterpreterArithmeticGrammarPerformanceTest() {
    … …  
    135150    ///</summary>
    136151    [TestMethod]
     152    [TestCategory("Problems.DataAnalysis")]
     153    [TestProperty("Time", "short")]
    137154    public void SymbolicDataAnalysisExpressionTreeInterpreterEvaluateTest() {
    138155      Dataset ds = new Dataset(new string[] { "Y", "A", "B" }, new double[,] {
    … …  
    158175
    159176    [TestMethod]
     177    [TestCategory("Problems.DataAnalysis")]
     178    [TestProperty("Time", "short")]
    160179    public void SymbolicDataAnalysisExpressionILEmittingTreeInterpreterEvaluateTest() {
    161180      Dataset ds = new Dataset(new string[] { "Y", "A", "B" }, new double[,] {
    … …  
    411430          try {
    412431            Evaluate(interpreter, ds, "(psi " + x + ")", 0, alglib.psi(x));
    413           }
    414           catch (alglib.alglibexception) { // ignore cases where alglib throws an exception
     432          } catch (alglib.alglibexception) { // ignore cases where alglib throws an exception
    415433          }
    416434        };

  • stable/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeSimplifierTest.cs

    r9456 r9885  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2625using Microsoft.VisualStudio.TestTools.UnitTesting;
    2726
    28 namespace HeuristicLab.Problems.DataAnalysis.Symbolic_34.Tests {
     27namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Tests {
    2928
    3029  [TestClass()]
    3130  public class SymbolicDataAnalysisExpressionTreeSimplifierTest {
     31
    3232    [TestMethod]
     33    [TestCategory("Problems.DataAnalysis")]
     34    [TestProperty("Time", "short")]
    3335    public void SimplifierAxiomsTest() {
    3436      SymbolicExpressionImporter importer = new SymbolicExpressionImporter();

  • stable/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicExpressionImporter.cs

    r9456 r9885  
    2525using System.Linq;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Problems.DataAnalysis.Symbolic;
    28 
    29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic_34.Tests {
     27
     28namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Tests {
    3029  internal class SymbolicExpressionImporter {
    3130    private const string VARSTART = "VAR";
    … …  
    8685    StartSymbol startSymbol = new StartSymbol();
    8786
    88     public SymbolicExpressionImporter() {
    89     }
    90 
    9187    internal ISymbolicExpressionTree Import(string str) {
    9288      str = str.Replace("(", " ( ").Replace(")", " ) ");

  • stable/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/Token.cs

    r9456 r9885  
    2222using System.Globalization;
    2323
    24 namespace HeuristicLab.Problems.DataAnalysis.Symbolic_34.Tests {
     24namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Tests {
    2525  internal enum TokenSymbol { LPAR, RPAR, SYMB, NUMBER };
    2626  internal class Token {

  • stable/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/Util.cs

    r9456 r9885  
    2525using System.Linq;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2827using HeuristicLab.Random;
    29 namespace HeuristicLab.Problems.DataAnalysis.Symbolic_34.Tests {
     28namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Tests {
    3029  internal class Util {
    3130
Note: See TracChangeset for help on using the changeset viewer.