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

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

Location:

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

Files:

• ArgumentCreater.cs (modified) (1 diff)
• SubroutineCreater.cs (modified) (2 diffs)
• SubroutineDeleter.cs (modified) (2 diffs)

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

@@ -101 +101 @@
       ArgumentTreeNode newArgumentNode = MakeArgumentNode(newArgumentIndex);
 
-      // this operation potentially creates very big trees so the access to the size property might throw overflow exception
+      // this operation potentially creates very big trees so the access to the length property might throw overflow exception
       try {
-        if (CreateNewArgumentForDefun(random, clonedTree, selectedDefunBranch, newArgumentNode) && clonedTree.Size <= maxTreeLength && clonedTree.Height <= maxTreeDepth) {
+        if (CreateNewArgumentForDefun(random, clonedTree, selectedDefunBranch, newArgumentNode) && clonedTree.Length <= maxTreeLength && clonedTree.Depth <= maxTreeDepth) {
 
           // size constraints are fulfilled 

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;

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

@@ -95 +95 @@
         var selectedSymbol = allowedSymbolsList.SelectRandom(weights, random);
 
-        int minPossibleSize = invocationCutPoint.Parent.Grammar.GetMinExpressionLength(selectedSymbol);
-        int maxSize = Math.Max(minPossibleSize, invocationCutPoint.ReplacedChild.GetSize());
-        int minPossibleHeight = invocationCutPoint.Parent.Grammar.GetMinExpressionDepth(selectedSymbol);
-        int maxHeight = Math.Max(minPossibleHeight, invocationCutPoint.ReplacedChild.GetHeight());
+        int minPossibleLength = invocationCutPoint.Parent.Grammar.GetMinExpressionLength(selectedSymbol);
+        int maxLength = Math.Max(minPossibleLength, invocationCutPoint.ReplacedChild.GetLength());
+        int minPossibleDepth = invocationCutPoint.Parent.Grammar.GetMinExpressionDepth(selectedSymbol);
+        int maxDepth = Math.Max(minPossibleDepth, invocationCutPoint.ReplacedChild.GetDepth());
         replacementTree = selectedSymbol.CreateTreeNode();
         if (replacementTree.HasLocalParameters)
@@ -105 +105 @@
         invocationCutPoint.Parent.InsertSubTree(invocationCutPoint.ReplacedChildIndex, replacementTree);
 
-        ProbabilisticTreeCreator.PTC2(random, replacementTree, maxSize, maxHeight, 0, 0);
+        ProbabilisticTreeCreator.PTC2(random, replacementTree, maxLength, maxDepth, 0, 0);
 
         invocationCutPoint = (from node in symbolicExpressionTree.IterateNodesPrefix()