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/Analyzer/BestAverageWorstTours
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestAverageWorstTours/BestAverageWorstVRPToursAnalyzer.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization.Operators;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3333using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3838  /// </summary>
    3939  [Item("BestAverageWorstVRPToursAnalyzer", "An operator which analyzes the best, average and worst properties of the VRP tours in the scope tree.")]
    40   [StorableClass]
     40  [StorableType("5DF1280C-5FEB-451E-8132-168E515CF47D")]
    4141  public sealed class BestAverageWorstVRPToursAnalyzer : AlgorithmOperator, IAnalyzer, IGeneralVRPOperator {
    4242    #region Parameter properties
    … …  
    179179    }
    180180    [StorableConstructor]
    181     private BestAverageWorstVRPToursAnalyzer(bool deserializing) : base() { }
     181    private BestAverageWorstVRPToursAnalyzer(StorableConstructorFlag _) : base(_) { }
    182182
    183183    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestAverageWorstTours/BestAverageWorstVRPToursCalculator.cs

    r16453 r16462  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Problems.VehicleRouting {
    3030  [Item("BestAverageWorstVRPToursCalculator", "An operator which calculates the current best, average and worst properties of VRP tours in the scope tree.")]
    31   [StorableClass]
     31  [StorableType("22DF27FC-17D0-4220-9B5D-C326DF47175C")]
    3232  public sealed class BestAverageWorstVRPToursCalculator : SingleSuccessorOperator {
    3333    public ScopeTreeLookupParameter<DoubleValue> DistanceParameter {
    … …  
    7171
    7272    [StorableConstructor]
    73     private BestAverageWorstVRPToursCalculator(bool deserializing) : base(deserializing) { }
     73    private BestAverageWorstVRPToursCalculator(StorableConstructorFlag _) : base(_) { }
    7474
    7575    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestAverageWorstTours/BestVRPToursMemorizer.cs

    r16453 r16462  
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting {
    3131  [Item("BestVRPToursMemorizer", "An operator that updates the best VRP tour found so far in the scope three.")]
    32   [StorableClass]
     32  [StorableType("3E5AF7DC-B85A-453B-8502-DC4FF45EE637")]
    3333  public class BestVRPToursMemorizer : SingleSuccessorOperator {
    3434    public ScopeTreeLookupParameter<DoubleValue> DistanceParameter {
    … …  
    5757
    5858    [StorableConstructor]
    59     protected BestVRPToursMemorizer(bool deserializing) : base(deserializing) { }
     59    protected BestVRPToursMemorizer(StorableConstructorFlag _) : base(_) { }
    6060
    6161    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestAverageWorstTours/Capacitated/BestAverageWorstCapacitatedVRPToursAnalyzer.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization.Operators;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3333using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3838  /// </summary>
    3939  [Item("BestAverageWorstCapaciatatedVRPToursAnalyzer", "An operator which analyzes the best, average and worst properties of the VRP tours in the scope tree.")]
    40   [StorableClass]
     40  [StorableType("20B56A45-8112-4D41-9C1D-EC563D0FDF75")]
    4141  public sealed class BestAverageWorstCapaciatatedVRPToursAnalyzer : AlgorithmOperator, IAnalyzer, IHomogenousCapacitatedOperator {
    4242    #region Parameter properties
    … …  
    132132    }
    133133    [StorableConstructor]
    134     private BestAverageWorstCapaciatatedVRPToursAnalyzer(bool deserializing) : base() { }
     134    private BestAverageWorstCapaciatatedVRPToursAnalyzer(StorableConstructorFlag _) : base(_) { }
    135135
    136136    [StorableHook(HookType.AfterDeserialization)]

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestAverageWorstTours/Capacitated/BestAverageWorstCapacitatedVRPToursCalculator.cs

    r16453 r16462  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Problems.VehicleRouting {
    3030  [Item("BestAverageWorstCapacitatedVRPToursCalculator", "An operator which calculates the current best, average and worst properties of VRP tours in the scope tree.")]
    31   [StorableClass]
     31  [StorableType("CAF65472-0C4E-4564-B750-61F6924AA284")]
    3232  public sealed class BestAverageWorstCapacitatedVRPToursCalculator : SingleSuccessorOperator {
    3333    public ScopeTreeLookupParameter<DoubleValue> OverloadParameter {
    … …  
    6161
    6262    [StorableConstructor]
    63     private BestAverageWorstCapacitatedVRPToursCalculator(bool deserializing) : base(deserializing) { }
     63    private BestAverageWorstCapacitatedVRPToursCalculator(StorableConstructorFlag _) : base(_) { }
    6464
    6565    private void UpdateOverloads() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestAverageWorstTours/Capacitated/BestCapacitatedVRPToursMemorizer.cs

    r16453 r16462  
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting {
    3131  [Item("BestCapacitatedVRPToursMemorizer", "An operator that updates the best VRP tour found so far in the scope three.")]
    32   [StorableClass]
     32  [StorableType("888B45AA-2037-49EB-ACD9-36F7D593D320")]
    3333  public class BestCapacitatedVRPToursMemorizer : SingleSuccessorOperator {
    3434    public ScopeTreeLookupParameter<DoubleValue> OverloadParameter {
    … …  
    5656
    5757    [StorableConstructor]
    58     protected BestCapacitatedVRPToursMemorizer(bool deserializing) : base(deserializing) { }
     58    protected BestCapacitatedVRPToursMemorizer(StorableConstructorFlag _) : base(_) { }
    5959
    6060    public override IOperation Apply() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestAverageWorstTours/PickupAndDelivery/BestAverageWorstPickupAndDeliveryVRPToursAnalyzer.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization.Operators;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3333using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3838  /// </summary>
    3939  [Item("BestAverageWorstPickupAndDeliveryVRPToursAnalyzer", "An operator which analyzes the best, average and worst properties of the VRP tours in the scope tree.")]
    40   [StorableClass]
     40  [StorableType("B2B231AD-3B1A-4BD0-B6C3-F249A858BAE9")]
    4141  public sealed class BestAverageWorstPickupAndDeliveryVRPToursAnalyzer : AlgorithmOperator, IAnalyzer, IPickupAndDeliveryOperator {
    4242    #region Parameter properties
    … …  
    132132    }
    133133    [StorableConstructor]
    134     private BestAverageWorstPickupAndDeliveryVRPToursAnalyzer(bool deserializing) : base() { }
     134    private BestAverageWorstPickupAndDeliveryVRPToursAnalyzer(StorableConstructorFlag _) : base(_) { }
    135135
    136136    [StorableHook(HookType.AfterDeserialization)]

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestAverageWorstTours/PickupAndDelivery/BestAverageWorstPickupAndDeliveryVRPToursCalculator.cs

    r16453 r16462  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Problems.VehicleRouting {
    3030  [Item("BestAverageWorstPickupAndDeliveryVRPToursCalculator", "An operator which calculates the current best, average and worst properties of VRP tours in the scope tree.")]
    31   [StorableClass]
     31  [StorableType("C6F8ED53-EF3E-49E5-9D29-227E870AF3D8")]
    3232  public sealed class BestAverageWorstPickupAndDeliveryVRPToursCalculator : SingleSuccessorOperator {
    3333    public ScopeTreeLookupParameter<IntValue> PickupViolationsParameter {
    … …  
    6161
    6262    [StorableConstructor]
    63     private BestAverageWorstPickupAndDeliveryVRPToursCalculator(bool deserializing) : base(deserializing) { }
     63    private BestAverageWorstPickupAndDeliveryVRPToursCalculator(StorableConstructorFlag _) : base(_) { }
    6464
    6565    private void UpdatePickupViolations() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestAverageWorstTours/PickupAndDelivery/BestPickupAndDeliveryVRPToursMemorizer.cs

    r16453 r16462  
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting {
    3131  [Item("BestPickupAndDeliveryVRPToursMemorizer", "An operator that updates the best VRP tour found so far in the scope three.")]
    32   [StorableClass]
     32  [StorableType("F9371738-574B-4658-BB10-12F29C951F72")]
    3333  public class BestPickupAndDeliveryVRPToursMemorizer : SingleSuccessorOperator {
    3434    public ScopeTreeLookupParameter<IntValue> PickupViolationsParameter {
    … …  
    5656
    5757    [StorableConstructor]
    58     protected BestPickupAndDeliveryVRPToursMemorizer(bool deserializing) : base(deserializing) { }
     58    protected BestPickupAndDeliveryVRPToursMemorizer(StorableConstructorFlag _) : base(_) { }
    5959
    6060    public override IOperation Apply() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestAverageWorstTours/TimeWindowed/BestAverageWorstTimeWindowedVRPToursAnalyzer.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization.Operators;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3333using HeuristicLab.Problems.VehicleRouting.Variants;
    … …  
    3838  /// </summary>
    3939  [Item("BestAverageWorstTimeWindowedVRPToursAnalyzer", "An operator which analyzes the best, average and worst properties of the VRP tours in the scope tree.")]
    40   [StorableClass]
     40  [StorableType("EBEDE5FC-0AA9-4F99-986A-5499A8C8C506")]
    4141  public sealed class BestAverageWorstTimeWindowedVRPToursAnalyzer : AlgorithmOperator, IAnalyzer, ITimeWindowedOperator {
    4242    #region Parameter properties
    … …  
    179179    }
    180180    [StorableConstructor]
    181     private BestAverageWorstTimeWindowedVRPToursAnalyzer(bool deserializing) : base() { }
     181    private BestAverageWorstTimeWindowedVRPToursAnalyzer(StorableConstructorFlag _) : base(_) { }
    182182
    183183    [StorableHook(HookType.AfterDeserialization)]

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestAverageWorstTours/TimeWindowed/BestAverageWorstTimeWindowedVRPToursCalculator.cs

    r16453 r16462  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Problems.VehicleRouting {
    3030  [Item("BestAverageWorstTimeWindowedVRPToursCalculator", "An operator which calculates the current best, average and worst properties of VRP tours in the scope tree.")]
    31   [StorableClass]
     31  [StorableType("2B7EA9C1-4036-497F-861D-771679ADAAE7")]
    3232  public sealed class BestAverageWorstTimeWindowedVRPToursCalculator : SingleSuccessorOperator {
    3333    public ScopeTreeLookupParameter<DoubleValue> TardinessParameter {
    … …  
    7171
    7272    [StorableConstructor]
    73     private BestAverageWorstTimeWindowedVRPToursCalculator(bool deserializing) : base(deserializing) { }
     73    private BestAverageWorstTimeWindowedVRPToursCalculator(StorableConstructorFlag _) : base(_) { }
    7474
    7575    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestAverageWorstTours/TimeWindowed/BestTimeWindowedVRPToursMemorizer.cs

    r16453 r16462  
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.VehicleRouting {
    3131  [Item("BestTimeWindowedVRPToursMemorizer", "An operator that updates the best VRP tour found so far in the scope three.")]
    32   [StorableClass]
     32  [StorableType("74E88AF0-67A4-41FC-8235-4B72253C95BE")]
    3333  public class BestTimeWindowedVRPToursMemorizer : SingleSuccessorOperator {
    3434    public ScopeTreeLookupParameter<DoubleValue> TardinessParameter {
    … …  
    7272
    7373    [StorableConstructor]
    74     protected BestTimeWindowedVRPToursMemorizer(bool deserializing) : base(deserializing) { }
     74    protected BestTimeWindowedVRPToursMemorizer(StorableConstructorFlag _) : base(_) { }
    7575
    7676    public override IDeepCloneable Clone(Cloner cloner) {
Note: See TracChangeset for help on using the changeset viewer.