Changeset 15176 for branches/MOCMAEvolutionStrategy/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Individual.cs

Timestamp:

07/10/17 15:31:35 (7 years ago)

Author:

bwerth

Message:

#2592 formatting & removed unreferenced enum

File:

• branches/MOCMAEvolutionStrategy/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Individual.cs (modified) (9 diffs)

branches/MOCMAEvolutionStrategy/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Individual.cs

@@ -32 +32 @@
   public class Individual : IDeepCloneable {
 
-    public enum OffspringSuccess {
-      Success, NoSuccess
-    }
-
     #region Properties
     [Storable]
@@ -54 +50 @@
     private double[,] lowerCholesky;
 
-
     //Phenotype
     [Storable]
@@ -70 +65 @@
     protected Individual(bool deserializing) { }
 
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="mean">has to be 0-vector with correct lenght</param>
-    /// <param name="pSucc">has to be ptargetsucc</param>
-    /// <param name="sigma">initialSigma</param>
-    /// <param name="pc">has to be 0-vector with correct lenght</param>
-    /// <param name="c">has to be a symmetric positive definit Covariance matrix</param>
     public Individual(RealVector mean, double pSucc, double sigma, RealVector pc, double[,] c, MOCMAEvolutionStrategy strategy) {
       Mean = mean;
@@ -147 +134 @@
         if (stepNormSqr > 1 && 1 < strategy.CovarianceMatrixUnlearningRate * (2 * stepNormSqr - 1)) rate = 1 / (2 * stepNormSqr - 1);
         CholeskyUpdate(lastStep, 1 + rate, -rate);
-
       } else RoundUpdate();
-
     }
 
@@ -159 +144 @@
         UpdateEvolutionPath(1 - strategy.EvolutionPathLearningRate, evolutionpathUpdateWeight);
         CholeskyUpdate(evolutionPath, 1 - strategy.CovarianceMatrixLearningRate, strategy.CovarianceMatrixLearningRate);
-      } else {
-        RoundUpdate();
-      }
+      } else RoundUpdate();
     }
 
@@ -172 +155 @@
     }
 
-    #region helpers
+    #region Helpers
     private void CholeskyDecomposition(double[,] c) {
       if (!alglib.spdmatrixcholesky(ref c, c.GetLength(0), false))
@@ -192 +175 @@
         var gamma = dj * betaPrime + swj2;
         var x1 = dj + swj2 / betaPrime;
-        if (x1 < 0.0) return;//throw new ArgumentException("Update makes Covariancematrix indefinite");//TODO check wether ignoring this update is valid
+        if (x1 < 0.0) return;
         var nLjj = Math.Sqrt(x1);
         lowerCholesky[j, j] = nLjj;
@@ -202 +185 @@
         for (var i = j + 1; i < n; i++) lowerCholesky[i, j] *= nLjj / ljj;
         for (var i = j + 1; i < n; i++) lowerCholesky[i, j] += nLjj * beta * wj / gamma * temp[i];
-
       }
-
     }
 
@@ -213 +194 @@
     }
     #endregion
-
   }
-
 }