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

Timestamp:

12/07/11 21:09:40 (13 years ago)

Author:

ascheibe

Message:

#1215

• removed storing of valid types and valid values. This leads to wrong plugin discovery by the Persistence and Hive. Previously references to types of all available algorithms and problems were saved and needed by Hive for deserializing a MetaOpt task. Now only the actual values are saved and valid types and values are discovered after deserialization.
• added missing license headers
• added missing plugin references to plugin file

Location:

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

Files:

• ConstrainedTypeValue.cs (modified) (4 diffs)
• Encoding/ParameterConfigurations/ParameterConfiguration.cs (modified) (9 diffs)
• Plugin.cs.frame (modified) (2 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/ConstrainedTypeValue.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
-using System.Drawing;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Common;
 using HeuristicLab.PluginInfrastructure;
 
@@ -15 +12 @@
   public class ConstrainedTypeValue : TypeValue {
 
-    [Storable]
     private IEnumerable<Type> validTypes;
     public IEnumerable<Type> ValidTypes {
@@ -29 +25 @@
     }
 
-    public ConstrainedTypeValue() : base() {
+    public ConstrainedTypeValue()
+      : base() {
       this.readOnly = false;
     }
-    public ConstrainedTypeValue(Type value) : this() {
+    public ConstrainedTypeValue(Type value)
+      : this() {
       this.Value = value;
     }
@@ -51 +49 @@
   public class ConstrainedTypeValue<T> : ConstrainedTypeValue where T : class, IItem {
 
-    public ConstrainedTypeValue() : base() {
+    public ConstrainedTypeValue()
+      : base() {
       this.ValidTypes = ApplicationManager.Manager.GetTypes(typeof(T), true).ToList();
       this.Value = ValidTypes.First();
     }
-    public ConstrainedTypeValue(Type value) : base() {
+    public ConstrainedTypeValue(Type value)
+      : base() {
       this.ValidTypes = ApplicationManager.Manager.GetTypes(typeof(T), true).ToList();
       this.Value = value;
     }
+
     [StorableConstructor]
-    protected ConstrainedTypeValue(bool deserializing) : base(deserializing) { }
+    protected ConstrainedTypeValue(bool deserializing)
+      : base(deserializing) {
+      if (deserializing) {
+        this.ValidTypes = ApplicationManager.Manager.GetTypes(typeof(T), true).ToList();
+      }
+    }
+
     protected ConstrainedTypeValue(ConstrainedTypeValue original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {

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

@@ -21 +21 @@
     }
 
-    [Storable]
     public string Filename { get; set; }
 
@@ -66 +65 @@
     }
 
-    [Storable]
     protected Type[] validTypes;
     public Type[] ValidTypes {
@@ -136 +134 @@
     }
 
-    [Storable]
     protected IItemSet<IItem> validValues;
 
@@ -216 +213 @@
     [StorableConstructor]
     protected ParameterConfiguration(bool deserializing) { }
+
     protected ParameterConfiguration(ParameterConfiguration original, Cloner cloner)
       : base(original, cloner) {
@@ -236 +234 @@
     }
 
-
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ParameterConfiguration(this, cloner);
@@ -242 +239 @@
     [StorableHook(HookType.AfterDeserialization)]
     protected virtual void AfterDeserialization() {
+      this.validTypes = GetValidTypes(parameterDataType).ToArray();
+
+      if (IsNullable) {
+        validTypes = new List<Type>(validTypes) { typeof(NullValue) }.ToArray();
+      }
+      this.validValues = CreateValidValues();
+
       if (this.valueConfigurations != null) RegisterValueConfigurationEvents();
       if (this.actualValue != null) RegisterActualValueEvents();
@@ -323 +327 @@
     }
 
+    private static IEnumerable<Type> GetValidTypes(Type 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 == 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))
+        return new List<Type> { parameter };
+
+      //TODO: not sure if this if makes sense; maybe only leave else branch here
+      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 {
+        // otherwise use all assignable types
+        return ApplicationManager.Manager.GetTypes(parameter, true);
+      }
+    }
+
     private IItemSet<IItem> GetValidValues(IValueParameter parameter) {
       if (IsSubclassOfRawGeneric(typeof(OptionalConstrainedValueParameter<>), parameter.GetType())) {
@@ -330 +354 @@
         return null;
       }
-      
     }
 
@@ -612 +635 @@
     private void KeepActualValueConfigurationIndexConsistent() {
       if (this.valueConfigurations != null && this.valueConfigurations.CheckedItems.Count() > 0) {
-        if(this.valueConfigurations.Count <= this.actualValueConfigurationIndex &&
+        if (this.valueConfigurations.Count <= this.actualValueConfigurationIndex &&
            this.valueConfigurations.CheckedItems.Count(x => x.Index == this.actualValueConfigurationIndex) == 1) {
           // everything is ok; do nothing

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Plugin.cs.frame

@@ -28 +28 @@
   [Plugin("HeuristicLab.Problems.MetaOptimization", "3.3.2.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.MetaOptimization-3.3.dll", PluginFileType.Assembly)]
-  [PluginDependency("HeuristicLab.Algorithms.GeneticAlgorithm", "3.3")]
+ [PluginDependency("HeuristicLab.Algorithms.GeneticAlgorithm", "3.3")]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
@@ -38 +38 @@
   [PluginDependency("HeuristicLab.Encodings.IntegerVectorEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
   [PluginDependency("HeuristicLab.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
-  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
+  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
+  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression", "3.4")]
   [PluginDependency("HeuristicLab.Problems.TestFunctions", "3.3")]
   [PluginDependency("HeuristicLab.Random", "3.3")]