Changeset 6918 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

10/13/11 15:31:27 (13 years ago)

Author:

mkommend

Message:

#1657: Corrected ADFs for GP and adapted and extended the specific unit test.

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators

Files:

• ArgumentCreater.cs (modified) (1 diff)
• GrammarModifier.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentCreater.cs

@@ -180 +180 @@
           foreach (var symb in subtree.Grammar.Symbols) {
             if (symb is StartSymbol || symb is ProgramRootSymbol) continue;
+            if (symb.Name == matchingSymbol.Name) continue; //don't allow invoke as child of invoke
             if (subtree.Grammar.IsAllowedChildSymbol(selectedCutPoint.Parent.Symbol, symb, selectedCutPoint.ChildIndex))
               subtree.Grammar.AddAllowedChildSymbol(matchingSymbol, symb, newArgumentNode.Symbol.ArgumentIndex);

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/GrammarModifier.cs

@@ -38 +38 @@
         //set allowed child symbols of invoke symbol 
         foreach (ISymbol child in grammar.Symbols) {
+          if (child.Name == invokeSym.Name) continue;
           int i = 0;
           foreach (CutPoint argumentCutPoint in argumentCutPoints) {