Changeset 4982 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3

Timestamp:

11/28/10 23:03:05 (14 years ago)

Author:

cneumuel

Message:

#1215 worked on metaoptimization

Location:

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

Files:

• . (modified) (1 prop)
• Encodings/ParameterConfigurations/ParameterConfiguration.cs (modified) (1 diff)
• Encodings/ValueConfigurations/CheckedValueConfigurationCollection.cs (modified) (2 diffs)
• Encodings/ValueConfigurations/RootValueConfiguration.cs (added)
• Encodings/ValueConfigurations/ValueConfiguration.cs (modified) (3 diffs)
• HeuristicLab.Problems.MetaOptimization-3.3.csproj (modified) (2 diffs)
• HeuristicLabProblemsMetaOptimizationPlugin.cs (deleted)
• HeuristicLabProblemsMetaOptimizationPlugin.cs.frame (added)
• Interfaces/ICheckedValueConfigurationCollection.cs (modified) (1 diff)
• MetaOptimizationProblem.cs (modified) (1 diff)
• Properties (modified) (1 prop)
• Properties/AssemblyInfo.cs (deleted)
• Properties/AssemblyInfo.cs.frame (added)

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

@@ -2 +2 @@
 bin
 obj
+HeuristicLabProblemsMetaOptimizationPlugin.cs

@@ -2 +2 @@
 bin
 obj
+HeuristicLabProblemsMetaOptimizationPlugin.cs

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

@@ -117 +117 @@
 
     private void PopulateValueConfigurations() {
-      foreach (IItem item in this.validValues) {
-        this.ValueConfigurations.Add(new ValueConfiguration(item, item.GetType()), false);
+      foreach (IItem validValue in this.validValues) {
+        IItem val;
+        if (actualValueConfiguration.ConstrainedValue.Value != null && actualValueConfiguration.ConstrainedValue.ValueDataType == validValue.GetType()) {
+          val = actualValueConfiguration.ConstrainedValue.Value; // use existing value for that type (if available)
+        } else {
+          val = validValue;
+        }
+        this.ValueConfigurations.Add(new ValueConfiguration(val, val.GetType()), true);
       }
     }

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

@@ -4 +4 @@
 using System.Text;
 using HeuristicLab.Core;
+using HeuristicLab.Common;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.MetaOptimization {
   // todo: check that at least 1 elements needs to be selected
   // todo: control creatable item types
+  [StorableClass]
   public class CheckedValueConfigurationCollection : CheckedItemCollection<IValueConfiguration>, ICheckedValueConfigurationCollection {
+    [Storable]
+    private int minItemCount = 1;
+    public int MinItemCount { 
+      get { return minItemCount; } 
+    }
 
+    [Storable]
     protected Type valueDataType;
     public Type ValueDataType {
@@ -17 +26 @@
     public CheckedValueConfigurationCollection(Type valueDataType) {
       this.valueDataType = valueDataType;
+      RegisterEvents();
+    }
+    public CheckedValueConfigurationCollection() {
+      RegisterEvents();
+    }
+    [StorableConstructor]
+    protected CheckedValueConfigurationCollection(bool deserializing) : base(deserializing) {
+      RegisterEvents();
+    }
+    protected CheckedValueConfigurationCollection(CheckedValueConfigurationCollection original, Cloner cloner) : base(original, cloner) {
+      this.minItemCount = original.MinItemCount;
+      this.valueDataType = original.valueDataType;
+      RegisterEvents();
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CheckedValueConfigurationCollection(this, cloner);
+    }
+
+    private void RegisterEvents() {
+      this.ItemsRemoved += new Collections.CollectionItemsChangedEventHandler<IValueConfiguration>(CheckedValueConfigurationCollection_ItemsRemoved);
+    }
+    private void DeregisterEvents() {
+      this.ItemsRemoved -= new Collections.CollectionItemsChangedEventHandler<IValueConfiguration>(CheckedValueConfigurationCollection_ItemsRemoved);
+    }
+
+    private void CheckedValueConfigurationCollection_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<IValueConfiguration> e) {
+      // auch collectionreset gehört berücksichtigt
+      // funktioniert so nicht ganz, weil die view das hinzufügen nicht mitkriegt
+      //if (this.Count < minItemCount) {
+      //  foreach (var item in e.Items) {
+      //    if (this.Count >= minItemCount)
+      //      break;
+      //    this.Add(item);
+      //  }
+      //}
     }
   }

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

@@ -30 +30 @@
     protected IItemCollection<IParameterConfiguration> parameterConfigurations = new ItemCollection<IParameterConfiguration>();
     public IItemCollection<IParameterConfiguration> ParameterConfigurations {
-      get { return this.parameterConfigurations; }
+      get { return new ReadOnlyItemCollection<IParameterConfiguration>(this.parameterConfigurations); }
       protected set { this.parameterConfigurations = value; }
     }
@@ -55 +55 @@
     #region Constructors and Cloning
     public ValueConfiguration(IItem value, Type valueDataType) {
-      this.parameterConfigurations = new ItemList<IParameterConfiguration>();
+      this.ParameterConfigurations = new ItemList<IParameterConfiguration>();
       this.ConstrainedValue = new ConstrainedValue(value, valueDataType);
       if (constrainedValue.ValueDataType == typeof(IntValue)) {
@@ -86 +86 @@
         foreach (var childParameter in parameterizedItem.Parameters) {
           var pc = ParameterConfiguration.Create(parameterizedItem, childParameter);
-          if (pc != null) this.ParameterConfigurations.Add(pc);
+          if (pc != null) this.parameterConfigurations.Add(pc);
         }
       }
     }
     protected virtual void ClearParameterConfigurations() {
-      ParameterConfigurations.Clear();
+      parameterConfigurations.Clear();
     }
 

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

@@ -88 +88 @@
   <ItemGroup>
     <Compile Include="Analyzers\BestParameterConfigurationAnalyzer.cs" />
+    <None Include="Properties\AssemblyInfo.cs.frame" />
+    <None Include="HeuristicLabProblemsMetaOptimizationPlugin.cs.frame" />
     <Compile Include="Encodings\RangeConstraints\ConstrainedValue.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Encodings\ValueConfigurations\RootValueConfiguration.cs" />
     <Compile Include="Encodings\ValueConfigurations\ValueConfiguration.cs" />
     <Compile Include="Encodings\ValueConfigurations\CheckedValueConfigurationCollection.cs" />
@@ -120 +123 @@
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
-set Outdir=$(Outdir)</PreBuildEvent>
+set Outdir=$(Outdir)
+
+call PreBuildEvent.cmd</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>

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

@@ -7 +7 @@
 namespace HeuristicLab.Problems.MetaOptimization {
   public interface ICheckedValueConfigurationCollection : ICheckedItemCollection<IValueConfiguration> {
+    int MinItemCount { get; }
     Type ValueDataType { get; }
   }

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

@@ -153 +153 @@
       if (Algorithm != null) {
         Algorithm.ProblemChanged += new EventHandler(BaseLevelAlgorithm_ProblemChanged);
-        AlgorithmParameterConfiguration = new ValueConfiguration(Algorithm, Algorithm.GetType());
+        AlgorithmParameterConfiguration = new RootValueConfiguration(Algorithm, Algorithm.GetType());
       }
       BaseLevelAlgorithm_ProblemChanged(sender, e);

@@ -2 +2 @@
 bin
 obj
+HeuristicLabProblemsMetaOptimizationPlugin.cs