Changeset 5267 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding

Timestamp:

01/10/11 15:48:06 (14 years ago)

Author:

cneumuel

Message:

#1215

• optimized memory consumption

File:

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

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

@@ -121 +121 @@
     }
 
+    [Storable]
     protected IItemSet<IItem> validValues;
 
@@ -134 +135 @@
         validTypes = new List<Type>(validTypes) { typeof(NullValue) }.ToArray();
       }
-      this.ValueConfigurations = new CheckedValueConfigurationCollection(this.CreateValidValues());
-      this.ActualValue = new ConstrainedValue(valueParameter.Value != null ? (IItem)valueParameter.Value.Clone() : null, valueParameter.DataType, this.CreateValidValues(), this.IsNullable);
+      this.ValueConfigurations = new CheckedValueConfigurationCollection();
+      this.ActualValue = new ConstrainedValue(
+        valueParameter.Value != null ? (IItem)valueParameter.Value.Clone() : null, 
+        valueParameter.DataType, 
+        this.validValues != null ? new ItemSet<IItem>(this.validValues) : CreateValidValues(), 
+        this.IsNullable);
       if (Optimize) {
         PopulateValueConfigurations();
@@ -191 +196 @@
           this.ValueConfigurations.Add(new NullValueConfiguration());
         } else {
-          IItem val = CreateItem(t); // (IItem)Activator.CreateInstance(t);
+          IItem val;
+          if (ActualValue.Value != null && ActualValue.ValueDataType == t) {
+            val = (IItem)ActualValue.Value.Clone(); // use existing value for that type (if available)
+          } else {
+            val = CreateItem(t);
+          }
           this.ValueConfigurations.Add(new ValueConfiguration(val, val.GetType()), true);
         }
@@ -198 +208 @@
 
     private 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>();
+
       if (IsSubclassOfRawGeneric(typeof(OptionalConstrainedValueParameter<>), parameter.GetType())) {
         var parameterValidValues = (IEnumerable)parameter.GetType().GetProperty("ValidValues").GetValue(parameter, new object[] { });
@@ -209 +223 @@
       if (IsSubclassOfRawGeneric(typeof(OptionalConstrainedValueParameter<>), parameter.GetType())) {
         var x = (IEnumerable)parameter.GetType().GetProperty("ValidValues").GetValue(parameter, new object[] { });
-        return new ItemSet<IItem>(x.Cast<IItem>().Select(y => (IItem)y.Clone()));
+        return new ItemSet<IItem>(x.Cast<IItem>().Select(y => (IItem)y.Clone())); // cloning actually saves memory, because references to event-subscribers are removed
       } else {
         return null;
@@ -226 +240 @@
       IItem value = this.validValues.Where(v => v.GetType() == type).SingleOrDefault();
       if (value != null) 
-        return (IItem)value.Clone();
+        return value;
 
       return null;
@@ -234 +248 @@
       var validValues = new ItemSet<IItem>();
       foreach (Type t in this.validTypes) {
-        validValues.Add(CreateItem(t));
+        try {
+          var val = CreateItem(t);
+          validValues.Add(val);
+        }
+        catch (MissingMethodException) { /* Constructor is missing, don't use those types */ }
       }
       return validValues;