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.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeExhaustiveMoveGenerator.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2828using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinPDExchangeExhaustiveMoveGenerator", "Generates exchange moves from a given PDP encoding.")]
    32   [StorableClass]
     32  [StorableType("EF921D7D-7DBE-45D9-B7F2-6364F2546981")]
    3333  public sealed class PotvinPDExchangeExhaustiveMoveGenerator : PotvinPDExchangeMoveGenerator, IExhaustiveMoveGenerator {
    3434    public override IDeepCloneable Clone(Cloner cloner) {
    … …  
    3737
    3838    [StorableConstructor]
    39     private PotvinPDExchangeExhaustiveMoveGenerator(bool deserializing) : base(deserializing) { }
     39    private PotvinPDExchangeExhaustiveMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4040
    4141    public PotvinPDExchangeExhaustiveMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMove.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinPDExchangeMove", "Item that describes a exchange move on a PDP representation.")]
    32   [StorableClass]
     32  [StorableType("2C3CC022-8F2B-435C-BDAD-ABB9D568FC8E")]
    3333  public class PotvinPDExchangeMove : Item, IVRPMove {
    3434    [Storable]
    … …  
    6565
    6666    [StorableConstructor]
    67     protected PotvinPDExchangeMove(bool deserializing) : base(deserializing) { }
     67    protected PotvinPDExchangeMove(StorableConstructorFlag _) : base(_) { }
    6868
    6969    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveEvaluator.cs

    r16453 r16462  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2929  [Item("PotvinPDExchangeMoveEvaluator", "Evaluates a exchange move for a PDP representation. ")]
    30   [StorableClass]
     30  [StorableType("092A4B82-1387-4887-9E0A-88F7D01862F6")]
    3131  public sealed class PotvinPDExchangeMoveEvaluator : PotvinMoveEvaluator, IPotvinPDExchangeMoveOperator {
    3232    public ILookupParameter<PotvinPDExchangeMove> PDExchangeMoveParameter {
    … …  
    5151
    5252    [StorableConstructor]
    53     private PotvinPDExchangeMoveEvaluator(bool deserializing) : base(deserializing) { }
     53    private PotvinPDExchangeMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    5454
    5555    public PotvinPDExchangeMoveEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveGenerator.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2929  [Item("PotvinPDExchangeMoveGenerator", "Generates exchange moves from a given PDP encoding.")]
    30   [StorableClass]
     30  [StorableType("1E0B89BB-5290-4D7B-8D4E-27667D29B2CE")]
    3131  public abstract class PotvinPDExchangeMoveGenerator : PotvinMoveGenerator, IPotvinPDExchangeMoveOperator {
    3232    public ILookupParameter<PotvinPDExchangeMove> PDExchangeMoveParameter {
    … …  
    4343
    4444    [StorableConstructor]
    45     protected PotvinPDExchangeMoveGenerator(bool deserializing) : base(deserializing) { }
     45    protected PotvinPDExchangeMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4646
    4747    public PotvinPDExchangeMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveMaker.cs

    r16453 r16462  
    2424using HeuristicLab.Optimization;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2828using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinPDExchangeMoveMaker", "Peforms the exchange move on a given PDP encoding and updates the quality.")]
    32   [StorableClass]
     32  [StorableType("A12F7FAD-9226-45A2-B254-D3F1A8EB5BA3")]
    3333  public class PotvinPDExchangeMoveMaker : PotvinMoveMaker, IPotvinPDExchangeMoveOperator, IMoveMaker {
    3434    public ILookupParameter<PotvinPDExchangeMove> PDExchangeMoveParameter {
    … …  
    4141
    4242    [StorableConstructor]
    43     protected PotvinPDExchangeMoveMaker(bool deserializing) : base(deserializing) { }
     43    protected PotvinPDExchangeMoveMaker(StorableConstructorFlag _) : base(_) { }
    4444
    4545    public PotvinPDExchangeMoveMaker()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveTabuCriterion.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3030using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3232namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3333  [Item("PotvinPDExchangeTabuCriterion", @"Checks if a certain exchange move is tabu.")]
    34   [StorableClass]
     34  [StorableType("65696327-6751-4029-9B07-849AEB0B79EE")]
    3535  public class PotvinPDExchangeTabuCriterion : SingleSuccessorOperator, IPotvinPDExchangeMoveOperator, ITabuChecker, IPotvinOperator, IVRPMoveOperator {
    3636    public override bool CanChangeName {
    … …  
    8383
    8484    [StorableConstructor]
    85     protected PotvinPDExchangeTabuCriterion(bool deserializing) : base(deserializing) { }
     85    protected PotvinPDExchangeTabuCriterion(StorableConstructorFlag _) : base(_) { }
    8686    protected PotvinPDExchangeTabuCriterion(PotvinPDExchangeTabuCriterion original, Cloner cloner) : base(original, cloner) { }
    8787    public PotvinPDExchangeTabuCriterion()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveTabuMaker.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3030
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3232  [Item("PotvinPDExchangeMoveTabuMaker", "Declares a given exchange move as tabu.")]
    33   [StorableClass]
     33  [StorableType("3B1A4A09-3A59-4763-A946-118F65576A2E")]
    3434  public class PotvinPDExchangeMoveTabuMaker : SingleSuccessorOperator, ITabuMaker, IPotvinPDExchangeMoveOperator, IPotvinOperator, ISingleObjectiveOperator {
    3535    public LookupParameter<ItemList<IItem>> TabuListParameter {
    … …  
    7777
    7878    [StorableConstructor]
    79     protected PotvinPDExchangeMoveTabuMaker(bool deserializing) : base(deserializing) { }
     79    protected PotvinPDExchangeMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    8080    protected PotvinPDExchangeMoveTabuMaker(PotvinPDExchangeMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
    8181    public PotvinPDExchangeMoveTabuMaker()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMultiMoveGenerator.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    3030using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3232namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3333  [Item("PotvinPDExchangeMultiMoveGenerator", "Generates exchange moves from a given PDP encoding.")]
    34   [StorableClass]
     34  [StorableType("7D0F0E92-66D9-49F9-AFDC-B75A9A261E55")]
    3535  public sealed class PotvinPDExchangeMultiMoveGenerator : PotvinPDExchangeMoveGenerator, IMultiMoveGenerator, IMultiVRPMoveGenerator {
    3636    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4747
    4848    [StorableConstructor]
    49     private PotvinPDExchangeMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     49    private PotvinPDExchangeMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5050
    5151    public PotvinPDExchangeMultiMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeSingleMoveGenerator.cs

    r16453 r16462  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2929using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3232  [Item("PotvinPDExchangeSingleMoveGenerator", "Generates a single exchange move from a given PDP encoding.")]
    33   [StorableClass]
     33  [StorableType("3A621754-DD4D-47BA-91B0-FC857D11D45B")]
    3434  public sealed class PotvinPDExchangeSingleMoveGenerator : PotvinPDExchangeMoveGenerator,
    3535    ISingleMoveGenerator {
    … …  
    4343
    4444    [StorableConstructor]
    45     private PotvinPDExchangeSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     45    private PotvinPDExchangeSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4646
    4747    public PotvinPDExchangeSingleMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeExhaustiveMoveGenerator.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2828using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinPDRearrangeExhaustiveMoveGenerator", "Generates rearrange moves from a given PDP encoding.")]
    32   [StorableClass]
     32  [StorableType("D3975AC5-11B8-4AF4-8CB2-BE97A69C935A")]
    3333  public sealed class PotvinPDRearrangeExhaustiveMoveGenerator : PotvinPDRearrangeMoveGenerator, IExhaustiveMoveGenerator {
    3434    public override IDeepCloneable Clone(Cloner cloner) {
    … …  
    3737
    3838    [StorableConstructor]
    39     private PotvinPDRearrangeExhaustiveMoveGenerator(bool deserializing) : base(deserializing) { }
     39    private PotvinPDRearrangeExhaustiveMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4040
    4141    public PotvinPDRearrangeExhaustiveMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMove.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinPDRearrangeMove", "Item that describes a rearrange move on a PDP representation.")]
    32   [StorableClass]
     32  [StorableType("219A5FFD-8533-4230-B373-9855F3D3C656")]
    3333  public class PotvinPDRearrangeMove : Item, IVRPMove {
    3434    [Storable]
    … …  
    6969
    7070    [StorableConstructor]
    71     protected PotvinPDRearrangeMove(bool deserializing) : base(deserializing) { }
     71    protected PotvinPDRearrangeMove(StorableConstructorFlag _) : base(_) { }
    7272
    7373    #region IVRPMove Members

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveEvaluator.cs

    r16453 r16462  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2929  [Item("PotvinPDRearrangeMoveEvaluator", "Evaluates a rearrange move for a PDP representation. ")]
    30   [StorableClass]
     30  [StorableType("4B60C6C0-7D1E-49E8-B1FF-240A5A52CD62")]
    3131  public sealed class PotvinPDRearrangeMoveEvaluator : PotvinMoveEvaluator, IPotvinPDRearrangeMoveOperator {
    3232    public ILookupParameter<PotvinPDRearrangeMove> PDRearrangeMoveParameter {
    … …  
    5151
    5252    [StorableConstructor]
    53     private PotvinPDRearrangeMoveEvaluator(bool deserializing) : base(deserializing) { }
     53    private PotvinPDRearrangeMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    5454
    5555    public PotvinPDRearrangeMoveEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveGenerator.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2929  [Item("PotvinPDRearrangeMoveGenerator", "Generates rearrange moves from a given PDP encoding.")]
    30   [StorableClass]
     30  [StorableType("BD74F7C5-6506-4440-AA62-E6577B0802E6")]
    3131  public abstract class PotvinPDRearrangeMoveGenerator : PotvinMoveGenerator, IPotvinPDRearrangeMoveOperator {
    3232    public ILookupParameter<PotvinPDRearrangeMove> PDRearrangeMoveParameter {
    … …  
    4343
    4444    [StorableConstructor]
    45     protected PotvinPDRearrangeMoveGenerator(bool deserializing) : base(deserializing) { }
     45    protected PotvinPDRearrangeMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4646
    4747    public PotvinPDRearrangeMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveMaker.cs

    r16453 r16462  
    2424using HeuristicLab.Optimization;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2828using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinPDRearrangeMoveMaker", "Peforms the rearrange move on a given PDP encoding and updates the quality.")]
    32   [StorableClass]
     32  [StorableType("5F16D0F3-A5E5-44A3-BA40-8CC9CE756FB7")]
    3333  public class PotvinPDRearrangeMoveMaker : PotvinMoveMaker, IPotvinPDRearrangeMoveOperator, IMoveMaker {
    3434    public ILookupParameter<PotvinPDRearrangeMove> PDRearrangeMoveParameter {
    … …  
    4141
    4242    [StorableConstructor]
    43     protected PotvinPDRearrangeMoveMaker(bool deserializing) : base(deserializing) { }
     43    protected PotvinPDRearrangeMoveMaker(StorableConstructorFlag _) : base(_) { }
    4444
    4545    public PotvinPDRearrangeMoveMaker()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveTabuCriterion.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3030using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3232namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3333  [Item("PotvinPDRearrangeTabuCriterion", @"Checks if a certain rearrange move is tabu.")]
    34   [StorableClass]
     34  [StorableType("02674C9B-8CA1-4CD9-8678-72BEE10EA00F")]
    3535  public class PotvinPDRearrangeTabuCriterion : SingleSuccessorOperator, IPotvinPDRearrangeMoveOperator, ITabuChecker, IPotvinOperator, IVRPMoveOperator {
    3636    public override bool CanChangeName {
    … …  
    8383
    8484    [StorableConstructor]
    85     protected PotvinPDRearrangeTabuCriterion(bool deserializing) : base(deserializing) { }
     85    protected PotvinPDRearrangeTabuCriterion(StorableConstructorFlag _) : base(_) { }
    8686    protected PotvinPDRearrangeTabuCriterion(PotvinPDRearrangeTabuCriterion original, Cloner cloner) : base(original, cloner) { }
    8787    public PotvinPDRearrangeTabuCriterion()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveTabuMaker.cs

    r16453 r16462  
    2525using HeuristicLab.Optimization.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinPDRearrangeMoveTabuMaker", "Declares a given rearrange move as tabu.")]
    32   [StorableClass]
     32  [StorableType("6E0FA87D-669A-4586-AD56-7DE38A2F54D1")]
    3333  public class PotvinPDRearrangeMoveTabuMaker : TabuMaker, IPotvinPDRearrangeMoveOperator, IPotvinOperator, IVRPMoveOperator {
    3434    public ILookupParameter<PotvinPDRearrangeMove> PDRearrangeMoveParameter {
    … …  
    5959
    6060    [StorableConstructor]
    61     protected PotvinPDRearrangeMoveTabuMaker(bool deserializing) : base(deserializing) { }
     61    protected PotvinPDRearrangeMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    6262    protected PotvinPDRearrangeMoveTabuMaker(PotvinPDRearrangeMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
    6363    public PotvinPDRearrangeMoveTabuMaker()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMultiMoveGenerator.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    3030using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3232namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3333  [Item("PotvinPDRearrangeMultiMoveGenerator", "Generates rearrange moves from a given PDP encoding.")]
    34   [StorableClass]
     34  [StorableType("99EF9C29-4174-4637-84F9-CE8622E4994C")]
    3535  public sealed class PotvinPDRearrangeMultiMoveGenerator : PotvinPDRearrangeMoveGenerator, IMultiMoveGenerator, IMultiVRPMoveGenerator {
    3636    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4747
    4848    [StorableConstructor]
    49     private PotvinPDRearrangeMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     49    private PotvinPDRearrangeMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5050
    5151    public PotvinPDRearrangeMultiMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeSingleMoveGenerator.cs

    r16453 r16462  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2929using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3232  [Item("PotvinPDRearrangeSingleMoveGenerator", "Generates a single rearrange move from a given PDP encoding.")]
    33   [StorableClass]
     33  [StorableType("A50A38DA-E9F9-4ED8-A84C-348B4420F858")]
    3434  public sealed class PotvinPDRearrangeSingleMoveGenerator : PotvinPDRearrangeMoveGenerator,
    3535    ISingleMoveGenerator {
    … …  
    4343
    4444    [StorableConstructor]
    45     private PotvinPDRearrangeSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     45    private PotvinPDRearrangeSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4646
    4747    public PotvinPDRearrangeSingleMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftExhaustiveMoveGenerator.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2828using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinPDShiftExhaustiveMoveGenerator", "Generates shift moves from a given PDP encoding.")]
    32   [StorableClass]
     32  [StorableType("CD03F921-FC4D-49AD-BEA3-156C60AAD5BD")]
    3333  public sealed class PotvinPDShiftExhaustiveMoveGenerator : PotvinPDShiftMoveGenerator, IExhaustiveMoveGenerator {
    3434    public override IDeepCloneable Clone(Cloner cloner) {
    … …  
    3737
    3838    [StorableConstructor]
    39     private PotvinPDShiftExhaustiveMoveGenerator(bool deserializing) : base(deserializing) { }
     39    private PotvinPDShiftExhaustiveMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4040
    4141    public PotvinPDShiftExhaustiveMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMove.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinPDShiftMove", "Item that describes a shift move on a PDP representation.")]
    32   [StorableClass]
     32  [StorableType("D71816CC-47C7-45C0-8474-8E4A94720B19")]
    3333  public class PotvinPDShiftMove : Item, IVRPMove {
    3434    [Storable]
    … …  
    7474
    7575    [StorableConstructor]
    76     protected PotvinPDShiftMove(bool deserializing) : base(deserializing) { }
     76    protected PotvinPDShiftMove(StorableConstructorFlag _) : base(_) { }
    7777
    7878    #region IVRPMove Members

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveEvaluator.cs

    r16453 r16462  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2929  [Item("PotvinPDShiftMoveEvaluator", "Evaluates a shift move for a PDP representation. ")]
    30   [StorableClass]
     30  [StorableType("30977D1E-28BA-459A-98EA-D6BEEDB872A4")]
    3131  public sealed class PotvinPDShiftMoveEvaluator : PotvinMoveEvaluator, IPotvinPDShiftMoveOperator {
    3232    public ILookupParameter<PotvinPDShiftMove> PDShiftMoveParameter {
    … …  
    5151
    5252    [StorableConstructor]
    53     private PotvinPDShiftMoveEvaluator(bool deserializing) : base(deserializing) { }
     53    private PotvinPDShiftMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    5454
    5555    public PotvinPDShiftMoveEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveGenerator.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2929  [Item("PotvinPDShiftMoveGenerator", "Generates shift moves from a given PDP encoding.")]
    30   [StorableClass]
     30  [StorableType("355A1C07-FEF7-42C6-8603-54D22D17359F")]
    3131  public abstract class PotvinPDShiftMoveGenerator : PotvinMoveGenerator, IPotvinPDShiftMoveOperator {
    3232    public ILookupParameter<PotvinPDShiftMove> PDShiftMoveParameter {
    … …  
    4343
    4444    [StorableConstructor]
    45     protected PotvinPDShiftMoveGenerator(bool deserializing) : base(deserializing) { }
     45    protected PotvinPDShiftMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4646
    4747    public PotvinPDShiftMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveMaker.cs

    r16453 r16462  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2929using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3232  [Item("PotvinPDShiftMoveMaker", "Peforms the shift move on a given PDP encoding and updates the quality.")]
    33   [StorableClass]
     33  [StorableType("510DE8E9-7634-4DF5-8721-E9797B925A6F")]
    3434  public class PotvinPDShiftMoveMaker : PotvinMoveMaker, IPotvinPDShiftMoveOperator, IMoveMaker {
    3535    public ILookupParameter<PotvinPDShiftMove> PDShiftMoveParameter {
    … …  
    4242
    4343    [StorableConstructor]
    44     protected PotvinPDShiftMoveMaker(bool deserializing) : base(deserializing) { }
     44    protected PotvinPDShiftMoveMaker(StorableConstructorFlag _) : base(_) { }
    4545
    4646    public PotvinPDShiftMoveMaker()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveTabuCriterion.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3030using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3232namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3333  [Item("PotvinPDShiftTabuCriterion", @"Checks if a certain shift move is tabu.")]
    34   [StorableClass]
     34  [StorableType("1A782EF0-0FC4-4C97-BEB7-5A6855785E5A")]
    3535  public class PotvinPDShiftTabuCriterion : SingleSuccessorOperator, IPotvinPDShiftMoveOperator, ITabuChecker, IPotvinOperator, IVRPMoveOperator {
    3636    public override bool CanChangeName {
    … …  
    8383
    8484    [StorableConstructor]
    85     protected PotvinPDShiftTabuCriterion(bool deserializing) : base(deserializing) { }
     85    protected PotvinPDShiftTabuCriterion(StorableConstructorFlag _) : base(_) { }
    8686    protected PotvinPDShiftTabuCriterion(PotvinPDShiftTabuCriterion original, Cloner cloner) : base(original, cloner) { }
    8787    public PotvinPDShiftTabuCriterion()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveTabuMaker.cs

    r16453 r16462  
    2525using HeuristicLab.Optimization.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinPDShiftMoveTabuMaker", "Declares a given shift move as tabu.")]
    32   [StorableClass]
     32  [StorableType("E814E95D-CEC4-4798-87AA-99A429BECFA2")]
    3333  public class PotvinPDShiftMoveTabuMaker : TabuMaker, IPotvinPDShiftMoveOperator, IPotvinOperator, IVRPMoveOperator {
    3434    public ILookupParameter<PotvinPDShiftMove> PDShiftMoveParameter {
    … …  
    5959
    6060    [StorableConstructor]
    61     protected PotvinPDShiftMoveTabuMaker(bool deserializing) : base(deserializing) { }
     61    protected PotvinPDShiftMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    6262    protected PotvinPDShiftMoveTabuMaker(PotvinPDShiftMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
    6363    public PotvinPDShiftMoveTabuMaker()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMultiMoveGenerator.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    3030using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3232namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3333  [Item("PotvinPDShiftMultiMoveGenerator", "Generates shift moves from a given PDP encoding.")]
    34   [StorableClass]
     34  [StorableType("72694EA5-4330-4740-8EDB-C5AC29CEE808")]
    3535  public sealed class PotvinPDShiftMultiMoveGenerator : PotvinPDShiftMoveGenerator, IMultiMoveGenerator, IMultiVRPMoveGenerator {
    3636    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4747
    4848    [StorableConstructor]
    49     private PotvinPDShiftMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     49    private PotvinPDShiftMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5050
    5151    public PotvinPDShiftMultiMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftSingleMoveGenerator.cs

    r16453 r16462  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2929using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3232  [Item("PotvinPDShiftSingleMoveGenerator", "Generates a single shift move from a given PDP encoding.")]
    33   [StorableClass]
     33  [StorableType("32B14D12-CC48-439E-9DDD-780F866B764F")]
    3434  public sealed class PotvinPDShiftSingleMoveGenerator : PotvinPDShiftMoveGenerator,
    3535    ISingleMoveGenerator {
    … …  
    4343
    4444    [StorableConstructor]
    45     private PotvinPDShiftSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     45    private PotvinPDShiftSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4646
    4747    public PotvinPDShiftSingleMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PotvinPDRelocateMoveAttribute.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2828  [Item("PotvinPDRelocateMoveAttribute", "PD relocation move attribute")]
    29   [StorableClass]
     29  [StorableType("F8315360-2078-4117-BB0E-AEBFFD0DB196")]
    3030  public class PotvinPDRelocateMoveAttribute : VRPMoveAttribute {
    3131    [Storable]
    … …  
    4444
    4545    [StorableConstructor]
    46     protected PotvinPDRelocateMoveAttribute(bool deserializing) : base(deserializing) { }
     46    protected PotvinPDRelocateMoveAttribute(StorableConstructorFlag _) : base(_) { }
    4747    protected PotvinPDRelocateMoveAttribute(PotvinPDRelocateMoveAttribute original, Cloner cloner)
    4848      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.