Changeset 9121 for branches/CMAES/HeuristicLab.Encodings.RealVectorEncoding/3.3/CMAESOperators/CMAParameters.cs

Timestamp:

01/07/13 20:21:07 (11 years ago)

Author:

abeham

Message:

#1961: Added wiring code, removed obsolete parameters, simplified mainloop slightly, changed sigmabounds to a matrix

File:

• branches/CMAES/HeuristicLab.Encodings.RealVectorEncoding/3.3/CMAESOperators/CMAParameters.cs (modified) (4 diffs)

branches/CMAES/HeuristicLab.Encodings.RealVectorEncoding/3.3/CMAESOperators/CMAParameters.cs

@@ -56 +56 @@
 
     [Storable]
-    private DoubleArray minSigma;
-    public DoubleArray MinSigma {
-      get { return minSigma; }
-      set {
-        if (minSigma == value) return;
-        minSigma = value;
-        OnPropertyChanged("MinSigma");
-      }
-    }
-
-    [Storable]
-    private DoubleArray maxSigma;
-    public DoubleArray MaxSigma {
-      get { return maxSigma; }
-      set {
-        if (maxSigma == value) return;
-        maxSigma = value;
-        OnPropertyChanged("MaxSigma");
+    private DoubleMatrix sigmaBounds;
+    public DoubleMatrix SigmaBounds {
+      get { return sigmaBounds; }
+      set {
+        if (sigmaBounds == value) return;
+        sigmaBounds = value;
+        OnPropertyChanged("SigmaBounds");
       }
     }
@@ -129 +118 @@
         cs = value;
         OnPropertyChanged("CS");
-      }
-    }
-
-    [Storable]
-    private DoubleValue c1;
-    public DoubleValue C1 {
-      get { return c1; }
-      set {
-        if (c1 == value) return;
-        c1 = value;
-        OnPropertyChanged("C1");
-      }
-    }
-
-    [Storable]
-    private DoubleValue cmu;
-    public DoubleValue CMU {
-      get { return cmu; }
-      set {
-        if (cmu == value) return;
-        cmu = value;
-        OnPropertyChanged("CMU");
       }
     }
@@ -292 +259 @@
       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.c1 = cloner.Clone(original.c1);
-      this.cc = cloner.Clone(original.cc);
       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.cmu = cloner.Clone(original.cmu);
       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.bDz = cloner.Clone(original.bDz);
-      this.maxSigma = cloner.Clone(original.maxSigma);
-      this.minSigma = cloner.Clone(original.minSigma);
       this.mu = cloner.Clone(original.mu);
       this.muCov = cloner.Clone(original.muCov);
@@ -311 +275 @@
       this.ps = cloner.Clone(original.ps);
       this.sigma = cloner.Clone(original.sigma);
+      this.sigmaBounds = cloner.Clone(original.sigmaBounds);
       this.weights = cloner.Clone(original.weights);
     }