Changeset 3307 for trunk

Timestamp:

04/12/10 08:29:50 (15 years ago)

Author:

gkronber

Message:

Added ADF symbols to symbolic expression grammar for the test class for the subroutine creater. #290 (Implement ADFs)

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Tests/SubroutineCreaterTest.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Tests/SubroutineCreaterTest.cs

@@ -8 +8 @@
 using System.Diagnostics;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.ArchitectureAlteringOperators;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.GeneralSymbols;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding_3._3.Tests {
@@ -38 +39 @@
       var random = new MersenneTwister();
       for (int i = 0; i < populationSize; i++) {
-        randomTrees.Add(ProbabilisticTreeCreator.Create(random, grammar, 100, 10));
+        var randTree = ProbabilisticTreeCreator.Create(random, grammar, 100, 10);
+        Assert.IsTrue(grammar.IsValidExpression(randTree));
+        randomTrees.Add(randTree);
       }
       var newPopulation = new List<SymbolicExpressionTree>();
@@ -62 +65 @@
     private class TestGrammar : DefaultSymbolicExpressionGrammar {
       public TestGrammar()
-        : base(0, 0, 0, 0) {
+        : base(0, 3, 0, 3) {
         Initialize();
       }
@@ -73 +76 @@
         var terminal = new Terminal();
 
-        var allSymbols = new List<Symbol>() { add, sub, mul, div, terminal };
+        var defun = new Defun();
+        var invoke = new InvokeFunction();
+
+        var allSymbols = new List<Symbol>() { add, sub, mul, div, terminal, invoke };
         var functionSymbols = new List<Symbol>() { add, sub, mul, div };
-        allSymbols.ForEach(s => AddAllowedSymbols(StartSymbol, 0, s));
-
+        foreach (var symb in allSymbols) {
+          AddAllowedSymbols(StartSymbol, 0, symb);
+          AddAllowedSymbols(defun, 0, symb);
+        }
+        SetMinSubTreeCount(invoke, 0);
+        SetMaxSubTreeCount(invoke, 3);
+        for (int i = 0; i < 3; i++) {
+          allSymbols.ForEach(s => AddAllowedSymbols(invoke, i, s));
+        }
         SetMinSubTreeCount(terminal, 0);
         SetMaxSubTreeCount(terminal, 0);