Changeset 9709 for branches/CMAES/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/CMAOperators

Timestamp:

07/16/13 15:32:29 (11 years ago)

Author:

abeham

Message:

#1961: implemented reviewer comments

Location:

branches/CMAES/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/CMAOperators

Files:

• CMALinearweightedRecombinator.cs (modified) (1 diff)
• CMALogweightedRecombinator.cs (modified) (1 diff)
• CMAMutator.cs (modified) (5 diffs)

branches/CMAES/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/CMAOperators/CMALinearweightedRecombinator.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
-  [Item("CMA Linear-weighted Recombinator", "Calculates weighted mean using linear increasing weights.")]
+  [Item("CMA Linear-weighted Recombinator", "Calculates weighted mean using linear decreasing weights.")]
   [StorableClass]
   public class CMALinearweightedRecombinator : CMARecombinator {

branches/CMAES/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/CMAOperators/CMALogweightedRecombinator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
-using System.Linq;
 
 namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
-  [Item("CMA Log-weighted Recombinator", "Calculates weighted mean based on a logarithmic increasing weights.")]
+  [Item("CMA Log-weighted Recombinator", "Calculates weighted mean based on a logarithmic decreasing weights.")]
   [StorableClass]
   public class CMALogweightedRecombinator : CMARecombinator {

branches/CMAES/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/CMAOperators/CMAMutator.cs

@@ -73 +73 @@
     }
 
-    public IValueParameter<IntValue> MaxTriesParameter {
-      get { return (IValueParameter<IntValue>)Parameters["MaxTries"]; }
+    public IFixedValueParameter<IntValue> MaxTriesParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["MaxTries"]; }
+    }
+
+    public IFixedValueParameter<BoolValue> TruncateAtBoundsParameter {
+      get { return (IFixedValueParameter<BoolValue>)Parameters["TruncateAtBounds"]; }
     }
     #endregion
@@ -91 +95 @@
       Parameters.Add(new ValueLookupParameter<DoubleMatrix>("Bounds", "The bounds for the dimensions."));
       Parameters.Add(new LookupParameter<CMAParameters>("StrategyParameters", "The CMA-ES strategy parameters used for mutation."));
-      Parameters.Add(new ValueParameter<IntValue>("MaxTries", "The maximum number of tries a mutation should be performed if it was outside the bounds.", new IntValue(1000)));
+      Parameters.Add(new FixedValueParameter<IntValue>("MaxTries", "The maximum number of tries a mutation should be performed if it was outside the bounds.", new IntValue(100)));
+      Parameters.Add(new FixedValueParameter<BoolValue>("TruncateAtBounds", "Whether the point should be truncated at the bounds if none of the tries resulted in a point within the bounds.", new BoolValue(true)));
     }
 
@@ -100 +105 @@
     public override IOperation Apply() {
       var maxTries = MaxTriesParameter.Value.Value;
+      var truncateAtBounds = TruncateAtBoundsParameter.Value.Value;
       var random = RandomParameter.ActualValue;
       var lambda = PopulationSizeParameter.ActualValue.Value;
@@ -128 +134 @@
               if (!inRange) tries++;
             } while (!inRange && tries < maxTries);
-            if (!inRange && maxTries > 1) {
+            if (!inRange && truncateAtBounds) {
               if (bounds[k % bounds.Rows, 0] > arx[i][k]) arx[i][k] = bounds[k % bounds.Rows, 0];
               else if (bounds[k % bounds.Rows, 1] < arx[i][k]) arx[i][k] = bounds[k % bounds.Rows, 1];
@@ -152 +158 @@
             }
           } while (!inRange && tries < maxTries);
-          if (!inRange && maxTries > 1) {
+          if (!inRange && truncateAtBounds) {
             for (int k = 0; k < length; k++) {
               if (bounds[k % bounds.Rows, 0] > arx[i][k]) arx[i][k] = bounds[k % bounds.Rows, 0];