Changeset 8644 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations

Timestamp:

09/13/12 14:06:56 (12 years ago)

Author:

jkarder

Message:

#1853:

• removed multi-crossovers for integer and double values
• restructured crossovers and manipulators for integer and double values

File:

• branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations/CheckedValueConfigurationCollection.cs (modified) (3 diffs)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations/CheckedValueConfigurationCollection.cs

@@ -29 +29 @@
 namespace HeuristicLab.Encodings.ParameterConfigurationEncoding {
   // TODO: check that at least 1 element needs to be selected
-  // TODO: control creatable item types
+  // TODO: control creatable item types ### EDIT: done?
   [StorableClass]
   public class CheckedValueConfigurationList : CheckedItemList<IValueConfiguration>, ICheckedValueConfigurationList {
@@ -81 +81 @@
     private void RegisterEvents() {
       this.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsAdded);
+      this.CheckedItemsChanged += new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_CheckedItemsChanged);
     }
 
     private void DeregisterEvents() {
+      this.CheckedItemsChanged -= new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_CheckedItemsChanged);
       this.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsAdded);
     }
 
+    #region Events
     private void CheckedValueConfigurationList_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
       foreach (var item in e.Items) {
         var matchingItems = this.Where(x => x != item.Value && x.ActualValue.ValueDataType == item.Value.ActualValue.ValueDataType);
-        if (matchingItems.Count() > 0) {
+        if (matchingItems.Any()) {
           int maxNumber = matchingItems.Select(x => x.Number).Max();
           item.Value.Number = maxNumber + 1;
@@ -96 +99 @@
       }
     }
+    private void CheckedValueConfigurationList_CheckedItemsChanged(object sender, CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
+      // TODO: view does not get notified
+      if (!this.CheckedItems.Any()) this.SetItemCheckedState(e.Items.Single().Value, true);
+    }
+    #endregion
+
   }
 }