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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.VehicleRouting

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/Interfaces/IMultiVRPMoveGenerator.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.
    … …  
    2121
    2222using HeuristicLab.Optimization;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
     26  [StorableType("27EF7230-78A6-48B5-88A7-AAC70C538FCA")]
    2527  public interface IMultiVRPMoveGenerator : IMultiVRPMoveOperator, ISingleMoveGenerator {
    2628  }

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/Interfaces/IMultiVRPMoveOperator.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.
    … …  
    2121
    2222using HeuristicLab.Problems.VehicleRouting.Interfaces;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
     26  [StorableType("C48B8EF1-F37C-4F0D-B4D7-B5A5B68CD9B7")]
    2527  public interface IMultiVRPMoveOperator : IVRPMoveOperator {
    2628  }

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/Interfaces/IVRPMove.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.Core;
    2323using HeuristicLab.Optimization;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
     27  [StorableType("2F7FBB88-86B4-4B13-91C7-6BFF0786291B")]
    2628  public interface IVRPMove : IItem {
    2729    VRPMoveEvaluator GetMoveEvaluator();

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.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.
    … …  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2727using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    2929namespace HeuristicLab.Problems.VehicleRouting {
    3030  [Item("MultiVRPMoveEvaluator", "Evaluates a move for the VRP representation.")]
    31   [StorableClass]
     31  [StorableType("CF6F48D1-D488-4266-8F46-68EC1A0A7828")]
    3232  public sealed class MultiVRPMoveEvaluator : VRPMoveEvaluator, IMultiVRPMoveOperator, IGeneralVRPOperator {
    3333    public override ILookupParameter VRPMoveParameter {
    … …  
    3636
    3737    [StorableConstructor]
    38     private MultiVRPMoveEvaluator(bool deserializing) : base(deserializing) { }
     38    private MultiVRPMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    3939
    4040    public MultiVRPMoveEvaluator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.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.
    … …  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    3333using HeuristicLab.Problems.VehicleRouting.Encodings.Alba;
    3434using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin;
    … …  
    3838namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
    3939  [Item("MultiVRPMoveGenerator", "Randomly selects and applies its move generators.")]
    40   [StorableClass]
     40  [StorableType("2BB3FF78-447F-4FCD-B866-D28D295ABF0E")]
    4141  public class MultiVRPMoveGenerator : CheckedMultiOperator<IMultiVRPMoveGenerator>, IMultiVRPMoveOperator,
    4242    IStochasticOperator, IMoveGenerator, IGeneralVRPOperator, IMultiVRPOperator {
    … …  
    7878
    7979    [StorableConstructor]
    80     protected MultiVRPMoveGenerator(bool deserializing) : base(deserializing) { }
     80    protected MultiVRPMoveGenerator(StorableConstructorFlag _) : base(_) { }
    8181    public MultiVRPMoveGenerator()
    8282      : base() {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveMaker.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.
    … …  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.VehicleRouting.Variants;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
    2929  [Item("MultiVRPMoveMaker", "Peforms a lambda interchange moves on a given VRP encoding and updates the quality.")]
    30   [StorableClass]
     30  [StorableType("E0D91D91-A8CC-459D-9D65-180D507A75AD")]
    3131  public class MultiVRPMoveMaker : VRPMoveMaker, IMultiVRPMoveOperator, IGeneralVRPOperator {
    3232    public override ILookupParameter VRPMoveParameter {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected MultiVRPMoveMaker(bool deserializing) : base(deserializing) { }
     37    protected MultiVRPMoveMaker(StorableConstructorFlag _) : base(_) { }
    3838
    3939    public MultiVRPMoveMaker()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveTabuChecker.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.Optimization;
    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.Encodings.General {
    3333  [Item("MultiVRPMoveTabuChecker", "Checks if a VRP move is tabu.")]
    34   [StorableClass]
     34  [StorableType("5688A0E6-7EB0-43E2-9D9F-AB68D689148B")]
    3535  public class MultiVRPMoveTabuChecker : SingleSuccessorOperator, IMultiVRPMoveOperator, ITabuChecker, IGeneralVRPOperator {
    3636    public ILookupParameter VRPMoveParameter {
    … …  
    6767
    6868    [StorableConstructor]
    69     protected MultiVRPMoveTabuChecker(bool deserializing) : base(deserializing) { }
     69    protected MultiVRPMoveTabuChecker(StorableConstructorFlag _) : base(_) { }
    7070
    7171    public MultiVRPMoveTabuChecker()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveTabuMaker.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.Optimization;
    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.Encodings.General {
    3333  [Item("MultiVRPMoveTabuMaker", "A multi VRP move tabu maker.")]
    34   [StorableClass]
     34  [StorableType("58E2C5A6-88CF-460B-8684-E38E2E64F648")]
    3535  public class MultiVRPMoveTabuMaker : SingleSuccessorOperator, IMultiVRPMoveOperator, ITabuMaker, IGeneralVRPOperator, ISingleObjectiveOperator {
    3636    public ILookupParameter VRPMoveParameter {
    … …  
    6060
    6161    [StorableConstructor]
    62     protected MultiVRPMoveTabuMaker(bool deserializing) : base(deserializing) { }
     62    protected MultiVRPMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    6363
    6464    public MultiVRPMoveTabuMaker()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveAttribute.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;
    2525
    2626namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
    2727  [Item("VRPMoveAttribute", "Base class for specifying a move attribute")]
    28   [StorableClass]
     28  [StorableType("61460C9F-D313-47C1-9894-A6A5E4852DBB")]
    2929  public class VRPMoveAttribute : Item {
    3030    [Storable]
    … …  
    3232
    3333    [StorableConstructor]
    34     protected VRPMoveAttribute(bool deserializing) : base(deserializing) { }
     34    protected VRPMoveAttribute(StorableConstructorFlag _) : base(_) { }
    3535    protected VRPMoveAttribute(VRPMoveAttribute original, Cloner cloner)
    3636      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveEvaluator.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.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
    3131  [Item("VRPMoveEvaluator", "Evaluates a VRP move.")]
    32   [StorableClass]
     32  [StorableType("2C1B7479-DCD7-41F7-BB65-D1D714313172")]
    3333  public abstract class VRPMoveEvaluator : VRPMoveOperator, ISingleObjectiveMoveEvaluator {
    3434    public const string MovePrefix = "Move";
    … …  
    4545
    4646    [StorableConstructor]
    47     protected VRPMoveEvaluator(bool deserializing) : base(deserializing) { }
     47    protected VRPMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4848
    4949    public VRPMoveEvaluator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveGenerator.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.
    … …  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Optimization;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
    2828  [Item("VRPMoveGenerator", "Generates moves for a VRP solution.")]
    29   [StorableClass]
     29  [StorableType("B76BD2D8-2D37-4006-86AF-64A1D28DC26D")]
    3030  public abstract class
    3131    VRPMoveGenerator : VRPMoveOperator, IMoveGenerator {
    3232    [StorableConstructor]
    33     protected VRPMoveGenerator(bool deserializing) : base(deserializing) { }
     33    protected VRPMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3434
    3535    public VRPMoveGenerator()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveMaker.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.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3030
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
    3232  [Item("VRPMoveMaker", "Performs a VRP move.")]
    33   [StorableClass]
     33  [StorableType("00082602-A676-48A7-A2D7-66733B972685")]
    3434  public abstract class VRPMoveMaker : VRPMoveOperator, IMoveMaker, ISingleObjectiveOperator {
    3535    public ILookupParameter<DoubleValue> QualityParameter {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected VRPMoveMaker(bool deserializing) : base(deserializing) { }
     46    protected VRPMoveMaker(StorableConstructorFlag _) : base(_) { }
    4747
    4848    public VRPMoveMaker()

  • trunk/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveOperator.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.
    … …  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
    2929  [Item("VRPMoveOperator", "A VRP move operator.")]
    30   [StorableClass]
     30  [StorableType("B2A37CCE-3EF6-4648-8A9B-2BCBD4EC93F1")]
    3131  public abstract class VRPMoveOperator : VRPOperator, IVRPMoveOperator {
    3232    public ILookupParameter<IVRPEncoding> VRPToursParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected VRPMoveOperator(bool deserializing) : base(deserializing) { }
     39    protected VRPMoveOperator(StorableConstructorFlag _) : base(_) { }
    4040
    4141    public VRPMoveOperator() {
Note: See TracChangeset for help on using the changeset viewer.