Changeset 5686 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntExpressionGrammar.cs

Timestamp:

03/15/11 13:34:38 (14 years ago)

Author:

mkommend

Message:

#1418: Finally added results from the grammar refactoring.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntExpressionGrammar.cs (modified) (2 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntExpressionGrammar.cs

@@ -28 +28 @@
 namespace HeuristicLab.Problems.ArtificialAnt {
   [StorableClass]
-  public class ArtificialAntExpressionGrammar : DefaultSymbolicExpressionGrammar {
+  public class ArtificialAntExpressionGrammar : SymbolicExpressionGrammar {
 
     public ArtificialAntExpressionGrammar()
@@ -53 +53 @@
 
       allSymbols.ForEach(s => AddSymbol(s));
-      SetMinSubtreeCount(ifFoodAhead, 2);
-      SetMaxSubtreeCount(ifFoodAhead, 2);
-      SetMinSubtreeCount(prog2, 2);
-      SetMaxSubtreeCount(prog2, 2);
-      SetMinSubtreeCount(prog3, 3);
-      SetMaxSubtreeCount(prog3, 3);
-      SetMinSubtreeCount(move, 0);
-      SetMaxSubtreeCount(move, 0);
-      SetMinSubtreeCount(left, 0);
-      SetMaxSubtreeCount(left, 0);
-      SetMinSubtreeCount(right, 0);
-      SetMaxSubtreeCount(right, 0);
+      SetSubtreeCount(ifFoodAhead, 2, 3);
+      SetSubtreeCount(prog2, 2, 2);
+      SetSubtreeCount(prog3, 3, 3);
+      SetSubtreeCount(move, 0, 0);
+      SetSubtreeCount(left, 0, 0);
+      SetSubtreeCount(right, 0, 0);
 
       // each symbols is allowed as child of the start symbol
-      allSymbols.ForEach(s => SetAllowedChild(StartSymbol, s, 0));
+      allSymbols.ForEach(s => AddAllowedChildSymbol(StartSymbol, s));
+      allSymbols.ForEach(s => AddAllowedChildSymbol(DefunSymbol, s));
 
       // each symbol is allowed as child of all other symbols (except for terminals that have MaxSubtreeCount == 0
-      foreach (var parent in allSymbols) {
-        for (int argIndex = 0; argIndex < GetMaxSubtreeCount(parent); argIndex++) {
-          foreach (var child in allSymbols) {
-            SetAllowedChild(parent, child, argIndex);
-          }
+      foreach (var parent in nonTerminalSymbols) {
+        foreach (var child in allSymbols) {
+          AddAllowedChildSymbol(parent, child);
         }
       }