Changeset 13164


Ignore:
Timestamp:
11/15/15 17:27:31 (3 years ago)
Author:
gkronber
Message:

#2478: copied selected parts from OSES branch to trunk

Location:
trunk/sources
Files:
9 edited
3 copied

Legend:

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

    r12918 r13164  
    440440EndProject
    441441Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GeneticProgramming.Views-3.3", "HeuristicLab.Problems.GeneticProgramming.Views\3.3\HeuristicLab.Problems.GeneticProgramming.Views-3.3.csproj", "{26349C8D-72A1-4BAE-95A3-14E96A3B4AE8}"
     442EndProject
     443Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3", "HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy\3.3\HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3.csproj", "{1D41EAE6-CC79-41D4-858C-589C4DB5E50D}"
    442444EndProject
    443445Global
     
    21552157    {26349C8D-72A1-4BAE-95A3-14E96A3B4AE8}.Release|x86.ActiveCfg = Release|x86
    21562158    {26349C8D-72A1-4BAE-95A3-14E96A3B4AE8}.Release|x86.Build.0 = Release|x86
     2159    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2160    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2161    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|x64.ActiveCfg = Debug|x64
     2162    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|x64.Build.0 = Debug|x64
     2163    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|x86.ActiveCfg = Debug|x86
     2164    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|x86.Build.0 = Debug|x86
     2165    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2166    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|Any CPU.Build.0 = Release|Any CPU
     2167    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|x64.ActiveCfg = Release|x64
     2168    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|x64.Build.0 = Release|x64
     2169    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|x86.ActiveCfg = Release|x86
     2170    {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|x86.Build.0 = Release|x86
    21572171  EndGlobalSection
    21582172  GlobalSection(SolutionProperties) = preSolution
     
    21642178    {71CDE004-C50F-48DF-858E-AB0AAA3537BC} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    21652179    {5E516C4F-9935-437F-8B15-ECEF4451744E} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
     2180    {7FC70D74-1813-48B7-9CE5-0BD913457579} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    21662181    {0C67A033-F6D9-4237-B3CA-C033A44706BE} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    2167     {7FC70D74-1813-48B7-9CE5-0BD913457579} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    21682182  EndGlobalSection
    21692183EndGlobal
  • trunk/sources/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy/3.3/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3.csproj

    r12968 r13164  
    1111    <RootNamespace>HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
     
    4646    <WarningLevel>4</WarningLevel>
    4747    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     48    <Prefer32Bit>false</Prefer32Bit>
    4849  </PropertyGroup>
    4950  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    5556    <WarningLevel>4</WarningLevel>
    5657    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     58    <Prefer32Bit>false</Prefer32Bit>
    5759  </PropertyGroup>
    5860  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    6466    <ErrorReport>prompt</ErrorReport>
    6567    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     68    <Prefer32Bit>false</Prefer32Bit>
    6669  </PropertyGroup>
    6770  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    7376    <ErrorReport>prompt</ErrorReport>
    7477    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     78    <Prefer32Bit>false</Prefer32Bit>
    7579  </PropertyGroup>
    7680  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     
    8286    <ErrorReport>prompt</ErrorReport>
    8387    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     88    <Prefer32Bit>false</Prefer32Bit>
    8489  </PropertyGroup>
    8590  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     
    9196    <ErrorReport>prompt</ErrorReport>
    9297    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     98    <Prefer32Bit>false</Prefer32Bit>
    9399  </PropertyGroup>
    94100  <ItemGroup>
     
    117123    <None Include="Plugin.cs.frame" />
    118124    <None Include="Properties\AssemblyInfo.cs.frame" />
    119   </ItemGroup>
    120   <ItemGroup>
    121     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    122       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    123       <Name>HeuristicLab.Analysis-3.3</Name>
    124       <Private>False</Private>
    125     </ProjectReference>
    126     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    127       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    128       <Name>HeuristicLab.Collections-3.3</Name>
    129       <Private>False</Private>
    130     </ProjectReference>
    131     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    132       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    133       <Name>HeuristicLab.Common-3.3</Name>
    134       <Private>False</Private>
    135     </ProjectReference>
    136     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    137       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    138       <Name>HeuristicLab.Core-3.3</Name>
    139       <Private>False</Private>
    140     </ProjectReference>
    141     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    142       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    143       <Name>HeuristicLab.Data-3.3</Name>
    144       <Private>False</Private>
    145     </ProjectReference>
    146     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    147       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    148       <Name>HeuristicLab.Operators-3.3</Name>
    149       <Private>False</Private>
    150     </ProjectReference>
    151     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    152       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    153       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    154       <Private>False</Private>
    155     </ProjectReference>
    156     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    157       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    158       <Name>HeuristicLab.Optimization-3.3</Name>
    159       <Private>False</Private>
    160     </ProjectReference>
    161     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    162       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    163       <Name>HeuristicLab.Parameters-3.3</Name>
    164       <Private>False</Private>
    165     </ProjectReference>
    166     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    167       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    168       <Name>HeuristicLab.Persistence-3.3</Name>
    169       <Private>False</Private>
    170     </ProjectReference>
    171     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    172       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    173       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    174       <Private>False</Private>
    175     </ProjectReference>
    176     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    177       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    178       <Name>HeuristicLab.Random-3.3</Name>
    179       <Private>False</Private>
    180     </ProjectReference>
    181     <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
    182       <Project>{2C36CD4F-E5F5-43A4-801A-201EA895FE17}</Project>
    183       <Name>HeuristicLab.Selection-3.3</Name>
    184       <Private>False</Private>
    185     </ProjectReference>
    186125  </ItemGroup>
    187126  <ItemGroup>
     
    201140      <Install>true</Install>
    202141    </BootstrapperPackage>
     142  </ItemGroup>
     143  <ItemGroup>
     144    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     145      <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
     146      <Name>HeuristicLab.Analysis-3.3</Name>
     147      <Private>False</Private>
     148    </ProjectReference>
     149    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     150      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     151      <Name>HeuristicLab.Collections-3.3</Name>
     152      <Private>False</Private>
     153    </ProjectReference>
     154    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     155      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
     156      <Name>HeuristicLab.Common-3.3</Name>
     157      <Private>False</Private>
     158    </ProjectReference>
     159    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     160      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
     161      <Name>HeuristicLab.Core-3.3</Name>
     162      <Private>False</Private>
     163    </ProjectReference>
     164    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     165      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
     166      <Name>HeuristicLab.Data-3.3</Name>
     167      <Private>False</Private>
     168    </ProjectReference>
     169    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     170      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
     171      <Name>HeuristicLab.Operators-3.3</Name>
     172      <Private>False</Private>
     173    </ProjectReference>
     174    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     175      <Project>{25087811-f74c-4128-bc86-8324271da13e}</Project>
     176      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     177      <Private>False</Private>
     178    </ProjectReference>
     179    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     180      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
     181      <Name>HeuristicLab.Optimization-3.3</Name>
     182      <Private>False</Private>
     183    </ProjectReference>
     184    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     185      <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
     186      <Name>HeuristicLab.Parameters-3.3</Name>
     187      <Private>False</Private>
     188    </ProjectReference>
     189    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     190      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
     191      <Name>HeuristicLab.Persistence-3.3</Name>
     192      <Private>False</Private>
     193    </ProjectReference>
     194    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     195      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     196      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     197      <Private>False</Private>
     198    </ProjectReference>
     199    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     200      <Project>{f4539fb6-4708-40c9-be64-0a1390aea197}</Project>
     201      <Name>HeuristicLab.Random-3.3</Name>
     202      <Private>False</Private>
     203    </ProjectReference>
     204    <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">
     205      <Project>{2c36cd4f-e5f5-43a4-801a-201ea895fe17}</Project>
     206      <Name>HeuristicLab.Selection-3.3</Name>
     207      <Private>False</Private>
     208    </ProjectReference>
    203209  </ItemGroup>
    204210  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • trunk/sources/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy/3.3/Plugin.cs.frame

    r12968 r13164  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/sources/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy/3.3/Properties/AssemblyInfo.cs.frame

    r12968 r13164  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    3131[assembly: AssemblyCompany("")]
    3232[assembly: AssemblyProduct("HeuristicLab")]
    33 [assembly: AssemblyCopyright("(c) 2002-2013 HEAL")]
     33[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
    3434[assembly: AssemblyTrademark("")]
    3535[assembly: AssemblyCulture("")]
  • trunk/sources/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy/3.3/WithoutRepeatingBatchedRandomSelector.cs

    r12968 r13164  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • trunk/sources/HeuristicLab.Optimization.Operators/3.3/ChildrenCopyCreator.cs

    r13163 r13164  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
    22 using System;
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Core;
    25 using HeuristicLab.Data;
    2624using HeuristicLab.Operators;
    2725using HeuristicLab.Parameters;
  • trunk/sources/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj

    r11623 r13164  
    115115  </ItemGroup>
    116116  <ItemGroup>
     117    <Compile Include="ChildrenCopyCreator.cs" />
    117118    <Compile Include="ExpressionCalculator.cs" />
    118119    <Compile Include="NoSimilarityCalculator.cs" />
  • trunk/sources/HeuristicLab.Selection/3.3/EvolutionStrategyOffspringSelector.cs

    r13163 r13164  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    161161      } else successfulOffspring = OffspringPopulationWinnersParameter.ActualValue;
    162162
    163       int successfulOffspringNeeded = (int)((successRatio) * populationSize) - (successfulOffspring.Value);
    164163      int successfulOffspringAdded = 0;
    165164
  • trunk/sources/HeuristicLab.Selection/3.3/HeuristicLab.Selection-3.3.csproj

    r11623 r13164  
    119119    <Compile Include="ConditionalSelector.cs" />
    120120    <Compile Include="CrowdedTournamentSelector.cs" />
     121    <Compile Include="EvolutionStrategyOffspringSelector.cs" />
    121122    <Compile Include="GeneralizedRankSelector.cs" />
    122123    <Compile Include="LeftSelector.cs" />
Note: See TracChangeset for help on using the changeset viewer.