Changeset 5549 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/ArgumentDeleterTest.cs

Timestamp:

02/22/11 19:04:54 (14 years ago)

Author:

gkronber

Message:

#1418 unified size/height vs. length/depth terminology and adapted unit tests for symbolic expression tree encoding version 3.4

File:

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

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

@@ -24 +24 @@
 using System.Collections.Generic;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.ArchitectureManipulators;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Creators;
 using HeuristicLab.Random;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
 
-namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding_3._3.Tests {
+namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding_3._4.Tests {
   [TestClass]
   public class ArgumentDeleterTest {
     private const int POPULATION_SIZE = 1000;
-    private const int MAX_TREE_SIZE = 100;
-    private const int MAX_TREE_HEIGHT = 10;
+    private const int MAX_TREE_LENGTH = 100;
+    private const int MAX_TREE_DEPTH = 10;
     private TestContext testContextInstance;
 
@@ -53 +50 @@
     [TestMethod()]
     public void ArgumentDeleterDistributionsTest() {
-      var trees = new List<SymbolicExpressionTree>();
+      var trees = new List<ISymbolicExpressionTree>();
       var grammar = Grammars.CreateArithmeticAndAdfGrammar();
       var random = new MersenneTwister(31415);
       for (int i = 0; i < POPULATION_SIZE; i++) {
-        SymbolicExpressionTree tree = null;
+        ISymbolicExpressionTree tree = null;
         do {
-          tree = ProbabilisticTreeCreator.Create(random, grammar, MAX_TREE_SIZE, MAX_TREE_HEIGHT, 3, 3);
+          tree = ProbabilisticTreeCreator.Create(random, grammar, MAX_TREE_LENGTH, MAX_TREE_DEPTH, 3, 3);
         } while (!TreeHasAdfWithArguments(tree));
-        var success = ArgumentDeleter.DeleteArgument(random, tree, grammar, MAX_TREE_SIZE, MAX_TREE_HEIGHT, 3, 3);
+        var success = ArgumentDeleter.DeleteArgument(random, tree, 3, 3);
         Assert.IsTrue(success);
         Util.IsValid(tree);
@@ -73 +70 @@
         );
     }
-    private bool TreeHasAdfWithArguments(SymbolicExpressionTree tree) {
-      return tree.Root.SubTrees.Count == 2 &&
-        tree.Root.SubTrees[1].GetAllowedSymbols(0).Where(x => x is Argument).Count() >= 2;
+    private bool TreeHasAdfWithArguments(ISymbolicExpressionTree tree) {
+      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() >= 2;
     }
   }