Free cookie consent management tool by TermsFeed Policy Generator

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

#2707 Merged trunk into branch

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

Legend:

Unmodified
Added
Removed

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

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinLocalSearchManipulator.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.Data;
    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("PotvinLocalSearchManipulator", "The LSM operator which manipulates a VRP representation.  It is implemented as described in Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172.")]
    32   [StorableClass]
     32  [StorableType("EF16AD46-5C58-4846-95CF-3C3DF78D2F68")]
    3333  public sealed class PotvinLocalSearchManipulator : PotvinManipulator, IVRPLocalSearchManipulator {
    3434    public IValueParameter<IntValue> Iterations {
    … …  
    3737
    3838    [StorableConstructor]
    39     private PotvinLocalSearchManipulator(bool deserializing) : base(deserializing) { }
     39    private PotvinLocalSearchManipulator(StorableConstructorFlag _) : base(_) { }
    4040
    4141    public PotvinLocalSearchManipulator()

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinManipulator.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.Encodings.General;
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3232  [Item("PotvinManipulator", "A VRP manipulation operation.")]
    33   [StorableClass]
     33  [StorableType("AF20AEB4-28EC-4291-9D27-6C5FF938ADA4")]
    3434  public abstract class PotvinManipulator : VRPManipulator, IStochasticOperator, IPotvinOperator {
    3535    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4242
    4343    [StorableConstructor]
    44     protected PotvinManipulator(bool deserializing) : base(deserializing) { }
     44    protected PotvinManipulator(StorableConstructorFlag _) : base(_) { }
    4545
    4646    public PotvinManipulator() {

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinOneLevelExchangeManipulator.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.Interfaces;
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2828  [Item("PotvinOneLevelExchangeMainpulator", "The 1M operator which manipulates a VRP representation.  It is implemented as described in Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172.")]
    29   [StorableClass]
     29  [StorableType("20E22B90-348D-438F-AD17-F1F92BD12C00")]
    3030  public sealed class PotvinOneLevelExchangeMainpulator : PotvinManipulator {
    3131    [StorableConstructor]
    32     private PotvinOneLevelExchangeMainpulator(bool deserializing) : base(deserializing) { }
     32    private PotvinOneLevelExchangeMainpulator(StorableConstructorFlag _) : base(_) { }
    3333
    3434    public PotvinOneLevelExchangeMainpulator() : base() { }

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinPairwiseOneLevelExchangeManipulator.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.ProblemInstances;
    2626using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    2929namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3030  [Item("PotvinPairwiseOneLevelExchangeMainpulator", "The 1M operator which manipulates a PDP representation. It has been adapted to pickup and delivery from Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172. It was adapted to the PDP formulation.")]
    31   [StorableClass]
     31  [StorableType("BF040F90-535E-4F3D-9420-0123565A252D")]
    3232  public sealed class PotvinPairwiseOneLevelExchangeMainpulator : PotvinManipulator {
    3333    [StorableConstructor]
    34     private PotvinPairwiseOneLevelExchangeMainpulator(bool deserializing) : base(deserializing) { }
     34    private PotvinPairwiseOneLevelExchangeMainpulator(StorableConstructorFlag _) : base(_) { }
    3535
    3636    public PotvinPairwiseOneLevelExchangeMainpulator() : base() { }

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinPairwiseTwoLevelExchangeManipulator.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.Encodings.PermutationEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
    2727using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinPairwiseTwoLevelExchangeManipulator", "The 2M operator which manipulates a VRP representation.   It has been adapted to pickup and delivery from Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172.  It was adapted to the PDP formulation.")]
    32   [StorableClass]
     32  [StorableType("8E4D8A17-1204-45CC-8ED7-375FCE0355E8")]
    3333  public sealed class PotvinPairwiseTwoLevelExchangeManipulator : PotvinManipulator {
    3434    [StorableConstructor]
    35     private PotvinPairwiseTwoLevelExchangeManipulator(bool deserializing) : base(deserializing) { }
     35    private PotvinPairwiseTwoLevelExchangeManipulator(StorableConstructorFlag _) : base(_) { }
    3636
    3737    public PotvinPairwiseTwoLevelExchangeManipulator() : base() { }

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinTwoLevelExchangeManipulator.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.Interfaces;
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2828  [Item("PotvinTwoLevelExchangeManipulator", "The 2M operator which manipulates a VRP representation.  It is implemented as described in Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172.")]
    29   [StorableClass]
     29  [StorableType("FB992182-9FD8-4B08-A48C-97378E85DAD5")]
    3030  public sealed class PotvinTwoLevelExchangeManipulator : PotvinManipulator {
    3131    [StorableConstructor]
    32     private PotvinTwoLevelExchangeManipulator(bool deserializing) : base(deserializing) { }
     32    private PotvinTwoLevelExchangeManipulator(StorableConstructorFlag _) : base(_) { }
    3333
    3434    public PotvinTwoLevelExchangeManipulator() : base() { }

  • branches/2707_HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinVehicleAssignmentManipulator.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.Encodings.PermutationEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3232  [Item("PotvinVehicleAssignmentMainpulator", "A manipulator that changes the vehicle assignment")]
    33   [StorableClass]
     33  [StorableType("57755DA2-B9CB-4A9F-B32C-988BFC06365A")]
    3434  public sealed class PotvinVehicleAssignmentMainpulator : VRPManipulator, ITimeWindowedOperator,
    3535    IMultiDepotOperator, IHeterogenousCapacitatedOperator {
    … …  
    4343
    4444    [StorableConstructor]
    45     private PotvinVehicleAssignmentMainpulator(bool deserializing) : base(deserializing) { }
     45    private PotvinVehicleAssignmentMainpulator(StorableConstructorFlag _) : base(_) { }
    4646
    4747    public PotvinVehicleAssignmentMainpulator()
Note: See TracChangeset for help on using the changeset viewer.