Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/28/18 16:10:48 (6 years ago)
Author:
jkarder
Message:

#2520: worked on reintegration of new persistence

  • added nuget references to HEAL.Fossil
  • added StorableType attributes to many classes
  • changed signature of StorableConstructors
  • removed some classes in old persistence
  • removed some unnecessary usings
Location:
branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3
Files:
45 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/BinPacking2D.cs

    r15583 r16462  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Common;
    … …  
    2929namespace HeuristicLab.Problems.BinPacking2D {
    3030  [Item("BinPacking2D", "Represents a single-bin packing for a 2D bin-packing problem.")]
    31   [StorableClass]
     31  [StorableType("8B9C6AB0-ED65-4868-B1DF-09BD1F49309A")]
    3232  public class BinPacking2D : BinPacking.BinPacking<PackingPosition, PackingShape, PackingItem> {
    3333
    … …  
    3939
    4040    [StorableConstructor]
    41     protected BinPacking2D(bool deserializing) : base(deserializing) { }
     41    protected BinPacking2D(StorableConstructorFlag _) : base(_) { }
    4242    protected BinPacking2D(BinPacking2D original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/Evaluators/BinUtilizationEvaluator.cs

    r15583 r16462  
    2020#endregion
    2121
    22 using System;
    2322using System.Linq;
    2423using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2625using HeuristicLab.Common;
    2726
    2827namespace HeuristicLab.Problems.BinPacking2D {
    2928  [Item("Bin-Utilization Evaluator (2d)", "Calculates the overall utilization of bin space.")]
    30   [StorableClass]
     29  [StorableType("54C2F064-D3C8-40C0-808D-B952D0C43033")]
    3130  public class BinUtilizationEvaluator : Item, IEvaluator {
    3231
    3332    [StorableConstructor]
    34     protected BinUtilizationEvaluator(bool deserializing) : base(deserializing) { }
     33    protected BinUtilizationEvaluator(StorableConstructorFlag _) : base(_) { }
    3534    protected BinUtilizationEvaluator(BinUtilizationEvaluator original, Cloner cloner)
    3635      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/Evaluators/PackingRatioEvaluator.cs

    r15583 r16462  
    2323using System.Linq;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Common;
    2727
    2828namespace HeuristicLab.Problems.BinPacking2D {
    2929  [Item("Packing-Ratio Evaluator (2d)", "Calculates the ratio between packed and unpacked space.")]
    30   [StorableClass]
     30  [StorableType("F07A6B7A-763B-413C-B3DA-916A6147B71A")]
    3131  public class PackingRatioEvaluator : Item, IEvaluator {
    3232
    3333    [StorableConstructor]
    34     protected PackingRatioEvaluator(bool deserializing) : base(deserializing) { }
     34    protected PackingRatioEvaluator(StorableConstructorFlag _) : base(_) { }
    3535    protected PackingRatioEvaluator(PackingRatioEvaluator original, Cloner cloner)
    3636      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs

    r15583 r16462  
    2020#endregion
    2121
    22 using System.Linq;
    2322using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2524using HeuristicLab.Common;
    2625using System.Collections.Generic;
    27 using HeuristicLab.Encodings.IntegerVectorEncoding;
    2826
    2927namespace HeuristicLab.Problems.BinPacking2D {
    3028  [Item("Bottom-left IntegerVector Decoder (2d)", "Decodes the integer vector and creates a packing solution candidate")]
    31   [StorableClass]
     29  [StorableType("27643FED-BADA-48BF-8A71-38C35D160961")]
    3230  public class BottomLeftIntegerVectorDecoder : IntegerVectorDecoderBase {
    3331
    3432    [StorableConstructor]
    35     protected BottomLeftIntegerVectorDecoder(bool deserializing) : base(deserializing) { }
     33    protected BottomLeftIntegerVectorDecoder(StorableConstructorFlag _) : base(_) { }
    3634    protected BottomLeftIntegerVectorDecoder(BottomLeftIntegerVectorDecoder original, Cloner cloner)
    3735      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs

    r15583 r16462  
    2121
    2222using HeuristicLab.Core;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424using HeuristicLab.Common;
    2525using System.Collections.Generic;
    26 using System.Linq;
    27 using HeuristicLab.Encodings.IntegerVectorEncoding;
    2826
    2927namespace HeuristicLab.Problems.BinPacking2D {
    3028  [Item("Extreme-point IntegerVector Decoder (2d)", "Decodes the integer vector and creates a packing solution candidate")]
    31   [StorableClass]
     29  [StorableType("D40DEE7A-4AAC-47DA-9FA8-12D3C09177A7")]
    3230  public class ExtremePointIntegerVectorDecoder : IntegerVectorDecoderBase {
    3331
    3432    [StorableConstructor]
    35     protected ExtremePointIntegerVectorDecoder(bool deserializing) : base(deserializing) { }
     33    protected ExtremePointIntegerVectorDecoder(StorableConstructorFlag _) : base(_) { }
    3634    protected ExtremePointIntegerVectorDecoder(ExtremePointIntegerVectorDecoder original, Cloner cloner)
    3735      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/IntegerVectorDecoderBase.cs

    r15583 r16462  
    2121
    2222using HeuristicLab.Core;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424using HeuristicLab.Common;
    2525using System.Collections.Generic;
    … …  
    2828
    2929namespace HeuristicLab.Problems.BinPacking2D {
    30   [StorableClass]
     30  [StorableType("63588140-31BB-402A-BEEE-B11C8809A585")]
    3131  public abstract class IntegerVectorDecoderBase : Item, IDecoder<IntegerVector> {
    3232
    3333    [StorableConstructor]
    34     protected IntegerVectorDecoderBase(bool deserializing) : base(deserializing) { }
     34    protected IntegerVectorDecoderBase(StorableConstructorFlag _) : base(_) { }
    3535    protected IntegerVectorDecoderBase(IntegerVectorDecoderBase original, Cloner cloner)
    3636      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/IntegerVectorProblem.cs

    r16453 r16462  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Optimization.Operators;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333
    3434namespace HeuristicLab.Problems.BinPacking2D {
    3535  [Item("Bin Packing Problem (2D, integer vector encoding) (BPP)", "Represents a two-dimensional bin-packing problem using only bins with identical measures and bins/items with rectangular shapes.")]
    36   [StorableClass]
     36  [StorableType("0928004F-FB4B-4516-9FAE-B44D2F39413B")]
    3737  [Creatable(Category = CreatableAttribute.Categories.CombinatorialProblems, Priority = 310)]
    3838  public sealed class IntegerVectorProblem : ProblemBase<IntegerVectorEncoding, IntegerVector> {
    3939    // persistence
    4040    [StorableConstructor]
    41     private IntegerVectorProblem(bool deserializing) : base(deserializing) { }
     41    private IntegerVectorProblem(StorableConstructorFlag _) : base(_) { }
    4242
    4343    // cloning

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/MoveEvaluatorBase.cs

    r15583 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.BinPacking2D {
    31   [StorableClass]
     31  [StorableType("13553924-A74F-4897-ABAB-CD049CFD2B41")]
    3232  public abstract class MoveEvaluatorBase<TSol, TMove> : SingleSuccessorOperator,
    3333    ISingleObjectiveMoveEvaluator, ISingleObjectiveMoveOperator, IOperator<TSol>
    … …  
    6161
    6262    [StorableConstructor]
    63     protected MoveEvaluatorBase(bool deserializing) : base(deserializing) { }
     63    protected MoveEvaluatorBase(StorableConstructorFlag _) : base(_) { }
    6464    protected MoveEvaluatorBase(MoveEvaluatorBase<TSol, TMove> original, Cloner cloner) : base(original, cloner) { }
    6565    protected MoveEvaluatorBase()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/PackingItem.cs

    r15583 r16462  
    2121
    2222
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    … …  
    3030namespace HeuristicLab.Problems.BinPacking2D {
    3131  [Item("PackingItem (2d)", "Represents a rectangular packing-item for bin-packing problems.")]
    32   [StorableClass]
     32  [StorableType("36B693B0-3CD9-4EE2-97EF-B8BEA8E4877A")]
    3333  public class PackingItem : PackingShape, IPackingItem {
    3434
    … …  
    4949
    5050    [StorableConstructor]
    51     protected PackingItem(bool deserializing) : base(deserializing) { }
     51    protected PackingItem(StorableConstructorFlag _) : base(_) { }
    5252    protected PackingItem(PackingItem original, Cloner cloner)
    5353      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/PackingPosition.cs

    r15583 r16462  
    2121
    2222using System;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Common;
    … …  
    2727namespace HeuristicLab.Problems.BinPacking2D {
    2828  [Item("Packing Position (2d)", "Represents a packing-position associated with a two dimensional packing-problem.")]
    29   [StorableClass]
     29  [StorableType("7B0A0FD9-2D2C-4E03-BB66-674446A07587")]
    3030  // PackingPosition is an immutable class (and handled as value type concerning Equals and GetHashCode())
    3131  public class PackingPosition : BinPacking.PackingPosition, IComparable<PackingPosition> {
    … …  
    3939
    4040    [StorableConstructor]
    41     protected PackingPosition(bool deserializing) : base(deserializing) { }
     41    protected PackingPosition(StorableConstructorFlag _) : base(_) { }
    4242    protected PackingPosition(PackingPosition original, Cloner cloner)
    4343      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/PackingShape.cs

    r15583 r16462  
    2323using System;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Data;
    … …  
    3131namespace HeuristicLab.Problems.BinPacking2D {
    3232  [Item("PackingShape (2d)", "Represents the rectangular measures (width, height) of a two-dimensional bin-packing object.")]
    33   [StorableClass]
     33  [StorableType("11EF7917-826C-4154-A7E6-0869C1188B95")]
    3434  public class PackingShape : PackingShape<PackingPosition>, IComparable<PackingShape> {
    3535    public int Height {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected PackingShape(bool deserializing) : base(deserializing) { }
     46    protected PackingShape(StorableConstructorFlag _) : base(_) { }
    4747    protected PackingShape(PackingShape original, Cloner cloner)
    4848      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/BottomLeftPermutationDecoder.cs

    r15583 r16462  
    2121
    2222using HeuristicLab.Core;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424using HeuristicLab.Common;
    2525using System.Collections.Generic;
    … …  
    2828namespace HeuristicLab.Problems.BinPacking2D {
    2929  [Item("Bottom-left Permutation Decoder (2d)", "Decodes the permutation and creates a packing solution candidate")]
    30   [StorableClass]
     30  [StorableType("BD0B1034-46EC-430A-B971-258FACC9A39B")]
    3131  public class BottomLeftPermutationDecoder : Item, IDecoder<Permutation> {
    3232
    3333    [StorableConstructor]
    34     protected BottomLeftPermutationDecoder(bool deserializing) : base(deserializing) { }
     34    protected BottomLeftPermutationDecoder(StorableConstructorFlag _) : base(_) { }
    3535    protected BottomLeftPermutationDecoder(BottomLeftPermutationDecoder original, Cloner cloner)
    3636      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/ExtremePointPermutationDecoder.cs

    r15583 r16462  
    2121
    2222using HeuristicLab.Core;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424using HeuristicLab.Common;
    2525using System.Collections.Generic;
    … …  
    2828namespace HeuristicLab.Problems.BinPacking2D {
    2929  [Item("Extreme-point Permutation Decoder (2d)", "Decodes the permutation and creates a packing solution candidate")]
    30   [StorableClass]
     30  [StorableType("F50F332A-CFE7-4AB7-95C6-8D7943B3DEF2")]
    3131  public class ExtremePointPermutationDecoder : Item, IDecoder<Permutation> {
    3232
    3333    [StorableConstructor]
    34     protected ExtremePointPermutationDecoder(bool deserializing) : base(deserializing) { }
     34    protected ExtremePointPermutationDecoder(StorableConstructorFlag _) : base(_) { }
    3535    protected ExtremePointPermutationDecoder(ExtremePointPermutationDecoder original, Cloner cloner)
    3636      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/PermutationProblem.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Optimization.Operators;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.BinPacking2D {
    3434  [Item("Bin Packing Problem (2D, permutation encoding) (BPP)", "Represents a two-dimensional bin-packing problem using only bins with identical measures and bins/items with rectangular shapes.")]
    35   [StorableClass]
     35  [StorableType("BE95CC5D-7FFD-4BC7-A2FF-7D71D3B951F6")]
    3636  [Creatable(Category = CreatableAttribute.Categories.CombinatorialProblems, Priority = 300)]
    3737  public sealed class PermutationProblem : ProblemBase<PermutationEncoding, Permutation> {
    3838    // persistence
    3939    [StorableConstructor]
    40     private PermutationProblem(bool deserializing) : base(deserializing) { }
     40    private PermutationProblem(StorableConstructorFlag _) : base(_) { }
    4141
    4242    // cloning

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/Swap2MoveEvaluator.cs

    r15583 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.PermutationEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Problems.BinPacking2D {
    2828  [Item("Swap2MoveEvaluator", "Move evaluator for 2-opt moves.")]
    29   [StorableClass]
     29  [StorableType("7C1A0291-AD10-457D-B7B3-3D2B5B02C58D")]
    3030  public sealed class Swap2MoveEvaluator : MoveEvaluatorBase<Permutation, Swap2Move>, IPermutationSwap2MoveOperator {
    3131    public ILookupParameter<Swap2Move> Swap2MoveParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     private Swap2MoveEvaluator(bool deserializing) : base(deserializing) { }
     39    private Swap2MoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4040    private Swap2MoveEvaluator(Swap2MoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    4141    public Swap2MoveEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/TranslocationMoveEvaluator.cs

    r15583 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.PermutationEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Problems.BinPacking2D {
    2828  [Item("TranslocationMoveEvaluator", "Move evaluator for insertion or translocation moves.")]
    29   [StorableClass]
     29  [StorableType("9198644C-27DA-408B-810E-7686F0539802")]
    3030  public sealed class TranslocationMoveEvaluator : MoveEvaluatorBase<Permutation, TranslocationMove>, IPermutationTranslocationMoveOperator {
    3131    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
    … …  
    3636    }
    3737    [StorableConstructor]
    38     private TranslocationMoveEvaluator(bool deserializing) : base(deserializing) { }
     38    private TranslocationMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    3939    private TranslocationMoveEvaluator(TranslocationMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    4040    public TranslocationMoveEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/ProblemBase.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131using HeuristicLab.Problems.Instances;
    3232
    3333namespace HeuristicLab.Problems.BinPacking2D {
    34   [StorableClass]
     34  [StorableType("215B7963-4B3D-4197-B18F-16CC13EC5D68")]
    3535  public abstract class ProblemBase<TEnc, TSol> :
    3636    SingleObjectiveBasicProblem<TEnc>, IProblemInstanceConsumer<BPPData>, IProblemInstanceExporter<BPPData>
    … …  
    138138    // persistence
    139139    [StorableConstructor]
    140     protected ProblemBase(bool deserializing) : base(deserializing) { }
     140    protected ProblemBase(StorableConstructorFlag _) : base(_) { }
    141141
    142142    // cloning

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/2D/Solution.cs

    r15583 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525using HeuristicLab.Problems.BinPacking;
    2626
    2727namespace HeuristicLab.Problems.BinPacking2D {
    2828  [Item("Bin Packing Solution (2d)", "Represents a solution for a 2D bin packing problem.")]
    29   [StorableClass]
     29  [StorableType("9C014DEE-B1B3-447F-885E-5887E29DADF1")]
    3030  public class Solution : PackingPlan<PackingPosition, PackingShape, PackingItem> {
    3131    public Solution(PackingShape binShape) : this(binShape, false, false) { }
    3232    public Solution(PackingShape binShape, bool useExtremePoints, bool stackingConstraints) : base(binShape, useExtremePoints, stackingConstraints) { }
    3333    [StorableConstructor]
    34     protected Solution(bool deserializing) : base(deserializing) { }
     34    protected Solution(StorableConstructorFlag _) : base(_) { }
    3535    protected Solution(Solution original, Cloner cloner)
    3636      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/BinPacking3D.cs

    r15583 r16462  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Common;
    … …  
    3030namespace HeuristicLab.Problems.BinPacking3D {
    3131  [Item("BinPacking3D", "Represents a single-bin packing for a 3D bin-packing problem.")]
    32   [StorableClass]
     32  [StorableType("34D86A6D-F75F-4F62-9FB6-D7FEA738CECD")]
    3333  public class BinPacking3D : BinPacking<PackingPosition, PackingShape, PackingItem> {
    3434
    … …  
    4343    }
    4444    [StorableConstructor]
    45     protected BinPacking3D(bool deserializing) : base(deserializing) { }
     45    protected BinPacking3D(StorableConstructorFlag _) : base(_) { }
    4646    protected BinPacking3D(BinPacking3D original, Cloner cloner)
    4747      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators/BinUtilizationEvaluator.cs

    r15583 r16462  
    2020#endregion
    2121
    22 using System;
    2322using System.Linq;
    2423using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2625using HeuristicLab.Common;
    2726
    … …  
    2928  // NOTE: same implementation as for 2d problem
    3029  [Item("Bin-Utilization Evaluator (3d)", "Calculates the overall utilization of bin space.")]
    31   [StorableClass]
     30  [StorableType("D6743552-FF6F-4D9B-AFC2-38FF3D25DEB9")]
    3231  public class BinUtilizationEvaluator : Item, IEvaluator {
    3332
    3433    [StorableConstructor]
    35     protected BinUtilizationEvaluator(bool deserializing) : base(deserializing) { }
     34    protected BinUtilizationEvaluator(StorableConstructorFlag _) : base(_) { }
    3635    protected BinUtilizationEvaluator(BinUtilizationEvaluator original, Cloner cloner)
    3736      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators/PackingRatioEvaluator.cs

    r15583 r16462  
    2323using System.Linq;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Common;
    2727
    … …  
    2929  // NOTE: same implementation as for 2d problem
    3030  [Item("Packing-Ratio Evaluator (3d)", "Calculates the ratio between packed and unpacked space.")]
    31   [StorableClass]
     31  [StorableType("1CD9C03B-3C29-4D3D-B3FA-A3C5234907CD")]
    3232  public class PackingRatioEvaluator : Item, IEvaluator {
    3333
    3434    [StorableConstructor]
    35     protected PackingRatioEvaluator(bool deserializing) : base(deserializing) { }
     35    protected PackingRatioEvaluator(StorableConstructorFlag _) : base(_) { }
    3636    protected PackingRatioEvaluator(PackingRatioEvaluator original, Cloner cloner)
    3737      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs

    r15583 r16462  
    2121
    2222using System;
    23 using System.Linq;
    2423using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2625using HeuristicLab.Common;
    2726using System.Collections.Generic;
    … …  
    3029namespace HeuristicLab.Problems.BinPacking3D {
    3130  [Item("Bottom-left IntegerVector Decoder (3d)", "Decodes the integer vector and creates a packing solution candidate")]
    32   [StorableClass]
     31  [StorableType("3216A482-05F0-4E4C-B74E-E5C81A24DFC2")]
    3332  public class BottomLeftIntegerVectorDecoder : IntegerVectorDecoderBase {
    3433
    3534    [StorableConstructor]
    36     protected BottomLeftIntegerVectorDecoder(bool deserializing) : base(deserializing) { }
     35    protected BottomLeftIntegerVectorDecoder(StorableConstructorFlag _) : base(_) { }
    3736    protected BottomLeftIntegerVectorDecoder(BottomLeftIntegerVectorDecoder original, Cloner cloner)
    3837      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs

    r15583 r16462  
    2121
    2222using HeuristicLab.Core;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424using HeuristicLab.Common;
    2525using System.Collections.Generic;
    26 using System.Linq;
    27 using HeuristicLab.Encodings.IntegerVectorEncoding;
    2826
    2927namespace HeuristicLab.Problems.BinPacking3D {
    3028  [Item("Extreme-point IntegerVector Decoder (3d)", "Decodes the integer vector and creates a packing solution candidate")]
    31   [StorableClass]
     29  [StorableType("F5A3F964-93C0-4B94-82ED-F241ADE409E8")]
    3230  public class ExtremePointIntegerVectorDecoder : IntegerVectorDecoderBase {
    3331
    3432    [StorableConstructor]
    35     protected ExtremePointIntegerVectorDecoder(bool deserializing) : base(deserializing) { }
     33    protected ExtremePointIntegerVectorDecoder(StorableConstructorFlag _) : base(_) { }
    3634    protected ExtremePointIntegerVectorDecoder(ExtremePointIntegerVectorDecoder original, Cloner cloner)
    3735      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorDecoderBase.cs

    r15583 r16462  
    2121
    2222using HeuristicLab.Core;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424using HeuristicLab.Common;
    2525using System.Collections.Generic;
    … …  
    2828
    2929namespace HeuristicLab.Problems.BinPacking3D {
    30   [StorableClass]
     30  [StorableType("19C0AA6B-8FC5-4EA9-A441-5C4F5AD4C38E")]
    3131  public abstract class IntegerVectorDecoderBase : Item, IDecoder<IntegerVector> {
    3232
    3333    [StorableConstructor]
    34     protected IntegerVectorDecoderBase(bool deserializing) : base(deserializing) { }
     34    protected IntegerVectorDecoderBase(StorableConstructorFlag _) : base(_) { }
    3535    protected IntegerVectorDecoderBase(IntegerVectorDecoderBase original, Cloner cloner)
    3636      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorProblem.cs

    r16453 r16462  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Optimization.Operators;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333
    3434namespace HeuristicLab.Problems.BinPacking3D {
    3535  [Item("Bin Packing Problem (3D, integer vector encoding) (BPP)", "Represents a two-dimensional bin-packing problem using only bins with identical measures and bins/items with rectangular shapes.")]
    36   [StorableClass]
     36  [StorableType("B5101A23-114F-4052-A06D-FFAF2B95A5E6")]
    3737  [Creatable(Category = CreatableAttribute.Categories.CombinatorialProblems, Priority = 330)]
    3838  public sealed class IntegerVectorProblem : ProblemBase<IntegerVectorEncoding, IntegerVector> {
    3939    [StorableConstructor]
    40     private IntegerVectorProblem(bool deserializing) : base(deserializing) { }
     40    private IntegerVectorProblem(StorableConstructorFlag _) : base(_) { }
    4141
    4242    // cloning

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/MoveEvaluatorBase.cs

    r15583 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.BinPacking3D {
    31   [StorableClass]
     31  [StorableType("13F03B86-9790-4F75-9155-B3AEE3F9B541")]
    3232  public abstract class MoveEvaluatorBase<TSol, TMove> : SingleSuccessorOperator,
    3333    ISingleObjectiveMoveEvaluator, ISingleObjectiveMoveOperator, IOperator<TSol>
    … …  
    6464
    6565    [StorableConstructor]
    66     protected MoveEvaluatorBase(bool deserializing) : base(deserializing) { }
     66    protected MoveEvaluatorBase(StorableConstructorFlag _) : base(_) { }
    6767    protected MoveEvaluatorBase(MoveEvaluatorBase<TSol, TMove> original, Cloner cloner) : base(original, cloner) { }
    6868    protected MoveEvaluatorBase()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/PackingItem.cs

    r15583 r16462  
    2121
    2222using HeuristicLab.Core;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Data;
    … …  
    2929namespace HeuristicLab.Problems.BinPacking3D {
    3030  [Item("PackingItem (3d)", "Represents a cuboidic packing-item for bin-packing problems.")]
    31   [StorableClass]
     31  [StorableType("413E8254-9600-42F9-B057-E57B502881FD")]
    3232  public class PackingItem : PackingShape, IPackingItem {
    3333    public IValueParameter<PackingShape> TargetBinParameter {
    … …  
    6161
    6262    [StorableConstructor]
    63     protected PackingItem(bool deserializing) : base(deserializing) { }
     63    protected PackingItem(StorableConstructorFlag _) : base(_) { }
    6464    protected PackingItem(PackingItem original, Cloner cloner)
    6565      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/PackingPosition.cs

    r15583 r16462  
    2121
    2222using System;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Common;
    … …  
    2727namespace HeuristicLab.Problems.BinPacking3D {
    2828  [Item("Packing Position (3d)", "Represents a packing-position associated with a three dimensional packing-problem.")]
    29   [StorableClass]
     29  [StorableType("68408986-2325-43D3-A53B-DC2F31FB690C")]
    3030  // PackingPosition is immutable (and handled as value type concerning Equals and GetHashCode)
    3131  public class PackingPosition : BinPacking.PackingPosition, IComparable<PackingPosition> {
    … …  
    4242
    4343    [StorableConstructor]
    44     protected PackingPosition(bool deserializing) : base(deserializing) { }
     44    protected PackingPosition(StorableConstructorFlag _) : base(_) { }
    4545    protected PackingPosition(PackingPosition original, Cloner cloner)
    4646      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/PackingShape.cs

    r15583 r16462  
    2222using System;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Data;
    … …  
    3030namespace HeuristicLab.Problems.BinPacking3D {
    3131  [Item("PackingShape (3d)", "Represents the cuboid measures (width, height, depth) of a three-dimensional cuboidic bin-packing object.")]
    32   [StorableClass]
     32  [StorableType("87C5DC4E-A7E3-4853-B6C7-690B3F47DB57")]
    3333  public class PackingShape : PackingShape<PackingPosition>, IComparable<PackingShape> {
    3434    public IFixedValueParameter<IntValue> HeightParameter {
    … …  
    5858
    5959    [StorableConstructor]
    60     protected PackingShape(bool deserializing) : base(deserializing) { }
     60    protected PackingShape(StorableConstructorFlag _) : base(_) { }
    6161    protected PackingShape(PackingShape original, Cloner cloner)
    6262      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/BottomLeftPermutationDecoder.cs

    r15583 r16462  
    2121
    2222using HeuristicLab.Core;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424using HeuristicLab.Common;
    2525using System.Collections.Generic;
    … …  
    2828namespace HeuristicLab.Problems.BinPacking3D {
    2929  [Item("Bottom-left Permutation Decoder (3d)", "Decodes the permutation and creates a packing solution candidate")]
    30   [StorableClass]
     30  [StorableType("120B6DE4-B1C2-4FCD-AE1F-051863DBE698")]
    3131  public class BottomLeftPermutationDecoder : Item, IDecoder<Permutation> {
    3232
    3333    [StorableConstructor]
    34     protected BottomLeftPermutationDecoder(bool deserializing) : base(deserializing) { }
     34    protected BottomLeftPermutationDecoder(StorableConstructorFlag _) : base(_) { }
    3535    protected BottomLeftPermutationDecoder(BottomLeftPermutationDecoder original, Cloner cloner)
    3636      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ExtremePointPermutationDecoder.cs

    r15583 r16462  
    2020#endregion
    2121
    22 using System;
    2322using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2524using HeuristicLab.Common;
    2625using System.Collections.Generic;
    2726using HeuristicLab.Encodings.PermutationEncoding;
    28 using System.Linq;
    2927
    3028
    3129namespace HeuristicLab.Problems.BinPacking3D {
    3230  [Item("Extreme-point Permutation Decoder (3d)", "Decodes the permutation and creates a packing solution candidate")]
    33   [StorableClass]
     31  [StorableType("1232374B-6C9C-46A2-B7C2-97F484597D44")]
    3432  public class ExtremePointPermutationDecoder : ExtremePointPermutationDecoderBase {
    3533
    3634    [StorableConstructor]
    37     protected ExtremePointPermutationDecoder(bool deserializing) : base(deserializing) { }
     35    protected ExtremePointPermutationDecoder(StorableConstructorFlag _) : base(_) { }
    3836    protected ExtremePointPermutationDecoder(ExtremePointPermutationDecoder original, Cloner cloner)
    3937      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ExtremePointPermutationDecoderBase.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.PermutationEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.BinPacking3D {
    2929  [Item("Extreme-point Permutation Decoder (3d) Base", "Base class for decoders")]
    30   [StorableClass]
     30  [StorableType("CF1A3362-B650-419D-A5C0-ADB9AFFCCC56")]
    3131  public abstract class ExtremePointPermutationDecoderBase : Item, IDecoder<Permutation> {
    3232
    3333    [StorableConstructor]
    34     protected ExtremePointPermutationDecoderBase(bool deserializing) : base(deserializing) { }
     34    protected ExtremePointPermutationDecoderBase(StorableConstructorFlag _) : base(_) { }
    3535    protected ExtremePointPermutationDecoderBase(ExtremePointPermutationDecoderBase original, Cloner cloner)
    3636      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/FreeVolumeBestFitExtremePointPermutationDecoder.cs

    r16453 r16462  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Encodings.PermutationEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.BinPacking3D {
    3131  [Item("Free Volume Best Fit Extreme-point Permutation Decoder (3d)", "Decodes the permutation and creates a packing solution candidate")]
    32   [StorableClass]
     32  [StorableType("3CF690C8-EB29-40DC-ADE3-9B9A83928772")]
    3333  public class FreeVolumeBestFitExtremePointPermutationDecoder : ExtremePointPermutationDecoderBase {
    3434
    3535    [StorableConstructor]
    36     protected FreeVolumeBestFitExtremePointPermutationDecoder(bool deserializing) : base(deserializing) { }
     36    protected FreeVolumeBestFitExtremePointPermutationDecoder(StorableConstructorFlag _) : base(_) { }
    3737    protected FreeVolumeBestFitExtremePointPermutationDecoder(FreeVolumeBestFitExtremePointPermutationDecoder original, Cloner cloner)
    3838      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/PermutationProblem.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Optimization.Operators;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.BinPacking3D {
    3434  [Item("Bin Packing Problem (3D, permutation encoding) (BPP)", "Represents a three-dimensional bin-packing problem using only bins with identical measures and bins/items with rectangular shapes.")]
    35   [StorableClass]
     35  [StorableType("84B8B871-C360-43BD-BFC3-F6F16B379439")]
    3636  [Creatable(Category = CreatableAttribute.Categories.CombinatorialProblems, Priority = 320)]
    3737  public sealed class PermutationProblem : ProblemBase<PermutationEncoding, Permutation> {
    3838    [StorableConstructor]
    39     private PermutationProblem(bool deserializing) : base(deserializing) { }
     39    private PermutationProblem(StorableConstructorFlag _) : base(_) { }
    4040
    4141    // cloning

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ResidualSpaceBestFitExtremePointPermutationDecoder.cs

    r16453 r16462  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Encodings.PermutationEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.BinPacking3D {
    3131  [Item("Residual Space Best Fit Extreme-point Permutation Decoder (3d)", "Decodes the permutation and creates a packing solution candidate")]
    32   [StorableClass]
     32  [StorableType("FD6679E5-CB7C-4DDA-B45F-DA6137CFA00E")]
    3333  public class ResidualSpaceBestFitExtremePointPermutationDecoder : ExtremePointPermutationDecoderBase {
    3434
    3535    [StorableConstructor]
    36     protected ResidualSpaceBestFitExtremePointPermutationDecoder(bool deserializing) : base(deserializing) { }
     36    protected ResidualSpaceBestFitExtremePointPermutationDecoder(StorableConstructorFlag _) : base(_) { }
    3737    protected ResidualSpaceBestFitExtremePointPermutationDecoder(ResidualSpaceBestFitExtremePointPermutationDecoder original, Cloner cloner)
    3838      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/Swap2MoveEvaluator.cs

    r15583 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.PermutationEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Problems.BinPacking3D {
    2828  [Item("Swap2MoveEvaluator", "Move evaluator for 2-opt moves.")]
    29   [StorableClass]
     29  [StorableType("CF5E678F-E420-4825-A3FE-AE48D9B9B7C0")]
    3030  public sealed class Swap2MoveEvaluator : MoveEvaluatorBase<Permutation, Swap2Move>, IPermutationSwap2MoveOperator {
    3131    public ILookupParameter<Swap2Move> Swap2MoveParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     private Swap2MoveEvaluator(bool deserializing) : base(deserializing) { }
     39    private Swap2MoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4040    private Swap2MoveEvaluator(Swap2MoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    4141    public Swap2MoveEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/TranslocationMoveEvaluator.cs

    r15583 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.PermutationEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Problems.BinPacking3D {
    2828  [Item("TranslocationMoveEvaluator", "Move evaluator for insertion or translocation moves.")]
    29   [StorableClass]
     29  [StorableType("76E856C1-3DB9-44EC-A995-2CD667B69753")]
    3030  public sealed class TranslocationMoveEvaluator : MoveEvaluatorBase<Permutation, TranslocationMove>, IPermutationTranslocationMoveOperator {
    3131    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
    … …  
    3636    }
    3737    [StorableConstructor]
    38     private TranslocationMoveEvaluator(bool deserializing) : base(deserializing) { }
     38    private TranslocationMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    3939    private TranslocationMoveEvaluator(TranslocationMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    4040    public TranslocationMoveEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/ProblemBase.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131using HeuristicLab.Problems.Instances;
    3232
    3333namespace HeuristicLab.Problems.BinPacking3D {
    3434  // in comparison to the 2d problem the 3d problem implementation also supports checking stacking constraints
    35   [StorableClass]
     35  [StorableType("11F0A7B9-EF53-435E-AE3B-200A269DE308")]
    3636  public abstract class ProblemBase<TEnc, TSol> :
    3737    SingleObjectiveBasicProblem<TEnc>, IProblemInstanceConsumer<BPPData>, IProblemInstanceExporter<BPPData>
    … …  
    152152    // persistence
    153153    [StorableConstructor]
    154     protected ProblemBase(bool deserializing) : base(deserializing) { }
     154    protected ProblemBase(StorableConstructorFlag _) : base(_) { }
    155155
    156156    // cloning

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/3D/Solution.cs

    r14167 r16462  
    11using HeuristicLab.Common;
    22using HeuristicLab.Core;
    3 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     3using HEAL.Fossil;
    44using HeuristicLab.Problems.BinPacking;
    55
    66namespace HeuristicLab.Problems.BinPacking3D {
    77  [Item("Bin Packing Solution (3d)", "Represents a solution for a 3D bin packing problem.")]
    8   [StorableClass]
     8  [StorableType("C0620C6F-3882-45CD-976F-4840ABD08BCD")]
    99  public class Solution : PackingPlan<PackingPosition, PackingShape, PackingItem> {
    1010    public Solution(PackingShape binShape) : this(binShape, false, false) { }
    1111    public Solution(PackingShape binShape, bool useExtremePoints, bool stackingConstraints) : base(binShape, useExtremePoints, stackingConstraints) { }
    1212    [StorableConstructor]
    13     protected Solution(bool deserializing) : base(deserializing) { }
     13    protected Solution(StorableConstructorFlag _) : base(_) { }
    1414    protected Solution(Solution original, Cloner cloner)
    1515      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/Algorithms/3D/ExtremePointAlgorithm.cs

    r15583 r16462  
    3131using HeuristicLab.Optimization;
    3232using HeuristicLab.Parameters;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     33using HEAL.Fossil;
    3434
    3535namespace HeuristicLab.Problems.BinPacking3D {
    … …  
    3939
    4040  [Item("Extreme-point-based Bin Packing (3d)", "An implementation of the extreme-point based packing described in Crainic, T. G., Perboli, G., & Tadei, R. (2008). Extreme point-based heuristics for three-dimensional bin packing. Informs Journal on computing, 20(3), 368-384.")]
    41   [StorableClass]
     41  [StorableType("33F16B60-E562-4609-A6BE-A21B83BDA575")]
    4242  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 180)]
    4343  public sealed class ExtremePointAlgorithm : BasicAlgorithm {
    … …  
    7575
    7676    [StorableConstructor]
    77     private ExtremePointAlgorithm(bool deserializing) : base(deserializing) { }
     77    private ExtremePointAlgorithm(StorableConstructorFlag _) : base(_) { }
    7878    private ExtremePointAlgorithm(ExtremePointAlgorithm original, Cloner cloner)
    7979      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/BinPacking.cs

    r15583 r16462  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2625using HeuristicLab.Core;
    2726using HeuristicLab.Common;
    … …  
    3029namespace HeuristicLab.Problems.BinPacking {
    3130  [Item("BinPacking", "Represents a single-bin packing for a bin-packing problem.")]
    32   [StorableClass]
     31  [StorableType("7B0C7B64-CB50-405F-9F73-15B7C86F9B86")]
    3332  public abstract class BinPacking<TPos, TBin, TItem> : Item
    3433    where TPos : class, IPackingPosition
    … …  
    6766
    6867    [StorableConstructor]
    69     protected BinPacking(bool deserializing) : base(deserializing) { }
     68    protected BinPacking(StorableConstructorFlag _) : base(_) { }
    7069    protected BinPacking(BinPacking<TPos, TBin, TItem> original, Cloner cloner)
    7170      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

    r16454 r16462  
    7575      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    7676    </Reference>
    77     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     77    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    7878      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    7979    </Reference>

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/PackingPlan.cs

    r15583 r16462  
    2222using System;
    2323using System.Linq;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Common;
    … …  
    2929
    3030namespace HeuristicLab.Problems.BinPacking {
    31   [StorableClass]
     31  [StorableType("2E5A4B2A-EB2B-49F8-9BE8-45DA1A421F3E")]
    3232  public abstract class PackingPlan<D, B, I> : Item
    3333    where D : class, IPackingPosition
    … …  
    7878
    7979    [StorableConstructor]
    80     protected PackingPlan(bool deserializing) : base(deserializing) { }
     80    protected PackingPlan(StorableConstructorFlag _) : base(_) { }
    8181    protected PackingPlan(PackingPlan<D, B, I> original, Cloner cloner)
    8282      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/PackingPosition.cs

    r15583 r16462  
    2020#endregion
    2121
    22 using System;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     22using HEAL.Fossil;
    2423using HeuristicLab.Core;
    2524using HeuristicLab.Common;
    2625
    2726namespace HeuristicLab.Problems.BinPacking {
    28   [StorableClass]
     27  [StorableType("8ED65A4B-6F85-47EA-90C6-A4B47533E429")]
    2928  // PackingPosition is immutable (and handled as value types concerning Equals and GetHashCode)
    3029  public abstract class PackingPosition : Item, IPackingPosition {
    … …  
    4847
    4948    [StorableConstructor]
    50     protected PackingPosition(bool deserializing) : base(deserializing) { }
     49    protected PackingPosition(StorableConstructorFlag _) : base(_) { }
    5150    protected PackingPosition(PackingPosition original, Cloner cloner)
    5251      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.BinPacking/3.3/PackingShape.cs

    r15583 r16462  
    2525using System.Linq;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Common;
    2929
    3030namespace HeuristicLab.Problems.BinPacking {
    31   [StorableClass]
     31  [StorableType("FA24378B-4353-4CC9-AEFD-4B002EF5B139")]
    3232  public abstract class PackingShape<T> : Item, IPackingShape, IParameterizedItem
    3333    where T : class, IPackingPosition {
    … …  
    4848
    4949    [StorableConstructor]
    50     protected PackingShape(bool deserializing) { }
     50    protected PackingShape(StorableConstructorFlag _) : base(_) { }
    5151    protected PackingShape(PackingShape<T> original, Cloner cloner) {
    5252      this.Parameters = new ParameterCollection(original.Parameters.Select(p => cloner.Clone(p)));
Note: See TracChangeset for help on using the changeset viewer.