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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Crossovers/PWRCrossover.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.PermutationWithRepetition {
    2727  [Item("PWRCrossover", "An operator which crosses two JSM representations.")]
    28   [StorableClass]
     28  [StorableType("53331857-83AF-4966-940E-1137FBA7205C")]
    2929  public abstract class PWRCrossover : ScheduleCrossover, IPWROperator {
    3030
    3131    [StorableConstructor]
    32     protected PWRCrossover(bool deserializing) : base(deserializing) { }
     32    protected PWRCrossover(StorableConstructorFlag _) : base(_) { }
    3333    protected PWRCrossover(PWRCrossover original, Cloner cloner) : base(original, cloner) { }
    3434    public PWRCrossover()

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Crossovers/PWRGOXCrossover.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.Core;
    2626using HeuristicLab.Encodings.IntegerVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition {
    3030  [Item("PWRGeneralizationOrderCrossover", "Represents a crossover operation swapping sequences of the parents to generate offspring.")]
    31   [StorableClass]
     31  [StorableType("DB974328-5DB4-4B9A-8223-924E929C573B")]
    3232  public class PWRGOXCrossover : PWRCrossover {
    3333
    3434    [StorableConstructor]
    35     protected PWRGOXCrossover(bool deserializing) : base(deserializing) { }
     35    protected PWRGOXCrossover(StorableConstructorFlag _) : base(_) { }
    3636    protected PWRGOXCrossover(PWRGOXCrossover original, Cloner cloner) : base(original, cloner) { }
    3737    public PWRGOXCrossover() : base() { }

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Crossovers/PWRPPXCrossover.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.Core;
    2626using HeuristicLab.Encodings.IntegerVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition {
    3030  [Item("PWRPPXCrossover", "Represents a crossover operation swapping sequences of the parents to generate offspring.")]
    31   [StorableClass]
     31  [StorableType("B5749161-8599-4F89-AAC7-414C53576B10")]
    3232  public class PWRPPXCrossover : PWRCrossover {
    3333
    3434    [StorableConstructor]
    35     protected PWRPPXCrossover(bool deserializing) : base(deserializing) { }
     35    protected PWRPPXCrossover(StorableConstructorFlag _) : base(_) { }
    3636    protected PWRPPXCrossover(PWRPPXCrossover original, Cloner cloner) : base(original, cloner) { }
    3737    public PWRPPXCrossover() : base() { }

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Manipulators/PWRInsertionManipulator.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.Core;
    2626using HeuristicLab.Encodings.IntegerVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition {
    3030  [Item("PWRInsertionManipulator", "Represents a manipulation operation inserting parts of the individual at another position.")]
    31   [StorableClass]
     31  [StorableType("D2813869-42F7-4609-B7E0-4725E7565572")]
    3232  public class PWRInsertionManipulator : PWRManipulator {
    3333    [StorableConstructor]
    34     protected PWRInsertionManipulator(bool deserializing) : base(deserializing) { }
     34    protected PWRInsertionManipulator(StorableConstructorFlag _) : base(_) { }
    3535    protected PWRInsertionManipulator(PWRInsertionManipulator original, Cloner cloner) : base(original, cloner) { }
    3636    public PWRInsertionManipulator() : base() { }

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Manipulators/PWRManipulator.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.PermutationWithRepetition {
    2828  [Item("PWRManipulator", "An operator which manipulates a PWR representation.")]
    29   [StorableClass]
     29  [StorableType("22287F17-B833-40E0-AE6C-F1136DCF4997")]
    3030  public abstract class PWRManipulator : ScheduleManipulator, IPWROperator {
    3131
    3232    [StorableConstructor]
    33     protected PWRManipulator(bool deserializing) : base(deserializing) { }
     33    protected PWRManipulator(StorableConstructorFlag _) : base(_) { }
    3434    protected PWRManipulator(PWRManipulator original, Cloner cloner) : base(original, cloner) { }
    3535    public PWRManipulator()

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/PWREncoding.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.IntegerVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition {
    2929  [Item("PermutationWithRepetitionEncoding", "Represents a encoding for a standard JobShop Scheduling Problem.")]
    30   [StorableClass]
     30  [StorableType("31A66AC4-897D-4986-A6FC-DC301DC06278")]
    3131  public class PWREncoding : Item, IScheduleEncoding {
    3232
    … …  
    3535
    3636    [StorableConstructor]
    37     protected PWREncoding(bool deserializing) : base(deserializing) { }
     37    protected PWREncoding(StorableConstructorFlag _) : base(_) { }
    3838    protected PWREncoding(PWREncoding original, Cloner cloner)
    3939      : base(original, cloner) {

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/PWRRandomCreator.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.ScheduleEncoding.PermutationWithRepetition {
    3030  [Item("PermutationWithRepetitionRandomCreator", "Creates PWR-individuals at random.")]
    31   [StorableClass]
     31  [StorableType("6E753916-C0FD-4585-B6A6-47FD66ED098F")]
    3232  public class PWRRandomCreator : ScheduleCreator, IStochasticOperator {
    3333
    … …  
    4343
    4444    [StorableConstructor]
    45     protected PWRRandomCreator(bool deserializing) : base(deserializing) { }
     45    protected PWRRandomCreator(StorableConstructorFlag _) : base(_) { }
    4646    protected PWRRandomCreator(PWRRandomCreator original, Cloner cloner) : base(original, cloner) { }
    4747    public PWRRandomCreator()
Note: See TracChangeset for help on using the changeset viewer.