Changeset 3873

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)

Location:

branches/3.2/sources

Files:

• HeuristicLab.GP.Interfaces/3.3/IGeneticProgrammingModel.cs (modified) (1 diff)
• HeuristicLab.GP.Operators/3.3/Manipulation/ChangeNodeTypeManipulation.cs (modified) (1 diff)
• HeuristicLab.GP.Operators/3.3/Manipulation/CutOutNodeManipulation.cs (modified) (2 diffs)
• HeuristicLab.GP.Operators/3.3/Manipulation/DeleteSubTreeManipulation.cs (modified) (2 diffs)
• HeuristicLab.GP.Operators/3.3/Manipulation/SubstituteSubTreeManipulation.cs (modified) (1 diff)
• HeuristicLab.GP.Tests/FunctionTreeTest.cs (added)
• HeuristicLab.GP/3.3/GeneticProgrammingModel.cs (modified) (2 diffs)

branches/3.2/sources/HeuristicLab.GP.Interfaces/3.3/IGeneticProgrammingModel.cs

@@ -28 +28 @@
   public interface IGeneticProgrammingModel : IItem {
     IFunctionTree FunctionTree { get; set; }
-    int Size { get; set; }
-    int Height { get; set; }
+    int Size { get; }
+    int Height { get; }
   }
 }

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

@@ -93 +93 @@
           parent.InsertSubTree(selectedChildIndex, newFunctionTree);
         }
-        // update size and height
-        gpModel.Size = gpModel.Size - oldChildSize + newChildSize;
-        gpModel.Height = gpModel.FunctionTree.GetHeight(); // must recalculate height because we can't know wether the manipulated branch was the deepest branch
         // check if whole tree is ok
         Debug.Assert(gardener.IsValidTree(gpModel.FunctionTree));

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);

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);

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

@@ -73 +73 @@
 
         Debug.Assert(gardener.IsValidTree(gpModel.FunctionTree));
-        // update the values of treeSize and treeHeight
-        gpModel.Size = gpModel.FunctionTree.GetSize();
-        gpModel.Height = gpModel.FunctionTree.GetHeight();
         // the root hasn't changed so we don't need to update 
         // return a CompositeOperation that randomly initializes all nodes of the new subtree

branches/3.2/sources/HeuristicLab.GP/3.3/GeneticProgrammingModel.cs

@@ -36 +36 @@
       set {
         functionTree = value;
-        Size = functionTree.GetSize();
-        Height = functionTree.GetHeight();
       }
     }
-    public int Size { get; set; }
-    public int Height { get; set; }
+    public int Size { get { return functionTree.GetSize(); } }
+    public int Height { get { return functionTree.GetHeight(); } }
 
     public GeneticProgrammingModel()
@@ -99 +97 @@
       // check if there is data for the tree node that needs to be restored and restore the data if needed
       var dataNode = fNode.SelectSingleNode("Data");
-      if (dataNode!=null) tree.Populate(dataNode, restoredObjects);
+      if (dataNode != null) tree.Populate(dataNode, restoredObjects);
       nodeIndex++;
       for (int i = 0; i < subTrees; i++) {