Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (6 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Problems.TestFunctions

  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.TestFunctions {
     
    3333  /// </summary
    3434  [Item("AckleyEvaluator", "Evaluates the Ackley function on a given point. The optimum of this function is 0 at the origin. It is implemented as described in Eiben, A.E. and Smith, J.E. 2003. Introduction to Evolutionary Computation. Natural Computing Series, Springer-Verlag Berlin Heidelberg.")]
    35   [StorableClass]
     35  [StorableType("AB46422C-A915-4BC5-B2F7-F6F4794E87D2")]
    3636  public class AckleyEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3737    public override string FunctionName { get { return "Ackley"; } }
     
    6868
    6969    [StorableConstructor]
    70     protected AckleyEvaluator(bool deserializing) : base(deserializing) { }
     70    protected AckleyEvaluator(StorableConstructorFlag _) : base(_) { }
    7171    protected AckleyEvaluator(AckleyEvaluator original, Cloner cloner) : base(original, cloner) { }
    7272    public AckleyEvaluator() : base() { }
  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BealeEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.TestFunctions {
     
    3333  /// </summary>
    3434  [Item("BealeEvaluator", "Evaluates the Beale function on a given point. The optimum of this function is 0 at (3,0.5). It is implemented as described in Moré, J.J., Garbow, B., and Hillstrom, K. 1981. Testing unconstrained optimization software. ACM Transactions on Mathematical Software 7, pp. 136-140, ACM.")]
    35   [StorableClass]
     35  [StorableType("EC1E155C-65ED-4603-A442-357ECC1E8F3D")]
    3636  public class BealeEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3737    public override string FunctionName { get { return "Beale"; } }
     
    6868
    6969    [StorableConstructor]
    70     protected BealeEvaluator(bool deserializing) : base(deserializing) { }
     70    protected BealeEvaluator(StorableConstructorFlag _) : base(_) { }
    7171    protected BealeEvaluator(BealeEvaluator original, Cloner cloner) : base(original, cloner) { }
    7272    public BealeEvaluator() : base() { }
  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BoothEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.TestFunctions {
     
    3232  /// </summary>
    3333  [Item("BoothEvaluator", "Evaluates the Booth function on a given point. The optimum of this function is 0 at (1,3). It is implemented as described on http://www-optima.amp.i.kyoto-u.ac.jp/member/student/hedar/Hedar_files/TestGO_files/Page816.htm, last accessed April 12th, 2010.")]
    34   [StorableClass]
     34  [StorableType("3D0027F9-FC7B-4C34-8766-93C4A467767A")]
    3535  public class BoothEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3636    public override string FunctionName { get { return "Booth"; } }
     
    6767
    6868    [StorableConstructor]
    69     protected BoothEvaluator(bool deserializing) : base(deserializing) { }
     69    protected BoothEvaluator(StorableConstructorFlag _) : base(_) { }
    7070    protected BoothEvaluator(BoothEvaluator original, Cloner cloner) : base(original, cloner) { }
    7171    public BoothEvaluator() : base() { }
  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/GriewankEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.TestFunctions {
     
    3434  /// </summary>
    3535  [Item("GriewankEvaluator", "Evaluates the Griewank function on a given point. The optimum of this function is 0 at the origin. It is introduced by Griewank A.O. 1981 and implemented as described (without the modifications) in Locatelli, M. 2003. A note on the Griewank test function. Journal of Global Optimization 25, pp. 169-174, Springer.")]
    36   [StorableClass]
     36  [StorableType("9FA738E6-EB3C-4C64-92FE-3F7F0F823639")]
    3737  public class GriewankEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3838    public override string FunctionName { get { return "Griewank"; } }
     
    6969
    7070    [StorableConstructor]
    71     protected GriewankEvaluator(bool deserializing) : base(deserializing) { }
     71    protected GriewankEvaluator(StorableConstructorFlag _) : base(_) { }
    7272    protected GriewankEvaluator(GriewankEvaluator original, Cloner cloner) : base(original, cloner) { }
    7373    public GriewankEvaluator() : base() { }
  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/LevyEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.TestFunctions {
     
    3232  /// </summary>
    3333  [Item("LevyEvaluator", "Evaluates the Levy function on a given point. The optimum of this function is 0 at (1,1,...,1). It is implemented as described on http://www-optima.amp.i.kyoto-u.ac.jp/member/student/hedar/Hedar_files/TestGO_files/Page2056.htm, last accessed April 12th, 2010.")]
    34   [StorableClass]
     34  [StorableType("1DE79A28-70E5-45D8-817F-F1F51BCBC19D")]
    3535  public class LevyEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3636    public override string FunctionName { get { return "Levy"; } }
     
    6767
    6868    [StorableConstructor]
    69     protected LevyEvaluator(bool deserializing) : base(deserializing) { }
     69    protected LevyEvaluator(StorableConstructorFlag _) : base(_) { }
    7070    protected LevyEvaluator(LevyEvaluator original, Cloner cloner) : base(original, cloner) { }
    7171    public LevyEvaluator() : base() { }
  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MatyasEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.TestFunctions {
     
    3232  /// </summary>
    3333  [Item("MatyasEvaluator", "Evaluates the Matyas function on a given point. The optimum of this function is 0 at the origin. It is implemented as described on http://www-optima.amp.i.kyoto-u.ac.jp/member/student/hedar/Hedar_files/TestGO_files/Page2213.htm, last accessed April 12th, 2010.")]
    34   [StorableClass]
     34  [StorableType("5C665115-42A4-4E19-AA2F-59BEB973215C")]
    3535  public class MatyasEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3636    public override string FunctionName { get { return "Matyas"; } }
     
    6767
    6868    [StorableConstructor]
    69     protected MatyasEvaluator(bool deserializing) : base(deserializing) { }
     69    protected MatyasEvaluator(StorableConstructorFlag _) : base(_) { }
    7070    protected MatyasEvaluator(MatyasEvaluator original, Cloner cloner) : base(original, cloner) { }
    7171    public MatyasEvaluator() : base() { }
  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MultinormalEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2929using HeuristicLab.Encodings.RealVectorEncoding;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.Problems.TestFunctions.Evaluators {
    3434  [Item("MultinormalFunction", "Evaluates a random multinormal function on a given point.")]
    35   [StorableClass]
     35  [StorableType("55E0E22B-43BD-4408-8A78-8F918E66AFB1")]
    3636  public class MultinormalEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3737    public override string FunctionName { get { return "Multinormal"; } }
     
    8787
    8888    [StorableConstructor]
    89     protected MultinormalEvaluator(bool deserializing) : base(deserializing) { }
     89    protected MultinormalEvaluator(StorableConstructorFlag _) : base(_) { }
    9090    protected MultinormalEvaluator(MultinormalEvaluator original, Cloner cloner) : base(original, cloner) { }
    9191    public MultinormalEvaluator() {
  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RandomEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.TestFunctions {
     
    3333  /// </summary
    3434  [Item("RandomEvaluator", "Returns a random value in [0;1) that is independent of the inputs.")]
    35   [StorableClass]
     35  [StorableType("8D56248E-D85B-49C0-92C1-E1D53F729202")]
    3636  public class RandomEvaluator : SingleObjectiveTestFunctionProblemEvaluator, IStochasticOperator {
    3737    public override string FunctionName { get { return "Random"; } }
     
    7272
    7373    [StorableConstructor]
    74     protected RandomEvaluator(bool deserializing) : base(deserializing) { }
     74    protected RandomEvaluator(StorableConstructorFlag _) : base(_) { }
    7575    protected RandomEvaluator(RandomEvaluator original, Cloner cloner) : base(original, cloner) { }
    7676    public RandomEvaluator()
  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RastriginEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.TestFunctions {
     
    3434  /// </summary
    3535  [Item("RastriginEvaluator", "Evaluates the generalized Rastrigin function y = Sum((x_i)^2 + A * (1 - Cos(2pi*x_i))) on a given point. The optimum of this function is 0 at the origin. It is implemented as described in Eiben, A.E. and Smith, J.E. 2003. Introduction to Evolutionary Computation. Natural Computing Series, Springer-Verlag Berlin Heidelberg.")]
    36   [StorableClass]
     36  [StorableType("DAC41E30-0487-4400-A089-4B57DFAA329A")]
    3737  public class RastriginEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3838    public override string FunctionName { get { return "Rastrigin"; } }
     
    8686
    8787    [StorableConstructor]
    88     protected RastriginEvaluator(bool deserializing) : base(deserializing) { }
     88    protected RastriginEvaluator(StorableConstructorFlag _) : base(_) { }
    8989    protected RastriginEvaluator(RastriginEvaluator original, Cloner cloner) : base(original, cloner) { }
    9090    /// <summary>
  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RosenbrockEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.TestFunctions {
     
    3636It is unknown how many local minima there are for dimensions greater than 30.
    3737It is implemented as generalized Rosenbrock function for which the 2 dimensional function is a special case, as for example given in Shang, Y.-W. and Qiu, Y.-H. 2006. A Note on the Extended Rosenbrock Function. Evolutionary Computation 14, pp. 119-126, MIT Press.")]
    38   [StorableClass]
     38  [StorableType("20C31FDB-4F7D-4563-B955-F4F8B34DFF3E")]
    3939  public class RosenbrockEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    4040    public override string FunctionName { get { return "Rosenbrock"; } }
     
    7171
    7272    [StorableConstructor]
    73     protected RosenbrockEvaluator(bool deserializing) : base(deserializing) { }
     73    protected RosenbrockEvaluator(StorableConstructorFlag _) : base(_) { }
    7474    protected RosenbrockEvaluator(RosenbrockEvaluator original, Cloner cloner) : base(original, cloner) { }
    7575    public RosenbrockEvaluator() : base() { }
  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SchwefelEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.TestFunctions {
     
    3232  /// </summary>
    3333  [Item("SchwefelEvaluator", "Evaluates the Schwefel function (sine root) on a given point. In the given bounds [-500;500] the optimum of this function is close to 0 at (420.968746453712,420.968746453712,...,420.968746453712). It is implemented as described in Affenzeller, M. and Wagner, S. 2005. Offspring Selection: A New Self-Adaptive Selection Scheme for Genetic Algorithms.  Ribeiro, B., Albrecht, R. F., Dobnikar, A., Pearson, D. W., and Steele, N. C. (eds.). Adaptive and Natural Computing Algorithms, pp. 218-221, Springer.")]
    34   [StorableClass]
     34  [StorableType("06AC1E53-E26F-4A41-9B4B-2EDC0B02B358")]
    3535  public class SchwefelEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3636    public override string FunctionName { get { return "Schwefel"; } }
     
    6767
    6868    [StorableConstructor]
    69     protected SchwefelEvaluator(bool deserializing) : base(deserializing) { }
     69    protected SchwefelEvaluator(StorableConstructorFlag _) : base(_) { }
    7070    protected SchwefelEvaluator(SchwefelEvaluator original, Cloner cloner) : base(original, cloner) { }
    7171    public SchwefelEvaluator() : base() { }
  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.TestFunctions {
     
    3333  /// </summary>
    3434  [Item("Evaluator", "Base calls for single objective test function evaluators.")]
    35   [StorableClass]
     35  [StorableType("2775A51F-C97B-4D2E-9B25-9E2591A961CB")]
    3636  public abstract class SingleObjectiveTestFunctionProblemEvaluator : InstrumentedOperator, ISingleObjectiveTestFunctionProblemEvaluator {
    3737    /// <summary>
     
    7474
    7575    [StorableConstructor]
    76     protected SingleObjectiveTestFunctionProblemEvaluator(bool deserializing) : base(deserializing) { }
     76    protected SingleObjectiveTestFunctionProblemEvaluator(StorableConstructorFlag _) : base(_) { }
    7777    protected SingleObjectiveTestFunctionProblemEvaluator(SingleObjectiveTestFunctionProblemEvaluator original, Cloner cloner) : base(original, cloner) { }
    7878    /// <summary>
  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SphereEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.TestFunctions {
     
    3434  /// </summary>
    3535  [Item("SphereEvaluator", "Evaluates the Sphere function y = C * ||X||^Alpha on a given point. The optimum of this function is 0 at the origin. It is implemented as described in Beyer, H.-G. and Schwefel, H.-P. 2002. Evolution Strategies - A Comprehensive Introduction Natural Computing, 1, pp. 3-52.")]
    36   [StorableClass]
     36  [StorableType("F40E2FAA-0491-41EA-9B25-57A87DD2AD25")]
    3737  public class SphereEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3838    public override string FunctionName { get { return "Sphere"; } }
     
    104104
    105105    [StorableConstructor]
    106     protected SphereEvaluator(bool deserializing) : base(deserializing) { }
     106    protected SphereEvaluator(StorableConstructorFlag _) : base(_) { }
    107107    protected SphereEvaluator(SphereEvaluator original, Cloner cloner) : base(original, cloner) { }
    108108    /// <summary>
  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SumSquaresEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.TestFunctions {
     
    3131  /// </summary>
    3232  [Item("SumSquaresEvaluator", "Evaluates the sum squares function on a given point. The optimum of this function is 0 at the origin. The Sum Squares function is defined as sum(i * x_i * x_i) for i = 1..n.")]
    33   [StorableClass]
     33  [StorableType("B7DFB7C7-0218-4D42-85F0-E427E99DB621")]
    3434  public class SumSquaresEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3535    public override string FunctionName { get { return "SumSquares"; } }
     
    6666
    6767    [StorableConstructor]
    68     protected SumSquaresEvaluator(bool deserializing) : base(deserializing) { }
     68    protected SumSquaresEvaluator(StorableConstructorFlag _) : base(_) { }
    6969    protected SumSquaresEvaluator(SumSquaresEvaluator original, Cloner cloner) : base(original, cloner) { }
    7070    public SumSquaresEvaluator() : base() { }
  • trunk/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Encodings.RealVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.TestFunctions {
     
    3131  /// </summary>
    3232  [Item("ZakharovEvaluator", "Evaluates the Zakharov function on a given point. The optimum of this function is 0 at the origin. It is implemented as described in Hedar, A. & Fukushima, M. 2004. Heuristic pattern search and its hybridization with simulated annealing for nonlinear global optimization. Optimization Methods and Software 19, pp. 291-308, Taylor & Francis.")]
    33   [StorableClass]
     33  [StorableType("AB90340D-E5D0-4397-A5C3-8C7590F1727A")]
    3434  public class ZakharovEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3535    public override string FunctionName { get { return "Zakharov"; } }
     
    7070
    7171    [StorableConstructor]
    72     protected ZakharovEvaluator(bool deserializing) : base(deserializing) { }
     72    protected ZakharovEvaluator(StorableConstructorFlag _) : base(_) { }
    7373    protected ZakharovEvaluator(ZakharovEvaluator original, Cloner cloner) : base(original, cloner) { }
    7474    public ZakharovEvaluator() : base() { }
Note: See TracChangeset for help on using the changeset viewer.