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:
3 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Tests

  • stable/HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs

    r9471 r9885  
    4141using HeuristicLab.Optimization;
    4242using HeuristicLab.Optimization.Operators;
    43 using HeuristicLab.ParallelEngine;
    4443using HeuristicLab.Persistence.Default.Xml;
    4544using HeuristicLab.Problems.ArtificialAnt;
    … …  
    6160using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
    6261using HeuristicLab.Selection;
    63 using HeuristicLab.SequentialEngine;
    6462using Microsoft.VisualStudio.TestTools.UnitTesting;
    6563
    6664
    67 namespace HeuristicLab_33.Tests {
     65namespace HeuristicLab.Tests {
    6866  [TestClass]
    6967  [DeploymentItem(@"HeuristicLab-3.3/Resources/C101.opt.txt")]
    … …  
    7371    #region TSP
    7472    [TestMethod]
     73    [TestCategory("Samples.Create")]
     74    [TestProperty("Time", "medium")]
    7575    public void CreateGaTspSampleTest() {
    7676      var ga = CreateGaTspSample();
    … …  
    7878    }
    7979    [TestMethod]
     80    [TestCategory("Samples.Execute")]
     81    [TestProperty("Time", "long")]
    8082    public void RunGaTspSampleTest() {
    8183      var ga = CreateGaTspSample();
    … …  
    109111    #region VRP
    110112    [TestMethod]
     113    [TestCategory("Samples.Create")]
     114    [TestProperty("Time", "medium")]
    111115    public void CreateGaVrpSampleTest() {
    112116      var ga = CreateGaVrpSample();
    … …  
    115119
    116120    [TestMethod]
     121    [TestCategory("Samples.Execute")]
     122    [TestProperty("Time", "long")]
    117123    public void RunGaVrpSampleTest() {
    118124      var ga = CreateGaVrpSample();
    … …  
    179185    #region ArtificialAnt
    180186    [TestMethod]
     187    [TestCategory("Samples.Create")]
     188    [TestProperty("Time", "medium")]
    181189    public void CreateGpArtificialAntSampleTest() {
    182190      var ga = CreateGpArtificialAntSample();
    … …  
    185193
    186194    [TestMethod]
     195    [TestCategory("Samples.Execute")]
     196    [TestProperty("Time", "long")]
    187197    public void RunGpArtificialAntSampleTest() {
    188198      var ga = CreateGpArtificialAntSample();
    … …  
    231241    #region Symbolic Regression
    232242    [TestMethod]
     243    [TestCategory("Samples.Create")]
     244    [TestProperty("Time", "medium")]
    233245    public void CreateGpSymbolicRegressionSampleTest() {
    234246      var ga = CreateGpSymbolicRegressionSample();
    … …  
    236248    }
    237249    [TestMethod]
     250    [TestCategory("Samples.Execute")]
     251    [TestProperty("Time", "long")]
    238252    public void RunGpSymbolicRegressionSampleTest() {
    239253      var ga = CreateGpSymbolicRegressionSample();
    … …  
    335349    #region Symbolic Classification
    336350    [TestMethod]
     351    [TestCategory("Samples.Create")]
     352    [TestProperty("Time", "medium")]
    337353    public void CreateGpSymbolicClassificationSampleTest() {
    338354      var ga = CreateGpSymbolicClassificationSample();
    … …  
    341357
    342358    [TestMethod]
     359    [TestCategory("Samples.Execute")]
     360    [TestProperty("Time", "long")]
    343361    public void RunGpSymbolicClassificationSampleTest() {
    344362      var ga = CreateGpSymbolicClassificationSample();
    … …  
    442460    #region LawnMower
    443461    [TestMethod]
     462    [TestCategory("Samples.Execute")]
     463    [TestProperty("Time", "long")]
    444464    public void RunGpLawnMowerSampleTest() {
    445465      var ga = CreateGpLawnMowerSample();
    … …  
    472492    #region Griewank
    473493    [TestMethod]
     494    [TestCategory("Samples.Create")]
     495    [TestProperty("Time", "medium")]
    474496    public void CreateEsGriewankSampleTest() {
    475497      var es = CreateEsGriewankSample();
    … …  
    477499    }
    478500    [TestMethod]
     501    [TestCategory("Samples.Execute")]
     502    [TestProperty("Time", "long")]
    479503    public void RunEsGriewankSampleTest() {
    480504      var es = CreateEsGriewankSample();
    … …  
    526550    #region TSP
    527551    [TestMethod]
     552    [TestCategory("Samples.Create")]
     553    [TestProperty("Time", "medium")]
    528554    public void CreateIslandGaTspSampleTest() {
    529555      var ga = CreateIslandGaTspSample();
    … …  
    531557    }
    532558    [TestMethod]
     559    [TestCategory("Samples.Execute")]
     560    [TestProperty("Time", "long")]
    533561    public void RunIslandGaTspSampleTest() {
    534562      var ga = CreateIslandGaTspSample();
    … …  
    566594    #region Knapsack
    567595    [TestMethod]
     596    [TestCategory("Samples.Create")]
     597    [TestProperty("Time", "medium")]
    568598    public void CreateLocalSearchKnapsackSampleTest() {
    569599      var ls = CreateLocalSearchKnapsackSample();
    … …  
    571601    }
    572602    [TestMethod]
     603    [TestCategory("Samples.Execute")]
     604    [TestProperty("Time", "medium")]
    573605    public void RunLocalSearchKnapsackSampleTest() {
    574606      var ls = CreateLocalSearchKnapsackSample();
    … …  
    618650      ls.SetSeedRandomly.Value = true;
    619651      #endregion
    620       ls.Engine = new ParallelEngine();
     652      ls.Engine = new ParallelEngine.ParallelEngine();
    621653      return ls;
    622654    }
    … …  
    627659    #region Schwefel
    628660    [TestMethod]
     661    [TestCategory("Samples.Create")]
     662    [TestProperty("Time", "medium")]
    629663    public void CreatePsoSchwefelSampleTest() {
    630664      var pso = CreatePsoSchwefelSample();
    … …  
    632666    }
    633667    [TestMethod]
     668    [TestCategory("Samples.Execute")]
     669    [TestProperty("Time", "medium")]
    634670    public void RunPsoSchwefelSampleTest() {
    635671      var pso = CreatePsoSchwefelSample();
    … …  
    697733      pso.SetSeedRandomly.Value = true;
    698734      #endregion
    699       pso.Engine = new ParallelEngine();
     735      pso.Engine = new ParallelEngine.ParallelEngine();
    700736      return pso;
    701737    }
    … …  
    706742    #region Rastrigin
    707743    [TestMethod]
     744    [TestCategory("Samples.Create")]
     745    [TestProperty("Time", "medium")]
    708746    public void CreateSimulatedAnnealingRastriginSampleTest() {
    709747      var sa = CreateSimulatedAnnealingRastriginSample();
    … …  
    711749    }
    712750    [TestMethod]
     751    [TestCategory("Samples.Execute")]
     752    [TestProperty("Time", "medium")]
    713753    public void RunSimulatedAnnealingRastriginSampleTest() {
    714754      var sa = CreateSimulatedAnnealingRastriginSample();
    … …  
    763803      sa.StartTemperature.Value = 1;
    764804      #endregion
    765       sa.Engine = new ParallelEngine();
     805      sa.Engine = new ParallelEngine.ParallelEngine();
    766806      return sa;
    767807    }
    … …  
    772812    #region TSP
    773813    [TestMethod]
     814    [TestCategory("Samples.Create")]
     815    [TestProperty("Time", "medium")]
    774816    public void CreateTabuSearchTspSampleTest() {
    775817      var ts = CreateTabuSearchTspSample();
    … …  
    777819    }
    778820    [TestMethod]
     821    [TestCategory("Samples.Execute")]
     822    [TestProperty("Time", "long")]
    779823    public void RunTabuSearchTspSampleTest() {
    780824      var ts = CreateTabuSearchTspSample();
    … …  
    832876
    833877      #endregion
    834       ts.Engine = new ParallelEngine();
     878      ts.Engine = new ParallelEngine.ParallelEngine();
    835879      return ts;
    836880    }
    … …  
    839883    #region VRP
    840884    [TestMethod]
     885    [TestCategory("Samples.Create")]
     886    [TestProperty("Time", "medium")]
    841887    public void CreateTabuSearchVRPSampleTest() {
    842888      var vrp = CreateTabuSearchVrpSample();
    … …  
    844890    }
    845891    [TestMethod]
     892    [TestCategory("Samples.Execute")]
     893    [TestProperty("Time", "long")]
    846894    public void RunTabuSearchVRPSampleTest() {
    847895      var vrp = CreateTabuSearchVrpSample();
    … …  
    898946
    899947      #endregion
    900       ts.Engine = new ParallelEngine();
     948      ts.Engine = new ParallelEngine.ParallelEngine();
    901949      return ts;
    902950    }
    … …  
    907955    #region TSP
    908956    [TestMethod]
     957    [TestCategory("Samples.Create")]
     958    [TestProperty("Time", "medium")]
    909959    public void CreateVnsTspSampleTest() {
    910960      var vns = CreateVnsTspSample();
    … …  
    912962    }
    913963    [TestMethod]
     964    [TestCategory("Samples.Execute")]
     965    [TestProperty("Time", "long")]
    914966    public void RunVnsTspSampleTest() {
    915967      var vns = CreateVnsTspSample();
    … …  
    9761028      vns.ShakingOperator = shakingOperator;
    9771029      #endregion
    978       vns.Engine = new ParallelEngine();
     1030      vns.Engine = new ParallelEngine.ParallelEngine();
    9791031      return vns;
    9801032    }
    … …  
    9841036    #region Gaussian Process Regression
    9851037    [TestMethod]
     1038    [TestCategory("Samples.Create")]
     1039    [TestProperty("Time", "medium")]
    9861040    public void CreateGaussianProcessRegressionSampleTest() {
    9871041      var gpr = CreateGaussianProcessRegressionSample();
    … …  
    9891043    }
    9901044    [TestMethod]
     1045    [TestCategory("Samples.Execute")]
     1046    [TestProperty("Time", "long")]
    9911047    public void RunGaussianProcessRegressionSample() {
    9921048      var gpr = CreateGaussianProcessRegressionSample();
    … …  
    10151071      gpr.SetSeedRandomly = true;
    10161072      #endregion
    1017       gpr.Engine = new ParallelEngine();
     1073      gpr.Engine = new ParallelEngine.ParallelEngine();
    10181074      return gpr;
    10191075    }
    … …  
    10231079    #region VRP
    10241080    [TestMethod]
     1081    [TestCategory("Samples.Create")]
     1082    [TestProperty("Time", "medium")]
    10251083    public void CreateScatterSearchVRPSampleTest() {
    10261084      var ss = CreateScatterSearchVRPSample();
    … …  
    10291087
    10301088    [TestMethod]
     1089    [TestCategory("Samples.Execute")]
     1090    [TestProperty("Time", "long")]
    10311091    public void RunScatterSearchVRPSampleTest() {
    10321092      var ss = CreateScatterSearchVRPSample();
    … …  
    10491109      #region Algorithm Configuration
    10501110      ScatterSearch ss = new ScatterSearch();
    1051       ss.Engine = new SequentialEngine();
     1111      ss.Engine = new SequentialEngine.SequentialEngine();
    10521112      ss.Name = "Scatter Search - VRP";
    10531113      ss.Description = "A scatter search algorithm which solves the \"C101\" vehicle routing problem (imported from Solomon)";
    … …  
    10791139    #region Scheduling
    10801140    [TestMethod]
     1141    [TestCategory("Samples.Create")]
     1142    [TestProperty("Time", "medium")]
    10811143    public void CreateRAPGASchedulingSampleTest() {
    10821144      var ss = CreateRAPGASchedulingSample();
    … …  
    10851147
    10861148    [TestMethod]
     1149    [TestCategory("Samples.Execute")]
     1150    [TestProperty("Time", "long")]
    10871151    public void RunRAPGASchedulingSampleTest() {
    10881152      var rapga = CreateRAPGASchedulingSample();
    … …  
    11021166      #region Algorithm Configuration
    11031167      RAPGA rapga = new RAPGA();
    1104       rapga.Engine = new SequentialEngine();
     1168      rapga.Engine = new SequentialEngine.SequentialEngine();
    11051169      rapga.Name = "RAPGA - Job Shop Scheduling";
    11061170      rapga.Description = "A relevant alleles preserving genetic algorithm which solves a job shop scheduling problem";
    … …  
    11471211        .OfType<SM>()
    11481212        .Single();
    1149       es.Engine = new ParallelEngine();
     1213      es.Engine = new ParallelEngine.ParallelEngine();
    11501214    }
    11511215
    … …  
    11761240        tSelector.GroupSizeParameter.Value.Value = tournGroupSize;
    11771241      }
    1178       ga.Engine = new ParallelEngine();
     1242      ga.Engine = new ParallelEngine.ParallelEngine();
    11791243    }
    11801244
    … …  
    12151279        .OfType<MiR>()
    12161280        .Single();
    1217       ga.Engine = new ParallelEngine();
     1281      ga.Engine = new ParallelEngine.ParallelEngine();
    12181282    }
    12191283
Note: See TracChangeset for help on using the changeset viewer.