Changeset 13293 for stable/HeuristicLab.Tests

Timestamp:

11/19/15 13:29:26 (8 years ago)

Author:

gkronber

Message:

#2478 reverse merge of r13292

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/OSESGriewankSampleTest.cs (deleted)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/SamplesUtils.cs (modified) (3 diffs)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (2 diffs)

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

@@ -5 +5 @@
 using HeuristicLab.Algorithms.EvolutionStrategy;
 using HeuristicLab.Algorithms.GeneticAlgorithm;
-using HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy;
 using HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm;
 using HeuristicLab.Data;
@@ -72 +71 @@
     }
 
-    public static void ConfigureOffspringSelectionEvolutionStrategyParameters<R, M, SC, SR, SM>(OffspringSelectionEvolutionStrategy es, int popSize,
-      double successRatio, double comparisonFactor, double maxSelPres, int parentsPerChild, int maxGens, bool plusSelection)
-      where R : ICrossover
-      where M : IManipulator
-      where SC : IStrategyParameterCreator
-      where SR : IStrategyParameterCrossover
-      where SM : IStrategyParameterManipulator {
-      es.PopulationSize.Value = popSize;
-      es.ComparisonFactor.Value = comparisonFactor;
-      es.SuccessRatio.Value = successRatio;
-      es.MaximumSelectionPressure.Value = maxSelPres;
-      es.ParentsPerChild.Value = parentsPerChild;
-      es.SelectedParents.Value = popSize * parentsPerChild;
-      es.MaximumGenerations.Value = maxGens;
-      es.PlusSelection.Value = false;
-
-      es.Seed.Value = 0;
-      es.SetSeedRandomly.Value = true;
-
-      es.Recombinator = es.RecombinatorParameter.ValidValues
-        .OfType<R>()
-        .Single();
-
-      es.Mutator = es.MutatorParameter.ValidValues
-        .OfType<M>()
-        .Single();
-
-      es.StrategyParameterCreator = es.StrategyParameterCreatorParameter.ValidValues
-        .OfType<SC>()
-        .Single();
-      es.StrategyParameterCrossover = es.StrategyParameterCrossoverParameter.ValidValues
-        .OfType<SR>()
-        .Single();
-      es.StrategyParameterManipulator = es.StrategyParameterManipulatorParameter.ValidValues
-        .OfType<SM>()
-        .Single();
-      es.Engine = new ParallelEngine.ParallelEngine();
-    }
-
     public static void ConfigureGeneticAlgorithmParameters<S, C, M>(GeneticAlgorithm ga, int popSize, int elites, int maxGens, double mutationRate, int tournGroupSize = 0)
       where S : ISelector
@@ -234 +194 @@
 
       ga.MaximumGenerations = maxGens;
-
+      
       ga.Engine = new ParallelEngine.ParallelEngine();
     }

stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -131 +131 @@
     <Reference Include="HeuristicLab.Algorithms.LocalSearch-3.3">
       <HintPath>..\bin\HeuristicLab.Algorithms.LocalSearch-3.3.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
-      <HintPath>..\bin\HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -440 +436 @@
     <Compile Include="HeuristicLab-3.3\PluginLoader.cs" />
     <Compile Include="HeuristicLab-3.3\Samples\AlpsSampleTest.cs" />
-    <Compile Include="HeuristicLab-3.3\Samples\OSESGriewankSampleTest.cs" />
     <Compile Include="HeuristicLab-3.3\Samples\GAGroupingProblemSampleTest.cs" />
     <Compile Include="HeuristicLab-3.3\Samples\VnsOpSampleTest.cs" />