Changeset 1286 for trunk/sources/HeuristicLab.GP/Recombination/SizeConstrictedGPCrossoverBase.cs

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)).

File:

• trunk/sources/HeuristicLab.GP/Recombination/SizeConstrictedGPCrossoverBase.cs (modified) (2 diffs)

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;
+    //}
   }
 }