Changeset 6918 for trunk

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

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentCreater.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/GrammarModifier.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/Util.cs (modified) (2 diffs)

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) {

trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/Util.cs

@@ -137 +137 @@
             Assert.IsTrue(otherRootNode.Grammar.GetMinimumSubtreeCount(invoke) == arity);
             Assert.IsTrue(otherRootNode.Grammar.GetMaximumSubtreeCount(invoke) == arity);
+            Assert.IsFalse(otherRootNode.Grammar.IsAllowedChildSymbol(invoke, invoke));
+            for (int i = 0; i < arity; i++) {
+              Assert.IsFalse(otherRootNode.Grammar.IsAllowedChildSymbol(invoke, invoke, i));
+            }
           }
         }
@@ -161 +165 @@
 
       foreach (var symbol in grammar.ModifyableSymbols) {
-        //check if ever symbol has at least on 
+        //check if ever symbol has at least one allowed child
         for (int i = 0; i < grammar.GetMaximumSubtreeCount(symbol); i++)
           Assert.IsTrue(grammar.GetAllowedChildSymbols(symbol, i).Any());