Changeset 3873 for branches/3.2/sources/HeuristicLab.GP.Operators/3.3/Manipulation/DeleteSubTreeManipulation.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/DeleteSubTreeManipulation.cs (modified) (2 diffs)

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

@@ -65 +65 @@
 
         Debug.Assert(gardener.IsValidTree(gpModel.FunctionTree));
-        // recalculate size and height
-        gpModel.Size = gpModel.FunctionTree.GetSize();
-        gpModel.Height = gpModel.FunctionTree.GetHeight();
         // root hasn't changed so don't need to update 'FunctionTree' variable
         return null;
@@ -77 +74 @@
         parent.InsertSubTree(childIndex, newFunctionTree);
         Debug.Assert(gardener.IsValidTree(gpModel.FunctionTree));
-        // recalculate size and height
-        gpModel.Size = gpModel.FunctionTree.GetSize();
-        gpModel.Height = gpModel.FunctionTree.GetHeight();
         // return an initialization operation for the newly created tree
         return Util.CreateInitializationOperation(TreeGardener.GetAllSubTrees(newFunctionTree), scope);