Changeset 3338 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/ArithmeticExpressionGrammar.cs

Timestamp:

04/13/10 20:44:31 (14 years ago)

Author:

gkronber

Message:

Fixed bugs related to dynamic symbol constraints with ADFs. #290 (Implement ADFs)

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/ArithmeticExpressionGrammar.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/ArithmeticExpressionGrammar.cs

@@ -48 +48 @@
 
     public ArithmeticExpressionGrammar()
-      : base(0, 0, 0, 0) {
+      : base() {
       Initialize();
     }
@@ -62 +62 @@
       var allSymbols = new List<Symbol>() { add, sub, mul, div, constant, variableSymbol };
       var functionSymbols = new List<Symbol>() { add, sub, mul, div };
-      allSymbols.ForEach(s => AddAllowedSymbols(StartSymbol, 0, s));
+      foreach (var symb in allSymbols)
+        AddSymbol(symb);
 
+      foreach (var funSymb in functionSymbols) {
+        SetMinSubtreeCount(funSymb, 1);
+        SetMaxSubtreeCount(funSymb, 3);
+      }
+      SetMinSubtreeCount(constant, 0);
+      SetMaxSubtreeCount(constant, 0);
+      SetMinSubtreeCount(variableSymbol, 0);
+      SetMaxSubtreeCount(variableSymbol, 0);
 
-      SetMinSubTreeCount(constant, 0);
-      SetMaxSubTreeCount(constant, 0);
-      SetMinSubTreeCount(variableSymbol, 0);
-      SetMaxSubTreeCount(variableSymbol, 0);
-      int maxSubTrees = 3;
-      foreach (var functionSymbol in functionSymbols) {
-        SetMinSubTreeCount(functionSymbol, 1);
-        SetMaxSubTreeCount(functionSymbol, maxSubTrees);
-        foreach (var childSymbol in allSymbols) {
-          for (int argumentIndex = 0; argumentIndex < maxSubTrees; argumentIndex++) {
-            AddAllowedSymbols(functionSymbol, argumentIndex, childSymbol);
+      // allow each symbol as child of the start symbol
+      foreach (var symb in allSymbols) {
+        SetAllowedChild(StartSymbol, symb, 0);
+      }
+
+      // 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);
           }
-        }
       }
     }