Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/07/19 23:40:10 (5 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Encodings.PermutationEncoding

  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/ExhaustiveSwap2MoveGenerator.cs

    r15584 r17097  
    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.Core;
    2626using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.PermutationEncoding {
    3030  [Item("ExhaustiveSwap2MoveGenerator", "Generates all possible swap-2 moves from a given permutation.")]
    31   [StorableClass]
     31  [StorableType("D88EEC45-27D1-4E4F-9D3B-FD7ED3C4892C")]
    3232  public class ExhaustiveSwap2MoveGenerator : Swap2MoveGenerator, IExhaustiveMoveGenerator {
    3333    [StorableConstructor]
    34     protected ExhaustiveSwap2MoveGenerator(bool deserializing) : base(deserializing) { }
     34    protected ExhaustiveSwap2MoveGenerator(StorableConstructorFlag _) : base(_) { }
    3535    protected ExhaustiveSwap2MoveGenerator(ExhaustiveSwap2MoveGenerator original, Cloner cloner) : base(original, cloner) { }
    3636    public ExhaustiveSwap2MoveGenerator() : base() { }

  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/StochasticSwap2MultiMoveGenerator.cs

    r15584 r17097  
    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("StochasticSwap2MultiMoveGenerator", "Randomly samples n from all possible swap-2 moves from a given permutation.")]
    31   [StorableClass]
     31  [StorableType("07B2AFDA-01BB-4317-9BFB-7D596CE43D1A")]
    3232  public class StochasticSwap2MultiMoveGenerator : Swap2MoveGenerator, IMultiMoveGenerator, IStochasticOperator {
    3333    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected StochasticSwap2MultiMoveGenerator(bool deserializing) : base(deserializing) { }
     46    protected StochasticSwap2MultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4747    protected StochasticSwap2MultiMoveGenerator(StochasticSwap2MultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4848    public StochasticSwap2MultiMoveGenerator()

  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/StochasticSwap2SingleMoveGenerator.cs

    r15584 r17097  
    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("StochasticSwap2SingleMoveGenerator", "Randomly samples a single from all possible swap-2 moves from a given permutation.")]
    31   [StorableClass]
     31  [StorableType("A3F2B5E5-CB79-46FA-8336-69C54F354C1B")]
    3232  public class StochasticSwap2SingleMoveGenerator : Swap2MoveGenerator, IStochasticOperator, ISingleMoveGenerator {
    3333    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3636
    3737    [StorableConstructor]
    38     protected StochasticSwap2SingleMoveGenerator(bool deserializing) : base(deserializing) { }
     38    protected StochasticSwap2SingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3939    protected StochasticSwap2SingleMoveGenerator(StochasticSwap2SingleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4040    public StochasticSwap2SingleMoveGenerator()

  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2Move.cs

    r15584 r17097  
    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("Swap2Move", "Item that describes a swap-2 move.")]
    28   [StorableClass]
     28  [StorableType("50250010-F7BF-4F72-9093-D9F5FE01B8BF")]
    2929  public class Swap2Move : TwoIndexMove {
    3030    [StorableConstructor]
    31     protected Swap2Move(bool deserializing) : base(deserializing) { }
     31    protected Swap2Move(StorableConstructorFlag _) : base(_) { }
    3232    protected Swap2Move(Swap2Move original, Cloner cloner) : base(original, cloner) { }
    3333    public Swap2Move() : base() { }

  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveAbsoluteAttribute.cs

    r15584 r17097  
    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("Swap2MoveAbsoluteAttribute", "Specifies the tabu attributes for a swap-2 move on an absolute position permutation.")]
    28   [StorableClass]
     28  [StorableType("BE525C05-D1EB-4A87-9282-CF6B88E0D667")]
    2929  public class Swap2MoveAbsoluteAttribute : PermutationMoveAttribute {
    3030    [Storable]
    … …  
    3838
    3939    [StorableConstructor]
    40     protected Swap2MoveAbsoluteAttribute(bool deserializing) : base(deserializing) { }
     40    protected Swap2MoveAbsoluteAttribute(StorableConstructorFlag _) : base(_) { }
    4141    protected Swap2MoveAbsoluteAttribute(Swap2MoveAbsoluteAttribute original, Cloner cloner)
    4242      : base(original, cloner) {

  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveGenerator.cs

    r15584 r17097  
    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("Swap2MoveGenerator", "Base class for all swap-2 move generators.")]
    31   [StorableClass]
     31  [StorableType("A509FD36-5472-4664-BCB7-D1E4C4449614")]
    3232  public abstract class Swap2MoveGenerator : SingleSuccessorOperator, IPermutationSwap2MoveOperator, IMoveGenerator {
    3333    public override bool CanChangeName {
    … …  
    4545
    4646    [StorableConstructor]
    47     protected Swap2MoveGenerator(bool deserializing) : base(deserializing) { }
     47    protected Swap2MoveGenerator(StorableConstructorFlag _) : base(_) { }
    4848    protected Swap2MoveGenerator(Swap2MoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4949    public Swap2MoveGenerator()

  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveHardTabuCriterion.cs

    r15584 r17097  
    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 {
    … …  
    3434
    3535If 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.")]
    36   [StorableClass]
     36  [StorableType("5A8C0CDE-2545-46B2-A764-1F20597D4FF7")]
    3737  public class Swap2MoveHardTabuCriterion : SingleSuccessorOperator, IPermutationSwap2MoveOperator, ITabuChecker {
    3838    public override bool CanChangeName {
    … …  
    6767
    6868    [StorableConstructor]
    69     protected Swap2MoveHardTabuCriterion(bool deserializing) : base(deserializing) { }
     69    protected Swap2MoveHardTabuCriterion(StorableConstructorFlag _) : base(_) { }
    7070    protected Swap2MoveHardTabuCriterion(Swap2MoveHardTabuCriterion original, Cloner cloner) : base(original, cloner) { }
    7171    public Swap2MoveHardTabuCriterion()

  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveMaker.cs

    r15584 r17097  
    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("Swap2MoveMaker", "Peforms a swap-2 move on a given permutation and updates the quality.")]
    32   [StorableClass]
     32  [StorableType("A5781DC7-E9F0-4926-A3BF-A43EE893E4F9")]
    3333  public class Swap2MoveMaker : SingleSuccessorOperator, IPermutationSwap2MoveOperator, IMoveMaker, ISingleObjectiveOperator {
    3434    public override bool CanChangeName {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected Swap2MoveMaker(bool deserializing) : base(deserializing) { }
     51    protected Swap2MoveMaker(StorableConstructorFlag _) : base(_) { }
    5252    protected Swap2MoveMaker(Swap2MoveMaker original, Cloner cloner) : base(original, cloner) { }
    5353    public Swap2MoveMaker()

  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveRelativeAttribute.cs

    r15584 r17097  
    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("Swap2MoveRelativeAttribute", "Specifies the tabu attributes for a swap-2 move on a relative position permutation.")]
    28   [StorableClass]
     28  [StorableType("826E9F84-344E-48F3-ADC8-E1AFF52AADBF")]
    2929  public class Swap2MoveRelativeAttribute : PermutationMoveAttribute {
    3030    [Storable]
    … …  
    3434
    3535    [StorableConstructor]
    36     protected Swap2MoveRelativeAttribute(bool deserializing) : base(deserializing) { }
     36    protected Swap2MoveRelativeAttribute(StorableConstructorFlag _) : base(_) { }
    3737    protected Swap2MoveRelativeAttribute(Swap2MoveRelativeAttribute original, Cloner cloner)
    3838      : base(original, cloner) {

  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveSoftTabuCriterion.cs

    r15584 r17097  
    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 {
    … …  
    3434
    3535If 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.")]
    36   [StorableClass]
     36  [StorableType("71881921-009B-4F82-BF3D-90AB1447D79A")]
    3737  public class Swap2MoveSoftTabuCriterion : SingleSuccessorOperator, IPermutationSwap2MoveOperator, ITabuChecker {
    3838    public override bool CanChangeName {
    … …  
    6767
    6868    [StorableConstructor]
    69     protected Swap2MoveSoftTabuCriterion(bool deserializing) : base(deserializing) { }
     69    protected Swap2MoveSoftTabuCriterion(StorableConstructorFlag _) : base(_) { }
    7070    protected Swap2MoveSoftTabuCriterion(Swap2MoveSoftTabuCriterion original, Cloner cloner) : base(original, cloner) { }
    7171    public Swap2MoveSoftTabuCriterion()

  • stable/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveTabuMaker.cs

    r15584 r17097  
    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("Swap2MoveTabuMaker", "Declares a given swap-2 move as tabu, by adding its attributes to the tabu list and also store the solution quality or the move quality (whichever is better).")]
    30   [StorableClass]
     30  [StorableType("A6548572-AF42-46FF-9B8C-E00EB9B92DE4")]
    3131  public class Swap2MoveTabuMaker : TabuMaker, IPermutationSwap2MoveOperator {
    3232    public ILookupParameter<Permutation> PermutationParameter {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected Swap2MoveTabuMaker(bool deserializing) : base(deserializing) { }
     40    protected Swap2MoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    4141    protected Swap2MoveTabuMaker(Swap2MoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
    4242    public Swap2MoveTabuMaker()
Note: See TracChangeset for help on using the changeset viewer.