Changeset 15178


Ignore:
Timestamp:
07/10/17 16:25:17 (2 weeks ago)
Author:
pfleck
Message:

#2592: Merged from branch to trunk

Location:
trunk/sources
Files:
1 deleted
3 edited
1 copied

Legend:

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

    r15139 r15178  
    22Microsoft Visual Studio Solution File, Format Version 12.00
    33# Visual Studio 15
    4 VisualStudioVersion = 15.0.26430.6
     4VisualStudioVersion = 15.0.26430.15
    55MinimumVisualStudioVersion = 10.0.40219.1
    66Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96396439-A764-4022-A8D2-BE021449B8D1}"
     
    458458EndProject
    459459Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GraphColoring-3.3", "HeuristicLab.Problems.GraphColoring\3.3\HeuristicLab.Problems.GraphColoring-3.3.csproj", "{4B76E2CB-A990-4959-B080-1D81D418D325}"
     460EndProject
     461Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3", "HeuristicLab.Algorithms.MOCMAEvolutionStrategy\3.3\HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3.csproj", "{0E2E224F-E9B2-41F3-B510-09183EEBA2AF}"
    460462EndProject
    461463Global
     
    22332235    {4B76E2CB-A990-4959-B080-1D81D418D325}.Release|x86.ActiveCfg = Release|x86
    22342236    {4B76E2CB-A990-4959-B080-1D81D418D325}.Release|x86.Build.0 = Release|x86
     2237    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2238    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2239    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Debug|x64.ActiveCfg = Debug|x64
     2240    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Debug|x64.Build.0 = Debug|x64
     2241    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Debug|x86.ActiveCfg = Debug|x86
     2242    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Debug|x86.Build.0 = Debug|x86
     2243    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2244    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|Any CPU.Build.0 = Release|Any CPU
     2245    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|x64.ActiveCfg = Release|x64
     2246    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|x64.Build.0 = Release|x64
     2247    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|x86.ActiveCfg = Release|x86
     2248    {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|x86.Build.0 = Release|x86
    22352249  EndGlobalSection
    22362250  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3.csproj

    r15175 r15178  
    1717    <DebugType>full</DebugType>
    1818    <Optimize>false</Optimize>
    19     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     19    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2020    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2121    <ErrorReport>prompt</ErrorReport>
     
    2626    <DebugType>pdbonly</DebugType>
    2727    <Optimize>true</Optimize>
    28     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     28    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2929    <DefineConstants>TRACE</DefineConstants>
    3030    <ErrorReport>prompt</ErrorReport>
     
    3232    <LangVersion>5</LangVersion>
    3333  </PropertyGroup>
     34  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     35    <DebugSymbols>true</DebugSymbols>
     36    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     37    <DefineConstants>DEBUG;TRACE</DefineConstants>
     38    <DebugType>full</DebugType>
     39    <PlatformTarget>x64</PlatformTarget>
     40    <LangVersion>5</LangVersion>
     41    <ErrorReport>prompt</ErrorReport>
     42    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     43  </PropertyGroup>
     44  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     45    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     46    <DefineConstants>TRACE</DefineConstants>
     47    <Optimize>true</Optimize>
     48    <DebugType>pdbonly</DebugType>
     49    <PlatformTarget>x64</PlatformTarget>
     50    <LangVersion>5</LangVersion>
     51    <ErrorReport>prompt</ErrorReport>
     52    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     53  </PropertyGroup>
     54  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     55    <DebugSymbols>true</DebugSymbols>
     56    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     57    <DefineConstants>DEBUG;TRACE</DefineConstants>
     58    <DebugType>full</DebugType>
     59    <PlatformTarget>x86</PlatformTarget>
     60    <LangVersion>5</LangVersion>
     61    <ErrorReport>prompt</ErrorReport>
     62    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     63  </PropertyGroup>
     64  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     65    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     66    <DefineConstants>TRACE</DefineConstants>
     67    <Optimize>true</Optimize>
     68    <DebugType>pdbonly</DebugType>
     69    <PlatformTarget>x86</PlatformTarget>
     70    <LangVersion>5</LangVersion>
     71    <ErrorReport>prompt</ErrorReport>
     72    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     73  </PropertyGroup>
    3474  <ItemGroup>
    3575    <Reference Include="ALGLIB-3.7.0">
    36       <HintPath>..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll</HintPath>
    37       <Private>False</Private>
    38     </Reference>
    39     <Reference Include="HeuristicLab.Analysis-3.3">
    40       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    41       <Private>False</Private>
    42     </Reference>
    43     <Reference Include="HeuristicLab.Collections-3.3">
    44       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    45       <Private>False</Private>
    46     </Reference>
    47     <Reference Include="HeuristicLab.Common-3.3">
    48       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    49       <Private>False</Private>
    50     </Reference>
    51     <Reference Include="HeuristicLab.Core-3.3">
    52       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    53       <Private>False</Private>
    54     </Reference>
    55     <Reference Include="HeuristicLab.Core.Views-3.3">
    56       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
    57       <Private>False</Private>
    58     </Reference>
    59     <Reference Include="HeuristicLab.Data-3.3">
    60       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    61       <Private>False</Private>
    62     </Reference>
    63     <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3">
    64       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
    65       <Private>False</Private>
    66     </Reference>
    67     <Reference Include="HeuristicLab.Operators-3.3">
    68       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    69       <Private>False</Private>
    70     </Reference>
    71     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    72       <SpecificVersion>False</SpecificVersion>
    73       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    74       <Private>False</Private>
    75     </Reference>
    76     <Reference Include="HeuristicLab.Parameters-3.3">
    77       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    78       <Private>False</Private>
    79     </Reference>
    80     <Reference Include="HeuristicLab.Persistence-3.3">
    81       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    82       <Private>False</Private>
    83     </Reference>
    84     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    85       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    86       <Private>False</Private>
    87     </Reference>
    88     <Reference Include="HeuristicLab.Problems.Instances-3.3">
    89       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    90       <Private>False</Private>
    91     </Reference>
    92     <Reference Include="HeuristicLab.Problems.TestFunctions.MultiObjective-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    93       <SpecificVersion>False</SpecificVersion>
    94       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.dll</HintPath>
    95     </Reference>
    96     <Reference Include="HeuristicLab.Random-3.3">
    97       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
     76      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    9877      <Private>False</Private>
    9978    </Reference>
     
    11695    <Compile Include="DoubleMatrixHelper.cs" />
    11796  </ItemGroup>
    118   <ItemGroup />
     97  <ItemGroup>
     98    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     99      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     100      <Name>HeuristicLab.Analysis-3.3</Name>
     101      <Private>False</Private>
     102    </ProjectReference>
     103    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     104      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     105      <Name>HeuristicLab.Collections-3.3</Name>
     106      <Private>False</Private>
     107    </ProjectReference>
     108    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     109      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     110      <Name>HeuristicLab.Common-3.3</Name>
     111      <Private>False</Private>
     112    </ProjectReference>
     113    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     114      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     115      <Name>HeuristicLab.Core-3.3</Name>
     116      <Private>False</Private>
     117    </ProjectReference>
     118    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     119      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     120      <Name>HeuristicLab.Data-3.3</Name>
     121      <Private>False</Private>
     122    </ProjectReference>
     123    <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
     124      <Project>{BB6D334A-4BB6-4674-9883-31A6EBB32CAB}</Project>
     125      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
     126      <Private>False</Private>
     127    </ProjectReference>
     128    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     129      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     130      <Name>HeuristicLab.Optimization-3.3</Name>
     131      <Private>False</Private>
     132    </ProjectReference>
     133    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     134      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     135      <Name>HeuristicLab.Parameters-3.3</Name>
     136      <Private>False</Private>
     137    </ProjectReference>
     138    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     139      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     140      <Name>HeuristicLab.Persistence-3.3</Name>
     141      <Private>False</Private>
     142    </ProjectReference>
     143    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     144      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     145      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     146      <Private>False</Private>
     147    </ProjectReference>
     148    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     149      <Project>{3540e29e-4793-49e7-8ee2-fea7f61c3994}</Project>
     150      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     151      <Private>False</Private>
     152    </ProjectReference>
     153    <ProjectReference Include="..\..\HeuristicLab.Problems.TestFunctions.MultiObjective\3.3\HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj">
     154      <Project>{D53E8E48-CFAA-4F57-AC35-63BEF4476159}</Project>
     155      <Name>HeuristicLab.Problems.TestFunctions.MultiObjective-3.3</Name>
     156      <Private>False</Private>
     157    </ProjectReference>
     158    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     159      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
     160      <Name>HeuristicLab.Random-3.3</Name>
     161      <Private>False</Private>
     162    </ProjectReference>
     163  </ItemGroup>
    119164  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    120165  <PropertyGroup>
  • trunk/sources/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Properties/AssemblyInfo.cs.frame

    r14404 r15178  
    2727// associated with an assembly.
    2828[assembly: AssemblyTitle("HeuristicLab.Algorithms.MOCMAEvolutionStrategy")]
    29 [assembly: AssemblyDescription("HeuristicLab implementation of MOCMA Evolution Strategy (CMA-ES)")]
     29[assembly: AssemblyDescription("HeuristicLab implementation of Multi-Objective CMA Evolution Strategy (MO-CMA-ES)")]
    3030[assembly: AssemblyConfiguration("")]
    3131[assembly: AssemblyCompany("")]
Note: See TracChangeset for help on using the changeset viewer.