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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.VehicleRouting

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Crossovers/BiasedMultiVRPSolutionCrossover.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.
    … …  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232using HeuristicLab.Random;
    3333
    3434namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
    3535  [Item("BiasedMultiVRPSolutionCrossover", "Randomly selects and applies one of its crossovers every time it is called based on the success progress.")]
    36   [StorableClass]
     36  [StorableType("9F319402-CF27-4355-9764-B7DDECBA2A15")]
    3737  public class BiasedMultiVRPSolutionCrossover : MultiVRPSolutionCrossover {
    3838    public ValueLookupParameter<DoubleArray> ActualProbabilitiesParameter {
    … …  
    5757
    5858    [StorableConstructor]
    59     protected BiasedMultiVRPSolutionCrossover(bool deserializing) : base(deserializing) { }
     59    protected BiasedMultiVRPSolutionCrossover(StorableConstructorFlag _) : base(_) { }
    6060    protected BiasedMultiVRPSolutionCrossover(BiasedMultiVRPSolutionCrossover original, Cloner cloner) : base(original, cloner) { }
    6161    public BiasedMultiVRPSolutionCrossover()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Crossovers/MultiVRPSolutionCrossover.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.
    … …  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3333using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3535namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
    3636  [Item("MultiVRPSolutionCrossover", "Randomly selects and applies one of its crossovers every time it is called.")]
    37   [StorableClass]
     37  [StorableType("68B26F83-1FF1-42B9-BDB8-606EC8C462C7")]
    3838  public class MultiVRPSolutionCrossover : StochasticMultiBranch<IVRPCrossover>, IVRPCrossover, IGeneralVRPOperator, IMultiVRPOperator, IStochasticOperator {
    3939    public override bool CanChangeName {
    … …  
    5858
    5959    [StorableConstructor]
    60     protected MultiVRPSolutionCrossover(bool deserializing) : base(deserializing) { }
     60    protected MultiVRPSolutionCrossover(StorableConstructorFlag _) : base(_) { }
    6161    public MultiVRPSolutionCrossover()
    6262      : base() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Crossovers/RandomParentCloneCrossover.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.Interfaces;
    2828using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.General.Crossovers {
    3131  [Item("RandomParentCloneCrossover", "An operator which randomly chooses one parent and returns a clone.")]
    32   [StorableClass]
     32  [StorableType("418EA2DE-C098-4A88-82B9-CB68732DB2AC")]
    3333  public sealed class RandomParentCloneCrossover : VRPOperator, IStochasticOperator, IGeneralVRPOperator, IVRPCrossover {
    3434    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4545
    4646    [StorableConstructor]
    47     private RandomParentCloneCrossover(bool deserializing) : base(deserializing) { }
     47    private RandomParentCloneCrossover(StorableConstructorFlag _) : base(_) { }
    4848
    4949    public RandomParentCloneCrossover()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Crossovers/VRPCrossover.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.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
    2929  [Item("VRPCrossover", "Crosses VRP solutions.")]
    30   [StorableClass]
     30  [StorableType("E26BAD0A-49E6-477C-AEA0-CB41552F0B2B")]
    3131  public abstract class VRPCrossover : VRPOperator, IVRPCrossover {
    3232    public ILookupParameter<ItemArray<IVRPEncoding>> ParentsParameter {
    … …  
    3939
    4040    [StorableConstructor]
    41     protected VRPCrossover(bool deserializing) : base(deserializing) { }
     41    protected VRPCrossover(StorableConstructorFlag _) : base(_) { }
    4242
    4343    public VRPCrossover()
Note: See TracChangeset for help on using the changeset viewer.