Changeset 3187 for trunk/sources/HeuristicLab.Problems.TestFunctions/3.3

Timestamp:

03/22/10 22:58:43 (14 years ago)

Author:

abeham

Message:

Added move operators for real encoding and test functions #890

Location:

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3

Files:

• Evaluators/SumSquaresEvaluator.cs (modified) (5 diffs)
• HeuristicLab.Problems.TestFunctions-3.3.csproj (modified) (1 diff)
• Interfaces/ISingleObjectiveTestFunctionAdditiveMoveEvaluator.cs (added)
• Interfaces/ISingleObjectiveTestFunctionMoveEvaluator.cs (added)
• MoveEvaluators (added)
• MoveEvaluators/AckleyAdditiveMoveEvaluator.cs (added)
• MoveEvaluators/AdditiveMoveEvaluator.cs (added)
• MoveEvaluators/BealeAdditiveMoveEvaluator.cs (added)
• MoveEvaluators/BoothAdditiveMoveEvaluator.cs (added)
• MoveEvaluators/GriewangkAdditiveMoveEvaluator.cs (added)
• MoveEvaluators/LevyAdditiveMoveEvaluator.cs (added)
• MoveEvaluators/MatyasAdditiveMoveEvaluator.cs (added)
• MoveEvaluators/RastriginAdditiveMoveEvaluator.cs (added)
• MoveEvaluators/RealVectorAdditiveMoveWrapper.cs (added)
• MoveEvaluators/RosenbrockAdditiveMoveEvaluator.cs (added)
• MoveEvaluators/SchwefelAdditiveMoveEvaluator.cs (added)
• MoveEvaluators/SphereAdditiveMoveEvaluator.cs (added)
• MoveEvaluators/SumSquaresAdditiveMoveEvaluator.cs (added)
• MoveEvaluators/ZakharovAdditiveMoveEvaluator.cs (added)
• SingleObjectiveTestFunctionProblem.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SumSquaresEvaluator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
+using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Encodings.RealVectorEncoding;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.TestFunctions {
+namespace HeuristicLab.Problems.TestFunctions {
   /// <summary>
   /// Sum Squares Function<br/>
@@ -30 +32 @@
   /// Optimum: 0.0 at (0.0, 0.0, ..., 0.0)
   /// </summary>
-  public class SumSquaresEvaluator : TestFunctionEvaluatorBase {
-    /// <inheritdoc select="summary"/>
-    public override string Description {
-      get { return
-@"Sum Squares Function
-
-Domain:  [-10.0 , 10.0]^n
-Optimum: 0.0 at (0.0, 0.0, ..., 0.0)";
-          }
+  [Item("SumSquaresEvaluator", "Evaluates the sum squares function on a given point. The optimum of this function is 0 at the origin.")]
+  [StorableClass]
+  public class SumSquaresEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+    /// <summary>
+    /// Returns false as the Rosenbrock function is a minimization problem.
+    /// </summary>
+    public override bool Maximization {
+      get { return false; }
+    }
+    /// <summary>
+    /// Gets the optimum function value (0).
+    /// </summary>
+    public override double BestKnownQuality {
+      get { return 0; }
+    }
+    /// <summary>
+    /// Gets the lower and upper bound of the function.
+    /// </summary>
+    public override DoubleMatrix Bounds {
+      get { return new DoubleMatrix(new double[,] { { -10, 10 } }); }
+    }
+    /// <summary>
+    /// Gets the minimum problem size (1).
+    /// </summary>
+    public override int MinimumProblemSize {
+      get { return 1; }
+    }
+    /// <summary>
+    /// Gets the (theoretical) maximum problem size (2^31 - 1).
+    /// </summary>
+    public override int MaximumProblemSize {
+      get { return int.MaxValue; }
     }
 
@@ -46 +71 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the Sum Squares function at the given point.</returns>
-    public static double Apply(double[] point) {
+    public static double Apply(RealVector point) {
       double result = 0;
       for (int i = 0; i < point.Length; i++) {
@@ -60 +85 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the Sum Squares function at the given point.</returns>
-    protected override double EvaluateFunction(double[] point) {
+    protected override double EvaluateFunction(RealVector point) {
       return Apply(point);
     }

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj

@@ -95 +95 @@
     <Compile Include="Evaluators\SingleObjectiveTestFunctionProblemEvaluator.cs" />
     <Compile Include="Evaluators\SphereEvaluator.cs" />
+    <Compile Include="Evaluators\SumSquaresEvaluator.cs" />
     <Compile Include="Evaluators\ZakharovEvaluator.cs" />
     <Compile Include="HeuristicLabProblemsTestFunctionsPlugin.cs" />
+    <Compile Include="Interfaces\ISingleObjectiveTestFunctionAdditiveMoveEvaluator.cs" />
+    <Compile Include="Interfaces\ISingleObjectiveTestFunctionMoveEvaluator.cs" />
     <Compile Include="Interfaces\ISingleObjectiveTestFunctionProblemEvaluator.cs" />
     <Compile Include="Interfaces\ISingleObjectiveTestFunctionProblemSolutionsVisualizer.cs" />
+    <Compile Include="MoveEvaluators\AckleyAdditiveMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\BealeAdditiveMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\BoothAdditiveMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\ZakharovAdditiveMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\SumSquaresAdditiveMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\SphereAdditiveMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\SchwefelAdditiveMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\MatyasAdditiveMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\RosenbrockAdditiveMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\RastriginAdditiveMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\LevyAdditiveMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\GriewangkAdditiveMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\AdditiveMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\RealVectorAdditiveMoveWrapper.cs" />
     <Compile Include="SingleObjectiveTestFunctionProblem.cs" />
     <None Include="HeuristicLab.snk" />

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -123 +123 @@
       set { BestKnownQualityParameter.Value = value; }
     }
-    private List<IRealVectorOperator> operators;
+    private List<IOperator> operators;
     public IEnumerable<IOperator> Operators {
-      get { return operators.Cast<IOperator>(); }
+      get { return operators; }
     }
     #endregion
@@ -197 +197 @@
     private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeEvaluator();
+      UpdateMoveEvaluators();
       Maximization.Value = Evaluator.Maximization;
       BoundsParameter.Value = Evaluator.Bounds;
@@ -226 +227 @@
         Bounds[e.Value, 0] = Bounds[e.Value, 1] - 0.1;
     }
-    private void BoundsParameter_NameChanged(object sender, EventArgs e) {
-      ParameterizeOperators();
+    private void MoveGenerator_AdditiveMoveParameter_ActualNameChanged(object sender, EventArgs e) {
+      string name = ((ILookupParameter<AdditiveMove>)sender).ActualName;
+      foreach (IAdditiveRealVectorMoveOperator op in Operators.OfType<IAdditiveRealVectorMoveOperator>()) {
+        op.AdditiveMoveParameter.ActualName = name;
+      }
     }
     #endregion
@@ -237 +241 @@
       ProblemSizeParameter.ValueChanged += new EventHandler(ProblemSizeParameter_ValueChanged);
       ProblemSize.ValueChanged += new EventHandler(ProblemSize_ValueChanged);
-      BoundsParameter.NameChanged += new EventHandler(BoundsParameter_NameChanged);
       BoundsParameter.ValueChanged += new EventHandler(BoundsParameter_ValueChanged);
       Bounds.ToStringChanged += new EventHandler(Bounds_ToStringChanged);
@@ -248 +251 @@
     }
     private void InitializeOperators() {
-      operators = new List<IRealVectorOperator>();
+      operators = new List<IOperator>();
       if (ApplicationManager.Manager != null) {
-        operators.AddRange(ApplicationManager.Manager.GetInstances<IRealVectorOperator>());
+        foreach (IRealVectorOperator op in ApplicationManager.Manager.GetInstances<IRealVectorOperator>())
+          operators.Add(op);
+        UpdateMoveEvaluators();
         ParameterizeOperators();
       }
-      //InitializeMoveGenerators();
-    }
-    /*private void InitializeMoveGenerators() {
-      foreach (ITwoOptPermutationMoveOperator op in Operators.OfType<ITwoOptPermutationMoveOperator>()) {
+      InitializeMoveGenerators();
+    }
+    private void InitializeMoveGenerators() {
+      foreach (IAdditiveRealVectorMoveOperator op in Operators.OfType<IAdditiveRealVectorMoveOperator>()) {
         if (op is IMoveGenerator) {
-          op.TwoOptMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_TwoOptMoveParameter_ActualNameChanged);
+          op.AdditiveMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_AdditiveMoveParameter_ActualNameChanged);
         }
       }
-      foreach (IThreeOptPermutationMoveOperator op in Operators.OfType<IThreeOptPermutationMoveOperator>()) {
-        if (op is IMoveGenerator) {
-          op.ThreeOptMoveParameter.ActualNameChanged += new EventHandler(MoveGenerator_ThreeOptMoveParameter_ActualNameChanged);
-        }
-      }
-    }*/
+    }
+    private void UpdateMoveEvaluators() {
+      if (ApplicationManager.Manager != null) {
+        foreach (ISingleObjectiveTestFunctionMoveEvaluator op in Operators.OfType<ISingleObjectiveTestFunctionMoveEvaluator>().ToList())
+          operators.Remove(op);
+        foreach (ISingleObjectiveTestFunctionMoveEvaluator op in ApplicationManager.Manager.GetInstances<ISingleObjectiveTestFunctionMoveEvaluator>())
+          if (op.EvaluatorType == Evaluator.GetType()) {
+            operators.Add(op);
+          }
+        ParameterizeOperators();
+        OnOperatorsChanged();
+      }
+    }
     private void ParameterizeSolutionCreator() {
       SolutionCreator.LengthParameter.Value = new IntValue(ProblemSize.Value);
@@ -289 +301 @@
         op.BoundsParameter.ActualName = BoundsParameter.Name;
       }
-      /*foreach (IPermutationMoveOperator op in Operators.OfType<IPermutationMoveOperator>()) {
-        op.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
-      }
-      foreach (ITSPPathMoveEvaluator op in Operators.OfType<ITSPPathMoveEvaluator>()) {
-        op.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
-        op.DistanceMatrixParameter.ActualName = DistanceMatrixParameter.Name;
-        op.UseDistanceMatrixParameter.ActualName = UseDistanceMatrixParameter.Name;
-      }*/
+      foreach (IRealVectorMoveOperator op in Operators.OfType<IRealVectorMoveOperator>()) {
+        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+      }
+      foreach (IRealVectorMoveGenerator op in Operators.OfType<IRealVectorMoveGenerator>()) {
+        op.BoundsParameter.ActualName = BoundsParameter.Name;
+      }
+      foreach (ISingleObjectiveTestFunctionAdditiveMoveEvaluator op in Operators.OfType<ISingleObjectiveTestFunctionAdditiveMoveEvaluator>()) {
+        op.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+      }
     }
     #endregion