Changeset 3873 for branches/3.2/sources/HeuristicLab.GP.Operators/3.3/Manipulation/CutOutNodeManipulation.cs

Timestamp:

05/31/10 08:31:29 (14 years ago)

Author:

gkronber

Message:

Removed fields for tree size and tree height in GeneticProgrammingModel instead iterate through the tree to determine the size/height whenever it is needed. #1025 (Incorrect size/height values for trees)

File:

• branches/3.2/sources/HeuristicLab.GP.Operators/3.3/Manipulation/CutOutNodeManipulation.cs (modified) (2 diffs)

branches/3.2/sources/HeuristicLab.GP.Operators/3.3/Manipulation/CutOutNodeManipulation.cs

@@ -84 +84 @@
         parent.InsertSubTree(childIndex, selectedChild);
         Debug.Assert(gardener.IsValidTree(gpModel.FunctionTree));
-        // recalculate the size and height of our tree
-        gpModel.Size = gpModel.FunctionTree.GetSize();
-        gpModel.Height = gpModel.FunctionTree.GetHeight();
         // don't need to schedule initialization operations
         return null;
@@ -101 +98 @@
         parent.InsertSubTree(childIndex, newFunctionTree);
         Debug.Assert(gardener.IsValidTree(gpModel.FunctionTree));
-        // recalculate size and height
-        gpModel.Size = gpModel.FunctionTree.GetSize();
-        gpModel.Height = gpModel.FunctionTree.GetHeight();
         // schedule an initialization operation for the new function-tree
         return Util.CreateInitializationOperation(TreeGardener.GetAllSubTrees(newFunctionTree), scope);