Changeset 5686 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/ArgumentCreaterTest.cs

Timestamp:

03/15/11 13:34:38 (13 years ago)

Author:

mkommend

Message:

#1418: Finally added results from the grammar refactoring.

File:

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

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Collections.Generic;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Random;
@@ -57 +57 @@
         ISymbolicExpressionTree tree;
         do {
-          tree = ProbabilisticTreeCreator.Create(random, grammar, MAX_TREE_LENGTH, MAX_TREE_DEPTH, 3, 3);
+          tree = ProbabilisticTreeCreator.Create(random, grammar, MAX_TREE_LENGTH, MAX_TREE_DEPTH);
+          SubroutineCreater.CreateSubroutine(random, tree, MAX_TREE_LENGTH, MAX_TREE_DEPTH, 3, 3);
         } while (!TreeHasAdfWithParameter(tree, 3));
         var success = ArgumentCreater.CreateNewArgument(random, tree, 60000, 100, 3, 3);
@@ -66 +67 @@
       // difficult to make sure that create argument operations succeed because trees are macro-expanded can potentially become very big 
       // => just test if only a small proportion fails
-      Assert.IsTrue(failedOps < POPULATION_SIZE * 0.01 ); // only 1% may fail
+      Assert.IsTrue(failedOps < POPULATION_SIZE * 0.01); // only 1% may fail
       Console.WriteLine("ArgumentCreator: " + Environment.NewLine +
         "Failed operations: " + failedOps * 100.0 / POPULATION_SIZE + " %" + Environment.NewLine +
@@ -77 +78 @@
 
     private bool TreeHasAdfWithParameter(ISymbolicExpressionTree tree, int maxParameters) {
-      if(tree.Root.SubTrees.Count() != 2 ) return false;
+      if (tree.Root.SubTrees.Count() != 2) return false;
       var firstAdf = tree.Root.GetSubTree(1);
-      return firstAdf.Grammar.GetAllowedSymbols(firstAdf.Symbol, 0).Where(x => x is Argument).Count() < maxParameters;
+      return firstAdf.Grammar.GetAllowedChildSymbols(firstAdf.Symbol, 0).Where(x => x is Argument).Count() < maxParameters;
     }
   }