Changeset 5277 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/CheckedValueConfigurationCollection.cs

Timestamp:

01/11/11 16:00:17 (14 years ago)

Author:

cneumuel

Message:

#1215

• implemented crossover and manipulator operators for int and double values

File:

• branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/CheckedValueConfigurationCollection.cs (modified) (6 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/CheckedValueConfigurationCollection.cs

@@ -6 +6 @@
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Collections;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -11 +12 @@
   // todo: control creatable item types
   [StorableClass]
-  public class CheckedValueConfigurationCollection : CheckedItemCollection<IValueConfiguration>, ICheckedValueConfigurationCollection {
+  public class CheckedValueConfigurationList : CheckedItemList<IValueConfiguration>, ICheckedValueConfigurationList {
     [Storable]
     private int minItemCount = 1;
@@ -24 +25 @@
     }
 
-    public CheckedValueConfigurationCollection(ItemSet<IItem> validValues) {
+    public CheckedValueConfigurationList(ItemSet<IItem> validValues) {
       this.validValues = validValues;
       RegisterEvents();
     }
-    public CheckedValueConfigurationCollection() {
+    public CheckedValueConfigurationList() {
       RegisterEvents();
     }
     [StorableConstructor]
-    protected CheckedValueConfigurationCollection(bool deserializing) : base(deserializing) {
+    protected CheckedValueConfigurationList(bool deserializing) : base(deserializing) {
       RegisterEvents();
     }
-    protected CheckedValueConfigurationCollection(CheckedValueConfigurationCollection original, Cloner cloner) : base(original, cloner) {
+    protected CheckedValueConfigurationList(CheckedValueConfigurationList original, Cloner cloner) : base(original, cloner) {
       this.minItemCount = original.MinItemCount;
       this.validValues = original.validValues;
@@ -41 +42 @@
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new CheckedValueConfigurationCollection(this, cloner);
+      return new CheckedValueConfigurationList(this, cloner);
     }
     [StorableHook(HookType.AfterDeserialization)]
@@ -49 +50 @@
 
     private void RegisterEvents() {
-      this.ItemsRemoved += new Collections.CollectionItemsChangedEventHandler<IValueConfiguration>(CheckedValueConfigurationCollection_ItemsRemoved);
-    }
-    private void DeregisterEvents() {
-      this.ItemsRemoved -= new Collections.CollectionItemsChangedEventHandler<IValueConfiguration>(CheckedValueConfigurationCollection_ItemsRemoved);
+      this.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsRemoved);
     }
 
-    private void CheckedValueConfigurationCollection_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<IValueConfiguration> e) {
+    private void DeregisterEvents() {
+      this.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsRemoved);
+    }
+
+    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
@@ -66 +68 @@
       //}
     }
+
   }
 }