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:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Encodings.RealVectorEncoding

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/BreederGeneticAlgorithmManipulator.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.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    3636  /// </remarks>
    3737  [Item("BreederGeneticAlgorithmManipulator", "It is implemented as described by Mühlenbein, H. and Schlierkamp-Voosen, D. 1993. Predictive Models for the Breeder Genetic Algorithm - I. Continuous Parameter Optimization. Evolutionary Computation, 1(1), pp. 25-49.")]
    38   [StorableClass]
     38  [StorableType("A9D7E5D6-6326-4C62-9EA0-E50785FDD677")]
    3939  public class BreederGeneticAlgorithmManipulator : RealVectorManipulator {
    4040    private static readonly double[] powerOfTwo = new double[] { 1, 0.5, 0.25, 0.125, 0.0625, 0.03125, 0.015625, 0.0078125, 0.00390625, 0.001953125, 0.0009765625, 0.00048828125, 0.000244140625, 0.0001220703125, 0.00006103515625, 0.000030517578125 };
    … …  
    4444
    4545    [StorableConstructor]
    46     protected BreederGeneticAlgorithmManipulator(bool deserializing) : base(deserializing) { }
     46    protected BreederGeneticAlgorithmManipulator(StorableConstructorFlag _) : base(_) { }
    4747    protected BreederGeneticAlgorithmManipulator(BreederGeneticAlgorithmManipulator original, Cloner cloner) : base(original, cloner) { }
    4848    /// <summary>

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/FixedNormalAllPositionsManipulator.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.Core;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HeuristicLab.Random;
    2828
    … …  
    3737  /// </remarks>
    3838  [Item("FixedNormalAllPositionsManipulator", "This manipulation operator adds a value sigma_i * N_i(0,1) to the current value in each position i given the values for sigma_i in the parameter. If there are less elements in Sigma than positions, then Sigma is cycled. 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.")]
    39   [StorableClass]
     39  [StorableType("DEEF042E-72C8-47D4-A4F8-E6C38FD90CC0")]
    4040  public class FixedNormalAllPositionsManipulator : RealVectorManipulator {
    4141
    … …  
    4545
    4646    [StorableConstructor]
    47     protected FixedNormalAllPositionsManipulator(bool deserializing) : base(deserializing) { }
     47    protected FixedNormalAllPositionsManipulator(StorableConstructorFlag _) : base(_) { }
    4848    protected FixedNormalAllPositionsManipulator(FixedNormalAllPositionsManipulator original, Cloner cloner) : base(original, cloner) { }
    4949    /// <summary>

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/MichalewiczNonUniformAllPositionsManipulator.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.Encodings.RealVectorEncoding {
    … …  
    3737  /// </remarks>
    3838  [Item("MichalewiczNonUniformAllPositionsManipulator", "It is implemented as described in Michalewicz, Z. 1999. Genetic Algorithms + Data Structures = Evolution Programs. Third, Revised and Extended Edition, Spring-Verlag Berlin Heidelberg.")]
    39   [StorableClass]
     39  [StorableType("32DCDE59-7557-48F7-98BB-678C47E98D7C")]
    4040  public class MichalewiczNonUniformAllPositionsManipulator : RealVectorManipulator, IIterationBasedOperator {
    4141    /// <summary>
    … …  
    5959
    6060    [StorableConstructor]
    61     protected MichalewiczNonUniformAllPositionsManipulator(bool deserializing) : base(deserializing) { }
     61    protected MichalewiczNonUniformAllPositionsManipulator(StorableConstructorFlag _) : base(_) { }
    6262    protected MichalewiczNonUniformAllPositionsManipulator(MichalewiczNonUniformAllPositionsManipulator original, Cloner cloner) : base(original, cloner) { }
    6363    /// <summary>

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/MichalewiczNonUniformOnePositionManipulator.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.Encodings.RealVectorEncoding {
    … …  
    3737  /// </remarks>
    3838  [Item("MichalewiczNonUniformOnePositionManipulator", "It is implemented as described in Michalewicz, Z. 1999. Genetic Algorithms + Data Structures = Evolution Programs. Third, Revised and Extended Edition, Spring-Verlag Berlin Heidelberg.")]
    39   [StorableClass]
     39  [StorableType("AD99F9B0-C820-416D-B57D-2287CE2E04D2")]
    4040  public class MichalewiczNonUniformOnePositionManipulator : RealVectorManipulator, IIterationBasedOperator {
    4141    /// <summary>
    … …  
    5959
    6060    [StorableConstructor]
    61     protected MichalewiczNonUniformOnePositionManipulator(bool deserializing) : base(deserializing) { }
     61    protected MichalewiczNonUniformOnePositionManipulator(StorableConstructorFlag _) : base(_) { }
    6262    protected MichalewiczNonUniformOnePositionManipulator(MichalewiczNonUniformOnePositionManipulator original, Cloner cloner) : base(original, cloner) { }
    6363    /// <summary>

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/MultiRealVectorManipulator.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.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.Encodings.RealVectorEncoding {
    3434  [Item("MultiRealVectorManipulator", "Randomly selects and applies one of its manipulators every time it is called.")]
    35   [StorableClass]
     35  [StorableType("E52D11F1-D746-48F7-AFF2-0E029F651FC5")]
    3636  public class MultiRealVectorManipulator : StochasticMultiBranch<IRealVectorManipulator>, IRealVectorManipulator, IStochasticOperator {
    3737    public override bool CanChangeName {
    … …  
    5050
    5151    [StorableConstructor]
    52     protected MultiRealVectorManipulator(bool deserializing) : base(deserializing) { }
     52    protected MultiRealVectorManipulator(StorableConstructorFlag _) : base(_) { }
    5353    protected MultiRealVectorManipulator(MultiRealVectorManipulator original, Cloner cloner) : base(original, cloner) { }
    5454    public MultiRealVectorManipulator()

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/PolynomialAllPositionManipulator.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.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    3636  /// </remarks>
    3737  [Item("PolynomialAllPositionManipulator", "The polynomial manipulation is implemented as described in Deb, K. & Goyal, M. A. 1996. Combined Genetic Adaptive Search (GeneAS) for Engineering Design Computer Science and Informatics, 26, pp. 30-45. In this operator it is performed on all positions of the real vector.")]
    38   [StorableClass]
     38  [StorableType("C2C54BF4-9DA4-418F-BD85-010EFA220BF4")]
    3939  public class PolynomialAllPositionManipulator : RealVectorManipulator {
    4040    /// <summary>
    … …  
    5656
    5757    [StorableConstructor]
    58     protected PolynomialAllPositionManipulator(bool deserializing) : base(deserializing) { }
     58    protected PolynomialAllPositionManipulator(StorableConstructorFlag _) : base(_) { }
    5959    protected PolynomialAllPositionManipulator(PolynomialAllPositionManipulator original, Cloner cloner) : base(original, cloner) { }
    6060    /// <summary>

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/PolynomialOnePositionManipulator.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.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    3535  /// </remarks>
    3636  [Item("PolynomialOnePositionManipulator", "The polynomial manipulation is implemented as described in Deb, K. & Goyal, M. A. 1996. Combined Genetic Adaptive Search (GeneAS) for Engineering Design Computer Science and Informatics, 26, pp. 30-45. In this operator it is performed on a single randomly chosen position of the real vector.")]
    37   [StorableClass]
     37  [StorableType("19F0F379-FCE8-43DE-B5B8-D8F2924D0F92")]
    3838  public class PolynomialOnePositionManipulator : RealVectorManipulator {
    3939    /// <summary>
    … …  
    5555
    5656    [StorableConstructor]
    57     protected PolynomialOnePositionManipulator(bool deserializing) : base(deserializing) { }
     57    protected PolynomialOnePositionManipulator(StorableConstructorFlag _) : base(_) { }
    5858    protected PolynomialOnePositionManipulator(PolynomialOnePositionManipulator original, Cloner cloner) : base(original, cloner) { }
    5959    /// <summary>

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/SelfAdaptiveNormalAllPositionsManipulator.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.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Random;
    2929
    … …  
    3838  /// </remarks>
    3939  [Item("SelfAdaptiveNormalAllPositionsManipulator", "This manipulation operator adds a value sigma_i * N(0,1) to the current value in each position i. The values for sigma_i are looked up dynamically. If there are less elements in the strategy vector than positions, then the strategy vector is cycled. 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.")]
    40   [StorableClass]
     40  [StorableType("7F5FC5F4-9F99-4856-AF88-02C67CAF0251")]
    4141  // BackwardsCompatibility3.3
    4242  // Rename class to match file- and itemname when upgrading to 3.4
    … …  
    5757
    5858    [StorableConstructor]
    59     protected NormalAllPositionsManipulator(bool deserializing) : base(deserializing) { }
     59    protected NormalAllPositionsManipulator(StorableConstructorFlag _) : base(_) { }
    6060    protected NormalAllPositionsManipulator(NormalAllPositionsManipulator original, Cloner cloner) : base(original, cloner) { }
    6161    /// <summary>

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Manipulators/UniformOnePositionManipulator.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.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.RealVectorEncoding {
    … …  
    3434  /// </remarks>
    3535  [Item("UniformOnePositionManipulator", "Changes a single position in the vector by sampling uniformly from the interval [Minimum_i, Maximum_i) in dimension i. It is implemented as described in Michalewicz, Z. 1999. Genetic Algorithms + Data Structures = Evolution Programs. Third, Revised and Extended Edition, Spring-Verlag Berlin Heidelberg.")]
    36   [StorableClass]
     36  [StorableType("CABE72D6-5CBD-40F5-B541-77CB1A5346E1")]
    3737  public class UniformOnePositionManipulator : RealVectorManipulator {
    3838    [StorableConstructor]
    39     protected UniformOnePositionManipulator(bool deserializing) : base(deserializing) { }
     39    protected UniformOnePositionManipulator(StorableConstructorFlag _) : base(_) { }
    4040    protected UniformOnePositionManipulator(UniformOnePositionManipulator original, Cloner cloner) : base(original, cloner) { }
    4141    public UniformOnePositionManipulator() : base() { }
Note: See TracChangeset for help on using the changeset viewer.