Changeset 8535 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations/CheckedValueConfigurationCollection.cs

Timestamp:

08/29/12 09:22:21 (12 years ago)

Author:

jkarder

Message:

#1853:

• enhanced combinations count calculation
• restructured code
• minor code improvements
• added license information

File:

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

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

@@ -28 +28 @@
 
 namespace HeuristicLab.Encodings.ParameterConfigurationEncoding {
-  // todo: check that at least 1 elements needs to be selected
-  // todo: control creatable item types
+  // TODO: check that at least 1 element needs to be selected
+  // TODO: control creatable item types
   [StorableClass]
   public class CheckedValueConfigurationList : CheckedItemList<IValueConfiguration>, ICheckedValueConfigurationList {
@@ -44 +44 @@
     }
 
-    public CheckedValueConfigurationList(IItemSet<IItem> validValues) {
-      this.validValues = validValues;
-      RegisterEvents();
-    }
-    public CheckedValueConfigurationList(IEnumerable<IValueConfiguration> collection)
-      : base(collection) {
-      validValues = null;
-      // event wiring not needed
-    }
-    public CheckedValueConfigurationList() {
-      RegisterEvents();
-    }
+    #region Constructors and Cloning
     [StorableConstructor]
     protected CheckedValueConfigurationList(bool deserializing)
@@ -67 +56 @@
       RegisterEvents();
     }
-
+    public CheckedValueConfigurationList(IItemSet<IItem> validValues)
+      : base() {
+      this.validValues = validValues;
+      RegisterEvents();
+    }
+    public CheckedValueConfigurationList(IEnumerable<IValueConfiguration> collection)
+      : base(collection) {
+      validValues = null;
+      // event wiring not needed
+    }
+    public CheckedValueConfigurationList()
+      : base() {
+      RegisterEvents();
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new CheckedValueConfigurationList(this, cloner);
@@ -75 +77 @@
       RegisterEvents();
     }
+    #endregion
 
     private void RegisterEvents() {
       this.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsAdded);
-      this.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsRemoved);
     }
 
     private void DeregisterEvents() {
-      this.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsRemoved);
       this.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsAdded);
     }
@@ -95 +96 @@
       }
     }
-
-    private void CheckedValueConfigurationList_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
-      // auch collectionreset gehört berücksichtigt
-      // funktioniert so nicht ganz, weil die view das hinzufügen nicht mitkriegt
-      //if (this.Count < minItemCount) {
-      //  foreach (var item in e.Items) {
-      //    if (this.Count >= minItemCount)
-      //      break;
-      //    this.Add(item);
-      //  }
-      //}
-    }
-
   }
 }