Changeset 8644 for branches

Timestamp:

09/13/12 14:06:56 (12 years ago)

Author:

jkarder

Message:

#1853:

• removed multi-crossovers for integer and double values
• restructured crossovers and manipulators for integer and double values

Location:

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3

Files:

• HeuristicLab.Encodings.ParameterConfigurationEncoding-3.3.csproj (modified) (2 diffs)
• Operators/Crossovers/DoubleValue/AverageDoubleValueCrossover.cs (modified) (2 diffs)
• Operators/Crossovers/DoubleValue/DiscreteDoubleValueCrossover.cs (modified) (2 diffs)
• Operators/Crossovers/DoubleValue/MultiDoubleValueCrossover.cs (deleted)
• Operators/Crossovers/DoubleValue/NormalDoubleValueCrossover.cs (modified) (2 diffs)
• Operators/Crossovers/IntValue/AverageIntValueCrossover.cs (modified) (2 diffs)
• Operators/Crossovers/IntValue/DiscreteIntValueCrossover.cs (modified) (2 diffs)
• Operators/Crossovers/IntValue/MultiIntValueCrossover.cs (deleted)
• Operators/Crossovers/IntValue/NormalIntValueCrossover.cs (modified) (2 diffs)
• Operators/Interfaces/IDoubleValueCrossover.cs (modified) (2 diffs)
• Operators/Interfaces/IDoubleValueManipulator.cs (modified) (1 diff)
• Operators/Interfaces/IIntValueCrossover.cs (modified) (1 diff)
• Operators/Interfaces/IIntValueManipulator.cs (modified) (1 diff)
• Operators/Interfaces/IValueManipulator.cs (deleted)
• Operators/Manipulators/DoubleValue/NormalDoubleValueManipulator.cs (modified) (3 diffs)
• Operators/Manipulators/DoubleValue/UniformDoubleValueManipulator.cs (modified) (3 diffs)
• Operators/Manipulators/IntValue/NormalIntValueManipulator.cs (modified) (3 diffs)
• Operators/Manipulators/IntValue/UniformIntValueManipulator.cs (modified) (3 diffs)
• RangeConstraints/Range.cs (modified) (1 diff)
• ValueConfigurations/CheckedValueConfigurationCollection.cs (modified) (3 diffs)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/HeuristicLab.Encodings.ParameterConfigurationEncoding-3.3.csproj

@@ -119 +119 @@
     <Compile Include="Operators\Crossovers\DoubleValue\AverageDoubleValueCrossover.cs" />
     <Compile Include="Operators\Crossovers\DoubleValue\DiscreteDoubleValueCrossover.cs" />
-    <Compile Include="Operators\Crossovers\DoubleValue\MultiDoubleValueCrossover.cs" />
     <Compile Include="Operators\Crossovers\DoubleValue\NormalDoubleValueCrossover.cs" />
     <Compile Include="Operators\Crossovers\IntValue\AverageIntValueCrossover.cs" />
     <Compile Include="Operators\Crossovers\IntValue\DiscreteIntValueCrossover.cs" />
-    <Compile Include="Operators\Crossovers\IntValue\MultiIntValueCrossover.cs" />
     <Compile Include="Operators\Crossovers\IntValue\NormalIntValueCrossover.cs" />
     <Compile Include="Operators\Interfaces\IDoubleValueCrossover.cs" />
@@ -129 +127 @@
     <Compile Include="Operators\Interfaces\IIntValueCrossover.cs" />
     <Compile Include="Operators\Interfaces\IIntValueManipulator.cs" />
-    <Compile Include="Operators\Interfaces\IValueManipulator.cs" />
     <Compile Include="Operators\Manipulators\DoubleValue\NormalDoubleValueManipulator.cs" />
     <Compile Include="Operators\Manipulators\DoubleValue\UniformDoubleValueManipulator.cs" />

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Crossovers/DoubleValue/AverageDoubleValueCrossover.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -34 +31 @@
   [Item("AverageDoubleValueCrossover", "An operator which crosses two double values. TODO")]
   [StorableClass]
-  public class AverageDoubleValueCrossover : SingleSuccessorOperator, IDoubleValueCrossover, IStochasticOperator {
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-
+  public class AverageDoubleValueCrossover : Item, IDoubleValueCrossover {
     #region Constructors and Cloning
     public AverageDoubleValueCrossover() : base() { }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Crossovers/DoubleValue/DiscreteDoubleValueCrossover.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -34 +31 @@
   [Item("DiscreteDoubleValueCrossover", "An operator which crosses two double values. TODO")]
   [StorableClass]
-  public class DiscreteDoubleValueCrossover : SingleSuccessorOperator, IDoubleValueCrossover, IStochasticOperator {
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-
+  public class DiscreteDoubleValueCrossover : Item, IDoubleValueCrossover {
     #region Constructors and Cloning
     public DiscreteDoubleValueCrossover() : base() { }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Crossovers/DoubleValue/NormalDoubleValueCrossover.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
@@ -36 +33 @@
   [Item("NormalDoubleValueCrossover", "An operator which crosses two double values. TODO")]
   [StorableClass]
-  public class NormalDoubleValueCrossover : SingleSuccessorOperator, IDoubleValueCrossover, IStochasticOperator {
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-
+  public class NormalDoubleValueCrossover : Item, IDoubleValueCrossover {
     #region Constructors and Cloning
     public NormalDoubleValueCrossover() : base() { }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Crossovers/IntValue/AverageIntValueCrossover.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -34 +31 @@
   [Item("AverageIntValueCrossover", "An operator which crosses two integer values. TODO")]
   [StorableClass]
-  public class AverageIntValueCrossover : SingleSuccessorOperator, IIntValueCrossover, IStochasticOperator {
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-
+  public class AverageIntValueCrossover : Item, IIntValueCrossover {
     #region Constructors and Cloning
     public AverageIntValueCrossover() : base() { }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Crossovers/IntValue/DiscreteIntValueCrossover.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -34 +31 @@
   [Item("DiscreteIntValueCrossover", "An operator which crosses two integer values. TODO")]
   [StorableClass]
-  public class DiscreteIntValueCrossover : SingleSuccessorOperator, IIntValueCrossover, IStochasticOperator {
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-
+  public class DiscreteIntValueCrossover : Item, IIntValueCrossover {
     #region Constructors and Cloning
     public DiscreteIntValueCrossover() : base() { }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Crossovers/IntValue/NormalIntValueCrossover.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
@@ -36 +33 @@
   [Item("NormalIntValueCrossover", "An operator which crosses two integer values. TODO")]
   [StorableClass]
-  public class NormalIntValueCrossover : SingleSuccessorOperator, IIntValueCrossover, IStochasticOperator {
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-
+  public class NormalIntValueCrossover : Item, IIntValueCrossover {
     #region Constructors and Cloning
     public NormalIntValueCrossover() : base() { }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Interfaces/IDoubleValueCrossover.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Encodings.ParameterConfigurationEncoding {
@@ -28 +27 @@
   /// An interface which represents a crossover operator for double values.
   /// </summary>
-  public interface IDoubleValueCrossover : ICrossover {
+  public interface IDoubleValueCrossover : IItem {
     void Apply(IRandom random, DoubleValue value, DoubleValue other, DoubleValueRange range);
   }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Interfaces/IDoubleValueManipulator.cs

@@ -27 +27 @@
   /// An interface which represents a manipulation operator for double values.
   /// </summary>
-  public interface IDoubleValueManipulator : IValueManipulator {
+  public interface IDoubleValueManipulator : IItem {
     void Apply(IRandom random, DoubleValue value, DoubleValueRange range);
   }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Interfaces/IIntValueCrossover.cs

@@ -28 +28 @@
   /// An interface which represents a crossover operator for integer values.
   /// </summary>
-  public interface IIntValueCrossover : ICrossover {
+  public interface IIntValueCrossover : IItem {
     void Apply(IRandom random, IntValue value, IntValue other, IntValueRange range);
   }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Interfaces/IIntValueManipulator.cs

@@ -27 +27 @@
   /// An interface which represents a manipulation operator for integer values.
   /// </summary>
-  public interface IIntValueManipulator : IValueManipulator {
+  public interface IIntValueManipulator : IItem {
     void Apply(IRandom random, IntValue value, IntValueRange range);
   }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Manipulators/DoubleValue/NormalDoubleValueManipulator.cs

@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -35 +32 @@
   [Item("NormalDoubleValueManipulator", "An operator which manipulates two double values. TODO")]
   [StorableClass]
-  public class NormalDoubleValueManipulator : SingleSuccessorOperator, IDoubleValueManipulator, IStochasticOperator {
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-
+  public class NormalDoubleValueManipulator : Item, IDoubleValueManipulator {
     #region Constructors and Cloning
     public NormalDoubleValueManipulator() : base() { }
@@ -51 +44 @@
     #endregion
 
-    // TODO: override Apply
     public void Apply(IRandom random, DoubleValue value, DoubleValueRange range) {
       ApplyStatic(random, value, range);

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Manipulators/DoubleValue/UniformDoubleValueManipulator.cs

@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -35 +32 @@
   [Item("UniformDoubleValueManipulator", "An operator which manipulates two double values. TODO")]
   [StorableClass]
-  public class UniformDoubleValueManipulator : SingleSuccessorOperator, IDoubleValueManipulator, IStochasticOperator {
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-
+  public class UniformDoubleValueManipulator : Item, IDoubleValueManipulator {
     #region Constructors and Cloning
     public UniformDoubleValueManipulator() : base() { }
@@ -51 +44 @@
     #endregion
 
-    // TODO: override Apply
     public void Apply(IRandom random, DoubleValue value, DoubleValueRange range) {
       ApplyStatic(random, value, range);

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Manipulators/IntValue/NormalIntValueManipulator.cs

@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -35 +32 @@
   [Item("NormalIntValueManipulator", "An operator which manipulates two integer values. TODO")]
   [StorableClass]
-  public class NormalIntValueManipulator : SingleSuccessorOperator, IIntValueManipulator, IStochasticOperator {
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-
+  public class NormalIntValueManipulator : Item, IIntValueManipulator {
     #region Constructors and Cloning
     public NormalIntValueManipulator() : base() { }
@@ -51 +44 @@
     #endregion
 
-    // TODO: override Apply
     public void Apply(IRandom random, IntValue value, IntValueRange range) {
       ApplyStatic(random, value, range);

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators/Manipulators/IntValue/UniformIntValueManipulator.cs

@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
-using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -35 +32 @@
   [Item("UniformIntValueManipulator", "An operator which manipulates two integer values. TODO")]
   [StorableClass]
-  public class UniformIntValueManipulator : SingleSuccessorOperator, IIntValueManipulator, IStochasticOperator {
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (LookupParameter<IRandom>)Parameters["Random"]; }
-    }
-
+  public class UniformIntValueManipulator : Item, IIntValueManipulator {
     #region Constructors and Cloning
     public UniformIntValueManipulator() : base() { }
@@ -51 +44 @@
     #endregion
 
-    // TODO: override Apply
     public void Apply(IRandom random, IntValue value, IntValueRange range) {
       ApplyStatic(random, value, range);

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/RangeConstraints/Range.cs

@@ -206 +206 @@
     }
     public bool Validate(string value, out string errorMessage) {
-      // TODO: check that stepsize < upper - lower
       T lower = (T)lowerBound.Clone();
       T upper = (T)upperBound.Clone();

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ValueConfigurations/CheckedValueConfigurationCollection.cs

@@ -29 +29 @@
 namespace HeuristicLab.Encodings.ParameterConfigurationEncoding {
   // TODO: check that at least 1 element needs to be selected
-  // TODO: control creatable item types
+  // TODO: control creatable item types ### EDIT: done?
   [StorableClass]
   public class CheckedValueConfigurationList : CheckedItemList<IValueConfiguration>, ICheckedValueConfigurationList {
@@ -81 +81 @@
     private void RegisterEvents() {
       this.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsAdded);
+      this.CheckedItemsChanged += new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_CheckedItemsChanged);
     }
 
     private void DeregisterEvents() {
+      this.CheckedItemsChanged -= new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_CheckedItemsChanged);
       this.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsAdded);
     }
 
+    #region Events
     private void CheckedValueConfigurationList_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
       foreach (var item in e.Items) {
         var matchingItems = this.Where(x => x != item.Value && x.ActualValue.ValueDataType == item.Value.ActualValue.ValueDataType);
-        if (matchingItems.Count() > 0) {
+        if (matchingItems.Any()) {
           int maxNumber = matchingItems.Select(x => x.Number).Max();
           item.Value.Number = maxNumber + 1;
@@ -96 +99 @@
       }
     }
+    private void CheckedValueConfigurationList_CheckedItemsChanged(object sender, CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
+      // TODO: view does not get notified
+      if (!this.CheckedItems.Any()) this.SetItemCheckedState(e.Items.Single().Value, true);
+    }
+    #endregion
+
   }
 }