Changeset 6814 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeGrammar.cs

Timestamp:

09/21/11 15:51:43 (13 years ago)

Author:

mkommend

Message:

#1479: Adapted symbolic expression encoding unit tests.

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeGrammar.cs (modified) (1 diff)

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

@@ -82 +82 @@
     public override IEnumerable<ISymbol> GetAllowedChildSymbols(ISymbol parent) {
       var symbols = grammar.GetAllowedChildSymbols(parent).Union(base.GetAllowedChildSymbols(parent));
-      return symbols.SelectMany(s => s.Flatten()).Where(s => s.Enabled && !(s is GroupSymbol));
+      return symbols.SelectMany(s => s.Flatten()).Where(s => s.Enabled).Distinct();
     }
     public override IEnumerable<ISymbol> GetAllowedChildSymbols(ISymbol parent, int argumentIndex) {
       var symbols = grammar.GetAllowedChildSymbols(parent, argumentIndex).Union(base.GetAllowedChildSymbols(parent, argumentIndex));
-      return symbols.SelectMany(s => s.Flatten()).Where(s => s.Enabled && !(s is GroupSymbol));
+      return symbols.SelectMany(s => s.Flatten()).Where(s => s.Enabled).Distinct();
     }