Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/18/15 10:54:32 (10 years ago)
Author:
bburlacu
Message:

#2276: Merged trunk changes.

Location:
branches/HeuristicLab.DatasetRefactor/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.DatasetRefactor/sources

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Tests

  • branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r11514 r12031  
    1212    <RootNamespace>HeuristicLab.Tests</RootNamespace>
    1313    <AssemblyName>HeuristicLab.Tests</AssemblyName>
    14     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     14    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1515    <FileAlignment>512</FileAlignment>
    1616    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     17    <TargetFrameworkProfile />
    1718  </PropertyGroup>
    1819  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    2425    <ErrorReport>prompt</ErrorReport>
    2526    <WarningLevel>4</WarningLevel>
     27    <Prefer32Bit>false</Prefer32Bit>
    2628  </PropertyGroup>
    2729  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    … …  
    3234    <ErrorReport>prompt</ErrorReport>
    3335    <WarningLevel>4</WarningLevel>
     36    <Prefer32Bit>false</Prefer32Bit>
    3437  </PropertyGroup>
    3538  <PropertyGroup>
    … …  
    5457    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    5558    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     59    <Prefer32Bit>false</Prefer32Bit>
    5660  </PropertyGroup>
    5761  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    … …  
    7074    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    7175    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     76    <Prefer32Bit>false</Prefer32Bit>
    7277  </PropertyGroup>
    7378  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    … …  
    8691    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
    8792    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     93    <Prefer32Bit>false</Prefer32Bit>
    8894  </PropertyGroup>
    8995  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    … …  
    100106    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
    101107    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     108    <Prefer32Bit>false</Prefer32Bit>
    102109  </PropertyGroup>
    103110  <ItemGroup>
    … …  
    126133      <Private>False</Private>
    127134    </Reference>
     135    <Reference Include="HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3">
     136      <SpecificVersion>False</SpecificVersion>
     137      <HintPath>..\bin\HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3.dll</HintPath>
     138      <Private>False</Private>
     139    </Reference>
    128140    <Reference Include="HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3">
    129141      <HintPath>..\bin\HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.dll</HintPath>
    … …  
    242254      <Private>False</Private>
    243255    </Reference>
     256    <Reference Include="HeuristicLab.Problems.Binary-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     257      <SpecificVersion>False</SpecificVersion>
     258      <HintPath>..\bin\HeuristicLab.Problems.Binary-3.3.dll</HintPath>
     259      <Private>False</Private>
     260    </Reference>
    244261    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
    245262      <HintPath>..\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    … …  
    262279      <Private>False</Private>
    263280    </Reference>
     281    <Reference Include="HeuristicLab.Problems.ExternalEvaluation-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     282      <SpecificVersion>False</SpecificVersion>
     283      <HintPath>..\bin\HeuristicLab.Problems.ExternalEvaluation-3.4.dll</HintPath>
     284      <Private>False</Private>
     285    </Reference>
     286    <Reference Include="HeuristicLab.Problems.ExternalEvaluation.GP-3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     287      <SpecificVersion>False</SpecificVersion>
     288      <HintPath>..\bin\HeuristicLab.Problems.ExternalEvaluation.GP-3.5.dll</HintPath>
     289      <Private>False</Private>
     290    </Reference>
     291    <Reference Include="HeuristicLab.Problems.ExternalEvaluation.Views-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     292      <SpecificVersion>False</SpecificVersion>
     293      <HintPath>..\bin\HeuristicLab.Problems.ExternalEvaluation.Views-3.4.dll</HintPath>
     294      <Private>False</Private>
     295    </Reference>
    264296    <Reference Include="HeuristicLab.Problems.GrammaticalEvolution-3.3">
    265297      <HintPath>..\bin\HeuristicLab.Problems.GrammaticalEvolution-3.3.dll</HintPath>
    … …  
    304336    <Reference Include="HeuristicLab.Problems.LinearAssignment-3.3">
    305337      <HintPath>..\bin\HeuristicLab.Problems.LinearAssignment-3.3.dll</HintPath>
     338      <Private>False</Private>
     339    </Reference>
     340    <Reference Include="HeuristicLab.Problems.Programmable-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     341      <SpecificVersion>False</SpecificVersion>
     342      <HintPath>..\bin\HeuristicLab.Problems.Programmable-3.3.dll</HintPath>
     343      <Private>False</Private>
     344    </Reference>
     345    <Reference Include="HeuristicLab.Problems.Programmable.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     346      <SpecificVersion>False</SpecificVersion>
     347      <HintPath>..\bin\HeuristicLab.Problems.Programmable.Views-3.3.dll</HintPath>
    306348      <Private>False</Private>
    307349    </Reference>
    … …  
    404446    <Compile Include="HeuristicLab.Algorithms.DataAnalysis-3.4\GaussianProcessFunctionsTest.cs" />
    405447    <Compile Include="HeuristicLab.Algorithms.DataAnalysis-3.4\GaussianProcessRegressionTest.cs" />
     448    <Compile Include="HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3\EnumerableBoolEqualityComparerTest.cs" />
     449    <Compile Include="HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3\LinkageTreeTest.cs" />
     450    <Compile Include="HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3\ParameterlessPopulationPyramidTest.cs" />
     451    <Compile Include="HeuristicLab.Analysis-3.3\BonferroniHolmUnitTests.cs" />
     452    <Compile Include="HeuristicLab.Analysis-3.3\ConfidenceIntervalsTests.cs" />
     453    <Compile Include="HeuristicLab.Analysis-3.3\EffectSizeUnitTests.cs" />
     454    <Compile Include="HeuristicLab.Analysis-3.3\KruskalWallisUnitTests.cs" />
    406455    <Compile Include="HeuristicLab.Analysis-3.3\MultidimensionalScalingTest.cs" />
    407456    <Compile Include="HeuristicLab.Collections-3.3\BidirectionalDictionaryTest.cs" />
    … …  
    481530    <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\OnlineCalculatorPerformanceTest.cs" />
    482531    <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\StatisticCalculatorsTest.cs" />
     532    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs" />
     533    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculatorTest.cs" />
    483534    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4\SymbolicDataAnalysisExpressionTreeInterpreterTest.cs" />
    484535    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4\Util.cs" />
    … …  
    511562    <Compile Include="HeuristicLab.Problems.VehicleRouting-3.4\VRPInstancesTest.cs" />
    512563    <Compile Include="HeuristicLab.Random-3.3\RandomEnumerableSampleTest.cs" />
    513     <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GAQAPScriptTest.cs" />
    514     <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GridSearchRFClassificationScriptTest.cs" />
    515     <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GridSearchRFRegressionScriptTest.cs" />
    516     <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GridSearchSVMClassificationScriptTest.cs" />
    517     <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GridSearchSVMRegressionScriptTest.cs" />
     564    <Compile Include="HeuristicLab.Scripting-3.3\GAQAPScriptTest.cs" />
     565    <Compile Include="HeuristicLab.Scripting-3.3\GridSearchRFClassificationScriptTest.cs" />
     566    <Compile Include="HeuristicLab.Scripting-3.3\GridSearchRFRegressionScriptTest.cs" />
     567    <Compile Include="HeuristicLab.Scripting-3.3\GridSearchSVMClassificationScriptTest.cs" />
     568    <Compile Include="HeuristicLab.Scripting-3.3\GridSearchSVMRegressionScriptTest.cs" />
     569    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\ScriptSources.Designer.cs">
     570      <AutoGen>True</AutoGen>
     571      <DesignTime>True</DesignTime>
     572      <DependentUpon>ScriptSources.resx</DependentUpon>
     573    </Compile>
    518574    <Compile Include="HeuristicLab.Scripting-3.3\ScriptingUtils.cs" />
    519     <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GUIAutomationScriptTest.cs" />
    520     <Compile Include="HeuristicLab.Scripting-3.3\Scripts\OSGARastriginScriptTest.cs" />
     575    <Compile Include="HeuristicLab.Scripting-3.3\GUIAutomationScriptTest.cs" />
     576    <Compile Include="HeuristicLab.Scripting-3.3\OSGARastriginScriptTest.cs" />
    521577    <Compile Include="Properties\AssemblyInfo.cs" />
    522     <Compile Include="Test Resources\Script Sources\GridSearch_RF_Classification_Script.cs">
    523       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    524     </Compile>
    525     <Compile Include="Test Resources\Script Sources\GridSearch_RF_Regression_Script.cs">
    526       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    527     </Compile>
    528     <Compile Include="Test Resources\Script Sources\GridSearch_SVM_Classification_Script.cs">
    529       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    530     </Compile>
    531     <Compile Include="Test Resources\Script Sources\GridSearch_SVM_Regression_Script.cs">
    532       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    533     </Compile>
    534     <Compile Include="Test Resources\Script Sources\GA_QAP_Script.cs">
    535       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    536     </Compile>
    537     <Compile Include="Test Resources\Script Sources\OSGA_Rastrigin_Script.cs">
    538       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    539     </Compile>
    540     <Compile Include="Test Resources\Script Sources\GUI_Automation_Script.cs">
     578    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\GridSearchRFClassificationScriptSource.cs">
     579      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     580    </Compile>
     581    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\GridSearchRFRegressionScriptSource.cs">
     582      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     583    </Compile>
     584    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\GridSearchSVMClassificationScriptSource.cs">
     585      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     586    </Compile>
     587    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\GridSearchSVMRegressionScriptSource.cs">
     588      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     589    </Compile>
     590    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\GAQAPScriptSource.cs">
     591      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     592    </Compile>
     593    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\OSGARastriginScriptSource.cs">
     594      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     595    </Compile>
     596    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\GUIAutomationScriptSource.cs">
    541597      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    542598    </Compile>
    … …  
    581637    </Content>
    582638  </ItemGroup>
    583   <ItemGroup />
     639  <ItemGroup>
     640    <EmbeddedResource Include="HeuristicLab.Scripting-3.3\Script Sources\ScriptSources.resx">
     641      <Generator>ResXFileCodeGenerator</Generator>
     642      <LastGenOutput>ScriptSources.Designer.cs</LastGenOutput>
     643      <CustomToolNamespace>HeuristicLab.Tests</CustomToolNamespace>
     644    </EmbeddedResource>
     645  </ItemGroup>
    584646  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    585647  <!-- 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.