Changeset 5733 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers

Timestamp:

03/17/11 14:07:47 (14 years ago)

Author:

mkommend

Message:

#1418: Corrected problem interfaces & unified naming of subtrees.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs (modified) (8 diffs)

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

@@ -93 +93 @@
 
       // calculate the max length and depth that the inserted branch can have 
-      int maxInsertedBranchLength = maxTreeLength - (parent0.Length - crossoverPoint0.GetSubTree(replacedSubtreeIndex).GetLength());
+      int maxInsertedBranchLength = maxTreeLength - (parent0.Length - crossoverPoint0.GetSubtree(replacedSubtreeIndex).GetLength());
       int maxInsertedBranchDepth = maxTreeDepth - GetBranchLevel(parent0.Root, crossoverPoint0);
 
@@ -111 +111 @@
         // manipulate the tree of parent0 in place
         // replace the branch in tree0 with the selected branch from tree1
-        crossoverPoint0.RemoveSubTree(replacedSubtreeIndex);
-        crossoverPoint0.InsertSubTree(replacedSubtreeIndex, selectedBranch);
+        crossoverPoint0.RemoveSubtree(replacedSubtreeIndex);
+        crossoverPoint0.InsertSubtree(replacedSubtreeIndex, selectedBranch);
         return parent0;
       }
@@ -139 +139 @@
       List<CutPoint> leafCrossoverPoints = new List<CutPoint>();
       parent0.Root.ForEachNodePostfix((n) => {
-        if (n.SubTrees.Any() && n != parent0.Root) {
-          foreach (var child in n.SubTrees) {
+        if (n.Subtrees.Any() && n != parent0.Root) {
+          foreach (var child in n.Subtrees) {
             if (child.GetLength() <= maxBranchLength &&
                 child.GetDepth() <= maxBranchDepth) {
-              if (child.SubTrees.Any())
+              if (child.Subtrees.Any())
                 internalCrossoverPoints.Add(new CutPoint(n, child));
               else
@@ -185 +185 @@
         // select internal node if possible
         allowedInternalBranches = (from branch in branches
-                                   where branch.SubTrees.Any()
+                                   where branch.Subtrees.Any()
                                    select branch).ToList();
         if (allowedInternalBranches.Count > 0) {
@@ -192 +192 @@
           // no internal nodes allowed => select leaf nodes
           allowedLeafBranches = (from branch in branches
-                                 where !branch.SubTrees.Any()
+                                 where !branch.Subtrees.Any()
                                  select branch).ToList();
           return allowedLeafBranches.SelectRandom(random);
@@ -199 +199 @@
         // select leaf node if possible
         allowedLeafBranches = (from branch in branches
-                               where !branch.SubTrees.Any()
+                               where !branch.Subtrees.Any()
                                select branch).ToList();
         if (allowedLeafBranches.Count > 0) {
@@ -205 +205 @@
         } else {
           allowedInternalBranches = (from branch in branches
-                                     where branch.SubTrees.Any()
+                                     where branch.Subtrees.Any()
                                      select branch).ToList();
           return allowedInternalBranches.SelectRandom(random);
@@ -214 +214 @@
     private static int GetBranchLevel(ISymbolicExpressionTreeNode root, ISymbolicExpressionTreeNode point) {
       if (root == point) return 0;
-      foreach (var subtree in root.SubTrees) {
+      foreach (var subtree in root.Subtrees) {
         int branchLevel = GetBranchLevel(subtree, point);
         if (branchLevel < int.MaxValue) return 1 + branchLevel;