Changeset 5207 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations

Timestamp:

01/04/11 02:18:27 (14 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

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations

Files:

• CheckedValueConfigurationCollection.cs (modified) (1 diff)
• ValueConfiguration.cs (modified) (3 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/CheckedValueConfigurationCollection.cs

@@ -24 +24 @@
     }
 
-    public CheckedValueConfigurationCollection(IItemSet<IItem> validValues) {
-      this.validValues = validValues;
+    public CheckedValueConfigurationCollection(IEnumerable<Type> validTypes) {
+      this.validValues = new ItemSet<IItem>();
+      foreach (Type t in validTypes) {
+        this.validValues.Add((IItem)Activator.CreateInstance(t));
+      }
       RegisterEvents();
     }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/ValueConfiguration.cs

@@ -60 +60 @@
       set {
         if (this.actualValue != value) {
-          RegisterActualValueEvents();
+          DeregisterActualValueEvents();
           ClearParameterConfigurations();
           this.actualValue = value;
@@ -66 +66 @@
           OnValueChanged();
           OnToStringChanged();
-          DeregisterActualValueEvents();
+          RegisterActualValueEvents();
         }
       }
@@ -87 +87 @@
     public ValueConfiguration(IItem value, Type valueDataType) {
       this.ParameterConfigurations = new ItemList<IParameterConfiguration>();
-      var validValues = new ItemSet<IItem>(ApplicationManager.Manager.GetInstances(valueDataType).Select(x => (IItem)x).OrderBy(x => x.ItemName));
-      this.ActualValue = new ConstrainedValue(value, valueDataType, validValues, false);
+      var validTypes = ApplicationManager.Manager.GetTypes(valueDataType).OrderBy(x => x.Name).ToArray();
+      this.ActualValue = new ConstrainedValue(value, valueDataType, validTypes, false);
       this.IsOptimizable = true;
       if (actualValue.ValueDataType == typeof(IntValue)) {