Changeset 9736


Ignore:
Timestamp:
07/23/13 14:14:31 (6 years ago)
Author:
abeham
Message:

#1961: Merged CMA-ES into stable branch

Location:
stable
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab 3.3.sln

    r9501 r9736  
    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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96396439-A764-4022-A8D2-BE021449B8D1}"
    55  ProjectSection(SolutionItems) = preProject
     
    5555    {78763A4E-E163-48C2-98EB-709760D06F25} = {78763A4E-E163-48C2-98EB-709760D06F25}
    5656    {94C7714E-29D4-4D6D-B213-2C18D627AB75} = {94C7714E-29D4-4D6D-B213-2C18D627AB75}
     57    {5E516C4F-9935-437F-8B15-ECEF4451744E} = {5E516C4F-9935-437F-8B15-ECEF4451744E}
    5758    {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B} = {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B}
    5859    {2C36CD4F-E5F5-43A4-801A-201EA895FE17} = {2C36CD4F-E5F5-43A4-801A-201EA895FE17}
     
    375376EndProject
    376377Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ParallelEngine.Views", "HeuristicLab.ParallelEngine.Views\3.3\HeuristicLab.ParallelEngine.Views.csproj", "{D34A7620-3E23-40D9-8647-637BE901F271}"
     378EndProject
     379Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.CMAEvolutionStrategy-3.3", "HeuristicLab.Algorithms.CMAEvolutionStrategy\3.3\HeuristicLab.Algorithms.CMAEvolutionStrategy-3.3.csproj", "{5E516C4F-9935-437F-8B15-ECEF4451744E}"
    377380EndProject
    378381Global
     
    18261829    {D34A7620-3E23-40D9-8647-637BE901F271}.Release|x86.ActiveCfg = Release|x86
    18271830    {D34A7620-3E23-40D9-8647-637BE901F271}.Release|x86.Build.0 = Release|x86
     1831    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1832    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1833    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|x64.ActiveCfg = Debug|x64
     1834    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|x64.Build.0 = Debug|x64
     1835    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|x86.ActiveCfg = Debug|x86
     1836    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|x86.Build.0 = Debug|x86
     1837    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1838    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|Any CPU.Build.0 = Release|Any CPU
     1839    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|x64.ActiveCfg = Release|x64
     1840    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|x64.Build.0 = Release|x64
     1841    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|x86.ActiveCfg = Release|x86
     1842    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|x86.Build.0 = Release|x86
    18281843  EndGlobalSection
    18291844  GlobalSection(SolutionProperties) = preSolution
  • stable/HeuristicLab.Tests

  • stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r9288 r9736  
    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    </Reference>
     107    <Reference Include="HeuristicLab.Algorithms.CMAEvolutionStrategy-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     108      <SpecificVersion>False</SpecificVersion>
     109      <HintPath>..\bin\HeuristicLab.Algorithms.CMAEvolutionStrategy-3.3.dll</HintPath>
    106110    </Reference>
    107111    <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
Note: See TracChangeset for help on using the changeset viewer.