Changeset 2455

Timestamp:

10/29/09 18:10:07 (15 years ago)

Author:

gkronber

Message:

Added test for ProbabilisticTreeCreator. #791 (Tests for GP operators and structure identification evaluators)

Location:

trunk/sources/HeuristicLab.GP.Tests

Files:

• ProbabilisticTreeCreatorTest.cs (modified) (7 diffs)
• Util.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.GP.Tests/ProbabilisticTreeCreatorTest.cs

@@ -68 +68 @@
         strBuilder.Append(Environment.NewLine);
         strBuilder.Append("< "); strBuilder.Append((i + 1) * 5);
-        strBuilder.Append(": "); strBuilder.Append(histogram[i]);
+        strBuilder.Append(": "); strBuilder.AppendFormat("{0:#0.00%}", histogram[i] / (double)randomTrees.Length);
       }
       Assert.Inconclusive("Size distribution of ProbabilisticTreeCreator: " + strBuilder);
@@ -76 +76 @@
     public void FunctionDistributionTest() {
       Dictionary<IFunction, int> occurances = new Dictionary<IFunction, int>();
+      double n = 0.0;
       for (int i = 0; i < randomTrees.Length; i++) {
         foreach (var node in FunctionTreeIterator.IteratePrefix(randomTrees[i])) {
@@ -82 +83 @@
               occurances[node.Function] = 0;
             occurances[node.Function]++;
+            n++;
           }
         }
@@ -89 +91 @@
         strBuilder.Append(Environment.NewLine);
         strBuilder.Append(function.Name); strBuilder.Append(": ");
-        strBuilder.Append(occurances[function]);
+        strBuilder.AppendFormat("{0:#0.00%}", occurances[function] / n);
       }
       Assert.Inconclusive("Function distribution of ProbabilisticTreeCreator: " + strBuilder);
@@ -95 +97 @@
 
     [TestMethod()]
+    public void NumberOfSubTreesDistributionTest() {
+      Dictionary<int, int> occurances = new Dictionary<int, int>();
+      double n = 0.0;
+      for (int i = 0; i < randomTrees.Length; i++) {
+        foreach (var node in FunctionTreeIterator.IteratePrefix(randomTrees[i])) {
+          if (!occurances.ContainsKey(node.SubTrees.Count))
+            occurances[node.SubTrees.Count] = 0;
+          occurances[node.SubTrees.Count]++;
+          n++;
+        }
+      }
+      StringBuilder strBuilder = new StringBuilder();
+      foreach (var arity in occurances.Keys) {
+        strBuilder.Append(Environment.NewLine);
+        strBuilder.Append(arity); strBuilder.Append(": ");
+        strBuilder.AppendFormat("{0:#0.00%}", occurances[arity] / n);
+      }
+      Assert.Inconclusive("Distribution of function arities of ProbabilisticTreeCreator: " + strBuilder);
+    }
+
+
+    [TestMethod()]
     public void TerminalDistributionTest() {
       Dictionary<IFunction, int> occurances = new Dictionary<IFunction, int>();
+      double n = 0.0;
       for (int i = 0; i < randomTrees.Length; i++) {
         foreach (var node in FunctionTreeIterator.IteratePrefix(randomTrees[i])) {
@@ -103 +128 @@
               occurances[node.Function] = 0;
             occurances[node.Function]++;
+            n++;
           }
         }
@@ -110 +136 @@
         strBuilder.Append(Environment.NewLine);
         strBuilder.Append(function.Name); strBuilder.Append(": ");
-        strBuilder.Append(occurances[function]);
+        strBuilder.AppendFormat("{0:#0.00%}", occurances[function] / n);
       }
       Assert.Inconclusive("Terminal distribution of ProbabilisticTreeCreator: " + strBuilder);

trunk/sources/HeuristicLab.GP.Tests/Util.cs

@@ -90 +90 @@
       doubleFunctions.Add(constant);
       doubleFunctions.Add(addition);
-      //doubleFunctions.Add(average);
+      // doubleFunctions.Add(average);
       doubleFunctions.Add(cosinus);
       doubleFunctions.Add(division);
@@ -132 +132 @@
       functionLibrary.AddFunction(constant);
       functionLibrary.AddFunction(addition);
-      //functionLibrary.AddFunction(average);
+      // functionLibrary.AddFunction(average);
       functionLibrary.AddFunction(and);
       functionLibrary.AddFunction(cosinus);