Changeset 5653 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations

Timestamp:

03/10/11 10:44:42 (14 years ago)

Author:

cneumuel

Message:

#1215

• evaluation operator returns operatorgraph which creates a scope and an operation for each algorithm execution (each repetition and problem)
• split ValueConfiguration into ParameterizedValueConfiguration and RangeValueConfiguration

Location:

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

Files:

• . (modified) (1 prop)
• Encoding/ParameterConfigurations/ParameterConfiguration.cs (modified) (11 diffs)

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

@@ -3 +3 @@
 obj
 HeuristicLabProblemsMetaOptimizationPlugin.cs
+*.vs10x

@@ -3 +3 @@
 obj
 HeuristicLabProblemsMetaOptimizationPlugin.cs
+*.vs10x

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

@@ -2 +2 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
+using System.Text;
+using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -9 +12 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
-using System.Text;
-using System.Reflection;
-using HeuristicLab.Optimization;
-using HeuristicLab.Collections;
-using System.Drawing;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -147 +145 @@
       this.ActualValue = new ConstrainedValue(
         valueParameter.Value != null ? valueParameter.Value : null, // don't clone here; otherwise settings of a non-optimized ValueParameter will not be synchronized with the ConstrainedValue
-        valueParameter.DataType, 
-        this.validValues != null ? new ItemSet<IItem>(this.validValues) : CreateValidValues(), 
+        valueParameter.DataType,
+        this.validValues != null ? new ItemSet<IItem>(this.validValues) : CreateValidValues(),
         this.IsNullable);
       if (Optimize) {
@@ -200 +198 @@
       if (this.ActualValue != null) this.ActualValue.ToStringChanged -= new EventHandler(ActualValue_ToStringChanged);
     }
-    
+
     private void PopulateValueConfigurations() {
       foreach (Type t in this.validTypes) {
@@ -212 +210 @@
             val = CreateItem(t);
           }
-          this.ValueConfigurations.Add(new ValueConfiguration(val, val.GetType()), true);
+          if (val is IParameterizedItem) {
+            this.ValueConfigurations.Add(new ParameterizedValueConfiguration(val, val.GetType()), true);
+          } else {
+            this.ValueConfigurations.Add(new RangeValueConfiguration(val, val.GetType()), true);
+          }
         }
       }
@@ -224 +226 @@
       // return only one type for ValueTypeValues<> (Int, Double, Percent, Bool). Otherwise 2 types would be returned for DoubleValue (PercentValue which is derived)
       if (IsSubclassOfRawGeneric(typeof(ValueTypeValue<>), parameter.DataType))
-        return new List<Type> { parameter.DataType }; 
-      
+        return new List<Type> { parameter.DataType };
+
       if (IsSubclassOfRawGeneric(typeof(OptionalConstrainedValueParameter<>), parameter.GetType())) {
         // use existing validvalues if known
@@ -252 +254 @@
       if (type == typeof(NullValue))
         return new NullValue();
-      
+
       // copy value from ValidValues; this ensures that previously set ActualNames for a type are kept
       IItem value = this.validValues.Where(v => v.GetType() == type).SingleOrDefault();
-      if (value != null) 
+      if (value != null)
         return value;
 
@@ -404 +406 @@
       if (Optimize) {
         if (this.ActualValue.Value is IParameterizedItem) {
-          this.ValueConfigurations[actualValueConfigurationIndex].Parameterize((IParameterizedItem)this.ActualValue.Value);
+          ((ParameterizedValueConfiguration)this.ValueConfigurations[actualValueConfigurationIndex]).Parameterize((IParameterizedItem)this.ActualValue.Value);
         }
       }
       var clonedValue = this.ActualValue.Value != null ? (IItem)this.ActualValue.Value.Clone() : null;
-      AdaptValidValues(parameter, clonedValue);
+      if(clonedValue != null) AdaptValidValues(parameter, clonedValue);
       parameter.Value = clonedValue;
     }
@@ -433 +435 @@
         foreach (var vc in this.ValueConfigurations) {
           if (this.ValueConfigurations.ItemChecked(vc)) {
-            vc.Randomize(random);
+            if (vc.Optimize) vc.Randomize(random);
           }
         }
@@ -447 +449 @@
         foreach (var vc in this.ValueConfigurations) {
           if (this.ValueConfigurations.ItemChecked(vc)) {
-            vc.Mutate(random, mutate, intValueManipulator, doubleValueManipulator);
+            if (vc.Optimize) vc.Mutate(random, mutate, intValueManipulator, doubleValueManipulator);
           }
         }
@@ -459 +461 @@
         for (int i = 0; i < this.ValueConfigurations.Count; i++) {
           if (this.ValueConfigurations.ItemChecked(this.ValueConfigurations[i])) {
-            this.ValueConfigurations[i].Cross(random, otherPc.ValueConfigurations[i], cross, intValueCrossover, doubleValueCrossover);
+            if (this.ValueConfigurations[i].Optimize) this.ValueConfigurations[i].Cross(random, otherPc.ValueConfigurations[i], cross, intValueCrossover, doubleValueCrossover);
           }
         }

@@ -3 +3 @@
 obj
 HeuristicLabProblemsMetaOptimizationPlugin.cs
+*.vs10x