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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.VehicleRouting

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRDisplacementManipulator.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.GVR {
    2828  [Item("GVRDisplacementManipulator", "An operator which manipulates a GVR representation by applying a displacement operation. It is implemented as described in Pereira, F.B. et al (2002). GVR: a New Genetic Representation for the Vehicle Routing Problem. AICS 2002, LNAI 2464, pp. 95-102.")]
    29   [StorableClass]
     29  [StorableType("9772264B-5A1B-4BCE-A796-70A6EF9B834F")]
    3030  public sealed class GVRDisplacementManipulator : GVRManipulator {
    3131    [StorableConstructor]
    32     private GVRDisplacementManipulator(bool deserializing) : base(deserializing) { }
     32    private GVRDisplacementManipulator(StorableConstructorFlag _) : base(_) { }
    3333
    3434    public GVRDisplacementManipulator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRInsertionManipulator.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.GVR {
    2727  [Item("GVRInsertionManipulator", "An operator which manipulates a GVR representation by inserting a customer at another location. It is implemented as described in Pereira, F.B. et al (2002). GVR: a New Genetic Representation for the Vehicle Routing Problem. AICS 2002, LNAI 2464, pp. 95-102.")]
    28   [StorableClass]
     28  [StorableType("2DDACE2B-562A-40A5-86A4-B0BE34993869")]
    2929  public sealed class GVRInsertionManipulator : GVRManipulator {
    3030    [StorableConstructor]
    31     private GVRInsertionManipulator(bool deserializing) : base(deserializing) { }
     31    private GVRInsertionManipulator(StorableConstructorFlag _) : base(_) { }
    3232
    3333    public GVRInsertionManipulator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRInversionManipulator.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.GVR {
    2727  [Item("GVRInversionManipulator", "An operator which manipulates a GVR representation by inverting a subroute. It is implemented as described in Pereira, F.B. et al (2002). GVR: a New Genetic Representation for the Vehicle Routing Problem. AICS 2002, LNAI 2464, pp. 95-102.")]
    28   [StorableClass]
     28  [StorableType("E65CA70B-D4A8-41FE-8F24-9BCD12CC7FA7")]
    2929  public sealed class GVRInversionManipulator : GVRManipulator {
    3030    [StorableConstructor]
    31     private GVRInversionManipulator(bool deserializing) : base(deserializing) { }
     31    private GVRInversionManipulator(StorableConstructorFlag _) : base(_) { }
    3232
    3333    public GVRInversionManipulator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRManipulator.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.GVR {
    3131  [Item("GVRManipulator", "A VRP manipulation operation.")]
    32   [StorableClass]
     32  [StorableType("D3459367-9919-4FB9-8E63-B7554154575C")]
    3333  public abstract class GVRManipulator : VRPManipulator, IStochasticOperator, IGVROperator {
    3434    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected GVRManipulator(bool deserializing) : base(deserializing) { }
     39    protected GVRManipulator(StorableConstructorFlag _) : base(_) { }
    4040
    4141    public GVRManipulator() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRSwapManipulator.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.GVR {
    2727  [Item("GVRSwapManipulator", "An operator which manipulates a GVR representation by swapping two customers. It is implemented as described in Pereira, F.B. et al (2002). GVR: a New Genetic Representation for the Vehicle Routing Problem. AICS 2002, LNAI 2464, pp. 95-102.")]
    28   [StorableClass]
     28  [StorableType("3EEC2566-633D-4338-853D-AE9930E9F238")]
    2929  public sealed class GVRSwapManipulator : GVRManipulator {
    3030    [StorableConstructor]
    31     private GVRSwapManipulator(bool deserializing) : base(deserializing) { }
     31    private GVRSwapManipulator(StorableConstructorFlag _) : base(_) { }
    3232
    3333    public GVRSwapManipulator()
Note: See TracChangeset for help on using the changeset viewer.