Changeset 189 for trunk/sources/HeuristicLab.StructureIdentification

Timestamp:

04/25/08 12:13:34 (17 years ago)

Author:

gkronber

Message:

fixed #131

Location:

trunk/sources/HeuristicLab.StructureIdentification

Files:

• Manipulation/ChangeNodeTypeManipulation.cs (modified) (1 diff)
• Recombination/SizeFairCrossOver.cs (modified) (1 diff)
• TreeGardener.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.StructureIdentification/Manipulation/ChangeNodeTypeManipulation.cs

@@ -156 +156 @@
       int maxArity;
       // create a new tree-node for a randomly selected function
-      IFunctionTree newTree = new FunctionTree(allowedFunctions[random.Next(allowedFunctions.Count)]);
+      IFunctionTree newTree = allowedFunctions[random.Next(allowedFunctions.Count)].GetTreeNode();
       gardener.GetMinMaxArity(newTree.Function, out minArity, out maxArity);
       // if the old child had too many sub-trees then the new child should keep as many sub-trees as possible

trunk/sources/HeuristicLab.StructureIdentification/Recombination/SizeFairCrossOver.cs

@@ -223 +223 @@
       if(possibleParents.Count == 0) throw new InvalidProgramException();
       // and select a random one
-      IFunctionTree parent = new FunctionTree(possibleParents.ElementAt(random.Next(possibleParents.Count())));
+      IFunctionTree parent = possibleParents.ElementAt(random.Next(possibleParents.Count())).GetTreeNode();
 
       int minArity;

trunk/sources/HeuristicLab.StructureIdentification/TreeGardener.cs

@@ -141 +141 @@
 
       // build the tree 
-      IFunctionTree root = new FunctionTree(selectedFunction);
+      IFunctionTree root = selectedFunction.GetTreeNode();
       if(balanceTrees) {
         MakeBalancedTree(root, maxTreeSize - 1, maxTreeHeight - 1);
@@ -376 +376 @@
       if(maxTreeHeight == 1 || maxTreeSize == 1) {
         IFunction selectedTerminal = RandomSelect(terminals);
-        return new FunctionTree(selectedTerminal);
+        return selectedTerminal.GetTreeNode();
       } else {
         IFunction[] possibleFunctions = allFunctions.Where(f => GetMinimalTreeHeight(f) <= maxTreeHeight &&
           GetMinimalTreeSize(f) <= maxTreeSize).ToArray();
         IFunction selectedFunction = RandomSelect(possibleFunctions);
-        return new FunctionTree(selectedFunction);
+        return selectedFunction.GetTreeNode();
       }
     }
@@ -400 +400 @@
             GetMinimalTreeSize(f) <= maxSubTreeSize).ToArray();
           IFunction selectedFunction = RandomSelect(possibleFunctions);
-          FunctionTree newSubTree = new FunctionTree(selectedFunction);
+          IFunctionTree newSubTree = selectedFunction.GetTreeNode();
           MakeUnbalancedTree(newSubTree, maxSubTreeSize - 1, maxTreeHeight - 1);
           parent.InsertSubTree(i, newSubTree);
@@ -424 +424 @@
             IFunction[] possibleTerminals = GetAllowedSubFunctions(parent.Function, i).Where(f => IsTerminal(f)).ToArray();
             IFunction selectedTerminal = RandomSelect(possibleTerminals);
-            IFunctionTree newTree = new FunctionTree(selectedTerminal);
+            IFunctionTree newTree = selectedTerminal.GetTreeNode();
             parent.InsertSubTree(i, newTree);
           } else {
@@ -432 +432 @@
               !IsTerminal(f)).ToArray();
             IFunction selectedFunction = RandomSelect(possibleFunctions);
-            FunctionTree newTree = new FunctionTree(selectedFunction);
+            IFunctionTree newTree = selectedFunction.GetTreeNode();
             parent.InsertSubTree(i, newTree);
             MakeBalancedTree(newTree, maxSubTreeSize - 1, maxTreeHeight - 1);