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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.VehicleRouting

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPEvaluation.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.

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPEvaluator.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.Data;
    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.ProblemInstances {
    3131  [Item("CVRPEvaluator", "Represents a single depot CVRP evaluator.")]
    32   [StorableClass]
     32  [StorableType("7253D8EC-5F91-4E5F-99E0-45AF10AEA9AF")]
    3333  public class CVRPEvaluator : VRPEvaluator {
    3434    public ILookupParameter<DoubleValue> OverloadParameter {
    … …  
    140140
    141141    [StorableConstructor]
    142     protected CVRPEvaluator(bool deserializing) : base(deserializing) { }
     142    protected CVRPEvaluator(StorableConstructorFlag _) : base(_) { }
    143143
    144144    public CVRPEvaluator() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPProblemInstance.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.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.PluginInfrastructure;
    3232using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3535namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    3636  [Item("CVRPProblemInstance", "Represents a single depot CVRP instance.")]
    37   [StorableClass]
     37  [StorableType("CBE1D39B-9BBE-4119-801B-32739D1E8DEE")]
    3838  public class CVRPProblemInstance : SingleDepotVRPProblemInstance, IHomogenousCapacitatedProblemInstance {
    3939    protected IValueParameter<DoubleValue> CapacityParameter {
    … …  
    8585
    8686    [StorableConstructor]
    87     protected CVRPProblemInstance(bool deserializing) : base(deserializing) { }
     87    protected CVRPProblemInstance(StorableConstructorFlag _) : base(_) { }
    8888
    8989    public CVRPProblemInstance() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWEvaluation.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.

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWEvaluator.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.
    … …  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3030using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3232namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    3333  [Item("CVRPPDTWEvaluator", "Represents a single depot CVRPPDTW evaluator.")]
    34   [StorableClass]
     34  [StorableType("6324F32C-727E-4593-BB21-4625755F844A")]
    3535  public class CVRPPDTWEvaluator : CVRPTWEvaluator {
    3636    public ILookupParameter<IntValue> PickupViolationsParameter {
    … …  
    306306
    307307    [StorableConstructor]
    308     protected CVRPPDTWEvaluator(bool deserializing) : base(deserializing) { }
     308    protected CVRPPDTWEvaluator(StorableConstructorFlag _) : base(_) { }
    309309
    310310    public CVRPPDTWEvaluator() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWProblemInstance.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.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.PluginInfrastructure;
    3232using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3535namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    3636  [Item("CVRPPDTWProblemInstance", "Represents a single depot CVRPPDTW instance.")]
    37   [StorableClass]
     37  [StorableType("6DC3F907-9CDC-4CDA-8C84-AC9ED248DB3B")]
    3838  public class CVRPPDTWProblemInstance : CVRPTWProblemInstance, IPickupAndDeliveryProblemInstance {
    3939    protected IValueParameter<IntArray> PickupDeliveryLocationParameter {
    … …  
    9191
    9292    [StorableConstructor]
    93     protected CVRPPDTWProblemInstance(bool deserializing) : base(deserializing) { }
     93    protected CVRPPDTWProblemInstance(StorableConstructorFlag _) : base(_) { }
    9494
    9595    public CVRPPDTWProblemInstance() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluation.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.

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluator.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;
    2929using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    3232  [Item("CVRPTWEvaluator", "Represents a single depot CVRPTW evaluator.")]
    33   [StorableClass]
     33  [StorableType("BB258008-7ECC-488A-BB2A-B38AE0023CFD")]
    3434  public class CVRPTWEvaluator : CVRPEvaluator {
    3535    public ILookupParameter<DoubleValue> TardinessParameter {
    … …  
    259259
    260260    [StorableConstructor]
    261     protected CVRPTWEvaluator(bool deserializing) : base(deserializing) { }
     261    protected CVRPTWEvaluator(StorableConstructorFlag _) : base(_) { }
    262262
    263263    public CVRPTWEvaluator() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWProblemInstance.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.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.PluginInfrastructure;
    3232using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3535namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    3636  [Item("CVRPTWProblemInstance", "Represents a single depot CVRPTW instance.")]
    37   [StorableClass]
     37  [StorableType("2138BE6C-058E-4003-8578-55E8DE3706C7")]
    3838  public class CVRPTWProblemInstance : CVRPProblemInstance, ITimeWindowedProblemInstance {
    3939    protected IValueParameter<DoubleArray> ReadyTimeParameter {
    … …  
    107107
    108108    [StorableConstructor]
    109     protected CVRPTWProblemInstance(bool deserializing) : base(deserializing) { }
     109    protected CVRPTWProblemInstance(StorableConstructorFlag _) : base(_) { }
    110110
    111111    public CVRPTWProblemInstance() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPEvaluator.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2626
    … …  
    2828namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    2929  [Item("SingleDepotVRPEvaluator", "Represents a single depot VRP evaluator.")]
    30   [StorableClass]
     30  [StorableType("1E0DECD9-54BF-4F69-A743-228C481749A0")]
    3131  public class SingleDepotVRPEvaluator : VRPEvaluator {
    3232    protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
    … …  
    8484
    8585    [StorableConstructor]
    86     protected SingleDepotVRPEvaluator(bool deserializing) : base(deserializing) { }
     86    protected SingleDepotVRPEvaluator(StorableConstructorFlag _) : base(_) { }
    8787
    8888    public SingleDepotVRPEvaluator() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPProblemInstance.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.
    … …  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Optimization;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.PluginInfrastructure;
    3030using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3333namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    3434  [Item("SingleDepotVRPProblemInstance", "Represents a single depot VRP instance.")]
    35   [StorableClass]
     35  [StorableType("A45435DD-F615-45C6-8456-5A49EE5D3C8E")]
    3636  public class SingleDepotVRPProblemInstance : VRPProblemInstance, ISingleDepotProblemInstance {
    3737    protected override IEnumerable<IOperator> GetOperators() {
    … …  
    6464
    6565    [StorableConstructor]
    66     protected SingleDepotVRPProblemInstance(bool deserializing) : base(deserializing) { }
     66    protected SingleDepotVRPProblemInstance(StorableConstructorFlag _) : base(_) { }
    6767
    6868    public SingleDepotVRPProblemInstance() {
Note: See TracChangeset for help on using the changeset viewer.