Changeset 449 for trunk

Timestamp:

08/05/08 15:40:29 (16 years ago)

Author:

gkronber

Message:

Use PTC2 random tree creation for all random-tree-creation-needs except for RampedHalfHalf (which uses MakeBalancedTree and MakeUnbalancedTree) (ticket #225)

File:

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

trunk/sources/HeuristicLab.StructureIdentification/TreeGardener.cs

@@ -100 +100 @@
 
     internal IFunctionTree PTC2(IRandom random, int size, int maxDepth) {
+      return PTC2(random, GetRandomRoot(size, maxDepth), size, maxDepth);
+    }
+
+    internal IFunctionTree PTC2(IRandom random, IFunction rootF, int size, int maxDepth) {
       if(size <= 1 || maxDepth <= 1) return RandomSelect(terminals).GetTreeNode();
       List<object[]> list = new List<object[]>();
-      IFunctionTree root = GetRandomRoot(size, maxDepth).GetTreeNode();
+      IFunctionTree root = rootF.GetTreeNode();
 
       int currentSize = 1;
@@ -212 +216 @@
       IFunctionTree root;
       if(balanceTrees) {
-        root = MakeBalancedTree(selectedFunction, maxTreeHeight - 1);
+        root = PTC2(random, selectedFunction, maxTreeSize -1, maxTreeHeight - 1);
       } else {
-        root = MakeUnbalancedTree(selectedFunction, maxTreeHeight - 1);
+        root = PTC2(random, selectedFunction, maxTreeSize - 1, maxTreeHeight - 1);
       }
       return root;