Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/04/17 17:19:35 (8 years ago)
Author:
gkronber
Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:
branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPEvaluator.cs

    r14185 r14927  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    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("82780d31-ea4e-4e6c-ab81-3acd76982e5d")]
    3333  public class MDCVRPEvaluator : VRPEvaluator {
    3434    public ILookupParameter<DoubleValue> OverloadParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPProblemInstance.cs

    r14185 r14927  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Persistence;
    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("286688c9-1471-49dc-b8e1-396bf9ea4dab")]
    3838  public class MDCVRPProblemInstance : MultiDepotVRPProblemInstance, IHeterogenousCapacitatedProblemInstance {
    3939    protected IValueParameter<DoubleArray> CapacityParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPPDTW/MDCVRPPDTWEvaluator.cs

    r14185 r14927  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    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("0b28e0cd-c983-4511-b3db-3efdb2ca03b8")]
    3535  public class MDCVRPPDTWEvaluator : MDCVRPTWEvaluator {
    3636    public ILookupParameter<IntValue> PickupViolationsParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPPDTW/MDCVRPPDTWProblemInstance.cs

    r14185 r14927  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Persistence;
    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("63ed38c0-e9d1-46ba-8409-c7f48ddb5da1")]
    3838  public class MDCVRPPDTWProblemInstance : MDCVRPTWProblemInstance, IPickupAndDeliveryProblemInstance {
    3939    protected IValueParameter<IntArray> PickupDeliveryLocationParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPTWEvaluator.cs

    r14185 r14927  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    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("fda9bb27-c9fc-44eb-afa0-37e16a13c654")]
    3434  public class MDCVRPTWEvaluator : MDCVRPEvaluator {
    3535    public ILookupParameter<DoubleValue> TardinessParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPTWProblemInstance.cs

    r14185 r14927  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Persistence;
    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("e5e81aef-4b70-4e10-bd86-1083b6dde463")]
    3838  public class MDCVRPTWProblemInstance : MDCVRPProblemInstance, ITimeWindowedProblemInstance {
    3939    protected IValueParameter<DoubleArray> ReadyTimeParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MultiDepotVRPEvaluator.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2626
     
    2828namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    2929  [Item("SingleDepotVRPEvaluator", "Represents a single depot VRP evaluator.")]
    30   [StorableClass]
     30  [StorableType("6f8648df-39f9-4b11-a687-4024d8ff21aa")]
    3131  public class MultiDepotVRPEvaluator : VRPEvaluator {
    3232    protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MultiDepotVRPProblemInstance.cs

    r14185 r14927  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    3030using HeuristicLab.PluginInfrastructure;
    3131using HeuristicLab.Problems.VehicleRouting.Interfaces;
     
    3434namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    3535  [Item("MultiDepotVRPProblemInstance", "Represents a multi depot VRP instance.")]
    36   [StorableClass]
     36  [StorableType("413c8bd9-fd3e-460d-b407-f8e7e208890b")]
    3737  public class MultiDepotVRPProblemInstance : VRPProblemInstance, IMultiDepotProblemInstance {
    3838    protected IValueParameter<IntValue> DepotsParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPEvaluator.cs

    r14185 r14927  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    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("333179e7-fe10-4244-b9e5-cf83728ebbe0")]
    3333  public class CVRPEvaluator : VRPEvaluator {
    3434    public ILookupParameter<DoubleValue> OverloadParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPProblemInstance.cs

    r14185 r14927  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Persistence;
    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("68e3803a-06e3-44c4-8f7e-60db9be7e317")]
    3838  public class CVRPProblemInstance : SingleDepotVRPProblemInstance, IHomogenousCapacitatedProblemInstance {
    3939    protected IValueParameter<DoubleValue> CapacityParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWEvaluator.cs

    r14185 r14927  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    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("7cf3ea94-c840-4589-9586-013a513b2677")]
    3535  public class CVRPPDTWEvaluator : CVRPTWEvaluator {
    3636    public ILookupParameter<IntValue> PickupViolationsParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWProblemInstance.cs

    r14185 r14927  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Persistence;
    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("0212b313-736f-4061-a4e3-c257d86d6eec")]
    3838  public class CVRPPDTWProblemInstance : CVRPTWProblemInstance, IPickupAndDeliveryProblemInstance {
    3939    protected IValueParameter<IntArray> PickupDeliveryLocationParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluator.cs

    r14185 r14927  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    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("1e312cd8-273f-40a3-aecd-8399fdf545ea")]
    3434  public class CVRPTWEvaluator : CVRPEvaluator {
    3535    public ILookupParameter<DoubleValue> TardinessParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWProblemInstance.cs

    r14185 r14927  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Persistence;
    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("d965fbe2-bb42-4a5d-9fa2-9d37b2385757")]
    3838  public class CVRPTWProblemInstance : CVRPProblemInstance, ITimeWindowedProblemInstance {
    3939    protected IValueParameter<DoubleArray> ReadyTimeParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPEvaluator.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2626
     
    2828namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    2929  [Item("SingleDepotVRPEvaluator", "Represents a single depot VRP evaluator.")]
    30   [StorableClass]
     30  [StorableType("4e485963-1979-4ae9-bf33-270c70fff625")]
    3131  public class SingleDepotVRPEvaluator : VRPEvaluator {
    3232    protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPProblemInstance.cs

    r14185 r14927  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Optimization;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    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("a3b5e68a-cfc3-4084-8f70-af87546c7885")]
    3636  public class SingleDepotVRPProblemInstance : VRPProblemInstance, ISingleDepotProblemInstance {
    3737    protected override IEnumerable<IOperator> GetOperators() {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluator.cs

    r14185 r14927  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727using HeuristicLab.Problems.VehicleRouting.Encodings;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
     
    3030namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    3131  [Item("VRPEvaluator", "Represents a VRP evaluator.")]
    32   [StorableClass]
     32  [StorableType("1645703c-2585-4b9f-8c3e-cc0e9738c0ac")]
    3333  public abstract class VRPEvaluator : VRPOperator, IVRPEvaluator {
    3434    public ILookupParameter<IVRPEncoding> VRPToursParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

    r14482 r14927  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    3030using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    3131using HeuristicLab.Problems.VehicleRouting.Interfaces;
     
    3333namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
    3434  [Item("VRPProblemInstance", "Represents a VRP instance.")]
    35   [StorableClass]
     35  [StorableType("3ad29012-6df5-4dba-8147-81f097272a6f")]
    3636  public abstract class VRPProblemInstance : ParameterizedNamedItem, IVRPProblemInstance, IStatefulItem {
    3737    IVRPEvaluator moveEvaluator;
Note: See TracChangeset for help on using the changeset viewer.