Changeset 6622

Timestamp:

08/02/11 12:53:25 (13 years ago)

Author:

mkommend

Message:

#1479: Corrected merging errors in symbolic expression grammars.

Location:

branches/GP.Grammar.Editor

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarEditorView.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammar.cs (modified) (2 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs (modified) (1 diff)

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarEditorView.cs

@@ -56 +56 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      addButton.Enabled = Content != null;
-      removeButton.Enabled = symbolsTreeView.SelectedNode != null && !(symbolsTreeView.SelectedNode.Tag is IReadOnlySymbol);
-      copyButton.Enabled = symbolsTreeView.SelectedNode != null && !(symbolsTreeView.SelectedNode.Tag is IReadOnlySymbol);
+      addButton.Enabled = Content != null && !Content.ReadOnly;
+      removeButton.Enabled = Content != null && !Content.ReadOnly && symbolsTreeView.SelectedNode != null && !(symbolsTreeView.SelectedNode.Tag is IReadOnlySymbol);
+      copyButton.Enabled = Content != null && !Content.ReadOnly && symbolsTreeView.SelectedNode != null && !(symbolsTreeView.SelectedNode.Tag is IReadOnlySymbol);
     }
 

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

@@ -190 +190 @@
     void ISymbolicExpressionGrammar.AddSymbol(ISymbol symbol) {
       if (ReadOnly) throw new InvalidOperationException();
-      base.AddSymbol(symbol);
+      AddSymbol(symbol);
     }
     void ISymbolicExpressionGrammar.RemoveSymbol(ISymbol symbol) {
       if (ReadOnly) throw new InvalidOperationException();
-      base.RemoveSymbol(symbol);
+      RemoveSymbol(symbol);
     }
 
@@ -235 +235 @@
     #region symbol events
     private void RegisterSymbolEvents(ISymbol symbol) {
-      symbol.NameChanging += new EventHandler<CancelEventArgs<string>>(Symbol_NameChanging);
-      symbol.NameChanged += new EventHandler(Symbol_NameChanged);
-
-      var groupSymbol = symbol as GroupSymbol;
-      if (groupSymbol != null) RegisterGroupSymbolEvents(groupSymbol);
-      else symbol.Changed += new EventHandler(Symbol_Changed);
+      foreach (var s in symbol.Flatten()) {
+        s.NameChanging += new EventHandler<CancelEventArgs<string>>(Symbol_NameChanging);
+        s.NameChanged += new EventHandler(Symbol_NameChanged);
+
+        var groupSymbol = s as GroupSymbol;
+        if (groupSymbol != null) RegisterGroupSymbolEvents(groupSymbol);
+        else symbol.Changed += new EventHandler(Symbol_Changed);
+      }
     }
     private void DeregisterSymbolEvents(ISymbol symbol) {
-      symbol.NameChanging -= new EventHandler<CancelEventArgs<string>>(Symbol_NameChanging);
-      symbol.NameChanged -= new EventHandler(Symbol_NameChanged);
-
-      var groupSymbol = symbol as GroupSymbol;
-      if (groupSymbol != null) DeregisterGroupSymbolEvents(groupSymbol);
-      else symbol.Changed -= new EventHandler(Symbol_Changed);
+      foreach (var s in symbol.Flatten()) {
+        s.NameChanging -= new EventHandler<CancelEventArgs<string>>(Symbol_NameChanging);
+        s.NameChanged -= new EventHandler(Symbol_NameChanged);
+
+        var groupSymbol = s as GroupSymbol;
+        if (groupSymbol != null) DeregisterGroupSymbolEvents(groupSymbol);
+        else symbol.Changed -= new EventHandler(Symbol_Changed);
+      }
     }
 

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

@@ -123 +123 @@
     protected virtual void AddSymbol(ISymbol symbol) {
       if (ContainsSymbol(symbol)) throw new ArgumentException("Symbol " + symbol + " is already defined.");
-      symbols.Add(symbol.Name, symbol);
-      symbolSubtreeCount.Add(symbol.Name, Tuple.Create(0, 0));
+      foreach (var s in symbol.Flatten()) {
+        symbols.Add(s.Name, s);
+        symbolSubtreeCount.Add(s.Name, Tuple.Create(s.MinimumArity, s.MaximumArity));
+      }
       ClearCaches();
     }
 
     protected virtual void RemoveSymbol(ISymbol symbol) {
-      symbols.Remove(symbol.Name);
-      allowedChildSymbols.Remove(symbol.Name);
-      for (int i = 0; i < GetMaximumSubtreeCount(symbol); i++)
-        allowedChildSymbolsPerIndex.Remove(Tuple.Create(symbol.Name, i));
-      symbolSubtreeCount.Remove(symbol.Name);
-
-      foreach (var parent in Symbols) {
-        List<string> allowedChilds;
-        if (allowedChildSymbols.TryGetValue(parent.Name, out allowedChilds))
-          allowedChilds.Remove(symbol.Name);
-
-        for (int i = 0; i < GetMaximumSubtreeCount(parent); i++) {
-          if (allowedChildSymbolsPerIndex.TryGetValue(Tuple.Create(parent.Name, i), out allowedChilds))
-            allowedChilds.Remove(symbol.Name);
+      foreach (var s in symbol.Flatten()) {
+        symbols.Remove(s.Name);
+        allowedChildSymbols.Remove(s.Name);
+        for (int i = 0; i < GetMaximumSubtreeCount(s); i++)
+          allowedChildSymbolsPerIndex.Remove(Tuple.Create(s.Name, i));
+        symbolSubtreeCount.Remove(s.Name);
+
+        foreach (var parent in Symbols) {
+          List<string> allowedChilds;
+          if (allowedChildSymbols.TryGetValue(parent.Name, out allowedChilds))
+            allowedChilds.Remove(s.Name);
+
+          for (int i = 0; i < GetMaximumSubtreeCount(parent); i++) {
+            if (allowedChildSymbolsPerIndex.TryGetValue(Tuple.Create(parent.Name, i), out allowedChilds))
+              allowedChilds.Remove(s.Name);
+          }
         }
       }
+      ClearCaches();
     }