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

Timestamp:

08/01/11 17:48:53 (13 years ago)

Author:

mkommend

Message:

#1479: Integrated trunk changes.

File:

• branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs (modified) (5 diffs)

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

@@ -86 +86 @@
       suppressEvents = false;
     }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      foreach (ISymbol symbol in symbols.Values)
-        RegisterSymbolEvents(symbol);
-    }
 
     protected SymbolicExpressionGrammarBase(SymbolicExpressionGrammarBase original, Cloner cloner)
@@ -109 +104 @@
         allowedChildSymbolsPerIndex.Add(element.Key, new List<string>(element.Value));
 
-      foreach (ISymbol symbol in symbols.Values)
-        RegisterSymbolEvents(symbol);
-
       suppressEvents = false;
     }
@@ -130 +122 @@
 
     #region protected grammar manipulation methods
-    protected void AddSymbol(ISymbol symbol) {
-      foreach (ISymbol s in symbol.Flatten())
-        AddSymbolToDictionaries(s);
-
+    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));
       ClearCaches();
       OnChanged();
     }
-    private void AddSymbolToDictionaries(ISymbol symbol) {
-      symbols.Add(symbol.Name, symbol);
-      symbolSubtreeCount.Add(symbol.Name, Tuple.Create(symbol.MinimumArity, symbol.MinimumArity));
-      RegisterSymbolEvents(symbol);
-    }
-
-    protected void RemoveSymbol(ISymbol symbol) {
-      foreach (ISymbol s in symbol.Flatten())
-        RemoveSymbolFromDictionaries(s);
-
-      foreach (GroupSymbol group in symbols.Values.OfType<GroupSymbol>())
-        group.SymbolsCollection.Remove(symbol);
-
-      ClearCaches();
-      OnChanged();
-    }
-    private void RemoveSymbolFromDictionaries(ISymbol symbol) {
+
+    protected virtual void RemoveSymbol(ISymbol symbol) {
       symbols.Remove(symbol.Name);
       allowedChildSymbols.Remove(symbol.Name);
@@ -170 +147 @@
         }
       }
-      DeregisterSymbolEvents(symbol);
     }
 
@@ -370 +346 @@
     }
 
-    private void ClearCaches() {
+    protected void ClearCaches() {
       cachedMinExpressionLength.Clear();
       cachedMaxExpressionLength.Clear();