Changeset 3677

Timestamp:

05/06/10 16:53:52 (15 years ago)

Author:

abeham

Message:

#890

• updated MichalewiczNonUniform(All|One)PositionsManipulator to default to "Generations" and added better explanation of one of the parameters

Location:

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators

Files:

• MichalewiczNonUniformAllPositionsManipulator.cs (modified) (3 diffs)
• MichalewiczNonUniformOnePositionManipulator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/MichalewiczNonUniformAllPositionsManipulator.cs

@@ -42 +42 @@
     /// </summary>
     public LookupParameter<IntValue> GenerationParameter {
-      get { return (LookupParameter<IntValue>)Parameters["Generation"]; }
+      get { return (LookupParameter<IntValue>)Parameters["Generations"]; }
     }
     /// <summary>
@@ -64 +64 @@
     public MichalewiczNonUniformAllPositionsManipulator()
       : base() {
-      Parameters.Add(new LookupParameter<IntValue>("Generation", "Current generation of the algorithm"));
+      Parameters.Add(new LookupParameter<IntValue>("Generations", "Current generation of the algorithm"));
       Parameters.Add(new LookupParameter<IntValue>("MaximumGenerations", "Maximum number of generations"));
-      Parameters.Add(new ValueLookupParameter<DoubleValue>("GenerationDependency", "Specifies the degree of dependency on the number of generations", new DoubleValue(5)));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("GenerationDependency", "Specifies the degree of dependency on the number of generations. A value of 0 means no dependency and the higher the value the stronger the progress towards maximum generations will be taken into account by sampling closer around the current position. Value must be >= 0.", new DoubleValue(5)));
     }
 
@@ -79 +79 @@
     /// <param name="currentGeneration">The current generation of the algorithm.</param>
     /// <param name="maximumGenerations">Maximum number of generations.</param>
-    /// <param name="generationsDependency">Specifies the degree of dependency on the number of generations.</param>
+    /// <param name="generationsDependency">Specifies the degree of dependency on the number of generations. A value of 0 means no dependency and the higher the value the stronger the progress towards maximum generations will be taken into account by sampling closer around the current position. Value must be >= 0.</param>
     /// <returns>The manipulated real vector.</returns>
     public static void Apply(IRandom random, RealVector vector, DoubleMatrix bounds, IntValue currentGeneration, IntValue maximumGenerations, DoubleValue generationsDependency) {
       if (currentGeneration.Value > maximumGenerations.Value) throw new ArgumentException("MichalewiczNonUniformAllPositionManipulator: CurrentGeneration must be smaller or equal than MaximumGeneration", "currentGeneration");
+      if (generationsDependency.Value < 0) throw new ArgumentException("MichalewiczNonUniformOnePositionManipulator: GenerationsDependency must be >= 0.");
       int length = vector.Length;
 

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/MichalewiczNonUniformOnePositionManipulator.cs

@@ -42 +42 @@
     /// </summary>
     public LookupParameter<IntValue> GenerationParameter {
-      get { return (LookupParameter<IntValue>)Parameters["Generation"]; }
+      get { return (LookupParameter<IntValue>)Parameters["Generations"]; }
     }
     /// <summary>
@@ -64 +64 @@
     public MichalewiczNonUniformOnePositionManipulator()
       : base() {
-      Parameters.Add(new LookupParameter<IntValue>("Generation", "Current generation of the algorithm"));
+      Parameters.Add(new LookupParameter<IntValue>("Generations", "Current generation of the algorithm"));
       Parameters.Add(new LookupParameter<IntValue>("MaximumGenerations", "Maximum number of generations"));
-      Parameters.Add(new ValueLookupParameter<DoubleValue>("GenerationDependency", "Specifies the degree of dependency on the number of generations", new DoubleValue(5)));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("GenerationDependency", "Specifies the degree of dependency on the number of generations. A value of 0 means no dependency and the higher the value the stronger the progress towards maximum generations will be taken into account by sampling closer around the current position. Value must be >= 0.", new DoubleValue(5)));
     }
 
@@ -79 +79 @@
     /// <param name="currentGeneration">The current generation of the algorithm.</param>
     /// <param name="maximumGenerations">Maximum number of generations.</param>
-    /// <param name="generationsDependency">Specifies the degree of dependency on the number of generations.</param>
+    /// <param name="generationsDependency">Specifies the degree of dependency on the number of generations. A value of 0 means no dependency and the higher the value the stronger the progress towards maximum generations will be taken into account by sampling closer around the current position. Value must be >= 0.</param>
     /// <returns>The manipulated real vector.</returns>
     public static void Apply(IRandom random, RealVector vector, DoubleMatrix bounds, IntValue currentGeneration, IntValue maximumGenerations, DoubleValue generationsDependency) {
       if (currentGeneration.Value > maximumGenerations.Value) throw new ArgumentException("MichalewiczNonUniformOnePositionManipulator: CurrentGeneration must be smaller or equal than MaximumGeneration", "currentGeneration");
+      if (generationsDependency.Value < 0) throw new ArgumentException("MichalewiczNonUniformOnePositionManipulator: GenerationsDependency must be >= 0.");
       int length = vector.Length;
       int index = random.Next(length);