Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/07/19 23:40:10 (5 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.VehicleRouting

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/IPotvinPDShiftMoveOperator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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("404B8A42-4BC0-47B3-AD95-5294229515B3")]
    2628  public interface IPotvinPDShiftMoveOperator : IVRPMoveOperator {
    2729    ILookupParameter<PotvinPDShiftMove> PDShiftMoveParameter { get; }

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftExhaustiveMoveGenerator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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("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()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMove.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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("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

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveEvaluator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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("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()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveGenerator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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("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()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveMaker.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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("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()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveTabuCriterion.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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("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()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveTabuMaker.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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.Operators;
    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("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()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMultiMoveGenerator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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("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()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftSingleMoveGenerator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 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("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()
Note: See TracChangeset for help on using the changeset viewer.