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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.VehicleRouting

  • 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()
Note: See TracChangeset for help on using the changeset viewer.