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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.VehicleRouting

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncoding.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.Data;
    2626using HeuristicLab.Encodings.PermutationEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3131  [Item("AlbaEncoding", "Represents an Alba encoding of VRP solutions. 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("8BB9735D-8371-46C1-B843-A6864B2ACDA5")]
    3333  public class AlbaEncoding : General.PermutationEncoding {
    3434    #region IVRPEncoding Members
    … …  
    106106
    107107    [StorableConstructor]
    108     protected AlbaEncoding(bool serializing)
    109       : base(serializing) {
     108    protected AlbaEncoding(StorableConstructorFlag _) : base(_) {
    110109    }
    111110

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Creators/AlbaCreator.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.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2626using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    2929  [Item("AlbaCreator", "A VRP creator.")]
    30   [StorableClass]
     30  [StorableType("95DC1B24-02C9-4AF0-8A00-21A47AFB9E39")]
    3131  public abstract class AlbaCreator : VRPCreator, IAlbaOperator, IVRPCreator {
    3232    public override bool CanChangeName {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected AlbaCreator(bool deserializing) : base(deserializing) { }
     37    protected AlbaCreator(StorableConstructorFlag _) : base(_) { }
    3838
    3939    public AlbaCreator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Creators/RandomCreator.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;
    2828
    2929namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3030  [Item("RandomCreator", "Creates a randomly initialized VRP solution.")]
    31   [StorableClass]
     31  [StorableType("3B0B288F-71C6-438B-96DF-C21243E7E66D")]
    3232  public sealed class RandomCreator : AlbaCreator, IStochasticOperator {
    3333    #region IStochasticOperator Members
    … …  
    3838
    3939    [StorableConstructor]
    40     private RandomCreator(bool deserializing) : base(deserializing) { }
     40    private RandomCreator(StorableConstructorFlag _) : base(_) { }
    4141
    4242    public RandomCreator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Crossovers/AlbaCrossover.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;
    2727using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3131  [Item("AlbaCrossover", "An operator which crosses two VRP representations.")]
    32   [StorableClass]
     32  [StorableType("64C6C851-64D6-42B7-B077-627F3E5791F4")]
    3333  public abstract class AlbaCrossover : VRPCrossover, IAlbaOperator, IVRPCrossover, IStochasticOperator {
    3434    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected AlbaCrossover(bool deserializing)
    40       : base(deserializing) {
     39    protected AlbaCrossover(StorableConstructorFlag _) : base(_) {
    4140    }
    4241

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Crossovers/AlbaPermutationCrossover.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.Encodings.PermutationEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    2929  [Item("AlbaPermutationCrossover", "An operator which crosses two VRP representations using a standard permutation operator.  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("E97C3448-E2DD-4BD6-B15B-F8AFF77FF03F")]
    3131  public sealed class AlbaPermutationCrossover : AlbaCrossover {
    3232    public IValueLookupParameter<IPermutationCrossover> InnerCrossoverParameter {
    … …  
    3535
    3636    [StorableConstructor]
    37     private AlbaPermutationCrossover(bool deserializing) : base(deserializing) { }
     37    private AlbaPermutationCrossover(StorableConstructorFlag _) : base(_) { }
    3838
    3939    public AlbaPermutationCrossover()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/IAlbaOperator.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.
    … …  
    2121
    2222using HeuristicLab.Problems.VehicleRouting.Variants;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
     26  [StorableType("E4EADC47-5FEC-429D-B713-795171F8C85B")]
    2527  public interface IAlbaOperator :
    2628    ISingleDepotOperator, IHeterogenousCapacitatedOperator, IMultiDepotOperator, ITimeWindowedOperator {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/LocalImprovement/AlbaLambdaInterchangeLocalImprovementOperator.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.
    … …  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2622using HeuristicLab.Optimization;
    2723using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2925using HeuristicLab.Data;
    3026using HeuristicLab.Common;
    3127using HeuristicLab.Parameters;
    32 using HeuristicLab.Operators;
    3328using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3429
    3530namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3631  [Item("AlbaLambdaInterchangeLocalImprovementOperator", "Takes a solution and finds the local optimum with respect to the lambda interchange neighborhood by decending along the steepest gradient.")]
    37   [StorableClass]
     32  [StorableType("84981F03-B886-4ADD-8DB5-C12628404335")]
    3833  public class AlbaLambdaInterchangeLocalImprovementOperator : VRPOperator, IStochasticOperator, ILocalImprovementOperator, ISingleObjectiveOperator {
    3934
    … …  
    7166
    7267    [StorableConstructor]
    73     protected AlbaLambdaInterchangeLocalImprovementOperator(bool deserializing) : base(deserializing) { }
     68    protected AlbaLambdaInterchangeLocalImprovementOperator(StorableConstructorFlag _) : base(_) { }
    7469    protected AlbaLambdaInterchangeLocalImprovementOperator(AlbaLambdaInterchangeLocalImprovementOperator original, Cloner cloner)
    7570      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaCustomerInsertionManipulator.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.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    2727  [Item("AlbaCustomerInsertionManipulator", "An operator which manipulates a VRP representation by inserting a customer in another place.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    28   [StorableClass]
     28  [StorableType("285F8CFD-4427-4A5C-920E-EBD33533FD80")]
    2929  public sealed class AlbaCustomerInsertionManipulator : AlbaManipulator {
    3030    [StorableConstructor]
    31     private AlbaCustomerInsertionManipulator(bool deserializing) : base(deserializing) { }
     31    private AlbaCustomerInsertionManipulator(StorableConstructorFlag _) : base(_) { }
    3232
    3333    public AlbaCustomerInsertionManipulator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaCustomerInversionManipulator.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.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    2828  [Item("AlbaCustomerInversionManipulator", "An operator which manipulates a VRP representation by inverting the order the customers are visited.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    29   [StorableClass]
     29  [StorableType("CDAD0FC4-B858-4FDA-B136-6D093A10ACED")]
    3030  public sealed class AlbaCustomerInversionManipulator : AlbaManipulator {
    3131    [StorableConstructor]
    32     private AlbaCustomerInversionManipulator(bool deserializing) : base(deserializing) { }
     32    private AlbaCustomerInversionManipulator(StorableConstructorFlag _) : base(_) { }
    3333
    3434    public AlbaCustomerInversionManipulator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaCustomerSwapManipulator.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.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    2727  [Item("AlbaCustomerSwapManipulator", "An operator which manipulates a VRP representation by swapping two customers.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    28   [StorableClass]
     28  [StorableType("9040B9C9-B7BB-4EC9-8049-4A488F8A6976")]
    2929  public sealed class AlbaCustomerSwapManipulator : AlbaManipulator {
    3030    [StorableConstructor]
    31     private AlbaCustomerSwapManipulator(bool deserializing) : base(deserializing) { }
     31    private AlbaCustomerSwapManipulator(StorableConstructorFlag _) : base(_) { }
    3232
    3333    public AlbaCustomerSwapManipulator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaIntraRouteInversionManipulator.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.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    2828  [Item("AlbaIntraRouteInversionManipulator", "An operator which applies the SLS operation to 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.")]
    29   [StorableClass]
     29  [StorableType("B64561D5-BFB8-47CB-A9D9-3F17A9510B45")]
    3030  public sealed class AlbaIntraRouteInversionManipulator : AlbaManipulator {
    3131    [StorableConstructor]
    32     private AlbaIntraRouteInversionManipulator(bool deserializing) : base(deserializing) { }
     32    private AlbaIntraRouteInversionManipulator(StorableConstructorFlag _) : base(_) { }
    3333
    3434    public AlbaIntraRouteInversionManipulator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaLambdaInterchangeManipulator.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.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3131  [Item("AlbaLambdaInterchangeManipulator", "An operator which applies the lambda interchange operation to 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.")]
    32   [StorableClass]
     32  [StorableType("7196378A-17BB-474E-ACCD-900683FD4030")]
    3333  public sealed class AlbaLambdaInterchangeManipulator : AlbaManipulator {
    3434    public IValueParameter<IntValue> LambdaParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     private AlbaLambdaInterchangeManipulator(bool deserializing) : base(deserializing) { }
     39    private AlbaLambdaInterchangeManipulator(StorableConstructorFlag _) : base(_) { }
    4040
    4141    public AlbaLambdaInterchangeManipulator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaManipulator.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;
    2727using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3131  [Item("AlbaManipulator", "An operator which manipulates a VRP representation.")]
    32   [StorableClass]
     32  [StorableType("D482A064-C423-4B72-BFFA-95C3A86356E8")]
    3333  public abstract class AlbaManipulator : VRPManipulator, IAlbaOperator, IVRPManipulator, IStochasticOperator {
    3434    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected AlbaManipulator(bool deserializing) : base(deserializing) { }
     39    protected AlbaManipulator(StorableConstructorFlag _) : base(_) { }
    4040
    4141    public AlbaManipulator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaPermutationManipulator.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.Encodings.PermutationEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    2929  [Item("AlbaPermutationManipulator", "An operator which manipulates a VRP representation by using a standard permutation manipulator.  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("EC65F07B-F693-4FEE-A595-39B02D633560")]
    3131  public sealed class AlbaPermutationManipualtor : AlbaManipulator {
    3232    public IValueLookupParameter<IPermutationManipulator> InnerManipulatorParameter {
    … …  
    3535
    3636    [StorableConstructor]
    37     private AlbaPermutationManipualtor(bool deserializing) : base(deserializing) { }
     37    private AlbaPermutationManipualtor(StorableConstructorFlag _) : base(_) { }
    3838
    3939    public AlbaPermutationManipualtor()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/AlbaMoveEvaluator.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.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.Alba {
    2828  [Item("AlbaMoveEvaluator", "Evaluates an Alba VRP move.")]
    29   [StorableClass]
     29  [StorableType("7658EE50-9E2E-4742-AE23-DC3C4609A807")]
    3030  public abstract class AlbaMoveEvaluator : VRPMoveEvaluator, IAlbaOperator {
    3131    [StorableConstructor]
    32     protected AlbaMoveEvaluator(bool deserializing) : base(deserializing) { }
     32    protected AlbaMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    3333
    3434    public AlbaMoveEvaluator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/AlbaMoveGenerator.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.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2626using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    2929  [Item("AlbaMoveGenerator", "Generates Alba VRP moves.")]
    30   [StorableClass]
     30  [StorableType("97A1A0D2-BC7F-4F68-A9FD-2CC29F487AF2")]
    3131  public abstract class AlbaMoveGenerator : VRPMoveGenerator, IAlbaOperator {
    3232    [StorableConstructor]
    33     protected AlbaMoveGenerator(bool deserializing) : base(deserializing) { }
     33    protected AlbaMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3434
    3535    public AlbaMoveGenerator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/AlbaMoveMaker.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.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.Alba {
    2828  [Item("AlbaMoveMaker", "Makes an Alba VRP move.")]
    29   [StorableClass]
     29  [StorableType("312C6293-55DB-4FA1-9CFF-1BEFEA770B47")]
    3030  public abstract class AlbaMoveMaker : VRPMoveMaker, IAlbaOperator {
    3131    [StorableConstructor]
    32     protected AlbaMoveMaker(bool deserializing) : base(deserializing) { }
     32    protected AlbaMoveMaker(StorableConstructorFlag _) : base(_) { }
    3333
    3434    public AlbaMoveMaker()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaExhaustiveIntraRouteInversionMoveGenerator.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.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.Alba {
    3030  [Item("AlbaExhaustiveIntraRouteInversionGenerator", "Generates all possible intra route inversion 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.")]
    31   [StorableClass]
     31  [StorableType("11670474-FE25-4641-8711-B68B645D15C1")]
    3232  public sealed class AlbaExhaustiveIntraRouteInversionGenerator : AlbaIntraRouteInversionMoveGenerator, IExhaustiveMoveGenerator, IAlbaIntraRouteInversionMoveOperator {
    3333    [StorableConstructor]
    34     private AlbaExhaustiveIntraRouteInversionGenerator(bool deserializing) : base(deserializing) { }
     34    private AlbaExhaustiveIntraRouteInversionGenerator(StorableConstructorFlag _) : base(_) { }
    3535
    3636    public AlbaExhaustiveIntraRouteInversionGenerator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionEvaluator.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("AlbaIntraRouteInversionMoveEvaluator", "Evaluates a intra route inversion 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("39ABD8F7-0745-4037-BA99-830DBE9ACA4E")]
    3131  public sealed class AlbaIntraRouteInversionMoveEvaluator : AlbaMoveEvaluator, IAlbaIntraRouteInversionMoveOperator {
    3232    public ILookupParameter<AlbaIntraRouteInversionMove> IntraRouteInversionMoveParameter {
    … …  
    3939
    4040    [StorableConstructor]
    41     private AlbaIntraRouteInversionMoveEvaluator(bool deserializing) : base(deserializing) { }
     41    private AlbaIntraRouteInversionMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4242
    4343    public AlbaIntraRouteInversionMoveEvaluator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionMove.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.Encodings.PermutationEncoding;
    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.Alba {
    3131  [Item("AlbaIntraRouteInversionMove", "Item that describes an intra route inversion 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.")]
    32   [StorableClass]
     32  [StorableType("F0A32074-2D3F-4236-A732-8C095FA5F64E")]
    3333  public class AlbaIntraRouteInversionMove : TwoIndexMove, IVRPMove {
    3434    public IVRPEncoding Individual { get { return Permutation as AlbaEncoding; } }
    3535
    3636    [StorableConstructor]
    37     protected AlbaIntraRouteInversionMove(bool deserializing) : base(deserializing) { }
     37    protected AlbaIntraRouteInversionMove(StorableConstructorFlag _) : base(_) { }
    3838
    3939    protected AlbaIntraRouteInversionMove(AlbaIntraRouteInversionMove original, Cloner cloner)

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionMoveGenerator.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;
    2727using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2828
    2929namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3030  [Item("AlbaIntraRouteInversionMoveGenerator", "Generates intra route inversion 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.")]
    31   [StorableClass]
     31  [StorableType("F2D66918-2307-4D0F-A7ED-2E429DA1B6F5")]
    3232  public abstract class AlbaIntraRouteInversionMoveGenerator : AlbaMoveGenerator, IExhaustiveMoveGenerator, IAlbaIntraRouteInversionMoveOperator {
    3333    public ILookupParameter<AlbaIntraRouteInversionMove> IntraRouteInversionMoveParameter {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected AlbaIntraRouteInversionMoveGenerator(bool deserializing) : base(deserializing) { }
     46    protected AlbaIntraRouteInversionMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4747
    4848    public AlbaIntraRouteInversionMoveGenerator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionMoveMaker.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("AlbaIntraRouteInversionMoveMaker", "Peforms the SLS move 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("B2A4AD5F-E09B-4F2F-BAE4-8E80F84DAA67")]
    3131  public class AlbaIntraRouteInversionMoveMaker : AlbaMoveMaker, IAlbaIntraRouteInversionMoveOperator, IMoveMaker {
    3232    public ILookupParameter<AlbaIntraRouteInversionMove> IntraRouteInversionMoveParameter {
    … …  
    3939
    4040    [StorableConstructor]
    41     protected AlbaIntraRouteInversionMoveMaker(bool deserializing) : base(deserializing) { }
     41    protected AlbaIntraRouteInversionMoveMaker(StorableConstructorFlag _) : base(_) { }
    4242
    4343    public AlbaIntraRouteInversionMoveMaker()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaStochasticIntraRouteInversionMutliMoveGenerator.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("AlbaStochasticIntraRouteInversionMultiMoveGenerator", "Generates multiple random intra route inversion 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("16DCDE21-1817-467B-B3E2-06BEF35541BD")]
    3434  public sealed class AlbaStochasticIntraRouteInversionMultiMoveGenerator : AlbaIntraRouteInversionMoveGenerator, IStochasticOperator,
    3535    IMultiMoveGenerator, IAlbaIntraRouteInversionMoveOperator, IMultiVRPMoveGenerator {
    … …  
    4343
    4444    [StorableConstructor]
    45     private AlbaStochasticIntraRouteInversionMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     45    private AlbaStochasticIntraRouteInversionMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4646
    4747    public AlbaStochasticIntraRouteInversionMultiMoveGenerator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaStochasticIntraRouteInversionSingleMoveGenerator.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("AlbaStochasticIntraRouteInversionSingleMoveGenerator", "Generates one random intra route inversion 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.")]
    32   [StorableClass]
     32  [StorableType("53458AC0-F674-4A75-9737-63052F17B54F")]
    3333  public sealed class AlbaStochasticIntraRouteInversionSingleMoveGenerator : AlbaIntraRouteInversionMoveGenerator,
    3434    IStochasticOperator, ISingleMoveGenerator, IAlbaIntraRouteInversionMoveOperator {
    … …  
    4646
    4747    [StorableConstructor]
    48     private AlbaStochasticIntraRouteInversionSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     48    private AlbaStochasticIntraRouteInversionSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4949
    5050    public AlbaStochasticIntraRouteInversionSingleMoveGenerator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/IAlbaIntraRouteInversionMoveOperator.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("70080696-44A4-41C0-9FFF-B84C35303AEB")]
    2628  public interface IAlbaIntraRouteInversionMoveOperator : IVRPMoveOperator {
    2729    ILookupParameter<AlbaIntraRouteInversionMove> IntraRouteInversionMoveParameter { get; }

  • 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; }

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaStochasticTranslocationSingleMoveGenerator.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.Data;
    2525using HeuristicLab.Encodings.PermutationEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2828
    2929namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3030  [Item("AlbaStochasticTranslocationSingleMoveGenerator", "An operator which generates a single translocation 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.")]
    31   [StorableClass]
     31  [StorableType("AB2D93A5-BECF-4ABE-B704-5DA883426CAF")]
    3232  public sealed class AlbaStochasticTranslocationSingleMoveGenerator : AlbaMoveGenerator, IAlbaTranslocationMoveOperator {
    3333    [Storable]
    … …  
    5555
    5656    [StorableConstructor]
    57     private AlbaStochasticTranslocationSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     57    private AlbaStochasticTranslocationSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5858
    5959    public AlbaStochasticTranslocationSingleMoveGenerator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMove.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.Encodings.PermutationEncoding;
    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.Alba {
    3131  [Item("AlbaTranslocationMove", "Item that describes a translocation 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.")]
    32   [StorableClass]
     32  [StorableType("C9BA8BFE-712F-4575-82E6-B94C604C001B")]
    3333  public class AlbaTranslocationMove : TranslocationMove, IVRPMove {
    3434    public IVRPEncoding Individual { get { return Permutation as AlbaEncoding; } }
    … …  
    4343
    4444    [StorableConstructor]
    45     protected AlbaTranslocationMove(bool deserializing) : base(deserializing) { }
     45    protected AlbaTranslocationMove(StorableConstructorFlag _) : base(_) { }
    4646
    4747    public override IDeepCloneable Clone(Cloner cloner) {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveEvaluator.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.Encodings.PermutationEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HeuristicLab.Problems.VehicleRouting.Encodings.Alba;
    2828
    2929namespace HeuristicLab.Problems.VehicleRouting {
    3030  [Item("AlbaTranslocationMoveEvaluator", "Evaluates a translocation or insertion move (3-opt) 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.")]
    31   [StorableClass]
     31  [StorableType("36E23651-0091-4CE9-869F-BACA65464D72")]
    3232  public sealed class AlbaTranslocationMoveEvaluator : AlbaMoveEvaluator, IAlbaTranslocationMoveOperator {
    3333    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
    … …  
    4141
    4242    [StorableConstructor]
    43     private AlbaTranslocationMoveEvaluator(bool deserializing) : base(deserializing) { }
     43    private AlbaTranslocationMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4444
    4545    public AlbaTranslocationMoveEvaluator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveGenerator.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("AlbaTranslocationMoveGenerator", "An operator which generates translocation moves 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.")]
    33   [StorableClass]
     33  [StorableType("695BBC5B-7A11-4AE5-83E6-9EEA9979E791")]
    3434  public sealed class AlbaTranslocationMoveGenerator : AlbaMoveGenerator, IAlbaTranslocationMoveOperator, IMultiMoveGenerator {
    3535    public IValueLookupParameter<TranslocationMoveGenerator> TranslocationMoveGeneratorParameter {
    … …  
    7474
    7575    [StorableConstructor]
    76     private AlbaTranslocationMoveGenerator(bool deserializing) : base(deserializing) { }
     76    private AlbaTranslocationMoveGenerator(StorableConstructorFlag _) : base(_) { }
    7777
    7878    public AlbaTranslocationMoveGenerator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveHardTabuCriterion.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.Encodings.PermutationEncoding;
    2626using HeuristicLab.Optimization;
    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("AlbaTranslocationMoveHardTabuCriterion", "An operator which checks if translocation moves are tabu using a hard criterion 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.")]
    33   [StorableClass]
     33  [StorableType("1148F3AA-FDE0-4604-8517-777E87F1CEA0")]
    3434  public sealed class AlbaTranslocationMoveHardTabuCriterion : VRPMoveOperator, IAlbaTranslocationMoveOperator, ITabuChecker, IAlbaOperator {
    3535    [Storable]
    … …  
    6565
    6666    [StorableConstructor]
    67     private AlbaTranslocationMoveHardTabuCriterion(bool deserializing) : base(deserializing) { }
     67    private AlbaTranslocationMoveHardTabuCriterion(StorableConstructorFlag _) : base(_) { }
    6868
    6969    public AlbaTranslocationMoveHardTabuCriterion()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveMaker.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.Encodings.PermutationEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    2828  [Item("AlbaTranslocationMoveMaker", "An operator which makes translocation moves 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.")]
    29   [StorableClass]
     29  [StorableType("3E2624B9-AC8D-4E18-9586-04E501769D3E")]
    3030  public sealed class AlbaTranslocationMoveMaker : AlbaMoveMaker, IAlbaTranslocationMoveOperator {
    3131    [Storable]
    … …  
    4545
    4646    [StorableConstructor]
    47     private AlbaTranslocationMoveMaker(bool deserializing) : base(deserializing) { }
     47    private AlbaTranslocationMoveMaker(StorableConstructorFlag _) : base(_) { }
    4848
    4949    public AlbaTranslocationMoveMaker()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveSoftTabuCriterion.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.Encodings.PermutationEncoding;
    2626using HeuristicLab.Optimization;
    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("AlbaTranslocationMoveSoftTabuCriterion", "An operator which checks if translocation moves are tabu using a soft criterion 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.")]
    33   [StorableClass]
     33  [StorableType("E1E314E4-11E8-40F8-BC26-A49D42810E79")]
    3434  public sealed class AlbaTranslocationMoveSoftTabuCriterion : VRPMoveOperator, IAlbaTranslocationMoveOperator, ITabuChecker, IAlbaOperator {
    3535    [Storable]
    … …  
    6565
    6666    [StorableConstructor]
    67     private AlbaTranslocationMoveSoftTabuCriterion(bool deserializing) : base(deserializing) { }
     67    private AlbaTranslocationMoveSoftTabuCriterion(StorableConstructorFlag _) : base(_) { }
    6868
    6969    public AlbaTranslocationMoveSoftTabuCriterion()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveTabuMaker.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.Encodings.PermutationEncoding;
    2626using HeuristicLab.Optimization;
    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("AlbaTranslocationMoveTabuMaker", "An operator which makes translocation moves tabu 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.")]
    33   [StorableClass]
     33  [StorableType("7C706677-1688-4D5F-8C86-D2F479CADA40")]
    3434  public sealed class AlbaTranslocationMoveTabuMaker : VRPMoveOperator, IAlbaTranslocationMoveOperator, ITabuMaker, IAlbaOperator {
    3535    [Storable]
    … …  
    6565
    6666    [StorableConstructor]
    67     private AlbaTranslocationMoveTabuMaker(bool deserializing) : base(deserializing) { }
     67    private AlbaTranslocationMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    6868
    6969    public AlbaTranslocationMoveTabuMaker()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/IAlbaTranslocationMoveOperator.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.Encodings.PermutationEncoding;
    2424using HeuristicLab.Problems.VehicleRouting.Interfaces;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
     28  [StorableType("781B6DDB-B55A-42C2-84E1-090E6F654089")]
    2729  public interface IAlbaTranslocationMoveOperator : IVRPMoveOperator {
    2830    ILookupParameter<TranslocationMove> TranslocationMoveParameter { get; }
Note: See TracChangeset for help on using the changeset viewer.