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

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Manipulators/JSMManipulator.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.Encodings.ScheduleEncoding.JobSequenceMatrix {
    2828  [Item("JSMManipulator", "An operator which manipulates a JSM representation.")]
    29   [StorableClass]
     29  [StorableType("E190A576-B835-4343-9F0C-096E970B8DDD")]
    3030  public abstract class JSMManipulator : ScheduleManipulator, IJSMOperator {
    3131    [StorableConstructor]
    32     protected JSMManipulator(bool deserializing) : base(deserializing) { }
     32    protected JSMManipulator(StorableConstructorFlag _) : base(_) { }
    3333    protected JSMManipulator(JSMManipulator original, Cloner cloner) : base(original, cloner) { }
    3434    public JSMManipulator()
  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Manipulators/JSMShiftChangeManipulator.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.Encodings.PermutationEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
    3131  [Item("JSMShiftChangeManipulator", "Represents a manipulation operation where the operations of a randomly determined job are shifted in one direction for all resources.")]
    32   [StorableClass]
     32  [StorableType("69212E02-2006-493D-92C0-0EF4EFDAAF8A")]
    3333  public class JSMShiftChangeManipulator : JSMManipulator {
    3434
    3535    [StorableConstructor]
    36     protected JSMShiftChangeManipulator(bool deserializing) : base(deserializing) { }
     36    protected JSMShiftChangeManipulator(StorableConstructorFlag _) : base(_) { }
    3737    protected JSMShiftChangeManipulator(JSMShiftChangeManipulator original, Cloner cloner) : base(original, cloner) { }
    3838    public JSMShiftChangeManipulator() : base() { }
  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Manipulators/JSMSwapManipulator.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.PermutationEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
    2929  [Item("JSMSwapManipulator", "Represents a manipulation operation swapping parts of the individual.")]
    30   [StorableClass]
     30  [StorableType("7BB1535F-C886-40A3-9F7C-4A54CED90A6E")]
    3131  public class JSMSwapManipulator : JSMManipulator {
    3232
    3333    [StorableConstructor]
    34     protected JSMSwapManipulator(bool deserializing) : base(deserializing) { }
     34    protected JSMSwapManipulator(StorableConstructorFlag _) : base(_) { }
    3535    protected JSMSwapManipulator(JSMSwapManipulator original, Cloner cloner) : base(original, cloner) { }
    3636    public JSMSwapManipulator() : base() { }
Note: See TracChangeset for help on using the changeset viewer.