Changeset 9121 for branches/CMAES

Timestamp:

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

Author:

abeham

Message:

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

Location:

branches/CMAES

Files:

• CMAES.sln (modified) (2 diffs)
• HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/CMAEvolutionStrategy.cs (modified) (previous)
• HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/CMAEvolutionStrategyMainLoop.cs (modified) (previous)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/CMAESOperators/CMAInitializer.cs (modified) (4 diffs)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/CMAESOperators/CMAMutator.cs (modified) (2 diffs)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/CMAESOperators/CMAParameters.cs (modified) (4 diffs)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/CMAESOperators/CMAUpdater.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ICMAESInitializer.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions (copied) (copied from trunk/sources/HeuristicLab.Problems.TestFunctions)
• HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj (modified) (8 diffs)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (10 diffs)

branches/CMAES/CMAES.sln

@@ -7 +7 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization-3.3", "HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj", "{14AB8D24-25BC-400C-A846-4627AA945192}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.TestFunctions-3.3", "HeuristicLab.Problems.TestFunctions\3.3\HeuristicLab.Problems.TestFunctions-3.3.csproj", "{88B9B0E3-344E-4196-82A3-0F9732506FE8}"
 EndProject
 Global
@@ -54 +56 @@
     {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x86.ActiveCfg = Release|x86
     {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x86.Build.0 = Release|x86
+    {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Debug|x64.ActiveCfg = Debug|x64
+    {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Debug|x64.Build.0 = Debug|x64
+    {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Debug|x86.ActiveCfg = Debug|x86
+    {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Debug|x86.Build.0 = Debug|x86
+    {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Release|Any CPU.Build.0 = Release|Any CPU
+    {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Release|x64.ActiveCfg = Release|x64
+    {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Release|x64.Build.0 = Release|x64
+    {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Release|x86.ActiveCfg = Release|x86
+    {88B9B0E3-344E-4196-82A3-0F9732506FE8}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
     HideSolutionNode = FALSE
   EndGlobalSection
+  GlobalSection(Performance) = preSolution
+    HasPerformanceSessions = true
+  EndGlobalSection
 EndGlobal

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

@@ -48 +48 @@
     }
 
-    public IValueLookupParameter<DoubleArray> MaxSigmaParameter {
-      get { return (IValueLookupParameter<DoubleArray>)Parameters["MaxSigma"]; }
-    }
-
-    public IValueLookupParameter<DoubleArray> MinSigmaParameter {
-      get { return (IValueLookupParameter<DoubleArray>)Parameters["MinSigma"]; }
+    public IValueLookupParameter<DoubleMatrix> SigmaBoundsParameter {
+      get { return (IValueLookupParameter<DoubleMatrix>)Parameters["SigmaBounds"]; }
     }
 
@@ -88 +84 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("Dimension", "The problem dimension (N)."));
       Parameters.Add(new ValueLookupParameter<DoubleArray>("InitialSigma", "The initial value for Sigma (need to be > 0), can be single dimensioned or an array that should be equal to the size of the vector.", new DoubleArray(new[] { 0.5 })));
-      Parameters.Add(new ValueLookupParameter<DoubleArray>("MaxSigma", "The maximum sigma value can be omitted, given as one value for all dimensions or a value for each dimension."));
-      Parameters.Add(new ValueLookupParameter<DoubleArray>("MinSigma", "The minimum sigma value can be omitted, given as one value for all dimensions or a value for each dimension."));
+      Parameters.Add(new ValueLookupParameter<DoubleMatrix>("SigmaBounds", "The bounds for sigma value can be omitted, given as one value for all dimensions or a value for each dimension. First column specifies minimum, second column maximum value."));
       Parameters.Add(new LookupParameter<IntValue>("Iterations", "The current iteration that is being processed."));
       Parameters.Add(new ValueLookupParameter<IntValue>("MaximumIterations", "The maximum number of iterations to be processed."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("InitialIterations", "The number of iterations that should be performed using the diagonal covariance matrix only."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("InitialIterations", "The number of iterations that should be performed using the diagonal covariance matrix only.", new IntValue(0)));
       Parameters.Add(new LookupParameter<IntValue>("PopulationSize", "The population size (lambda)."));
       Parameters.Add(new LookupParameter<IntValue>("Mu", "The number of offspring considered for updating of the strategy parameters."));
@@ -132 +127 @@
 
       // ensure maximal and minimal standard deviations
-      var minSigma = MinSigmaParameter.ActualValue;
-      if (minSigma != null && minSigma.Length > 0) {
+      var sigmaBounds = SigmaBoundsParameter.ActualValue;
+      if (sigmaBounds != null && sigmaBounds.Rows > 0) {
         for (int i = 0; i < N; i++) {
-          var d = minSigma[(int)Math.Min(i, minSigma.Length - 1)];
+          var d = sigmaBounds[(int)Math.Min(i, sigmaBounds.Rows - 1), 0];
           if (d > sigma * minSqrtdiagC) sigma = d / minSqrtdiagC;
         }
-      }
-      var maxSigma = MaxSigmaParameter.ActualValue;
-      if (maxSigma != null && maxSigma.Length > 0) {
         for (int i = 0; i < N; i++) {
-          var d = maxSigma[(int)Math.Min(i, maxSigma.Length - 1)];
+          var d = sigmaBounds[(int)Math.Min(i, sigmaBounds.Rows - 1), 1];
           if (d > sigma * maxSqrtdiagC) sigma = d / maxSqrtdiagC;
         }
@@ -181 +173 @@
       sp.BDz = new DoubleArray(BDz);
       sp.Sigma = new DoubleValue(sigma);
-      if (maxSigma != null) sp.MaxSigma = (DoubleArray)maxSigma.Clone();
-      if (minSigma != null) sp.MinSigma = (DoubleArray)minSigma.Clone();
+      if (sigmaBounds != null) sp.SigmaBounds = (DoubleMatrix)sigmaBounds.Clone();
       sp.InitialIterations = new IntValue(initialIterations.Value);
 

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

@@ -105 +105 @@
       } else {
         bool inRange;
+        var B = sp.B;
         tries = 0;
         do {
@@ -116 +117 @@
             var sum = 0.0;
             for (int j = 0; j < arx.Length; j++)
-              sum += sp.B[i, j] * artmp[j];
+              sum += B[i, j] * artmp[j];
             arx[i] = copy[i] + sp.Sigma.Value * sum; // m + sig * Normal(0,C) 
             if (bounds[i % bounds.Rows, 0] > arx[i] || arx[i] > bounds[i % bounds.Rows, 1])

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);
     }

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

@@ -157 +157 @@
 
       // ensure maximal and minimal standard deviations
-      if (sp.MinSigma != null && sp.MinSigma.Length > 0) {
-        for (int i = 0; i < N; i++) {
-          var d = sp.MinSigma[Math.Min(i, sp.MinSigma.Length - 1)];
+      if (sp.SigmaBounds != null && sp.SigmaBounds.Rows > 0) {
+        for (int i = 0; i < N; i++) {
+          var d = sp.SigmaBounds[Math.Min(i, sp.SigmaBounds.Rows - 1), 0];
           if (d > sp.Sigma.Value * minSqrtdiagC) sp.Sigma.Value = d / minSqrtdiagC;
         }
-      }
-      if (sp.MaxSigma != null && sp.MaxSigma.Length > 0) {
-        for (int i = 0; i < N; i++) {
-          var d = sp.MaxSigma[Math.Min(i, sp.MaxSigma.Length - 1)];
+        for (int i = 0; i < N; i++) {
+          var d = sp.SigmaBounds[Math.Min(i, sp.SigmaBounds.Rows - 1), 1];
           if (d > sp.Sigma.Value * maxSqrtdiagC) sp.Sigma.Value = d / maxSqrtdiagC;
         }

branches/CMAES/HeuristicLab.Optimization/3.3/Interfaces/ICMAESInitializer.cs

@@ -30 +30 @@
     Type CMAType { get; }
 
+    ILookupParameter<IntValue> PopulationSizeParameter { get; }
     ILookupParameter<IntValue> MuParameter { get; }
+    IValueLookupParameter<DoubleArray> InitialSigmaParameter { get; }
   }
 }

branches/CMAES/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj

@@ -41 +41 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -50 +50 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -58 +58 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -66 +66 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -76 +76 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -84 +84 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
@@ -93 +93 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Analysis-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Collections-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Core-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Data-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Operators-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Parameters-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Persistence-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -162 +206 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
-      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
-      <Name>HeuristicLab.Analysis-3.3</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
-      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
-      <Name>HeuristicLab.Collections-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
-      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
-      <Name>HeuristicLab.Common.Resources-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
-      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
-      <Name>HeuristicLab.Common-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
-      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
-      <Name>HeuristicLab.Core-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
-      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
-      <Name>HeuristicLab.Data-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
       <Project>{BB6D334A-4BB6-4674-9883-31A6EBB32CAB}</Project>
       <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
       <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
-      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
-      <Name>HeuristicLab.Operators-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
-      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
-      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
       <Name>HeuristicLab.Optimization-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
-      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
-      <Name>HeuristicLab.Parameters-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
-      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
-      <Name>HeuristicLab.Persistence-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
-      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
-      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
       <Private>False</Private>
     </ProjectReference>

branches/CMAES/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
@@ -32 +29 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace HeuristicLab.Problems.TestFunctions {
@@ -330 +330 @@
       try {
         BestKnownSolutionParameter.Value = Evaluator.GetBestKnownSolution(ProblemSize.Value);
-      }
-      catch (ArgumentException e) {
+      } catch (ArgumentException e) {
         ErrorHandling.ShowErrorDialog(e);
         ProblemSize.Value = Evaluator.MinimumProblemSize;
@@ -337 +336 @@
     }
     private void ParameterizeOperators() {
-      foreach (IRealVectorCrossover op in Operators.OfType<IRealVectorCrossover>()) {
+      foreach (var op in Operators.OfType<IRealVectorCrossover>()) {
         op.ParentsParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
         op.ParentsParameter.Hidden = true;
@@ -345 +344 @@
         op.BoundsParameter.Hidden = true;
       }
-      foreach (IRealVectorManipulator op in Operators.OfType<IRealVectorManipulator>()) {
+      foreach (var op in Operators.OfType<IRealVectorManipulator>()) {
         op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
         op.RealVectorParameter.Hidden = true;
@@ -351 +350 @@
         op.BoundsParameter.Hidden = true;
       }
-      foreach (IRealVectorMoveOperator op in Operators.OfType<IRealVectorMoveOperator>()) {
-        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
-        op.RealVectorParameter.Hidden = true;
-      }
-      foreach (IRealVectorMoveGenerator op in Operators.OfType<IRealVectorMoveGenerator>()) {
+      foreach (var op in Operators.OfType<IRealVectorMoveOperator>()) {
+        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+        op.RealVectorParameter.Hidden = true;
+      }
+      foreach (var op in Operators.OfType<IRealVectorMoveGenerator>()) {
         op.BoundsParameter.ActualName = BoundsParameter.Name;
         op.BoundsParameter.Hidden = true;
       }
-      foreach (ISingleObjectiveTestFunctionAdditiveMoveEvaluator op in Operators.OfType<ISingleObjectiveTestFunctionAdditiveMoveEvaluator>()) {
+      foreach (var op in Operators.OfType<ISingleObjectiveTestFunctionAdditiveMoveEvaluator>()) {
         op.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
         op.QualityParameter.Hidden = true;
@@ -365 +364 @@
         op.RealVectorParameter.Hidden = true;
       }
-      foreach (IRealVectorParticleCreator op in Operators.OfType<IRealVectorParticleCreator>()) {
+      foreach (var op in Operators.OfType<IRealVectorParticleCreator>()) {
         op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
         op.RealVectorParameter.Hidden = true;
@@ -373 +372 @@
         op.ProblemSizeParameter.Hidden = true;
       }
-      foreach (IRealVectorParticleUpdater op in Operators.OfType<IRealVectorParticleUpdater>()) {
+      foreach (var op in Operators.OfType<IRealVectorParticleUpdater>()) {
         op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
         op.RealVectorParameter.Hidden = true;
@@ -379 +378 @@
         op.BoundsParameter.Hidden = true;
       }
-      foreach (IRealVectorSwarmUpdater op in Operators.OfType<IRealVectorSwarmUpdater>()) {
+      foreach (var op in Operators.OfType<IRealVectorSwarmUpdater>()) {
         op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
         op.RealVectorParameter.Hidden = true;
@@ -385 +384 @@
         op.MaximizationParameter.Hidden = true;
       }
-      foreach (IRealVectorMultiNeighborhoodShakingOperator op in Operators.OfType<IRealVectorMultiNeighborhoodShakingOperator>()) {
-        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
-        op.RealVectorParameter.Hidden = true;
-      }
-      foreach (ISingleObjectiveImprovementOperator op in Operators.OfType<ISingleObjectiveImprovementOperator>()) {
+      foreach (var op in Operators.OfType<IRealVectorMultiNeighborhoodShakingOperator>()) {
+        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+        op.RealVectorParameter.Hidden = true;
+      }
+      foreach (var op in Operators.OfType<ISingleObjectiveImprovementOperator>()) {
         op.SolutionParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
         op.SolutionParameter.Hidden = true;
       }
-      foreach (ISingleObjectivePathRelinker op in Operators.OfType<ISingleObjectivePathRelinker>()) {
+      foreach (var op in Operators.OfType<ISingleObjectivePathRelinker>()) {
         op.ParentsParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
         op.ParentsParameter.Hidden = true;
       }
-      foreach (SingleObjectiveTestFunctionSimilarityCalculator op in Operators.OfType<SingleObjectiveTestFunctionSimilarityCalculator>()) {
+      foreach (var op in Operators.OfType<SingleObjectiveTestFunctionSimilarityCalculator>()) {
         op.SolutionVariableName = SolutionCreator.RealVectorParameter.ActualName;
         op.QualityVariableName = Evaluator.QualityParameter.ActualName;
         op.Bounds = Bounds;
       }
+      foreach (var op in Operators.OfType<CMAInitializer>()) {
+        op.DimensionParameter.ActualName = ProblemSizeParameter.Name;
+      }
+      foreach (var op in Operators.OfType<CMAMutator>()) {
+        op.BoundsParameter.ActualName = BoundsParameter.Name;
+        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+      }
+      foreach (var op in Operators.OfType<CMARecombinator>()) {
+        op.MeanParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+        op.OffspringParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+      }
+      foreach (var op in Operators.OfType<CMAUpdater>()) {
+        op.MeansParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+        op.OffspringParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+      }
     }
     private void UpdateStrategyVectorBounds() {
-      DoubleMatrix strategyBounds = (DoubleMatrix)Bounds.Clone();
+      var strategyBounds = (DoubleMatrix)Bounds.Clone();
       for (int i = 0; i < strategyBounds.Rows; i++) {
         if (strategyBounds[i, 0] < 0) strategyBounds[i, 0] = 0;