Changeset 289

Timestamp:

06/03/08 17:29:31 (16 years ago)

Author:

gkronber

Message:

• also added code to account for constraints regarding the allowed sub-functions for the clean-up part (where terminals (or if not possible trees of minimal size) are inserted at the open ends. (follow up to r288 and r286)

File:

• trunk/sources/HeuristicLab.StructureIdentification/TreeGardener.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.StructureIdentification/TreeGardener.cs

@@ -128 +128 @@
           parent.InsertSubTree(a, RandomSelect(GetAllowedSubFunctions(parent.Function, a).Where(f => IsTerminal(f)).ToArray()).GetTreeNode());
         } else {
-          IFunction selectedFunction = RandomSelect(GetAllowedSubFunctions(parent.Function, a).Where(f => !IsTerminal(f)).ToArray());
+          IFunction selectedFunction = RandomSelect(GetAllowedSubFunctions(parent.Function, a).Where( 
+            f => !IsTerminal(f) && GetMinimalTreeHeight(f) + (d-1) <= maxDepth).ToArray());
           IFunctionTree newTree = selectedFunction.GetTreeNode();
           parent.RemoveSubTree(a);
@@ -153 +154 @@
         int a = (int)nextExtension[1];
         int d = (int)nextExtension[2];
-        IFunction selectedTerminal = RandomSelect(terminals);
         parent.RemoveSubTree(a);
-        parent.InsertSubTree(a, selectedTerminal.GetTreeNode());
+        parent.InsertSubTree(a, CreateRandomTree(GetAllowedSubFunctions(parent.Function, a), 1, 1)); // append a tree with minimal possible height
       }
       return root;