Changeset 5207 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/ConstrainedValue.cs

Timestamp:

01/04/11 02:18:27 (13 years ago)

Author:

cneumuel

Message:

#1215

• lots of memory-consumption improvements
• validValues -> validTypes (this saves memory!)
• changed manipulators; modifications are less significant, out-of-bound-values are resampled instead of set to lower or upper bound
• changed the way a base-level algorithm gets executed -> introduced AlgorithmExecutor

File:

• branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/ConstrainedValue.cs (modified) (3 diffs)

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

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