Changeset 452 for trunk

Timestamp:

08/05/08 16:51:35 (16 years ago)

Author:

gkronber

Message:

fixed a bug that caused generation of invalid individuals (#225)

File:

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

trunk/sources/HeuristicLab.StructureIdentification/TreeGardener.cs

@@ -104 +104 @@
 
     internal IFunctionTree PTC2(IRandom random, IFunction rootF, int size, int maxDepth) {
-      if(size <= 1 || maxDepth <= 1) return RandomSelect(terminals).GetTreeNode();
+      IFunctionTree root = rootF.GetTreeNode();
+      if(size <= 1 || maxDepth <= 1) return root;
       List<object[]> list = new List<object[]>();
-      IFunctionTree root = rootF.GetTreeNode();
-
       int currentSize = 1;
       int totalListMinSize = 0;
@@ -167 +166 @@
         int d = (int)nextExtension[2];
         parent.RemoveSubTree(a);
-        parent.InsertSubTree(a, CreateRandomTree(GetAllowedSubFunctions(parent.Function, a), 1, 1)); // append a tree with minimal possible height
+        parent.InsertSubTree(a, 
+          CreateRandomTree(GetAllowedSubFunctions(parent.Function, a), 1, 1)); // append a tree with minimal possible height
       }
       return root;
@@ -200 +200 @@
       // build the tree 
       IFunctionTree root;
-      root = PTC2(random, selectedFunction, maxTreeSize - 1, maxTreeHeight - 1);
+      root = PTC2(random, selectedFunction, maxTreeSize, maxTreeHeight);
       return root;
     }