Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/28/19 16:54:20 (6 years ago)
Author:
abeham
Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

  • it doesn't build
Location:
branches/2521_ProblemRefactoring
Files:
37 edited

Legend:

Unmodified
Added
Removed

  • branches/2521_ProblemRefactoring

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVector.cs

    r16692 r16723  
    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.Data;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    29   [StorableClass]
     29  [StorableType("B349929A-675C-41F4-AEB9-EEA3121E73A9")]
    3030  [Item("BinaryVector", "Represents a vector of binary values.")]
    3131  public class BinaryVector : BoolArray, ISolution {
    3232    [StorableConstructor]
    33     protected BinaryVector(bool deserializing) : base(deserializing) { }
     33    protected BinaryVector(StorableConstructorFlag _) : base(_) { }
    3434    protected BinaryVector(BinaryVector original, Cloner cloner) : base(original, cloner) { }
    3535    public BinaryVector() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorCreator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    … …  
    3333  /// </summary>
    3434  [Item("BinaryVectorCreator", "A base class for operators creating bool-valued vectors.")]
    35   [StorableClass]
     35  [StorableType("5CE4B676-CE68-4338-AF85-A289D3C8BA69")]
    3636  public abstract class BinaryVectorCreator : InstrumentedOperator, IBinaryVectorCreator, IStochasticOperator {
    3737    public override bool CanChangeName {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected BinaryVectorCreator(bool deserializing) : base(deserializing) { }
     51    protected BinaryVectorCreator(StorableConstructorFlag _) : base(_) { }
    5252    protected BinaryVectorCreator(BinaryVectorCreator original, Cloner cloner) : base(original, cloner) { }
    5353    protected BinaryVectorCreator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorCrossover.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    … …  
    3232  /// </summary>
    3333  [Item("BinaryVectorCrossover", "A base class for operators that perform a crossover of bool-valued vectors.")]
    34   [StorableClass]
     34  [StorableType("1E97E70A-DBB0-49E4-B67B-41A581B95BAE")]
    3535  public abstract class BinaryVectorCrossover : InstrumentedOperator, IBinaryVectorCrossover, IStochasticOperator {
    3636    public override bool CanChangeName {
    … …  
    4848
    4949    [StorableConstructor]
    50     protected BinaryVectorCrossover(bool deserializing) : base(deserializing) { }
     50    protected BinaryVectorCrossover(StorableConstructorFlag _) : base(_) { }
    5151    protected BinaryVectorCrossover(BinaryVectorCrossover original, Cloner cloner) : base(original, cloner) { }
    5252    protected BinaryVectorCrossover()

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorEncoding.cs

    r16692 r16723  
    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.BinaryVectorEncoding {
    3434  [Item("BinaryVectorEncoding", "Describes a binary vector encoding.")]
    35   [StorableClass]
     35  [StorableType("889C5E1A-3FBF-4AB3-AB2E-199A781503B5")]
    3636  public sealed class BinaryVectorEncoding : Encoding<BinaryVector> {
    3737    #region Encoding Parameters
    … …  
    5959
    6060    [StorableConstructor]
    61     private BinaryVectorEncoding(bool deserializing) : base(deserializing) { }
     61    private BinaryVectorEncoding(StorableConstructorFlag _) : base(_) { }
    6262    [StorableHook(HookType.AfterDeserialization)]
    6363    private void AfterDeserialization() {

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorEqualityComparer.cs

    r16692 r16723  
    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 System.Collections.Generic;
    2424using HeuristicLab.PluginInfrastructure;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    2728  [NonDiscoverableType]
     29  [StorableType("b9277027-dd39-4977-a8de-1b9854290f5e")]
    2830  public class BinaryVectorEqualityComparer : EqualityComparer<BinaryVector> {
    2931    public override bool Equals(BinaryVector x, BinaryVector y) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorManipulator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    … …  
    3232  /// </summary>
    3333  [Item("BinaryVectorManipulator", "A base class for operators that manipulate bool-valued vectors.")]
    34   [StorableClass]
     34  [StorableType("B5A9B51F-33F3-4C0B-87CF-147C3BF03545")]
    3535  public abstract class BinaryVectorManipulator : InstrumentedOperator, IBinaryVectorManipulator, IStochasticOperator {
    3636    public override bool CanChangeName {
    … …  
    4545
    4646    [StorableConstructor]
    47     protected BinaryVectorManipulator(bool deserializing) : base(deserializing) { }
     47    protected BinaryVectorManipulator(StorableConstructorFlag _) : base(_) { }
    4848    protected BinaryVectorManipulator(BinaryVectorManipulator original, Cloner cloner) : base(original, cloner) { }
    4949    protected BinaryVectorManipulator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Creators/RandomBinaryVectorCreator.cs

    r16692 r16723  
    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.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    … …  
    3232  /// </summary>
    3333  [Item("RandomBinaryVectorCreator", "An operator which creates a new random binary vector with each element randomly initialized.")]
    34   [StorableClass]
     34  [StorableType("D5BF4C14-1C0B-4589-835E-BA337D325E31")]
    3535  public sealed class RandomBinaryVectorCreator : BinaryVectorCreator {
    3636    private const string TrueProbabilityParameterName = "TrueProbability";
    … …  
    4646
    4747    [StorableConstructor]
    48     private RandomBinaryVectorCreator(bool deserializing) : base(deserializing) { }
     48    private RandomBinaryVectorCreator(StorableConstructorFlag _) : base(_) { }
    4949    private RandomBinaryVectorCreator(RandomBinaryVectorCreator original, Cloner cloner) : base(original, cloner) { }
    5050    public override IDeepCloneable Clone(Cloner cloner) { return new RandomBinaryVectorCreator(this, cloner); }

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Crossovers/MultiBinaryVectorCrossover.cs

    r16692 r16723  
    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.BinaryVectorEncoding {
    3434  [Item("MultiBinaryVectorCrossover", "Randomly selects and applies one of its crossovers every time it is called.")]
    35   [StorableClass]
     35  [StorableType("0ACAFFFB-E57A-4171-9D6D-A20B7A7B935E")]
    3636  public class MultiBinaryVectorCrossover : StochasticMultiBranch<IBinaryVectorCrossover>, IBinaryVectorCrossover, IStochasticOperator {
    3737    public override bool CanChangeName {
    … …  
    5151
    5252    [StorableConstructor]
    53     protected MultiBinaryVectorCrossover(bool deserializing) : base(deserializing) { }
     53    protected MultiBinaryVectorCrossover(StorableConstructorFlag _) : base(_) { }
    5454    protected MultiBinaryVectorCrossover(MultiBinaryVectorCrossover original, Cloner cloner) : base(original, cloner) { }
    5555    public MultiBinaryVectorCrossover()

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Crossovers/NPointCrossover.cs

    r16692 r16723  
    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.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    … …  
    3636  /// </remarks>
    3737  [Item("NPointCrossover", "N point crossover for binary vectors. 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("59683F25-9315-47D9-9E06-539559C9DEE1")]
    3939  public sealed class NPointCrossover : BinaryVectorCrossover {
    4040    /// <summary>
    … …  
    4646
    4747    [StorableConstructor]
    48     private NPointCrossover(bool deserializing) : base(deserializing) { }
     48    private NPointCrossover(StorableConstructorFlag _) : base(_) { }
    4949    private NPointCrossover(NPointCrossover original, Cloner cloner) : base(original, cloner) { }
    5050    /// <summary>

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Crossovers/SinglePointCrossover.cs

    r16692 r16723  
    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.BinaryVectorEncoding {
    … …  
    3434  /// </remarks>
    3535  [Item("SinglePointCrossover", "Single point crossover for binary vectors. It is implemented based on the NPointCrossover.")]
    36   [StorableClass]
     36  [StorableType("40B6A5D5-8937-495E-8B98-2E4F8FD06D93")]
    3737  public sealed class SinglePointCrossover : BinaryVectorCrossover {
    3838
    3939    [StorableConstructor]
    40     private SinglePointCrossover(bool deserializing) : base(deserializing) { }
     40    private SinglePointCrossover(StorableConstructorFlag _) : base(_) { }
    4141    private SinglePointCrossover(SinglePointCrossover original, Cloner cloner) : base(original, cloner) { }
    4242    public SinglePointCrossover() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Crossovers/UniformCrossover.cs

    r16692 r16723  
    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.BinaryVectorEncoding {
    … …  
    3333  /// </remarks>
    3434  [Item("UniformCrossover", "Uniform crossover for binary vectors. 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("6B0DDD76-EC81-4C5A-989E-239A82B78E66")]
    3636  public sealed class UniformCrossover : BinaryVectorCrossover {
    3737
    3838    [StorableConstructor]
    39     private UniformCrossover(bool deserializing) : base(deserializing) { }
     39    private UniformCrossover(StorableConstructorFlag _) : base(_) { }
    4040    private UniformCrossover(UniformCrossover original, Cloner cloner) : base(original, cloner) { }
    4141    public UniformCrossover() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj

    r16692 r16723  
    1111    <RootNamespace>HeuristicLab.Encodings.BinaryVectorEncoding</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Encodings.BinaryVectorEncoding-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
    … …  
    226226    </BootstrapperPackage>
    227227  </ItemGroup>
    228   <ItemGroup />
     228  <ItemGroup>
     229    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     230      <SpecificVersion>False</SpecificVersion>
     231      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
     232      <Private>False</Private>
     233    </Reference>
     234  </ItemGroup>
    229235  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    230236  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorCreator.cs

    r16692 r16723  
    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.BinaryVectorEncoding {
     28  [StorableType("60af1d5b-398c-4167-aa3f-08fce3d7d0a4")]
    2729  /// <summary>
    2830  /// An interface which represents an operator for creating vectors of bool-valued data.

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorCrossover.cs

    r16692 r16723  
    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.BinaryVectorEncoding {
     27  [StorableType("608e364f-06f8-49a2-afab-a00195a96bc3")]
    2628  /// <summary>
    2729  /// An interface which represents an operator for crossing vectors of bool-valued data.

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorManipulator.cs

    r16692 r16723  
    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.Optimization;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Encodings.BinaryVectorEncoding {
     26  [StorableType("250ec119-143a-4798-b074-32b44a0fc0d4")]
    2527  /// <summary>
    2628  /// An interface which represents an operator for manipulating vectors of bool-valued data.

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorMoveOperator.cs

    r16692 r16723  
    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.Optimization;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Encodings.BinaryVectorEncoding {
     26  [StorableType("269d5dc0-f788-4016-ab6a-3ccfd9ea074e")]
    2527  public interface IBinaryVectorMoveOperator : IBinaryVectorSolutionOperator, IMoveOperator {
    2628  }

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorMultiNeighborhoodShakingOperator.cs

    r16692 r16723  
    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.
    … …  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223
    2324namespace HeuristicLab.Encodings.BinaryVectorEncoding {
     25  [StorableType("90e29db0-b4bf-479d-a77b-f867fdda0fb4")]
    2426  public interface IBinaryVectorMultiNeighborhoodShakingOperator : IBinaryVectorSolutionOperator {
    2527  }

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorOperator.cs

    r16692 r16723  
    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.BinaryVectorEncoding {
     26  [StorableType("24afee75-e15a-4076-aeae-101fe24d8e60")]
    2527  /// <summary>
    2628  /// An interface which represents an operator dealing with vectors of bool-valued data.

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IOneBitflipMoveOperator.cs

    r16692 r16723  
    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.BinaryVectorEncoding {
     26  [StorableType("f59dc211-20bf-4c50-8a87-54c0d37735c7")]
    2527  public interface IOneBitflipMoveOperator : IBinaryVectorMoveOperator {
    2628    ILookupParameter<OneBitflipMove> OneBitflipMoveParameter { get; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Manipulators/SinglePositionBitflipManipulator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    … …  
    3232  /// </remarks>
    3333  [Item("SinglePositionBitflipManipulator", "Flips exactly one bit of a binary vector. It is implemented as described in Michalewicz, Z. 1999. Genetic Algorithms + Data Structures = Evolution Programs. Third, Revised and Extended Edition, Spring-Verlag Berlin Heidelberg.")]
    34   [StorableClass]
     34  [StorableType("72BE48BD-F47C-4C81-81F6-FA42D496AC34")]
    3535  public sealed class SinglePositionBitflipManipulator : BinaryVectorManipulator {
    3636
    3737    [StorableConstructor]
    38     private SinglePositionBitflipManipulator(bool deserializing) : base(deserializing) { }
     38    private SinglePositionBitflipManipulator(StorableConstructorFlag _) : base(_) { }
    3939    private SinglePositionBitflipManipulator(SinglePositionBitflipManipulator original, Cloner cloner) : base(original, cloner) { }
    4040    public SinglePositionBitflipManipulator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Manipulators/SomePositionsBitflipManipulator.cs

    r16692 r16723  
    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.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    … …  
    3535  /// </remarks>
    3636  [Item("SomePositionsBitflipManipulator", "Flips some bits of a binary vector, each position is flipped with a probability of pm. 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, p. 43.")]
    37   [StorableClass]
     37  [StorableType("058E0380-0BFB-4E39-82DC-C4E3CCD8EAF5")]
    3838  public sealed class SomePositionsBitflipManipulator : BinaryVectorManipulator {
    3939    /// <summary>
    … …  
    4545
    4646    [StorableConstructor]
    47     private SomePositionsBitflipManipulator(bool deserializing) : base(deserializing) { }
     47    private SomePositionsBitflipManipulator(StorableConstructorFlag _) : base(_) { }
    4848    private SomePositionsBitflipManipulator(SomePositionsBitflipManipulator original, Cloner cloner) : base(original, cloner) { }
    4949    /// <summary>

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/ExhaustiveOneBitflipMoveGenerator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Optimization;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    2828  [Item("ExhaustiveBitflipMoveGenerator", "Generates all possible one bitflip moves from a given binaryVector.")]
    29   [StorableClass]
     29  [StorableType("15F17361-2334-434A-904D-EF9426DEF32F")]
    3030  public sealed class ExhaustiveOneBitflipMoveGenerator : OneBitflipMoveGenerator, IExhaustiveMoveGenerator {
    3131    [StorableConstructor]
    32     private ExhaustiveOneBitflipMoveGenerator(bool deserializing) : base(deserializing) { }
     32    private ExhaustiveOneBitflipMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3333    private ExhaustiveOneBitflipMoveGenerator(ExhaustiveOneBitflipMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    3434    public ExhaustiveOneBitflipMoveGenerator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMove.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    2727  [Item("OneBitflipMove", "Item that describes a one bitflip move.")]
    28   [StorableClass]
     28  [StorableType("BFF3ABCF-9C7B-41F8-8861-B2164D92FD89")]
    2929  public class OneBitflipMove : OneIndexMove {
    3030    [StorableConstructor]
    31     protected OneBitflipMove(bool deserializing) : base(deserializing) { }
     31    protected OneBitflipMove(StorableConstructorFlag _) : base(_) { }
    3232    protected OneBitflipMove(OneBitflipMove original, Cloner cloner) : base(original, cloner) { }
    3333    public OneBitflipMove() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveAttribute.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    2727  [Item("OneBitflipMoveAttribute", "Describes the attributes (move quality and index) of a single bitflip move.")]
    28   [StorableClass]
     28  [StorableType("D5CD3F76-E016-417F-B916-7666683A42D7")]
    2929  public class OneBitflipMoveAttribute : Item {
    3030    [Storable]
    … …  
    3434
    3535    [StorableConstructor]
    36     protected OneBitflipMoveAttribute(bool deserializing) : base(deserializing) { }
     36    protected OneBitflipMoveAttribute(StorableConstructorFlag _) : base(_) { }
    3737    protected OneBitflipMoveAttribute(OneBitflipMoveAttribute original, Cloner cloner)
    3838      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveGenerator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    3030  [Item("OneBitflipMoveGenerator", "Base class for all one bitflip move generators.")]
    31   [StorableClass]
     31  [StorableType("600CE405-5ADC-471A-966B-27965190AF73")]
    3232  public abstract class OneBitflipMoveGenerator : SingleSuccessorOperator, IOneBitflipMoveOperator, IMoveGenerator {
    3333    public override bool CanChangeName {
    … …  
    4545
    4646    [StorableConstructor]
    47     protected OneBitflipMoveGenerator(bool deserializing) : base(deserializing) { }
     47    protected OneBitflipMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4848    protected OneBitflipMoveGenerator(OneBitflipMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4949    public OneBitflipMoveGenerator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveMaker.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    3131  [Item("OneBitflipMoveMaker", "Peforms a one bitflip move on a given BitVector and updates the quality.")]
    32   [StorableClass]
     32  [StorableType("13029FD8-4A99-4EA6-A4AA-8877B86582B8")]
    3333  public class OneBitflipMoveMaker : SingleSuccessorOperator, IOneBitflipMoveQualityOperator, IMoveMaker, ISingleObjectiveOperator {
    3434    public override bool CanChangeName {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected OneBitflipMoveMaker(bool deserializing) : base(deserializing) { }
     51    protected OneBitflipMoveMaker(StorableConstructorFlag _) : base(_) { }
    5252    protected OneBitflipMoveMaker(OneBitflipMoveMaker original, Cloner cloner) : base(original, cloner) { }
    5353    public OneBitflipMoveMaker()

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveTabuChecker.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    3131  [Item("OneBitflipMoveTabuChecker", "Prevents peforming a one bitflip move again.")]
    32   [StorableClass]
     32  [StorableType("27523531-D19E-47ED-9397-F7457D41B85B")]
    3333  public class OneBitflipMoveTabuChecker : SingleSuccessorOperator, IOneBitflipMoveQualityOperator, ITabuChecker {
    3434    public override bool CanChangeName {
    … …  
    6363
    6464    [StorableConstructor]
    65     protected OneBitflipMoveTabuChecker(bool deserializing) : base(deserializing) { }
     65    protected OneBitflipMoveTabuChecker(StorableConstructorFlag _) : base(_) { }
    6666    protected OneBitflipMoveTabuChecker(OneBitflipMoveTabuChecker original, Cloner cloner) : base(original, cloner) { }
    6767    public OneBitflipMoveTabuChecker()

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/OneBitflipMoveTabuMaker.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Optimization.Operators;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    2929  [Item("OneBitflipMoveTabuMaker", "Declares a given one bitflip move as tabu, by adding its attributes to the tabu list. It also removes the oldest entry in the tabu list when its size is greater than tenure.")]
    30   [StorableClass]
     30  [StorableType("F0C4D51D-EF93-426D-8D94-867BE0DBE1F6")]
    3131  public class OneBitflipMoveTabuMaker : TabuMaker, IOneBitflipMoveQualityOperator {
    3232    public ILookupParameter<BinaryVector> BinaryVectorParameter {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected OneBitflipMoveTabuMaker(bool deserializing) : base(deserializing) { }
     40    protected OneBitflipMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    4141    protected OneBitflipMoveTabuMaker(OneBitflipMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
    4242    public OneBitflipMoveTabuMaker()

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/StochasticOneBitflipMultiMoveGenerator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    3131  [Item("StochasticOneBitflipMultiMoveGenerator", "Randomly samples n from all possible one bitflip moves from a given BinaryVector.")]
    32   [StorableClass]
     32  [StorableType("11A9E43A-6291-4F9D-90AB-DC205923EE68")]
    3333  public class StochasticOneBitflipMultiMoveGenerator : OneBitflipMoveGenerator, IStochasticOperator, IMultiMoveGenerator {
    3434    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4545
    4646    [StorableConstructor]
    47     protected StochasticOneBitflipMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     47    protected StochasticOneBitflipMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4848    protected StochasticOneBitflipMultiMoveGenerator(StochasticOneBitflipMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4949    public StochasticOneBitflipMultiMoveGenerator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneBitflipMove/StochasticOneBitflipSingleMoveGenerator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Optimization;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    2929  [Item("StochasticOneBitflipSingleMoveGenerator", "Randomly samples a single from all possible one bitflip moves from a given BinaryVector.")]
    30   [StorableClass]
     30  [StorableType("9EFDBD19-B9AF-4820-8DA9-EE04370D7D8B")]
    3131  public class StochasticOneBitflipSingleMoveGenerator : OneBitflipMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
    3232    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected StochasticOneBitflipSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     37    protected StochasticOneBitflipSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3838    protected StochasticOneBitflipSingleMoveGenerator(StochasticOneBitflipSingleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    3939    public StochasticOneBitflipSingleMoveGenerator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Moves/OneIndexMove.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    2727  [Item("OneIndexMove", "A move on a binary vector that is specified by 1 index")]
    28   [StorableClass]
     28  [StorableType("C7948F7F-EC47-4752-9E18-9299123189D1")]
    2929  public class OneIndexMove : Item {
    3030    [Storable]
    … …  
    3434
    3535    [StorableConstructor]
    36     protected OneIndexMove(bool deserializing) : base(deserializing) { }
     36    protected OneIndexMove(StorableConstructorFlag _) : base(_) { }
    3737    protected OneIndexMove(OneIndexMove original, Cloner cloner)
    3838      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Plugin.cs.frame

    r16692 r16723  
    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.
    … …  
    3636  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
    3737  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    38   [PluginDependency("HeuristicLab.Persistence", "3.3")]
     38  [PluginDependency("HeuristicLab.Attic", "1.0")]
    3939  public class HeuristicLabEncodingsBinaryVectorEncodingPlugin : PluginBase {
    4040  }

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Properties/AssemblyInfo.cs.frame

    r16692 r16723  
    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.

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/ShakingOperators/BinaryVectorShakingOperator.cs

    r16692 r16723  
    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("BinaryVectorShakingOperator", "A shaking operator for VNS which uses available manipulation operators to perform the shaking.")]
    38   [StorableClass]
     38  [StorableType("9AC6B66C-C95D-4A39-8E40-6F4B5AC03B6E")]
    3939  public class BinaryVectorShakingOperator : ShakingOperator<IBinaryVectorManipulator>, IBinaryVectorMultiNeighborhoodShakingOperator, IStochasticOperator {
    4040
    … …  
    4848
    4949    [StorableConstructor]
    50     protected BinaryVectorShakingOperator(bool deserializing) : base(deserializing) { }
     50    protected BinaryVectorShakingOperator(StorableConstructorFlag _) : base(_) { }
    5151    protected BinaryVectorShakingOperator(BinaryVectorShakingOperator original, Cloner cloner) : base(original, cloner) { }
    5252    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/SimilarityCalculators/HammingSimilarityCalculator.cs

    r15583 r16723  
    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.BinaryVectorEncoding {
    2929  [Item("Hamming Similarity Calculator for BinaryVector", "Calculates the solution similarity based on the Hamming distance between two binary vectors.")]
    30   [StorableClass]
     30  [StorableType("1718CDA7-9BC7-4A05-A52D-774BEEB59E05")]
    3131  public sealed class HammingSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
    3232    protected override bool IsCommutative {
    … …  
    3535
    3636    [StorableConstructor]
    37     private HammingSimilarityCalculator(bool deserializing) : base(deserializing) { }
     37    private HammingSimilarityCalculator(StorableConstructorFlag _) : base(_) { }
    3838    private HammingSimilarityCalculator(HammingSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
    3939    public HammingSimilarityCalculator() { }
Note: See TracChangeset for help on using the changeset viewer.