Changeset 13793 for branches/HeuristicLab.Algorithms.CMAEvolutionStrategy/sources/3.3/CMAOperators

Timestamp:

04/25/16 15:10:19 (9 years ago)

Author:

bwerth

Message:

#2592 first unfinished implementation similiar to Shark – Machine Learning 3.1

File:

• branches/HeuristicLab.Algorithms.CMAEvolutionStrategy/sources/3.3/CMAOperators/CMAUpdater.cs (modified) (4 diffs)

branches/HeuristicLab.Algorithms.CMAEvolutionStrategy/sources/3.3/CMAOperators/CMAUpdater.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
-using System.Linq;
 
 namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
@@ -125 +125 @@
       if (sp.CC == 0) sp.CC = 4.0 / (N + 4);
       if (sp.MuCov == 0) sp.MuCov = sp.MuEff;
-      if (sp.CCov == 0) sp.CCov = 2.0 / ((N + 1.41) * (N + 1.41) * sp.MuCov)
-                             + (1 - (1.0 / sp.MuCov)) * Math.Min(1, (2 * sp.MuEff - 1) / (sp.MuEff + (N + 2) * (N + 2)));
+      if (sp.CCov == 0)
+        sp.CCov = 2.0 / ((N + 1.41) * (N + 1.41) * sp.MuCov)
+             + (1 - (1.0 / sp.MuCov)) * Math.Min(1, (2 * sp.MuEff - 1) / (sp.MuEff + (N + 2) * (N + 2)));
       if (sp.CCovSep == 0) sp.CCovSep = Math.Min(1, sp.CCov * (N + 1.5) / 3);
       #endregion
@@ -269 +270 @@
         tred2(N, B, diagD, offdiag);
         tql2(N, diagD, offdiag, B);
-      } catch { result = false; }
+      }
+      catch { result = false; }
 
       return result;