Changeset 526 for trunk/sources/HeuristicLab.StructureIdentification

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

Files:

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

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

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

@@ -214 +214 @@
       IFunctionTree parent = possibleParents.ElementAt(random.Next(possibleParents.Count())).GetTreeNode();
 
-      int minArity;
-      int maxArity;
-      gardener.GetMinMaxArity(parent.Function, out minArity, out maxArity);
-      int nSlots = Math.Max(2, minArity);
+      int nSlots = Math.Max(2, parent.Function.MinArity);
       // determine which slot can take which sub-trees
       List<IFunctionTree>[] slots = new List<IFunctionTree>[nSlots];

trunk/sources/HeuristicLab.StructureIdentification/TreeGardener.cs

@@ -59 +59 @@
       // init functions and terminals based on constraints
       foreach(IFunction fun in funLibrary.Group.Operators) {
-        int maxA, minA;
-        GetMinMaxArity(fun, out minA, out maxA);
-        if(maxA == 0) {
+        if(fun.MaxArity == 0) {
           terminals.Add(fun);
           allFunctions.Add(fun);
@@ -109 +107 @@
       int currentSize = 1;
       int totalListMinSize = 0;
-      int minArity;
-      int maxArity;
-      GetMinMaxArity(root.Function, out minArity, out maxArity);
+      int minArity = root.Function.MinArity;
+      int maxArity = root.Function.MaxArity;
       if(maxArity >= size) {
         maxArity = size;
@@ -145 +142 @@
           totalListMinSize--;
 
-          GetMinMaxArity(selectedFunction, out minArity, out maxArity);
+          minArity = selectedFunction.MinArity;
+          maxArity = selectedFunction.MaxArity;
           if(maxArity >= size) {
             maxArity = size;
@@ -314 +312 @@
 
     private bool IsPossibleParent(IFunction f, List<IFunction> children) {
-      int minArity;
-      int maxArity;
-      GetMinMaxArity(f, out minArity, out maxArity);
-
+      int minArity = f.MinArity;
+      int maxArity = f.MaxArity;
       // note: we can't assume that the operators in the children list have different types!
 
@@ -380 +376 @@
     }
     internal bool IsTerminal(IFunction f) {
-      int minArity;
-      int maxArity;
-      GetMinMaxArity(f, out minArity, out maxArity);
-      return minArity == 0 && maxArity == 0;
+      return f.MinArity == 0 && f.MaxArity == 0;
     }
     internal IList<IFunction> GetAllowedSubFunctions(IFunction f, int index) {
@@ -391 +384 @@
         return f.AllowedSubFunctions(index);
       }
-    }
-    internal void GetMinMaxArity(IFunction f, out int minArity, out int maxArity) {
-      minArity = f.MinArity;
-      maxArity = f.MaxArity;
     }
     #endregion
@@ -414 +403 @@
     private IFunctionTree MakeUnbalancedTree(IFunction parent, int maxTreeHeight) {
       if(maxTreeHeight == 0) return parent.GetTreeNode();
-      int minArity;
-      int maxArity;
-      GetMinMaxArity(parent, out minArity, out maxArity);
+      int minArity = parent.MinArity;
+      int maxArity = parent.MaxArity;
       int actualArity = random.Next(minArity, maxArity + 1);
       if(actualArity > 0) {
@@ -436 +424 @@
     private IFunctionTree MakeBalancedTree(IFunction parent, int maxTreeHeight) {
       if(maxTreeHeight == 0) return parent.GetTreeNode();
-      int minArity;
-      int maxArity;
-      GetMinMaxArity(parent, out minArity, out maxArity);
+      int minArity = parent.MinArity;
+      int maxArity = parent.MaxArity;
       int actualArity = random.Next(minArity, maxArity + 1);
       if(actualArity > 0) {