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:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Problems.BinPacking

  • trunk/HeuristicLab.Problems.BinPacking/3.3/2D/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.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) {
  • trunk/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/ExtremePointPermutationDecoder.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.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) {
  • trunk/HeuristicLab.Problems.BinPacking/3.3/2D/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.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
  • trunk/HeuristicLab.Problems.BinPacking/3.3/2D/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.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()
  • trunk/HeuristicLab.Problems.BinPacking/3.3/2D/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.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()
Note: See TracChangeset for help on using the changeset viewer.