Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/Swap/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.
    … …  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Optimization;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    3131  [Item("ExhaustiveSwap2MoveGenerator", "Generates all possible swap-2 moves from a given lle grouping.")]
    32   [StorableClass]
     32  [StorableType("1D050D36-3197-4931-9806-F8119A60E8B6")]
    3333  public class ExhaustiveSwap2MoveGenerator : Swap2MoveGenerator, IExhaustiveMoveGenerator {
    3434    [StorableConstructor]
    35     protected ExhaustiveSwap2MoveGenerator(bool deserializing) : base(deserializing) { }
     35    protected ExhaustiveSwap2MoveGenerator(StorableConstructorFlag _) : base(_) { }
    3636    protected ExhaustiveSwap2MoveGenerator(ExhaustiveSwap2MoveGenerator original, Cloner cloner) : base(original, cloner) { }
    3737    public ExhaustiveSwap2MoveGenerator() : base() { }

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/Swap/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.LinearLinkageEncoding {
    3030  [Item("StochasticSwap2MultiMoveGenerator", "Randomly samples n from all possible swap-2 moves from a given lle grouping.")]
    31   [StorableClass]
     31  [StorableType("156E5EAE-D929-41CE-844E-7DECE09CB74B")]
    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.LinearLinkageEncoding/3.4/Moves/Swap/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.
    … …  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    3131  [Item("StochasticSwap2SingleMoveGenerator", "Randomly samples a single from all possible swap-2 moves from a given lle grouping.")]
    32   [StorableClass]
     32  [StorableType("381C1F6F-A61C-4886-A2A1-348445DF2C84")]
    3333  public class StochasticSwap2SingleMoveGenerator : Swap2MoveGenerator, IStochasticOperator, ISingleMoveGenerator {
    3434    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected StochasticSwap2SingleMoveGenerator(bool deserializing) : base(deserializing) { }
     39    protected StochasticSwap2SingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4040    protected StochasticSwap2SingleMoveGenerator(StochasticSwap2SingleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4141    public StochasticSwap2SingleMoveGenerator()

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/Swap/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.LinearLinkageEncoding {
    2727  [Item("Swap2Move", "Item that describes a swap-2 move.")]
    28   [StorableClass]
     28  [StorableType("AEB203A4-03AD-4F86-B200-B0FA8253BCFF")]
    2929  public class Swap2Move : Item {
    3030    [Storable]
    … …  
    3636
    3737    [StorableConstructor]
    38     protected Swap2Move(bool deserializing) : base(deserializing) { }
     38    protected Swap2Move(StorableConstructorFlag _) : base(_) { }
    3939    protected Swap2Move(Swap2Move original, Cloner cloner) : base(original, cloner) { }
    4040    public Swap2Move() : this(-1, -1, null) { }

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/Swap/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.LinearLinkageEncoding {
    3030  [Item("Swap2MoveGenerator", "Base class for all swap-2 move generators.")]
    31   [StorableClass]
     31  [StorableType("E7319AAA-7D34-444A-9B63-8A5CF1F010B5")]
    3232  public abstract class Swap2MoveGenerator : SingleSuccessorOperator, ILinearLinkageSwap2MoveOperator, IMoveGenerator {
    3333    public override bool CanChangeName {
    … …  
    4242
    4343    [StorableConstructor]
    44     protected Swap2MoveGenerator(bool deserializing) : base(deserializing) { }
     44    protected Swap2MoveGenerator(StorableConstructorFlag _) : base(_) { }
    4545    protected Swap2MoveGenerator(Swap2MoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4646    public Swap2MoveGenerator()

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Moves/Swap/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.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    3333  [Item("Swap2MoveMaker", "Peforms a swap-2 move on a given grouping and updates the quality.")]
    34   [StorableClass]
     34  [StorableType("2A1F7169-5DD5-4FB6-A25C-BBC4C06BB15A")]
    3535  public class Swap2MoveMaker : SingleSuccessorOperator, ILinearLinkageSwap2MoveOperator, IMoveMaker, ISingleObjectiveOperator {
    3636    public override bool CanChangeName {
    … …  
    5151
    5252    [StorableConstructor]
    53     protected Swap2MoveMaker(bool deserializing) : base(deserializing) { }
     53    protected Swap2MoveMaker(StorableConstructorFlag _) : base(_) { }
    5454    protected Swap2MoveMaker(Swap2MoveMaker original, Cloner cloner) : base(original, cloner) { }
    5555    public Swap2MoveMaker()
Note: See TracChangeset for help on using the changeset viewer.