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

Timestamp:

06/27/11 23:56:35 (14 years ago)

Author:

cneumuel

Message:

#1215

• fixed issue with multiple problems (by introducing valuesReadOnly to IOptimizable)
• fixed error message when removing last problem instance
• made quality measure name configurable

Location:

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

Files:

• ParameterCombinationsEnumerator.cs (modified) (1 diff)
• ParameterConfigurationTree.cs (modified) (2 diffs)
• ParameterConfigurations/ParameterConfiguration.cs (modified) (3 diffs)
• ValueConfigurations/ParameterizedValueConfiguration.cs (modified) (1 diff)
• ValueConfigurations/ValueConfiguration.cs (modified) (2 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterCombinationsEnumerator.cs

@@ -22 +22 @@
       get {
         if (!initialized)
-          throw new SystemException("Enumeration not started. Call MoveNext!");
+          throw new InvalidOperationException("Enumeration not started. Call MoveNext!");
         return Current;
       }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurationTree.cs

@@ -161 +161 @@
       this.parameterConfigurations.Add(new SingleValuedParameterConfiguration("Algorithm", algproblemitem.AlgorithmParameter));
       this.parameterConfigurations.Add(new SingleValuedParameterConfiguration("Problem", algproblemitem.ProblemParameter));
+
+      // problems can be modified in the list of problem instances, so the parameters which are not Optimize=true, 
+      // must not be modifiable in the parameter configuration tree. otherwise the parameter values would be ambiguous
+      ProblemConfiguration.ValuesReadOnly = true;
     }
     public ParameterConfigurationTree() { }
@@ -190 +194 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
+      if(ProblemConfiguration != null) ProblemConfiguration.ValuesReadOnly = true;
     }
     #endregion

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

@@ -146 +146 @@
     }
 
+    [Storable]
+    protected bool valuesReadOnly = false;
+    public virtual bool ValuesReadOnly {
+      get { return valuesReadOnly; }
+      set {
+        if (value != this.valuesReadOnly) {
+          this.valuesReadOnly = value;
+          foreach (var vc in this.valueConfigurations) {
+            vc.ValuesReadOnly = value;
+          }
+        }
+      }
+    }
 
     #region Constructors and Cloning
@@ -220 +233 @@
       this.discoverValidValues = original.discoverValidValues;
       this.AutoPopulateValueConfigurations = original.AutoPopulateValueConfigurations;
+      this.valuesReadOnly = original.valuesReadOnly;
     }
 
@@ -485 +499 @@
 
     public void Parameterize(IValueParameter parameter) {
+      if (!Optimize && ValuesReadOnly)
+        return;
+
       if (Optimize) {
         if (this.ActualValue.Value is IParameterizedItem) {

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

@@ -46 +46 @@
       get { return discoverValidValues; }
       set { discoverValidValues = value; }
+    }
+
+    public override bool ValuesReadOnly {
+      set {
+        if (value != this.valuesReadOnly) {
+          this.valuesReadOnly = value;
+          foreach (var pc in this.parameterConfigurations) {
+            pc.ValuesReadOnly = value;
+          }
+        }
+      }
     }
 

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

@@ -73 +73 @@
     }
 
+    [Storable]
+    protected bool valuesReadOnly = false;
+    public virtual bool ValuesReadOnly {
+      get { return valuesReadOnly; }
+      set {
+        if (value != this.valuesReadOnly) {
+          this.valuesReadOnly = value;
+        }
+      }
+    }
+
     #region Constructors and Cloning
     public ValueConfiguration(IItem value, Type valueDataType) {
@@ -88 +99 @@
       this.optimize = original.optimize;
       this.number = original.number;
+      this.valuesReadOnly = original.valuesReadOnly;
       RegisterActualValueEvents();
     }