Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/10/14 10:31:41 (10 years ago)
Author:
pfleck
Message:

#2269 Merged trunk. Updated .net version of ALPS plugin.

Location:
branches/ALPS
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/ALPS

  • branches/ALPS/HeuristicLab.Tests

  • branches/ALPS/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r11466 r11677  
    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>
    104     <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     111    <Reference Include="ALGLIB-3.7.0">
    105112      <HintPath>..\bin\ALGLIB-3.7.0.dll</HintPath>
    106113      <Private>False</Private>
    … …  
    122129      <Private>False</Private>
    123130    </Reference>
    124     <Reference Include="HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    125       <SpecificVersion>False</SpecificVersion>
     131    <Reference Include="HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3">
    126132      <HintPath>..\bin\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll</HintPath>
     133      <Private>False</Private>
    127134    </Reference>
    128135    <Reference Include="HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3">
    … …  
    150157      <Private>False</Private>
    151158    </Reference>
    152     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0">
     159    <Reference Include="HeuristicLab.Analysis-3.3">
    153160      <HintPath>..\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    154161      <Private>False</Private>
    … …  
    214221      <Private>False</Private>
    215222    </Reference>
    216     <Reference Include="HeuristicLab.Optimizer-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    217       <SpecificVersion>False</SpecificVersion>
     223    <Reference Include="HeuristicLab.Optimization.Views-3.3">
     224      <HintPath>..\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     225      <Private>False</Private>
     226    </Reference>
     227    <Reference Include="HeuristicLab.Optimizer-3.3">
    218228      <HintPath>..\bin\HeuristicLab.Optimizer-3.3.dll</HintPath>
    219       <Private>True</Private>
     229      <Private>False</Private>
    220230    </Reference>
    221231    <Reference Include="HeuristicLab.ParallelEngine-3.3">
    … …  
    259269      <Private>False</Private>
    260270    </Reference>
    261     <Reference Include="HeuristicLab.Problems.GrammaticalEvolution-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    262       <SpecificVersion>False</SpecificVersion>
     271    <Reference Include="HeuristicLab.Problems.GrammaticalEvolution-3.3">
    263272      <HintPath>..\bin\HeuristicLab.Problems.GrammaticalEvolution-3.3.dll</HintPath>
     273      <Private>False</Private>
    264274    </Reference>
    265275    <Reference Include="HeuristicLab.Problems.Instances-3.3">
    … …  
    327337      <Private>False</Private>
    328338    </Reference>
    329     <Reference Include="HeuristicLab.Scripting-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    330       <SpecificVersion>False</SpecificVersion>
     339    <Reference Include="HeuristicLab.Scripting-3.3">
    331340      <HintPath>..\bin\HeuristicLab.Scripting-3.3.dll</HintPath>
    332341      <Private>False</Private>
    … …  
    338347    <Reference Include="HeuristicLab.SequentialEngine-3.3">
    339348      <HintPath>..\bin\HeuristicLab.SequentialEngine-3.3.dll</HintPath>
     349      <Private>False</Private>
     350    </Reference>
     351    <Reference Include="LibSVM-3.12">
     352      <HintPath>..\bin\LibSVM-3.12.dll</HintPath>
    340353      <Private>False</Private>
    341354    </Reference>
    … …  
    358371  </ItemGroup>
    359372  <ItemGroup>
     373    <Compile Include="AssemblyInitializer.cs" />
    360374    <Compile Include="HeuristicLab-3.3\AlgorithmExtensions.cs" />
    361375    <Compile Include="HeuristicLab-3.3\CloningConstructorTest.cs" />
    … …  
    504518    <Compile Include="HeuristicLab.Problems.VehicleRouting-3.4\VRPInstancesTest.cs" />
    505519    <Compile Include="HeuristicLab.Random-3.3\RandomEnumerableSampleTest.cs" />
    506     <Compile Include="HeuristicLab.Scripting-3.3\GridSearchScriptTest.cs" />
     520    <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GAQAPScriptTest.cs" />
     521    <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GridSearchRFClassificationScriptTest.cs" />
     522    <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GridSearchRFRegressionScriptTest.cs" />
     523    <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GridSearchSVMClassificationScriptTest.cs" />
     524    <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GridSearchSVMRegressionScriptTest.cs" />
     525    <Compile Include="HeuristicLab.Scripting-3.3\ScriptingUtils.cs" />
     526    <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GUIAutomationScriptTest.cs" />
     527    <Compile Include="HeuristicLab.Scripting-3.3\Scripts\OSGARastriginScriptTest.cs" />
    507528    <Compile Include="Properties\AssemblyInfo.cs" />
     529    <Compile Include="Test Resources\Script Sources\GridSearch_RF_Classification_Script.cs">
     530      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     531    </Compile>
     532    <Compile Include="Test Resources\Script Sources\GridSearch_RF_Regression_Script.cs">
     533      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     534    </Compile>
     535    <Compile Include="Test Resources\Script Sources\GridSearch_SVM_Classification_Script.cs">
     536      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     537    </Compile>
     538    <Compile Include="Test Resources\Script Sources\GridSearch_SVM_Regression_Script.cs">
     539      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     540    </Compile>
     541    <Compile Include="Test Resources\Script Sources\GA_QAP_Script.cs">
     542      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     543    </Compile>
     544    <Compile Include="Test Resources\Script Sources\OSGA_Rastrigin_Script.cs">
     545      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     546    </Compile>
     547    <Compile Include="Test Resources\Script Sources\GUI_Automation_Script.cs">
     548      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     549    </Compile>
    508550    <Compile Include="TestRandom.cs" />
    509551  </ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.