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/Analyzer/BestSolution/BestVRPSolutionAnalyzer.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.
    … …  
    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;
    … …  
    3737  /// </summary>
    3838  [Item("BestVRPSolutionAnalyzer", "An operator for analyzing the best solution of Vehicle Routing Problems.")]
    39   [StorableClass]
     39  [StorableType("42DFB4D7-0DDA-424A-9DB3-1EDAB917A26B")]
    4040  public sealed class BestVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, IGeneralVRPOperator, ISingleObjectiveOperator {
    4141    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
    … …  
    7878
    7979    [StorableConstructor]
    80     private BestVRPSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     80    private BestVRPSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    8181
    8282    public BestVRPSolutionAnalyzer()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/Capacitated/BestCapacitatedVRPSolutionAnalyzer.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.
    … …  
    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.Variants;
    … …  
    3737  /// </summary>
    3838  [Item("BestCapacitatedVRPSolutionAnalyzer", "An operator for analyzing the best solution of capacitated Vehicle Routing Problems.")]
    39   [StorableClass]
     39  [StorableType("5E50BE52-E801-4F84-8070-298368FEC208")]
    4040  public sealed class BestCapacitatedVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ICapacitatedOperator, ISingleObjectiveOperator {
    4141    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
    … …  
    6565
    6666    [StorableConstructor]
    67     private BestCapacitatedVRPSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     67    private BestCapacitatedVRPSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    6868
    6969    public BestCapacitatedVRPSolutionAnalyzer()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/PickupAndDelivery/BestPickupAndDeliveryVRPSolutionAnalyzer.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.
    … …  
    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.Variants;
    … …  
    3737  /// </summary>
    3838  [Item("BestPickupAndDeliveryVRPSolutionAnalyzer", "An operator for analyzing the best solution of Pickup and Delivery Routing Problems.")]
    39   [StorableClass]
     39  [StorableType("81CA703F-038E-4D41-BB3F-25E04EC46AF9")]
    4040  public sealed class BestPickupAndDeliveryVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, IPickupAndDeliveryOperator, ISingleObjectiveOperator {
    4141    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
    … …  
    6565
    6666    [StorableConstructor]
    67     private BestPickupAndDeliveryVRPSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     67    private BestPickupAndDeliveryVRPSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    6868
    6969    public BestPickupAndDeliveryVRPSolutionAnalyzer()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/TimeWindowed/BestTimeWindowedVRPSolutionAnalyzer.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.
    … …  
    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.Variants;
    … …  
    3737  /// </summary>
    3838  [Item("BestTimeWindowedVRPSolutionAnalyzer", "An operator for analyzing the best solution of time windowed Vehicle Routing Problems.")]
    39   [StorableClass]
     39  [StorableType("2804825D-064C-4AF5-970B-3F17796579D9")]
    4040  public sealed class BestTimeWindowedVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ITimeWindowedOperator, ISingleObjectiveOperator {
    4141    public ILookupParameter<IVRPProblemInstance> ProblemInstanceParameter {
    … …  
    6868
    6969    [StorableConstructor]
    70     private BestTimeWindowedVRPSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     70    private BestTimeWindowedVRPSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    7171
    7272    public BestTimeWindowedVRPSolutionAnalyzer()
Note: See TracChangeset for help on using the changeset viewer.