Changeset 5686 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/Grammars.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/Grammars.cs (modified) (2 diffs)

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

@@ -94 +94 @@
     }
 
-    private class SimpleArithmeticGrammar : DefaultSymbolicExpressionGrammar {
+    private class SimpleArithmeticGrammar : SymbolicExpressionGrammar {
       protected SimpleArithmeticGrammar(SimpleArithmeticGrammar original, Cloner cloner) : base(original, cloner) { }
       public SimpleArithmeticGrammar()
@@ -119 +119 @@
 
         foreach (var funSymb in functionSymbols) {
-          SetMinSubtreeCount(funSymb, 1);
-          SetMaxSubtreeCount(funSymb, 3);
+          SetSubtreeCount(funSymb, 1, 3);
         }
-        SetMinSubtreeCount(terminal, 0);
-        SetMaxSubtreeCount(terminal, 0);
+        SetSubtreeCount(terminal, 0, 0);
 
+        SetSubtreeCount(StartSymbol, 1, 1);
         // allow each symbol as child of the start symbol
         foreach (var symb in allSymbols) {
-          SetAllowedChild(StartSymbol, symb, 0);
+          AddAllowedChildSymbol(StartSymbol, symb);
+          AddAllowedChildSymbol(DefunSymbol, symb);
         }
 
         // allow each symbol as child of every other symbol (except for terminals that have maxSubtreeCount == 0)
-        foreach (var parent in allSymbols) {
-          for (int i = 0; i < GetMaxSubtreeCount(parent); i++)
-            foreach (var child in allSymbols) {
-              SetAllowedChild(parent, child, i);
-            }
+        foreach (var parent in functionSymbols) {
+          foreach (var child in allSymbols) {
+            AddAllowedChildSymbol(parent, child);
+          }
         }
       }
     }
 
-    public static ISymbolicExpressionTreeGrammar CreateSimpleArithmeticGrammar() {
-      var g = new GlobalSymbolicExpressionGrammar(new SimpleArithmeticGrammar());
-      g.MaxFunctionArguments = 0;
-      g.MinFunctionArguments = 0;
-      g.MaxFunctionDefinitions = 0;
-      g.MinFunctionDefinitions = 0;
+    public static ISymbolicExpressionGrammar CreateSimpleArithmeticGrammar() {
+      var g = new SimpleArithmeticGrammar();
+      g.MaximumFunctionArguments = 0;
+      g.MinimumFunctionArguments = 0;
+      g.MaximumFunctionDefinitions = 0;
+      g.MinimumFunctionDefinitions = 0;
       return g;
     }
 
-    public static ISymbolicExpressionTreeGrammar CreateArithmeticAndAdfGrammar() {
-      var g = new GlobalSymbolicExpressionGrammar(new SimpleArithmeticGrammar());
-      g.MaxFunctionArguments = 3;
-      g.MinFunctionArguments = 0;
-      g.MaxFunctionDefinitions = 3;
-      g.MinFunctionDefinitions = 0;
+    public static ISymbolicExpressionGrammar CreateArithmeticAndAdfGrammar() {
+      var g = new SimpleArithmeticGrammar();
+      g.MaximumFunctionArguments = 3;
+      g.MinimumFunctionArguments = 0;
+      g.MaximumFunctionDefinitions = 3;
+      g.MinimumFunctionDefinitions = 0;
       return g;
     }