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

Timestamp:

01/11/11 16:00:17 (14 years ago)

Author:

cneumuel

Message:

#1215

• implemented crossover and manipulator operators for int and double values

Location:

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

Files:

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

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

@@ -6 +6 @@
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Collections;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -11 +12 @@
   // todo: control creatable item types
   [StorableClass]
-  public class CheckedValueConfigurationCollection : CheckedItemCollection<IValueConfiguration>, ICheckedValueConfigurationCollection {
+  public class CheckedValueConfigurationList : CheckedItemList<IValueConfiguration>, ICheckedValueConfigurationList {
     [Storable]
     private int minItemCount = 1;
@@ -24 +25 @@
     }
 
-    public CheckedValueConfigurationCollection(ItemSet<IItem> validValues) {
+    public CheckedValueConfigurationList(ItemSet<IItem> validValues) {
       this.validValues = validValues;
       RegisterEvents();
     }
-    public CheckedValueConfigurationCollection() {
+    public CheckedValueConfigurationList() {
       RegisterEvents();
     }
     [StorableConstructor]
-    protected CheckedValueConfigurationCollection(bool deserializing) : base(deserializing) {
+    protected CheckedValueConfigurationList(bool deserializing) : base(deserializing) {
       RegisterEvents();
     }
-    protected CheckedValueConfigurationCollection(CheckedValueConfigurationCollection original, Cloner cloner) : base(original, cloner) {
+    protected CheckedValueConfigurationList(CheckedValueConfigurationList original, Cloner cloner) : base(original, cloner) {
       this.minItemCount = original.MinItemCount;
       this.validValues = original.validValues;
@@ -41 +42 @@
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new CheckedValueConfigurationCollection(this, cloner);
+      return new CheckedValueConfigurationList(this, cloner);
     }
     [StorableHook(HookType.AfterDeserialization)]
@@ -49 +50 @@
 
     private void RegisterEvents() {
-      this.ItemsRemoved += new Collections.CollectionItemsChangedEventHandler<IValueConfiguration>(CheckedValueConfigurationCollection_ItemsRemoved);
-    }
-    private void DeregisterEvents() {
-      this.ItemsRemoved -= new Collections.CollectionItemsChangedEventHandler<IValueConfiguration>(CheckedValueConfigurationCollection_ItemsRemoved);
+      this.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsRemoved);
     }
 
-    private void CheckedValueConfigurationCollection_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<IValueConfiguration> e) {
+    private void DeregisterEvents() {
+      this.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsRemoved);
+    }
+
+    private void CheckedValueConfigurationList_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
       // auch collectionreset gehört berücksichtigt
       // funktioniert so nicht ganz, weil die view das hinzufügen nicht mitkriegt
@@ -66 +68 @@
       //}
     }
+
   }
 }

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

@@ -245 +245 @@
     }
 
-    public void Mutate(IRandom random, MutateDelegate mutate, ParameterConfigurationManipulator pcmanip) {
+    public void Mutate(IRandom random, MutateDelegate mutate, IIntValueManipulator intValueManipulator, IDoubleValueManipulator doubleValueManipulator) {
       if (Optimize) {
         if (rangeConstraint != null) {
-          mutate(random, this, pcmanip);
+          mutate(random, this, intValueManipulator, doubleValueManipulator);
         } else {
           foreach (IParameterConfiguration pc in this.ParameterConfigurations) {
-            pc.Mutate(random, mutate, pcmanip);
-          }
-        }
-      }
-    }
-
-    public void Cross(IRandom random, IOptimizable other, CrossDelegate cross, ParameterConfigurationCrossover pccross) {
+            pc.Mutate(random, mutate, intValueManipulator, doubleValueManipulator);
+          }
+        }
+      }
+    }
+
+    public void Cross(IRandom random, IOptimizable other, CrossDelegate cross, IIntValueCrossover intValueCrossover, IDoubleValueCrossover doubleValueCrossover) {
       if (Optimize) {
-        IValueConfiguration otherVc = (IValueConfiguration)other;
         if (rangeConstraint != null) {
-          cross(random, this, pccross);
-
-          //if (this.actualValue.ValueDataType == typeof(IntValue)) {
-          //  //this.actualValue.Value = new IntValue((((IntValue)this.actualValue.Value).Value + ((IntValue)other.ActualValue.Value).Value) / 2);
-
-          //  IntegerVector[] parents = new IntegerVector[2];
-          //  parents[0] = new IntegerVector(new int[] { ((IntValue)this.actualValue.Value).Value });
-          //  parents[1] = new IntegerVector(new int[] { ((IntValue)other.ActualValue.Value).Value });
-
-          //  this.actualValue.Value = new IntValue(HeuristicLab.Encodings.IntegerVectorEncoding.DiscreteCrossover.Apply(random, parents[0], parents[1]).First());
-
-          //} else if (this.actualValue.ValueDataType == typeof(DoubleValue)) {
-          //  //this.actualValue.Value = new DoubleValue((((DoubleValue)this.actualValue.Value).Value + ((DoubleValue)other.ActualValue.Value).Value) / 2);
-          //  RealVector[] parents = new RealVector[2];
-          //  parents[0] = new RealVector(new double[] { ((DoubleValue)this.actualValue.Value).Value });
-          //  parents[1] = new RealVector(new double[] { ((DoubleValue)other.ActualValue.Value).Value });
-
-          //  if (random.NextDouble() < 0.5) {
-          //    this.actualValue.Value = new DoubleValue(AverageCrossover.Apply(random, new ItemArray<RealVector>(parents)).First());
-          //  } else {
-          //    this.actualValue.Value = new DoubleValue(HeuristicLab.Encodings.RealVectorEncoding.DiscreteCrossover.Apply(random, new ItemArray<RealVector>(parents)).First());
-          //  }
-          //  //this.actualValue.Value = new DoubleValue(AverageCrossover.Apply(random, new ItemArray<RealVector>(parents)).First());
-
-          //} else if (this.actualValue.ValueDataType == typeof(PercentValue)) {
-          //  //this.actualValue.Value = new PercentValue((((PercentValue)this.actualValue.Value).Value + ((PercentValue)other.ActualValue.Value).Value) / 2);
-
-          //  RealVector[] parents = new RealVector[2];
-          //  parents[0] = new RealVector(new double[] { ((PercentValue)this.actualValue.Value).Value });
-          //  parents[1] = new RealVector(new double[] { ((PercentValue)other.ActualValue.Value).Value });
-
-          //  if (random.NextDouble() < 0.5) {
-          //    this.actualValue.Value = new PercentValue(AverageCrossover.Apply(random, new ItemArray<RealVector>(parents)).First());
-          //  } else {
-          //    this.actualValue.Value = new PercentValue(HeuristicLab.Encodings.RealVectorEncoding.DiscreteCrossover.Apply(random, new ItemArray<RealVector>(parents)).First());
-          //  }
-
-          //} else if (this.actualValue.ValueDataType == typeof(BoolValue)) {
-          //  if (random.NextDouble() > 0.5)
-          //    this.actualValue.Value = this.actualValue.Value;
-          //  else
-          //    this.actualValue.Value = other.ActualValue.Value;
-          //} else {
-          //  throw new NotImplementedException();
-          //}
-        } else {
+          cross(random, this, other, intValueCrossover, doubleValueCrossover);
+        } else {
+          IValueConfiguration otherVc = (IValueConfiguration)other;
           for (int i = 0; i < this.ParameterConfigurations.Count; i++) {
-            this.ParameterConfigurations.ElementAt(i).Cross(random, otherVc.ParameterConfigurations.ElementAt(i), cross, pccross);
+            this.ParameterConfigurations.ElementAt(i).Cross(random, otherVc.ParameterConfigurations.ElementAt(i), cross, intValueCrossover, doubleValueCrossover);
           }
         }