Changeset 3183 for trunk

Timestamp:

03/22/10 17:04:46 (15 years ago)

Author:

abeham

Message:

Updated evolution strategy to include mutation strength adjustment (doh!) #932
Also added self adaptive crossover

Location:

trunk/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3

Files:

• EvolutionStrategy.cs (modified) (previous)
• EvolutionStrategyMainLoop.cs (modified) (7 diffs)
• HeuristicLab.Algorithms.EvolutionStrategy-3.3.csproj (modified) (1 diff)
• SelfAdaptiveCrossover.cs (added)
• StrategyVectorManipulator.cs (added)
• WithoutRepeatingBatchedRandomSelector.cs (moved) (moved from trunk/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3/WithoutRepeatingRandomSelector.cs)

trunk/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3/EvolutionStrategyMainLoop.cs

@@ -28 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Selection;
+using HeuristicLab.Encodings.RealVectorEncoding;
 
 namespace HeuristicLab.Algorithms.EvolutionStrategy {
@@ -58 +59 @@
       get { return (ValueLookupParameter<IntValue>)Parameters["Children"]; }
     }
+    public ValueLookupParameter<RealVector> StrategyVectorParameter {
+      get { return (ValueLookupParameter<RealVector>)Parameters["StrategyVector"]; }
+    }
     public ValueLookupParameter<DoubleMatrix> StrategyVectorBoundsParameter {
       get { return (ValueLookupParameter<DoubleMatrix>)Parameters["StrategyVectorBounds"]; }
@@ -117 +121 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("Children", "λ (lambda) - the size of the offspring population."));
       Parameters.Add(new ValueLookupParameter<IntValue>("MaximumGenerations", "The maximum number of generations which should be processed."));
+      Parameters.Add(new ValueLookupParameter<RealVector>("StrategyVector", "The strategy vector."));
       Parameters.Add(new LookupParameter<DoubleMatrix>("StrategyVectorBounds", "2 column matrix with one row for each dimension specifying upper and lower bound for the strategy vector. If there are less rows than dimensions, the strategy vector will be read in a cycle."));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("GeneralLearningRate", "τ0 (tau0) - the factor with which adjustments in the strategy vector is dampened over all dimensions. Recommendation is to use 1/Sqrt(2*ProblemDimension)."));
@@ -146 +151 @@
       UniformSequentialSubScopesProcessor uniformSequentialSubScopesProcessor1 = new UniformSequentialSubScopesProcessor();
       Placeholder recombinator = new Placeholder();
+      StrategyVectorManipulator strategyMutator1 = new StrategyVectorManipulator();
       Placeholder mutator1 = new Placeholder();
       Placeholder evaluator1 = new Placeholder();
       SubScopesRemover subScopesRemover = new SubScopesRemover();
       UniformSequentialSubScopesProcessor uniformSequentialSubScopesProcessor2 = new UniformSequentialSubScopesProcessor();
+      StrategyVectorManipulator strategyMutator2 = new StrategyVectorManipulator();
       Placeholder mutator2 = new Placeholder();
       Placeholder evaluator2 = new Placeholder();
@@ -228 +235 @@
       recombinator.OperatorParameter.ActualName = RecombinatorParameter.Name;
 
+      strategyMutator1.StrategyVectorParameter.ActualName = StrategyVectorParameter.Name;
+      strategyMutator1.GeneralLearningRateParameter.ActualName = GeneralLearningRateParameter.Name;
+      strategyMutator1.LearningRateParameter.ActualName = LearningRateParameter.Name;
+      strategyMutator1.RandomParameter.ActualName = RandomParameter.Name;
+
       mutator1.Name = "Mutator (placeholder)";
       mutator1.OperatorParameter.ActualName = MutatorParameter.Name;
@@ -235 +247 @@
 
       subScopesRemover.RemoveAllSubScopes = true;
+
+      strategyMutator2.StrategyVectorParameter.ActualName = StrategyVectorParameter.Name;
+      strategyMutator2.GeneralLearningRateParameter.ActualName = GeneralLearningRateParameter.Name;
+      strategyMutator2.LearningRateParameter.ActualName = LearningRateParameter.Name;
+      strategyMutator2.RandomParameter.ActualName = RandomParameter.Name;
 
       mutator2.Name = "Mutator (placeholder)";
@@ -310 +327 @@
       uniformSequentialSubScopesProcessor1.Operator = recombinator;
       uniformSequentialSubScopesProcessor1.Successor = null;
-      recombinator.Successor = mutator1;
+      recombinator.Successor = strategyMutator1;
+      strategyMutator1.Successor = mutator1;
       mutator1.Successor = evaluator1;
       evaluator1.Successor = subScopesRemover;
       subScopesRemover.Successor = null;
-      uniformSequentialSubScopesProcessor2.Operator = mutator2;
+      uniformSequentialSubScopesProcessor2.Operator = strategyMutator2;
       uniformSequentialSubScopesProcessor2.Successor = null;
+      strategyMutator2.Successor = mutator2;
       mutator2.Successor = evaluator2;
       plusOrCommaReplacementBranch.TrueBranch = plusReplacement;

trunk/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3/HeuristicLab.Algorithms.EvolutionStrategy-3.3.csproj

@@ -84 +84 @@
     <Compile Include="EvolutionStrategy.cs" />
     <Compile Include="EvolutionStrategyMainLoop.cs" />
-    <Compile Include="WithoutRepeatingRandomSelector.cs" />
+    <Compile Include="SelfAdaptiveCrossover.cs" />
+    <Compile Include="StrategyVectorManipulator.cs" />
+    <Compile Include="WithoutRepeatingBatchedRandomSelector.cs" />
   </ItemGroup>
   <ItemGroup>