Changeset 7153 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/ConstrainedTypeValue.cs

Timestamp:

12/07/11 21:09:40 (12 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

File:

• branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/ConstrainedTypeValue.cs (modified) (4 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) {