Changeset 288 for trunk

Timestamp:

06/03/08 17:13:38 (16 years ago)

Author:

gkronber

Message:

added code to account for constraints regarding the set of allowed sub-functions

File:

• trunk/sources/HeuristicLab.StructureIdentification/TreeGardener.cs (modified) (1 diff)

trunk/sources/HeuristicLab.StructureIdentification/TreeGardener.cs

@@ -126 +126 @@
         if(d == maxDepth) {
           parent.RemoveSubTree(a);
-          parent.InsertSubTree(a, RandomSelect(terminals).GetTreeNode());
+          parent.InsertSubTree(a, RandomSelect(GetAllowedSubFunctions(parent.Function, a).Where(f => IsTerminal(f)).ToArray()).GetTreeNode());
         } else {
-          IFunction selectedFunction = RandomSelect(functions);
+          IFunction selectedFunction = RandomSelect(GetAllowedSubFunctions(parent.Function, a).Where(f => !IsTerminal(f)).ToArray());
           IFunctionTree newTree = selectedFunction.GetTreeNode();
           parent.RemoveSubTree(a);