Changeset 148 for branches/FunctionsAndStructIdRefactoring

Timestamp:

04/22/08 11:17:08 (17 years ago)

Author:

gkronber

Message:

fixed bugs in struct-id operators (ticket #112)

Location:

branches/FunctionsAndStructIdRefactoring/HeuristicLab.StructureIdentification

Files:

• Manipulation/CutOutNodeManipulation.cs (modified) (1 diff)
• TreeGardener.cs (modified) (1 diff)

branches/FunctionsAndStructIdRefactoring/HeuristicLab.StructureIdentification/Manipulation/CutOutNodeManipulation.cs

@@ -120 +120 @@
 
       // match the sub-trees of the child with the allowed sub-trees of the parent
-      IFunction[] possibleChilds = gardener.GetAllowedSubFunctions(parent.Function, childIndex).SelectMany(allowedFun => child.SubTrees
-        .Where(subTree => allowedFun == subTree.Function)).Select(t=>t.Function).ToArray(); // Actually we should probably use OperatorEqualityComparer here (gkronber 21.04.08)
+      IFunctionTree[] possibleChilds = gardener.GetAllowedSubFunctions(parent.Function, childIndex).SelectMany(allowedFun => child.SubTrees
+        .Where(subTree => allowedFun == subTree.Function)).ToArray(); // Actually we should probably use OperatorEqualityComparer here (gkronber 21.04.08)
 
       if (possibleChilds.Length > 0) {
         // replace child with a random child of the child
         // make a clone to simplify removing obsolete branches from the function-tree
-        IFunction selectedChild = possibleChilds[random.Next(possibleChilds.Length)];        
+        IFunctionTree selectedChild = possibleChilds[random.Next(possibleChilds.Length)];        
         parent.RemoveSubTree(childIndex);
-        parent.InsertSubTree(childIndex, new FunctionTree(selectedChild));
+        parent.InsertSubTree(childIndex, selectedChild);
 
         if (!gardener.IsValidTree(root)) {

branches/FunctionsAndStructIdRefactoring/HeuristicLab.StructureIdentification/TreeGardener.cs

@@ -329 +329 @@
           int max = ((NumberOfSubOperatorsConstraint)constraint).MaxOperators.Data;
           int min = ((NumberOfSubOperatorsConstraint)constraint).MinOperators.Data;
-          if(tree.SubTrees.Count < min || tree.SubTrees.Count > max) return false;
+          if(tree.SubTrees.Count < min || tree.SubTrees.Count > max) 
+            return false;
         }
       }