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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Encodings.RealVectorEncoding

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMove.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.RealVectorEncoding {
    2727  [Item("AdditiveMove", "A move on a real vector that that represents an additive change in one dimension.")]
    28   [StorableClass]
     28  [StorableType("D7E22627-2AB5-44A9-BD4D-9D1C5E45A150")]
    2929  public class AdditiveMove : Item {
    3030    [Storable]
    … …  
    3636
    3737    [StorableConstructor]
    38     protected AdditiveMove(bool deserializing) : base(deserializing) { }
     38    protected AdditiveMove(StorableConstructorFlag _) : base(_) { }
    3939    protected AdditiveMove(AdditiveMove original, Cloner cloner)
    4040      : base(original, cloner) {

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveGenerator.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 {
    3131  [Item("AdditiveMoveGenerator", "Base class for all additive move generators.")]
    32   [StorableClass]
     32  [StorableType("254F20A6-AB7F-4C7D-9EA7-9310FD56743F")]
    3333  public abstract class AdditiveMoveGenerator : SingleSuccessorOperator, IAdditiveRealVectorMoveOperator, IMoveGenerator, IStochasticOperator {
    3434    public override bool CanChangeName {
    … …  
    5252
    5353    [StorableConstructor]
    54     protected AdditiveMoveGenerator(bool deserializing) : base(deserializing) { }
     54    protected AdditiveMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5555    protected AdditiveMoveGenerator(AdditiveMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    5656    public AdditiveMoveGenerator()

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveMaker.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 {
    3131  [Item("AdditiveMoveMaker", "Peforms an additive move on a given real vector and updates the quality.")]
    32   [StorableClass]
     32  [StorableType("DFEC364D-EFF9-456C-A85C-095F454719C8")]
    3333  public class AdditiveMoveMaker : SingleSuccessorOperator, IAdditiveRealVectorMoveOperator, IMoveMaker, ISingleObjectiveOperator {
    3434    public override bool CanChangeName {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected AdditiveMoveMaker(bool deserializing) : base(deserializing) { }
     51    protected AdditiveMoveMaker(StorableConstructorFlag _) : base(_) { }
    5252    protected AdditiveMoveMaker(AdditiveMoveMaker original, Cloner cloner) : base(original, cloner) { }
    5353    public AdditiveMoveMaker()

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveTabuAttribute.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.RealVectorEncoding {
    2727  [Item("AdditiveMoveTabuAttribute", "Tabu attribute for additive moves.")]
    28   [StorableClass]
     28  [StorableType("F53207BE-01C0-4057-AACE-8DF031C8EBC5")]
    2929  public class AdditiveMoveTabuAttribute : Item {
    3030    [Storable]
    … …  
    3838
    3939    [StorableConstructor]
    40     protected AdditiveMoveTabuAttribute(bool deserializing) : base(deserializing) { }
     40    protected AdditiveMoveTabuAttribute(StorableConstructorFlag _) : base(_) { }
    4141    protected AdditiveMoveTabuAttribute(AdditiveMoveTabuAttribute original, Cloner cloner)
    4242      : base(original, cloner) {

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveTabuChecker.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.
    … …  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Encodings.RealVectorEncoding {
    3232  [Item("AdditiveMoveTabuChecker", "Prevents falling back into ranges that have been moved over before.")]
    33   [StorableClass]
     33  [StorableType("CA7D09FF-C936-474C-A0F8-17D9DBF783C2")]
    3434  public class AdditiveMoveTabuChecker : SingleSuccessorOperator, IAdditiveRealVectorMoveOperator, ITabuChecker {
    3535    public override bool CanChangeName {
    … …  
    6464
    6565    [StorableConstructor]
    66     protected AdditiveMoveTabuChecker(bool deserializing) : base(deserializing) { }
     66    protected AdditiveMoveTabuChecker(StorableConstructorFlag _) : base(_) { }
    6767    protected AdditiveMoveTabuChecker(AdditiveMoveTabuChecker original, Cloner cloner) : base(original, cloner) { }
    6868    public AdditiveMoveTabuChecker()

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveTabuMaker.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.Optimization.Operators;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.RealVectorEncoding {
    2929  [Item("AdditiveMoveTabuMaker", "Sets the move tabu.")]
    30   [StorableClass]
     30  [StorableType("D495C70E-BE42-4FFB-B0E2-8422B7C8A1E9")]
    3131  public class AdditiveMoveTabuMaker : TabuMaker, IAdditiveRealVectorMoveOperator {
    3232    public ILookupParameter<AdditiveMove> AdditiveMoveParameter {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected AdditiveMoveTabuMaker(bool deserializing) : base(deserializing) { }
     40    protected AdditiveMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    4141    protected AdditiveMoveTabuMaker(AdditiveMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
    4242    public AdditiveMoveTabuMaker()

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/StochasticNormalMultiMoveGenerator.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
    3030namespace HeuristicLab.Encodings.RealVectorEncoding {
    3131  [Item("StochasticNormalMultiMoveGenerator", "Generates normal distributed moves from a given real vector.")]
    32   [StorableClass]
     32  [StorableType("2FCED1E2-2F4F-440A-9402-AA908DF0887B")]
    3333  public class StochasticNormalMultiMoveGenerator : AdditiveMoveGenerator, IMultiMoveGenerator {
    3434    public IValueLookupParameter<DoubleValue> SigmaParameter {
    … …  
    4040
    4141    [StorableConstructor]
    42     protected StochasticNormalMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     42    protected StochasticNormalMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4343    protected StochasticNormalMultiMoveGenerator(StochasticNormalMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4444    public StochasticNormalMultiMoveGenerator()

  • trunk/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/StochasticPolynomialMultiMoveGenerator.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;
    2828
    2929namespace HeuristicLab.Encodings.RealVectorEncoding {
    3030  [Item("StochasticPolynomialMultiMoveGenerator", "Generates polynomial moves from a given real vector.")]
    31   [StorableClass]
     31  [StorableType("94B0F4BE-E2CE-4521-8351-AAA21611D589")]
    3232  public class StochasticPolynomialMultiMoveGenerator : AdditiveMoveGenerator, IMultiMoveGenerator {
    3333    /// <summary>
    … …  
    4949
    5050    [StorableConstructor]
    51     protected StochasticPolynomialMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     51    protected StochasticPolynomialMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5252    protected StochasticPolynomialMultiMoveGenerator(StochasticPolynomialMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    5353    public StochasticPolynomialMultiMoveGenerator()
Note: See TracChangeset for help on using the changeset viewer.