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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Crossovers/DirectScheduleCrossover.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.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.ScheduleEncoding.ScheduleEncoding {
    2828  [Item("DirectScheduleCrossover", "An operator which crosses two schedule representations.")]
    29   [StorableClass]
     29  [StorableType("841CA966-FDB0-4C0D-BBE2-6A3422DF94CD")]
    3030  public abstract class DirectScheduleCrossover : ScheduleCrossover, IDirectScheduleOperator {
    3131    [StorableConstructor]
    32     protected DirectScheduleCrossover(bool deserializing) : base(deserializing) { }
     32    protected DirectScheduleCrossover(StorableConstructorFlag _) : base(_) { }
    3333    protected DirectScheduleCrossover(DirectScheduleCrossover original, Cloner cloner) : base(original, cloner) { }
    3434    public DirectScheduleCrossover()

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Crossovers/DirectScheduleGTCrossover.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.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.ScheduleEncoding.ScheduleEncoding {
    2929  [Item("DirectScheduleGTCrossover", "Represents a crossover using the GT-Algorithm to cross two direct schedule representations.")]
    30   [StorableClass]
     30  [StorableType("07921864-BC23-431D-BA28-B302691F7FF8")]
    3131  public class DirectScheduleGTCrossover : DirectScheduleCrossover {
    3232
    … …  
    3636
    3737    [StorableConstructor]
    38     protected DirectScheduleGTCrossover(bool deserializing) : base(deserializing) { }
     38    protected DirectScheduleGTCrossover(StorableConstructorFlag _) : base(_) { }
    3939    protected DirectScheduleGTCrossover(DirectScheduleGTCrossover original, Cloner cloner) : base(original, cloner) { }
    4040    public DirectScheduleGTCrossover()

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/DirectScheduleRandomCreator.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
    3131
    3232namespace HeuristicLab.Encodings.ScheduleEncoding {
    3333  [Item("DirectScheduleRandomCreator", "Creator class used to create schedule encoding objects.")]
    34   [StorableClass]
     34  [StorableType("40BD24F4-7197-4F65-AFC0-AC28A372DD45")]
    3535  public class DirectScheduleRandomCreator : ScheduleCreator, IStochasticOperator {
    3636
    … …  
    5050
    5151    [StorableConstructor]
    52     protected DirectScheduleRandomCreator(bool deserializing) : base(deserializing) { }
     52    protected DirectScheduleRandomCreator(StorableConstructorFlag _) : base(_) { }
    5353    protected DirectScheduleRandomCreator(DirectScheduleRandomCreator original, Cloner cloner)
    5454      : base(original, cloner) {

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/GTAlgorithmUtils.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.

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Job.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.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.ScheduleEncoding {
    3131  [Item("Job", "Represents a composition of tasks that require processing in a scheduling problem.")]
    32   [StorableClass]
     32  [StorableType("77EC3F5A-5539-4090-8EB6-6599F17A32D8")]
    3333  public class Job : Item, INotifyPropertyChanged {
    3434
    … …  
    7373
    7474    [StorableConstructor]
    75     protected Job(bool deserializing) : base(deserializing) { }
     75    protected Job(StorableConstructorFlag _) : base(_) { }
    7676    protected Job(Job original, Cloner cloner)
    7777      : base(original, cloner) {

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Manipulators/DirectScheduleManipulator.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.ScheduleEncoding {
    2828  [Item("DirectScheduleManipulator", "An operator which manipulates a direct schedule representation.")]
    29   [StorableClass]
     29  [StorableType("B5E31B46-3C2B-4DA5-AA5F-C0A88A4A8A26")]
    3030  public abstract class DirectScheduleManipulator : ScheduleManipulator, IDirectScheduleOperator {
    3131
    3232    [StorableConstructor]
    33     protected DirectScheduleManipulator(bool deserializing) : base(deserializing) { }
     33    protected DirectScheduleManipulator(StorableConstructorFlag _) : base(_) { }
    3434    protected DirectScheduleManipulator(DirectScheduleManipulator original, Cloner cloner) : base(original, cloner) { }
    3535    public DirectScheduleManipulator()

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Resource.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 {
    2828  [Item("ResourceClass", "Represents a resource used in scheduling problems.")]
    29   [StorableClass]
     29  [StorableType("32C052AF-8397-4908-8044-507509871A3F")]
    3030  public class Resource : Item {
    3131
    … …  
    4242
    4343    [StorableConstructor]
    44     protected Resource(bool deserializing) : base(deserializing) { }
     44    protected Resource(StorableConstructorFlag _) : base(_) { }
    4545    protected Resource(Resource original, Cloner cloner)
    4646      : base(original, cloner) {

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Schedule.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.Data;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.ScheduleEncoding {
    3131  [Item("Schedule", "Represents the general solution for scheduling problems.")]
    32   [StorableClass]
     32  [StorableType("EA6D14A3-7FA6-4B4B-B7F6-40B42657D398")]
    3333  public sealed class Schedule : NamedItem, IScheduleEncoding {
    3434
    … …  
    6363
    6464    [StorableConstructor]
    65     private Schedule(bool deserializing) : base(deserializing) { }
     65    private Schedule(StorableConstructorFlag _) : base(_) { }
    6666    private Schedule(Schedule original, Cloner cloner)
    6767      : base(original, cloner) {

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/ScheduledTask.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 {
    2828  [Item("ScheduledTask", "Represents a task that has been scheduled already.")]
    29   [StorableClass]
     29  [StorableType("8E947B77-37DF-4451-ACF4-03251516FC52")]
    3030  public class ScheduledTask : Item {
    3131
    … …  
    4949
    5050    [StorableConstructor]
    51     protected ScheduledTask(bool deserializing) : base(deserializing) { }
     51    protected ScheduledTask(StorableConstructorFlag _) : base(_) { }
    5252    protected ScheduledTask(ScheduledTask original, Cloner cloner)
    5353      : base(original, cloner) {

  • trunk/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Task.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.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.ScheduleEncoding {
    2929  [Item("Task", "Represents a task that has to be scheduled.")]
    30   [StorableClass]
     30  [StorableType("D28FB463-EA44-493B-B232-A851F22AFBAA")]
    3131  public class Task : Item, INotifyPropertyChanged {
    3232
    … …  
    9292
    9393    [StorableConstructor]
    94     protected Task(bool deserializing) : base(deserializing) { }
     94    protected Task(StorableConstructorFlag _) : base(_) { }
    9595    protected Task(Task original, Cloner cloner)
    9696      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.