Changeset 526 for trunk/sources/HeuristicLab.StructureIdentification/Manipulation

Timestamp:

08/20/08 11:06:11 (16 years ago)

Author:

gkronber

Message:

refactoring: removed method GetMinMaxArity in TreeGardener (#263 (List of allowed sub-functions for each function should be cached))

Location:

trunk/sources/HeuristicLab.StructureIdentification/Manipulation

Files:

• ChangeNodeTypeManipulation.cs (modified) (1 diff)
• DeleteSubTreeManipulation.cs (modified) (1 diff)

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

@@ -152 +152 @@
       // try to make a tree with the same arity as the old child.
       int actualArity = child.SubTrees.Count;
-      // arity of the selected operator
-      int minArity;
-      int maxArity;
       // create a new tree-node for a randomly selected function
       IFunction selectedFunction = allowedFunctions[random.Next(allowedFunctions.Count)];
-      gardener.GetMinMaxArity(selectedFunction, out minArity, out maxArity);
+      // arity of the selected operator
+      int minArity = selectedFunction.MinArity;
+      int maxArity = selectedFunction.MaxArity;
       // if the old child had too many sub-trees then the new child should keep as many sub-trees as possible
       if (actualArity > maxArity)

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

@@ -74 +74 @@
       // select a branch to prune
       int childIndex = random.Next(parent.SubTrees.Count);
-      int min;
-      int max;
-      gardener.GetMinMaxArity(parent.Function, out min, out max);
-      if(parent.SubTrees.Count > min) {
+      if(parent.SubTrees.Count > parent.Function.MinArity) {
         parent.RemoveSubTree(childIndex);
         // actually since the next sub-trees are shifted in the place of the removed branch