Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (6 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.VehicleRouting

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaExhaustiveLambdaInterchangeMoveGenerator.cs

    r15583 r16565  
    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.Core;
    2626using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3131  [Item("AlbaExhaustiveLambdaInterchangeMoveGenerator", "Generates all possible lambda interchange moves from a given VRP encoding.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    32   [StorableClass]
     32  [StorableType("2602E521-452B-4554-92E3-BF24666A08B7")]
    3333  public sealed class AlbaExhaustiveLambdaInterchangeMoveGenerator : AlbaLambdaInterchangeMoveGenerator, IExhaustiveMoveGenerator, IAlbaLambdaInterchangeMoveOperator {
    3434    [StorableConstructor]
    35     private AlbaExhaustiveLambdaInterchangeMoveGenerator(bool deserializing) : base(deserializing) { }
     35    private AlbaExhaustiveLambdaInterchangeMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3636
    3737    public AlbaExhaustiveLambdaInterchangeMoveGenerator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaLambdaInterchangeMove.cs

    r15583 r16565  
    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.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.Alba {
    3030  [Item("AlbaLambdaInterchangeMove", "Item that describes a lambda move on a VRP representation.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    31   [StorableClass]
     31  [StorableType("81F387D5-917B-45FB-842A-2DD305B8E313")]
    3232  public class AlbaLambdaInterchangeMove : Item, IVRPMove {
    3333    [Storable]
    … …  
    7979
    8080    [StorableConstructor]
    81     protected AlbaLambdaInterchangeMove(bool deserializing) : base(deserializing) { }
     81    protected AlbaLambdaInterchangeMove(StorableConstructorFlag _) : base(_) { }
    8282
    8383    public override IDeepCloneable Clone(Cloner cloner) {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaLambdaInterchangeMoveEvaluator.cs

    r15583 r16565  
    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.Encodings.Alba;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting {
    2929  [Item("AlbaLambdaInterchangeMoveEvaluator", "Evaluates a lamnbda interchange move for a VRP representation.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    30   [StorableClass]
     30  [StorableType("19F0179C-8D5C-4181-9411-9EBE0B951673")]
    3131  public sealed class AlbaLambdaInterchangeMoveEvaluator : AlbaMoveEvaluator, IAlbaLambdaInterchangeMoveOperator {
    3232    public ILookupParameter<AlbaLambdaInterchangeMove> LambdaInterchangeMoveParameter {
    … …  
    3939
    4040    [StorableConstructor]
    41     private AlbaLambdaInterchangeMoveEvaluator(bool deserializing) : base(deserializing) { }
     41    private AlbaLambdaInterchangeMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4242
    4343    public AlbaLambdaInterchangeMoveEvaluator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaLambdaInterchangeMoveGenerator.cs

    r15583 r16565  
    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;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3131  [Item("AlbaLambdaInterchangeMoveGenerator", "Generates lambda interchange moves from a given VRP encoding.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    32   [StorableClass]
     32  [StorableType("4BE6784E-663A-4B06-9E8A-52502A1967CC")]
    3333  public abstract class AlbaLambdaInterchangeMoveGenerator : AlbaMoveGenerator, IExhaustiveMoveGenerator, IAlbaLambdaInterchangeMoveOperator {
    3434    #region IAlbaLambdaInterchangeMoveOperator Members
    … …  
    5353
    5454    [StorableConstructor]
    55     protected AlbaLambdaInterchangeMoveGenerator(bool deserializing) : base(deserializing) { }
     55    protected AlbaLambdaInterchangeMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5656
    5757    public AlbaLambdaInterchangeMoveGenerator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaLambdaInterchangeMoveMaker.cs

    r15583 r16565  
    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.Optimization;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    2929  [Item("AlbaLambdaInterchangeMoveMaker", "Peforms a lambda interchange moves on a given VRP encoding and updates the quality. It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    30   [StorableClass]
     30  [StorableType("C9622972-70BC-428D-9181-08B8A4D5B076")]
    3131  public class AlbaLambdaInterchangeMoveMaker : AlbaMoveMaker, IAlbaLambdaInterchangeMoveOperator, IMoveMaker {
    3232    public override bool CanChangeName {
    … …  
    4242
    4343    [StorableConstructor]
    44     protected AlbaLambdaInterchangeMoveMaker(bool deserializing) : base(deserializing) { }
     44    protected AlbaLambdaInterchangeMoveMaker(StorableConstructorFlag _) : base(_) { }
    4545
    4646    public AlbaLambdaInterchangeMoveMaker()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaStochasticLambdaInterchangeMutliMoveGenerator.cs

    r15583 r16565  
    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.Encodings.General;
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3232  [Item("AlbaStochasticLambdaInterchangeMultiMoveGenerator", "Generates multiple random lambda interchange moves from a given VRP encoding.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    33   [StorableClass]
     33  [StorableType("30C4BF89-1C6F-4A9D-B179-E04FFAD75A8B")]
    3434  public sealed class AlbaStochasticLambdaInterchangeMultiMoveGenerator : AlbaLambdaInterchangeMoveGenerator, IStochasticOperator,
    3535    IMultiMoveGenerator, IAlbaLambdaInterchangeMoveOperator, IMultiVRPMoveGenerator {
    … …  
    4343
    4444    [StorableConstructor]
    45     private AlbaStochasticLambdaInterchangeMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     45    private AlbaStochasticLambdaInterchangeMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4646
    4747    public AlbaStochasticLambdaInterchangeMultiMoveGenerator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaStochasticLambdaInterchangeSingleMoveGenerator.cs

    r15583 r16565  
    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;
    3030
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3232  [Item("AlbaStochasticLambdaInterchangeSingleMoveGenerator", "Generates one random lambda interchange move from a given VRP encoding.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    33   [StorableClass]
     33  [StorableType("12D7E711-F3D7-47D7-BC57-57113752E269")]
    3434  public sealed class AlbaStochasticLambdaInterchangeSingleMoveGenerator : AlbaLambdaInterchangeMoveGenerator,
    3535    IStochasticOperator, ISingleMoveGenerator, IAlbaLambdaInterchangeMoveOperator {
    … …  
    4747
    4848    [StorableConstructor]
    49     private AlbaStochasticLambdaInterchangeSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     49    private AlbaStochasticLambdaInterchangeSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5050
    5151    public AlbaStochasticLambdaInterchangeSingleMoveGenerator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/IAlbaLambdaInterchangeMoveOperator.cs

    r15583 r16565  
    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.Alba {
     27  [StorableType("81637BC6-8D9E-420D-9591-81A9EAA04E6E")]
    2628  public interface IAlbaLambdaInterchangeMoveOperator : IVRPMoveOperator {
    2729    ILookupParameter<AlbaLambdaInterchangeMove> LambdaInterchangeMoveParameter { get; }
Note: See TracChangeset for help on using the changeset viewer.