Changeset 6299

Timestamp:

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

Author:

mkommend

Message:

#1479: Corrected handling of GroupSymbols.

Location:

branches/GP.Grammar.Editor

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolView.cs (modified) (3 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarEditorView.cs (modified) (5 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarView.cs (modified) (2 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs (modified) (11 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/GroupSymbol.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Symbol.cs (modified) (1 diff)

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

@@ -47 +47 @@
       this.initialFrequencyLabel = new System.Windows.Forms.Label();
       this.initialFrequencyTextBox = new System.Windows.Forms.TextBox();
+      this.checkBoxEnabled = new System.Windows.Forms.CheckBox();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
@@ -73 +74 @@
       // initialFrequencyTextBox
       // 
-      this.initialFrequencyTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.initialFrequencyTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.errorProvider.SetIconAlignment(this.initialFrequencyTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.initialFrequencyTextBox.Location = new System.Drawing.Point(93, 26);
@@ -84 +85 @@
       this.initialFrequencyTextBox.Validated += new System.EventHandler(this.initialFrequencyTextBox_Validated);
       // 
+      // checkBoxEnabled
+      // 
+      this.checkBoxEnabled.AutoSize = true;
+      this.checkBoxEnabled.Location = new System.Drawing.Point(93, 52);
+      this.checkBoxEnabled.Name = "checkBoxEnabled";
+      this.checkBoxEnabled.Size = new System.Drawing.Size(65, 17);
+      this.checkBoxEnabled.TabIndex = 5;
+      this.checkBoxEnabled.Text = "Enabled";
+      this.checkBoxEnabled.UseVisualStyleBackColor = true;
+      this.checkBoxEnabled.CheckedChanged += new System.EventHandler(this.checkBoxEnabled_CheckedChanged);
+      // 
       // SymbolView
       // 
@@ -90 +102 @@
       this.Controls.Add(this.initialFrequencyTextBox);
       this.Controls.Add(this.initialFrequencyLabel);
+      this.Controls.Add(this.checkBoxEnabled);
       this.Name = "SymbolView";
-      this.Size = new System.Drawing.Size(320, 51);
+      this.Size = new System.Drawing.Size(320, 75);
+      this.Controls.SetChildIndex(this.checkBoxEnabled, 0);
       this.Controls.SetChildIndex(this.initialFrequencyLabel, 0);
       this.Controls.SetChildIndex(this.initialFrequencyTextBox, 0);
@@ -107 +121 @@
     protected System.Windows.Forms.Label initialFrequencyLabel;
     protected System.Windows.Forms.TextBox initialFrequencyTextBox;
+    private System.Windows.Forms.CheckBox checkBoxEnabled;
 
   }

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

@@ -57 +57 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      initialFrequencyTextBox.Enabled = Content != null;
+      initialFrequencyTextBox.Enabled = Content != null || Locked;
       initialFrequencyTextBox.ReadOnly = ReadOnly;
+      checkBoxEnabled.Enabled = Content != null || Locked || ReadOnly;
     }
 
@@ -93 +94 @@
       }
     }
+
+    private void checkBoxEnabled_CheckedChanged(object sender, EventArgs e) {
+      Content.Enabled = checkBoxEnabled.Checked;
+    }
     #endregion
 
@@ -99 +104 @@
       if (Content == null) {
         initialFrequencyTextBox.Text = string.Empty;
+        checkBoxEnabled.Checked = false;
       } else {
         initialFrequencyTextBox.Text = Content.InitialFrequency.ToString();
+        checkBoxEnabled.Checked = Content.Enabled;
       }
       SetEnabledStateOfControls();
     }
     #endregion
+
   }
 }

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

@@ -100 +100 @@
     private void RebuildSymbolsTreeView() {
       symbolsTreeView.Nodes.Clear();
-      var start = new TreeNode();
-      var symbols = new DummySymbol("Symbols");
-      start.Name = "Symbols";
-      start.Text = "Symbols";
-      start.Tag = symbols;
-      start.Checked = true;
-      symbolsTreeView.Nodes.Add(start);
+      var symbols = Content.Symbols.ToList();
+      var groupSymbols = symbols.OfType<GroupSymbol>().ToList();
+      var topLevelSymbols = Content.Symbols.Where(s => !groupSymbols.Any(g => g.Symbols.Contains(s)));
+      AddChildTreeNodes(symbolsTreeView.Nodes, topLevelSymbols);
 
-      foreach (ISymbol symbol in Content.Symbols.Where(s => !(s is IReadOnlySymbol))) {
+      RebuildImageList();
+      symbolsTreeView.ExpandAll();
+    }
+
+    private void AddChildTreeNodes(TreeNodeCollection collection, IEnumerable<ISymbol> symbols) {
+      foreach (ISymbol symbol in symbols) {
         var node = new TreeNode();
         node.Name = symbol.Name;
         node.Text = symbol.Name;
         node.Tag = symbol;
-        node.Checked = !symbol.InitialFrequency.IsAlmost(0.0);
-        start.Nodes.Add(node);
+        node.Checked = symbol.Enabled;
+        collection.Add(node);
+        var groupSymbol = symbol as GroupSymbol;
+        if (groupSymbol != null) AddChildTreeNodes(node.Nodes, groupSymbol.Symbols);
       }
-      RebuildImageList();
-      symbolsTreeView.ExpandAll();
     }
 
@@ -134 +136 @@
       if (e.Action != TreeViewAction.Unknown) {
         DeregisterContentEvents();
-        foreach (var symbol in IterateTreeNodes(e.Node).Select(n => n.Tag).OfType<ISymbol>()) {
-          if (e.Node.Checked) symbol.InitialFrequency = 1.0;
-          else symbol.InitialFrequency = 0.0;
-        }
+        var symbol = (ISymbol)e.Node.Tag;
+        symbol.Enabled = e.Node.Checked;
         RegisterContentEvents();
         Content_Changed(Content, EventArgs.Empty);
@@ -176 +176 @@
     protected virtual void RebuildImageList() {
       symbolsTreeView.ImageList.Images.Clear();
-      foreach (TreeNode treeNode in symbolsTreeView.Nodes) {
+      foreach (TreeNode treeNode in IterateTreeNodes()) {
         var symbol = (ISymbol)treeNode.Tag;
         symbolsTreeView.ImageList.Images.Add(symbol == null ? HeuristicLab.Common.Resources.VSImageLibrary.Nothing : symbol.ItemImage);
@@ -183 +183 @@
     }
   }
+    #endregion
 
   [NonDiscoverableType]
@@ -190 +191 @@
     public override IDeepCloneable Clone(Cloner cloner) { return new DummySymbol(this, cloner); }
   }
-
-    #endregion
 }

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

@@ -90 +90 @@
           if (!(symbol is IReadOnlySymbol)) {
             symbol.Changed += new EventHandler(symbol_Changed);
-            symbols.Add(symbol, symbol.InitialFrequency > 0.0);
+            symbols.Add(symbol, symbol.Enabled);
           }
         }
@@ -101 +101 @@
     private void symbol_Changed(object sender, EventArgs e) {
       ISymbol symbol = (ISymbol)sender;
-      symbols.SetItemCheckedState(symbol, symbol.InitialFrequency > 0.0);
+      symbols.SetItemCheckedState(symbol, symbol.Enabled);
     }
 
     private void symbols_CheckedItemsChanged(object sender, CollectionItemsChangedEventArgs<IndexedItem<ISymbol>> e) {
       ICheckedItemList<ISymbol> checkedItemList = (ICheckedItemList<ISymbol>)sender;
-      foreach (var indexedItem in e.Items) {
-        if (checkedItemList.ItemChecked(indexedItem.Value)) {
-          indexedItem.Value.InitialFrequency = 1.0;
-        } else {
-          indexedItem.Value.InitialFrequency = 0.0;
-        }
-      }
+      foreach (var indexedItem in e.Items)
+        indexedItem.Value.Enabled = checkedItemList.ItemChecked(indexedItem.Value);
     }
     private void ClearSymbols() {

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