Changeset 5231 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization

Timestamp:

01/07/11 17:06:40 (14 years ago)

Author:

cneumuel

Message:

#1215

• fixed issues with wrongly configured operators by cloning the corresponding ValidValue object rather than instantiating a new operator

Location:

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

Files:

• Encoding/ParameterConfigurations/ParameterConfiguration.cs (modified) (7 diffs)
• Encoding/RangeConstraints/ConstrainedValue.cs (modified) (3 diffs)
• Encoding/ValueConfigurations/CheckedValueConfigurationCollection.cs (modified) (1 diff)
• Encoding/ValueConfigurations/ValueConfiguration.cs (modified) (1 diff)
• Evaluators/ParameterConfigurationEvaluator.cs (modified) (1 diff)

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

@@ -11 +11 @@
 using System.Text;
 using System.Reflection;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -120 +121 @@
     }
 
+    protected IItemSet<IItem> validValues;
+
     #region Constructors and Cloning
     public ParameterConfiguration(string parameterName, IValueParameter valueParameter) {
@@ -125 +128 @@
       this.parameterDataType = valueParameter.GetType();
       this.valueDataType = valueParameter.DataType;
+      this.validValues = GetValidValues(valueParameter);
       this.validTypes = GetValidTypes(valueParameter).ToArray();
       this.IsNullable = valueParameter.ItemName.StartsWith("Optional");
@@ -130 +134 @@
         validTypes = new List<Type>(validTypes) { typeof(NullValue) }.ToArray();
       }
-      this.ValueConfigurations = new CheckedValueConfigurationCollection(this.validTypes);
-      this.ActualValue = new ConstrainedValue(valueParameter.Value != null ? (IItem)valueParameter.Value.Clone() : null, valueParameter.DataType, this.ValidTypes, this.IsNullable);
+      this.ValueConfigurations = new CheckedValueConfigurationCollection(this.CreateValidValues());
+      this.ActualValue = new ConstrainedValue(valueParameter.Value != null ? (IItem)valueParameter.Value.Clone() : null, valueParameter.DataType, this.CreateValidValues(), this.IsNullable);
       if (Optimize) {
         PopulateValueConfigurations();
@@ -145 +149 @@
       this.parameterDataType = original.parameterDataType;
       this.valueDataType = original.ValueDataType;
+      this.validValues = cloner.Clone(original.validValues);
       this.validTypes = original.validTypes.ToArray();
       this.valueConfigurations = cloner.Clone(original.ValueConfigurations);
@@ -186 +191 @@
           this.ValueConfigurations.Add(new NullValueConfiguration());
         } else {
-          IItem val;
-          if (ActualValue.Value != null && ActualValue.ValueDataType == t) {
-            val = ActualValue.Value; // use existing value for that type (if available)
-          } else {
-            val = (IItem)Activator.CreateInstance(t);
-          }
+          IItem val = CreateItem(t); // (IItem)Activator.CreateInstance(t);
           this.ValueConfigurations.Add(new ValueConfiguration(val, val.GetType()), true);
         }
@@ -198 +198 @@
 
     private IEnumerable<Type> GetValidTypes(IValueParameter parameter) {
-      //if (IsSubclassOfRawGeneric(typeof(OptionalConstrainedValueParameter<>), parameter.GetType())) {
-      //  var x = (IEnumerable)parameter.GetType().GetProperty("ValidValues").GetValue(parameter, new object[] { });
-      //  return new ItemSet<IItem>(x.Cast<IItem>());
-      //} else {
-      //  return new ItemSet<IItem>(ApplicationManager.Manager.GetInstances(valueDataType).Select(x => (IItem)x).OrderBy(x => x.ItemName));
-      //}
-      return ApplicationManager.Manager.GetTypes(valueDataType, true);
+      if (IsSubclassOfRawGeneric(typeof(OptionalConstrainedValueParameter<>), parameter.GetType())) {
+        var parameterValidValues = (IEnumerable)parameter.GetType().GetProperty("ValidValues").GetValue(parameter, new object[] { });
+        return parameterValidValues.Cast<object>().Select(x => x.GetType());
+      } else {
+        return ApplicationManager.Manager.GetTypes(valueDataType, true);
+      }
+    }
+
+    private IItemSet<IItem> GetValidValues(IValueParameter parameter) {
+      if (IsSubclassOfRawGeneric(typeof(OptionalConstrainedValueParameter<>), parameter.GetType())) {
+        var x = (IEnumerable)parameter.GetType().GetProperty("ValidValues").GetValue(parameter, new object[] { });
+        return new ItemSet<IItem>(x.Cast<IItem>());
+      } else {
+        return null;
+      }
+    }
+
+    public IItem CreateItem(Type type) {
+      // no valid values; just instantiate
+      if (validValues == null)
+        return (IItem)Activator.CreateInstance(type);
+
+      if (type == typeof(NullValue))
+        return new NullValue();
+      
+      // copy value from ValidValues; this ensures that previously set ActualNames for a type are kept
+      IItem value = this.validValues.Where(v => v.GetType() == type).SingleOrDefault();
+      if (value != null) 
+        return (IItem)value.Clone();
+
+      return null;
+    }
+
+    private ItemSet<IItem> CreateValidValues() {
+      var validValues = new ItemSet<IItem>();
+      foreach (Type t in this.validTypes) {
+        validValues.Add(CreateItem(t));
+      }
+      return validValues;
     }
 

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/ConstrainedValue.cs

@@ -33 +33 @@
 
     [Storable]
-    protected Type[] validTypes;
-    public Type[] ValidTypes {
-      get { return validTypes; }
+    protected IItemSet<IItem> validValues;
+    public IItemSet<IItem> ValidValues {
+      get { return validValues; }
       protected set {
-        if (this.validTypes != value) {
-          this.validTypes = value;
+        if (this.validValues != value) {
+          this.validValues = value;
         }
       }
@@ -65 +65 @@
     [StorableConstructor]
     protected ConstrainedValue(bool deserializing) : base(deserializing) { }
-    public ConstrainedValue(IItem value, Type valueDataType, Type[] validTypes, bool isNullable) {
+    public ConstrainedValue(IItem value, Type valueDataType, IItemSet<IItem> validValues, bool isNullable) {
       this.Value = value;
       this.ValueDataType = valueDataType;
-      this.ValidTypes = validTypes;
+      this.ValidValues = validValues;
       this.isNullable = isNullable;
     }
@@ -74 +74 @@
       this.valueDataType = original.valueDataType;
       this.Value = cloner.Clone(original.value);
-      if(original.ValidTypes != null) this.ValidTypes = original.ValidTypes.ToArray();
+      if(original.ValidValues != null) this.ValidValues = cloner.Clone(original.ValidValues);
       this.isNullable = original.isNullable;
     }

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

@@ -24 +24 @@
     }
 
-    public CheckedValueConfigurationCollection(IEnumerable<Type> validTypes) {
-      this.validValues = new ItemSet<IItem>();
-      foreach (Type t in validTypes) {
-        this.validValues.Add((IItem)Activator.CreateInstance(t));
-      }
+    public CheckedValueConfigurationCollection(ItemSet<IItem> validValues) {
+      this.validValues = validValues;
       RegisterEvents();
     }

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

@@ -88 +88 @@
       this.ParameterConfigurations = new ItemList<IParameterConfiguration>();
       var validTypes = ApplicationManager.Manager.GetTypes(valueDataType).OrderBy(x => x.Name).ToArray();
-      this.ActualValue = new ConstrainedValue(value, valueDataType, validTypes, false);
+      this.ActualValue = new ConstrainedValue(value, valueDataType, new ItemSet<IItem> { value }, false);
       this.IsOptimizable = true;
       if (actualValue.ValueDataType == typeof(IntValue)) {

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/ParameterConfigurationEvaluator.cs

@@ -76 +76 @@
         medians = new double[problems.Count]; // todo
         for (int i = 0; i < medians.Length; i++) {
-          medians[i] = 10;
+          medians[i] = 1;
         }
       } else {