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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Crossovers/PRVCrossover.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.PriorityRulesVector {
    2727  [Item("PRVCrossover", "An operator which crosses two PRV representations.")]
    28   [StorableClass]
     28  [StorableType("D5AD4BED-029A-4424-8512-F2F7E10D748D")]
    2929  public abstract class PRVCrossover : ScheduleCrossover, IPRVOperator {
    3030
    3131    [StorableConstructor]
    32     protected PRVCrossover(bool deserializing) : base(deserializing) { }
     32    protected PRVCrossover(StorableConstructorFlag _) : base(_) { }
    3333    protected PRVCrossover(PRVCrossover original, Cloner cloner) : base(original, cloner) { }
    3434    public PRVCrossover()

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Crossovers/PRVDiscreteCrossover.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.IntegerVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector {
    2828  [Item("PRVDiscreteCrossover", "Represents a crossover operation swapping sequences of the parents to generate offspring.")]
    29   [StorableClass]
     29  [StorableType("79050109-0BDC-4EBE-A290-D32F99BB45D4")]
    3030  public class PRVDiscreteCrossover : PRVCrossover {
    3131
    3232    [StorableConstructor]
    33     protected PRVDiscreteCrossover(bool deserializing) : base(deserializing) { }
     33    protected PRVDiscreteCrossover(StorableConstructorFlag _) : base(_) { }
    3434    protected PRVDiscreteCrossover(PRVDiscreteCrossover original, Cloner cloner) : base(original, cloner) { }
    3535    public PRVDiscreteCrossover() : base() { }

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Crossovers/PRVSinglePointCrossover.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.IntegerVectorEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector {
    2828  [Item("PRVSinglePointCrossover", "Represents a crossover operation swapping sequences of the parents to generate offspring.")]
    29   [StorableClass]
     29  [StorableType("7E148F4E-1993-44B5-B466-E1E441203498")]
    3030  public class PRVSinglePointCrossover : PRVCrossover {
    3131
    3232    [StorableConstructor]
    33     protected PRVSinglePointCrossover(bool deserializing) : base(deserializing) { }
     33    protected PRVSinglePointCrossover(StorableConstructorFlag _) : base(_) { }
    3434    protected PRVSinglePointCrossover(PRVSinglePointCrossover original, Cloner cloner) : base(original, cloner) { }
    3535    public PRVSinglePointCrossover() : base() { }

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Manipulators/PRVManipulator.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.PriorityRulesVector {
    2828  [Item("PRVManipulator", "An operator which manipulates a PRV representation.")]
    29   [StorableClass]
     29  [StorableType("724A2141-E592-447E-9F51-5C69BD3A7D46")]
    3030  public abstract class PRVManipulator : ScheduleManipulator, IPRVOperator {
    3131    [StorableConstructor]
    32     protected PRVManipulator(bool deserializing) : base(deserializing) { }
     32    protected PRVManipulator(StorableConstructorFlag _) : base(_) { }
    3333    protected PRVManipulator(PRVManipulator original, Cloner cloner) : base(original, cloner) { }
    3434    public PRVManipulator()

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Manipulators/PRVUniformOnePositionManipulator.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.IntegerVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector {
    2929  [Item("PRVUniformOnePositionManipulator", "Represents a manipulation operation inserting parts of the individual at another position.")]
    30   [StorableClass]
     30  [StorableType("5C6A1D79-88DD-42D7-94C1-57C16BA44148")]
    3131  public class PRVUniformOnePositionManipulator : PRVManipulator {
    3232
    3333    [StorableConstructor]
    34     protected PRVUniformOnePositionManipulator(bool deserializing) : base(deserializing) { }
     34    protected PRVUniformOnePositionManipulator(StorableConstructorFlag _) : base(_) { }
    3535    protected PRVUniformOnePositionManipulator(PRVUniformOnePositionManipulator original, Cloner cloner) : base(original, cloner) { }
    3636    public PRVUniformOnePositionManipulator() : base() { }

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/PRVEncoding.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.Data;
    2626using HeuristicLab.Encodings.IntegerVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector {
    3030  [Item("PriorityRulesVectorEncoding", "Represents an encoding for a Scheduling Problem.")]
    31   [StorableClass]
     31  [StorableType("D42AC200-1F87-451E-A953-803EF33BE953")]
    3232  public class PRVEncoding : Item, IScheduleEncoding {
    3333    [Storable]
    … …  
    4343
    4444    [StorableConstructor]
    45     protected PRVEncoding(bool deserializing) : base(deserializing) { }
     45    protected PRVEncoding(StorableConstructorFlag _) : base(_) { }
    4646    protected PRVEncoding(PRVEncoding original, Cloner cloner)
    4747      : base(original, cloner) {

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/PRVRandomCreator.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.PriorityRulesVector {
    3030  [Item("PriorityRulesRandomCreator", "Creator class used to create PRV encoding objects for scheduling problems.")]
    31   [StorableClass]
     31  [StorableType("5FF2A11E-86F9-4A8B-8E1C-713D6801506C")]
    3232  public class PRVRandomCreator : ScheduleCreator, IStochasticOperator {
    3333
    … …  
    4646
    4747    [StorableConstructor]
    48     protected PRVRandomCreator(bool deserializing) : base(deserializing) { }
     48    protected PRVRandomCreator(StorableConstructorFlag _) : base(_) { }
    4949    protected PRVRandomCreator(PRVRandomCreator original, Cloner cloner)
    5050      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.