Changeset 1286 for trunk/sources/HeuristicLab.GP

Timestamp:

03/08/09 11:04:49 (15 years ago)

Author:

gkronber

Message:

Adapted GP crossover operators to match the new design for crossover operators. #512 (GP crossover operators should be changed to match the new design of crossover operators (see #475)).

Location:

trunk/sources/HeuristicLab.GP

Files:

• HeuristicLab.GP.csproj (modified) (1 diff)
• Recombination/GPCrossoverBase.cs (modified) (2 diffs)
• Recombination/OnePointCrossOver.cs (modified) (1 diff)
• Recombination/SizeConstrictedGPCrossoverBase.cs (modified) (2 diffs)
• Recombination/SizeFairCrossOver.cs (modified) (2 diffs)
• Recombination/StandardCrossOver.cs (modified) (1 diff)
• Recombination/UniformCrossover.cs (modified) (1 diff)

trunk/sources/HeuristicLab.GP/HeuristicLab.GP.csproj

@@ -123 +123 @@
       <Name>HeuristicLab.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Evolutionary\HeuristicLab.Evolutionary.csproj">
+      <Project>{F5614C53-153C-4A37-A608-121E1C087F07}</Project>
+      <Name>HeuristicLab.Evolutionary</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Operators\HeuristicLab.Operators.csproj">
       <Project>{A9983BA2-B3B2-475E-8E2C-62050B71D1C5}</Project>

trunk/sources/HeuristicLab.GP/Recombination/GPCrossoverBase.cs

@@ -30 +30 @@
 using HeuristicLab.Constraints;
 using System.Diagnostics;
+using HeuristicLab.Evolutionary;
 
 namespace HeuristicLab.GP {
-  public abstract class GPCrossoverBase : OperatorBase {
+  public abstract class GPCrossoverBase : CrossoverBase {
     public GPCrossoverBase()
       : base() {
-      AddVariableInfo(new VariableInfo("Random", "Pseudo random number generator", typeof(MersenneTwister), VariableKind.In));
       AddVariableInfo(new VariableInfo("OperatorLibrary", "The operator library containing all available operators", typeof(GPOperatorLibrary), VariableKind.In));
       AddVariableInfo(new VariableInfo("FunctionTree", "The tree to mutate", typeof(IFunctionTree), VariableKind.In | VariableKind.New));
@@ -42 +42 @@
     }
 
-    public override IOperation Apply(IScope scope) {
-      MersenneTwister random = GetVariableValue<MersenneTwister>("Random", scope, true);
+    internal abstract IFunctionTree Cross(IScope scope, TreeGardener gardener, IRandom random, IFunctionTree tree0, IFunctionTree tree1);
+
+    protected override void Cross(IScope scope, IRandom random) {
       GPOperatorLibrary opLibrary = GetVariableValue<GPOperatorLibrary>("OperatorLibrary", scope, true);
       TreeGardener gardener = new TreeGardener(random, opLibrary);
 
-      if ((scope.SubScopes.Count % 2) != 0)
-        throw new InvalidOperationException("Number of parents is not even");
+      if (scope.SubScopes.Count != 2)
+        throw new InvalidOperationException("Number of parents must be exactly two.");
 
-      int children = scope.SubScopes.Count / 2;
-      for (int i = 0; i < children; i++) {
-        IFunctionTree parent0 = TakeNextParent(scope);
-        IFunctionTree parent1 = TakeNextParent(scope);
+      IFunctionTree parent0 = GetVariableValue<IFunctionTree>("FunctionTree", scope.SubScopes[0], false);
+      IFunctionTree parent1 = GetVariableValue<IFunctionTree>("FunctionTree", scope.SubScopes[1], false);
 
-        // randomly swap parents to remove a possible bias from selection (e.g. when using gender-specific selection)
-        if (random.NextDouble() < 0.5) {
-          IFunctionTree tmp = parent0;
-          parent0 = parent1;
-          parent1 = tmp;
-        }
-
-        IFunctionTree child = Cross(scope, gardener, random, parent0, parent1);
-        Debug.Assert(gardener.IsValidTree(child));
-        IScope childScope = new Scope(i.ToString());
-        childScope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("FunctionTree"), child));
-        childScope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("TreeSize"), new IntData(child.Size)));
-        childScope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("TreeHeight"), new IntData(child.Height)));
-        scope.AddSubScope(childScope);
+      // randomly swap parents to remove a possible bias from selection (e.g. when using gender-specific selection)
+      if (random.NextDouble() < 0.5) {
+        IFunctionTree tmp = parent0;
+        parent0 = parent1;
+        parent1 = tmp;
       }
 
-      return null;
-    }
-
-    internal abstract IFunctionTree Cross(IScope scope, TreeGardener gardener, MersenneTwister random, IFunctionTree tree0, IFunctionTree tree1);
-
-    private IFunctionTree TakeNextParent(IScope scope) {
-      IFunctionTree parent = GetVariableValue<IFunctionTree>("FunctionTree", scope.SubScopes[0], false);
-      scope.RemoveSubScope(scope.SubScopes[0]);
-      return parent;
+      IFunctionTree child = Cross(scope, gardener, random, parent0, parent1);
+      Debug.Assert(gardener.IsValidTree(child));
+      scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("FunctionTree"), child));
+      scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("TreeSize"), new IntData(child.Size)));
+      scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("TreeHeight"), new IntData(child.Height)));
     }
   }

trunk/sources/HeuristicLab.GP/Recombination/OnePointCrossOver.cs

@@ -49 +49 @@
     }
 
-    internal override IFunctionTree Cross(TreeGardener gardener, MersenneTwister random, IFunctionTree tree0, IFunctionTree tree1, int maxTreeSize, int maxTreeHeight) {
+    internal override IFunctionTree Cross(TreeGardener gardener, IRandom random, IFunctionTree tree0, IFunctionTree tree1, int maxTreeSize, int maxTreeHeight) {
       List<CrossoverPoint> allowedCrossOverPoints = new List<CrossoverPoint>();
       GetCrossOverPoints(gardener, tree0, tree1, maxTreeSize - tree0.Size, allowedCrossOverPoints);

trunk/sources/HeuristicLab.GP/Recombination/SizeConstrictedGPCrossoverBase.cs

@@ -42 +42 @@
     }
 
-    internal override IFunctionTree Cross(IScope scope, TreeGardener gardener, MersenneTwister random, IFunctionTree tree0, IFunctionTree tree1) {
+    internal override IFunctionTree Cross(IScope scope, TreeGardener gardener, IRandom random, IFunctionTree tree0, IFunctionTree tree1) {
       int maxTreeHeight = GetVariableValue<IntData>("MaxTreeHeight", scope, true).Data;
       int maxTreeSize = GetVariableValue<IntData>("MaxTreeSize", scope, true).Data;
@@ -62 +62 @@
     }
 
-    internal abstract IFunctionTree Cross(TreeGardener gardener, MersenneTwister random, IFunctionTree tree0, IFunctionTree tree1, int maxTreeSize, int maxTreeHeight);
+    internal abstract IFunctionTree Cross(TreeGardener gardener, IRandom random, IFunctionTree tree0, IFunctionTree tree1, int maxTreeSize, int maxTreeHeight);
 
-    private IFunctionTree TakeNextParent(IScope scope) {
-      IFunctionTree parent = GetVariableValue<IFunctionTree>("FunctionTree", scope.SubScopes[0], false);
-      scope.RemoveSubScope(scope.SubScopes[0]);
-      return parent;
-    }
+    //private IFunctionTree TakeNextParent(IScope scope) {
+    //  IFunctionTree parent = GetVariableValue<IFunctionTree>("FunctionTree", scope.SubScopes[0], false);
+    //  scope.RemoveSubScope(scope.SubScopes[0]);
+    //  return parent;
+    //}
   }
 }

trunk/sources/HeuristicLab.GP/Recombination/SizeFairCrossOver.cs

@@ -47 +47 @@
     }
 
-    internal override IFunctionTree Cross(TreeGardener gardener, MersenneTwister random, IFunctionTree tree0, IFunctionTree tree1, int maxTreeSize, int maxTreeHeight) {
+    internal override IFunctionTree Cross(TreeGardener gardener, IRandom random, IFunctionTree tree0, IFunctionTree tree1, int maxTreeSize, int maxTreeHeight) {
       int tries = 0;
       IFunctionTree insertedBranch = null;
@@ -56 +56 @@
         while (parent == null) parent = gardener.GetRandomParentNode(tree0);
         removedBranchIndex = random.Next(parent.SubTrees.Count);
-        insertedBranch = GetReplacementBranch(random, gardener, tree0, parent, removedBranchIndex, tree1, maxTreeSize, maxTreeHeight);
+        insertedBranch = GetReplacementBranch((MersenneTwister)random, gardener, tree0, parent, removedBranchIndex, tree1, maxTreeSize, maxTreeHeight);
       } while (insertedBranch == null && tries++ < MaxRecombinationTries);
 

trunk/sources/HeuristicLab.GP/Recombination/StandardCrossOver.cs

@@ -44 +44 @@
     }
 
-    internal override IFunctionTree Cross(TreeGardener gardener, MersenneTwister random, IFunctionTree tree0, IFunctionTree tree1, int maxTreeSize, int maxTreeHeight) {
+    internal override IFunctionTree Cross(TreeGardener gardener, IRandom random, IFunctionTree tree0, IFunctionTree tree1, int maxTreeSize, int maxTreeHeight) {
       int tries = 0;
       List<IFunctionTree> allowedCrossoverPoints = null;

trunk/sources/HeuristicLab.GP/Recombination/UniformCrossover.cs

@@ -52 +52 @@
     }
 
-    internal override IFunctionTree Cross(TreeGardener gardener, MersenneTwister random, IFunctionTree tree0, IFunctionTree tree1, int maxTreeSize, int maxTreeHeight) {
+    internal override IFunctionTree Cross(TreeGardener gardener, IRandom random, IFunctionTree tree0, IFunctionTree tree1, int maxTreeSize, int maxTreeHeight) {
       List<CrossoverPoint> allowedCrossOverPoints = new List<CrossoverPoint>();
       GetCrossOverPoints(gardener, tree0, tree1, allowedCrossOverPoints);