Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • 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() {
Note: See TracChangeset for help on using the changeset viewer.