Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/15/19 13:36:51 (5 years ago)
Author:
abeham
Message:

#2457: merged trunk into branch

Location:
branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding
Files:
44 edited

Legend:

Unmodified
Added
Removed

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Edge.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("Edge", "An edge between two integer nodes and a flag for the direction.")]
    28   [StorableClass]
     28  [StorableType("68E0DF31-81CC-4561-B118-000AC925464D")]
    2929  public class Edge : Item {
    3030    [Storable]
    … …  
    3636
    3737    [StorableConstructor]
    38     protected Edge(bool deserializing) : base(deserializing) { }
     38    protected Edge(StorableConstructorFlag _) : base(_) { }
    3939    protected Edge(Edge original, Cloner cloner)
    4040      : base(original, cloner) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/PermutationMoveAttribute.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("PermutationMoveAttribute", "Base class for specifying a move attribute")]
    28   [StorableClass]
     28  [StorableType("46AD6CFC-3D7B-4C36-9925-09526723E990")]
    2929  public class PermutationMoveAttribute : Item {
    3030    [Storable]
    … …  
    3232
    3333    [StorableConstructor]
    34     protected PermutationMoveAttribute(bool deserializing) : base(deserializing) { }
     34    protected PermutationMoveAttribute(StorableConstructorFlag _) : base(_) { }
    3535    protected PermutationMoveAttribute(PermutationMoveAttribute original, Cloner cloner)
    3636      : base(original, cloner) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/ScrambleMove.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("ScrambleMove", "Item that describes a scramble move.")]
    28   [StorableClass]
     28  [StorableType("DBE9C007-10AA-4B8A-8092-23C9ACBA411A")]
    2929  public sealed class ScrambleMove : Item {
    3030    [Storable]
    … …  
    3434
    3535    [StorableConstructor]
    36     private ScrambleMove(bool deserializing) : base(deserializing) { }
     36    private ScrambleMove(StorableConstructorFlag _) : base(_) { }
    3737    private ScrambleMove(ScrambleMove original, Cloner cloner)
    3838      : base(original, cloner) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/ScrambleMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("ScrambleMoveGenerator", "Base class for all scramble move generators.")]
    31   [StorableClass]
     31  [StorableType("053A3BFC-F5F1-4893-B5E8-BCB452D18FC1")]
    3232  public abstract class ScrambleMoveGenerator : SingleSuccessorOperator, IPermutationScrambleMoveOperator, IMoveGenerator {
    3333    public override bool CanChangeName {
    … …  
    4242
    4343    [StorableConstructor]
    44     protected ScrambleMoveGenerator(bool deserializing) : base(deserializing) { }
     44    protected ScrambleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4545    protected ScrambleMoveGenerator(ScrambleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4646    public ScrambleMoveGenerator()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/ScrambleMoveMaker.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("ScrambleMoveMaker", "Peforms a scramble move on a given permutation and updates the quality.")]
    32   [StorableClass]
     32  [StorableType("5DC6735A-F109-4D86-98CF-B8CCB648D3D3")]
    3333  public class ScrambleMoveMaker : SingleSuccessorOperator, IPermutationScrambleMoveOperator, IMoveMaker, ISingleObjectiveOperator {
    3434    public override bool CanChangeName {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected ScrambleMoveMaker(bool deserializing) : base(deserializing) { }
     51    protected ScrambleMoveMaker(StorableConstructorFlag _) : base(_) { }
    5252    protected ScrambleMoveMaker(ScrambleMoveMaker original, Cloner cloner) : base(original, cloner) { }
    5353    public ScrambleMoveMaker()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/StochasticScrambleMultiMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("StochasticScrambleMultiMoveGenerator", "Randomly samples n from all possible scramble moves from a given permutation.")]
    33   [StorableClass]
     33  [StorableType("ECC7549D-404B-459A-A01E-6E00A53E58F5")]
    3434  public class StochasticScrambleMultiMoveGenerator : ScrambleMoveGenerator, IMultiMoveGenerator, IStochasticOperator {
    3535    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4646
    4747    [StorableConstructor]
    48     protected StochasticScrambleMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     48    protected StochasticScrambleMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4949    protected StochasticScrambleMultiMoveGenerator(StochasticScrambleMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    5050    public StochasticScrambleMultiMoveGenerator()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/StandardEdgeEqualityComparer.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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.
    … …  
    2121
    2222using System.Collections.Generic;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Encodings.PermutationEncoding {
     26  [StorableType("09d35061-7098-4f29-957d-c2a2319fe954")]
    2527  public class StandardEdgeEqualityComparer : EqualityComparer<Edge> {
    2628    public override bool Equals(Edge x, Edge y) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/ExhaustiveSwap2MoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/StochasticSwap2MultiMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/StochasticSwap2SingleMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2Move.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveAbsoluteAttribute.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveHardTabuCriterion.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveMaker.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveRelativeAttribute.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveSoftTabuCriterion.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveTabuMaker.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeIndexMove.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("ThreeIndexMove", "A move on a permutation that is specified by 3 indices.")]
    28   [StorableClass]
     28  [StorableType("0F9A8E7D-0198-4FBF-B6BA-D1B537F4B4D9")]
    2929  public class ThreeIndexMove : Item {
    3030    [Storable]
    … …  
    3838
    3939    [StorableConstructor]
    40     protected ThreeIndexMove(bool deserializing) : base(deserializing) { }
     40    protected ThreeIndexMove(StorableConstructorFlag _) : base(_) { }
    4141    protected ThreeIndexMove(ThreeIndexMove original, Cloner cloner)
    4242      : base(original, cloner) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/ExhaustiveInsertionMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticSingleInsertionMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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() {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticTranslocationMultiMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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() {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticTranslocationSingleMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMove.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveAbsoluteAttribute.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveHardTabuCriterion.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveMaker.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveRelativeAttribute.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveSoftTabuCriterion.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveTabuMaker.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoIndexMove.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("TwoIndexMove", "A move on a permutation that is specified by 2 indices.")]
    28   [StorableClass]
     28  [StorableType("B2415ECB-30EE-4FD6-96F6-1170B5BD85DE")]
    2929  public class TwoIndexMove : Item {
    3030    [Storable]
    … …  
    3636
    3737    [StorableConstructor]
    38     protected TwoIndexMove(bool deserializing) : base(deserializing) { }
     38    protected TwoIndexMove(StorableConstructorFlag _) : base(_) { }
    3939    protected TwoIndexMove(TwoIndexMove original, Cloner cloner)
    4040      : base(original, cloner) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/ExhaustiveInversionMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("ExhaustiveInversionMoveGenerator", "Generates all possible inversion moves (2-opt) from a given permutation.")]
    32   [StorableClass]
     32  [StorableType("7356F98C-404C-47B5-B290-EF4EE995D51C")]
    3333  public class ExhaustiveInversionMoveGenerator : InversionMoveGenerator, IExhaustiveMoveGenerator {
    3434    [StorableConstructor]
    35     protected ExhaustiveInversionMoveGenerator(bool deserializing) : base(deserializing) { }
     35    protected ExhaustiveInversionMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3636    protected ExhaustiveInversionMoveGenerator(ExhaustiveInversionMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    3737    public ExhaustiveInversionMoveGenerator() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMove.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("InversionMove", "Item that describes an inversion move (2-opt).")]
    28   [StorableClass]
     28  [StorableType("864C1259-8419-410F-8DD1-2C2751B1AF6B")]
    2929  public class InversionMove : TwoIndexMove {
    3030    [StorableConstructor]
    31     protected InversionMove(bool deserializing) : base(deserializing) { }
     31    protected InversionMove(StorableConstructorFlag _) : base(_) { }
    3232    protected InversionMove(InversionMove original, Cloner cloner) : base(original, cloner) { }
    3333    public InversionMove() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveAbsoluteAttribute.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("InversionMoveAbsoluteAttribute", "Specifies the tabu attributes for an inversion move (2-opt) on an absolute position permutation.")]
    28   [StorableClass]
     28  [StorableType("3C1B448F-5D8F-462F-9F2A-42CCDF4D596D")]
    2929  public class InversionMoveAbsoluteAttribute : PermutationMoveAttribute {
    3030    [Storable]
    … …  
    3838
    3939    [StorableConstructor]
    40     protected InversionMoveAbsoluteAttribute(bool deserializing) : base(deserializing) { }
     40    protected InversionMoveAbsoluteAttribute(StorableConstructorFlag _) : base(_) { }
    4141    protected InversionMoveAbsoluteAttribute(InversionMoveAbsoluteAttribute original, Cloner cloner)
    4242      : base(original, cloner) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("InversionMoveGenerator", "Base class for all inversion (2-opt) move generators.")]
    31   [StorableClass]
     31  [StorableType("FB20D0B5-4A65-4718-9A92-90C421034BCF")]
    3232  public abstract class InversionMoveGenerator : SingleSuccessorOperator, IPermutationInversionMoveOperator, IMoveGenerator {
    3333    public override bool CanChangeName {
    … …  
    4545
    4646    [StorableConstructor]
    47     protected InversionMoveGenerator(bool deserializing) : base(deserializing) { }
     47    protected InversionMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4848    protected InversionMoveGenerator(InversionMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4949    public InversionMoveGenerator()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveHardTabuCriterion.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("E5212C75-4A9E-4F9F-920E-D76D11E72874")]
    3737  public class InversionMoveHardTabuCriterion : SingleSuccessorOperator, IPermutationInversionMoveOperator, ITabuChecker {
    3838    public override bool CanChangeName {
    … …  
    6767
    6868    [StorableConstructor]
    69     protected InversionMoveHardTabuCriterion(bool deserializing) : base(deserializing) { }
     69    protected InversionMoveHardTabuCriterion(StorableConstructorFlag _) : base(_) { }
    7070    protected InversionMoveHardTabuCriterion(InversionMoveHardTabuCriterion original, Cloner cloner) : base(original, cloner) { }
    7171    public InversionMoveHardTabuCriterion()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveMaker.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("InversionMoveMaker", "Peforms an inversion move (2-opt) on a given permutation and updates the quality.")]
    32   [StorableClass]
     32  [StorableType("9A0BCC19-9153-457B-A7E4-A16A51615739")]
    3333  public class InversionMoveMaker : SingleSuccessorOperator, IPermutationInversionMoveOperator, IMoveMaker, ISingleObjectiveOperator {
    3434    public override bool CanChangeName {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected InversionMoveMaker(bool deserializing) : base(deserializing) { }
     51    protected InversionMoveMaker(StorableConstructorFlag _) : base(_) { }
    5252    protected InversionMoveMaker(InversionMoveMaker original, Cloner cloner) : base(original, cloner) { }
    5353    public InversionMoveMaker()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveRelativeAttribute.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("InversionMoveRelativeAttribute", "Specifies the tabu attributes for an inversion move (2-opt) on a relative position permutation.")]
    28   [StorableClass]
     28  [StorableType("92CFBF00-0D01-4EBA-9CED-EA1483C842F7")]
    2929  public class InversionMoveRelativeAttribute : PermutationMoveAttribute {
    3030    [Storable]
    … …  
    3838
    3939    [StorableConstructor]
    40     protected InversionMoveRelativeAttribute(bool deserializing) : base(deserializing) { }
     40    protected InversionMoveRelativeAttribute(StorableConstructorFlag _) : base(_) { }
    4141    protected InversionMoveRelativeAttribute(InversionMoveRelativeAttribute original, Cloner cloner)
    4242      : base(original, cloner) {

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveSoftTabuCriterion.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("5A5C8DDD-C22A-44CA-9261-BAFA79BB50BB")]
    3737  public class InversionMoveSoftTabuCriterion : SingleSuccessorOperator, IPermutationInversionMoveOperator, ITabuChecker {
    3838    public override bool CanChangeName {
    … …  
    6767
    6868    [StorableConstructor]
    69     protected InversionMoveSoftTabuCriterion(bool deserializing) : base(deserializing) { }
     69    protected InversionMoveSoftTabuCriterion(StorableConstructorFlag _) : base(_) { }
    7070    protected InversionMoveSoftTabuCriterion(InversionMoveSoftTabuCriterion original, Cloner cloner) : base(original, cloner) { }
    7171    public InversionMoveSoftTabuCriterion()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveTabuMaker.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("InversionMoveTabuMaker", "Declares a given inversion move (2-opt) 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("81928009-A474-418B-8FD6-834FE79B43C9")]
    3131  public class InversionMoveTabuMaker : TabuMaker, IPermutationInversionMoveOperator {
    3232    public ILookupParameter<Permutation> PermutationParameter {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected InversionMoveTabuMaker(bool deserializing) : base(deserializing) { }
     40    protected InversionMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    4141    protected InversionMoveTabuMaker(InversionMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
    4242    public InversionMoveTabuMaker()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/StochasticInversionMultiMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("StochasticInversionMultiMoveGenerator", "Randomly samples n from all possible inversion moves (2-opt) from a given permutation.")]
    31   [StorableClass]
     31  [StorableType("7CFC07A2-6610-4716-96BE-ABC84A6DA4C6")]
    3232  public class StochasticInversionMultiMoveGenerator : InversionMoveGenerator, IMultiMoveGenerator, IStochasticOperator {
    3333    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected StochasticInversionMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     46    protected StochasticInversionMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4747    protected StochasticInversionMultiMoveGenerator(StochasticInversionMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4848    public StochasticInversionMultiMoveGenerator()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/StochasticInversionSingleMoveGenerator.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("StochasticInversionSingleMoveGenerator", "Randomly samples a single from all possible inversion moves (2-opt) from a given permutation.")]
    31   [StorableClass]
     31  [StorableType("F7190264-4BE1-45A2-A908-E2C7869B4F1F")]
    3232  public class StochasticInversionSingleMoveGenerator : InversionMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
    3333    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3636
    3737    [StorableConstructor]
    38     protected StochasticInversionSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     38    protected StochasticInversionSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3939    protected StochasticInversionSingleMoveGenerator(StochasticInversionSingleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4040    public StochasticInversionSingleMoveGenerator()
Note: See TracChangeset for help on using the changeset viewer.