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

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentDuplicater.cs

@@ -107 +107 @@
       // register the new argument symbol and increase the number of arguments of the ADF
       selectedDefunBranch.Grammar.AddSymbol(newArgSymbol);
-      selectedDefunBranch.Grammar.SetMinSubtreeCount(newArgSymbol, 0);
-      selectedDefunBranch.Grammar.SetMaxSubtreeCount(newArgSymbol, 0);
+      selectedDefunBranch.Grammar.SetSubtreeCount(newArgSymbol, 0, 0);
       // allow the argument as child of any other symbol
       foreach (var symb in selectedDefunBranch.Grammar.Symbols)
-        for (int i = 0; i < selectedDefunBranch.Grammar.GetMaxSubtreeCount(symb); i++) {
-          selectedDefunBranch.Grammar.SetAllowedChild(symb, newArgSymbol, i);
+        for (int i = 0; i < selectedDefunBranch.Grammar.GetMaximumSubtreeCount(symb); i++) {
+          selectedDefunBranch.Grammar.AddAllowedChildSymbol(symb, newArgSymbol, i);
         }
       selectedDefunBranch.NumberOfArguments++;
@@ -122 +121 @@
                                     select symb).SingleOrDefault();
         if (matchingInvokeSymbol != null) {
-          subtree.Grammar.SetMinSubtreeCount(matchingInvokeSymbol, selectedDefunBranch.NumberOfArguments);
-          subtree.Grammar.SetMaxSubtreeCount(matchingInvokeSymbol, selectedDefunBranch.NumberOfArguments);
-          foreach (var child in subtree.Grammar.GetAllowedSymbols(subtree.Symbol, 0)) {
-            for (int i = 0; i < subtree.Grammar.GetMaxSubtreeCount(matchingInvokeSymbol); i++) {
-              subtree.Grammar.SetAllowedChild(matchingInvokeSymbol, child, i);
+          subtree.Grammar.SetSubtreeCount(matchingInvokeSymbol, selectedDefunBranch.NumberOfArguments, selectedDefunBranch.NumberOfArguments);
+          foreach (var child in subtree.Grammar.GetAllowedChildSymbols(subtree.Symbol, 0)) {
+            for (int i = 0; i < subtree.Grammar.GetMaximumSubtreeCount(matchingInvokeSymbol); i++) {
+              subtree.Grammar.AddAllowedChildSymbol(matchingInvokeSymbol, child, i);
             }
           }