Changeset 7498

Timestamp:

02/21/12 11:13:16 (13 years ago)

Author:

bburlacu

Message:

#1682: SubtreeCrossover: Minor improvement inside the SelectCrossoverPoint method.

File:

• branches/HeuristicLab.Crossovers/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs (modified) (1 diff)

branches/HeuristicLab.Crossovers/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs

@@ -133 +133 @@
       List<CutPoint> leafCrossoverPoints = new List<CutPoint>();
       parent0.Root.ForEachNodePostfix((n) => {
-        if (n.Subtrees.Any() && n != parent0.Root) {
-          foreach (var child in n.Subtrees) {
-            if (child.GetLength() <= maxBranchLength &&
-                child.GetDepth() <= maxBranchDepth) {
-              if (child.Subtrees.Any())
-                internalCrossoverPoints.Add(new CutPoint(n, child));
-              else
-                leafCrossoverPoints.Add(new CutPoint(n, child));
-            }
+        if (n.Parent != null && n.Parent != parent0.Root) {
+          if (n.GetLength() <= maxBranchLength && n.GetDepth() <= maxBranchDepth) {
+            if (n.SubtreeCount > 0)
+              internalCrossoverPoints.Add(new CutPoint(n.Parent, n));
+            else
+              leafCrossoverPoints.Add(new CutPoint(n.Parent, n));
           }
           // add one additional extension point if the number of sub trees for the symbol is not full