Changeset 5733 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/Util.cs

Timestamp:

03/17/11 14:07:47 (13 years ago)

Author:

mkommend

Message:

#1418: Corrected problem interfaces & unified naming of subtrees.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/Util.cs (modified) (7 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/Util.cs

@@ -53 +53 @@
       for (int i = 0; i < trees.Count; i++) {
         foreach (var node in trees[i].IterateNodesPrefix()) {
-          if (node.SubTrees.Count() > 0) {
+          if (node.Subtrees.Count() > 0) {
             if (!occurances.ContainsKey(node.Symbol.Name))
               occurances[node.Symbol.Name] = 0;
@@ -70 +70 @@
     }
 
-    public static string GetNumberOfSubTreesDistributionString(IList<ISymbolicExpressionTree> trees) {
+    public static string GetNumberOfSubtreesDistributionString(IList<ISymbolicExpressionTree> trees) {
       Dictionary<int, int> occurances = new Dictionary<int, int>();
       double n = 0.0;
       for (int i = 0; i < trees.Count; i++) {
         foreach (var node in trees[i].IterateNodesPrefix()) {
-          if (!occurances.ContainsKey(node.SubTrees.Count()))
-            occurances[node.SubTrees.Count()] = 0;
-          occurances[node.SubTrees.Count()]++;
+          if (!occurances.ContainsKey(node.Subtrees.Count()))
+            occurances[node.Subtrees.Count()] = 0;
+          occurances[node.Subtrees.Count()]++;
           n++;
         }
@@ -96 +96 @@
       for (int i = 0; i < trees.Count; i++) {
         foreach (var node in trees[i].IterateNodesPrefix()) {
-          if (node.SubTrees.Count() == 0) {
+          if (node.Subtrees.Count() == 0) {
             if (!occurances.ContainsKey(node.Symbol.Name))
               occurances[node.Symbol.Name] = 0;
@@ -118 +118 @@
       Assert.AreEqual(actualSize, reportedSize);
 
-      foreach (var defunTreeNode in tree.Root.SubTrees.OfType<DefunTreeNode>()) {
+      foreach (var defunTreeNode in tree.Root.Subtrees.OfType<DefunTreeNode>()) {
         int arity = defunTreeNode.NumberOfArguments;
 
@@ -133 +133 @@
 
         var invoke = new InvokeFunction(defunTreeNode.FunctionName);
-        foreach (var otherRootNode in tree.Root.SubTrees) {
+        foreach (var otherRootNode in tree.Root.Subtrees) {
           if (otherRootNode.Grammar.ContainsSymbol(invoke)) {
             Assert.IsTrue(otherRootNode.Grammar.GetMinimumSubtreeCount(invoke) == arity);
@@ -141 +141 @@
 
       }
-      foreach (var subtree in tree.Root.SubTrees) {
+      foreach (var subtree in tree.Root.Subtrees) {
         Assert.AreNotSame(subtree.Grammar, tree.Root.Grammar);
         IsValid(subtree.Grammar);
@@ -165 +165 @@
                             where symb.Name == treeNode.Symbol.Name
                             select symb).SingleOrDefault();
-      Assert.IsTrue(treeNode.SubTrees.Count() >= treeNode.Grammar.GetMinimumSubtreeCount(matchingSymbol));
-      Assert.IsTrue(treeNode.SubTrees.Count() <= treeNode.Grammar.GetMaximumSubtreeCount(matchingSymbol));
+      Assert.IsTrue(treeNode.Subtrees.Count() >= treeNode.Grammar.GetMinimumSubtreeCount(matchingSymbol));
+      Assert.IsTrue(treeNode.Subtrees.Count() <= treeNode.Grammar.GetMaximumSubtreeCount(matchingSymbol));
       Assert.AreNotEqual(0.0, matchingSymbol.InitialFrequency); // check that no deactivated symbols occur in the tree
-      for (int i = 0; i < treeNode.SubTrees.Count(); i++) {
-        Assert.IsTrue(treeNode.Grammar.GetAllowedChildSymbols(treeNode.Symbol, i).Select(x => x.Name).Contains(treeNode.GetSubTree(i).Symbol.Name));
-        IsValid(treeNode.GetSubTree(i));
+      for (int i = 0; i < treeNode.Subtrees.Count(); i++) {
+        Assert.IsTrue(treeNode.Grammar.GetAllowedChildSymbols(treeNode.Symbol, i).Select(x => x.Name).Contains(treeNode.GetSubtree(i).Symbol.Name));
+        IsValid(treeNode.GetSubtree(i));
       }
     }