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

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.VehicleRouting

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuCrossover.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.Zhu {
    3131  [Item("ZhuCrossover", "An operator which crosses two VRP representations.")]
    32   [StorableClass]
     32  [StorableType("557D7F37-14DB-4CB8-92B0-DB2BC039F36C")]
    3333  public abstract class ZhuCrossover : VRPCrossover, IStochasticOperator, IZhuOperator {
    3434    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected ZhuCrossover(bool deserializing) : base(deserializing) { }
     39    protected ZhuCrossover(StorableConstructorFlag _) : base(_) { }
    4040
    4141    public ZhuCrossover()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuHeuristicCrossover1.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.Zhu {
    2727  [Item("ZhuHeuristicCrossover1", "The Zhu Heuristic Crossover (Version 1). It is implemented as described in Zhu, K.Q. (2000). A New Genetic Algorithm For VRPTW. Proceedings of the International Conference on Artificial Intelligence.")]
    28   [StorableClass]
     28  [StorableType("C3E48066-FD84-428E-89E7-DD0A8322535E")]
    2929  public sealed class ZhuHeuristicCrossover1 : ZhuCrossover {
    3030    [StorableConstructor]
    31     private ZhuHeuristicCrossover1(bool deserializing) : base(deserializing) { }
     31    private ZhuHeuristicCrossover1(StorableConstructorFlag _) : base(_) { }
    3232
    3333    public ZhuHeuristicCrossover1()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuHeuristicCrossover2.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.Zhu {
    2828  [Item("ZhuHeuristicCrossover2", "The Zhu Heuristic Crossover (Version 2). It is implemented as described in Zhu, K.Q. (2000). A New Genetic Algorithm For VRPTW. Proceedings of the International Conference on Artificial Intelligence.")]
    29   [StorableClass]
     29  [StorableType("69206FC0-4870-4C78-B8FD-6C6EF2ADDA31")]
    3030  public sealed class ZhuHeuristicCrossover2 : ZhuCrossover {
    3131    [StorableConstructor]
    32     private ZhuHeuristicCrossover2(bool deserializing) : base(deserializing) { }
     32    private ZhuHeuristicCrossover2(StorableConstructorFlag _) : base(_) { }
    3333
    3434    public ZhuHeuristicCrossover2()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuMergeCrossover1.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.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.VehicleRouting.Variants;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
    2929  [Item("ZhuMergeCrossover1", "The Zhu Merge Crossover (Version 1). It is implemented as described in Zhu, K.Q. (2000). A New Genetic Algorithm For VRPTW. Proceedings of the International Conference on Artificial Intelligence.")]
    30   [StorableClass]
     30  [StorableType("3DF02AC1-B4F2-41C3-83E3-C587EBE70DEF")]
    3131  public sealed class ZhuMergeCrossover1 : ZhuCrossover {
    3232    [StorableConstructor]
    33     private ZhuMergeCrossover1(bool deserializing) : base(deserializing) { }
     33    private ZhuMergeCrossover1(StorableConstructorFlag _) : base(_) { }
    3434
    3535    public ZhuMergeCrossover1()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuMergeCrossover2.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.Variants;
    2828
    2929namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
    3030  [Item("ZhuMergeCrossover2", "The Zhu Merge Crossover (Version 2).  It is implemented as described in Zhu, K.Q. (2000). A New Genetic Algorithm For VRPTW. Proceedings of the International Conference on Artificial Intelligence.")]
    31   [StorableClass]
     31  [StorableType("A0714F51-A876-429E-853C-6F29A48B9F8C")]
    3232  public sealed class ZhuMergeCrossover2 : ZhuCrossover {
    3333    [StorableConstructor]
    34     private ZhuMergeCrossover2(bool deserializing) : base(deserializing) { }
     34    private ZhuMergeCrossover2(StorableConstructorFlag _) : base(_) { }
    3535
    3636    public ZhuMergeCrossover2()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuPermutationCrossover.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.Encodings.PermutationEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
    2929  [Item("ZhuPermutationCrossover", "An operator which crosses two VRP representations using a standard permutation operator. It is implemented as described in Zhu, K.Q. (2000). A New Genetic Algorithm For VRPTW. Proceedings of the International Conference on Artificial Intelligence.")]
    30   [StorableClass]
     30  [StorableType("1D216531-C9D8-4A12-BCFD-7E97161EC383")]
    3131  public sealed class PrinsPermutationCrossover : ZhuCrossover {
    3232    public IValueLookupParameter<IPermutationCrossover> InnerCrossoverParameter {
    … …  
    3535
    3636    [StorableConstructor]
    37     private PrinsPermutationCrossover(bool deserializing) : base(deserializing) { }
     37    private PrinsPermutationCrossover(StorableConstructorFlag _) : base(_) { }
    3838
    3939    public PrinsPermutationCrossover()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/IZhuOperator.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.Zhu {
     26  [StorableType("CD11FA3C-3B50-4710-AAFC-32C9C61B3321")]
    2527  public interface IZhuOperator :
    2628    ISingleDepotOperator, IHomogenousCapacitatedOperator, ITimeWindowedOperator {

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Manipulators/ZhuManipulator.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.Zhu {
    3131  [Item("ZhuManipulator", "An operator which manipulates a VRP representation.")]
    32   [StorableClass]
     32  [StorableType("DC8B774D-4D51-4439-90BC-9533CACF74FD")]
    3333  public abstract class ZhuManipulator : VRPManipulator, IStochasticOperator, IZhuOperator {
    3434    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected ZhuManipulator(bool deserializing) : base(deserializing) { }
     39    protected ZhuManipulator(StorableConstructorFlag _) : base(_) { }
    4040
    4141    public ZhuManipulator()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Manipulators/ZhuPermutationManipulator.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.Encodings.PermutationEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
    2929  [Item("ZhuPermutationManipulator", "An operator which manipulates a VRP representation by using a standard permutation manipulator. It is implemented as described in Zhu, K.Q. (2000). A New Genetic Algorithm For VRPTW. Proceedings of the International Conference on Artificial Intelligence.")]
    30   [StorableClass]
     30  [StorableType("2D0168F4-40E8-4E54-AEAD-E8CEAE355AEB")]
    3131  public sealed class ZhuPermutationManipulator : ZhuManipulator {
    3232    public IValueLookupParameter<IPermutationManipulator> InnerManipulatorParameter {
    … …  
    3535
    3636    [StorableConstructor]
    37     private ZhuPermutationManipulator(bool deserializing) : base(deserializing) { }
     37    private ZhuPermutationManipulator(StorableConstructorFlag _) : base(_) { }
    3838
    3939    public ZhuPermutationManipulator()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/ZhuEncoding.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.Core;
    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.Zhu {
    3131  [Item("ZhuEncoding", "Represents a Zhu encoding of VRP solutions. It is implemented as described in Zhu, K.Q. (2000). A New Genetic Algorithm For VRPTW. Proceedings of the International Conference on Artificial Intelligence.")]
    32   [StorableClass]
     32  [StorableType("1A5F5A1D-E4F5-4477-887E-45FC488BC459")]
    3333  public class ZhuEncoding : General.PermutationEncoding {
    3434    #region IVRPEncoding Members
    … …  
    108108
    109109    [StorableConstructor]
    110     protected ZhuEncoding(bool serializing)
    111       : base(serializing) {
     110    protected ZhuEncoding(StorableConstructorFlag _) : base(_) {
    112111    }
    113112
Note: See TracChangeset for help on using the changeset viewer.