Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/28/19 17:19:09 (6 years ago)
Author:
abeham
Message:

#2521:

  • Adapt Encodings.ScheduleEncoding to new persistence
  • Adapt Problems.Programmable to new persistence
Location:
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Decoder/JSMDecoder.cs

    r13469 r16725  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    … …  
    2829using HeuristicLab.Encodings.PermutationEncoding;
    2930using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131using HeuristicLab.Random;
    3232
    3333namespace HeuristicLab.Encodings.ScheduleEncoding {
    3434  [Item("JobSequenceMatrixDecoder", "Applies the GifflerThompson algorithm to create an active schedule from a JobSequence Matrix.")]
    35   [StorableClass]
     35  [StorableType("BBE354C2-7599-43CC-ACDC-F8F0F65BE3F5")]
    3636  public class JSMDecoder : ScheduleDecoder<JSMEncoding> {
    3737
    … …  
    5252
    5353    [StorableConstructor]
    54     protected JSMDecoder(bool deserializing) : base(deserializing) { }
     54    protected JSMDecoder(StorableConstructorFlag _) : base(_) { }
    5555    protected JSMDecoder(JSMDecoder original, Cloner cloner) : base(original, cloner) { }
    5656    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/JobSequenceMatrixEncoding.cs

    r13443 r16725  
    2525using System.Collections.Generic;
    2626using System.Linq;
     27using HEAL.Attic;
    2728using HeuristicLab.Common;
    2829using HeuristicLab.Core;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.PluginInfrastructure;
    3131
    3232namespace HeuristicLab.Encodings.ScheduleEncoding {
    33   [StorableClass]
     33  [StorableType("9C090369-0214-42E6-8C3E-369751F5A9E1")]
    3434  public sealed class JobSequenceMatrixEncoding : ScheduleEncoding<JSMEncoding> {
    3535    [StorableConstructor]
    36     private JobSequenceMatrixEncoding(bool deserializing) : base(deserializing) { }
     36    private JobSequenceMatrixEncoding(StorableConstructorFlag _) : base(_) { }
    3737    private JobSequenceMatrixEncoding(JobSequenceMatrixEncoding original, Cloner cloner) : base(original, cloner) { }
    3838    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Decoder/PWRDecoder.cs

    r13469 r16725  
    2020#endregion
    2121
    22 using System;
     22using HEAL.Attic;
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2625
    2726namespace HeuristicLab.Encodings.ScheduleEncoding {
    2827  [Item("PWRDecoder", "An item used to convert a PWR-individual into a generalized schedule.")]
    29   [StorableClass]
     28  [StorableType("60D171BE-9704-40E1-9C63-0E56D95403CD")]
    3029  public class PWRDecoder : ScheduleDecoder<PWREncoding> {
    3130    [StorableConstructor]
    32     protected PWRDecoder(bool deserializing) : base(deserializing) { }
     31    protected PWRDecoder(StorableConstructorFlag _) : base(_) { }
    3332    protected PWRDecoder(PWRDecoder original, Cloner cloner) : base(original, cloner) { }
    3433    public PWRDecoder() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/PermutationWithRepetitionEncoding.cs

    r13443 r16725  
    2525using System.Collections.Generic;
    2626using System.Linq;
     27using HEAL.Attic;
    2728using HeuristicLab.Common;
    2829using HeuristicLab.Core;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.PluginInfrastructure;
    3131
    3232namespace HeuristicLab.Encodings.ScheduleEncoding {
    33   [StorableClass]
     33  [StorableType("468EF506-0749-469B-B9B9-36655AA0178D")]
    3434  public sealed class PermutationWithRepetitionEncoding : ScheduleEncoding<PWREncoding> {
    3535    [StorableConstructor]
    36     private PermutationWithRepetitionEncoding(bool deserializing) : base(deserializing) { }
     36    private PermutationWithRepetitionEncoding(StorableConstructorFlag _) : base(_) { }
    3737    private PermutationWithRepetitionEncoding(PermutationWithRepetitionEncoding original, Cloner cloner) : base(original, cloner) { }
    3838    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Decoder/PRVDecoder.cs

    r13469 r16725  
    2121
    2222using System.Linq;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626using HeuristicLab.Random;
    2727
    2828namespace HeuristicLab.Encodings.ScheduleEncoding {
    2929  [Item("JobSequencingMatrixDecoder", "Applies the GifflerThompson algorithm to create an active schedule from a JobSequencing Matrix.")]
    30   [StorableClass]
     30  [StorableType("2D059957-AC7C-4B33-BADE-96706AEBAF29")]
    3131  public class PRVDecoder : ScheduleDecoder<PRVEncoding> {
    3232    #region Priority Rules
    … …  
    158158
    159159    [StorableConstructor]
    160     protected PRVDecoder(bool deserializing) : base(deserializing) { }
     160    protected PRVDecoder(StorableConstructorFlag _) : base(_) { }
    161161    protected PRVDecoder(PRVDecoder original, Cloner cloner) : base(original, cloner) { }
    162162    public PRVDecoder() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/PriorityRulesVectorEncoding.cs

    r13443 r16725  
    2525using System.Collections.Generic;
    2626using System.Linq;
     27using HEAL.Attic;
    2728using HeuristicLab.Common;
    2829using HeuristicLab.Core;
    2930using HeuristicLab.Data;
    3031using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232using HeuristicLab.PluginInfrastructure;
    3333
    3434namespace HeuristicLab.Encodings.ScheduleEncoding {
    35   [StorableClass]
     35  [StorableType("9C419EE5-F3A8-4F06-8263-7D37D3AE1C72")]
    3636  public sealed class PriorityRulesVectorEncoding : ScheduleEncoding<PRVEncoding> {
    3737
    … …  
    5353
    5454    [StorableConstructor]
    55     private PriorityRulesVectorEncoding(bool deserializing) : base(deserializing) { }
     55    private PriorityRulesVectorEncoding(StorableConstructorFlag _) : base(_) { }
    5656    private PriorityRulesVectorEncoding(PriorityRulesVectorEncoding original, Cloner cloner) : base(original, cloner) { }
    5757    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleDecoder.cs

    r13469 r16725  
    2121
    2222using System;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    2526using HeuristicLab.Operators;
    2627using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828
    2929namespace HeuristicLab.Encodings.ScheduleEncoding {
    3030  [Item("ScheduleDecoder", "A schedule decoder translates a respresentation into an actual schedule.")]
    31   [StorableClass]
     31  [StorableType("57A68F4B-4B35-4DB4-9B5E-D5154DD46E45")]
    3232  public abstract class ScheduleDecoder<TSchedule> : SingleSuccessorOperator, IScheduleDecoder<TSchedule>
    3333  where TSchedule : class, ISchedule {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected ScheduleDecoder(bool deserializing) : base(deserializing) { }
     46    protected ScheduleDecoder(StorableConstructorFlag _) : base(_) { }
    4747    protected ScheduleDecoder(ScheduleDecoder<TSchedule> original, Cloner cloner) : base(original, cloner) { }
    4848    public ScheduleDecoder()

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding.cs

    r13469 r16725  
    2525using System.Collections.Generic;
    2626using System.Linq;
     27using HEAL.Attic;
    2728using HeuristicLab.Common;
    2829using HeuristicLab.Core;
    … …  
    3031using HeuristicLab.Optimization;
    3132using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333
    3434namespace HeuristicLab.Encodings.ScheduleEncoding {
    35   [StorableClass]
     35  [StorableType("D2FB1AF9-EF13-4ED2-B3E9-D5BE4E5772EA")]
    3636  public abstract class ScheduleEncoding<TSchedule> : Encoding<TSchedule>, IScheduleEncoding
    3737  where TSchedule : class, ISchedule {
    … …  
    119119
    120120    [StorableConstructor]
    121     protected ScheduleEncoding(bool deserializing) : base(deserializing) { }
     121    protected ScheduleEncoding(StorableConstructorFlag _) : base(_) { }
    122122    protected ScheduleEncoding(ScheduleEncoding<TSchedule> original, Cloner cloner)
    123123      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/Decoder/DirectScheduleDecoder.cs

    r13469 r16725  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    2626namespace HeuristicLab.Encodings.ScheduleEncoding {
    2727  [Item("DirectScheduleDecoder", "An item used to convert a direct schedule into a generalized schedule.")]
    28   [StorableClass]
     28  [StorableType("151C772B-6E6C-40D9-B171-F5626C676A5F")]
    2929  public class DirectScheduleDecoder : ScheduleDecoder<Schedule> {
    3030    [StorableConstructor]
    31     protected DirectScheduleDecoder(bool deserializing) : base(deserializing) { }
     31    protected DirectScheduleDecoder(StorableConstructorFlag _) : base(_) { }
    3232    protected DirectScheduleDecoder(DirectScheduleDecoder original, Cloner cloner) : base(original, cloner) { }
    3333    public DirectScheduleDecoder() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/ScheduleEncoding/DirectScheduleEncoding.cs

    r13443 r16725  
    2525using System.Collections.Generic;
    2626using System.Linq;
     27using HEAL.Attic;
    2728using HeuristicLab.Common;
    2829using HeuristicLab.Core;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.PluginInfrastructure;
    3131
    3232namespace HeuristicLab.Encodings.ScheduleEncoding {
    33   [StorableClass]
     33  [StorableType("BB1BD851-3E77-4357-942C-EAF5BE6760B4")]
    3434  public sealed class DirectScheduleEncoding : ScheduleEncoding<Schedule> {
    3535    [StorableConstructor]
    36     private DirectScheduleEncoding(bool deserializing) : base(deserializing) { }
     36    private DirectScheduleEncoding(StorableConstructorFlag _) : base(_) { }
    3737    private DirectScheduleEncoding(DirectScheduleEncoding original, Cloner cloner) : base(original, cloner) { }
    3838    public override IDeepCloneable Clone(Cloner cloner) {
Note: See TracChangeset for help on using the changeset viewer.