Changeset 8644 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Operators

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/Operators

Files:

• Crossovers/DoubleValue/AverageDoubleValueCrossover.cs (modified) (2 diffs)
• Crossovers/DoubleValue/DiscreteDoubleValueCrossover.cs (modified) (2 diffs)
• Crossovers/DoubleValue/MultiDoubleValueCrossover.cs (deleted)
• Crossovers/DoubleValue/NormalDoubleValueCrossover.cs (modified) (2 diffs)
• Crossovers/IntValue/AverageIntValueCrossover.cs (modified) (2 diffs)
• Crossovers/IntValue/DiscreteIntValueCrossover.cs (modified) (2 diffs)
• Crossovers/IntValue/MultiIntValueCrossover.cs (deleted)
• Crossovers/IntValue/NormalIntValueCrossover.cs (modified) (2 diffs)
• Interfaces/IDoubleValueCrossover.cs (modified) (2 diffs)
• Interfaces/IDoubleValueManipulator.cs (modified) (1 diff)
• Interfaces/IIntValueCrossover.cs (modified) (1 diff)
• Interfaces/IIntValueManipulator.cs (modified) (1 diff)
• Interfaces/IValueManipulator.cs (deleted)
• Manipulators/DoubleValue/NormalDoubleValueManipulator.cs (modified) (3 diffs)
• Manipulators/DoubleValue/UniformDoubleValueManipulator.cs (modified) (3 diffs)
• Manipulators/IntValue/NormalIntValueManipulator.cs (modified) (3 diffs)
• Manipulators/IntValue/UniformIntValueManipulator.cs (modified) (3 diffs)

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);