Ignore:
Timestamp:
01/28/19 13:41:42 (3 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
88 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Encodings.PermutationEncoding

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Creators/RandomPermutationCreator.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  /// </summary>
    3434  [Item("RandomPermutationCreator", "An operator which creates a new random permutation of integer values.")]
    35   [StorableClass]
     35  [StorableType("527B14A9-DB58-4507-8C3F-1DE1EF4C4A2B")]
    3636  public sealed class RandomPermutationCreator : InstrumentedOperator, IPermutationCreator, IStochasticOperator {
    3737    public override bool CanChangeName {
     
    5858
    5959    [StorableConstructor]
    60     private RandomPermutationCreator(bool deserializing) : base(deserializing) { }
     60    private RandomPermutationCreator(StorableConstructorFlag _) : base(_) { }
    6161    private RandomPermutationCreator(RandomPermutationCreator original, Cloner cloner) : base(original, cloner) { }
    6262    public RandomPermutationCreator()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/CosaCrossover.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.PermutationEncoding {
     
    3636  /// </remarks>
    3737  [Item("CosaCrossover", "An operator which performs the crossover described in the COSA optimization method. It is implemented as described in Wendt, O. 1994. COSA: COoperative Simulated Annealing - Integration von Genetischen Algorithmen und Simulated Annealing am Beispiel der Tourenplanung. Dissertation Thesis. IWI Frankfurt.")]
    38   [StorableClass]
     38  [StorableType("2C6B5F27-A921-4CDD-A484-35B8824CDDBE")]
    3939  public class CosaCrossover : PermutationCrossover {
    4040    [StorableConstructor]
    41     protected CosaCrossover(bool deserializing) : base(deserializing) { }
     41    protected CosaCrossover(StorableConstructorFlag _) : base(_) { }
    4242    protected CosaCrossover(CosaCrossover original, Cloner cloner) : base(original, cloner) { }
    4343    public CosaCrossover() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/CyclicCrossover.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.PermutationEncoding {
     
    3333  /// </remarks>
    3434  [Item("CyclicCrossover", "An operator which performs the cyclic crossover on two permutations. It is implemented as described in Eiben, A.E. and Smith, J.E. 2003. Introduction to Evolutionary Computation. Natural Computing Series, Springer-Verlag Berlin Heidelberg.")]
    35   [StorableClass]
     35  [StorableType("7C4797B7-A154-4702-AEEB-5511A170858B")]
    3636  public class CyclicCrossover : PermutationCrossover {
    3737    [StorableConstructor]
    38     protected CyclicCrossover(bool deserializing) : base(deserializing) { }
     38    protected CyclicCrossover(StorableConstructorFlag _) : base(_) { }
    3939    protected CyclicCrossover(CyclicCrossover original, Cloner cloner) : base(original, cloner) { }
    4040    public CyclicCrossover() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/CyclicCrossover2.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.PermutationEncoding {
     
    3434  /// </remarks>
    3535  [Item("CyclicCrossover2", "An operator which performs the cyclic crossover on two permutations. It is implemented as described in Affenzeller, M. et al. 2009. Genetic Algorithms and Genetic Programming - Modern Concepts and Practical Applications. CRC Press. p. 136.")]
    36   [StorableClass]
     36  [StorableType("B1550E88-0F0B-452F-94EC-F457761A58F3")]
    3737  public class CyclicCrossover2 : PermutationCrossover {
    3838    [StorableConstructor]
    39     protected CyclicCrossover2(bool deserializing) : base(deserializing) { }
     39    protected CyclicCrossover2(StorableConstructorFlag _) : base(_) { }
    4040    protected CyclicCrossover2(CyclicCrossover2 original, Cloner cloner) : base(original, cloner) { }
    4141    public CyclicCrossover2() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/EdgeRecombinationCrossover.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.PermutationEncoding {
     
    3636  /// </remarks>
    3737  [Item("EdgeRecombinationCrossover", "An operator which performs the edge recombination crossover on two permutations. It is implemented as described in Whitley et.al. 1991, The Traveling Salesman and Sequence Scheduling, in Davis, L. (Ed.), Handbook of Genetic Algorithms, New York, pp. 350-372.")]
    38   [StorableClass]
     38  [StorableType("4A2E0B7A-F92A-4085-8F3A-149FA010FEB0")]
    3939  public class EdgeRecombinationCrossover : PermutationCrossover {
    4040    [StorableConstructor]
    41     protected EdgeRecombinationCrossover(bool deserializing) : base(deserializing) { }
     41    protected EdgeRecombinationCrossover(StorableConstructorFlag _) : base(_) { }
    4242    protected EdgeRecombinationCrossover(EdgeRecombinationCrossover original, Cloner cloner) : base(original, cloner) { }
    4343    public EdgeRecombinationCrossover() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/MaximalPreservativeCrossover.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.PermutationEncoding {
     
    3636  /// </remarks>
    3737  [Item("MaximalPreservativeCrossover", "An operator which performs the maximal preservative crossover on two permutations. It is implemented as described in Mühlenbein, H. 1991. Evolution in time and space - the parallel genetic algorithm. FOUNDATIONS OF GENETIC ALGORITHMS, pp. 316-337. Morgan Kaufmann.")]
    38   [StorableClass]
     38  [StorableType("FEC5CCFA-C7E6-4A2E-88C0-C537329BEE73")]
    3939  public class MaximalPreservativeCrossover : PermutationCrossover {
    4040    [StorableConstructor]
    41     protected MaximalPreservativeCrossover(bool deserializing) : base(deserializing) { }
     41    protected MaximalPreservativeCrossover(StorableConstructorFlag _) : base(_) { }
    4242    protected MaximalPreservativeCrossover(MaximalPreservativeCrossover original, Cloner cloner) : base(original, cloner) { }
    4343    public MaximalPreservativeCrossover() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/MultiPermutationCrossover.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.
     
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.PluginInfrastructure;
    3232
    3333namespace HeuristicLab.Encodings.PermutationEncoding {
    3434  [Item("MultiPermutationCrossover", "Randomly selects and applies one of its crossovers every time it is called.")]
    35   [StorableClass]
     35  [StorableType("C4F47F2E-FAF5-4AC6-B8AB-42F8A11D8703")]
    3636  public class MultiPermutationCrossover : StochasticMultiBranch<IPermutationCrossover>, IPermutationCrossover, IStochasticOperator {
    3737    public override bool CanChangeName {
     
    5151
    5252    [StorableConstructor]
    53     protected MultiPermutationCrossover(bool deserializing) : base(deserializing) { }
     53    protected MultiPermutationCrossover(StorableConstructorFlag _) : base(_) { }
    5454    protected MultiPermutationCrossover(MultiPermutationCrossover original, Cloner cloner) : base(original, cloner) { }
    5555    public MultiPermutationCrossover()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/OrderBasedCrossover.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.PermutationEncoding {
     
    3636  /// </remarks>
    3737  [Item("OrderBasedCrossover", "An operator which performs an order based crossover of two permutations. It is implemented as described in Syswerda, G. (1991). Schedule Optimization Using Genetic Algorithms. In Davis, L. (Ed.) Handbook of Genetic Algorithms, Van Nostrand Reinhold, New York, pp. 332-349.")]
    38   [StorableClass]
     38  [StorableType("399EAAF3-ECDF-46AE-9DB6-1D99E45EBA66")]
    3939  public class OrderBasedCrossover : PermutationCrossover {
    4040    [StorableConstructor]
    41     protected OrderBasedCrossover(bool deserializing) : base(deserializing) { }
     41    protected OrderBasedCrossover(StorableConstructorFlag _) : base(_) { }
    4242    protected OrderBasedCrossover(OrderBasedCrossover original, Cloner cloner) : base(original, cloner) { }
    4343    public OrderBasedCrossover() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/OrderCrossover.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.PermutationEncoding {
     
    3636  /// </remarks>
    3737  [Item("OrderCrossover", "An operator which performs an order crossover of two permutations. It is implemented as described in Eiben, A.E. and Smith, J.E. 2003. Introduction to Evolutionary Computation. Natural Computing Series, Springer-Verlag Berlin Heidelberg.")]
    38   [StorableClass]
     38  [StorableType("DEF33012-C7C5-4C09-8FCD-1145353D06A2")]
    3939  public class OrderCrossover : PermutationCrossover {
    4040    [StorableConstructor]
    41     protected OrderCrossover(bool deserializing) : base(deserializing) { }
     41    protected OrderCrossover(StorableConstructorFlag _) : base(_) { }
    4242    protected OrderCrossover(OrderCrossover original, Cloner cloner) : base(original, cloner) { }
    4343    public OrderCrossover() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/OrderCrossover2.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.PermutationEncoding {
     
    3535  /// </remarks>
    3636  [Item("OrderCrossover2", "An operator which performs an order crossover of two permutations. It is implemented as described in Affenzeller, M. et al. 2009. Genetic Algorithms and Genetic Programming - Modern Concepts and Practical Applications. CRC Press. p. 135.")]
    37   [StorableClass]
     37  [StorableType("9E9A828E-E853-43FD-A39B-F47D17BCE539")]
    3838  public class OrderCrossover2 : PermutationCrossover {
    3939    [StorableConstructor]
    40     protected OrderCrossover2(bool deserializing) : base(deserializing) { }
     40    protected OrderCrossover2(StorableConstructorFlag _) : base(_) { }
    4141    protected OrderCrossover2(OrderCrossover2 original, Cloner cloner) : base(original, cloner) { }
    4242    public OrderCrossover2() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/PartiallyMatchedCrossover.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.PermutationEncoding {
     
    3535  /// </remarks>
    3636  [Item("PartiallyMatchedCrossover", "An operator which performs the partially matched crossover on two permutations. It is implemented as described in Fogel, D.B. 1988. An Evolutionary Approach to the Traveling Salesman Problem. Biological Cybernetics, 60, pp. 139-144, Springer-Verlag.")]
    37   [StorableClass]
     37  [StorableType("BE92E88C-0A05-4E56-884A-BAFFE6A86F4F")]
    3838  public class PartiallyMatchedCrossover : PermutationCrossover {
    3939    [StorableConstructor]
    40     protected PartiallyMatchedCrossover(bool deserializing) : base(deserializing) { }
     40    protected PartiallyMatchedCrossover(StorableConstructorFlag _) : base(_) { }
    4141    protected PartiallyMatchedCrossover(PartiallyMatchedCrossover original, Cloner cloner) : base(original, cloner) { }
    4242    public PartiallyMatchedCrossover() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/PositionBasedCrossover.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.PermutationEncoding {
     
    3333  /// </remarks>
    3434  [Item("PositionBasedCrossover", "An operator which performs the position based crossover on two permutations. It is implemented as described in Syswerda, G. (1991). Schedule Optimization Using Genetic Algorithms. In Davis, L. (Ed.) Handbook of Genetic Algorithms, Van Nostrand Reinhold, New York, pp 332-349.")]
    35   [StorableClass]
     35  [StorableType("9C707A94-E432-4A1C-94F4-FA69ED639289")]
    3636  public class PositionBasedCrossover : PermutationCrossover {
    3737    [StorableConstructor]
    38     protected PositionBasedCrossover(bool deserializing) : base(deserializing) { }
     38    protected PositionBasedCrossover(StorableConstructorFlag _) : base(_) { }
    3939    protected PositionBasedCrossover(PositionBasedCrossover original, Cloner cloner) : base(original, cloner) { }
    4040    public PositionBasedCrossover() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/UniformLikeCrossover.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.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.PermutationEncoding {
    2929  [Item("UniformLikeCrossover", "The ULX crossover tries to maintain the position in the permutation. It randomly chooses from left to right one of its parents' alleles at each position. Missing entries are then filled randomly later. It is described in Tate, D. M. and Smith, A. E. 1995. A genetic approach to the quadratic assignment problem. Computers & Operations Research, vol. 22, pp. 73-83.")]
    30   [StorableClass]
     30  [StorableType("5FCF5C48-80A1-4A08-9561-F01FDCB8D20D")]
    3131  public sealed class UniformLikeCrossover : PermutationCrossover {
    3232    [StorableConstructor]
    33     private UniformLikeCrossover(bool deserializing) : base(deserializing) { }
     33    private UniformLikeCrossover(StorableConstructorFlag _) : base(_) { }
    3434    private UniformLikeCrossover(UniformLikeCrossover original, Cloner cloner) : base(original, cloner) { }
    3535    public UniformLikeCrossover() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/HeuristicLab.Encodings.PermutationEncoding-3.3.csproj

    r14660 r16565  
    1818    <UpgradeBackupLocation>
    1919    </UpgradeBackupLocation>
    20     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     20    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    2121    <TargetFrameworkProfile>
    2222    </TargetFrameworkProfile>
     
    106106  </PropertyGroup>
    107107  <ItemGroup>
     108    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     109      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     110    </Reference>
     111    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     112      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     113    </Reference>
    108114    <Reference Include="System" />
    109115    <Reference Include="System.Core">
     
    112118    <Reference Include="System.Data" />
    113119    <Reference Include="System.Drawing" />
     120    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     121      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     122    </Reference>
    114123    <Reference Include="System.Xml" />
    115124  </ItemGroup>
     
    207216  <ItemGroup>
    208217    <None Include="HeuristicLab.snk" />
     218    <None Include="packages.config" />
    209219    <None Include="Plugin.cs.frame" />
    210220    <None Include="Properties\AssemblyInfo.cs.frame" />
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationCreator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Data;
    2424using HeuristicLab.Optimization;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Encodings.PermutationEncoding {
     28  [StorableType("ead61b5e-63a4-40dc-a31d-7bb10c98b3db")]
    2729  /// <summary>
    2830  /// An interface which represents an operator for creating permutations.
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationCrossover.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.Core;
    2323using HeuristicLab.Optimization;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Encodings.PermutationEncoding {
     27  [StorableType("2164b769-8244-4ed8-a2ca-7649e6b51617")]
    2628  /// <summary>
    2729  /// An interface which represents an operator for crossing permutations.
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationInversionMoveOperator.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.
     
    2121
    2222using HeuristicLab.Core;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Encodings.PermutationEncoding {
     26  [StorableType("79998345-30ae-4013-b891-68615ba19b7c")]
    2527  public interface IPermutationInversionMoveOperator : IPermutationMoveOperator {
    2628    ILookupParameter<InversionMove> InversionMoveParameter { get; }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationManipulator.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.Core;
    2323using HeuristicLab.Optimization;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Encodings.PermutationEncoding {
     27  [StorableType("2b3e467b-32a9-46fa-bfd2-41017bb5075c")]
    2628  /// <summary>
    2729  /// An interface which represents an operator for manipulating solutions.
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationMoveOperator.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.Core;
    2323using HeuristicLab.Optimization;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Encodings.PermutationEncoding {
     27  [StorableType("22c93d6a-6fe8-4737-b2d7-bfe3e6192c2b")]
    2628  public interface IPermutationMoveOperator : IPermutationOperator, IMoveOperator {
    2729    ILookupParameter<Permutation> PermutationParameter { get; }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationMultiNeighborhoodShakingOperator.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.Core;
    2323using HeuristicLab.Optimization;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Encodings.PermutationEncoding {
     27  [StorableType("60adeb1e-63fc-463d-8b9a-406e7a75e48a")]
    2628  public interface IPermutationMultiNeighborhoodShakingOperator : IMultiNeighborhoodShakingOperator, IPermutationOperator {
    2729    ILookupParameter<Permutation> PermutationParameter { get; }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationOperator.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.
     
    2121
    2222using HeuristicLab.Core;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Encodings.PermutationEncoding {
     26  [StorableType("78db7fb9-a81d-4b48-9c24-1bdab9b6d3f9")]
    2527  /// <summary>
    2628  /// An interface which represents an operator dealing with permutations.
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationScrambleMoveOperator.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.
     
    2121
    2222using HeuristicLab.Core;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Encodings.PermutationEncoding {
     26  [StorableType("ec27a153-2ad7-4bf6-81e2-b0586083fdd3")]
    2527  public interface IPermutationScrambleMoveOperator : IPermutationMoveOperator {
    2628    ILookupParameter<ScrambleMove> ScrambleMoveParameter { get; }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationSwap2MoveOperator.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.
     
    2121
    2222using HeuristicLab.Core;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Encodings.PermutationEncoding {
     26  [StorableType("5ca82b56-9376-49bc-94c2-4eb25cb87b33")]
    2527  public interface IPermutationSwap2MoveOperator : IPermutationMoveOperator {
    2628    ILookupParameter<Swap2Move> Swap2MoveParameter { get; }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationTranslocationMoveOperator.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.
     
    2121
    2222using HeuristicLab.Core;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Encodings.PermutationEncoding {
     26  [StorableType("2813f39a-d095-4cc1-ad56-335f2288b9d0")]
    2527  public interface IPermutationTranslocationMoveOperator : IPermutationMoveOperator {
    2628    ILookupParameter<TranslocationMove> TranslocationMoveParameter { get; }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InsertionManipulator.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 {
     
    3232  /// </remarks>
    3333  [Item("InsertionManipulator", "An operator which moves randomly one element to another position in the permutation (Insertion is a special case of Translocation). It is implemented as described in Fogel, D.B. (1988). An Evolutionary Approach to the Traveling Salesman Problem, Biological Cybernetics, 60, pp. 139-144.")]
    34   [StorableClass]
     34  [StorableType("E8C09728-ACB7-491B-B87C-BE8E2B5A5B0B")]
    3535  public class InsertionManipulator : PermutationManipulator {
    3636    [StorableConstructor]
    37     protected InsertionManipulator(bool deserializing) : base(deserializing) { }
     37    protected InsertionManipulator(StorableConstructorFlag _) : base(_) { }
    3838    protected InsertionManipulator(InsertionManipulator original, Cloner cloner) : base(original, cloner) { }
    3939    public InsertionManipulator() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InversionManipulator.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 {
     
    3232  /// </remarks>
    3333  [Item("InversionManipulator", "An operator which inverts a randomly chosen part of a permutation. It is implemented as described in Eiben, A.E. and Smith, J.E. 2003. Introduction to Evolutionary Computation. Natural Computing Series, Springer-Verlag Berlin Heidelberg.")]
    34   [StorableClass]
     34  [StorableType("F43DF081-19FB-4082-B136-EC1A77E0468A")]
    3535  public class InversionManipulator : PermutationManipulator {
    3636    [StorableConstructor]
    37     protected InversionManipulator(bool deserializing) : base(deserializing) { }
     37    protected InversionManipulator(StorableConstructorFlag _) : base(_) { }
    3838    protected InversionManipulator(InversionManipulator original, Cloner cloner) : base(original, cloner) { }
    3939    public InversionManipulator() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/MultiPermutationManipulator.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.
     
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.PluginInfrastructure;
    3232
    3333namespace HeuristicLab.Encodings.PermutationEncoding {
    3434  [Item("MultiPermutationManipulator", "Randomly selects and applies one of its manipulators every time it is called.")]
    35   [StorableClass]
     35  [StorableType("21EA3717-C907-490B-82E7-34A0B1A94EB0")]
    3636  public class MultiPermutationManipulator : StochasticMultiBranch<IPermutationManipulator>, IPermutationManipulator, IStochasticOperator {
    3737    public override bool CanChangeName {
     
    4747
    4848    [StorableConstructor]
    49     protected MultiPermutationManipulator(bool deserializing) : base(deserializing) { }
     49    protected MultiPermutationManipulator(StorableConstructorFlag _) : base(_) { }
    5050    protected MultiPermutationManipulator(MultiPermutationManipulator original, Cloner cloner) : base(original, cloner) { }
    5151    public MultiPermutationManipulator()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/ScrambleManipulator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.PermutationEncoding {
     
    3333  /// </remarks>
    3434  [Item("ScrambleManipulator", "An operator which manipulates a permutation array by randomly scrambling the elements in a randomly chosen interval. It is implemented as described in Syswerda, G. (1991). Schedule Optimization Using Genetic Algorithms. In Davis, L. (Ed.) Handbook of Genetic Algorithms, Van Nostrand Reinhold, New York, pp 332-349.")]
    35   [StorableClass]
     35  [StorableType("C324E297-C54E-4A18-BF41-3F0EF9595762")]
    3636  public class ScrambleManipulator : PermutationManipulator {
    3737    [StorableConstructor]
    38     protected ScrambleManipulator(bool deserializing) : base(deserializing) { }
     38    protected ScrambleManipulator(StorableConstructorFlag _) : base(_) { }
    3939    protected ScrambleManipulator(ScrambleManipulator original, Cloner cloner) : base(original, cloner) { }
    4040    public ScrambleManipulator() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap2Manipulator.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 {
     
    3232  /// </remarks>
    3333  [Item("Swap2Manipulator", "An operator which manipulates a permutation array by swapping to randomly chosen elements. It is implemented as described in Eiben, A.E. and Smith, J.E. 2003. Introduction to Evolutionary Computation. Natural Computing Series, Springer-Verlag Berlin Heidelberg.")]
    34   [StorableClass]
     34  [StorableType("0909F09A-B27B-4962-8A7D-B4561A37D324")]
    3535  public class Swap2Manipulator : PermutationManipulator {
    3636    [StorableConstructor]
    37     protected Swap2Manipulator(bool deserializing) : base(deserializing) { }
     37    protected Swap2Manipulator(StorableConstructorFlag _) : base(_) { }
    3838    protected Swap2Manipulator(Swap2Manipulator original, Cloner cloner) : base(original, cloner) { }
    3939    public Swap2Manipulator() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap3Manipulator.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.PermutationEncoding {
     
    3434  /// </remarks>
    3535  [Item("Swap3Manipulator", "An operator which manipulates a permutation array by swaping three randomly chosen elements. It is implemented such that first 3 positions are randomly chosen in the interval [0;N) with N = length of the permutation with all positions being distinct from each other. Then position 1 is put in place of position 3, position 2 is put in place of position 1 and position 3 is put in place of position 2.")]
    36   [StorableClass]
     36  [StorableType("3907489F-54DF-4774-85E6-E89CE055B56C")]
    3737  public class Swap3Manipulator : PermutationManipulator {
    3838    [StorableConstructor]
    39     protected Swap3Manipulator(bool deserializing) : base(deserializing) { }
     39    protected Swap3Manipulator(StorableConstructorFlag _) : base(_) { }
    4040    protected Swap3Manipulator(Swap3Manipulator original, Cloner cloner) : base(original, cloner) { }
    4141    public Swap3Manipulator() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/TranslocationInversionManipulator.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 {
     
    3333  /// </remarks>
    3434  [Item("TranslocationInversionManipulator", "An operator which inverts a randomly chosen part of a permutation and inserts it at a random position. It is implemented as described in Fogel, D.B. 1993. Applying Evolutionary Programming to Selected TSP Problems, Cybernetics and Systems, 22, pp. 27-36.")]
    35   [StorableClass]
     35  [StorableType("00E282D0-60ED-4A6B-B409-9CAB380DA670")]
    3636  public class TranslocationInversionManipulator : PermutationManipulator {
    3737    [StorableConstructor]
    38     protected TranslocationInversionManipulator(bool deserializing) : base(deserializing) { }
     38    protected TranslocationInversionManipulator(StorableConstructorFlag _) : base(_) { }
    3939    protected TranslocationInversionManipulator(TranslocationInversionManipulator original, Cloner cloner) : base(original, cloner) { }
    4040    public TranslocationInversionManipulator() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/TranslocationManipulator.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 {
     
    3333  /// </remarks>
    3434  [Item("TranslocationManipulator", "An operator which Manipulates a permutation array by moving a randomly chosen interval of elements to another (randomly chosen) position in the array. It is implemented as described in Michalewicz, Z. 1992. Genetic Algorithms + Data Structures = Evolution Programs, Springer Verlag, Berlin Heidelberg.")]
    35   [StorableClass]
     35  [StorableType("AB07D415-33F1-46C0-83FA-F7C1151B8AC8")]
    3636  public class TranslocationManipulator : PermutationManipulator {
    3737    [StorableConstructor]
    38     protected TranslocationManipulator(bool deserializing) : base(deserializing) { }
     38    protected TranslocationManipulator(StorableConstructorFlag _) : base(_) { }
    3939    protected TranslocationManipulator(TranslocationManipulator original, Cloner cloner) : base(original, cloner) { }
    4040    public TranslocationManipulator() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Edge.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("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) {
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/PermutationMoveAttribute.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("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) {
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/ScrambleMove.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("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) {
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/ScrambleMoveGenerator.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("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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/ScrambleMoveMaker.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("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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/StochasticScrambleMultiMoveGenerator.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("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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/StandardEdgeEqualityComparer.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.
     
    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) {
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/ExhaustiveSwap2MoveGenerator.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.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() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/StochasticSwap2MultiMoveGenerator.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("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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/StochasticSwap2SingleMoveGenerator.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("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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2Move.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("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() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveAbsoluteAttribute.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("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) {
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveGenerator.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("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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveHardTabuCriterion.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 {
     
    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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveMaker.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("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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveRelativeAttribute.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("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) {
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveSoftTabuCriterion.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 {
     
    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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Swap2/Swap2MoveTabuMaker.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("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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeIndexMove.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("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) {
  • 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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoIndexMove.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("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) {
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/ExhaustiveInversionMoveGenerator.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("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() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMove.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("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() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveAbsoluteAttribute.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("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) {
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveGenerator.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("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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveHardTabuCriterion.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 {
     
    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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveMaker.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("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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveRelativeAttribute.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("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) {
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveSoftTabuCriterion.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 {
     
    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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveTabuMaker.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("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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/StochasticInversionMultiMoveGenerator.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("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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/StochasticInversionSingleMoveGenerator.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("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()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Permutation.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.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.PermutationEncoding {
    2929  [Item("Permutation", "Represents a permutation of integer values.")]
    30   [StorableClass]
     30  [StorableType("FBBCFA53-C1AE-4069-907B-99C720F5AC51")]
    3131  public class Permutation : IntArray {
    3232    [Storable]
     
    4545
    4646    [StorableConstructor]
    47     protected Permutation(bool deserializing) : base(deserializing) { }
     47    protected Permutation(StorableConstructorFlag _) : base(_) { }
    4848    protected Permutation(Permutation original, Cloner cloner)
    4949      : base(original, cloner) {
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationCrossover.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 {
     
    3232  /// </summary>
    3333  [Item("PermutationCrossover", "A base class for permutation crossover operators.")]
    34   [StorableClass]
     34  [StorableType("99A5AE01-4208-4002-8FCB-DC2231DE0F53")]
    3535  public abstract class PermutationCrossover : InstrumentedOperator, IPermutationCrossover, IStochasticOperator {
    3636    public override bool CanChangeName {
     
    4949
    5050    [StorableConstructor]
    51     protected PermutationCrossover(bool deserializing) : base(deserializing) { }
     51    protected PermutationCrossover(StorableConstructorFlag _) : base(_) { }
    5252    protected PermutationCrossover(PermutationCrossover original, Cloner cloner) : base(original, cloner) { }
    5353    protected PermutationCrossover()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationEncoding.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.
     
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.PluginInfrastructure;
    3232
    3333namespace HeuristicLab.Encodings.PermutationEncoding {
    3434  [Item("PermutationEncoding", "Describes a permutation encoding.")]
    35   [StorableClass]
     35  [StorableType("E30E7507-44BA-4021-8F56-C3FC5569A6FE")]
    3636  public sealed class PermutationEncoding : Encoding<IPermutationCreator> {
    3737    #region encoding parameters
     
    8080
    8181    [StorableConstructor]
    82     private PermutationEncoding(bool deserializing) : base(deserializing) { }
     82    private PermutationEncoding(StorableConstructorFlag _) : base(_) { }
    8383    [StorableHook(HookType.AfterDeserialization)]
    8484    private void AfterDeserialization() {
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationEqualityComparer.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 System.Text;
    2626using HeuristicLab.PluginInfrastructure;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Encodings.PermutationEncoding {
    2930  [NonDiscoverableType]
     31  [StorableType("9e0bdbda-0d76-4032-bc69-f5acbbfd5d37")]
    3032  public class PermutationEqualityComparer : EqualityComparer<Permutation> {
    3133    public override bool Equals(Permutation x, Permutation y) {
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationManipulator.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 {
     
    3232  /// </summary>
    3333  [Item("PermutationManipulator", "A base class for permutation manipulation operators.")]
    34   [StorableClass]
     34  [StorableType("436622C7-1F84-4A07-B77A-019DA2A2DFC9")]
    3535  public abstract class PermutationManipulator : InstrumentedOperator, IPermutationManipulator, IStochasticOperator {
    3636    public override bool CanChangeName {
     
    4646
    4747    [StorableConstructor]
    48     protected PermutationManipulator(bool deserializing) : base(deserializing) { }
     48    protected PermutationManipulator(StorableConstructorFlag _) : base(_) { }
    4949    protected PermutationManipulator(PermutationManipulator original, Cloner cloner) : base(original, cloner) { }
    5050    protected PermutationManipulator()
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationType.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.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.PermutationEncoding {
    2929  [Item("PermutationType", "Represents a certain type of permutation.")]
    30   [StorableClass]
     30  [StorableType("B37C1815-5F82-4E46-BAE3-D71F801EFF46")]
    3131  public class PermutationType : ValueTypeValue<PermutationTypes> {
    3232    public static new Image StaticItemImage {
     
    3535
    3636    [StorableConstructor]
    37     protected PermutationType(bool deserializing) : base(deserializing) { }
     37    protected PermutationType(StorableConstructorFlag _) : base(_) { }
    3838    protected PermutationType(PermutationType original, Cloner cloner) : base(original, cloner) { }
    3939    public PermutationType() : base() { }
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationTypes.cs

    r15583 r16565  
    1 #region License Information
     1using HEAL.Attic;
     2#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
     
    2122
    2223namespace HeuristicLab.Encodings.PermutationEncoding {
     24  [StorableType("1ce01958-67f6-41d2-ab53-a7cf0dd6a55b")]
    2325  public enum PermutationTypes {
    2426    RelativeDirected,
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Plugin.cs.frame

    r15589 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.
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Properties/AssemblyInfo.cs.frame

    r15589 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.
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/ShakingOperators/PermutationShakingOperator.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.
     
    2828using HeuristicLab.Optimization.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.PluginInfrastructure;
    3232
     
    3636  /// </summary>
    3737  [Item("PermutationShakingOperator", "A shaking operator for VNS which uses available manipulation operators to perform the shaking.")]
    38   [StorableClass]
     38  [StorableType("632B3164-EEE1-4DAC-BB91-651A1CE2EED1")]
    3939  public class PermutationShakingOperator : ShakingOperator<IPermutationManipulator>, IPermutationMultiNeighborhoodShakingOperator, IStochasticOperator {
    4040
     
    4848
    4949    [StorableConstructor]
    50     protected PermutationShakingOperator(bool deserializing) : base(deserializing) { }
     50    protected PermutationShakingOperator(StorableConstructorFlag _) : base(_) { }
    5151    protected PermutationShakingOperator(PermutationShakingOperator original, Cloner cloner) : base(original, cloner) { }
    5252    public override IDeepCloneable Clone(Cloner cloner) {
  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/SimilarityCalculators/HammingSimilarityCalculator.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.Core;
    2525using HeuristicLab.Optimization.Operators;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.PermutationEncoding {
    2929  [Item("Hamming Similarity Calculator for Permutation", "An operator that performs similarity calculation between two permutation-encoded solutions.")]
    30   [StorableClass]
     30  [StorableType("CD7CC097-C46E-42A5-82BF-E47CEB945B9B")]
    3131  public sealed class HammingSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
    3232    protected override bool IsCommutative { get { return true; } }
    3333
    3434    [StorableConstructor]
    35     private HammingSimilarityCalculator(bool deserializing) : base(deserializing) { }
     35    private HammingSimilarityCalculator(StorableConstructorFlag _) : base(_) { }
    3636    private HammingSimilarityCalculator(HammingSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
    3737    public HammingSimilarityCalculator() : base() { }
Note: See TracChangeset for help on using the changeset viewer.