Changeset 9736

Timestamp:

07/23/13 14:14:31 (11 years ago)

Author:

abeham

Message:

#1961: Merged CMA-ES into stable branch

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab 3.3.sln (modified) (4 diffs)
• HeuristicLab.Algorithms.CMAEvolutionStrategy (copied) (copied from trunk/sources/HeuristicLab.Algorithms.CMAEvolutionStrategy)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (1 diff)

stable/HeuristicLab 3.3.sln

@@ -1 +1 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96396439-A764-4022-A8D2-BE021449B8D1}"
   ProjectSection(SolutionItems) = preProject
@@ -55 +55 @@
     {78763A4E-E163-48C2-98EB-709760D06F25} = {78763A4E-E163-48C2-98EB-709760D06F25}
     {94C7714E-29D4-4D6D-B213-2C18D627AB75} = {94C7714E-29D4-4D6D-B213-2C18D627AB75}
+    {5E516C4F-9935-437F-8B15-ECEF4451744E} = {5E516C4F-9935-437F-8B15-ECEF4451744E}
     {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B} = {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B}
     {2C36CD4F-E5F5-43A4-801A-201EA895FE17} = {2C36CD4F-E5F5-43A4-801A-201EA895FE17}
@@ -375 +376 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ParallelEngine.Views", "HeuristicLab.ParallelEngine.Views\3.3\HeuristicLab.ParallelEngine.Views.csproj", "{D34A7620-3E23-40D9-8647-637BE901F271}"
+EndProject
+Project("{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}"
 EndProject
 Global
@@ -1826 +1829 @@
     {D34A7620-3E23-40D9-8647-637BE901F271}.Release|x86.ActiveCfg = Release|x86
     {D34A7620-3E23-40D9-8647-637BE901F271}.Release|x86.Build.0 = Release|x86
+    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|x64.ActiveCfg = Debug|x64
+    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|x64.Build.0 = Debug|x64
+    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|x86.ActiveCfg = Debug|x86
+    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|x86.Build.0 = Debug|x86
+    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|Any CPU.Build.0 = Release|Any CPU
+    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|x64.ActiveCfg = Release|x64
+    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|x64.Build.0 = Release|x64
+    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|x86.ActiveCfg = Release|x86
+    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -104 +104 @@
     <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <HintPath>..\bin\ALGLIB-3.7.0.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Algorithms.CMAEvolutionStrategy-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\bin\HeuristicLab.Algorithms.CMAEvolutionStrategy-3.3.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">