Changeset 9140

Timestamp:

01/09/13 23:30:15 (11 years ago)

Author:

abeham

Message:

#1961: Added creator to project, fixed wiring in CMA-ES algorithm, fixed visualization of random landscape, removed useless function in test functions

Location:

branches/CMAES

Files:

• HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/CMAAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Algorithms.CMAEvolutionStrategy/3.3/CMAEvolutionStrategy.cs (modified) (previous)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RandomEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (1 diff)

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

@@ -115 +115 @@
         realVector.Rows["Axis" + i.ToString()].Values.Add(vector[i]);
 
+      DataTable stdDevs;
+      if (results.ContainsKey("StandardDeviations")) {
+        stdDevs = (DataTable)results["StandardDeviations"].Value;
+      } else {
+        stdDevs = new DataTable("StandardDeviations");
+        for (int i = 0; i < vector.Length; i++)
+          stdDevs.Rows.Add(new DataRow("Axis" + i.ToString()));
+        results.Add(new Result("StandardDeviations", stdDevs));
+      }
+      for (int i = 0; i < vector.Length; i++)
+        stdDevs.Rows["Axis" + i.ToString()].Values.Add(sp.C[i, i]);
+
       return base.Apply();
     }

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

@@ -173 +173 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Creators\PredefinedRealVectorCreator.cs" />
     <Compile Include="Interfaces\IRealVectorMultiNeighborhoodShakingOperator.cs" />
     <Compile Include="ParticleOperators\RealVectorParticleCreator.cs" />

branches/CMAES/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RandomEvaluator.cs

@@ -86 +86 @@
     }
 
+    public override double Evaluate2D(double x, double y) {
+      var random = new System.Random();
+      return random.NextDouble();
+    }
+
     protected override double EvaluateFunction(RealVector point) {
       return RandomParameter.ActualValue.NextDouble();

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

@@ -125 +125 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new SingleObjectiveTestFunctionProblem(this, cloner);
-    }
-
-    private bool IsNotFieldReferenced(IOperator x) {
-      return !(x == strategyVectorCreator
-        || x == strategyVectorCrossover
-        || x == strategyVectorManipulator);
     }