Changeset 9297 for branches/CMAES/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/CMAParameters.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/CMAParameters.cs (modified) (22 diffs)

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

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using System.Collections.Generic;
@@ -33 +32 @@
 
     [Storable]
-    private DoubleValue axisRatio;
-    public DoubleValue AxisRatio {
+    private double axisRatio;
+    public double AxisRatio {
       get { return axisRatio; }
       set {
@@ -44 +43 @@
 
     [Storable]
-    private DoubleValue sigma;
-    public DoubleValue Sigma {
+    private double sigma;
+    public double Sigma {
       get { return sigma; }
       set {
@@ -55 +54 @@
 
     [Storable]
-    private DoubleMatrix sigmaBounds;
-    public DoubleMatrix SigmaBounds {
+    private double[,] sigmaBounds;
+    public double[,] SigmaBounds {
       get { return sigmaBounds; }
       set {
@@ -66 +65 @@
 
     [Storable]
-    private IntValue mu;
-    public IntValue Mu {
+    private int mu;
+    public int Mu {
       get { return mu; }
       set {
@@ -77 +76 @@
 
     [Storable]
-    private DoubleArray weights;
-    public DoubleArray Weights {
+    private double[] weights;
+    public double[] Weights {
       get { return weights; }
       set {
@@ -88 +87 @@
 
     [Storable]
-    private DoubleValue muEff;
-    public DoubleValue MuEff {
+    private double muEff;
+    public double MuEff {
       get { return muEff; }
       set {
@@ -99 +98 @@
 
     [Storable]
-    private DoubleValue cc;
-    public DoubleValue CC {
+    private double cc;
+    public double CC {
       get { return cc; }
       set {
@@ -110 +109 @@
 
     [Storable]
-    private DoubleValue cs;
-    public DoubleValue CS {
+    private double cs;
+    public double CS {
       get { return cs; }
       set {
@@ -121 +120 @@
 
     [Storable]
-    private DoubleValue damps;
-    public DoubleValue Damps {
+    private double damps;
+    public double Damps {
       get { return damps; }
       set {
@@ -132 +131 @@
 
     [Storable]
-    private DoubleValue muCov;
-    public DoubleValue MuCov {
+    private double muCov;
+    public double MuCov {
       get { return muCov; }
       set {
@@ -143 +142 @@
 
     [Storable]
-    private DoubleValue cCov;
-    public DoubleValue CCov {
+    private double cCov;
+    public double CCov {
       get { return cCov; }
       set {
@@ -154 +153 @@
 
     [Storable]
-    private DoubleValue cCovSep;
-    public DoubleValue CCovSep {
+    private double cCovSep;
+    public double CCovSep {
       get { return cCovSep; }
       set {
@@ -165 +164 @@
 
     [Storable]
-    private DoubleArray pc;
-    public DoubleArray PC {
+    private double[] pc;
+    public double[] PC {
       get { return pc; }
       set {
@@ -176 +175 @@
 
     [Storable]
-    private DoubleArray ps;
-    public DoubleArray PS {
+    private double[] ps;
+    public double[] PS {
       get { return ps; }
       set {
@@ -187 +186 @@
 
     [Storable]
-    private DoubleMatrix b;
-    public DoubleMatrix B {
+    private double[,] b;
+    public double[,] B {
       get { return b; }
       set {
@@ -198 +197 @@
 
     [Storable]
-    private DoubleArray d;
-    public DoubleArray D {
+    private double[] d;
+    public double[] D {
       get { return d; }
       set {
@@ -209 +208 @@
 
     [Storable]
-    private DoubleMatrix c;
-    public DoubleMatrix C {
+    private double[,] c;
+    public double[,] C {
       get { return c; }
       set {
@@ -220 +219 @@
 
     [Storable]
-    private DoubleArray bDz;
-    public DoubleArray BDz {
+    private double[] bDz;
+    public double[] BDz {
       get { return bDz; }
       set {
@@ -231 +230 @@
 
     [Storable]
-    private DoubleValue chiN;
-    public DoubleValue ChiN {
+    private double chiN;
+    public double ChiN {
       get { return chiN; }
       set {
@@ -242 +241 @@
 
     [Storable]
-    private IntValue initialIterations;
-    public IntValue InitialIterations {
+    private int initialIterations;
+    public int InitialIterations {
       get { return initialIterations; }
       set {
@@ -275 +274 @@
     private CMAParameters(CMAParameters original, Cloner cloner)
       : base(original, cloner) {
-      this.axisRatio = cloner.Clone(original.axisRatio);
-      this.b = cloner.Clone(original.b);
-      this.bDz = cloner.Clone(original.bDz);
-      this.c = cloner.Clone(original.c);
-      this.cCov = cloner.Clone(original.cCov);
-      this.cCovSep = cloner.Clone(original.cCovSep);
-      this.cc = cloner.Clone(original.cc);
-      this.chiN = cloner.Clone(original.chiN);
-      this.cs = cloner.Clone(original.cs);
-      this.d = cloner.Clone(original.d);
-      this.damps = cloner.Clone(original.damps);
-      this.initialIterations = cloner.Clone(original.initialIterations);
-      this.mu = cloner.Clone(original.mu);
-      this.muCov = cloner.Clone(original.muCov);
-      this.muEff = cloner.Clone(original.muEff);
-      this.pc = cloner.Clone(original.pc);
-      this.ps = cloner.Clone(original.ps);
-      this.sigma = cloner.Clone(original.sigma);
-      this.sigmaBounds = cloner.Clone(original.sigmaBounds);
-      this.weights = cloner.Clone(original.weights);
+      this.axisRatio = original.axisRatio;
+      this.b = (double[,])original.b.Clone();
+      this.bDz = (double[])original.bDz.Clone();
+      this.c = (double[,])original.c.Clone();
+      this.cCov = original.cCov;
+      this.cCovSep = original.cCovSep;
+      this.cc = original.cc;
+      this.chiN = original.chiN;
+      this.cs = original.cs;
+      this.d = (double[])original.d.Clone();
+      this.damps = original.damps;
+      this.initialIterations = original.initialIterations;
+      this.mu = original.mu;
+      this.muCov = original.muCov;
+      this.muEff = original.muEff;
+      this.pc = (double[])original.pc.Clone();
+      this.ps = (double[])original.ps.Clone();
+      this.sigma = original.sigma;
+      this.sigmaBounds = (double[,])original.sigmaBounds.Clone();
+      this.weights = (double[])original.weights.Clone();
 
       this.qualityHistory = new Queue<double>(original.qualityHistory);