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

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

Location:
trunk
Files:
24 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Problems.NK/3.3/BinaryVectorComparers/AverageBitBinaryVectorComparer.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.Encodings.BinaryVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.NK {
    2929  [Item("Average Bit Binary Vector Comparer", "Compares two binary vectors by their average positive bit location")]
    30   [StorableClass]
     30  [StorableType("F782E957-3D46-40BC-B152-045F9E2BE330")]
    3131  public sealed class AverageBitBinaryVectorComparer : Item, IBinaryVectorComparer {
    3232    [StorableConstructor]
    33     private AverageBitBinaryVectorComparer(bool deserializing) : base(deserializing) { }
     33    private AverageBitBinaryVectorComparer(StorableConstructorFlag _) : base(_) { }
    3434    private AverageBitBinaryVectorComparer(AverageBitBinaryVectorComparer original, Cloner cloner)
    3535      : base(original, cloner) { }
  • trunk/HeuristicLab.Problems.NK/3.3/BinaryVectorComparers/IBinaryVectorComparer.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.Core;
    2424using HeuristicLab.Encodings.BinaryVectorEncoding;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Problems.NK {
     28  [StorableType("056C41CB-BF99-418E-AAF5-85273EF0831A")]
    2729  public interface IBinaryVectorComparer : IItem, IComparer<BinaryVector> { }
    2830}
  • trunk/HeuristicLab.Problems.NK/3.3/BinaryVectorComparers/LexicographicBinaryVectorComparer.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.Encodings.BinaryVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.NK {
    2929  [Item("Lexicographic Binary Vector Comparer", "Compares two binary vectors lexicographically")]
    30   [StorableClass]
     30  [StorableType("E107BAC1-B863-4704-9129-F258B0974285")]
    3131  public sealed class LexicographicBinaryVectorComparer : Item, IBinaryVectorComparer {
    3232    [StorableConstructor]
    33     private LexicographicBinaryVectorComparer(bool deserializing) : base(deserializing) { }
     33    private LexicographicBinaryVectorComparer(StorableConstructorFlag _) : base(_) { }
    3434    private LexicographicBinaryVectorComparer(LexicographicBinaryVectorComparer original, Cloner cloner)
    3535      : base(original, cloner) { }
  • trunk/HeuristicLab.Problems.NK/3.3/BinaryVectorComparers/MedianBitBinaryVectorComparer.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.Encodings.BinaryVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.NK {
    2929  [Item("Median Bit Binary Vector Comparer", "Compares two binary vectors by the median positive bit location")]
    30   [StorableClass]
     30  [StorableType("C750F13C-F775-4A53-8725-DB26F38DC229")]
    3131  public sealed class MedianBitBinaryVectorComparer : Item, IBinaryVectorComparer {
    3232    [StorableConstructor]
    33     private MedianBitBinaryVectorComparer(bool deserializing) : base(deserializing) { }
     33    private MedianBitBinaryVectorComparer(StorableConstructorFlag _) : base(_) { }
    3434    private MedianBitBinaryVectorComparer(MedianBitBinaryVectorComparer original, Cloner cloner)
    3535      : base(original, cloner) { }
  • trunk/HeuristicLab.Problems.NK/3.3/HeuristicLab.Problems.NK-3.3.csproj

    r12846 r16565  
    1111    <RootNamespace>HeuristicLab.Problems.NK</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Problems.NK-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />
     
    109109  </PropertyGroup>
    110110  <ItemGroup>
     111    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     112      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     113    </Reference>
     114    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     115      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     116    </Reference>
    111117    <Reference Include="System" />
    112118    <Reference Include="System.Core" />
    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.Linq" />
    115124    <Reference Include="System.Data.DataSetExtensions" />
     
    144153  <ItemGroup>
    145154    <None Include="HeuristicLab.snk" />
     155    <None Include="packages.config" />
    146156    <None Include="Plugin.cs.frame" />
    147157    <None Include="Properties\AssemblyInfo.cs.frame" />
  • trunk/HeuristicLab.Problems.NK/3.3/INKMoveEvaluator.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.Optimization;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.NK {
     26  [StorableType("06B5D234-4D97-4D4A-8EE2-E61FB21A54F6")]
    2527  public interface INKMoveEvaluator : ISingleObjectiveMoveEvaluator, IMoveOperator { }
    2628}
  • trunk/HeuristicLab.Problems.NK/3.3/InteractionInitializers/IInteractionInitializer.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.Data;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.NK {
     27  [StorableType("78325D81-C6B0-49FF-B190-755B7D413E56")]
    2628  public interface IInteractionInitializer : IParameterizedItem {
    2729    BoolMatrix InitializeInterations(int length, int nComponents, int nInteractions, IRandom random);
  • trunk/HeuristicLab.Problems.NK/3.3/InteractionInitializers/IncreasingBlockSizeInteractionsInitializer.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.Data;
    2727using HeuristicLab.Encodings.BinaryVectorEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.NK {
    3131  [Item("IncreasingBlockSizeInteractionsInitializer", "Randomly assignes interactions across all bits but makes sure that different numbers of ineractions are applied to different bits.")]
    32   [StorableClass]
     32  [StorableType("E4AAEDCA-6A90-45AE-AFD5-B200A50ACAB8")]
    3333  public sealed class IncreasingBlockSizeInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
    3434    [StorableConstructor]
    35     private IncreasingBlockSizeInteractionsInitializer(bool serializing) : base(serializing) { }
     35    private IncreasingBlockSizeInteractionsInitializer(StorableConstructorFlag _) : base(_) { }
    3636    private IncreasingBlockSizeInteractionsInitializer(IncreasingBlockSizeInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
    3737    public IncreasingBlockSizeInteractionsInitializer() { }
  • trunk/HeuristicLab.Problems.NK/3.3/InteractionInitializers/LimitedRandomInteractionsInitializer.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.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.NK {
    3131  [Item("LimitedRandomInteractionsInitializer", "Randomly assignes interactions across bits in the vicinity of each other respecting the maximum distances if possible.")]
    32   [StorableClass]
     32  [StorableType("A49E3167-FC04-40F8-A45C-BA8818CE2065")]
    3333  public sealed class LimitedRandomInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
    3434    private class Bounds {
     
    5252
    5353    [StorableConstructor]
    54     private LimitedRandomInteractionsInitializer(bool serializing) : base(serializing) { }
     54    private LimitedRandomInteractionsInitializer(StorableConstructorFlag _) : base(_) { }
    5555    private LimitedRandomInteractionsInitializer(LimitedRandomInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
    5656    public LimitedRandomInteractionsInitializer() {
  • trunk/HeuristicLab.Problems.NK/3.3/InteractionInitializers/RandomInteractionsInitializer.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.Problems.NK {
    2929  [Item("RandomInteractionsInitializer", "Randomly assignes interactions across all bits")]
    30   [StorableClass]
     30  [StorableType("ACB3BE45-DB9E-4200-95BF-D22C726B4DAE")]
    3131  public sealed class RandomInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
    3232    [StorableConstructor]
    33     private RandomInteractionsInitializer(bool serializing) : base(serializing) { }
     33    private RandomInteractionsInitializer(StorableConstructorFlag _) : base(_) { }
    3434    private RandomInteractionsInitializer(RandomInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
    3535    public RandomInteractionsInitializer() { }
  • trunk/HeuristicLab.Problems.NK/3.3/InteractionInitializers/SortedRandomInteractionsInitializer.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.Encodings.BinaryVectorEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.PluginInfrastructure;
    3030
    3131namespace HeuristicLab.Problems.NK {
    3232  [Item("SortedRandomInteractionsInitializer", "Randomly assigns interactions across all bits and sorts components according to bit affinity.")]
    33   [StorableClass]
     33  [StorableType("33F27348-DC65-4DCF-88EC-383379EEEA0C")]
    3434  public sealed class SortedRandomInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
    3535    public IConstrainedValueParameter<IBinaryVectorComparer> ComparerParameter {
     
    4141
    4242    [StorableConstructor]
    43     private SortedRandomInteractionsInitializer(bool serializing) : base(serializing) { }
     43    private SortedRandomInteractionsInitializer(StorableConstructorFlag _) : base(_) { }
    4444    private SortedRandomInteractionsInitializer(SortedRandomInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
    4545    public SortedRandomInteractionsInitializer() {
  • trunk/HeuristicLab.Problems.NK/3.3/NKBitFlipMoveEvaluator.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.Encodings.BinaryVectorEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.NK {
    3131
    3232  [Item("NK BitFlip Move Evaluator", "Evaluates a single bit flip on an NK landscape.")]
    33   [StorableClass]
     33  [StorableType("58DA2DE8-6FEB-464F-9B25-E2CA676D530E")]
    3434  public class NKBitFlipMoveEvaluator : NKMoveEvaluator, IOneBitflipMoveOperator {
    3535    public ILookupParameter<OneBitflipMove> OneBitflipMoveParameter {
     
    4141
    4242    [StorableConstructor]
    43     protected NKBitFlipMoveEvaluator(bool deserializing) : base(deserializing) { }
     43    protected NKBitFlipMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4444    protected NKBitFlipMoveEvaluator(NKBitFlipMoveEvaluator original, Cloner cloner)
    4545      : base(original, cloner) { }
  • trunk/HeuristicLab.Problems.NK/3.3/NKLandscape.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.Encodings.BinaryVectorEncoding;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.PluginInfrastructure;
    3232using HeuristicLab.Problems.Binary;
     
    3636  [Item("NK Landscape", "Represents an NK landscape optimization problem.")]
    3737  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 215)]
    38   [StorableClass]
     38  [StorableType("04294537-87F2-4A9F-BC14-7D4CA700F326")]
    3939  public sealed class NKLandscape : BinaryProblem {
    4040    public override bool Maximization {
     
    136136
    137137    [StorableConstructor]
    138     private NKLandscape(bool deserializing) : base(deserializing) { }
     138    private NKLandscape(StorableConstructorFlag _) : base(_) { }
    139139    private NKLandscape(NKLandscape original, Cloner cloner)
    140140      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.NK/3.3/NKMoveEvaluator.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.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.NK {
    3131
    3232  [Item("NKMoveEvaluator", "A base class for operators which evaluate moves on the NK Landscape.")]
    33   [StorableClass]
     33  [StorableType("54E33987-5AC1-4E3B-ABE7-769B009A6A76")]
    3434  public abstract class NKMoveEvaluator : SingleSuccessorOperator, INKMoveEvaluator, IBinaryVectorMoveOperator {
    3535
     
    5656
    5757    [StorableConstructor]
    58     protected NKMoveEvaluator(bool deserializing) : base(deserializing) { }
     58    protected NKMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    5959    protected NKMoveEvaluator(NKMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    6060    protected NKMoveEvaluator()
  • trunk/HeuristicLab.Problems.NK/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.Problems.NK/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.Problems.NK/3.3/WeightInitializers/EqualWeightsInitializer.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.Problems.NK {
    2828  [Item("EqualWeightsInitializer", "Initializes all weights to 1.0.")]
    29   [StorableClass]
     29  [StorableType("AFFF8CCF-FF3E-48F6-861D-2A5E595FA0C0")]
    3030  public sealed class EqualWeightsInitializer : ParameterizedNamedItem, IWeightsInitializer {
    3131    [StorableConstructor]
    32     private EqualWeightsInitializer(bool deserializing) : base(deserializing) { }
     32    private EqualWeightsInitializer(StorableConstructorFlag _) : base(_) { }
    3333    private EqualWeightsInitializer(EqualWeightsInitializer original, Cloner cloner)
    3434      : base(original, cloner) { }
  • trunk/HeuristicLab.Problems.NK/3.3/WeightInitializers/ExponentialDistributionWeightsInitializer.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.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.NK {
    3131  [Item("ExponentialDistributionWeightsInitializer", "Assigns exponentially decreasing weights using the rate parameter lambda.")]
    32   [StorableClass]
     32  [StorableType("F67982B7-A94B-4876-977A-34DB44B40739")]
    3333  public sealed class ExponentialDistributionWeightsInitializer : ParameterizedNamedItem, IWeightsInitializer {
    3434    public IValueParameter<DoubleValue> LambdaParameter {
     
    3737
    3838    [StorableConstructor]
    39     private ExponentialDistributionWeightsInitializer(bool deserializing) : base(deserializing) { }
     39    private ExponentialDistributionWeightsInitializer(StorableConstructorFlag _) : base(_) { }
    4040    private ExponentialDistributionWeightsInitializer(ExponentialDistributionWeightsInitializer original, Cloner cloner)
    4141      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.NK/3.3/WeightInitializers/ExponentialWeightsInitializer.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.Problems.NK {
    2929  [Item("ExponentialWeightsInitializer", "Assigns exponentially increasing weights.")]
    30   [StorableClass]
     30  [StorableType("6F927828-8292-49E6-95CB-F4CFA97018CA")]
    3131  public sealed class ExponentialWeightsInitializer : ParameterizedNamedItem, IWeightsInitializer {
    3232    [StorableConstructor]
    33     private ExponentialWeightsInitializer(bool deserializing) : base(deserializing) { }
     33    private ExponentialWeightsInitializer(StorableConstructorFlag _) : base(_) { }
    3434    private ExponentialWeightsInitializer(ExponentialWeightsInitializer original, Cloner cloner)
    3535      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.NK/3.3/WeightInitializers/IWeightsInitializer.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 System.Collections.Generic;
    2323using HeuristicLab.Core;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.NK {
     27  [StorableType("5F374919-37B0-4FB0-B07D-C3136970EA37")]
    2628  public interface IWeightsInitializer : IParameterizedItem {
    2729    IEnumerable<double> GetWeights(int nComponents);
  • trunk/HeuristicLab.Problems.NK/3.3/WeightInitializers/LinearWeightsInitializer.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.Problems.NK {
    2828  [Item("LinearWeightsInitializer", "Assigns linear increasing weights.")]
    29   [StorableClass]
     29  [StorableType("355BD81C-E35B-4260-91DD-2B1729682E61")]
    3030  public sealed class LinearWeightsInitializer : ParameterizedNamedItem, IWeightsInitializer {
    3131    [StorableConstructor]
    32     private LinearWeightsInitializer(bool deserializing) : base(deserializing) { }
     32    private LinearWeightsInitializer(StorableConstructorFlag _) : base(_) { }
    3333    private LinearWeightsInitializer(LinearWeightsInitializer original, Cloner cloner)
    3434      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.NK/3.3/WeightInitializers/ReverseExponentialWeightsInitializer.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.Problems.NK {
    2929  [Item("ReverseExponentialWeightsInitializer", "Assigns exponentially decreasing weights.")]
    30   [StorableClass]
     30  [StorableType("DF84DB40-3B0D-4047-ABAC-4962D970A08A")]
    3131  public sealed class ReverseExponentialWeightsInitializer : ParameterizedNamedItem, IWeightsInitializer {
    3232    [StorableConstructor]
    33     private ReverseExponentialWeightsInitializer(bool deserializing) : base(deserializing) { }
     33    private ReverseExponentialWeightsInitializer(StorableConstructorFlag _) : base(_) { }
    3434    private ReverseExponentialWeightsInitializer(ReverseExponentialWeightsInitializer original, Cloner cloner)
    3535      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.NK/3.3/WeightInitializers/ReverseLinearWeightsInitializer.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.Problems.NK {
    2828  [Item("ReverseLinearWeightsInitializer", "Assigns exponentially decreasing weights.")]
    29   [StorableClass]
     29  [StorableType("E63DE1AE-FBA4-4430-9C22-631ADDFD3976")]
    3030  public sealed class ReverseLinearWeightsInitializer : ParameterizedNamedItem, IWeightsInitializer {
    3131    [StorableConstructor]
    32     private ReverseLinearWeightsInitializer(bool deserializing) : base(deserializing) { }
     32    private ReverseLinearWeightsInitializer(StorableConstructorFlag _) : base(_) { }
    3333    private ReverseLinearWeightsInitializer(ReverseLinearWeightsInitializer original, Cloner cloner)
    3434      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.