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

Timestamp:

01/20/11 01:30:44 (14 years ago)

Author:

cneumuel

Message:

#1215

• made all IAlgorithm types compatible to be loaded into MetaOptimization.
• valid problem types are now automatically set

File:

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

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

@@ -217 +217 @@
     }
 
-    private IEnumerable<Type> GetValidTypes(IValueParameter parameter) {
+    private static IEnumerable<Type> GetValidTypes(IValueParameter parameter) {
       // in case of IOperator return empty list, otherwise hundreds of types would be returned. this mostly occurs for Successor which will never be optimized
       if (parameter.DataType == typeof(IOperator))
         return new List<Type>();
 
+      // return only one type for ValueTypeValues<> (Int, Double, Percent, Bool). Otherwise 2 types would be returned for DoubleValue (PercentValue which is derived)
+      if (IsSubclassOfRawGeneric(typeof(ValueTypeValue<>), parameter.DataType))
+        return new List<Type> { parameter.DataType }; 
+      
       if (IsSubclassOfRawGeneric(typeof(OptionalConstrainedValueParameter<>), parameter.GetType())) {
+        // use existing validvalues if known
         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);
+        // otherwise use all assignable types
+        return ApplicationManager.Manager.GetTypes(parameter.DataType, true);
       }
     }
@@ -273 +279 @@
           return true;
         }
-        toCheck = toCheck.BaseType;
+        toCheck = toCheck.BaseType; // baseType is null when toCheck is an Interface
+        if (toCheck == null)
+          return false;
       }
       return false;