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

Timestamp:

04/24/08 14:29:31 (16 years ago)

Author:

gkronber

Message:

• minor refactoring of TreeGardener
• added descriptive comments for tree-creation methods

File:

• trunk/sources/HeuristicLab.StructureIdentification/Manipulation/ChangeNodeTypeManipulation.cs (modified) (1 diff)

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

@@ -128 +128 @@
 
     private IFunctionTree ChangeTerminalType(IFunctionTree parent, IFunctionTree child, int childIndex, TreeGardener gardener, MersenneTwister random) {
-      IList<IFunction> allowedChildren;
+      IList<IFunction> allowedTerminals;
       if (parent == null) {
-        allowedChildren = gardener.Terminals;
+        allowedTerminals = gardener.Terminals;
       } else {
-        allowedChildren = new List<IFunction>();
+        allowedTerminals = new List<IFunction>();
         var allAllowedChildren = gardener.GetAllowedSubFunctions(parent.Function, childIndex);
         foreach(IFunction c in allAllowedChildren) {
-          if(gardener.IsTerminal(c)) allowedChildren.Add(c);
+          if(gardener.IsTerminal(c)) allowedTerminals.Add(c);
         }
       }
       // selecting from the terminals should always work since the current child was also a terminal
       // so in the worst case we will just create a new terminal of the same type again.
-      return gardener.CreateRandomTree(allowedChildren[random.Next(allowedChildren.Count)], 1, 1, false);
+      return gardener.CreateRandomTree(allowedTerminals, 1, 1);
     }