Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (6 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.BinPacking

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

    r15583 r16565  
    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) {

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

    r15583 r16565  
    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) {

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

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.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) {

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

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    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) {

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

    r15583 r16565  
    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

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

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    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) {

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

    r15583 r16565  
    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()

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

    r15583 r16565  
    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()
Note: See TracChangeset for help on using the changeset viewer.