Changeset 6409 for branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols

Timestamp:

06/14/11 10:57:27 (13 years ago)

Author:

mkommend

Message:

#1479: Updated grammar editor and changed related classes.

Location:

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols

Files:

• GroupSymbol.cs (modified) (3 diffs)
• Symbol.cs (modified) (2 diffs)

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/GroupSymbol.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  [StorableClass]
   public sealed class GroupSymbol : Symbol {
     private const int minimumArity = 0;
@@ -45 +46 @@
     public IEnumerable<ISymbol> Symbols {
       get { return symbols; }
+      private set { symbols = new ObservableSet<ISymbol>(value); }
     }
 
@@ -75 +77 @@
     }
 
-    public IEnumerable<ISymbol> Flatten() {
-      return symbols.Union(symbols.OfType<GroupSymbol>().SelectMany(g => g.Flatten()));
+    public override IEnumerable<ISymbol> Flatten() {
+      return base.Flatten().Union(symbols.SelectMany(s => s.Flatten()));
     }
   }

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Symbol.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -96 +97 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      if (initialFrequency.IsAlmost(0.0)) enabled = false;
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code, remove with 3.4
+      if (initialFrequency.IsAlmost(0.0) && !(this is GroupSymbol)) enabled = false;
+      #endregion
+
     }
 
     public virtual ISymbolicExpressionTreeNode CreateTreeNode() {
       return new SymbolicExpressionTreeNode(this);
+    }
+
+    public virtual IEnumerable<ISymbol> Flatten() {
+      return new List<ISymbol>() { this };
     }