Changeset 5361 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding

Timestamp:

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

Author:

cneumuel

Message:

#1215

• minor bugfixes

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding

Files:

• ParameterConfigurations/ParameterConfiguration.cs (modified) (3 diffs)
• ValueConfigurations/CheckedValueConfigurationCollection.cs (modified) (3 diffs)
• ValueConfigurations/ValueConfiguration.cs (modified) (3 diffs)

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

@@ -146 +146 @@
       this.ValueConfigurations = new CheckedValueConfigurationList(this.validValues ?? CreateValidValues());
       this.ActualValue = new ConstrainedValue(
-        valueParameter.Value != null ? (IItem)valueParameter.Value.Clone() : null, 
+        valueParameter.Value != null ? valueParameter.Value : null, // don't clone here; otherwise settings of a non-optimized ValueParameter will not be synchronized with the ConstrainedValue
         valueParameter.DataType, 
         this.validValues != null ? new ItemSet<IItem>(this.validValues) : CreateValidValues(), 
@@ -200 +200 @@
       if (this.ActualValue != null) this.ActualValue.ToStringChanged -= new EventHandler(ActualValue_ToStringChanged);
     }
-
+    
     private void PopulateValueConfigurations() {
       foreach (Type t in this.validTypes) {
@@ -370 +370 @@
         if (this.Optimize) {
           var vc = this.ValueConfigurations[actualValueConfigurationIndex];
-          if (IsSubclassOfRawGeneric(typeof(ValueTypeValue<>), vc.GetType())) {
+          if (vc.ActualValue == null || vc.ActualValue.Value == null) {
+            sb.Append(string.Format("{0}: null", parameterName));
+          } else if (IsSubclassOfRawGeneric(typeof(ValueTypeValue<>), vc.ActualValue.Value.GetType())) {
             // for int, double, bool use the value directly
-            sb.Append(string.Format("{0}: {1}", parameterName, this.ActualValue.Value != null ? this.ActualValue.Value.ToString() : "null"));
+            sb.Append(string.Format("{0}: {1}", parameterName, this.ActualValue.Value.ToString()));
           } else {
             // for other types use NumberedName (this also uses the Number-Property for otherwise ambiguous ValueConfigurations)

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;
         }

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

@@ -93 +93 @@
 
     [Storable]
-    protected int number = -1;
+    protected int number = 0;
     public int Number {
       get { return number; }
@@ -237 +237 @@
       get {
         if (this.number == 0) {
-          return ActualValue.Value.ItemName;
+          return (ActualValue != null && ActualValue.Value != null) ? ActualValue.Value.ItemName : base.ToString();
         } else {
           return string.Format("{0} {1}", ActualValue.Value.ItemName, number);
@@ -260 +260 @@
     public virtual void Parameterize(IParameterizedItem item) {
       foreach (IParameterConfiguration pc in this.ParameterConfigurations) {
-        if(pc.Optimize) pc.Parameterize((IValueParameter)item.Parameters[pc.ParameterName]);
+        pc.Parameterize((IValueParameter)item.Parameters[pc.ParameterName]);
       }
     }