Changeset 7012 for trunk/sources/HeuristicLab.Tests

Timestamp:

11/17/11 11:51:09 (13 years ago)

Author:

bburlacu

Message:

#1654: Updated Full-, Grow- and RampedHalfAndHalf tree creators so that the Create call has the exact same signature for all of them (including the probabilistic tree creator); adjusted tests. Added CreateTree interface method and tree creator selection mechanism in the Sample Tree View.

Location:

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

Files:

• FullTreeCreatorTest.cs (modified) (2 diffs)
• GrowTreeCreatorTest.cs (modified) (2 diffs)

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

@@ -32 +32 @@
     private const int POPULATION_SIZE = 10000;
     private const int MAX_TREE_DEPTH = 10;
+    private const int MAX_TREE_LENGTH = 1000;
     private TestContext testContextInstance;
 
@@ -55 +56 @@
       stopwatch.Start();
       for (int i = 0; i != POPULATION_SIZE; i++) {
-        randomTrees.Add(FullTreeCreator.Create(random, grammar, MAX_TREE_DEPTH));
+        randomTrees.Add(FullTreeCreator.Create(random, grammar, MAX_TREE_DEPTH, MAX_TREE_LENGTH));
       }
       stopwatch.Stop();

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

@@ -32 +32 @@
     private const int POPULATION_SIZE = 10000;
     private const int MAX_TREE_DEPTH = 10;
+    private const int MAX_TREE_LENGTH = 50;
     private TestContext testContextInstance;
 
@@ -55 +56 @@
       stopwatch.Start();
       for (int i = 0; i != POPULATION_SIZE; i++) {
-        randomTrees.Add(GrowTreeCreator.Create(random, grammar, MAX_TREE_DEPTH));
+        randomTrees.Add(GrowTreeCreator.Create(random, grammar, MAX_TREE_DEPTH, MAX_TREE_LENGTH));
       }
       stopwatch.Stop();