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.PTSP/3.3/Improvers
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPAnalyticalInsertionLocalImprovement.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.PTSP {
    … …  
    3939  /// </remarks>
    4040  [Item("PTSP Analytical Insertion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]
    41   [StorableClass]
     41  [StorableType("D63C6CB3-A5EF-4270-A252-2F5EBF1ED163")]
    4242  public sealed class PTSPAnalyticalInsertionLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, ILocalImprovementOperator {
    4343
    … …  
    7979
    8080    [StorableConstructor]
    81     private PTSPAnalyticalInsertionLocalImprovement(bool deserializing) : base(deserializing) { }
     81    private PTSPAnalyticalInsertionLocalImprovement(StorableConstructorFlag _) : base(_) { }
    8282    private PTSPAnalyticalInsertionLocalImprovement(PTSPAnalyticalInsertionLocalImprovement original, Cloner cloner) : base(original, cloner) { }
    8383    public PTSPAnalyticalInsertionLocalImprovement()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPAnalyticalInversionLocalImprovement.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.PTSP {
    … …  
    3939  /// </remarks>
    4040  [Item("PTSP Analytical Inversion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]
    41   [StorableClass]
     41  [StorableType("1594EB4E-A874-485A-B1D5-E622F9FF3FD8")]
    4242  public sealed class PTSPAnalyticalInversionLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, ILocalImprovementOperator {
    4343
    … …  
    7979
    8080    [StorableConstructor]
    81     private PTSPAnalyticalInversionLocalImprovement(bool deserializing) : base(deserializing) { }
     81    private PTSPAnalyticalInversionLocalImprovement(StorableConstructorFlag _) : base(_) { }
    8282    private PTSPAnalyticalInversionLocalImprovement(PTSPAnalyticalInversionLocalImprovement original, Cloner cloner) : base(original, cloner) { }
    8383    public PTSPAnalyticalInversionLocalImprovement()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPAnalyticalTwoPointFiveLocalImprovement.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.PTSP {
    … …  
    3939  /// </remarks>
    4040  [Item("PTSP Analytical 2.5 Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]
    41   [StorableClass]
     41  [StorableType("C139639F-D6DD-4756-8482-24F12A78C8E9")]
    4242  public sealed class PTSPAnalyticalTwoPointFiveLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, ILocalImprovementOperator {
    4343
    … …  
    7979
    8080    [StorableConstructor]
    81     private PTSPAnalyticalTwoPointFiveLocalImprovement(bool deserializing) : base(deserializing) { }
     81    private PTSPAnalyticalTwoPointFiveLocalImprovement(StorableConstructorFlag _) : base(_) { }
    8282    private PTSPAnalyticalTwoPointFiveLocalImprovement(PTSPAnalyticalTwoPointFiveLocalImprovement original, Cloner cloner) : base(original, cloner) { }
    8383    public PTSPAnalyticalTwoPointFiveLocalImprovement()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPEstimatedInsertionLocalImprovement.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.PTSP {
    … …  
    3939  /// </remarks>
    4040  [Item("PTSP Estimated Insertion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]
    41   [StorableClass]
     41  [StorableType("B2D60579-A97D-4E44-B11C-61CDA6EBEBA7")]
    4242  public sealed class PTSPEstimatedInsertionLocalImprovement : SingleSuccessorOperator, IEstimatedPTSPOperator, ILocalImprovementOperator {
    4343
    … …  
    7979
    8080    [StorableConstructor]
    81     private PTSPEstimatedInsertionLocalImprovement(bool deserializing) : base(deserializing) { }
     81    private PTSPEstimatedInsertionLocalImprovement(StorableConstructorFlag _) : base(_) { }
    8282    private PTSPEstimatedInsertionLocalImprovement(PTSPEstimatedInsertionLocalImprovement original, Cloner cloner) : base(original, cloner) { }
    8383    public PTSPEstimatedInsertionLocalImprovement()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPEstimatedInversionLocalImprovement.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.PTSP {
    … …  
    3939  /// </remarks>
    4040  [Item("PTSP Estimated Inversion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]
    41   [StorableClass]
     41  [StorableType("AA67F3B1-2667-4F0B-A79F-4A02B89EE977")]
    4242  public sealed class PTSPEstimatedInversionLocalImprovement : SingleSuccessorOperator, IEstimatedPTSPOperator, ILocalImprovementOperator {
    4343
    … …  
    7979
    8080    [StorableConstructor]
    81     private PTSPEstimatedInversionLocalImprovement(bool deserializing) : base(deserializing) { }
     81    private PTSPEstimatedInversionLocalImprovement(StorableConstructorFlag _) : base(_) { }
    8282    private PTSPEstimatedInversionLocalImprovement(PTSPEstimatedInversionLocalImprovement original, Cloner cloner) : base(original, cloner) { }
    8383    public PTSPEstimatedInversionLocalImprovement()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPEstimatedTwoPointFiveLocalImprovement.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.PTSP {
    … …  
    3939  /// </remarks>
    4040  [Item("PTSP Estimated 2.5 Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]
    41   [StorableClass]
     41  [StorableType("8B04265A-50AD-4FAD-99F8-2357D6F10CC3")]
    4242  public sealed class PTSPEstimatedTwoPointFiveLocalImprovement : SingleSuccessorOperator, IEstimatedPTSPOperator, ILocalImprovementOperator {
    4343
    … …  
    7979
    8080    [StorableConstructor]
    81     private PTSPEstimatedTwoPointFiveLocalImprovement(bool deserializing) : base(deserializing) { }
     81    private PTSPEstimatedTwoPointFiveLocalImprovement(StorableConstructorFlag _) : base(_) { }
    8282    private PTSPEstimatedTwoPointFiveLocalImprovement(PTSPEstimatedTwoPointFiveLocalImprovement original, Cloner cloner) : base(original, cloner) { }
    8383    public PTSPEstimatedTwoPointFiveLocalImprovement()
Note: See TracChangeset for help on using the changeset viewer.