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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.VehicleRouting

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPEvaluator.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("MDCVRPEvaluator", "Represents a multi depot CVRP evaluator.")]
    32   [StorableClass]
     32  [StorableType("E59F6449-7DA3-4842-A0D8-C5BECC965642")]
    3333  public class MDCVRPEvaluator : VRPEvaluator {
    3434    public ILookupParameter<DoubleValue> OverloadParameter {
    … …  
    135135
    136136    [StorableConstructor]
    137     protected MDCVRPEvaluator(bool deserializing) : base(deserializing) { }
     137    protected MDCVRPEvaluator(StorableConstructorFlag _) : base(_) { }
    138138
    139139    public MDCVRPEvaluator() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPProblemInstance.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("MDCVRPProblemInstance", "Represents a multi depot CVRP instance.")]
    37   [StorableClass]
     37  [StorableType("19F824AB-6C66-4FB6-88D5-3C163BF789E6")]
    3838  public class MDCVRPProblemInstance : MultiDepotVRPProblemInstance, IHeterogenousCapacitatedProblemInstance {
    3939    protected IValueParameter<DoubleArray> CapacityParameter {
    … …  
    8585
    8686    [StorableConstructor]
    87     protected MDCVRPProblemInstance(bool deserializing) : base(deserializing) { }
     87    protected MDCVRPProblemInstance(StorableConstructorFlag _) : base(_) { }
    8888
    8989    public MDCVRPProblemInstance() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPPDTW/MDCVRPPDTWEvaluator.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("MDCVRPPDTWEvaluator", "Represents a multi depot CVRPPDTW evaluator.")]
    34   [StorableClass]
     34  [StorableType("4C4D6FA1-A16B-47B5-99D8-7F3D7C3D286A")]
    3535  public class MDCVRPPDTWEvaluator : MDCVRPTWEvaluator {
    3636    public ILookupParameter<IntValue> PickupViolationsParameter {
    … …  
    324324
    325325    [StorableConstructor]
    326     protected MDCVRPPDTWEvaluator(bool deserializing) : base(deserializing) { }
     326    protected MDCVRPPDTWEvaluator(StorableConstructorFlag _) : base(_) { }
    327327
    328328    public MDCVRPPDTWEvaluator() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPPDTW/MDCVRPPDTWProblemInstance.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("MDCVRPPDTWProblemInstance", "Represents a multi depot CVRPPDTW instance.")]
    37   [StorableClass]
     37  [StorableType("A77F180E-8DE5-43E2-B9A4-313B5E2C5A06")]
    3838  public class MDCVRPPDTWProblemInstance : MDCVRPTWProblemInstance, IPickupAndDeliveryProblemInstance {
    3939    protected IValueParameter<IntArray> PickupDeliveryLocationParameter {
    … …  
    9191
    9292    [StorableConstructor]
    93     protected MDCVRPPDTWProblemInstance(bool deserializing) : base(deserializing) { }
     93    protected MDCVRPPDTWProblemInstance(StorableConstructorFlag _) : base(_) { }
    9494
    9595    public MDCVRPPDTWProblemInstance() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPTWEvaluator.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("MDCVRPTWEvaluator", "Represents a multi depot CVRPTW evaluator.")]
    33   [StorableClass]
     33  [StorableType("D3E40FC1-17FA-4C0E-AD1A-10C98ACCE27D")]
    3434  public class MDCVRPTWEvaluator : MDCVRPEvaluator {
    3535    public ILookupParameter<DoubleValue> TardinessParameter {
    … …  
    275275
    276276    [StorableConstructor]
    277     protected MDCVRPTWEvaluator(bool deserializing) : base(deserializing) { }
     277    protected MDCVRPTWEvaluator(StorableConstructorFlag _) : base(_) { }
    278278
    279279    public MDCVRPTWEvaluator() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPTWProblemInstance.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("MDCVRPTWProblemInstance", "Represents a multi depot CVRPTW instance.")]
    37   [StorableClass]
     37  [StorableType("ADC41AA7-EFA6-46FB-BBA7-DC08AE0A26F0")]
    3838  public class MDCVRPTWProblemInstance : MDCVRPProblemInstance, ITimeWindowedProblemInstance {
    3939    protected IValueParameter<DoubleArray> ReadyTimeParameter {
    … …  
    107107
    108108    [StorableConstructor]
    109     protected MDCVRPTWProblemInstance(bool deserializing) : base(deserializing) { }
     109    protected MDCVRPTWProblemInstance(StorableConstructorFlag _) : base(_) { }
    110110
    111111    public MDCVRPTWProblemInstance() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MultiDepotVRPEvaluator.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("AFC33483-2E8A-4469-8216-1F4FEE0AEB51")]
    3131  public class MultiDepotVRPEvaluator : VRPEvaluator {
    3232    protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
    … …  
    8080
    8181    [StorableConstructor]
    82     protected MultiDepotVRPEvaluator(bool deserializing) : base(deserializing) { }
     82    protected MultiDepotVRPEvaluator(StorableConstructorFlag _) : base(_) { }
    8383
    8484    public MultiDepotVRPEvaluator() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MultiDepotVRPProblemInstance.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("MultiDepotVRPProblemInstance", "Represents a multi depot VRP instance.")]
    37   [StorableClass]
     37  [StorableType("20788CA4-8AA0-4A57-8118-0D7C3FEF1AA4")]
    3838  public class MultiDepotVRPProblemInstance : VRPProblemInstance, IMultiDepotProblemInstance {
    3939    protected IValueParameter<IntValue> DepotsParameter {
    … …  
    174174
    175175    [StorableConstructor]
    176     protected MultiDepotVRPProblemInstance(bool deserializing) : base(deserializing) { }
     176    protected MultiDepotVRPProblemInstance(StorableConstructorFlag _) : base(_) { }
    177177    protected MultiDepotVRPProblemInstance(MultiDepotVRPProblemInstance original, Cloner cloner)
    178178      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.