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

Timestamp:

05/26/11 15:11:48 (13 years ago)

Author:

mkommend

Message:

#1479: Corrected handling of GroupSymbols.

Location:

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

Files:

• SymbolicExpressionGrammarBase.cs (modified) (11 diffs)
• Symbols/GroupSymbol.cs (modified) (1 diff)
• Symbols/Symbol.cs (modified) (1 diff)

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

@@ -130 +130 @@
     #region protected grammar manipulation methods
     protected void AddSymbol(ISymbol symbol) {
+      AddSymbolToDictionaries(symbol);
+      var groupSymbol = symbol as GroupSymbol;
+      if (groupSymbol != null) {
+        foreach (ISymbol s in groupSymbol.Flatten())
+          AddSymbolToDictionaries(s);
+      }
+
+      ClearCaches();
+      OnChanged();
+    }
+    private void AddSymbolToDictionaries(ISymbol symbol) {
       symbols.Add(symbol.Name, symbol);
       symbolSubtreeCount.Add(symbol.Name, Tuple.Create(0, 0));
       RegisterSymbolEvents(symbol);
-
+    }
+
+    protected void RemoveSymbol(ISymbol symbol) {
+      RemoveSymbolFromDictionaries(symbol);
       var groupSymbol = symbol as GroupSymbol;
-      if (groupSymbol != null) AddSymbol(groupSymbol);
+      if (groupSymbol != null) {
+        foreach (ISymbol s in groupSymbol.Flatten())
+          RemoveSymbolFromDictionaries(s);
+      }
 
       ClearCaches();
       OnChanged();
     }
-
-    private void AddSymbol(GroupSymbol groupSymbol) {
-      foreach (ISymbol symbol in groupSymbol.Symbols) {
-        symbols.Add(symbol.Name, symbol);
-        symbolSubtreeCount.Add(symbol.Name, Tuple.Create(0, 0));
-        RegisterSymbolEvents(symbol);
-
-        var childGroup = symbol as GroupSymbol;
-        if (childGroup != null) AddSymbol(childGroup);
-      }
-    }
-
-    protected void RemoveSymbol(ISymbol symbol) {
+    private void RemoveSymbolFromDictionaries(ISymbol symbol) {
       symbols.Remove(symbol.Name);
       allowedChildSymbols.Remove(symbol.Name);
@@ -170 +175 @@
       }
       DeregisterSymbolEvents(symbol);
-      ClearCaches();
-      OnChanged();
     }
 
@@ -181 +184 @@
 
     protected void AddAllowedChildSymbol(ISymbol parent, ISymbol child) {
+      List<ISymbol> parents;
+      List<ISymbol> childs;
+      bool changed = false;
+
+      var parentGroup = parent as GroupSymbol;
+      if (parentGroup != null) parents = parentGroup.Flatten().Where(p => !(p is GroupSymbol)).ToList();
+      else parents = new List<ISymbol>() { parent };
+      var childGroup = child as GroupSymbol;
+      if (childGroup != null) childs = childGroup.Flatten().Where(c => !(c is GroupSymbol)).ToList();
+      else childs = new List<ISymbol>() { child };
+
+      foreach (ISymbol p in parents) {
+        foreach (ISymbol c in childs) {
+          changed |= AddAllowedChildSymbolToDictionaries(p, c);
+        }
+      }
+
+      if (changed) {
+        ClearCaches();
+        OnChanged();
+      }
+    }
+
+    private bool AddAllowedChildSymbolToDictionaries(ISymbol parent, ISymbol child) {
+      List<string> childSymbols;
+      if (!allowedChildSymbols.TryGetValue(parent.Name, out childSymbols)) {
+        childSymbols = new List<string>();
+        allowedChildSymbols.Add(parent.Name, childSymbols);
+      }
+      if (childSymbols.Contains(child.Name)) return false;
+
       suppressEvents = true;
       for (int argumentIndex = 0; argumentIndex < GetMaximumSubtreeCount(parent); argumentIndex++)
@@ -186 +220 @@
       suppressEvents = false;
 
-      List<string> childSymbols;
-      if (!allowedChildSymbols.TryGetValue(parent.Name, out childSymbols)) {
-        childSymbols = new List<string>();
-        allowedChildSymbols.Add(parent.Name, childSymbols);
-      }
-
-      if (!childSymbols.Contains(child.Name)) {
-        childSymbols.Add(child.Name);
+      childSymbols.Add(child.Name);
+      return true;
+    }
+
+    protected void AddAllowedChildSymbol(ISymbol parent, ISymbol child, int argumentIndex) {
+      List<ISymbol> parents;
+      List<ISymbol> childs;
+      bool changed = false;
+
+      var parentGroup = parent as GroupSymbol;
+      if (parentGroup != null) parents = parentGroup.Flatten().Where(p => !(p is GroupSymbol)).ToList();
+      else parents = new List<ISymbol>() { parent };
+      var childGroup = child as GroupSymbol;
+      if (childGroup != null) childs = childGroup.Flatten().Where(c => !(c is GroupSymbol)).ToList();
+      else childs = new List<ISymbol>() { child };
+
+      foreach (ISymbol p in parents) {
+        foreach (ISymbol c in childs) {
+          changed |= AddAllowedChildSymbolToDictionaries(p, c, argumentIndex);
+        }
+      }
+
+      if (changed) {
         ClearCaches();
         OnChanged();
@@ -199 +248 @@
     }
 
-    protected void AddAllowedChildSymbol(ISymbol parent, ISymbol child, int argumentIndex) {
+
+    private bool AddAllowedChildSymbolToDictionaries(ISymbol parent, ISymbol child, int argumentIndex) {
       List<string> childSymbols;
       if (allowedChildSymbols.TryGetValue(parent.Name, out childSymbols))
-        if (childSymbols.Contains(child.Name)) return;
+        if (childSymbols.Contains(child.Name)) return false;
 
       var key = Tuple.Create(parent.Name, argumentIndex);
@@ -209 +259 @@
         allowedChildSymbolsPerIndex.Add(key, childSymbols);
       }
-
-      if (!childSymbols.Contains(child.Name)) {
-        childSymbols.Add(child.Name);
-        ClearCaches();
-        OnChanged();
-      }
+      if (childSymbols.Contains(child.Name)) return false;
+
+      childSymbols.Add(child.Name);
+      return true;
     }
 
@@ -221 +269 @@
       List<string> childSymbols;
       if (allowedChildSymbols.TryGetValue(child.Name, out childSymbols)) {
-        if (allowedChildSymbols[parent.Name].Remove(child.Name)) changed = true;
+        changed |= childSymbols.Remove(child.Name);
       }
 
       for (int argumentIndex = 0; argumentIndex < GetMaximumSubtreeCount(parent); argumentIndex++) {
         var key = Tuple.Create(parent.Name, argumentIndex);
-        if (allowedChildSymbolsPerIndex.TryGetValue(key, out childSymbols)) {
-          if (allowedChildSymbolsPerIndex[key].Remove(child.Name)) changed = true;
-        }
+        if (allowedChildSymbolsPerIndex.TryGetValue(key, out childSymbols))
+          changed |= childSymbols.Remove(child.Name);
       }
 
@@ -240 +287 @@
       bool changed = false;
 
+      suppressEvents = true;
       List<string> childSymbols;
       if (allowedChildSymbols.TryGetValue(parent.Name, out childSymbols)) {
         if (childSymbols.Remove(child.Name)) {
-          suppressEvents = true;
           for (int i = 0; i < GetMaximumSubtreeCount(parent); i++) {
             if (i != argumentIndex) AddAllowedChildSymbol(parent, child, i);
           }
-          suppressEvents = false;
           changed = true;
         }
       }
+      suppressEvents = false;
 
       var key = Tuple.Create(parent.Name, argumentIndex);
-      if (allowedChildSymbolsPerIndex.TryGetValue(key, out childSymbols)) {
-        if (allowedChildSymbolsPerIndex[key].Remove(child.Name))
-          changed = true;
-      }
+      if (allowedChildSymbolsPerIndex.TryGetValue(key, out childSymbols))
+        changed |= childSymbols.Remove(child.Name);
 
       if (changed) {
@@ -265 +310 @@
 
     protected void SetSubtreeCount(ISymbol symbol, int minimumSubtreeCount, int maximumSubtreeCount) {
+      var groupSymbol = symbol as GroupSymbol;
+      if (groupSymbol != null)
+        foreach (ISymbol s in groupSymbol.Flatten().Where(s => !(s is GroupSymbol)))
+          SetSubTreeCountInDictionaries(s, minimumSubtreeCount, maximumSubtreeCount);
+      else
+        SetSubTreeCountInDictionaries(symbol, minimumSubtreeCount, maximumSubtreeCount);
+
+      ClearCaches();
+      OnChanged();
+    }
+
+    private void SetSubTreeCountInDictionaries(ISymbol symbol, int minimumSubtreeCount, int maximumSubtreeCount) {
       for (int i = GetMaximumSubtreeCount(symbol) - 1; i >= maximumSubtreeCount; i--) {
         var key = Tuple.Create(symbol.Name, i);
@@ -271 +328 @@
 
       symbolSubtreeCount[symbol.Name] = Tuple.Create(minimumSubtreeCount, maximumSubtreeCount);
-      ClearCaches();
-      OnChanged();
     }
     #endregion
@@ -291 +346 @@
       List<string> temp;
       if (allowedChildSymbols.TryGetValue(parent.Name, out temp))
-        if (temp.Contains(child.Name)) return true;
+        return temp.Contains(child.Name);
       return false;
     }

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

@@ -59 +59 @@
       InitialFrequency = 0.0;
     }
+
+    public IEnumerable<ISymbol> Flatten() {
+      return symbols.Union(symbols.OfType<GroupSymbol>().SelectMany(g => g.Flatten()));
+    }
   }
 }

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

@@ -38 +38 @@
         if (value != initialFrequency) {
           initialFrequency = value;
-          if (initialFrequency.IsAlmost(0.0)) enabled = false;
           OnChanged(EventArgs.Empty);
         }