Changeset 5529 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators

Timestamp:

02/21/11 17:49:23 (14 years ago)

Author:

gkronber

Message:

#1418 Removed grammar specific members from ISymbolicExpressionTreeNode interface.

Location:

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

Files:

• ArgumentCreater.cs (modified) (1 diff)
• ArgumentDuplicater.cs (modified) (1 diff)
• SubroutineDeleter.cs (modified) (1 diff)

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

@@ -180 +180 @@
           subtree.Grammar.SetMinSubtreeCount(matchingSymbol, defunBranch.NumberOfArguments);
           subtree.Grammar.SetMaxSubtreeCount(matchingSymbol, defunBranch.NumberOfArguments);
-          foreach (var child in subtree.GetAllowedSymbols(0)) {
+          foreach (var child in subtree.Grammar.GetAllowedSymbols(subtree.Symbol, 0)) {
             for (int i = 0; i < subtree.Grammar.GetMaxSubtreeCount(matchingSymbol); i++) {
               subtree.Grammar.SetAllowedChild(matchingSymbol, child, i);

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

@@ -124 +124 @@
           subtree.Grammar.SetMinSubtreeCount(matchingInvokeSymbol, selectedDefunBranch.NumberOfArguments);
           subtree.Grammar.SetMaxSubtreeCount(matchingInvokeSymbol, selectedDefunBranch.NumberOfArguments);
-          foreach (var child in subtree.GetAllowedSymbols(0)) {
+          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);

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

@@ -91 +91 @@
         // deletion by random regeneration
         ISymbolicExpressionTreeNode replacementTree = null;
-        var allowedSymbolsList = invocationCutPoint.Parent.GetAllowedSymbols(invocationCutPoint.ReplacedChildIndex).ToList();
+        var allowedSymbolsList = invocationCutPoint.Parent.Grammar.GetAllowedSymbols(invocationCutPoint.Parent.Symbol, invocationCutPoint.ReplacedChildIndex).ToList();
         var weights = allowedSymbolsList.Select(s => s.InitialFrequency);
         var selectedSymbol = allowedSymbolsList.SelectRandom(weights, random);