Changeset 9718


Ignore:
Timestamp:
07/17/13 21:43:30 (6 years ago)
Author:
abeham
Message:

#1961: Integrated branch into trunk

Files:
4 deleted
5 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3.sln

    r9323 r9718  
    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}
     
    378379EndProject
    379380Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ParallelEngine.Views", "HeuristicLab.ParallelEngine.Views\3.3\HeuristicLab.ParallelEngine.Views.csproj", "{D34A7620-3E23-40D9-8647-637BE901F271}"
     381EndProject
     382Project("{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}"
    380383EndProject
    381384Global
     
    18411844    {D34A7620-3E23-40D9-8647-637BE901F271}.Release|x86.ActiveCfg = Release|x86
    18421845    {D34A7620-3E23-40D9-8647-637BE901F271}.Release|x86.Build.0 = Release|x86
     1846    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1847    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1848    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|x64.ActiveCfg = Debug|x64
     1849    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|x64.Build.0 = Debug|x64
     1850    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|x86.ActiveCfg = Debug|x86
     1851    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Debug|x86.Build.0 = Debug|x86
     1852    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1853    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|Any CPU.Build.0 = Release|Any CPU
     1854    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|x64.ActiveCfg = Release|x64
     1855    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|x64.Build.0 = Release|x64
     1856    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|x86.ActiveCfg = Release|x86
     1857    {5E516C4F-9935-437F-8B15-ECEF4451744E}.Release|x86.Build.0 = Release|x86
    18431858  EndGlobalSection
    18441859  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.Algorithms.CMAEvolutionStrategy

    • Property svn:ignore set to
      bin
  • trunk/sources/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3

    • Property svn:ignore
      •  

        old new  
         1*.DotSettings
        12*.user
         3Plugin.cs
        24obj
        3 Plugin.cs
  • trunk/sources/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/HeuristicLab.Algorithms.CMAEvolutionStrategy-3.3.csproj

    r9709 r9718  
    66    <ProductVersion>9.0.30729</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
    8     <ProjectGuid>{E0B45023-CB84-48A1-A1B7-8295B64B7BAD}</ProjectGuid>
     8    <ProjectGuid>{5E516C4F-9935-437F-8B15-ECEF4451744E}</ProjectGuid>
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
     
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     43    <OutputPath>.\..\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
     
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     52    <OutputPath>..\..\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
     
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     60    <OutputPath>.\..\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
     
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    68     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     68    <OutputPath>.\..\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
     
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     78    <OutputPath>.\..\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
     
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    86     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     86    <OutputPath>.\..\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
     
    9393  </PropertyGroup>
    9494  <ItemGroup>
    95     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    96       <SpecificVersion>False</SpecificVersion>
    97       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    98       <Private>False</Private>
    99     </Reference>
    100     <Reference Include="HeuristicLab.Collections-3.3">
    101       <SpecificVersion>False</SpecificVersion>
    102       <HintPath>..\..\..\..\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    103       <Private>False</Private>
    104     </Reference>
    105     <Reference Include="HeuristicLab.Common-3.3">
    106       <SpecificVersion>False</SpecificVersion>
    107       <HintPath>..\..\..\..\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    108       <Private>False</Private>
    109     </Reference>
    110     <Reference Include="HeuristicLab.Core-3.3">
    111       <SpecificVersion>False</SpecificVersion>
    112       <HintPath>..\..\..\..\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    113       <Private>False</Private>
    114     </Reference>
    115     <Reference Include="HeuristicLab.Data-3.3">
    116       <SpecificVersion>False</SpecificVersion>
    117       <HintPath>..\..\..\..\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    118       <Private>False</Private>
    119     </Reference>
    120     <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    121       <SpecificVersion>False</SpecificVersion>
    122       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
    123       <Private>False</Private>
    124     </Reference>
    125     <Reference Include="HeuristicLab.Operators-3.3">
    126       <SpecificVersion>False</SpecificVersion>
    127       <HintPath>..\..\..\..\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    128       <Private>False</Private>
    129     </Reference>
    130     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    131       <SpecificVersion>False</SpecificVersion>
    132       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    133       <Private>False</Private>
    134     </Reference>
    135     <Reference Include="HeuristicLab.Optimization.Operators-3.3">
    136       <SpecificVersion>False</SpecificVersion>
    137       <HintPath>..\..\..\..\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
    138       <Private>False</Private>
    139     </Reference>
    140     <Reference Include="HeuristicLab.Parameters-3.3">
    141       <SpecificVersion>False</SpecificVersion>
    142       <HintPath>..\..\..\..\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    143       <Private>False</Private>
    144     </Reference>
    145     <Reference Include="HeuristicLab.Persistence-3.3">
    146       <SpecificVersion>False</SpecificVersion>
    147       <HintPath>..\..\..\..\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    148       <Private>False</Private>
    149     </Reference>
    150     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    151       <SpecificVersion>False</SpecificVersion>
    152       <HintPath>..\..\..\..\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    153       <Private>False</Private>
    154     </Reference>
    155     <Reference Include="HeuristicLab.Random-3.3">
    156       <SpecificVersion>False</SpecificVersion>
    157       <HintPath>..\..\..\..\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
    158       <Private>False</Private>
    159     </Reference>
    160     <Reference Include="HeuristicLab.Selection-3.3">
    161       <SpecificVersion>False</SpecificVersion>
    162       <HintPath>..\..\..\..\sources\bin\HeuristicLab.Selection-3.3.dll</HintPath>
    163       <Private>False</Private>
    164     </Reference>
    16595    <Reference Include="System" />
    16696    <Reference Include="System.Core">
     
    217147      <Install>true</Install>
    218148    </BootstrapperPackage>
     149  </ItemGroup>
     150  <ItemGroup>
     151    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     152      <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
     153      <Name>HeuristicLab.Analysis-3.3</Name>
     154      <Private>False</Private>
     155    </ProjectReference>
     156    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     157      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
     158      <Name>HeuristicLab.Collections-3.3</Name>
     159      <Private>False</Private>
     160    </ProjectReference>
     161    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     162      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
     163      <Name>HeuristicLab.Common-3.3</Name>
     164      <Private>False</Private>
     165    </ProjectReference>
     166    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     167      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
     168      <Name>HeuristicLab.Core-3.3</Name>
     169      <Private>False</Private>
     170    </ProjectReference>
     171    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     172      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
     173      <Name>HeuristicLab.Data-3.3</Name>
     174      <Private>False</Private>
     175    </ProjectReference>
     176    <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
     177      <Project>{bb6d334a-4bb6-4674-9883-31a6ebb32cab}</Project>
     178      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
     179      <Private>False</Private>
     180    </ProjectReference>
     181    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     182      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
     183      <Name>HeuristicLab.Operators-3.3</Name>
     184      <Private>False</Private>
     185    </ProjectReference>
     186    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     187      <Project>{25087811-f74c-4128-bc86-8324271da13e}</Project>
     188      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     189      <Private>False</Private>
     190    </ProjectReference>
     191    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     192      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
     193      <Name>HeuristicLab.Optimization-3.3</Name>
     194      <Private>False</Private>
     195    </ProjectReference>
     196    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     197      <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
     198      <Name>HeuristicLab.Parameters-3.3</Name>
     199      <Private>False</Private>
     200    </ProjectReference>
     201    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     202      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
     203      <Name>HeuristicLab.Persistence-3.3</Name>
     204      <Private>False</Private>
     205    </ProjectReference>
     206    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     207      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     208      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     209      <Private>False</Private>
     210    </ProjectReference>
     211    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     212      <Project>{f4539fb6-4708-40c9-be64-0a1390aea197}</Project>
     213      <Name>HeuristicLab.Random-3.3</Name>
     214      <Private>False</Private>
     215    </ProjectReference>
     216    <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
     217      <Project>{2c36cd4f-e5f5-43a4-801a-201ea895fe17}</Project>
     218      <Name>HeuristicLab.Selection-3.3</Name>
     219      <Private>False</Private>
     220    </ProjectReference>
    219221  </ItemGroup>
    220222  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • trunk/sources/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/Plugin.cs.frame

    r9709 r9718  
    4040  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    4141  [PluginDependency("HeuristicLab.Random", "3.3")]
     42  [PluginDependency("HeuristicLab.Selection", "3.3")]
    4243  public class HeuristicLabAlgorithmsCMAEvolutionStrategyPlugin : PluginBase {
    4344  }
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r9288 r9718  
    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.