Changeset 6337 for branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

05/30/11 16:59:50 (14 years ago)

Author:

mkommend

Message:

#1479: Added updated version of grammar editor.

File:

• branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs (modified) (4 diffs)

branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -94 +93 @@
        * 
        * BinaryOperator = 
-       *   "+" | "-" | "*" | "/" | "Power"
+       *   "+" | "-" | "*" | "/" | "Power" | "Root"
        * 
        * UnaryOperator = 
@@ -107 +106 @@
        */
 
+      var arithmeticSymbols = new GroupSymbol("Arithmetic Functions", new List<ISymbol>() { add, sub, mul, div });
+      var trigonometricSymbols = new GroupSymbol("Trigonometric Functions", new List<ISymbol>() { sin, cos, tan });
+      var powerSymbols = new GroupSymbol("Power Functions", new List<ISymbol> { pow, root });
+      var exponentialAndLogarithmicSymbols = new GroupSymbol("Exponential and Logarithmic Functions", new List<ISymbol> { exp, log });
+      var terminalSymbols = new GroupSymbol("Terminals", new List<ISymbol> { constant, variableSymbol });
+      var realValuedSymbols = new GroupSymbol("Real valued Symbols",
+        new List<ISymbol>() { arithmeticSymbols, trigonometricSymbols, powerSymbols, exponentialAndLogarithmicSymbols, terminalSymbols });
+
+      AddSymbol(realValuedSymbols);
+
+      SetSubtreeCount(arithmeticSymbols, 2, 2);
+      SetSubtreeCount(trigonometricSymbols, 1, 1);
+      SetSubtreeCount(powerSymbols, 2, 2);
+      SetSubtreeCount(exponentialAndLogarithmicSymbols, 1, 1);
+      SetSubtreeCount(terminalSymbols, 0, 0);
+
+      AddAllowedChildSymbol(StartSymbol, realValuedSymbols);
+      AddAllowedChildSymbol(DefunSymbol, realValuedSymbols);
+      AddAllowedChildSymbol(realValuedSymbols, realValuedSymbols);
+
+      //var unaryBooleanFunctionSymbols = new List<Symbol>() { not };
+      //var binaryBooleanFunctionSymbols = new List<Symbol>() { or, and };
+      //var relationalFunctionSymbols = new List<Symbol>() { gt, lt };
+      //var booleanSymbols = unaryBooleanFunctionSymbols.Concat(binaryBooleanFunctionSymbols).Concat(relationalFunctionSymbols);
+
       var allSymbols = new List<Symbol>() { add, sub, mul, div, mean, sin, cos, tan, log, pow, root, exp, @if, gt, lt, and, or, not, timeLag, integral, derivative, constant, variableSymbol, laggedVariable, variableCondition };
 
@@ -112 +136 @@
       var binaryFunctionSymbols = new List<Symbol>() { add, sub, mul, div, mean, pow, root, variableCondition };
 
-      var unaryBooleanFunctionSymbols = new List<Symbol>() { not };
-      var binaryBooleanFunctionSymbols = new List<Symbol>() { or, and };
-      var relationalFunctionSymbols = new List<Symbol>() { gt, lt };
-      var terminalSymbols = new List<Symbol>() { variableSymbol, constant, laggedVariable };
-      var realValuedSymbols = unaryFunctionSymbols.Concat(binaryFunctionSymbols).Concat(terminalSymbols).Concat(new List<Symbol>() { @if });
-      var booleanSymbols = unaryBooleanFunctionSymbols.Concat(binaryBooleanFunctionSymbols).Concat(relationalFunctionSymbols);
-
-      foreach (var symb in allSymbols)
-        AddSymbol(symb);
-
-      foreach (var unaryFun in unaryFunctionSymbols.Concat(unaryBooleanFunctionSymbols)) {
-        SetSubtreeCount(unaryFun, 1, 1);
-      }
-      foreach (var binaryFun in binaryFunctionSymbols.Concat(binaryBooleanFunctionSymbols).Concat(relationalFunctionSymbols)) {
-        SetSubtreeCount(binaryFun, 2, 2);
-      }
-
-      foreach (var terminalSymbol in terminalSymbols) {
-        SetSubtreeCount(terminalSymbol, 0, 0);
-      }
-
-      SetSubtreeCount(@if, 3, 3);
+
+
+      //var terminalSymbols = new List<Symbol>() { variableSymbol, constant, laggedVariable };
+      //var realValuedSymbols = unaryFunctionSymbols.Concat(binaryFunctionSymbols).Concat(terminalSymbols).Concat(new List<Symbol>() { @if });
+
+
+      //foreach (var symb in allSymbols)
+      //  AddSymbol(symb);
+
+      //foreach (var unaryFun in unaryFunctionSymbols.Concat(unaryBooleanFunctionSymbols)) {
+      //  SetSubtreeCount(unaryFun, 1, 1);
+      //}
+      //foreach (var binaryFun in binaryFunctionSymbols.Concat(binaryBooleanFunctionSymbols).Concat(relationalFunctionSymbols)) {
+      //  SetSubtreeCount(binaryFun, 2, 2);
+      //}
+
+      //foreach (var terminalSymbol in terminalSymbols) {
+      //  SetSubtreeCount(terminalSymbol, 0, 0);
+      //}
+
+      //SetSubtreeCount(@if, 3, 3);
 
 
       // allow only real-valued expressions as child of the start symbol
-      foreach (var symb in realValuedSymbols) {
-        AddAllowedChildSymbol(StartSymbol, symb);
-        AddAllowedChildSymbol(DefunSymbol, symb);
-      }
-
-      foreach (var symb in unaryFunctionSymbols) {
-        foreach (var childSymb in realValuedSymbols) {
-          AddAllowedChildSymbol(symb, childSymb);
-        }
-      }
-
-      foreach (var symb in binaryFunctionSymbols) {
-        foreach (var childSymb in realValuedSymbols) {
-          AddAllowedChildSymbol(symb, childSymb);
-        }
-      }
-
-      foreach (var childSymb in booleanSymbols) {
-        AddAllowedChildSymbol(@if, childSymb, 0);
-      }
-      foreach (var childSymb in realValuedSymbols) {
-        AddAllowedChildSymbol(@if, childSymb, 1);
-        AddAllowedChildSymbol(@if, childSymb, 2);
-      }
-
-      foreach (var symb in relationalFunctionSymbols) {
-        foreach (var childSymb in realValuedSymbols) {
-          AddAllowedChildSymbol(symb, childSymb);
-        }
-      }
-      foreach (var symb in binaryBooleanFunctionSymbols) {
-        foreach (var childSymb in booleanSymbols) {
-          AddAllowedChildSymbol(symb, childSymb);
-        }
-      }
-      foreach (var symb in unaryBooleanFunctionSymbols) {
-        foreach (var childSymb in booleanSymbols) {
-          AddAllowedChildSymbol(symb, childSymb);
-        }
-      }
+      //foreach (var symb in realValuedSymbols) {
+      //  AddAllowedChildSymbol(StartSymbol, symb);
+      //  AddAllowedChildSymbol(DefunSymbol, symb);
+      //}
+
+      //foreach (var symb in unaryFunctionSymbols) {
+      //  foreach (var childSymb in realValuedSymbols) {
+      //    AddAllowedChildSymbol(symb, childSymb);
+      //  }
+      //}
+
+      //foreach (var symb in binaryFunctionSymbols) {
+      //  foreach (var childSymb in realValuedSymbols) {
+      //    AddAllowedChildSymbol(symb, childSymb);
+      //  }
+      //}
+
+      //foreach (var childSymb in booleanSymbols) {
+      //  AddAllowedChildSymbol(@if, childSymb, 0);
+      //}
+      //foreach (var childSymb in realValuedSymbols) {
+      //  AddAllowedChildSymbol(@if, childSymb, 1);
+      //  AddAllowedChildSymbol(@if, childSymb, 2);
+      //}
+
+      //foreach (var symb in relationalFunctionSymbols) {
+      //  foreach (var childSymb in realValuedSymbols) {
+      //    AddAllowedChildSymbol(symb, childSymb);
+      //  }
+      //}
+      //foreach (var symb in binaryBooleanFunctionSymbols) {
+      //  foreach (var childSymb in booleanSymbols) {
+      //    AddAllowedChildSymbol(symb, childSymb);
+      //  }
+      //}
+      //foreach (var symb in unaryBooleanFunctionSymbols) {
+      //  foreach (var childSymb in booleanSymbols) {
+      //    AddAllowedChildSymbol(symb, childSymb);
+      //  }
+      //}
     }
   }