Changeset 6949 for trunk

Timestamp:

11/04/11 14:57:32 (13 years ago)

Author:

bburlacu

Message:

#1654: Enhanced tree creator tests.

Location:

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

Files:

• FullTreeCreatorTest.cs (modified) (1 diff)
• GrowTreeCreatorTest.cs (modified) (1 diff)
• ProbabilisticTreeCreaterTest.cs (modified) (2 diffs)

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

@@ -58 +58 @@
       }
       stopwatch.Stop();
-
+      double msPerRandomTreeCreation = stopwatch.ElapsedMilliseconds / (double)POPULATION_SIZE;
+      int count = 0;
+      int depth = 0;
+      int maxLength = 0;
       foreach (var tree in randomTrees) {
         Util.IsValid(tree);
         Assert.IsTrue(tree.Depth == MAX_TREE_DEPTH);
+        if (maxLength < tree.Length)
+          maxLength = tree.Length;
+        count += tree.Length;
+        depth += tree.Depth;
       }
-      double msPerRandomTreeCreation = stopwatch.ElapsedMilliseconds / (double)POPULATION_SIZE;
 
       Console.WriteLine("FullTreeCreator: " + Environment.NewLine +
-        msPerRandomTreeCreation + " ms per random tree (~" + Math.Round(1000.0 / (msPerRandomTreeCreation)) + "random trees / s)" + Environment.NewLine +
-        Util.GetSizeDistributionString(randomTrees, 105, 5) + Environment.NewLine +
+        msPerRandomTreeCreation + " ms per random tree (~" +
+        Math.Round(1000.0 / (msPerRandomTreeCreation)) + "random trees / s)" + Environment.NewLine +
+        Util.GetSizeDistributionString(randomTrees, maxLength, 5) + Environment.NewLine +
         Util.GetFunctionDistributionString(randomTrees) + Environment.NewLine +
         Util.GetNumberOfSubtreesDistributionString(randomTrees) + Environment.NewLine +
-        Util.GetTerminalDistributionString(randomTrees) + Environment.NewLine
+        Util.GetTerminalDistributionString(randomTrees) + Environment.NewLine +
+        "Average tree depth: " + depth / POPULATION_SIZE + Environment.NewLine +
+        "Average tree length: " + count / POPULATION_SIZE + Environment.NewLine +
+        "Maximum tree length: " + maxLength + Environment.NewLine +
+        "Total nodes created: " + count + Environment.NewLine
         );
       Assert.IsTrue(Math.Round(1000.0 / (msPerRandomTreeCreation)) > 300); // must achieve more than 300 random trees / s

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

@@ -59 +59 @@
       stopwatch.Stop();
 
+      int count = 0;
+      int depth = 0;
+      int maxLength = 0;
       foreach (var tree in randomTrees) {
         Util.IsValid(tree);
+        if (maxLength < tree.Length)
+          maxLength = tree.Length;
+        count += tree.Length;
+        depth += tree.Depth;
       }
+
       double msPerRandomTreeCreation = stopwatch.ElapsedMilliseconds / (double)POPULATION_SIZE;
 
       Console.WriteLine("GrowTreeCreator: " + Environment.NewLine +
         msPerRandomTreeCreation + " ms per random tree (~" + Math.Round(1000.0 / (msPerRandomTreeCreation)) + "random trees / s)" + Environment.NewLine +
-        Util.GetSizeDistributionString(randomTrees, 105, 5) + Environment.NewLine +
+        Util.GetSizeDistributionString(randomTrees, maxLength, 5) + Environment.NewLine +
         Util.GetFunctionDistributionString(randomTrees) + Environment.NewLine +
         Util.GetNumberOfSubtreesDistributionString(randomTrees) + Environment.NewLine +
-        Util.GetTerminalDistributionString(randomTrees) + Environment.NewLine
+        Util.GetTerminalDistributionString(randomTrees) + Environment.NewLine +
+        "Average tree depth: " + depth / POPULATION_SIZE + Environment.NewLine +
+        "Average tree length: " + count / POPULATION_SIZE + Environment.NewLine +
+        "Total nodes created: " + count + Environment.NewLine
         );
       Assert.IsTrue(Math.Round(1000.0 / (msPerRandomTreeCreation)) > 300); // must achieve more than 300 random trees / s

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

@@ -60 +60 @@
       stopwatch.Stop();
 
+      int count = 0;
+      int depth = 0;
       foreach (var tree in randomTrees) {
         Util.IsValid(tree);
+        count += tree.Length;
+        depth += tree.Depth;
       }
       double msPerRandomTreeCreation = stopwatch.ElapsedMilliseconds / (double)POPULATION_SIZE;
@@ -70 +74 @@
         Util.GetFunctionDistributionString(randomTrees) + Environment.NewLine +
         Util.GetNumberOfSubtreesDistributionString(randomTrees) + Environment.NewLine +
-        Util.GetTerminalDistributionString(randomTrees) + Environment.NewLine
+        Util.GetTerminalDistributionString(randomTrees) + Environment.NewLine +
+        "Average tree depth: " + depth / POPULATION_SIZE + Environment.NewLine +
+        "Average tree length: " + count / POPULATION_SIZE + Environment.NewLine +
+        "Total nodes created: " + count + Environment.NewLine
         );
       Assert.IsTrue(Math.Round(1000.0 / (msPerRandomTreeCreation)) > 250); // must achieve more than 250 random trees / s