Changeset 9244 for branches

Timestamp:

02/26/13 14:20:58 (12 years ago)

Author:

mkommend

Message:

#1961: Corrected bounds update in CMAMutator.

File:

• branches/CMAES/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/CMAOperators/CMAMutator.cs (modified) (4 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
 
 namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
@@ -128 +128 @@
             if (!inRange && maxTries > 1) {
               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[i % bounds.Rows, 1];
+              else if (bounds[k % bounds.Rows, 1] < arx[i][k]) arx[i][k] = bounds[k % bounds.Rows, 1];
             }
           }
@@ -153 +153 @@
             for (int k = 0; k < arx[0].Length; k++) {
               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[i % bounds.Rows, 1];
+              else if (bounds[k % bounds.Rows, 1] < arx[i][k]) arx[i][k] = bounds[k % bounds.Rows, 1];
             }
           }