Changeset 5367 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Crossovers

Timestamp:

01/24/11 19:04:27 (14 years ago)

Author:

gkronber

Message:

#1136 Fixed test cases for symbolic expression tree encoding operators (+ minor bug fixes in symbolic expression tree operators).

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Crossovers/SubtreeCrossover.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Crossovers/SubtreeCrossover.cs

@@ -74 +74 @@
       List<SymbolicExpressionTreeNode> allowedBranches = new List<SymbolicExpressionTreeNode>();
       parent1.Root.ForEachNodePostfix((n) => {
-        if (n.GetSize() < maxInsertedBranchSize &&
-          n.GetHeight() < maxInsertedBranchHeight &&
+        if (n.GetSize() <= maxInsertedBranchSize &&
+          n.GetHeight() <= maxInsertedBranchHeight &&
           IsMatchingPointType(crossoverPoint0, replacedSubtreeIndex, n))
           allowedBranches.Add(n);
@@ -117 +117 @@
       List<CrossoverPoint> leafCrossoverPoints = new List<CrossoverPoint>();
       parent0.Root.ForEachNodePostfix((n) => {
-        if (n.SubTrees.Count > 0 &&
-          n.GetSize() < maxBranchSize &&
-          n.GetHeight() < maxBranchHeight &&
-          n != parent0.Root
-          ) {
+        if (n.SubTrees.Count > 0 && n != parent0.Root) {
           foreach (var child in n.SubTrees) {
-            if (child.SubTrees.Count > 0)
-              internalCrossoverPoints.Add(new CrossoverPoint(n, child));
-            else
-              leafCrossoverPoints.Add(new CrossoverPoint(n, child));
+            if (child.GetSize() <= maxBranchSize &&
+                child.GetHeight() <= maxBranchHeight) {
+              if (child.SubTrees.Count > 0)
+                internalCrossoverPoints.Add(new CrossoverPoint(n, child));
+              else
+                leafCrossoverPoints.Add(new CrossoverPoint(n, child));
+            }
           }
         }
       });
+
       if (random.NextDouble() < internalNodeProbability) {
         // select from internal node if possible