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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMDecoder.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.
    … …  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    3333
    3434namespace HeuristicLab.Problems.Scheduling {
    3535  [Item("JobSequenceMatrixDecoder", "Applies the GifflerThompson algorithm to create an active schedule from a JobSequence Matrix.")]
    36   [StorableClass]
     36  [StorableType("BEB71861-F5DE-4A00-87A8-97716C13895B")]
    3737  public class JSMDecoder : ScheduleDecoder, IStochasticOperator, IJSSPOperator {
    3838
    … …  
    5959
    6060    [StorableConstructor]
    61     protected JSMDecoder(bool deserializing) : base(deserializing) { }
     61    protected JSMDecoder(StorableConstructorFlag _) : base(_) { }
    6262    protected JSMDecoder(JSMDecoder original, Cloner cloner) : base(original, cloner) { }
    6363    public override IDeepCloneable Clone(Cloner cloner) {

  • trunk/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMDecodingErrorPolicy.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.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.Scheduling {
    2929  [Item("JSMDecodingErrorPolicy", "Represents a policy for handling decoding errors.")]
    30   [StorableClass]
     30  [StorableType("835B8FE8-8BEA-4E05-BB68-2538341AC2D0")]
    3131  public sealed class JSMDecodingErrorPolicy : ValueTypeValue<JSMDecodingErrorPolicyTypes> {
    3232
    … …  
    3636
    3737    [StorableConstructor]
    38     private JSMDecodingErrorPolicy(bool deserializing) : base(deserializing) { }
     38    private JSMDecodingErrorPolicy(StorableConstructorFlag _) : base(_) { }
    3939    private JSMDecodingErrorPolicy(JSMDecodingErrorPolicy original, Cloner cloner) : base(original, cloner) { }
    4040    public JSMDecodingErrorPolicy() : base() { }

  • trunk/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMDecodingErrorPolicyTypes.cs

    r15583 r16565  
    1 #region License Information
     1using HEAL.Attic;
     2#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2122
    2223namespace HeuristicLab.Problems.Scheduling {
     24  [StorableType("546CD984-4CBF-4AF8-8E92-C9EDC5426CB4")]
    2325  public enum JSMDecodingErrorPolicyTypes {
    2426    RandomPolicy,

  • trunk/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMForcingStrategy.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.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.Scheduling {
    2929  [Item("JSMForcingStrategy", "Represents a forcing strategy.")]
    30   [StorableClass]
     30  [StorableType("B5170DC3-AEDD-46D2-9173-E37E0EEFD456")]
    3131  public sealed class JSMForcingStrategy : ValueTypeValue<JSMForcingStrategyTypes> {
    3232
    … …  
    3636
    3737    [StorableConstructor]
    38     private JSMForcingStrategy(bool deserializing) : base(deserializing) { }
     38    private JSMForcingStrategy(StorableConstructorFlag _) : base(_) { }
    3939    private JSMForcingStrategy(JSMForcingStrategy original, Cloner cloner) : base(original, cloner) { }
    4040    public JSMForcingStrategy() { }

  • trunk/HeuristicLab.Problems.Scheduling/3.3/Decoders/JSMForcingStrategyTypes.cs

    r15583 r16565  
    1 #region License Information
     1using HEAL.Attic;
     2#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2122
    2223namespace HeuristicLab.Problems.Scheduling {
     24  [StorableType("24F9DDB2-C881-4C8D-AED8-76683C53110C")]
    2325  public enum JSMForcingStrategyTypes {
    2426    ShiftForcing,

  • trunk/HeuristicLab.Problems.Scheduling/3.3/Decoders/PRVDecoder.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
    3131namespace HeuristicLab.Problems.Scheduling {
    3232  [Item("JobSequencingMatrixDecoder", "Applies the GifflerThompson algorithm to create an active schedule from a JobSequencing Matrix.")]
    33   [StorableClass]
     33  [StorableType("4BECE53D-C72B-4F96-AE96-EA01E7DE4B92")]
    3434  public class PRVDecoder : ScheduleDecoder, IStochasticOperator, IJSSPOperator {
    3535
    … …  
    169169
    170170    [StorableConstructor]
    171     protected PRVDecoder(bool deserializing) : base(deserializing) { }
     171    protected PRVDecoder(StorableConstructorFlag _) : base(_) { }
    172172    protected PRVDecoder(PRVDecoder original, Cloner cloner) : base(original, cloner) { }
    173173    public PRVDecoder()

  • trunk/HeuristicLab.Problems.Scheduling/3.3/Decoders/PWRDecoder.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
    3131namespace HeuristicLab.Problems.Scheduling {
    3232  [Item("PWRDecoder", "An item used to convert a PWR-individual into a generalized schedule.")]
    33   [StorableClass]
     33  [StorableType("FE66781A-93CB-4312-8AC0-AA049220FEB8")]
    3434  public class PWRDecoder : ScheduleDecoder, IStochasticOperator, IJSSPOperator {
    3535
    … …  
    4242
    4343    [StorableConstructor]
    44     protected PWRDecoder(bool deserializing) : base(deserializing) { }
     44    protected PWRDecoder(StorableConstructorFlag _) : base(_) { }
    4545    protected PWRDecoder(PWRDecoder original, Cloner cloner) : base(original, cloner) { }
    4646    public PWRDecoder()

  • trunk/HeuristicLab.Problems.Scheduling/3.3/Decoders/ScheduleDecoder.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.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.Scheduling {
    3030  [Item("ScheduleDecoder", "A schedule decoder translates a respresentation into an actual schedule.")]
    31   [StorableClass]
     31  [StorableType("B48CB500-3983-4D83-98A8-3BC8FB167211")]
    3232  public abstract class ScheduleDecoder : SingleSuccessorOperator, IScheduleDecoder {
    3333
    … …  
    4040
    4141    [StorableConstructor]
    42     protected ScheduleDecoder(bool deserializing) : base(deserializing) { }
     42    protected ScheduleDecoder(StorableConstructorFlag _) : base(_) { }
    4343    protected ScheduleDecoder(ScheduleDecoder original, Cloner cloner) : base(original, cloner) { }
    4444    public ScheduleDecoder()
Note: See TracChangeset for help on using the changeset viewer.