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

Timestamp:

05/25/11 10:50:21 (14 years ago)

Author:

mkommend

Message:

#1479: Created branch for grammar editing.

Location:

branches/GP.Grammar.Editor

Files:

• . (copied) (copied from trunk/sources)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs (modified) (13 diffs)

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

@@ -93 +93 @@
       cachedMinExpressionDepth = new Dictionary<string, int>();
 
-
       symbols = original.symbols.ToDictionary(x => x.Key, y => (ISymbol)cloner.Clone(y.Value));
       symbolSubtreeCount = new Dictionary<string, Tuple<int, int>>(original.symbolSubtreeCount);
@@ -128 +127 @@
       symbolSubtreeCount.Add(symbol.Name, Tuple.Create(0, 0));
       ClearCaches();
+      OnChanged();
     }
 
@@ -133 +133 @@
       symbol.NameChanging += new EventHandler<CancelEventArgs<string>>(Symbol_NameChanging);
       symbol.NameChanged += new EventHandler(Symbol_NameChanged);
+      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);
+      symbol.Changed -= new EventHandler(Symbol_Changed);
     }
 
@@ -179 +181 @@
 
       ClearCaches();
+      OnChanged();
+    }
+
+    private void Symbol_Changed(object sende, EventArgs e) {
+      ClearCaches();
+      OnChanged();
     }
 
@@ -200 +208 @@
       DeregisterSymbolEvents(symbol);
       ClearCaches();
+      OnChanged();
     }
 
@@ -217 +226 @@
       childSymbols.Add(child.Name);
       ClearCaches();
+      OnChanged();
     }
 
@@ -231 +241 @@
       childSymbols.Add(child.Name);
       ClearCaches();
+      OnChanged();
     }
 
@@ -236 +247 @@
       List<string> childSymbols;
       if (allowedChildSymbols.TryGetValue(child.Name, out childSymbols)) {
-        if (allowedChildSymbols[parent.Name].Remove(child.Name))
+        if (allowedChildSymbols[parent.Name].Remove(child.Name)) {
           ClearCaches();
+          OnChanged();
+        }
       }
     }
@@ -245 +258 @@
       List<string> childSymbols;
       if (allowedChildSymbolsPerIndex.TryGetValue(key, out childSymbols)) {
-        if (allowedChildSymbolsPerIndex[key].Remove(child.Name))
+        if (allowedChildSymbolsPerIndex[key].Remove(child.Name)) {
           ClearCaches();
+          OnChanged();
+        }
       }
     }
@@ -258 +273 @@
       symbolSubtreeCount[symbol.Name] = Tuple.Create(minimumSubtreeCount, maximumSubtreeCount);
       ClearCaches();
+      OnChanged();
     }
     #endregion
@@ -304 +320 @@
         result = result.Union(temp);
 
-      return result.Select(x => GetSymbol(x));
+      return result.Select(x => GetSymbol(x)).Where(s => !s.InitialFrequency.IsAlmost(0.0));
     }
 
@@ -313 +329 @@
       return symbolSubtreeCount[symbol.Name].Item2;
     }
-
 
     private void ClearCaches() {
@@ -369 +384 @@
       return temp;
     }
+
+    public event EventHandler Changed;
+    protected virtual void OnChanged() {
+      var handler = Changed;
+      if (handler != null) Changed(this, EventArgs.Empty);
+    }
     #endregion
   }