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

Timestamp:

06/07/11 12:49:03 (13 years ago)

Author:

mkommend

Message:

#1479: Merged trunk changes into branch.

File:

• branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/GroupSymbol.cs (modified) (4 diffs)

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

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
-  public sealed class GroupSymbol : Symbol, IReadOnlySymbol {
-    internal List<ISymbol> symbols;
-
+  public sealed class GroupSymbol : Symbol {
+    private ObservableSet<ISymbol> symbols;
+    public IObservableSet<ISymbol> SymbolsCollection {
+      get { return symbols; }
+    }
     [Storable]
     public IEnumerable<ISymbol> Symbols {
@@ -39 +42 @@
         if (value != Enabled) {
           base.Enabled = value;
-          symbols.ForEach(s => s.Enabled = value);
+          foreach (ISymbol symbol in symbols)
+            symbol.Enabled = value;
         }
       }
@@ -48 +52 @@
     private GroupSymbol(GroupSymbol original, Cloner cloner)
       : base(original, cloner) {
-      symbols = original.Symbols.Select(s => cloner.Clone(s)).ToList();
+      symbols = new ObservableSet<ISymbol>(original.Symbols.Select(s => cloner.Clone(s)));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -54 +58 @@
     }
 
+    public GroupSymbol() : this("Group Symbol", Enumerable.Empty<ISymbol>()) { }
     public GroupSymbol(string name, IEnumerable<ISymbol> symbols)
       : base(name, "A symbol which groups other symbols") {
-      this.symbols = new List<ISymbol>(symbols);
+      this.symbols = new ObservableSet<ISymbol>(symbols);
       InitialFrequency = 0.0;
     }