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

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMCrossover.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.ScheduleEncoding.JobSequenceMatrix {
    2727  [Item("JSMCrossover", "An operator which crosses two JSM representations.")]
    28   [StorableClass]
     28  [StorableType("09F360FC-2AA0-4C05-98E1-0BE700355C96")]
    2929  public abstract class JSMCrossover : ScheduleCrossover, IJSMOperator {
    3030
    3131    [StorableConstructor]
    32     protected JSMCrossover(bool deserializing) : base(deserializing) { }
     32    protected JSMCrossover(StorableConstructorFlag _) : base(_) { }
    3333    protected JSMCrossover(JSMCrossover original, Cloner cloner) : base(original, cloner) { }
    3434    public JSMCrossover()
  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMJOXCrossover.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.Data;
    2525using HeuristicLab.Encodings.PermutationEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
    2929  [Item("JSMJobbasedOrderCrossover", "Represents a crossover operation swapping subsequences of the parents to generate offspring.")]
    30   [StorableClass]
     30  [StorableType("3D9540B9-6834-4C34-8D5D-001FBF442344")]
    3131  public class JSMJOXCrossover : JSMCrossover {
    3232
    3333    [StorableConstructor]
    34     protected JSMJOXCrossover(bool deserializing) : base(deserializing) { }
     34    protected JSMJOXCrossover(StorableConstructorFlag _) : base(_) { }
    3535    protected JSMJOXCrossover(JSMJOXCrossover original, Cloner cloner) : base(original, cloner) { }
    3636    public JSMJOXCrossover() : base() { }
  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMOXCrossover.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.ScheduleEncoding.JobSequenceMatrix {
    2727  [Item("JSMOrderCrossover", "Represents a crossover operation swapping sequences of the parents to generate offspring.")]
    28   [StorableClass]
     28  [StorableType("8F353BE8-40E4-4C0E-A677-4B1F43A66A65")]
    2929  public class JSMOXCrossover : JSMCrossover {
    3030
    3131    [StorableConstructor]
    32     protected JSMOXCrossover(bool deserializing) : base(deserializing) { }
     32    protected JSMOXCrossover(StorableConstructorFlag _) : base(_) { }
    3333    protected JSMOXCrossover(JSMOXCrossover original, Cloner cloner) : base(original, cloner) { }
    3434    public JSMOXCrossover() : base() { }
  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMSXXCrossover.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.Core;
    2424using HeuristicLab.Encodings.PermutationEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix {
    2828  [Item("JSMSubsequenceExchangeCrossover", "Represents a crossover operation identifiying and exchanging equal subsequences of the parents to generate offspring.")]
    29   [StorableClass]
     29  [StorableType("029A3890-FEB7-4D01-9092-E33CEBD8C0CC")]
    3030  public class JSMSXXCrossover : JSMCrossover {
    3131
    3232    [StorableConstructor]
    33     protected JSMSXXCrossover(bool deserializing) : base(deserializing) { }
     33    protected JSMSXXCrossover(StorableConstructorFlag _) : base(_) { }
    3434    protected JSMSXXCrossover(JSMSXXCrossover original, Cloner cloner) : base(original, cloner) { }
    3535    public JSMSXXCrossover() : base() { }
Note: See TracChangeset for help on using the changeset viewer.