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/Potvin/Creators/IterativeInsertionCreator.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.
    … …  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3131using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
    … …  
    3434namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3535  [Item("IterativeInsertionCreator", "Creates a randomly initialized VRP solution.")]
    36   [StorableClass]
     36  [StorableType("7504083B-79FC-441C-BE32-DAFCB9E81448")]
    3737  public sealed class IterativeInsertionCreator : PotvinCreator, IStochasticOperator {
    3838    #region IStochasticOperator Members
    … …  
    4747
    4848    [StorableConstructor]
    49     private IterativeInsertionCreator(bool deserializing) : base(deserializing) { }
     49    private IterativeInsertionCreator(StorableConstructorFlag _) : base(_) { }
    5050
    5151    public IterativeInsertionCreator()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/PotvinCreator.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;
    2525using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2626using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2929  [Item("PotvinCreator", "A VRP creator.")]
    30   [StorableClass]
     30  [StorableType("9007B8EE-61F5-45D7-A853-951E2435E308")]
    3131  public abstract class PotvinCreator : VRPCreator, IPotvinOperator, IVRPCreator {
    3232    public override bool CanChangeName {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected PotvinCreator(bool deserializing) : base(deserializing) { }
     37    protected PotvinCreator(StorableConstructorFlag _) : base(_) { }
    3838
    3939    public PotvinCreator()

  • stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/PushForwardInsertionCreator.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.
    … …  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3131using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
    … …  
    3434namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3535  [Item("PushForwardInsertionCreator", "The push forward insertion heuristic. It is implemented as described in Sam, and Thangiah, R. (1999). A Hybrid Genetic Algorithms, Simulated Annealing and Tabu Search Heuristic for Vehicle Routing Problems with Time Windows. Practical Handbook of Genetic Algorithms, Volume III, pp 347–381.")]
    36   [StorableClass]
     36  [StorableType("B93C1DA8-67D4-4A29-976F-49C966763670")]
    3737  public sealed class PushForwardInsertionCreator : PotvinCreator, IStochasticOperator {
    3838    #region IStochasticOperator Members
    … …  
    6262
    6363    [StorableConstructor]
    64     private PushForwardInsertionCreator(bool deserializing) : base(deserializing) { }
     64    private PushForwardInsertionCreator(StorableConstructorFlag _) : base(_) { }
    6565
    6666    public PushForwardInsertionCreator()
Note: See TracChangeset for help on using the changeset viewer.