Changeset 6018 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/ParameterConfiguration.cs

Timestamp:

04/17/11 18:22:28 (13 years ago)

Author:

cneumuel

Message:

#1215

• support for maximization problems
• made base level algorithms stoppable
• optimization for multiple goals possible (AverageQuality, AverageDeviation, AverageEvaluatedSolutions)
• lots of fixes

File:

• branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/ParameterConfiguration.cs (modified) (7 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/ParameterConfiguration.cs

@@ -92 +92 @@
           if (this.valueConfigurations != null) DeregisterValueConfigurationEvents();
           this.valueConfigurations = value;
+          KeepActualValueConfigurationIndexConsistent();
           if (this.valueConfigurations != null) RegisterValueConfigurationEvents();
         }
@@ -144 +145 @@
       set { autoPopulateValueConfigurations = value; }
     }
-    
+
 
     #region Constructors and Cloning
@@ -258 +259 @@
         } else {
           IItem val;
-          if (ActualValue.Value != null && ActualValue.ValueDataType == t) {
+          if (ActualValue.Value != null && ActualValue.Value.GetType() == t) {
             val = (IItem)ActualValue.Value.Clone(); // use existing value for that type (if available)
           } else {
@@ -363 +364 @@
     void ValueConfigurations_CheckedItemsChanged(object sender, Collections.CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
       OnToStringChanged();
-    }
+      KeepActualValueConfigurationIndexConsistent();
+    }
+
     void ValueConfigurations_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
       OnToStringChanged();
+      KeepActualValueConfigurationIndexConsistent();
     }
     void ValueConfigurations_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
       OnToStringChanged();
+      KeepActualValueConfigurationIndexConsistent();
     }
 
@@ -440 +445 @@
     }
 
-    public string ParameterInfoString {
+    public virtual string ParameterInfoString {
       get {
         StringBuilder sb = new StringBuilder();
@@ -455 +460 @@
           }
 
-          if (this.ActualValue.Value is IParameterizedItem) {
+          if (this.ValueConfigurations[actualValueConfigurationIndex] is ParameterizedValueConfiguration) {
             string subParams = this.ValueConfigurations[actualValueConfigurationIndex].ParameterInfoString;
             if (!string.IsNullOrEmpty(subParams)) {
@@ -583 +588 @@
       }
     }
+
+    /// <summary>
+    /// Ensures that the ActualValueConfigurationIndex has a valid value
+    /// Only indices of items which are checked are allowed
+    /// </summary>
+    private void KeepActualValueConfigurationIndexConsistent() {
+      if (this.valueConfigurations != null && this.valueConfigurations.CheckedItems.Count() > 0) {
+        if(this.valueConfigurations.Count <= this.actualValueConfigurationIndex &&
+           this.valueConfigurations.CheckedItems.Count(x => x.Index == this.actualValueConfigurationIndex) == 1) {
+          // everything is ok; do nothing
+        } else {
+          // current index is invalid, set new one
+          this.ActualValueConfigurationIndex = this.valueConfigurations.CheckedItems.First().Index;
+        }
+      } else {
+        // no checked valueConfiguration is available; cannot be used
+        this.ActualValueConfigurationIndex = -1;
+      }
+    }
   }
 }