Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/28/18 16:10:48 (6 years ago)
Author:
jkarder
Message:

#2520: worked on reintegration of new persistence

  • added nuget references to HEAL.Fossil
  • added StorableType attributes to many classes
  • changed signature of StorableConstructors
  • removed some classes in old persistence
  • removed some unnecessary usings
Location:
branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarExhaustiveMoveGenerator.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2828
    2929namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3030  [Item("PotvinTwoOptStarExhaustiveMoveGenerator", "Generates two opt star moves from a given VRP encoding.")]
    31   [StorableClass]
     31  [StorableType("1479DAA2-D7A9-4043-A485-F54F75C1A2DB")]
    3232  public sealed class PotvinTwoOptStarExhaustiveMoveGenerator : PotvinTwoOptStarMoveGenerator, IExhaustiveMoveGenerator {
    3333    public override IDeepCloneable Clone(Cloner cloner) {
    … …  
    3636
    3737    [StorableConstructor]
    38     private PotvinTwoOptStarExhaustiveMoveGenerator(bool deserializing) : base(deserializing) { }
     38    private PotvinTwoOptStarExhaustiveMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3939
    4040    public PotvinTwoOptStarExhaustiveMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMove.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Optimization;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2727using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    2929namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3030  [Item("PotvinTwoOptStarMove", "Item that describes a two opt star move on a VRP representation.")]
    31   [StorableClass]
     31  [StorableType("54EBE079-E698-46A6-BCD3-033C0EA3B2DB")]
    3232  public class PotvinTwoOptStarMove : Item, IVRPMove {
    3333    [Storable]
    … …  
    8080
    8181    [StorableConstructor]
    82     protected PotvinTwoOptStarMove(bool deserializing) : base(deserializing) { }
     82    protected PotvinTwoOptStarMove(StorableConstructorFlag _) : base(_) { }
    8383
    8484    #region IVRPMove Members

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMoveAttribute.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2828  [Item("PotvinTwoOptStarMoveAttribute", "Two opt star move attribute")]
    29   [StorableClass]
     29  [StorableType("BE6E1C1B-335A-4FDB-9105-A7304380510E")]
    3030  public class PotvinTwoOptStarMoveAttribute : VRPMoveAttribute {
    3131    [Storable]
    … …  
    4242
    4343    [StorableConstructor]
    44     protected PotvinTwoOptStarMoveAttribute(bool deserializing) : base(deserializing) { }
     44    protected PotvinTwoOptStarMoveAttribute(StorableConstructorFlag _) : base(_) { }
    4545    protected PotvinTwoOptStarMoveAttribute(PotvinTwoOptStarMoveAttribute original, Cloner cloner)
    4646      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMoveEvaluator.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2828  [Item("PotvinTwoOptStarMoveEvaluator", "Evaluates a two opt star move for a VRP representation. ")]
    29   [StorableClass]
     29  [StorableType("5CB2E8F6-191E-4EBE-B832-18BECC9BB19B")]
    3030  public sealed class PotvinTwoOptStarMoveEvaluator : PotvinMoveEvaluator, IPotvinTwoOptStarMoveOperator {
    3131    public ILookupParameter<PotvinTwoOptStarMove> TwoOptStarMoveParameter {
    … …  
    3737    }
    3838    [StorableConstructor]
    39     private PotvinTwoOptStarMoveEvaluator(bool deserializing) : base(deserializing) { }
     39    private PotvinTwoOptStarMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4040
    4141    public PotvinTwoOptStarMoveEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMoveGenerator.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2727
    2828namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    2929  [Item("PotvinTwoOptStarMoveGenerator", "Generates two opt star moves from a given VRP encoding.")]
    30   [StorableClass]
     30  [StorableType("DDAD1DFC-3E6D-42DD-B4ED-24AC44D968A9")]
    3131  public abstract class PotvinTwoOptStarMoveGenerator : PotvinMoveGenerator, IPotvinTwoOptStarMoveOperator {
    3232    public ILookupParameter<PotvinTwoOptStarMove> TwoOptStarMoveParameter {
    … …  
    4343
    4444    [StorableConstructor]
    45     protected PotvinTwoOptStarMoveGenerator(bool deserializing) : base(deserializing) { }
     45    protected PotvinTwoOptStarMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4646
    4747    public PotvinTwoOptStarMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMoveMaker.cs

    r16453 r16462  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinTwoOptStarMoveMaker", "Peforms the two opt star move on a given VRP encoding and updates the quality.")]
    32   [StorableClass]
     32  [StorableType("3DCD4D99-DED9-48FB-953C-332F27A6E4D9")]
    3333  public class PotvinTwoOptStarMoveMaker : PotvinMoveMaker, IPotvinTwoOptStarMoveOperator, IMoveMaker {
    3434    public ILookupParameter<PotvinTwoOptStarMove> TwoOptStarMoveParameter {
    … …  
    4141
    4242    [StorableConstructor]
    43     protected PotvinTwoOptStarMoveMaker(bool deserializing) : base(deserializing) { }
     43    protected PotvinTwoOptStarMoveMaker(StorableConstructorFlag _) : base(_) { }
    4444
    4545    public PotvinTwoOptStarMoveMaker()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMoveTabuCriterion.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3131using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3333namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3434  [Item("PotvinTwoOptStarTabuCriterion", @"Checks if a certain two opt star move is tabu.")]
    35   [StorableClass]
     35  [StorableType("B00189B4-0B8A-444D-BE71-B55C7DCA0EC4")]
    3636  public class PotvinTwoOptStarMoveTabuCriterion : SingleSuccessorOperator, IPotvinTwoOptStarMoveOperator, ITabuChecker, IPotvinOperator, IVRPMoveOperator {
    3737    public override bool CanChangeName {
    … …  
    8484
    8585    [StorableConstructor]
    86     protected PotvinTwoOptStarMoveTabuCriterion(bool deserializing) : base(deserializing) { }
     86    protected PotvinTwoOptStarMoveTabuCriterion(StorableConstructorFlag _) : base(_) { }
    8787    protected PotvinTwoOptStarMoveTabuCriterion(PotvinTwoOptStarMoveTabuCriterion original, Cloner cloner) : base(original, cloner) { }
    8888    public PotvinTwoOptStarMoveTabuCriterion()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMoveTabuMaker.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3131
    3232namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3333  [Item("PotvinTwoOptStarMoveTabuMaker", "Declares a given two opt star move as tabu.")]
    34   [StorableClass]
     34  [StorableType("4F4D7E5C-3C43-4795-AEB6-680740F04F14")]
    3535  public class PotvinTwoOptStarMoveTabuMaker : SingleSuccessorOperator, ITabuMaker, IPotvinTwoOptStarMoveOperator, IPotvinOperator, ISingleObjectiveOperator {
    3636    public LookupParameter<ItemList<IItem>> TabuListParameter {
    … …  
    7575
    7676    [StorableConstructor]
    77     protected PotvinTwoOptStarMoveTabuMaker(bool deserializing) : base(deserializing) { }
     77    protected PotvinTwoOptStarMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    7878    protected PotvinTwoOptStarMoveTabuMaker(PotvinTwoOptStarMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
    7979    public PotvinTwoOptStarMoveTabuMaker()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMultiMoveGenerator.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    3030using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3232namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3333  [Item("PotvinTwoOptStarMultiMoveGenerator", "Generates two opt star moves from a given VRP encoding.")]
    34   [StorableClass]
     34  [StorableType("4CA15027-BFF3-4D23-9AAA-291BCC4C9BCC")]
    3535  public sealed class PotvinTwoOptStarMultiMoveGenerator : PotvinTwoOptStarMoveGenerator, IMultiMoveGenerator, IMultiVRPMoveGenerator {
    3636    public ILookupParameter<IRandom> RandomParameter {
    … …  
    4747
    4848    [StorableConstructor]
    49     private PotvinTwoOptStarMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     49    private PotvinTwoOptStarMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5050
    5151    public PotvinTwoOptStarMultiMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarSingleMoveGenerator.cs

    r16453 r16462  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3131  [Item("PotvinTwoOptStarSingleMoveGenerator", "Generates a single two opt star move from a given VRP encoding.")]
    32   [StorableClass]
     32  [StorableType("DEA1CE97-AE5F-4357-B51C-8802DFF69391")]
    3333  public sealed class PotvinTwoOptStarSingleMoveGenerator : PotvinTwoOptStarMoveGenerator,
    3434    ISingleMoveGenerator {
    … …  
    5050
    5151    [StorableConstructor]
    52     private PotvinTwoOptStarSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     52    private PotvinTwoOptStarSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5353
    5454    public PotvinTwoOptStarSingleMoveGenerator()
Note: See TracChangeset for help on using the changeset viewer.