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

Timestamp:

03/22/12 18:05:15 (12 years ago)

Author:

mkommend

Message:

#1806: improved memory usage of symbolic expression tree encoding

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Files:

• . (modified) (1 prop)
• 3.4/SymbolicExpressionTreeGrammar.cs (modified) (2 diffs)

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -51 +50 @@
 
     public override IEnumerable<ISymbol> Symbols {
-      get { return grammar.Symbols.Union(base.Symbols); }
+      get {
+        foreach (var s in base.symbols.Values) yield return s;
+        foreach (var s in grammar.Symbols) yield return s;
+      }
     }
     public override IEnumerable<ISymbol> AllowedSymbols {