Changeset 7660

Timestamp:

03/23/12 13:32:11 (13 years ago)

Author:

mkommend

Message:

#1806: corrected minor bugs in symbolic expression grammar base regarding ADFs.

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Files:

• SymbolicExpressionGrammarBase.cs (modified) (1 diff)
• SymbolicExpressionTreeGrammar.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs

@@ -338 +338 @@
     public virtual bool IsAllowedChildSymbol(ISymbol parent, ISymbol child, int argumentIndex) {
       if (!child.Enabled) return false;
+      if (IsAllowedChildSymbol(parent, child)) return true;
       if (allowedChildSymbolsPerIndex.Count == 0) return false;
-      if (IsAllowedChildSymbol(parent, child)) return true;
 
       bool result;

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeGrammar.cs

@@ -51 +51 @@
     public override IEnumerable<ISymbol> Symbols {
       get {
+        foreach (var s in grammar.Symbols) yield return s;
         foreach (var s in base.symbols.Values) yield return s;
-        foreach (var s in grammar.Symbols) yield return s;
       }
     }