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

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.VehicleRouting

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Manipulators/BiasedMultiVRPSolutionManipulator.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.
    … …  
    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("BiasedMultiVRPSolutionManipulator", "Randomly selects and applies one of its crossovers every time it is called based on the success progress.")]
    36   [StorableClass]
     36  [StorableType("213DD800-26CC-47FE-A151-CFB8742DB3C1")]
    3737  public class BiasedMultiVRPSolutionManipulator : MultiVRPSolutionManipulator {
    3838    public ValueLookupParameter<DoubleArray> ActualProbabilitiesParameter {
    … …  
    5757
    5858    [StorableConstructor]
    59     protected BiasedMultiVRPSolutionManipulator(bool deserializing) : base(deserializing) { }
     59    protected BiasedMultiVRPSolutionManipulator(StorableConstructorFlag _) : base(_) { }
    6060    protected BiasedMultiVRPSolutionManipulator(BiasedMultiVRPSolutionManipulator original, Cloner cloner) : base(original, cloner) { }
    6161    public BiasedMultiVRPSolutionManipulator()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Manipulators/MultiVRPSolutionManipulator.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.
    … …  
    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("MultiVRPSolutionManipulator", "Randomly selects and applies one of its manipulators every time it is called.")]
    37   [StorableClass]
     37  [StorableType("9EE8B958-A511-40EC-A3DA-0F0CE0BF6524")]
    3838  public class MultiVRPSolutionManipulator : StochasticMultiBranch<IVRPManipulator>, IVRPManipulator, IGeneralVRPOperator, IMultiVRPOperator, IStochasticOperator {
    3939    public override bool CanChangeName {
    … …  
    5454
    5555    [StorableConstructor]
    56     protected MultiVRPSolutionManipulator(bool deserializing) : base(deserializing) { }
     56    protected MultiVRPSolutionManipulator(StorableConstructorFlag _) : base(_) { }
    5757    public MultiVRPSolutionManipulator()
    5858      : base() {

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Manipulators/VRPManipulator.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.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("VRPManipulator", "Manipulates a VRP solution.")]
    30   [StorableClass]
     30  [StorableType("6A7616B7-0BA2-45DA-B89F-C4ECE93080BD")]
    3131  public abstract class VRPManipulator : VRPOperator, IVRPManipulator {
    3232    public ILookupParameter<IVRPEncoding> VRPToursParameter {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected VRPManipulator(bool deserializing) : base(deserializing) { }
     37    protected VRPManipulator(StorableConstructorFlag _) : base(_) { }
    3838
    3939    public VRPManipulator()
Note: See TracChangeset for help on using the changeset viewer.