Changeset 6878 for branches/GeneralizedQAP/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarView.cs

Timestamp:

10/05/11 21:55:55 (13 years ago)

Author:

abeham

Message:

#1614

• updated branch from trunk

Location:

branches/GeneralizedQAP

Files:

• . (modified) (2 props)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4 (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarView.cs (modified) (3 diffs)

branches/GeneralizedQAP

@@ +1 @@
+*.docstates
+*.psess
 *.resharper
 *.suo
+*.vsp
 Google.ProtocolBuffers-0.9.1.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.resharper.user
@@ -8 +13 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab.ExtLibs
+bin
 protoc.exe
-HeuristicLab 3.3.5.1.ReSharper.user
-*.psess
-*.vsp
-*.docstates
+HeuristicLab.ExtLibs.6.0.ReSharper.user

@@ +1 @@
+*.docstates
+*.psess
 *.resharper
 *.suo
+*.vsp
 Google.ProtocolBuffers-0.9.1.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.resharper.user
@@ -8 +13 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab.ExtLibs
+bin
 protoc.exe
-HeuristicLab 3.3.5.1.ReSharper.user
-*.psess
-*.vsp
-*.docstates
+HeuristicLab.ExtLibs.6.0.ReSharper.user

branches/GeneralizedQAP/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4

@@ -4 +4 @@
 *.vs10x
 HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj.user
+Plugin.cs

@@ -4 +4 @@
 *.vs10x
 HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj.user
+Plugin.cs

branches/GeneralizedQAP/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarView.cs

@@ -30 +30 @@
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
   [View("Symbolic Expression Grammar View")]
-  [Content(typeof(ISymbolicExpressionGrammar), true)]
+  [Content(typeof(ISymbolicExpressionGrammar), false)]
   public partial class SymbolicExpressionGrammarView : NamedItemView {
     private CheckedItemList<ISymbol> symbols;
@@ -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() {

@@ +1 @@
+*.docstates
+*.psess
 *.resharper
 *.suo
+*.vsp
 Google.ProtocolBuffers-0.9.1.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.resharper.user
@@ -8 +13 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab.ExtLibs
+bin
 protoc.exe
-HeuristicLab 3.3.5.1.ReSharper.user
-*.psess
-*.vsp
-*.docstates
+HeuristicLab.ExtLibs.6.0.ReSharper.user

@@ -4 +4 @@
 *.vs10x
 HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj.user
+Plugin.cs