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

Timestamp:

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

Author:

mkommend

Message:

#1479: Merged trunk changes into branch.

Location:

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

Files:

• Creators/ProbabilisticTreeCreator.cs (modified) (1 diff)
• SymbolicExpressionGrammarBase.cs (modified) (5 diffs)
• SymbolicExpressionTreeNode.cs (modified) (1 diff)
• Symbols/GroupSymbol.cs (modified) (4 diffs)
• Tests/Grammars.cs (modified) (7 diffs)

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs

@@ -182 +182 @@
                                 where s.InitialFrequency > 0.0
                                 where s.Fixed || parent.Grammar.GetMinimumExpressionDepth(s) < maxDepth - extensionDepth + 1
-                                //where s.Fixed || parent.Grammar.GetMaximumExpressionLength(s) > targetLength - totalListMinLength - currentLength
+                                where s.Fixed || parent.Grammar.GetMaximumExpressionLength(s) > targetLength - totalListMinLength - currentLength
                                 select s)
                                .ToList();

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -155 +156 @@
 
       foreach (GroupSymbol group in symbols.Values.OfType<GroupSymbol>())
-        group.symbols.Remove(symbol);
+        group.SymbolsCollection.Remove(symbol);
 
       ClearCaches();
@@ -451 +452 @@
       symbol.NameChanged += new EventHandler(Symbol_NameChanged);
       symbol.Changed += new EventHandler(Symbol_Changed);
+      var groupSymbol = symbol as GroupSymbol;
+      if (groupSymbol != null) RegisterGroupSymbolEvents(groupSymbol);
     }
     private void DeregisterSymbolEvents(ISymbol symbol) {
@@ -456 +459 @@
       symbol.NameChanged -= new EventHandler(Symbol_NameChanged);
       symbol.Changed -= new EventHandler(Symbol_Changed);
+      var groupSymbol = symbol as GroupSymbol;
+      if (groupSymbol != null) DeregisterGroupSymbolEvents(groupSymbol);
+    }
+
+    private void RegisterGroupSymbolEvents(GroupSymbol groupSymbol) {
+      groupSymbol.SymbolsCollection.ItemsAdded += new Collections.CollectionItemsChangedEventHandler<ISymbol>(GroupSymbol_ItemsAdded);
+      groupSymbol.SymbolsCollection.ItemsRemoved += new Collections.CollectionItemsChangedEventHandler<ISymbol>(GroupSymbol_ItemsRemoved);
+      groupSymbol.SymbolsCollection.CollectionReset += new Collections.CollectionItemsChangedEventHandler<ISymbol>(GroupSymbol_CollectionReset);
+    }
+    private void DeregisterGroupSymbolEvents(GroupSymbol groupSymbol) {
+      groupSymbol.SymbolsCollection.ItemsAdded -= new Collections.CollectionItemsChangedEventHandler<ISymbol>(GroupSymbol_ItemsAdded);
+      groupSymbol.SymbolsCollection.ItemsRemoved -= new Collections.CollectionItemsChangedEventHandler<ISymbol>(GroupSymbol_ItemsRemoved);
+      groupSymbol.SymbolsCollection.CollectionReset -= new Collections.CollectionItemsChangedEventHandler<ISymbol>(GroupSymbol_CollectionReset);
     }
 
@@ -506 +522 @@
     }
 
+    private void GroupSymbol_ItemsAdded(object sender, CollectionItemsChangedEventArgs<ISymbol> e) {
+      suppressEvents = true;
+      foreach (ISymbol symbol in e.Items)
+        if (!ContainsSymbol(symbol))
+          AddSymbol(symbol);
+      suppressEvents = false;
+      OnChanged();
+    }
+    private void GroupSymbol_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<ISymbol> e) {
+      suppressEvents = true;
+      foreach (ISymbol symbol in e.Items)
+        if (ContainsSymbol(symbol))
+          RemoveSymbol(symbol);
+      suppressEvents = false;
+      OnChanged();
+    }
+    private void GroupSymbol_CollectionReset(object sender, CollectionItemsChangedEventArgs<ISymbol> e) {
+      suppressEvents = true;
+      foreach (ISymbol symbol in e.Items)
+        if (!ContainsSymbol(symbol))
+          AddSymbol(symbol);
+      foreach (ISymbol symbol in e.OldItems)
+        if (ContainsSymbol(symbol))
+          RemoveSymbol(symbol);
+      suppressEvents = false;
+      OnChanged();
+    }
+
     public event EventHandler Changed;
     protected virtual void OnChanged() {

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs

@@ -186 +186 @@
 
     public override string ToString() {
-      return Symbol.Name;
+      if (Symbol != null) return Symbol.Name;
+      return "SymbolicExpressionTreeNode";
     }
 

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;
     }

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/Grammars.cs

@@ -27 +27 @@
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding_3._4.Tests {
   public static class Grammars {
+
+    [StorableClass]
     private class Addition : Symbol {
+      [StorableConstructor]
+      protected Addition(bool deserializing) : base(deserializing) { }
       protected Addition(Addition original, Cloner cloner) : base(original, cloner) { }
       public Addition() : base("Addition", "") { }
@@ -34 +38 @@
       }
     }
+
+    [StorableClass]
     private class Subtraction : Symbol {
+      [StorableConstructor]
+      protected Subtraction(bool deserializing) : base(deserializing) { }
       protected Subtraction(Subtraction original, Cloner cloner) : base(original, cloner) { }
       public Subtraction() : base("Subtraction", "") { }
@@ -41 +49 @@
       }
     }
+
+    [StorableClass]
     private class Multiplication : Symbol {
+      [StorableConstructor]
+      protected Multiplication(bool deserializing) : base(deserializing) { }
       protected Multiplication(Multiplication original, Cloner cloner) : base(original, cloner) { }
       public Multiplication() : base("Multiplication", "") { }
@@ -48 +60 @@
       }
     }
+
+    [StorableClass]
     private class Division : Symbol {
+      [StorableConstructor]
+      protected Division(bool deserializing) : base(deserializing) { }
       protected Division(Division original, Cloner cloner) : base(original, cloner) { }
       public Division() : base("Division", "") { }
@@ -55 +71 @@
       }
     }
+
+    [StorableClass]
     private class Terminal : Symbol {
+      [StorableConstructor]
+      protected Terminal(bool deserializing) : base(deserializing) { }
       protected Terminal(Terminal original, Cloner cloner) : base(original, cloner) { }
       public Terminal() : base("Terminal", "") { }
@@ -67 +87 @@
     }
 
+    [StorableClass]
     private class TerminalNode : SymbolicExpressionTreeTerminalNode {
       public override bool HasLocalParameters { get { return true; } }
@@ -94 +115 @@
     }
 
+    [StorableClass]
     private class SimpleArithmeticGrammar : SymbolicExpressionGrammar {
+      [StorableConstructor]
+      protected SimpleArithmeticGrammar(bool deserializing) : base(deserializing) { }
       protected SimpleArithmeticGrammar(SimpleArithmeticGrammar original, Cloner cloner) : base(original, cloner) { }
       public SimpleArithmeticGrammar()