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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Encodings.PermutationEncoding

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/ExhaustiveInsertionMoveGenerator.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.Core;
    2727using HeuristicLab.Optimization;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.PermutationEncoding {
    3131  [Item("ExhaustiveInsertionMoveGenerator", "Generates all possible insertion moves (3-opt) from a given permutation.")]
    32   [StorableClass]
     32  [StorableType("D3E672A7-97F5-4E21-B151-F7CE465A4DBB")]
    3333  public class ExhaustiveInsertionMoveGenerator : TranslocationMoveGenerator, IExhaustiveMoveGenerator {
    3434    [StorableConstructor]
    35     protected ExhaustiveInsertionMoveGenerator(bool deserializing) : base(deserializing) { }
     35    protected ExhaustiveInsertionMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3636    protected ExhaustiveInsertionMoveGenerator(ExhaustiveInsertionMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    3737    public ExhaustiveInsertionMoveGenerator() : base() { }

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticSingleInsertionMoveGenerator.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.PermutationEncoding {
    3232  [Item("StochasticInsertionMultiMoveGenerator", "Generates all possible insertion moves (3-opt) from a few numbers in a given permutation.")]
    33   [StorableClass]
     33  [StorableType("27AFEE18-D94C-467C-AB45-F81ABB879B16")]
    3434  public class StochasticInsertionMultiMoveGenerator : TranslocationMoveGenerator, IMultiMoveGenerator, IStochasticOperator {
    3535    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4646
    4747    [StorableConstructor]
    48     protected StochasticInsertionMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     48    protected StochasticInsertionMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4949    protected StochasticInsertionMultiMoveGenerator(StochasticInsertionMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    5050    public StochasticInsertionMultiMoveGenerator() : base() {

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticTranslocationMultiMoveGenerator.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.PermutationEncoding {
    3030  [Item("StochasticTranslocationMultiMoveGenerator", "Randomly samples n from all possible translocation and insertion moves (3-opt) from a given permutation.")]
    31   [StorableClass]
     31  [StorableType("CEC3FF43-3DE6-4977-BCE7-4CEB20BA97EE")]
    3232  public class StochasticTranslocationMultiMoveGenerator : TranslocationMoveGenerator, IStochasticOperator, IMultiMoveGenerator {
    3333    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected StochasticTranslocationMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     46    protected StochasticTranslocationMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4747    protected StochasticTranslocationMultiMoveGenerator(StochasticTranslocationMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4848    public StochasticTranslocationMultiMoveGenerator() : base() {

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticTranslocationSingleMoveGenerator.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.PermutationEncoding {
    3030  [Item("StochasticTranslocationSingleMoveGenerator", "Randomly samples one from all possible translocation and insertion moves (3-opt) from a given permutation.")]
    31   [StorableClass]
     31  [StorableType("E084E519-132B-4D01-ABDF-1B5B2976219E")]
    3232  public class StochasticTranslocationSingleMoveGenerator : TranslocationMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
    3333    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3636
    3737    [StorableConstructor]
    38     protected StochasticTranslocationSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     38    protected StochasticTranslocationSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3939    protected StochasticTranslocationSingleMoveGenerator(StochasticTranslocationSingleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4040    public StochasticTranslocationSingleMoveGenerator()

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMove.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.PermutationEncoding {
    2727  [Item("TranslocationMove", "A move that changes three edges by performing a translocation.")]
    28   [StorableClass]
     28  [StorableType("D8C65083-9375-4665-8A90-1A9EAD3EDA97")]
    2929  public class TranslocationMove : ThreeIndexMove {
    3030    [StorableConstructor]
    31     protected TranslocationMove(bool deserializing) : base(deserializing) { }
     31    protected TranslocationMove(StorableConstructorFlag _) : base(_) { }
    3232    protected TranslocationMove(TranslocationMove original, Cloner cloner) : base(original, cloner) { }
    3333    public TranslocationMove() : base() { }

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveAbsoluteAttribute.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.PermutationEncoding {
    2727  [Item("TranslocationMoveAbsoluteAttribute", "Specifies the tabu attributes for a translocation and insertion move (3-opt) on absolute permutation encodings.")]
    28   [StorableClass]
     28  [StorableType("6E434731-DD9F-4CCD-A929-C6522EA4A301")]
    2929  public class TranslocationMoveAbsoluteAttribute : PermutationMoveAttribute {
    3030    [Storable]
    … …  
    3636
    3737    [StorableConstructor]
    38     protected TranslocationMoveAbsoluteAttribute(bool deserializing) : base(deserializing) { }
     38    protected TranslocationMoveAbsoluteAttribute(StorableConstructorFlag _) : base(_) { }
    3939    protected TranslocationMoveAbsoluteAttribute(TranslocationMoveAbsoluteAttribute original, Cloner cloner)
    4040      : base(original, cloner) {

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveGenerator.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.PermutationEncoding {
    3030  [Item("TranslocationMoveGenerator", "Base class for move generators that produce translocation moves (3-opt).")]
    31   [StorableClass]
     31  [StorableType("1569B595-0381-44D9-932B-72769C55ABC5")]
    3232  public abstract class TranslocationMoveGenerator : SingleSuccessorOperator, IPermutationTranslocationMoveOperator, IMoveGenerator {
    3333    public override bool CanChangeName {
    … …  
    4545
    4646    [StorableConstructor]
    47     protected TranslocationMoveGenerator(bool deserializing) : base(deserializing) { }
     47    protected TranslocationMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4848    protected TranslocationMoveGenerator(TranslocationMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4949    public TranslocationMoveGenerator()

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveHardTabuCriterion.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.PermutationEncoding {
    … …  
    3333
    3434If the aspiration condition is activated, a move will not be considered tabu against a move in the tabu list if it leads to a better solution than the quality recorded with the move in the tabu list.")]
    35   [StorableClass]
     35  [StorableType("FD8C3ED7-734F-4B90-9539-2367C62FA7EB")]
    3636  public class TranslocationMoveHardTabuCriterion : SingleSuccessorOperator, IPermutationTranslocationMoveOperator, ITabuChecker {
    3737    public override bool CanChangeName {
    … …  
    6666
    6767    [StorableConstructor]
    68     protected TranslocationMoveHardTabuCriterion(bool deserializing) : base(deserializing) { }
     68    protected TranslocationMoveHardTabuCriterion(StorableConstructorFlag _) : base(_) { }
    6969    protected TranslocationMoveHardTabuCriterion(TranslocationMoveHardTabuCriterion original, Cloner cloner) : base(original, cloner) { }
    7070    public TranslocationMoveHardTabuCriterion()

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveMaker.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.PermutationEncoding {
    3131  [Item("TranslocationMoveMaker", "Peforms a translocation or insertion move (3-opt) on a given permutation and updates the quality.")]
    32   [StorableClass]
     32  [StorableType("B27DC2DD-4E4E-448A-B4BD-86EEABACBBC5")]
    3333  public class TranslocationMoveMaker : SingleSuccessorOperator, IPermutationTranslocationMoveOperator, IMoveMaker, ISingleObjectiveOperator {
    3434    public override bool CanChangeName {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected TranslocationMoveMaker(bool deserializing) : base(deserializing) { }
     51    protected TranslocationMoveMaker(StorableConstructorFlag _) : base(_) { }
    5252    protected TranslocationMoveMaker(TranslocationMoveMaker original, Cloner cloner) : base(original, cloner) { }
    5353    public TranslocationMoveMaker()

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveRelativeAttribute.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.PermutationEncoding {
    2727  [Item("TranslocationMoveRelativeAttribute", "Specifies the tabu attributes for a translocation and insertion move (3-opt) on relative permutation encodings.")]
    28   [StorableClass]
     28  [StorableType("95F01C10-D383-4E5C-AC30-CB88E3263A00")]
    2929  public class TranslocationMoveRelativeAttribute : PermutationMoveAttribute {
    3030    [Storable]
    … …  
    4242
    4343    [StorableConstructor]
    44     protected TranslocationMoveRelativeAttribute(bool deserializing) : base(deserializing) { }
     44    protected TranslocationMoveRelativeAttribute(StorableConstructorFlag _) : base(_) { }
    4545    protected TranslocationMoveRelativeAttribute(TranslocationMoveRelativeAttribute original, Cloner cloner)
    4646      : base(original, cloner) {

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveSoftTabuCriterion.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.PermutationEncoding {
    … …  
    3333
    3434If the aspiration condition is activated, a move will not be considered tabu against a move in the tabu list if it leads to a better solution than the quality recorded with the move in the tabu list.")]
    35   [StorableClass]
     35  [StorableType("391C33EC-E235-4331-8121-97298E0FAE49")]
    3636  public class TranslocationMoveSoftTabuCriterion : SingleSuccessorOperator, IPermutationTranslocationMoveOperator, ITabuChecker {
    3737    public override bool CanChangeName {
    … …  
    6666
    6767    [StorableConstructor]
    68     protected TranslocationMoveSoftTabuCriterion(bool deserializing) : base(deserializing) { }
     68    protected TranslocationMoveSoftTabuCriterion(StorableConstructorFlag _) : base(_) { }
    6969    protected TranslocationMoveSoftTabuCriterion(TranslocationMoveSoftTabuCriterion original, Cloner cloner) : base(original, cloner) { }
    7070    public TranslocationMoveSoftTabuCriterion()

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveTabuMaker.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.PermutationEncoding {
    2929  [Item("TranslocationMoveTabuMaker", "Declares a given translocation or insertion move (3-opt) as tabu, by adding its attributes to the tabu list.")]
    30   [StorableClass]
     30  [StorableType("A5B9AC7B-3A83-4BF4-914A-A0FD17AE8A94")]
    3131  public class TranslocationMoveTabuMaker : TabuMaker, IPermutationTranslocationMoveOperator {
    3232    public ILookupParameter<Permutation> PermutationParameter {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected TranslocationMoveTabuMaker(bool deserializing) : base(deserializing) { }
     40    protected TranslocationMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    4141    protected TranslocationMoveTabuMaker(TranslocationMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
    4242    public TranslocationMoveTabuMaker()
Note: See TracChangeset for help on using the changeset viewer.