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.Encodings.PermutationEncoding

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/ScrambleMove.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.PermutationEncoding {
    2727  [Item("ScrambleMove", "Item that describes a scramble move.")]
    28   [StorableClass]
     28  [StorableType("DBE9C007-10AA-4B8A-8092-23C9ACBA411A")]
    2929  public sealed class ScrambleMove : Item {
    3030    [Storable]
    … …  
    3434
    3535    [StorableConstructor]
    36     private ScrambleMove(bool deserializing) : base(deserializing) { }
     36    private ScrambleMove(StorableConstructorFlag _) : base(_) { }
    3737    private ScrambleMove(ScrambleMove original, Cloner cloner)
    3838      : base(original, cloner) {

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/ScrambleMoveGenerator.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.PermutationEncoding {
    3030  [Item("ScrambleMoveGenerator", "Base class for all scramble move generators.")]
    31   [StorableClass]
     31  [StorableType("053A3BFC-F5F1-4893-B5E8-BCB452D18FC1")]
    3232  public abstract class ScrambleMoveGenerator : SingleSuccessorOperator, IPermutationScrambleMoveOperator, IMoveGenerator {
    3333    public override bool CanChangeName {
    … …  
    4242
    4343    [StorableConstructor]
    44     protected ScrambleMoveGenerator(bool deserializing) : base(deserializing) { }
     44    protected ScrambleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4545    protected ScrambleMoveGenerator(ScrambleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4646    public ScrambleMoveGenerator()

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/ScrambleMoveMaker.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.PermutationEncoding {
    3131  [Item("ScrambleMoveMaker", "Peforms a scramble move on a given permutation and updates the quality.")]
    32   [StorableClass]
     32  [StorableType("5DC6735A-F109-4D86-98CF-B8CCB648D3D3")]
    3333  public class ScrambleMoveMaker : SingleSuccessorOperator, IPermutationScrambleMoveOperator, IMoveMaker, ISingleObjectiveOperator {
    3434    public override bool CanChangeName {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected ScrambleMoveMaker(bool deserializing) : base(deserializing) { }
     51    protected ScrambleMoveMaker(StorableConstructorFlag _) : base(_) { }
    5252    protected ScrambleMoveMaker(ScrambleMoveMaker original, Cloner cloner) : base(original, cloner) { }
    5353    public ScrambleMoveMaker()

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/StochasticScrambleMultiMoveGenerator.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.
    … …  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Encodings.PermutationEncoding {
    3232  [Item("StochasticScrambleMultiMoveGenerator", "Randomly samples n from all possible scramble moves from a given permutation.")]
    33   [StorableClass]
     33  [StorableType("ECC7549D-404B-459A-A01E-6E00A53E58F5")]
    3434  public class StochasticScrambleMultiMoveGenerator : ScrambleMoveGenerator, IMultiMoveGenerator, IStochasticOperator {
    3535    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4646
    4747    [StorableConstructor]
    48     protected StochasticScrambleMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     48    protected StochasticScrambleMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4949    protected StochasticScrambleMultiMoveGenerator(StochasticScrambleMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    5050    public StochasticScrambleMultiMoveGenerator()
Note: See TracChangeset for help on using the changeset viewer.