Free cookie consent management tool by TermsFeed Policy Generator

Changeset 16725


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

#2521:

  • Adapt Encodings.ScheduleEncoding to new persistence
  • Adapt Problems.Programmable to new persistence
Location:
branches/2521_ProblemRefactoring
Files:
14 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) {
  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs

    r16723 r16725  
    2121
    2222using System.Drawing;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Common.Resources;
     
    2728using HeuristicLab.Optimization;
    2829using HeuristicLab.Parameters;
    29 using HEAL.Attic;
    3030using HeuristicLab.Scripting;
    3131
     
    6161
    6262    [StorableConstructor]
    63     private MultiObjectiveProgrammableProblem(StorableConstructorFlag _) : base(_) { }
     63    protected MultiObjectiveProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    6464    protected MultiObjectiveProgrammableProblem(MultiObjectiveProgrammableProblem<TEncoding, TSolution> original, Cloner cloner)
    6565      : base(original, cloner) {
  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScript.cs

    r16723 r16725  
    2323using System.Linq;
    2424using System.Reflection;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    2728using HeuristicLab.Optimization;
    28 using HEAL.Attic;
    2929using HeuristicLab.Scripting;
    3030
     
    5555
    5656  [Item("ProblemDefinitionScript", "Script that defines the parameter vector and evaluates the solution for a programmable problem.")]
    57   [StorableClass]
     57  [StorableType("0B3AF22C-4744-4860-BBCF-A92046000847")]
    5858  public abstract class ProblemDefinitionScript<TEncoding, TSolution> : ProblemDefinitionScript, IProblemDefinition<TEncoding, TSolution>
    5959    where TEncoding : class, IEncoding<TSolution>
     
    7979
    8080    [StorableConstructor]
    81     protected ProblemDefinitionScript(bool deserializing) : base(deserializing) { }
     81    protected ProblemDefinitionScript(StorableConstructorFlag _) : base(_) { }
    8282    protected ProblemDefinitionScript(ProblemDefinitionScript<TEncoding, TSolution> original, Cloner cloner)
    8383      : base(original, cloner) {
  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/ProgrammableProblemInstances.cs

    r13376 r16725  
    2222#endregion
    2323
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
     
    3132using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    3233using HeuristicLab.Optimization;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3434
    3535namespace HeuristicLab.Problems.Programmable {
     
    3737  [Item("Binary Vector Problem (single-objective)", "Represents a binary vector single-objective problem that can be programmed with a script.")]
    3838  [Creatable(CreatableAttribute.Categories.ProgrammableProblemsSingleObjective, Priority = 100)]
    39   [StorableClass]
     39  [StorableType("FD06DC4B-FB2C-4325-817A-AC030683537B")]
    4040  public sealed class SingleObjectiveBinaryVectorProgrammableProblem : SingleObjectiveProgrammableProblem<BinaryVectorEncoding, BinaryVector> {
    4141
    4242    [StorableConstructor]
    43     private SingleObjectiveBinaryVectorProgrammableProblem(bool deserializing) : base(deserializing) { }
     43    private SingleObjectiveBinaryVectorProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    4444    private SingleObjectiveBinaryVectorProgrammableProblem(SingleObjectiveBinaryVectorProgrammableProblem original, Cloner cloner) : base(original, cloner) { }
    4545
     
    6161  [Item("Integer Vector Problem (single-objective)", "Represents an integer vector single-objective problem that can be programmed with a script.")]
    6262  [Creatable(CreatableAttribute.Categories.ProgrammableProblemsSingleObjective, Priority = 101)]
    63   [StorableClass]
     63  [StorableType("650DF07C-886D-48DF-B796-CE8C18471E40")]
    6464  public sealed class SingleObjectiveIntegerVectorProgrammableProblem : SingleObjectiveProgrammableProblem<IntegerVectorEncoding, IntegerVector> {
    6565
    6666    [StorableConstructor]
    67     private SingleObjectiveIntegerVectorProgrammableProblem(bool deserializing) : base(deserializing) { }
     67    private SingleObjectiveIntegerVectorProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    6868    private SingleObjectiveIntegerVectorProgrammableProblem(SingleObjectiveIntegerVectorProgrammableProblem original, Cloner cloner) : base(original, cloner) { }
    6969
     
    8484  [Item("Real Vector Problem (single-objective)", "Represents a real vector single-objective problem that can be programmed with a script.")]
    8585  [Creatable(CreatableAttribute.Categories.ProgrammableProblemsSingleObjective, Priority = 102)]
    86   [StorableClass]
     86  [StorableType("FA01E098-D70B-4782-85E0-8DCF9D1F72D3")]
    8787  public sealed class SingleObjectiveRealVectorProgrammableProblem : SingleObjectiveProgrammableProblem<RealVectorEncoding, RealVector> {
    8888
    8989    [StorableConstructor]
    90     private SingleObjectiveRealVectorProgrammableProblem(bool deserializing) : base(deserializing) { }
     90    private SingleObjectiveRealVectorProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    9191    private SingleObjectiveRealVectorProgrammableProblem(SingleObjectiveRealVectorProgrammableProblem original, Cloner cloner) : base(original, cloner) { }
    9292
     
    107107  [Item("Permutation Problem (single-objective)", "Represents a permutation single-objective problem that can be programmed with a script.")]
    108108  [Creatable(CreatableAttribute.Categories.ProgrammableProblemsSingleObjective, Priority = 103)]
    109   [StorableClass]
     109  [StorableType("51D851AD-8F12-4C00-A626-CDF785574C07")]
    110110  public sealed class SingleObjectivePermutationProgrammableProblem : SingleObjectiveProgrammableProblem<PermutationEncoding, Permutation> {
    111111
    112112    [StorableConstructor]
    113     private SingleObjectivePermutationProgrammableProblem(bool deserializing) : base(deserializing) { }
     113    private SingleObjectivePermutationProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    114114    private SingleObjectivePermutationProgrammableProblem(SingleObjectivePermutationProgrammableProblem original, Cloner cloner) : base(original, cloner) { }
    115115
     
    130130  [Item("Symbolic Expression Tree Problem (single-objective)", "Represents a symbolic expression tree single-objective problem that can be programmed with a script.")]
    131131  [Creatable(CreatableAttribute.Categories.ProgrammableProblemsSingleObjective, Priority = 104)]
    132   [StorableClass]
     132  [StorableType("49EE7342-D54E-42D4-ADC1-0E79599385A2")]
    133133  public sealed class SingleObjectiveSymbolicExpressionTreeProgrammableProblem : SingleObjectiveProgrammableProblem<SymbolicExpressionTreeEncoding, ISymbolicExpressionTree> {
    134134
    135135    [StorableConstructor]
    136     private SingleObjectiveSymbolicExpressionTreeProgrammableProblem(bool deserializing) : base(deserializing) { }
     136    private SingleObjectiveSymbolicExpressionTreeProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    137137    private SingleObjectiveSymbolicExpressionTreeProgrammableProblem(SingleObjectiveSymbolicExpressionTreeProgrammableProblem original, Cloner cloner) : base(original, cloner) { }
    138138    public SingleObjectiveSymbolicExpressionTreeProgrammableProblem()
     
    152152  [Item("Linear Linkage Problem (single-objective)", "Represents a linear linkage single-objective problem that can be programmed with a script.")]
    153153  [Creatable(CreatableAttribute.Categories.ProgrammableProblemsSingleObjective, Priority = 105)]
    154   [StorableClass]
     154  [StorableType("C6D025AC-C09A-49F1-BB2C-F40A16687E95")]
    155155  public sealed class SingleObjectiveLinearLinkageProgrammableProblem : SingleObjectiveProgrammableProblem<LinearLinkageEncoding, LinearLinkage> {
    156156
    157157    [StorableConstructor]
    158     private SingleObjectiveLinearLinkageProgrammableProblem(bool deserializing) : base(deserializing) { }
     158    private SingleObjectiveLinearLinkageProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    159159    private SingleObjectiveLinearLinkageProgrammableProblem(SingleObjectiveLinearLinkageProgrammableProblem original, Cloner cloner) : base(original, cloner) { }
    160160    public SingleObjectiveLinearLinkageProgrammableProblem()
     
    174174  [Item("Combined Encoding Problem (single-objective)", "Represents a combined encoding single-objective problem that can be programmed with a script.")]
    175175  [Creatable(CreatableAttribute.Categories.ProgrammableProblemsSingleObjective, Priority = 1000)]
    176   [StorableClass]
     176  [StorableType("BF5186A9-8695-484D-888D-0DAE0F344AAD")]
    177177  public sealed class SingleObjectiveCombinedEncodingProgrammableProblem : SingleObjectiveProgrammableProblem<CombinedEncoding, CombinedSolution> {
    178178
    179179    [StorableConstructor]
    180     private SingleObjectiveCombinedEncodingProgrammableProblem(bool deserializing) : base(deserializing) { }
     180    private SingleObjectiveCombinedEncodingProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    181181    private SingleObjectiveCombinedEncodingProgrammableProblem(SingleObjectiveCombinedEncodingProgrammableProblem original, Cloner cloner) : base(original, cloner) { }
    182182
     
    196196  [Item("Binary Vector Problem (multi-objective)", "Represents a binary vector multi-objective problem that can be programmed with a script.")]
    197197  [Creatable(CreatableAttribute.Categories.ProgrammableProblemsMultiObjective, Priority = 100)]
    198   [StorableClass]
     198  [StorableType("750F0CF5-2779-49A7-BC32-EA3C593B50DE")]
    199199  public sealed class MultiObjectiveBinaryVectorProgrammableProblem : MultiObjectiveProgrammableProblem<BinaryVectorEncoding, BinaryVector> {
    200200
    201201    [StorableConstructor]
    202     private MultiObjectiveBinaryVectorProgrammableProblem(bool deserializing) : base(deserializing) { }
     202    private MultiObjectiveBinaryVectorProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    203203    private MultiObjectiveBinaryVectorProgrammableProblem(MultiObjectiveBinaryVectorProgrammableProblem original, Cloner cloner) : base(original, cloner) { }
    204204
     
    220220  [Item("Integer Vector Problem (multi-objective)", "Represents an integer vector multi-objective problem that can be programmed with a script.")]
    221221  [Creatable(CreatableAttribute.Categories.ProgrammableProblemsMultiObjective, Priority = 101)]
    222   [StorableClass]
     222  [StorableType("442F242E-29E6-416A-8CA3-C216300A1FA5")]
    223223  public sealed class MultiObjectiveIntegerVectorProgrammableProblem : MultiObjectiveProgrammableProblem<IntegerVectorEncoding, IntegerVector> {
    224224
    225225    [StorableConstructor]
    226     private MultiObjectiveIntegerVectorProgrammableProblem(bool deserializing) : base(deserializing) { }
     226    private MultiObjectiveIntegerVectorProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    227227    private MultiObjectiveIntegerVectorProgrammableProblem(MultiObjectiveIntegerVectorProgrammableProblem original, Cloner cloner) : base(original, cloner) { }
    228228
     
    243243  [Item("Real Vector Problem (multi-objective)", "Represents a real vector multi-objective problem that can be programmed with a script.")]
    244244  [Creatable(CreatableAttribute.Categories.ProgrammableProblemsMultiObjective, Priority = 102)]
    245   [StorableClass]
     245  [StorableType("2DEFF24A-755A-4E22-8DD8-B791C0BCC832")]
    246246  public sealed class MultiObjectiveRealVectorProgrammableProblem : MultiObjectiveProgrammableProblem<RealVectorEncoding, RealVector> {
    247247
    248248    [StorableConstructor]
    249     private MultiObjectiveRealVectorProgrammableProblem(bool deserializing) : base(deserializing) { }
     249    private MultiObjectiveRealVectorProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    250250    private MultiObjectiveRealVectorProgrammableProblem(MultiObjectiveRealVectorProgrammableProblem original, Cloner cloner) : base(original, cloner) { }
    251251
     
    266266  [Item("Permutation Problem (multi-objective)", "Represents a permutation multi-objective problem that can be programmed with a script.")]
    267267  [Creatable(CreatableAttribute.Categories.ProgrammableProblemsMultiObjective, Priority = 103)]
    268   [StorableClass]
     268  [StorableType("23FC641C-770B-49A2-AA3C-5862F4A55F94")]
    269269  public sealed class MultiObjectivePermutationProgrammableProblem : MultiObjectiveProgrammableProblem<PermutationEncoding, Permutation> {
    270270
    271271    [StorableConstructor]
    272     private MultiObjectivePermutationProgrammableProblem(bool deserializing) : base(deserializing) { }
     272    private MultiObjectivePermutationProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    273273    private MultiObjectivePermutationProgrammableProblem(MultiObjectivePermutationProgrammableProblem original, Cloner cloner) : base(original, cloner) { }
    274274    public MultiObjectivePermutationProgrammableProblem()
     
    288288  [Item("Symbolic Expression Tree Programmable Problem (multi-objective)", "Represents a symbolic expression tree multi-objective problem that can be programmed with a script.")]
    289289  [Creatable(CreatableAttribute.Categories.ProgrammableProblemsMultiObjective, Priority = 104)]
    290   [StorableClass]
     290  [StorableType("FAEA5ED6-EA8F-4EA2-B84C-7A1B4491292A")]
    291291  public sealed class MultiObjectiveSymbolicExpressionTreeProgrammableProblem : MultiObjectiveProgrammableProblem<SymbolicExpressionTreeEncoding, ISymbolicExpressionTree> {
    292292
    293293    [StorableConstructor]
    294     private MultiObjectiveSymbolicExpressionTreeProgrammableProblem(bool deserializing) : base(deserializing) { }
     294    private MultiObjectiveSymbolicExpressionTreeProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    295295    private MultiObjectiveSymbolicExpressionTreeProgrammableProblem(MultiObjectiveSymbolicExpressionTreeProgrammableProblem original, Cloner cloner) : base(original, cloner) { }
    296296    public MultiObjectiveSymbolicExpressionTreeProgrammableProblem()
     
    310310  [Item("Linear Linkage Programmable Problem (multi-objective)", "Represents a linear linkage multi-objective problem that can be programmed with a script.")]
    311311  [Creatable(CreatableAttribute.Categories.ProgrammableProblemsMultiObjective, Priority = 105)]
    312   [StorableClass]
     312  [StorableType("207E3110-4937-4A95-9331-39880739D7CF")]
    313313  public sealed class MultiObjectiveLinearLinkageProgrammableProblem : MultiObjectiveProgrammableProblem<LinearLinkageEncoding, LinearLinkage> {
    314314
    315315    [StorableConstructor]
    316     private MultiObjectiveLinearLinkageProgrammableProblem(bool deserializing) : base(deserializing) { }
     316    private MultiObjectiveLinearLinkageProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    317317    private MultiObjectiveLinearLinkageProgrammableProblem(MultiObjectiveLinearLinkageProgrammableProblem original, Cloner cloner) : base(original, cloner) { }
    318318    public MultiObjectiveLinearLinkageProgrammableProblem()
     
    332332  [Item("Combined Encoding Problem (multi-objective)", "Represents a combined encoding multi-objective problem that can be programmed with a script.")]
    333333  [Creatable(CreatableAttribute.Categories.ProgrammableProblemsMultiObjective, Priority = 1000)]
    334   [StorableClass]
     334  [StorableType("1EE16E10-63DD-41F1-8739-ACE7437D551B")]
    335335  public sealed class MultiObjectiveCombinedEncodingProgrammableProblem : MultiObjectiveProgrammableProblem<CombinedEncoding, CombinedSolution> {
    336336
    337337    [StorableConstructor]
    338     private MultiObjectiveCombinedEncodingProgrammableProblem(bool deserializing) : base(deserializing) { }
     338    private MultiObjectiveCombinedEncodingProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    339339    private MultiObjectiveCombinedEncodingProgrammableProblem(MultiObjectiveCombinedEncodingProgrammableProblem original, Cloner cloner) : base(original, cloner) { }
    340340
  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

    r16723 r16725  
    2222using System.Collections.Generic;
    2323using System.Drawing;
     24using HEAL.Attic;
    2425using HeuristicLab.Analysis;
    2526using HeuristicLab.Common;
     
    2930using HeuristicLab.Optimization;
    3031using HeuristicLab.Parameters;
    31 using HEAL.Attic;
    3232using HeuristicLab.Scripting;
    3333
     
    7272
    7373    [StorableConstructor]
    74     private SingleObjectiveProgrammableProblem(StorableConstructorFlag _) : base(_) { }
     74    protected SingleObjectiveProgrammableProblem(StorableConstructorFlag _) : base(_) { }
    7575    public SingleObjectiveProgrammableProblem()
    7676      : base() {
Note: See TracChangeset for help on using the changeset viewer.