Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/14/19 15:47:37 (6 years ago)
Author:
pfleck
Message:

#2707 Merged trunk into branch

Location:
branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/IPotvinPDExchangeMoveOperator.cs

    r14185 r17010  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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.
    … …  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Problems.VehicleRouting.Interfaces;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
     27  [StorableType("D3D40EAC-F695-4069-9A3A-861CE2997E37")]
    2628  public interface IPotvinPDExchangeMoveOperator : IVRPMoveOperator {
    2729    ILookupParameter<PotvinPDExchangeMove> PDExchangeMoveParameter { get; }

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeExhaustiveMoveGenerator.cs

    r14185 r17010  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    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/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMove.cs

    r14185 r17010  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    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/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveEvaluator.cs

    r14185 r17010  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    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/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveGenerator.cs

    r14185 r17010  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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.
    … …  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    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/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveMaker.cs

    r14185 r17010  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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.Optimization;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    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/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveTabuCriterion.cs

    r14185 r17010  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    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/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveTabuMaker.cs

    r14185 r17010  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    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/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMultiMoveGenerator.cs

    r14185 r17010  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    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/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeSingleMoveGenerator.cs

    r14185 r17010  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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.
    … …  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    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()
Note: See TracChangeset for help on using the changeset viewer.