Changeset 4525 for branches/HeuristicLab.MetaOptimization

Timestamp:

09/27/10 17:38:55 (14 years ago)

Author:

cneumuel

Message:

implemented basic crossover operator for ParameterSets. MetaOptimization is now functional on a basic level (Configuration and Crossing only works for IntValue Parameters) (#1215)

Location:

branches/HeuristicLab.MetaOptimization

Files:

• HeuristicLab.Problems.MetaOptimization.Views/3.3/ParameterConfigurationView.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Creators/RandomParameterSetCreator.cs (modified) (3 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encodings/Crossovers (added)
• HeuristicLab.Problems.MetaOptimization/3.3/Encodings/Crossovers/ParameterSetCrossover.cs (added)
• HeuristicLab.Problems.MetaOptimization/3.3/Encodings/NumericParameterConfiguration.cs (modified) (6 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encodings/ParameterConfiguration.cs (modified) (3 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Encodings/ParameterSet.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/MetaOptimizationEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/HeuristicLab.Problems.MetaOptimization-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IParameterConfiguration.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IParameterSet.cs (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IParameterSetOperator.cs (added)
• HeuristicLab.Problems.MetaOptimization/3.3/MetaOptimizationProblem.cs (modified) (3 diffs)
• HeuristicLab.Problems.MetaOptimization/3.3/NumericRange.cs (modified) (5 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/ParameterConfigurationView.cs

@@ -35 +35 @@
       base.OnContentChanged();
       if (Content != null) {
-        optimizeCheckBox.Checked = Content.Optimize;
         viewHost.Content = Content.Parameter;
       } else {
-        optimizeCheckBox.Checked = false;
         viewHost.Content = null;
       }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Creators/RandomParameterSetCreator.cs

@@ -7 +7 @@
 using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -26 +27 @@
     }
 
+    [Storable]
     private ParameterConfigurationList parametersToOptimize;
     public ParameterConfigurationList ParametersToOptimize {
@@ -42 +44 @@
       return base.Apply();
     }
+
+    #region Cloning
+    public override IDeepCloneable Clone(Cloner cloner) {
+      RandomParameterSetCreator clone = (RandomParameterSetCreator) base.Clone(cloner);
+      clone.parametersToOptimize = (ParameterConfigurationList)this.parametersToOptimize.Clone();
+      return clone;
+    }
+    #endregion
   }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/NumericParameterConfiguration.cs

@@ -6 +6 @@
 using HeuristicLab.Core;
 using HeuristicLab.Collections;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.MetaOptimization {
+  [StorableClass]
   public class NumericParameterConfiguration : ParameterConfiguration {
+    [Storable]
     private NumericRangeList ranges;
     public NumericRangeList Ranges {
@@ -15 +18 @@
 
     protected NumericParameterConfiguration() { }
+    
+    [StorableConstructor]
+    protected NumericParameterConfiguration(bool deserializing) : base(deserializing) { }
+
     public NumericParameterConfiguration(IParameter parameter, string category)
       : base(parameter, category) {
@@ -22 +29 @@
       this.ranges.CollectionReset += new CollectionItemsChangedEventHandler<INumericRange>(ranges_CollectionReset);
     }
+
+
 
     void ranges_CollectionReset(object sender, CollectionItemsChangedEventArgs<INumericRange> e) {
@@ -55 +64 @@
     }
 
+    #region Cloning
     public override Common.IDeepCloneable Clone(Common.Cloner cloner) {
       NumericParameterConfiguration clone = (NumericParameterConfiguration)base.Clone(cloner);
@@ -63 +73 @@
       return clone;
     }
+    #endregion
 
     void range_ToStringChanged(object sender, EventArgs e) {
@@ -72 +83 @@
     }
 
-    public override IParameter GetParameterWithRandomValue(IRandom random) {
+    public override void SetParameterWithRandomValue(IRandom random) {
       int rangeIndex = random.Next(ranges.Count);
       int value = random.Next(ranges.ElementAt(rangeIndex).LowerBound.Value, ranges.ElementAt(rangeIndex).UpperBound.Value); // TODO: respect StepSize parameter
-      IParameter clone = (IParameter)this.Parameter.Clone();
-      clone.ActualValue = new IntValue(value);
-      return clone;
+      this.Parameter.ActualValue = new IntValue(value);
     }
   }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/ParameterConfiguration.cs

@@ -5 +5 @@
 using HeuristicLab.Core;
 using HeuristicLab.Common;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.MetaOptimization {
+  [StorableClass]
   public abstract class ParameterConfiguration : IParameterConfiguration {
-    public bool Optimize { get; set; }
+    [Storable]
     public IParameter Parameter { get; set; }
+
+    [Storable]
     public string Category { get; set; }
 
     public ParameterConfiguration() { }
+    
+    [StorableConstructor]
+    protected ParameterConfiguration(bool deserializing) { }
+
     public ParameterConfiguration(IParameter parameter, string category) {
       this.Parameter = parameter;
@@ -74 +82 @@
       cloner.RegisterClonedObject(this, clone);
       clone.Parameter = (IParameter)cloner.Clone(this.Parameter);
-      clone.Optimize = this.Optimize;
+      clone.Category = this.Category;
       return clone;
     }
@@ -87 +95 @@
     }
     
-    public abstract IParameter GetParameterWithRandomValue(IRandom random);
+    public abstract void SetParameterWithRandomValue(IRandom random);
 
   }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/ParameterSet.cs

@@ -4 +4 @@
 using System.Text;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.MetaOptimization {
+  [StorableClass]
   public class ParameterSet : Item, IParameterSet {
-    private List<KeyValuePair<string, IParameter>> parameters;
-    public IEnumerable<KeyValuePair<string, IParameter>> Parameters {
+    [Storable]
+    private List<IParameterConfiguration> parameters;
+    public IEnumerable<IParameterConfiguration> Parameters {
       get { return parameters; }
     }
 
     public ParameterSet() {
-      this.parameters = new List<KeyValuePair<string, IParameter>>();
+      this.parameters = new List<IParameterConfiguration>();
     }
+
+    [StorableConstructor]
+    protected ParameterSet(bool deserializing) : base(deserializing) { }
+
     public ParameterSet(ParameterConfigurationList parametersToOptimize, IRandom random)
       : this() {
       foreach (IParameterConfiguration config in parametersToOptimize.CheckedItems) {
-        parameters.Add(new KeyValuePair<string, IParameter>(config.Category, config.GetParameterWithRandomValue(random)));
+        IParameterConfiguration clone = (IParameterConfiguration)config.Clone();
+        clone.SetParameterWithRandomValue(random);
+        parameters.Add(clone);
       }
     }
 
-
+    #region Cloning
+    public override Common.IDeepCloneable Clone(Common.Cloner cloner) {
+      ParameterSet clone = (ParameterSet)base.Clone(cloner);
+      clone.parameters = new List<IParameterConfiguration>();
+      foreach (var param in this.parameters) {
+        clone.parameters.Add((IParameterConfiguration)param.Clone(cloner));
+      }
+      return clone;
+    }
+    #endregion
   }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/MetaOptimizationEvaluator.cs

@@ -57 +57 @@
 
     private void ParametrizeAlgorithm() {
-      foreach (KeyValuePair<string, IParameter> parameter in ParameterSetParameter.ActualValue.Parameters) {
-        if (parameter.Key == "Algorithm") {
-          this.AlgorithmParameter.ActualValue.Parameters[parameter.Value.Name].ActualValue = parameter.Value.ActualValue;
-        } else if (parameter.Key == "Problem") {
-          this.AlgorithmParameter.ActualValue.Problem.Parameters[parameter.Value.Name].ActualValue = parameter.Value.ActualValue;
+      foreach (IParameterConfiguration parameter in ParameterSetParameter.ActualValue.Parameters) {
+        if (parameter.Category == "Algorithm") {
+          this.AlgorithmParameter.ActualValue.Parameters[parameter.Parameter.Name].ActualValue = parameter.Parameter.ActualValue;
+        } else if (parameter.Category == "Problem") {
+          this.AlgorithmParameter.ActualValue.Problem.Parameters[parameter.Parameter.Name].ActualValue = parameter.Parameter.ActualValue;
         }
       }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/HeuristicLab.Problems.MetaOptimization-3.3.csproj

@@ -54 +54 @@
       <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3">
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Operators-3.3">
       <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
@@ -81 +90 @@
     <Compile Include="Creators\RandomParameterSetCreator.cs" />
     <Compile Include="Encodings\BooleanParameterConfiguration.cs" />
+    <Compile Include="Encodings\Crossovers\ParameterSetCrossover.cs" />
+    <Compile Include="Interfaces\IParameterSetOperator.cs" />
     <Compile Include="NumericRangeList.cs" />
     <Compile Include="Encodings\EnumerableParameterConfiguration.cs" />

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IParameterConfiguration.cs

@@ -7 +7 @@
 namespace HeuristicLab.Problems.MetaOptimization {
   public interface IParameterConfiguration : INamedItem {
-    bool Optimize { get; set; }
     IParameter Parameter { get; set; }
     string Category { get; set; }
 
-    IParameter GetParameterWithRandomValue(IRandom random);
+    void SetParameterWithRandomValue(IRandom random);
   }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IParameterSet.cs

@@ -7 +7 @@
 namespace HeuristicLab.Problems.MetaOptimization {
   public interface IParameterSet : IItem {
-    IEnumerable<KeyValuePair<string, IParameter>> Parameters { get; }
+    IEnumerable<IParameterConfiguration> Parameters { get; }
   }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/MetaOptimizationProblem.cs

@@ -172 +172 @@
     }
 
+    #region Cloning
     public override IDeepCloneable Clone(Cloner cloner) {
       MetaOptimizationProblem clone = (MetaOptimizationProblem)base.Clone(cloner);
@@ -179 +180 @@
       return clone;
     }
+    #endregion
 
     #region Helpers
@@ -195 +197 @@
       operators.Add(new BestQualityAnalyzer());
       ParameterizeAnalyzer();
+      operators.AddRange(ApplicationManager.Manager.GetInstances<IParameterSetOperator>().Cast<IOperator>());
       ParameterizeOperators();
+
+      //UpdateMoveEvaluators();
+      //InitializeMoveGenerators();
     }
     private void ParameterizeSolutionCreator() {

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/NumericRange.cs

@@ -5 +5 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.MetaOptimization {
+  [StorableClass]
   public class NumericRange : Item, INumericRange {
+    [Storable]
     private IntValue lowerBound;
     public IntValue LowerBound {
@@ -25 +28 @@
     }
 
+    [Storable]
     private IntValue upperBound;
     public IntValue UpperBound {
@@ -42 +46 @@
     }
 
+    [Storable]
     private IntValue stepSize;
     public IntValue StepSize {
@@ -63 +68 @@
       UpperBound = new IntValue(0);
       StepSize = new IntValue(1);
+    }
+
+    [StorableConstructor]
+    protected NumericRange(bool deserializing) : base(deserializing) { }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (lowerBound != null) {
+        lowerBound.ValueChanged += new EventHandler(lowerBound_ValueChanged);
+      }
+      if (upperBound != null) {
+        upperBound.ValueChanged += new EventHandler(upperBound_ValueChanged);
+      }
+      if (stepSize != null) {
+        stepSize.ValueChanged += new EventHandler(stepSize_ValueChanged);
+      }
     }
 
@@ -95 +116 @@
       return string.Format("[{0},{1}:{2}]", LowerBound.ToString(), UpperBound.ToString(), StepSize.ToString());
     }
+
+    #region Cloning
+    public override Common.IDeepCloneable Clone(Common.Cloner cloner) {
+      NumericRange clone = (NumericRange)base.Clone(cloner);
+      clone.LowerBound = (IntValue)this.LowerBound.Clone();
+      clone.UpperBound = (IntValue)this.UpperBound.Clone();
+      clone.StepSize = (IntValue)this.StepSize.Clone();
+      return base.Clone(cloner);
+    }
+    #endregion
   }
 }