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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Encodings.BinaryVectorEncoding

  • trunk/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/ExhaustiveOneBitflipMoveGenerator.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.
    … …  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Optimization;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    2828  [Item("ExhaustiveBitflipMoveGenerator", "Generates all possible one bitflip moves from a given binaryVector.")]
    29   [StorableClass]
     29  [StorableType("15F17361-2334-434A-904D-EF9426DEF32F")]
    3030  public sealed class ExhaustiveOneBitflipMoveGenerator : OneBitflipMoveGenerator, IExhaustiveMoveGenerator {
    3131    [StorableConstructor]
    32     private ExhaustiveOneBitflipMoveGenerator(bool deserializing) : base(deserializing) { }
     32    private ExhaustiveOneBitflipMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3333    private ExhaustiveOneBitflipMoveGenerator(ExhaustiveOneBitflipMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    3434    public ExhaustiveOneBitflipMoveGenerator() : base() { }

  • trunk/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMove.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.BinaryVectorEncoding {
    2727  [Item("OneBitflipMove", "Item that describes a one bitflip move.")]
    28   [StorableClass]
     28  [StorableType("BFF3ABCF-9C7B-41F8-8861-B2164D92FD89")]
    2929  public class OneBitflipMove : OneIndexMove {
    3030    [StorableConstructor]
    31     protected OneBitflipMove(bool deserializing) : base(deserializing) { }
     31    protected OneBitflipMove(StorableConstructorFlag _) : base(_) { }
    3232    protected OneBitflipMove(OneBitflipMove original, Cloner cloner) : base(original, cloner) { }
    3333    public OneBitflipMove() : base() { }

  • trunk/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveAttribute.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.BinaryVectorEncoding {
    2727  [Item("OneBitflipMoveAttribute", "Describes the attributes (move quality and index) of a single bitflip move.")]
    28   [StorableClass]
     28  [StorableType("D5CD3F76-E016-417F-B916-7666683A42D7")]
    2929  public class OneBitflipMoveAttribute : Item {
    3030    [Storable]
    … …  
    3434
    3535    [StorableConstructor]
    36     protected OneBitflipMoveAttribute(bool deserializing) : base(deserializing) { }
     36    protected OneBitflipMoveAttribute(StorableConstructorFlag _) : base(_) { }
    3737    protected OneBitflipMoveAttribute(OneBitflipMoveAttribute original, Cloner cloner)
    3838      : base(original, cloner) {

  • trunk/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveGenerator.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.BinaryVectorEncoding {
    3030  [Item("OneBitflipMoveGenerator", "Base class for all one bitflip move generators.")]
    31   [StorableClass]
     31  [StorableType("600CE405-5ADC-471A-966B-27965190AF73")]
    3232  public abstract class OneBitflipMoveGenerator : SingleSuccessorOperator, IOneBitflipMoveOperator, IMoveGenerator {
    3333    public override bool CanChangeName {
    … …  
    4545
    4646    [StorableConstructor]
    47     protected OneBitflipMoveGenerator(bool deserializing) : base(deserializing) { }
     47    protected OneBitflipMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4848    protected OneBitflipMoveGenerator(OneBitflipMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4949    public OneBitflipMoveGenerator()

  • trunk/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveMaker.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.BinaryVectorEncoding {
    3131  [Item("OneBitflipMoveMaker", "Peforms a one bitflip move on a given BitVector and updates the quality.")]
    32   [StorableClass]
     32  [StorableType("13029FD8-4A99-4EA6-A4AA-8877B86582B8")]
    3333  public class OneBitflipMoveMaker : SingleSuccessorOperator, IOneBitflipMoveOperator, IMoveMaker, ISingleObjectiveOperator {
    3434    public override bool CanChangeName {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected OneBitflipMoveMaker(bool deserializing) : base(deserializing) { }
     51    protected OneBitflipMoveMaker(StorableConstructorFlag _) : base(_) { }
    5252    protected OneBitflipMoveMaker(OneBitflipMoveMaker original, Cloner cloner) : base(original, cloner) { }
    5353    public OneBitflipMoveMaker()

  • trunk/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveTabuChecker.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.BinaryVectorEncoding {
    3131  [Item("OneBitflipMoveTabuChecker", "Prevents peforming a one bitflip move again.")]
    32   [StorableClass]
     32  [StorableType("27523531-D19E-47ED-9397-F7457D41B85B")]
    3333  public class OneBitflipMoveTabuChecker : SingleSuccessorOperator, IOneBitflipMoveOperator, ITabuChecker {
    3434    public override bool CanChangeName {
    … …  
    6363
    6464    [StorableConstructor]
    65     protected OneBitflipMoveTabuChecker(bool deserializing) : base(deserializing) { }
     65    protected OneBitflipMoveTabuChecker(StorableConstructorFlag _) : base(_) { }
    6666    protected OneBitflipMoveTabuChecker(OneBitflipMoveTabuChecker original, Cloner cloner) : base(original, cloner) { }
    6767    public OneBitflipMoveTabuChecker()

  • trunk/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveTabuMaker.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.BinaryVectorEncoding {
    2929  [Item("OneBitflipMoveTabuMaker", "Declares a given one bitflip move as tabu, by adding its attributes to the tabu list. It also removes the oldest entry in the tabu list when its size is greater than tenure.")]
    30   [StorableClass]
     30  [StorableType("F0C4D51D-EF93-426D-8D94-867BE0DBE1F6")]
    3131  public class OneBitflipMoveTabuMaker : TabuMaker, IOneBitflipMoveOperator {
    3232    public ILookupParameter<BinaryVector> BinaryVectorParameter {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected OneBitflipMoveTabuMaker(bool deserializing) : base(deserializing) { }
     40    protected OneBitflipMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    4141    protected OneBitflipMoveTabuMaker(OneBitflipMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
    4242    public OneBitflipMoveTabuMaker()

  • trunk/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/StochasticOneBitflipMultiMoveGenerator.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.BinaryVectorEncoding {
    3131  [Item("StochasticOneBitflipMultiMoveGenerator", "Randomly samples n from all possible one bitflip moves from a given BinaryVector.")]
    32   [StorableClass]
     32  [StorableType("11A9E43A-6291-4F9D-90AB-DC205923EE68")]
    3333  public class StochasticOneBitflipMultiMoveGenerator : OneBitflipMoveGenerator, IStochasticOperator, IMultiMoveGenerator {
    3434    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4545
    4646    [StorableConstructor]
    47     protected StochasticOneBitflipMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     47    protected StochasticOneBitflipMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4848    protected StochasticOneBitflipMultiMoveGenerator(StochasticOneBitflipMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4949    public StochasticOneBitflipMultiMoveGenerator()

  • trunk/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/StochasticOneBitflipSingleMoveGenerator.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;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    2929  [Item("StochasticOneBitflipSingleMoveGenerator", "Randomly samples a single from all possible one bitflip moves from a given BinaryVector.")]
    30   [StorableClass]
     30  [StorableType("9EFDBD19-B9AF-4820-8DA9-EE04370D7D8B")]
    3131  public class StochasticOneBitflipSingleMoveGenerator : OneBitflipMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
    3232    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected StochasticOneBitflipSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     37    protected StochasticOneBitflipSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3838    protected StochasticOneBitflipSingleMoveGenerator(StochasticOneBitflipSingleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    3939    public StochasticOneBitflipSingleMoveGenerator()

  • trunk/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneIndexMove.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.BinaryVectorEncoding {
    2727  [Item("OneIndexMove", "A move on a binary vector that is specified by 1 index")]
    28   [StorableClass]
     28  [StorableType("C7948F7F-EC47-4752-9E18-9299123189D1")]
    2929  public class OneIndexMove : Item {
    3030    [Storable]
    … …  
    3434
    3535    [StorableConstructor]
    36     protected OneIndexMove(bool deserializing) : base(deserializing) { }
     36    protected OneIndexMove(StorableConstructorFlag _) : base(_) { }
    3737    protected OneIndexMove(OneIndexMove original, Cloner cloner)
    3838      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.