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/Alba/Moves/ThreeOpt
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaStochasticTranslocationSingleMoveGenerator.cs

    r16453 r16462  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Encodings.PermutationEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Problems.VehicleRouting.Interfaces;
    2828
    2929namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3030  [Item("AlbaStochasticTranslocationSingleMoveGenerator", "An operator which generates a single translocation move for a VRP representation.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    31   [StorableClass]
     31  [StorableType("AB2D93A5-BECF-4ABE-B704-5DA883426CAF")]
    3232  public sealed class AlbaStochasticTranslocationSingleMoveGenerator : AlbaMoveGenerator, IAlbaTranslocationMoveOperator {
    3333    [Storable]
    … …  
    5555
    5656    [StorableConstructor]
    57     private AlbaStochasticTranslocationSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     57    private AlbaStochasticTranslocationSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5858
    5959    public AlbaStochasticTranslocationSingleMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMove.cs

    r16453 r16462  
    2424using HeuristicLab.Encodings.PermutationEncoding;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2828using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3030namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3131  [Item("AlbaTranslocationMove", "Item that describes a translocation move on a VRP representation.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    32   [StorableClass]
     32  [StorableType("C9BA8BFE-712F-4575-82E6-B94C604C001B")]
    3333  public class AlbaTranslocationMove : TranslocationMove, IVRPMove {
    3434    public IVRPEncoding Individual { get { return Permutation as AlbaEncoding; } }
    … …  
    4343
    4444    [StorableConstructor]
    45     protected AlbaTranslocationMove(bool deserializing) : base(deserializing) { }
     45    protected AlbaTranslocationMove(StorableConstructorFlag _) : base(_) { }
    4646
    4747    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveEvaluator.cs

    r16453 r16462  
    2424using HeuristicLab.Encodings.PermutationEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Problems.VehicleRouting.Encodings.Alba;
    2828
    2929namespace HeuristicLab.Problems.VehicleRouting {
    3030  [Item("AlbaTranslocationMoveEvaluator", "Evaluates a translocation or insertion move (3-opt) for a VRP representation.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    31   [StorableClass]
     31  [StorableType("36E23651-0091-4CE9-869F-BACA65464D72")]
    3232  public sealed class AlbaTranslocationMoveEvaluator : AlbaMoveEvaluator, IAlbaTranslocationMoveOperator {
    3333    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
    … …  
    4141
    4242    [StorableConstructor]
    43     private AlbaTranslocationMoveEvaluator(bool deserializing) : base(deserializing) { }
     43    private AlbaTranslocationMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4444
    4545    public AlbaTranslocationMoveEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveGenerator.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3030
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3232  [Item("AlbaTranslocationMoveGenerator", "An operator which generates translocation moves for a VRP representation.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    33   [StorableClass]
     33  [StorableType("695BBC5B-7A11-4AE5-83E6-9EEA9979E791")]
    3434  public sealed class AlbaTranslocationMoveGenerator : AlbaMoveGenerator, IAlbaTranslocationMoveOperator, IMultiMoveGenerator {
    3535    public IValueLookupParameter<TranslocationMoveGenerator> TranslocationMoveGeneratorParameter {
    … …  
    7474
    7575    [StorableConstructor]
    76     private AlbaTranslocationMoveGenerator(bool deserializing) : base(deserializing) { }
     76    private AlbaTranslocationMoveGenerator(StorableConstructorFlag _) : base(_) { }
    7777
    7878    public AlbaTranslocationMoveGenerator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveHardTabuCriterion.cs

    r16453 r16462  
    2525using HeuristicLab.Encodings.PermutationEncoding;
    2626using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3232  [Item("AlbaTranslocationMoveHardTabuCriterion", "An operator which checks if translocation moves are tabu using a hard criterion for a VRP representation.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    33   [StorableClass]
     33  [StorableType("1148F3AA-FDE0-4604-8517-777E87F1CEA0")]
    3434  public sealed class AlbaTranslocationMoveHardTabuCriterion : VRPMoveOperator, IAlbaTranslocationMoveOperator, ITabuChecker, IAlbaOperator {
    3535    [Storable]
    … …  
    6565
    6666    [StorableConstructor]
    67     private AlbaTranslocationMoveHardTabuCriterion(bool deserializing) : base(deserializing) { }
     67    private AlbaTranslocationMoveHardTabuCriterion(StorableConstructorFlag _) : base(_) { }
    6868
    6969    public AlbaTranslocationMoveHardTabuCriterion()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveMaker.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.PermutationEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    2828  [Item("AlbaTranslocationMoveMaker", "An operator which makes translocation moves for a VRP representation.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    29   [StorableClass]
     29  [StorableType("3E2624B9-AC8D-4E18-9586-04E501769D3E")]
    3030  public sealed class AlbaTranslocationMoveMaker : AlbaMoveMaker, IAlbaTranslocationMoveOperator {
    3131    [Storable]
    … …  
    4545
    4646    [StorableConstructor]
    47     private AlbaTranslocationMoveMaker(bool deserializing) : base(deserializing) { }
     47    private AlbaTranslocationMoveMaker(StorableConstructorFlag _) : base(_) { }
    4848
    4949    public AlbaTranslocationMoveMaker()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveSoftTabuCriterion.cs

    r16453 r16462  
    2525using HeuristicLab.Encodings.PermutationEncoding;
    2626using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3232  [Item("AlbaTranslocationMoveSoftTabuCriterion", "An operator which checks if translocation moves are tabu using a soft criterion for a VRP representation.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    33   [StorableClass]
     33  [StorableType("E1E314E4-11E8-40F8-BC26-A49D42810E79")]
    3434  public sealed class AlbaTranslocationMoveSoftTabuCriterion : VRPMoveOperator, IAlbaTranslocationMoveOperator, ITabuChecker, IAlbaOperator {
    3535    [Storable]
    … …  
    6565
    6666    [StorableConstructor]
    67     private AlbaTranslocationMoveSoftTabuCriterion(bool deserializing) : base(deserializing) { }
     67    private AlbaTranslocationMoveSoftTabuCriterion(StorableConstructorFlag _) : base(_) { }
    6868
    6969    public AlbaTranslocationMoveSoftTabuCriterion()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveTabuMaker.cs

    r16453 r16462  
    2525using HeuristicLab.Encodings.PermutationEncoding;
    2626using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    2929using HeuristicLab.Problems.VehicleRouting.Interfaces;
    … …  
    3131namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3232  [Item("AlbaTranslocationMoveTabuMaker", "An operator which makes translocation moves tabu for a VRP representation.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    33   [StorableClass]
     33  [StorableType("7C706677-1688-4D5F-8C86-D2F479CADA40")]
    3434  public sealed class AlbaTranslocationMoveTabuMaker : VRPMoveOperator, IAlbaTranslocationMoveOperator, ITabuMaker, IAlbaOperator {
    3535    [Storable]
    … …  
    6565
    6666    [StorableConstructor]
    67     private AlbaTranslocationMoveTabuMaker(bool deserializing) : base(deserializing) { }
     67    private AlbaTranslocationMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    6868
    6969    public AlbaTranslocationMoveTabuMaker()
Note: See TracChangeset for help on using the changeset viewer.