Changeset 9303

Timestamp:

03/08/13 16:05:14 (12 years ago)

Author:

abeham

Message:

#1961: Improved performance slightly (thx to mkommend)

File:

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

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -29 +30 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
-using System;
 
 namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
@@ -116 +116 @@
       var nd = new NormalDistributedRandom(random, 0, 1);
 
+      var length = arx[0].Length;
+
       for (int i = 0; i < lambda; i++) {
         int tries = 0;
         bool inRange;
         if (initialIterations > iterations) {
-          for (int k = 0; k < arx[i].Length; k++) {
+          for (int k = 0; k < length; k++) {
             do {
               arx[i][k] = xmean[k] + sp.Sigma * sp.D[k] * nd.NextDouble();
@@ -136 +138 @@
             tries++;
             inRange = true;
-            var artmp = new double[arx[0].Length];
-            for (int k = 0; k < arx[0].Length; ++k) {
+            var artmp = new double[length];
+            for (int k = 0; k < length; ++k) {
               artmp[k] = sp.D[k] * nd.NextDouble();
             }
 
-            for (int k = 0; k < arx[0].Length; k++) {
+            for (int k = 0; k < length; k++) {
               var sum = 0.0;
-              for (int j = 0; j < arx[0].Length; j++)
+              for (int j = 0; j < length; j++)
                 sum += B[k, j] * artmp[j];
               arx[i][k] = xmean[k] + sp.Sigma * sum; // m + sig * Normal(0,C)
@@ -151 +153 @@
           } while (!inRange && tries < maxTries);
           if (!inRange && maxTries > 1) {
-            for (int k = 0; k < arx[0].Length; k++) {
+            for (int k = 0; k < 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[k % bounds.Rows, 1];