Changeset 5549 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineCreater.cs

Timestamp:

02/22/11 19:04:54 (13 years ago)

Author:

gkronber

Message:

#1418 unified size/height vs. length/depth terminology and adapted unit tests for symbolic expression tree encoding version 3.4

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineCreater.cs (modified) (2 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineCreater.cs

@@ -86 +86 @@
         // allowed maximum number of ADF reached => abort
         return false;
-      if (symbolicExpressionTree.Size + 4 > maxTreeLength)
-        // defining a new function causes an size increase by 4 nodes (max) if the max tree size is reached => abort
+      if (symbolicExpressionTree.Length + 4 > maxTreeLength)
+        // defining a new function causes an length increase by 4 nodes (max) if the max tree length is reached => abort
         return false;
       string formatString = new StringBuilder().Append('0', (int)Math.Log10(maxFunctionDefinitions * 10 - 1)).ToString(); // >= 100 functions => ###
@@ -95 +95 @@
       // select a random body (either the result producing branch or an ADF branch)
       var bodies = from node in symbolicExpressionTree.Root.SubTrees
-                   select new { Tree = node, Size = node.GetSize() };
-      var totalNumberOfBodyNodes = bodies.Select(x => x.Size).Sum();
+                   select new { Tree = node, Length = node.GetLength() };
+      var totalNumberOfBodyNodes = bodies.Select(x => x.Length).Sum();
       int r = random.Next(totalNumberOfBodyNodes);
       int aggregatedNumberOfBodyNodes = 0;
       ISymbolicExpressionTreeNode selectedBody = null;
       foreach (var body in bodies) {
-        aggregatedNumberOfBodyNodes += body.Size;
+        aggregatedNumberOfBodyNodes += body.Length;
         if (aggregatedNumberOfBodyNodes > r)
           selectedBody = body.Tree;