Changeset 9122

Timestamp:

01/07/13 21:29:42 (12 years ago)

Author:

abeham

Message:

#1961:

• Added an analyzer for the behavior of CMA-ES
• Fixed counting of evaluated solutions
• Fixed ItemNames

Location:

branches/CMAES

Files:

• HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/CMAEvolutionStrategyMainLoop.cs (modified) (previous)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/CMAESOperators/CMAAnalyzer.cs (added)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/CMAESOperators/CMAMutator.cs (modified) (1 diff)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/CMAESOperators/CMAParameters.cs (modified) (1 diff)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RandomEvaluator.cs (added)
• HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/RandomAdditiveMoveEvaluator.cs (added)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (1 diff)

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

@@ -31 +31 @@
 
 namespace HeuristicLab.Encodings.RealVectorEncoding {
-  [Item("CovarianceMatrixMutator", "Mutates the solution vector according to the CMA-ES scheme.")]
+  [Item("CMAMutator", "Mutates the solution vector according to the CMA-ES scheme.")]
   [StorableClass]
   public sealed class CMAMutator : SingleSuccessorOperator, IStochasticOperator, IRealVectorOperator, ICMAESManipulator, IIterationBasedOperator {

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

@@ -29 +29 @@
 
 namespace HeuristicLab.Encodings.RealVectorEncoding {
-  [Item("CMAES Strategy Parameters", "CMA-ES controls many strategy parameters that guide the search and which are combined in this class.")]
+  [Item("CMAParameters", "CMA-ES controls many strategy parameters that guide the search and which are combined in this class.")]
   [StorableClass]
   public sealed class CMAParameters : Item, INotifyPropertyChanged {

branches/CMAES/HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj

@@ -104 +104 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -112 +117 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -163 +173 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CMAESOperators\CMAAnalyzer.cs" />
     <Compile Include="CMAESOperators\CMARecombinator.cs" />
     <Compile Include="CMAESOperators\CMAParameters.cs" />

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

@@ -152 +152 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Evaluators\RandomEvaluator.cs" />
     <Compile Include="Improvers\SingleObjectiveTestFunctionImprovementOperator.cs" />
+    <Compile Include="MoveEvaluators\RandomAdditiveMoveEvaluator.cs" />
     <Compile Include="PathRelinkers\SingleObjectiveTestFunctionPathRelinker.cs" />
     <Compile Include="Plugin.cs" />

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

@@ -416 +416 @@
         op.OffspringParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
       }
+      foreach (var op in Operators.OfType<CMAAnalyzer>()) {
+        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+      }
     }
     private void UpdateStrategyVectorBounds() {