Changeset 3873 for branches/3.2/sources/HeuristicLab.GP/3.3

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/3.3/GeneticProgrammingModel.cs (modified) (2 diffs)

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++) {