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:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Creators/ExactGroupsLinearLinkageCreator.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;
    2929using HeuristicLab.Random;
    3030
    3131namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    3232  [Item("Exactgroups Linear Linkage Creator", "Creates a random linear linkage LLE encoded solution with a given number of equal-sized groups.")]
    33   [StorableClass]
     33  [StorableType("ACF7F729-9436-4418-86C4-45BF69F91803")]
    3434  public sealed class ExactGroupsLinearLinkageCreator : LinearLinkageCreator {
    3535
    … …  
    4444
    4545    [StorableConstructor]
    46     private ExactGroupsLinearLinkageCreator(bool deserializing) : base(deserializing) { }
     46    private ExactGroupsLinearLinkageCreator(StorableConstructorFlag _) : base(_) { }
    4747    private ExactGroupsLinearLinkageCreator(ExactGroupsLinearLinkageCreator original, Cloner cloner) : base(original, cloner) { }
    4848

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Creators/MaxGroupSizeLinearLinkageCreator.cs

    r14479 r16565  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
     1using System.Linq;
    42using HeuristicLab.Common;
    53using HeuristicLab.Core;
    64using HeuristicLab.Data;
    75using HeuristicLab.Parameters;
    8 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     6using HEAL.Attic;
    97
    108namespace HeuristicLab.Encodings.LinearLinkageEncoding.Creators {
    119  [Item("Max Group-size Linear Linkage Creator", "Creates a random linear linkage LLE encoded solution with a given maximum number of items per group.")]
    12   [StorableClass]
     10  [StorableType("5C9DEA79-60CC-44A5-B70E-FC11A588C307")]
    1311  public class MaxGroupSizeLinearLinkageCreator: LinearLinkageCreator {
    1412
    … …  
    2321
    2422    [StorableConstructor]
    25     protected MaxGroupSizeLinearLinkageCreator(bool deserializing) : base(deserializing) { }
     23    protected MaxGroupSizeLinearLinkageCreator(StorableConstructorFlag _) : base(_) { }
    2624    protected MaxGroupSizeLinearLinkageCreator(MaxGroupSizeLinearLinkageCreator original, Cloner cloner) : base(original, cloner) { }
    2725

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Creators/MaxGroupsLinearLinkageCreator.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.Encodings.LinearLinkageEncoding {
    3131  [Item("Maxgroups Linear Linkage Creator", "Creates a random linear linkage LLE encoded solution with a given maximum number of groups.")]
    32   [StorableClass]
     32  [StorableType("68BA2FF2-2493-404C-B044-D50AAC401CF1")]
    3333  public sealed class MaxGroupsLinearLinkageCreator : LinearLinkageCreator {
    3434
    … …  
    4343
    4444    [StorableConstructor]
    45     private MaxGroupsLinearLinkageCreator(bool deserializing) : base(deserializing) { }
     45    private MaxGroupsLinearLinkageCreator(StorableConstructorFlag _) : base(_) { }
    4646    private MaxGroupsLinearLinkageCreator(MaxGroupsLinearLinkageCreator original, Cloner cloner) : base(original, cloner) { }
    4747

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Creators/RandomLinearLinkageCreator.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.LinearLinkageEncoding {
    2929  [Item("Random Linear Linkage Creator", "Creates a random linear linkage LLE encoded solution (similar to MaxGroups set to N).")]
    30   [StorableClass]
     30  [StorableType("A2B2881B-BFB6-4902-BE59-DBF26E27B498")]
    3131  public sealed class RandomLinearLinkageCreator : LinearLinkageCreator {
    3232
    3333    [StorableConstructor]
    34     private RandomLinearLinkageCreator(bool deserializing) : base(deserializing) { }
     34    private RandomLinearLinkageCreator(StorableConstructorFlag _) : base(_) { }
    3535    private RandomLinearLinkageCreator(RandomLinearLinkageCreator original, Cloner cloner) : base(original, cloner) { }
    3636    public RandomLinearLinkageCreator() { }
Note: See TracChangeset for help on using the changeset viewer.