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

Timestamp:

01/24/11 10:12:39 (13 years ago)

Author:

cneumuel

Message:

#1215

• minor bugfixes

File:

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

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

@@ -15 +15 @@
     [Storable]
     private int minItemCount = 1;
-    public int MinItemCount { 
-      get { return minItemCount; } 
+    public int MinItemCount {
+      get { return minItemCount; }
     }
 
@@ -33 +33 @@
     }
     [StorableConstructor]
-    protected CheckedValueConfigurationList(bool deserializing) : base(deserializing) {
+    protected CheckedValueConfigurationList(bool deserializing)
+      : base(deserializing) {
       RegisterEvents();
     }
-    protected CheckedValueConfigurationList(CheckedValueConfigurationList original, Cloner cloner) : base(original, cloner) {
+    protected CheckedValueConfigurationList(CheckedValueConfigurationList original, Cloner cloner)
+      : base(original, cloner) {
       this.minItemCount = original.MinItemCount;
       this.validValues = original.validValues;
@@ -61 +63 @@
     void CheckedValueConfigurationList_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
       foreach (var item in e.Items) {
-        if(this.Where(x => x.ItemName == item.Value.ItemName).Count() > 0) {
-          int maxNumber = this.Where(x => x.ItemName == item.Value.ItemName).Select(x => x.Number).Max();
+        var matchingItems = this.Where(x => x != item.Value && x.ActualValue.ValueDataType == item.Value.ActualValue.ValueDataType);
+        if (matchingItems.Count() > 0) {
+          int maxNumber = matchingItems.Select(x => x.Number).Max();
           item.Value.Number = maxNumber + 1;
         }