Changeset 7079 for trunk

Timestamp:

11/27/11 22:40:34 (13 years ago)

Author:

mkommend

Message:

#1654: Added caching in SymbolicExpressionGrammarBase and changed depth limit for FullTreeCreator unit test.

Location:

trunk/sources

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeGrammar.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/FullTreeCreatorTest.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeGrammar.cs

@@ -119 +119 @@
       else return base.GetMinimumExpressionDepth(symbol);
     }
+    int ISymbolicExpressionGrammarBase.GetMaximumExpressionDepth(ISymbol symbol) {
+      if (symbols.Count == 0) return grammar.GetMaximumExpressionDepth(symbol);
+      else return base.GetMaximumExpressionDepth(symbol);
+    }
     int ISymbolicExpressionGrammarBase.GetMinimumExpressionLength(ISymbol symbol) {
       if (symbols.Count == 0) return grammar.GetMinimumExpressionLength(symbol);
@@ -127 +131 @@
       else return base.GetMaximumExpressionLength(symbol, maxDepth);
     }
+
   }
 }

trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/FullTreeCreatorTest.cs

@@ -31 +31 @@
   public class FullTreeCreatorTest {
     private const int POPULATION_SIZE = 10000;
-    private const int MAX_TREE_DEPTH = 10;
-    private const int MAX_TREE_LENGTH = 1000;
+    private const int MAX_TREE_DEPTH = 9 ;
+    private const int MAX_TREE_LENGTH = 256;
     private TestContext testContextInstance;