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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.VehicleRouting

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Crossovers/PrinsCrossover.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.Prins {
    3131  [Item("PrinsCrossover", "An operator which crosses two VRP representations.")]
    32   [StorableClass]
     32  [StorableType("EAF32C5C-D67E-4EEB-8705-FAA577A40439")]
    3333  public abstract class PrinsCrossover : VRPCrossover, IStochasticOperator, IPrinsOperator {
    3434
    … …  
    3838
    3939    [StorableConstructor]
    40     protected PrinsCrossover(bool deserializing) : base(deserializing) { }
     40    protected PrinsCrossover(StorableConstructorFlag _) : base(_) { }
    4141
    4242    public PrinsCrossover()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Crossovers/PrinsPermutationCrossover.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.Prins {
    2929  [Item("PrinsPermutationCrossover", "An operator which crosses two VRP representations using a standard permutation operator.  It is implemented as described in Prins, C. (2004). A simple and effective evolutionary algorithm for the vehicle routing problem. Computers & Operations Research, 12:1985-2002.")]
    30   [StorableClass]
     30  [StorableType("F61C494E-4958-4B89-893B-7485A72A1C80")]
    3131  public sealed class PrinsPermutationCrossover : PrinsCrossover, IPrinsOperator {
    3232    public IValueLookupParameter<IPermutationCrossover> InnerCrossoverParameter {
    … …  
    3535
    3636    [StorableConstructor]
    37     private PrinsPermutationCrossover(bool deserializing) : base(deserializing) { }
     37    private PrinsPermutationCrossover(StorableConstructorFlag _) : base(_) { }
    3838
    3939    public PrinsPermutationCrossover()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/IPrinsOperator.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.Prins {
     26  [StorableType("02783182-5F42-45F8-A57A-E63459E22C6A")]
    2527  public interface IPrinsOperator :
    2628    ISingleDepotOperator, IHomogenousCapacitatedOperator, ITimeWindowedOperator {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Manipulators/PrinsExhaustiveLSManipulator.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.Prins {
    2828  [Item("PrinsExhaustiveLSManipulator", "An operator which manipulates a VRP representation by using the exhaustive Prins local search.  It is implemented as described in Prins, C. (2004). A simple and effective evolutionary algorithm for the vehicle routing problem. Computers & Operations Research, 12:1985-2002.")]
    29   [StorableClass]
     29  [StorableType("D0C880A5-B777-436D-9E01-0A450C1327C5")]
    3030  public sealed class PrinsExhaustiveLSManipulator : PrinsLSManipulator {
    3131    [StorableConstructor]
    32     private PrinsExhaustiveLSManipulator(bool deserializing) : base(deserializing) { }
     32    private PrinsExhaustiveLSManipulator(StorableConstructorFlag _) : base(_) { }
    3333
    3434    public PrinsExhaustiveLSManipulator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Manipulators/PrinsLSManipulator.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.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Prins {
    3131  [Item("PrinsLSManipulator", "An operator which manipulates a VRP representation by using the Prins local search.  It is implemented as described in Prins, C. (2004). A simple and effective evolutionary algorithm for the vehicle routing problem. Computers & Operations Research, 12:1985-2002.")]
    32   [StorableClass]
     32  [StorableType("11400A09-F3A9-4059-9C82-426B228C2CA0")]
    3333  public abstract class PrinsLSManipulator : PrinsManipulator, IVRPLocalSearchManipulator {
    3434    public IValueParameter<IntValue> Iterations {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected PrinsLSManipulator(bool deserializing) : base(deserializing) { }
     39    protected PrinsLSManipulator(StorableConstructorFlag _) : base(_) { }
    4040
    4141    public PrinsLSManipulator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Manipulators/PrinsManipulator.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.Prins {
    3131  [Item("PrinsManipulator", "An operator which manipulates a VRP representation.")]
    32   [StorableClass]
     32  [StorableType("AF313602-8AFC-4722-AA47-FFDCF39CF3E4")]
    3333  public abstract class PrinsManipulator : VRPManipulator, IStochasticOperator, IPrinsOperator {
    3434    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected PrinsManipulator(bool deserializing) : base(deserializing) { }
     39    protected PrinsManipulator(StorableConstructorFlag _) : base(_) { }
    4040
    4141    public PrinsManipulator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Manipulators/PrinsPermutationManipulator.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.Prins {
    2929  [Item("PrinsPermutationManipulator", "An operator which manipulates a VRP representation by using a standard permutation manipulator. It is implemented as described in Prins, C. (2004). A simple and effective evolutionary algorithm for the vehicle routing problem. Computers & Operations Research, 12:1985-2002.")]
    30   [StorableClass]
     30  [StorableType("D5455C8E-B245-4706-AC26-86B4085B6339")]
    3131  public sealed class PrinsPermutationManipulator : PrinsManipulator {
    3232    public IValueLookupParameter<IPermutationManipulator> InnerManipulatorParameter {
    … …  
    3535
    3636    [StorableConstructor]
    37     private PrinsPermutationManipulator(bool deserializing) : base(deserializing) { }
     37    private PrinsPermutationManipulator(StorableConstructorFlag _) : base(_) { }
    3838
    3939    public PrinsPermutationManipulator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Manipulators/PrinsStochasticLSManipulator.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.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.VehicleRouting.Encodings.Prins {
    3030  [Item("PrinsStochasticLSManipulator", "An operator which manipulates a VRP representation by using the stochastic version of the Prins local search.  It is implemented as described in Prins, C. (2004). A simple and effective evolutionary algorithm for the vehicle routing problem. Computers & Operations Research, 12:1985-2002.")]
    31   [StorableClass]
     31  [StorableType("0EA1C024-7FDA-4E52-8186-D2BAF9D5AB24")]
    3232  public sealed class PrinsStochasticLSManipulator : PrinsLSManipulator {
    3333    public IValueParameter<IntValue> SampleSize {
    … …  
    3636
    3737    [StorableConstructor]
    38     private PrinsStochasticLSManipulator(bool deserializing) : base(deserializing) { }
     38    private PrinsStochasticLSManipulator(StorableConstructorFlag _) : base(_) { }
    3939
    4040    public PrinsStochasticLSManipulator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/PrinsEncoding.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.Encodings.PermutationEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2929using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Prins {
    3232  [Item("PrinsEncoding", "Represents an Prins encoding of VRP solutions. It is implemented as described in Prins, C. (2004). A simple and effective evolutionary algorithm for the vehicle routing problem. Computers & Operations Research, 12:1985-2002.")]
    33   [StorableClass]
     33  [StorableType("A0E1EBC1-C0F5-4CD5-9279-1A669C6633CD")]
    3434  public class PrinsEncoding : General.PermutationEncoding {
    3535    #region IVRPEncoding Members
    … …  
    138138
    139139    [StorableConstructor]
    140     protected PrinsEncoding(bool serializing)
    141       : base(serializing) {
     140    protected PrinsEncoding(StorableConstructorFlag _) : base(_) {
    142141    }
    143142
Note: See TracChangeset for help on using the changeset viewer.