Changeset 9979


Ignore:
Timestamp:
09/17/13 10:39:26 (6 years ago)
Author:
ascheibe
Message:

#2108 Merged r9955-r9956, r9958-r9959, r9978 into stable branch

Location:
stable
Files:
4 deleted
12 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab 3.3 Tests.sln

    r7932 r9979  
    11
    2 Microsoft Visual Studio Solution File, Format Version 11.00
    3 # Visual Studio 2010
     2Microsoft Visual Studio Solution File, Format Version 12.00
     3# Visual Studio 2012
    44Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Tests", "HeuristicLab.Tests\HeuristicLab.Tests.csproj", "{B62872C1-6752-4758-9823-751A2D28C388}"
    55EndProject
    66Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4880EC01-2CAD-4291-BBC1-B269AD67D4FA}"
    7   ProjectSection(SolutionItems) = preProject
    8     HeuristicLab 3.3 Tests.vsmdi = HeuristicLab 3.3 Tests.vsmdi
    9     LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
    10   EndProjectSection
    117EndProject
    128Global
    13   GlobalSection(TestCaseManagementSettings) = postSolution
    14     CategoryFile = HeuristicLab 3.3 Tests.vsmdi
    15   EndGlobalSection
    169  GlobalSection(SolutionConfigurationPlatforms) = preSolution
    1710    Debug|Any CPU = Debug|Any CPU
  • stable/HeuristicLab.Tests

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

    r9885 r9979  
    4747    [TestCategory("Essential")]
    4848    [TestProperty("Time", "medium")]
    49     [DeploymentItem(@"HeuristicLab-3.3/Resources/GA_SymbReg.hl")]
    5049    public void CollectGASample() {
    51       GeneticAlgorithm ga = (GeneticAlgorithm)XmlParser.Deserialize("GA_SymbReg.hl");
     50      GeneticAlgorithm ga = (GeneticAlgorithm)XmlParser.Deserialize(@"Test Resources\GA_SymbReg.hl");
    5251
    5352      Stopwatch watch = new Stopwatch();
  • stable/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs

    r9885 r9979  
    6767    [TestCategory("Essential")]
    6868    [TestProperty("Time", "long")]
    69     [DeploymentItem(@"HeuristicLab-3.3\Resources\SamplesExperimentFinished.hl")]
    7069    public void TestCloningFinishedExperiment() {
    71       Experiment experiment = (Experiment)XmlParser.Deserialize("SamplesExperimentFinished.hl");
     70      Experiment experiment = (Experiment)XmlParser.Deserialize(@"Test Resources\SamplesExperimentFinished.hl");
    7271
    7372      Experiment clone = (Experiment)experiment.Clone(new Cloner());
  • stable/HeuristicLab.Tests/HeuristicLab-3.3/GeneticAlgorithmTest.cs

    r9885 r9979  
    4545    [TestCategory("General")]
    4646    [TestProperty("Time", "long")]
    47     [DeploymentItem(@"HeuristicLab-3.3/Resources/GA_TSP.hl")]
    4847    public void GeneticAlgorithmPerformanceTest() {
    4948      ex = null;
    50       GeneticAlgorithm ga = (GeneticAlgorithm)XmlParser.Deserialize("GA_TSP.hl");
     49      GeneticAlgorithm ga = (GeneticAlgorithm)XmlParser.Deserialize(@"Test Resources\GA_TSP.hl");
    5150      ga.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(ga_ExceptionOccurred);
    5251      ga.Stopped += new EventHandler(ga_Stopped);
  • stable/HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs

    r9885 r9979  
    2121
    2222using System;
     23using System.IO;
    2324using System.Linq;
    2425using System.Threading;
     
    6566namespace HeuristicLab.Tests {
    6667  [TestClass]
    67   [DeploymentItem(@"HeuristicLab-3.3/Resources/C101.opt.txt")]
    68   [DeploymentItem(@"HeuristicLab-3.3/Resources/C101.txt")]
    6968  public class SamplesTest {
     69    private const string samplesDirectory = @"Samples\";
     70
     71    [ClassInitialize]
     72    public static void MyClassInitialize(TestContext testContext) {
     73      if (!Directory.Exists(samplesDirectory))
     74        Directory.CreateDirectory(samplesDirectory);
     75    }
     76
    7077    #region GA
    7178    #region TSP
     
    7582    public void CreateGaTspSampleTest() {
    7683      var ga = CreateGaTspSample();
    77       XmlGenerator.Serialize(ga, "../../GA_TSP.hl");
     84      XmlGenerator.Serialize(ga, @"Samples\GA_TSP.hl");
    7885    }
    7986    [TestMethod]
     
    115122    public void CreateGaVrpSampleTest() {
    116123      var ga = CreateGaVrpSample();
    117       XmlGenerator.Serialize(ga, "../../GA_VRP.hl");
     124      XmlGenerator.Serialize(ga, @"Samples\GA_VRP.hl");
    118125    }
    119126
     
    137144
    138145      SolomonFormatInstanceProvider instanceProvider = new SolomonInstanceProvider();
    139       CVRPTWData data = instanceProvider.Import("C101.txt", "C101.opt.txt") as CVRPTWData;
     146      CVRPTWData data = instanceProvider.Import(@"Test Resources\C101.txt", @"Test Resources\C101.opt.txt") as CVRPTWData;
    140147      vrpProblem.Load(data);
    141148      vrpProblem.Name = "C101 VRP (imported from Solomon)";
     
    189196    public void CreateGpArtificialAntSampleTest() {
    190197      var ga = CreateGpArtificialAntSample();
    191       XmlGenerator.Serialize(ga, "../../SGP_SantaFe.hl");
     198      XmlGenerator.Serialize(ga, @"Samples\SGP_SantaFe.hl");
    192199    }
    193200
     
    245252    public void CreateGpSymbolicRegressionSampleTest() {
    246253      var ga = CreateGpSymbolicRegressionSample();
    247       XmlGenerator.Serialize(ga, "../../SGP_SymbReg.hl");
     254      XmlGenerator.Serialize(ga, @"Samples\SGP_SymbReg.hl");
    248255    }
    249256    [TestMethod]
     
    353360    public void CreateGpSymbolicClassificationSampleTest() {
    354361      var ga = CreateGpSymbolicClassificationSample();
    355       XmlGenerator.Serialize(ga, "../../SGP_SymbClass.hl");
     362      XmlGenerator.Serialize(ga, @"Samples\SGP_SymbClass.hl");
    356363    }
    357364
     
    496503    public void CreateEsGriewankSampleTest() {
    497504      var es = CreateEsGriewankSample();
    498       XmlGenerator.Serialize(es, "../../ES_Griewank.hl");
     505      XmlGenerator.Serialize(es, @"Samples\ES_Griewank.hl");
    499506    }
    500507    [TestMethod]
     
    554561    public void CreateIslandGaTspSampleTest() {
    555562      var ga = CreateIslandGaTspSample();
    556       XmlGenerator.Serialize(ga, "../../IslandGA_TSP.hl");
     563      XmlGenerator.Serialize(ga, @"Samples\IslandGA_TSP.hl");
    557564    }
    558565    [TestMethod]
     
    598605    public void CreateLocalSearchKnapsackSampleTest() {
    599606      var ls = CreateLocalSearchKnapsackSample();
    600       XmlGenerator.Serialize(ls, "../../LS_Knapsack.hl");
     607      XmlGenerator.Serialize(ls, @"Samples\LS_Knapsack.hl");
    601608    }
    602609    [TestMethod]
     
    663670    public void CreatePsoSchwefelSampleTest() {
    664671      var pso = CreatePsoSchwefelSample();
    665       XmlGenerator.Serialize(pso, "../../PSO_Schwefel.hl");
     672      XmlGenerator.Serialize(pso, @"Samples\PSO_Schwefel.hl");
    666673    }
    667674    [TestMethod]
     
    746753    public void CreateSimulatedAnnealingRastriginSampleTest() {
    747754      var sa = CreateSimulatedAnnealingRastriginSample();
    748       XmlGenerator.Serialize(sa, "../../SA_Rastrigin.hl");
     755      XmlGenerator.Serialize(sa, @"Samples\SA_Rastrigin.hl");
    749756    }
    750757    [TestMethod]
     
    816823    public void CreateTabuSearchTspSampleTest() {
    817824      var ts = CreateTabuSearchTspSample();
    818       XmlGenerator.Serialize(ts, "../../TS_TSP.hl");
     825      XmlGenerator.Serialize(ts, @"Samples\TS_TSP.hl");
    819826    }
    820827    [TestMethod]
     
    887894    public void CreateTabuSearchVRPSampleTest() {
    888895      var vrp = CreateTabuSearchVrpSample();
    889       XmlGenerator.Serialize(vrp, "../../TS_VRP.hl");
     896      XmlGenerator.Serialize(vrp, @"Samples\TS_VRP.hl");
    890897    }
    891898    [TestMethod]
     
    959966    public void CreateVnsTspSampleTest() {
    960967      var vns = CreateVnsTspSample();
    961       XmlGenerator.Serialize(vns, "../../VNS_TSP.hl");
     968      XmlGenerator.Serialize(vns, @"Samples\VNS_TSP.hl");
    962969    }
    963970    [TestMethod]
     
    10401047    public void CreateGaussianProcessRegressionSampleTest() {
    10411048      var gpr = CreateGaussianProcessRegressionSample();
    1042       XmlGenerator.Serialize(gpr, "../../GPR.hl");
     1049      XmlGenerator.Serialize(gpr, @"Samples\GPR.hl");
    10431050    }
    10441051    [TestMethod]
     
    10831090    public void CreateScatterSearchVRPSampleTest() {
    10841091      var ss = CreateScatterSearchVRPSample();
    1085       XmlGenerator.Serialize(ss, "../../SS_VRP.hl");
     1092      XmlGenerator.Serialize(ss, @"Samples\SS_VRP.hl");
    10861093    }
    10871094
     
    11431150    public void CreateRAPGASchedulingSampleTest() {
    11441151      var ss = CreateRAPGASchedulingSample();
    1145       XmlGenerator.Serialize(ss, "../../RAPGA_JSSP.hl");
     1152      XmlGenerator.Serialize(ss, @"Samples\RAPGA_JSSP.hl");
    11461153    }
    11471154
  • stable/HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/GaussianProcessModelTest.cs

    r9885 r9979  
    3030  public class GaussianProcessModelTest {
    3131    [TestMethod]
    32     [DeploymentItem(@"HeuristicLab.Algorithms.DataAnalysis-3.4/co2.txt")]
    3332    [TestCategory("General")]
    3433    [TestProperty("Time", "medium")]
    3534    public void GaussianProcessModelOutputTest() {
    3635      var provider = new RegressionCSVInstanceProvider();
    37       var problemData = provider.ImportData("co2.txt");
     36      var problemData = provider.ImportData(@"Test Resources\co2.txt");
    3837
    3938      var targetVariable = "interpolated";
  • stable/HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/GaussianProcessRegressionTest.cs

    r9885 r9979  
    3030namespace HeuristicLab.Algorithms.DataAnalysis.Tests {
    3131  [TestClass]
    32   [DeploymentItem(@"HeuristicLab.Algorithms.DataAnalysis-3.4/co2.txt")]
    3332  public class GaussianProcessRegressionTest {
    3433    public GaussianProcessRegressionTest() { }
     
    5453      alg.Problem = new RegressionProblem();
    5554      var provider = new RegressionCSVInstanceProvider();
    56       var problemData = (RegressionProblemData)provider.ImportData("co2.txt");
     55      var problemData = (RegressionProblemData)provider.ImportData(@"Test Resources\co2.txt");
    5756      problemData.TargetVariableParameter.ActualValue = problemData.TargetVariableParameter.ValidValues.First(x => x.Value == "interpolated");
    5857      problemData.InputVariables.SetItemCheckedState(problemData.InputVariables.First(x => x.Value == "year"), false);
  • stable/HeuristicLab.Tests/HeuristicLab.Encodings.PermutationEncoding-3.3/UniformLikeCrossoverTest.cs

    r9885 r9979  
    6161    [TestCategory("Encodings.Permutation")]
    6262    [TestProperty("Time", "short")]
    63     [DeploymentItem("HeuristicLab.Encodings.PermutationEncoding-3.3.dll")]
    6463    public void UniformLikeCrossoverCrossTest() {
    6564      UniformLikeCrossover_Accessor target = new UniformLikeCrossover_Accessor();
  • stable/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs

    r9976 r9979  
    2222using System;
    2323using System.Collections.Generic;
     24using System.Diagnostics;
    2425using System.Globalization;
    2526using System.Linq;
     27using System.Linq.Expressions;
    2628using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2729using HeuristicLab.Random;
     
    149151      var dataset = Util.CreateRandomDataset(twister, Rows, Columns);
    150152      var grammar = new ArithmeticExpressionGrammar();
     153      //grammar.Symbols.OfType<Variable>().First().Enabled = false;
    151154      grammar.MaximumFunctionArguments = 0;
    152155      grammar.MaximumFunctionDefinitions = 0;
  • stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r9886 r9979  
    2020    <DebugType>full</DebugType>
    2121    <Optimize>false</Optimize>
    22     <OutputPath>bin\</OutputPath>
     22    <OutputPath>..\bin\</OutputPath>
    2323    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2424    <ErrorReport>prompt</ErrorReport>
     
    2828    <DebugType>pdbonly</DebugType>
    2929    <Optimize>true</Optimize>
    30     <OutputPath>bin\</OutputPath>
     30    <OutputPath>..\bin\</OutputPath>
    3131    <DefineConstants>TRACE</DefineConstants>
    3232    <ErrorReport>prompt</ErrorReport>
     
    4141  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    4242    <DebugSymbols>true</DebugSymbols>
    43     <OutputPath>bin\</OutputPath>
     43    <OutputPath>..\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <DebugType>full</DebugType>
     
    5656  </PropertyGroup>
    5757  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    58     <OutputPath>bin\</OutputPath>
     58    <OutputPath>..\bin\</OutputPath>
    5959    <DefineConstants>TRACE</DefineConstants>
    6060    <Optimize>true</Optimize>
     
    7373  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    7474    <DebugSymbols>true</DebugSymbols>
    75     <OutputPath>bin\</OutputPath>
     75    <OutputPath>..\bin\</OutputPath>
    7676    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7777    <DebugType>full</DebugType>
     
    8888  </PropertyGroup>
    8989  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    90     <OutputPath>bin\</OutputPath>
     90    <OutputPath>..\bin\</OutputPath>
    9191    <DefineConstants>TRACE</DefineConstants>
    9292    <Optimize>true</Optimize>
     
    104104    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    105105      <HintPath>..\bin\ALGLIB-3.7.0.dll</HintPath>
    106       <Private>true</Private>
     106      <Private>False</Private>
    107107    </Reference>
    108108    <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.4">
    109109      <HintPath>..\bin\HeuristicLab.Algorithms.DataAnalysis-3.4.dll</HintPath>
    110       <Private>true</Private>
     110      <Private>False</Private>
    111111    </Reference>
    112112    <Reference Include="HeuristicLab.Algorithms.EvolutionStrategy-3.3">
    113113      <HintPath>..\bin\HeuristicLab.Algorithms.EvolutionStrategy-3.3.dll</HintPath>
    114       <Private>true</Private>
     114      <Private>False</Private>
    115115    </Reference>
    116116    <Reference Include="HeuristicLab.Algorithms.GeneticAlgorithm-3.3">
    117117      <HintPath>..\bin\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll</HintPath>
    118       <Private>true</Private>
     118      <Private>False</Private>
    119119    </Reference>
    120120    <Reference Include="HeuristicLab.Algorithms.LocalSearch-3.3">
    121121      <HintPath>..\bin\HeuristicLab.Algorithms.LocalSearch-3.3.dll</HintPath>
    122       <Private>true</Private>
     122      <Private>False</Private>
    123123    </Reference>
    124124    <Reference Include="HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3">
    125125      <HintPath>..\bin\HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.dll</HintPath>
    126       <Private>true</Private>
     126      <Private>False</Private>
    127127    </Reference>
    128128    <Reference Include="HeuristicLab.Algorithms.RAPGA-3.3">
    129129      <HintPath>..\bin\HeuristicLab.Algorithms.RAPGA-3.3.dll</HintPath>
    130       <Private>true</Private>
     130      <Private>False</Private>
    131131    </Reference>
    132132    <Reference Include="HeuristicLab.Algorithms.ScatterSearch-3.3">
    133133      <HintPath>..\bin\HeuristicLab.Algorithms.ScatterSearch-3.3.dll</HintPath>
    134       <Private>true</Private>
     134      <Private>False</Private>
    135135    </Reference>
    136136    <Reference Include="HeuristicLab.Algorithms.SimulatedAnnealing-3.3">
    137137      <HintPath>..\bin\HeuristicLab.Algorithms.SimulatedAnnealing-3.3.dll</HintPath>
    138       <Private>true</Private>
     138      <Private>False</Private>
    139139    </Reference>
    140140    <Reference Include="HeuristicLab.Algorithms.TabuSearch-3.3">
    141141      <HintPath>..\bin\HeuristicLab.Algorithms.TabuSearch-3.3.dll</HintPath>
    142       <Private>true</Private>
     142      <Private>False</Private>
    143143    </Reference>
    144144    <Reference Include="HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3">
    145145      <HintPath>..\bin\HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.dll</HintPath>
    146       <Private>true</Private>
     146      <Private>False</Private>
    147147    </Reference>
    148148    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0">
    149149      <HintPath>..\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    150       <Private>true</Private>
     150      <Private>False</Private>
    151151    </Reference>
    152152    <Reference Include="HeuristicLab.Collections-3.3">
    153153      <HintPath>..\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    154       <Private>true</Private>
     154      <Private>False</Private>
    155155    </Reference>
    156156    <Reference Include="HeuristicLab.Common-3.3">
    157157      <HintPath>..\bin\HeuristicLab.Common-3.3.dll</HintPath>
    158       <Private>true</Private>
     158      <Private>False</Private>
    159159    </Reference>
    160160    <Reference Include="HeuristicLab.Core-3.3">
    161161      <HintPath>..\bin\HeuristicLab.Core-3.3.dll</HintPath>
    162       <Private>true</Private>
     162      <Private>False</Private>
    163163    </Reference>
    164164    <Reference Include="HeuristicLab.Data-3.3">
    165165      <HintPath>..\bin\HeuristicLab.Data-3.3.dll</HintPath>
    166       <Private>true</Private>
     166      <Private>False</Private>
    167167    </Reference>
    168168    <Reference Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3">
    169169      <HintPath>..\bin\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.dll</HintPath>
    170       <Private>true</Private>
     170      <Private>False</Private>
    171171    </Reference>
    172172    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3">
    173       <Private>true</Private>
     173      <Private>False</Private>
    174174      <HintPath>..\bin\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll</HintPath>
    175175    </Reference>
    176176    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
    177177      <HintPath>..\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
    178       <Private>true</Private>
     178      <Private>False</Private>
    179179    </Reference>
    180180    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3">
    181181      <HintPath>..\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
    182       <Private>true</Private>
     182      <Private>False</Private>
    183183    </Reference>
    184184    <Reference Include="HeuristicLab.Encodings.ScheduleEncoding-3.3">
    185185      <HintPath>..\bin\HeuristicLab.Encodings.ScheduleEncoding-3.3.dll</HintPath>
    186       <Private>true</Private>
     186      <Private>False</Private>
    187187    </Reference>
    188188    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4">
    189189      <HintPath>..\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
    190       <Private>true</Private>
     190      <Private>False</Private>
    191191    </Reference>
    192192    <Reference Include="HeuristicLab.MainForm-3.3">
    193193      <HintPath>..\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
    194       <Private>true</Private>
     194      <Private>False</Private>
    195195    </Reference>
    196196    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
    197197      <HintPath>..\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    198       <Private>true</Private>
     198      <Private>False</Private>
    199199    </Reference>
    200200    <Reference Include="HeuristicLab.Operators-3.3">
    201201      <HintPath>..\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    202       <Private>true</Private>
     202      <Private>False</Private>
    203203    </Reference>
    204204    <Reference Include="HeuristicLab.Optimization-3.3">
    205205      <HintPath>..\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    206       <Private>true</Private>
     206      <Private>False</Private>
    207207    </Reference>
    208208    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
    209209      <HintPath>..\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
    210       <Private>true</Private>
     210      <Private>False</Private>
    211211    </Reference>
    212212    <Reference Include="HeuristicLab.ParallelEngine-3.3">
    213213      <HintPath>..\bin\HeuristicLab.ParallelEngine-3.3.dll</HintPath>
    214       <Private>true</Private>
     214      <Private>False</Private>
    215215    </Reference>
    216216    <Reference Include="HeuristicLab.Parameters-3.3">
    217217      <HintPath>..\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    218       <Private>true</Private>
     218      <Private>False</Private>
    219219    </Reference>
    220220    <Reference Include="HeuristicLab.Persistence-3.3">
    221221      <HintPath>..\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    222       <Private>true</Private>
     222      <Private>False</Private>
    223223    </Reference>
    224224    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    225225      <HintPath>..\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    226       <Private>true</Private>
     226      <Private>False</Private>
    227227    </Reference>
    228228    <Reference Include="HeuristicLab.Problems.ArtificialAnt-3.4">
    229229      <HintPath>..\bin\HeuristicLab.Problems.ArtificialAnt-3.4.dll</HintPath>
    230       <Private>true</Private>
     230      <Private>False</Private>
    231231    </Reference>
    232232    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
    233233      <HintPath>..\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    234       <Private>true</Private>
     234      <Private>False</Private>
    235235    </Reference>
    236236    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4">
    237237      <HintPath>..\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
    238       <Private>true</Private>
     238      <Private>False</Private>
    239239    </Reference>
    240240    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4">
    241241      <HintPath>..\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.dll</HintPath>
    242       <Private>true</Private>
     242      <Private>False</Private>
    243243    </Reference>
    244244    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4">
    245245      <HintPath>..\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath>
    246       <Private>true</Private>
     246      <Private>False</Private>
    247247    </Reference>
    248248    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4">
    249249      <HintPath>..\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4.dll</HintPath>
    250       <Private>true</Private>
     250      <Private>False</Private>
    251251    </Reference>
    252252    <Reference Include="HeuristicLab.Problems.Instances-3.3">
    253253      <HintPath>..\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    254       <Private>true</Private>
     254      <Private>False</Private>
    255255    </Reference>
    256256    <Reference Include="HeuristicLab.Problems.Instances.CordeauGQAP-3.3">
    257257      <HintPath>..\bin\HeuristicLab.Problems.Instances.CordeauGQAP-3.3.dll</HintPath>
    258       <Private>true</Private>
     258      <Private>False</Private>
    259259    </Reference>
    260260    <Reference Include="HeuristicLab.Problems.Instances.DataAnalysis-3.3">
    261261      <HintPath>..\bin\HeuristicLab.Problems.Instances.DataAnalysis-3.3.dll</HintPath>
    262       <Private>true</Private>
     262      <Private>False</Private>
    263263    </Reference>
    264264    <Reference Include="HeuristicLab.Problems.Instances.ElloumiCTAP-3.3">
    265265      <HintPath>..\bin\HeuristicLab.Problems.Instances.ElloumiCTAP-3.3.dll</HintPath>
    266       <Private>true</Private>
     266      <Private>False</Private>
    267267    </Reference>
    268268    <Reference Include="HeuristicLab.Problems.Instances.QAPLIB-3.3">
    269269      <HintPath>..\bin\HeuristicLab.Problems.Instances.QAPLIB-3.3.dll</HintPath>
    270       <Private>true</Private>
     270      <Private>False</Private>
    271271    </Reference>
    272272    <Reference Include="HeuristicLab.Problems.Instances.TSPLIB-3.3">
    273273      <HintPath>..\bin\HeuristicLab.Problems.Instances.TSPLIB-3.3.dll</HintPath>
    274       <Private>true</Private>
     274      <Private>False</Private>
    275275    </Reference>
    276276    <Reference Include="HeuristicLab.Problems.Instances.VehicleRouting-3.4">
    277277      <HintPath>..\bin\HeuristicLab.Problems.Instances.VehicleRouting-3.4.dll</HintPath>
    278       <Private>true</Private>
     278      <Private>False</Private>
    279279    </Reference>
    280280    <Reference Include="HeuristicLab.Problems.Knapsack-3.3">
    281281      <HintPath>..\bin\HeuristicLab.Problems.Knapsack-3.3.dll</HintPath>
    282       <Private>true</Private>
     282      <Private>False</Private>
    283283    </Reference>
    284284    <Reference Include="HeuristicLab.Problems.LawnMower-3.3">
    285285      <HintPath>..\bin\HeuristicLab.Problems.LawnMower-3.3.dll</HintPath>
    286       <Private>true</Private>
     286      <Private>False</Private>
    287287    </Reference>
    288288    <Reference Include="HeuristicLab.Problems.LinearAssignment-3.3">
    289289      <HintPath>..\bin\HeuristicLab.Problems.LinearAssignment-3.3.dll</HintPath>
    290       <Private>true</Private>
     290      <Private>False</Private>
    291291    </Reference>
    292292    <Reference Include="HeuristicLab.Problems.QuadraticAssignment-3.3">
    293293      <HintPath>..\bin\HeuristicLab.Problems.QuadraticAssignment-3.3.dll</HintPath>
    294       <Private>true</Private>
     294      <Private>False</Private>
    295295    </Reference>
    296296    <Reference Include="HeuristicLab.Problems.Scheduling-3.3">
    297297      <HintPath>..\bin\HeuristicLab.Problems.Scheduling-3.3.dll</HintPath>
    298       <Private>true</Private>
     298      <Private>False</Private>
    299299    </Reference>
    300300    <Reference Include="HeuristicLab.Problems.TestFunctions-3.3">
    301301      <HintPath>..\bin\HeuristicLab.Problems.TestFunctions-3.3.dll</HintPath>
    302       <Private>true</Private>
     302      <Private>False</Private>
    303303    </Reference>
    304304    <Reference Include="HeuristicLab.Problems.TravelingSalesman-3.3">
    305305      <HintPath>..\bin\HeuristicLab.Problems.TravelingSalesman-3.3.dll</HintPath>
    306       <Private>true</Private>
     306      <Private>False</Private>
    307307    </Reference>
    308308    <Reference Include="HeuristicLab.Problems.VehicleRouting-3.4">
    309309      <HintPath>..\bin\HeuristicLab.Problems.VehicleRouting-3.4.dll</HintPath>
    310       <Private>true</Private>
     310      <Private>False</Private>
    311311    </Reference>
    312312    <Reference Include="HeuristicLab.Random-3.3">
    313313      <HintPath>..\bin\HeuristicLab.Random-3.3.dll</HintPath>
    314       <Private>true</Private>
     314      <Private>False</Private>
    315315    </Reference>
    316316    <Reference Include="HeuristicLab.Selection-3.3">
    317317      <HintPath>..\bin\HeuristicLab.Selection-3.3.dll</HintPath>
    318       <Private>true</Private>
     318      <Private>False</Private>
    319319    </Reference>
    320320    <Reference Include="HeuristicLab.SequentialEngine-3.3">
    321321      <HintPath>..\bin\HeuristicLab.SequentialEngine-3.3.dll</HintPath>
    322       <Private>true</Private>
     322      <Private>False</Private>
    323323    </Reference>
    324324    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
     
    342342    <Compile Include="HeuristicLab-3.3\CollectObjectGraphTest.cs" />
    343343    <Compile Include="HeuristicLab-3.3\ContentViewTests.cs" />
    344     <Compile Include="HeuristicLab-3.3\NamedItemTest.cs" />
    345     <Compile Include="HeuristicLab-3.3\ParameterVisibilityTest.cs" />
    346344    <Compile Include="HeuristicLab-3.3\DeepCloneableCloningTest.cs" />
    347345    <Compile Include="HeuristicLab-3.3\GeneticAlgorithmTest.cs" />
    348346    <Compile Include="HeuristicLab-3.3\InstantiateCreatablesTest.cs" />
     347    <Compile Include="HeuristicLab-3.3\NamedItemTest.cs" />
     348    <Compile Include="HeuristicLab-3.3\ParameterVisibilityTest.cs" />
    349349    <Compile Include="HeuristicLab-3.3\PluginDependenciesTest.cs" />
    350350    <Compile Include="HeuristicLab-3.3\PluginLoader.cs" />
    351351    <Compile Include="HeuristicLab-3.3\SamplesTest.cs" />
    352352    <Compile Include="HeuristicLab-3.3\StorableConstructorTest.cs" />
    353     <Compile Include="HeuristicLab.Algorithms.DataAnalysis-3.4\SupportVectorMachineTest.cs" />
    354353    <Compile Include="HeuristicLab-3.3\ThreadSafeLogTest.cs" />
    355354    <Compile Include="HeuristicLab-3.3\ToStringTest.cs" />
     355    <Compile Include="HeuristicLab.Algorithms.DataAnalysis-3.4\SupportVectorMachineTest.cs" />
    356356    <Compile Include="HeuristicLab.Algorithms.DataAnalysis-3.4\GaussianProcessModelTest.cs" />
    357357    <Compile Include="HeuristicLab.Algorithms.DataAnalysis-3.4\GaussianProcessFunctionsTest.cs" />
     
    468468  </ItemGroup>
    469469  <ItemGroup>
    470     <Content Include="HeuristicLab.Algorithms.DataAnalysis-3.4\co2.txt">
    471       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    472     </Content>
    473470    <None Include="app.config" />
    474471    <None Include="Builder.testsettings">
    475472      <SubType>Designer</SubType>
    476473    </None>
    477     <None Include="HeuristicLab-3.3\Resources\GA_SymbReg.hl">
    478       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     474    <None Include="HeuristicLab.snk" />
     475    <None Include="Test Resources\GA_SymbReg.hl">
     476      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    479477    </None>
    480     <None Include="HeuristicLab-3.3\Resources\GA_TSP.hl">
    481       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     478    <None Include="Test Resources\GA_TSP.hl">
     479      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    482480    </None>
    483     <Content Include="HeuristicLab-3.3\Resources\SamplesExperimentFinished.hl">
    484       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    485     </Content>
    486     <None Include="HeuristicLab.snk" />
     481    <None Include="Test Resources\SamplesExperimentFinished.hl">
     482      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     483    </None>
    487484    <Shadow Include="Test References\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.accessor" />
    488485    <Shadow Include="Test References\HeuristicLab.PluginInfrastructure-3.3.accessor" />
     
    494491    <Shadow Include="Test References\HeuristicLab.Problems.TestFunctions-3.3.accessor" />
    495492  </ItemGroup>
    496   <ItemGroup />
    497493  <ItemGroup>
    498     <Content Include="HeuristicLab-3.3\Resources\C101.opt.txt">
    499       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     494    <Content Include="Test Resources\C101.opt.txt">
     495      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    500496    </Content>
    501     <Content Include="HeuristicLab-3.3\Resources\C101.txt">
    502       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     497    <Content Include="Test Resources\C101.txt">
     498      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     499    </Content>
     500    <Content Include="Test Resources\co2.txt">
     501      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    503502    </Content>
    504503  </ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.