Changeset 13293


Ignore:
Timestamp:
11/19/15 13:29:26 (3 years ago)
Author:
gkronber
Message:

#2478 reverse merge of r13292

Location:
stable
Files:
4 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab 3.3.sln

    r13292 r13293  
    442442EndProject
    443443Project("{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}"
    444 EndProject
    445 Project("{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}"
    446444EndProject
    447445Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.ALPS-3.3", "HeuristicLab.Algorithms.ALPS\3.3\HeuristicLab.Algorithms.ALPS-3.3.csproj", "{59F354CB-FE13-4253-AED2-AD86372BEC27}"
     
    21492147    {26349C8D-72A1-4BAE-95A3-14E96A3B4AE8}.Release|x86.ActiveCfg = Release|x86
    21502148    {26349C8D-72A1-4BAE-95A3-14E96A3B4AE8}.Release|x86.Build.0 = Release|x86
    2151     {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    2152     {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|Any CPU.Build.0 = Debug|Any CPU
    2153     {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|x64.ActiveCfg = Debug|x64
    2154     {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|x64.Build.0 = Debug|x64
    2155     {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|x86.ActiveCfg = Debug|x86
    2156     {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Debug|x86.Build.0 = Debug|x86
    2157     {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|Any CPU.ActiveCfg = Release|Any CPU
    2158     {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|Any CPU.Build.0 = Release|Any CPU
    2159     {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|x64.ActiveCfg = Release|x64
    2160     {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|x64.Build.0 = Release|x64
    2161     {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|x86.ActiveCfg = Release|x86
    2162     {1D41EAE6-CC79-41D4-858C-589C4DB5E50D}.Release|x86.Build.0 = Release|x86
    21632149    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    21642150    {59F354CB-FE13-4253-AED2-AD86372BEC27}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    21832169    {71CDE004-C50F-48DF-858E-AB0AAA3537BC} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    21842170    {5E516C4F-9935-437F-8B15-ECEF4451744E} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
     2171    {0C67A033-F6D9-4237-B3CA-C033A44706BE} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    21852172    {7FC70D74-1813-48B7-9CE5-0BD913457579} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    2186     {0C67A033-F6D9-4237-B3CA-C033A44706BE} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    21872173  EndGlobalSection
    21882174EndGlobal
  • stable/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj

    r13292 r13293  
    115115  </ItemGroup>
    116116  <ItemGroup>
    117     <Compile Include="ChildrenCopyCreator.cs" />
    118117    <Compile Include="ExpressionCalculator.cs" />
    119118    <Compile Include="NoSimilarityCalculator.cs" />
  • stable/HeuristicLab.Selection/3.3/HeuristicLab.Selection-3.3.csproj

    r13292 r13293  
    119119    <Compile Include="ConditionalSelector.cs" />
    120120    <Compile Include="CrowdedTournamentSelector.cs" />
    121     <Compile Include="EvolutionStrategyOffspringSelector.cs" />
    122121    <Compile Include="GeneralizedRankSelector.cs" />
    123122    <Compile Include="LeftSelector.cs" />
  • stable/HeuristicLab.Tests

  • stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/SamplesUtils.cs

    r13292 r13293  
    55using HeuristicLab.Algorithms.EvolutionStrategy;
    66using HeuristicLab.Algorithms.GeneticAlgorithm;
    7 using HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy;
    87using HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm;
    98using HeuristicLab.Data;
     
    7271    }
    7372
    74     public static void ConfigureOffspringSelectionEvolutionStrategyParameters<R, M, SC, SR, SM>(OffspringSelectionEvolutionStrategy es, int popSize,
    75       double successRatio, double comparisonFactor, double maxSelPres, int parentsPerChild, int maxGens, bool plusSelection)
    76       where R : ICrossover
    77       where M : IManipulator
    78       where SC : IStrategyParameterCreator
    79       where SR : IStrategyParameterCrossover
    80       where SM : IStrategyParameterManipulator {
    81       es.PopulationSize.Value = popSize;
    82       es.ComparisonFactor.Value = comparisonFactor;
    83       es.SuccessRatio.Value = successRatio;
    84       es.MaximumSelectionPressure.Value = maxSelPres;
    85       es.ParentsPerChild.Value = parentsPerChild;
    86       es.SelectedParents.Value = popSize * parentsPerChild;
    87       es.MaximumGenerations.Value = maxGens;
    88       es.PlusSelection.Value = false;
    89 
    90       es.Seed.Value = 0;
    91       es.SetSeedRandomly.Value = true;
    92 
    93       es.Recombinator = es.RecombinatorParameter.ValidValues
    94         .OfType<R>()
    95         .Single();
    96 
    97       es.Mutator = es.MutatorParameter.ValidValues
    98         .OfType<M>()
    99         .Single();
    100 
    101       es.StrategyParameterCreator = es.StrategyParameterCreatorParameter.ValidValues
    102         .OfType<SC>()
    103         .Single();
    104       es.StrategyParameterCrossover = es.StrategyParameterCrossoverParameter.ValidValues
    105         .OfType<SR>()
    106         .Single();
    107       es.StrategyParameterManipulator = es.StrategyParameterManipulatorParameter.ValidValues
    108         .OfType<SM>()
    109         .Single();
    110       es.Engine = new ParallelEngine.ParallelEngine();
    111     }
    112 
    11373    public static void ConfigureGeneticAlgorithmParameters<S, C, M>(GeneticAlgorithm ga, int popSize, int elites, int maxGens, double mutationRate, int tournGroupSize = 0)
    11474      where S : ISelector
     
    234194
    235195      ga.MaximumGenerations = maxGens;
    236 
     196     
    237197      ga.Engine = new ParallelEngine.ParallelEngine();
    238198    }
  • stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r13292 r13293  
    131131    <Reference Include="HeuristicLab.Algorithms.LocalSearch-3.3">
    132132      <HintPath>..\bin\HeuristicLab.Algorithms.LocalSearch-3.3.dll</HintPath>
    133       <Private>False</Private>
    134     </Reference>
    135     <Reference Include="HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    136       <HintPath>..\bin\HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3.dll</HintPath>
    137133      <Private>False</Private>
    138134    </Reference>
     
    440436    <Compile Include="HeuristicLab-3.3\PluginLoader.cs" />
    441437    <Compile Include="HeuristicLab-3.3\Samples\AlpsSampleTest.cs" />
    442     <Compile Include="HeuristicLab-3.3\Samples\OSESGriewankSampleTest.cs" />
    443438    <Compile Include="HeuristicLab-3.3\Samples\GAGroupingProblemSampleTest.cs" />
    444439    <Compile Include="HeuristicLab-3.3\Samples\VnsOpSampleTest.cs" />
Note: See TracChangeset for help on using the changeset viewer.