Free cookie consent management tool by TermsFeed Policy Generator

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

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.VehicleRouting

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Crossovers/GVRCrossover.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.GVR {
    3232  [Item("GVRCrossover", "The GVR crossover 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.")]
    33   [StorableClass]
     33  [StorableType("AAA4C747-C89C-4491-9113-725F3893463A")]
    3434  public sealed class GVRCrossover : VRPCrossover, IStochasticOperator, IGVROperator {
    3535    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3838
    3939    [StorableConstructor]
    40     private GVRCrossover(bool deserializing) : base(deserializing) { }
     40    private GVRCrossover(StorableConstructorFlag _) : base(_) { }
    4141
    4242    public GVRCrossover() {

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/GVREncoding.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.GVR {
    3232  [Item("GVREncoding", "Represents a potvin encoding of VRP solutions. 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.")]
    33   [StorableClass]
     33  [StorableType("27A8F267-9865-4AEA-9ECF-88D950D81D74")]
    3434  public class GVREncoding : TourEncoding {
    3535    public override List<Tour> GetTours() {
    … …  
    8181
    8282    [StorableConstructor]
    83     protected GVREncoding(bool serializing)
    84       : base(serializing) {
     83    protected GVREncoding(StorableConstructorFlag _) : base(_) {
    8584    }
    8685

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/IGVROperator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2121
    2222using HeuristicLab.Problems.VehicleRouting.Variants;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.VehicleRouting.Encodings.GVR {
     26  [StorableType("8C6EFFE6-4270-497D-9351-13BEDA227E21")]
    2527  public interface IGVROperator :
    2628    ISingleDepotOperator, IHomogenousCapacitatedOperator, ITimeWindowedOperator {

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRDisplacementManipulator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.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()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRInsertionManipulator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.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()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRInversionManipulator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.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()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRManipulator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.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() {

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Manipulators/GVRSwapManipulator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.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.