Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/07/19 23:40:10 (5 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
30 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.BinPacking

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/BinPacking3D.cs

    r15584 r17097  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    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) {

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators/BinUtilizationEvaluator.cs

    r15584 r17097  
    2020#endregion
    2121
    22 using System;
    2322using System.Linq;
    2423using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    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) {

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators/PackingRatioEvaluator.cs

    r15584 r17097  
    2323using System.Linq;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    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) {

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/Instances/RandomInstanceProvider.cs

    r15584 r17097  
    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.

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/Instances/RealWorldContainerPackingInstanceProvider.cs

    r15584 r17097  
    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.

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/Instances/ThreeDInstanceDescriptor.cs

    r15584 r17097  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/Instances/ThreeDInstanceParser.cs

    r15584 r17097  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs

    r15584 r17097  
    2121
    2222using System;
    23 using System.Linq;
    2423using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    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) {

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs

    r15584 r17097  
    2121
    2222using HeuristicLab.Core;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Attic;
    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) {

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorDecoderBase.cs

    r15584 r17097  
    2121
    2222using HeuristicLab.Core;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Attic;
    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) {

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorProblem.cs

    r15584 r17097  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
    … …  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Optimization.Operators;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    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

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/Interfaces/IDecoder.cs

    r15584 r17097  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Core;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.BinPacking3D {
     27  [StorableType("df195f8b-c7c1-4167-bff1-362e30f3c4dd")]
    2628  public interface IDecoder<in T> : IItem {
    2729    Solution Decode(T encodedSolution, PackingShape binShape, IList<PackingItem> items, bool useStackingConstraints);

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/Interfaces/IEvaluator.cs

    r15584 r17097  
    2121
    2222using HeuristicLab.Core;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.BinPacking3D {
     26  [StorableType("9bc2a33b-46b1-457c-a96b-afb15d5cc01f")]
    2527  public interface IEvaluator : IItem {
    2628    double Evaluate(Solution solution);

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/Interfaces/IOperator.cs

    r15584 r17097  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Data;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.BinPacking3D {
     27  [StorableType("d442d459-ad09-46df-8b3e-6164db9fb0e2")]
    2628  public interface IOperator<TSol> : IItem {
    2729    ILookupParameter<ReadOnlyItemList<PackingItem>> ItemsParameter { get; }

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/MoveEvaluatorBase.cs

    r15584 r17097  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    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()

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/PackingItem.cs

    r15584 r17097  
    2121
    2222using HeuristicLab.Core;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Attic;
    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) {

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/PackingPosition.cs

    r15584 r17097  
    2121
    2222using System;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Attic;
    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) {

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/PackingShape.cs

    r15584 r17097  
    2222using System;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    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) {
    … …  
    118118      else throw new ArgumentException(string.Format("Cannot compare with object {0}", obj), "obj");
    119119    }
    120 
    121120    #endregion
    122121
     122    [StorableType(StorableMemberSelection.AllFields, "6dc0b0e2-e165-44e0-a342-71974f0494e3")]
    123123    private struct CuboidDiagonal {
    124124      public int x1;

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/BottomLeftPermutationDecoder.cs

    r15584 r17097  
    2121
    2222using HeuristicLab.Core;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Attic;
    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) {

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ExtremePointPermutationDecoder.cs

    r15584 r17097  
    2020#endregion
    2121
    22 using System;
    2322using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Attic;
    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) {

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ExtremePointPermutationDecoderBase.cs

    r15584 r17097  
    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.Encodings.PermutationEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    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) {

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/FreeVolumeBestFitExtremePointPermutationDecoder.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Encodings.PermutationEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    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) {

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/PermutationProblem.cs

    r15584 r17097  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
    … …  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Optimization.Operators;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    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

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ResidualSpaceBestFitExtremePointPermutationDecoder.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Encodings.PermutationEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    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) {

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/Swap2MoveEvaluator.cs

    r15584 r17097  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.PermutationEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    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()

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/TranslocationMoveEvaluator.cs

    r15584 r17097  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.PermutationEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    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()

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/ProblemBase.cs

    r15584 r17097  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    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

  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/Solution.cs

    r14170 r17097  
    11using HeuristicLab.Common;
    22using HeuristicLab.Core;
    3 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     3using HEAL.Attic;
    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) {
Note: See TracChangeset for help on using the changeset viewer.