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

Legend:

Unmodified
Added
Removed

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

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/IPotvinVehicleAssignmentMoveOperator.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("9C467DEC-0BA6-47B8-8805-3A4494BD0561")]
    2628  public interface IPotvinVehicleAssignmentMoveOperator : IVRPMoveOperator {
    2729    ILookupParameter<PotvinVehicleAssignmentMove> VehicleAssignmentMoveParameter { get; }

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentExhaustiveMoveGenerator.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;
    2828
    2929namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3030  [Item("PotvinVehicleAssignmentExhaustiveMoveGenerator", "Generates vehicle assignment moves from a given VRP encoding.")]
    31   [StorableClass]
     31  [StorableType("F1CAD2AC-DBC9-463A-AAE7-2413F6CB96AF")]
    3232  public sealed class PotvinVehicleAssignmentExhaustiveMoveGenerator : PotvinVehicleAssignmentMoveGenerator, IExhaustiveMoveGenerator {
    3333    public override IDeepCloneable Clone(Cloner cloner) {
    … …  
    3636
    3737    [StorableConstructor]
    38     private PotvinVehicleAssignmentExhaustiveMoveGenerator(bool deserializing) : base(deserializing) { }
     38    private PotvinVehicleAssignmentExhaustiveMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3939
    4040    public PotvinVehicleAssignmentExhaustiveMoveGenerator()

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMove.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.Optimization;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2727using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    2929namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3030  [Item("PotvinVehicleAssignmentMove", "Item that describes a relocation move on a VRP representation.")]
    31   [StorableClass]
     31  [StorableType("6807BEDA-4718-4AB8-B615-FD4938196DB4")]
    3232  public class PotvinVehicleAssignmentMove : Item, IVRPMove {
    3333    [Storable]
    … …  
    6969
    7070    [StorableConstructor]
    71     protected PotvinVehicleAssignmentMove(bool deserializing) : base(deserializing) { }
     71    protected PotvinVehicleAssignmentMove(StorableConstructorFlag _) : base(_) { }
    7272
    7373    #region IVRPMove Members

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMoveAttribute.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.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2828  [Item("PotvinVehicleAssignmentMoveAttribute", "vehicle assignment move attribute")]
    29   [StorableClass]
     29  [StorableType("7E494584-0CE3-4138-BF4C-1C20D2EEE852")]
    3030  public class PotvinVehicleAssignmentMoveAttribute : VRPMoveAttribute {
    3131    [Storable]
    … …  
    4242
    4343    [StorableConstructor]
    44     protected PotvinVehicleAssignmentMoveAttribute(bool deserializing) : base(deserializing) { }
     44    protected PotvinVehicleAssignmentMoveAttribute(StorableConstructorFlag _) : base(_) { }
    4545    protected PotvinVehicleAssignmentMoveAttribute(PotvinVehicleAssignmentMoveAttribute original, Cloner cloner)
    4646      : base(original, cloner) {

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMoveEvaluator.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;
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2828  [Item("PotvinVehicleAssignmentMoveEvaluator", "Evaluates a vehicle assignment move for a VRP representation. ")]
    29   [StorableClass]
     29  [StorableType("41525962-0E71-4DE5-9FC9-6E8FD0C6BE61")]
    3030  public sealed class PotvinVehicleAssignmentMoveEvaluator : PotvinMoveEvaluator, IPotvinVehicleAssignmentMoveOperator {
    3131    public ILookupParameter<PotvinVehicleAssignmentMove> VehicleAssignmentMoveParameter {
    … …  
    3838
    3939    [StorableConstructor]
    40     private PotvinVehicleAssignmentMoveEvaluator(bool deserializing) : base(deserializing) { }
     40    private PotvinVehicleAssignmentMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4141
    4242    public PotvinVehicleAssignmentMoveEvaluator()

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMoveGenerator.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("PotvinVehicleAssignmentMoveGenerator", "Generates vehicle assignment moves from a given VRP encoding.")]
    30   [StorableClass]
     30  [StorableType("036C7D2D-50BA-415A-B5C0-8A643746F469")]
    3131  public abstract class PotvinVehicleAssignmentMoveGenerator : PotvinMoveGenerator, IPotvinVehicleAssignmentMoveOperator {
    3232    public ILookupParameter<PotvinVehicleAssignmentMove> VehicleAssignmentMoveParameter {
    … …  
    4343
    4444    [StorableConstructor]
    45     protected PotvinVehicleAssignmentMoveGenerator(bool deserializing) : base(deserializing) { }
     45    protected PotvinVehicleAssignmentMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4646
    4747    public PotvinVehicleAssignmentMoveGenerator()

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMoveMaker.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;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinVehicleAssignmentMoveMaker", "Peforms the vehicle assignment move on a given VRP encoding and updates the quality.")]
    32   [StorableClass]
     32  [StorableType("3D2B1F7F-DCF7-4223-8A91-19A44B6B9EF6")]
    3333  public class PotvinVehicleAssignmentMoveMaker : PotvinMoveMaker, IPotvinVehicleAssignmentMoveOperator, IMoveMaker {
    3434    public ILookupParameter<PotvinVehicleAssignmentMove> VehicleAssignmentMoveParameter {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected PotvinVehicleAssignmentMoveMaker(bool deserializing) : base(deserializing) { }
     51    protected PotvinVehicleAssignmentMoveMaker(StorableConstructorFlag _) : base(_) { }
    5252
    5353    public PotvinVehicleAssignmentMoveMaker()

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMoveTabuCriterion.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("PotvinVehicleAssignmentMoveTabuCriterion", @"Checks if a certain vehicle assignment move is tabu.")]
    34   [StorableClass]
     34  [StorableType("F1D25F3C-DE98-4C8B-B70B-9BDEF9EB4D1E")]
    3535  public class PotvinVehicleAssignmentMoveTabuCriterion : SingleSuccessorOperator, IPotvinVehicleAssignmentMoveOperator, ITabuChecker, IPotvinOperator, IVRPMoveOperator {
    3636    public override bool CanChangeName {
    … …  
    8383
    8484    [StorableConstructor]
    85     protected PotvinVehicleAssignmentMoveTabuCriterion(bool deserializing) : base(deserializing) { }
     85    protected PotvinVehicleAssignmentMoveTabuCriterion(StorableConstructorFlag _) : base(_) { }
    8686    protected PotvinVehicleAssignmentMoveTabuCriterion(PotvinVehicleAssignmentMoveTabuCriterion original, Cloner cloner) : base(original, cloner) { }
    8787    public PotvinVehicleAssignmentMoveTabuCriterion()

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMoveTabuMaker.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("PotvinVehicleAssignmentMoveTabuMaker", "Declares a given vehicle assignment move as tabu.")]
    33   [StorableClass]
     33  [StorableType("7E620554-BA0A-49E1-ACD4-4BF4966F6EE5")]
    3434  public class PotvinVehicleAssignmentMoveTabuMaker : SingleSuccessorOperator, ITabuMaker, IPotvinVehicleAssignmentMoveOperator, IPotvinOperator, ISingleObjectiveOperator {
    3535    public LookupParameter<ItemList<IItem>> TabuListParameter {
    … …  
    7474
    7575    [StorableConstructor]
    76     protected PotvinVehicleAssignmentMoveTabuMaker(bool deserializing) : base(deserializing) { }
     76    protected PotvinVehicleAssignmentMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    7777    protected PotvinVehicleAssignmentMoveTabuMaker(PotvinVehicleAssignmentMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
    7878    public PotvinVehicleAssignmentMoveTabuMaker()

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMultiMoveGenerator.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("PotvinVehicleAssignmentMultiMoveGenerator", "Generates vehicle assignment moves from a given VRP encoding.")]
    34   [StorableClass]
     34  [StorableType("C2CB1C17-5B79-4A40-9CA2-5F2D478B84A8")]
    3535  public sealed class PotvinVehicleAssignmentMultiMoveGenerator : PotvinVehicleAssignmentMoveGenerator, IMultiMoveGenerator, IMultiVRPMoveGenerator {
    3636    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4747
    4848    [StorableConstructor]
    49     private PotvinVehicleAssignmentMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     49    private PotvinVehicleAssignmentMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5050
    5151    public PotvinVehicleAssignmentMultiMoveGenerator()

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentSingleMoveGenerator.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;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinVehicleAssignmentSingleMoveGenerator", "Generates a single vehicle assignment move from a given VRP encoding.")]
    32   [StorableClass]
     32  [StorableType("437E0361-CEEE-41E4-BD20-BA40D6BB8DA4")]
    3333  public sealed class PotvinVehicleAssignmentSingleMoveGenerator : PotvinVehicleAssignmentMoveGenerator,
    3434    ISingleMoveGenerator {
    … …  
    5050
    5151    [StorableConstructor]
    52     private PotvinVehicleAssignmentSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     52    private PotvinVehicleAssignmentSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5353
    5454    public PotvinVehicleAssignmentSingleMoveGenerator()
Note: See TracChangeset for help on using the changeset viewer.