Changeset 9297 for branches/CMAES/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/Terminator.cs

Timestamp:

03/07/13 16:13:17 (11 years ago)

Author:

abeham

Message:

#1961:

• Improved performance of CMA-ES without ALGLIB
  • All CMA-ES parameter are standard .NET types instead of HL types

File:

• branches/CMAES/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/Terminator.cs (modified) (2 diffs)

branches/CMAES/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/Terminator.cs

@@ -169 +169 @@
 
       double minSqrtdiagC = int.MaxValue, maxSqrtdiagC = int.MinValue;
-      for (int i = 0; i < sp.C.Rows; i++) {
+      for (int i = 0; i < sp.C.GetLength(0); i++) {
         if (Math.Sqrt(sp.C[i, i]) < minSqrtdiagC) minSqrtdiagC = Math.Sqrt(sp.C[i, i]);
         if (Math.Sqrt(sp.C[i, i]) > maxSqrtdiagC) maxSqrtdiagC = Math.Sqrt(sp.C[i, i]);
@@ -175 +175 @@
 
       var tolx = MinimumStandardDeviationParameter.ActualValue.Value;
-      if (sp.Sigma.Value * maxSqrtdiagC < tolx
-          && sp.Sigma.Value * sp.PC.Select(x => Math.Abs(x)).Max() < tolx) return terminateOp;
+      if (sp.Sigma * maxSqrtdiagC < tolx
+          && sp.Sigma * sp.PC.Select(x => Math.Abs(x)).Max() < tolx) return terminateOp;
 
       var stopTolUpXFactor = MaximumStandardDeviationChangeParameter.ActualValue.Value;
-      if (sp.Sigma.Value * maxSqrtdiagC > stopTolUpXFactor * InitialSigmaParameter.ActualValue.Max())
+      if (sp.Sigma * maxSqrtdiagC > stopTolUpXFactor * InitialSigmaParameter.ActualValue.Max())
         return terminateOp;