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

Timestamp:

04/28/08 21:35:23 (17 years ago)

Author:

gkronber

Message:

bug fixes in struct-id operators

File:

• trunk/sources/HeuristicLab.StructureIdentification/Manipulation/ChangeNodeTypeManipulation.cs (modified) (4 diffs)

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

@@ -156 +156 @@
       int maxArity;
       // create a new tree-node for a randomly selected function
-      IFunctionTree newTree = allowedFunctions[random.Next(allowedFunctions.Count)].GetTreeNode();
-      gardener.GetMinMaxArity(newTree.Function, out minArity, out maxArity);
+      IFunction selectedFunction = allowedFunctions[random.Next(allowedFunctions.Count)];
+      gardener.GetMinMaxArity(selectedFunction, 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
       if (actualArity > maxArity)
@@ -165 +165 @@
       // create a list that holds old sub-trees that we can reuse in the new tree
       List<IFunctionTree> availableSubTrees = new List<IFunctionTree>(child.SubTrees);
-      List<IFunctionTree> freshSubTrees = new List<IFunctionTree>() { newTree };
+      List<IFunctionTree> freshSubTrees = new List<IFunctionTree>();
+      IFunctionTree newTree = selectedFunction.GetTreeNode();
       // randomly select the sub-trees that we keep
       for (int i = 0; i < actualArity; i++) {
@@ -172 +173 @@
         // then use a random existing sub-tree. When there are no existing sub-trees
         // that fit in the given slot then create a new random tree and use it for the slot
-        ICollection<IFunction> allowedSubFunctions = gardener.GetAllowedSubFunctions(newTree.Function, i);
+        ICollection<IFunction> allowedSubFunctions = gardener.GetAllowedSubFunctions(selectedFunction, i);
         var matchingSubTrees = availableSubTrees.Where(subTree => allowedSubFunctions.Contains(subTree.Function));
         if (matchingSubTrees.Count() > 0) {
@@ -186 +187 @@
         }
       }
+      freshSubTrees.Add(newTree);
       uninitializedBranches = freshSubTrees;
       return newTree;