Ignore:
Timestamp:
12/28/18 16:10:48 (12 months 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
Files:
35 edited

Legend:

Unmodified
Added
Removed
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs

    r16453 r16462  
    2727using HeuristicLab.Encodings.PermutationEncoding;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Problems.PTSP {
    3232  [Item("Analytical Probabilistic Traveling Salesman Problem (PTSP)", "Represents a probabilistic traveling salesman problem where the expected tour length is calculated exactly.")]
    3333  [Creatable(CreatableAttribute.Categories.CombinatorialProblems)]
    34   [StorableClass]
     34  [StorableType("509B6AB5-F4DE-4144-A031-43EEBAD02CA6")]
    3535  public sealed class AnalyticalProbabilisticTravelingSalesmanProblem : ProbabilisticTravelingSalesmanProblem {
    3636
    3737    [StorableConstructor]
    38     private AnalyticalProbabilisticTravelingSalesmanProblem(bool deserializing) : base(deserializing) { }
     38    private AnalyticalProbabilisticTravelingSalesmanProblem(StorableConstructorFlag _) : base(_) { }
    3939    private AnalyticalProbabilisticTravelingSalesmanProblem(AnalyticalProbabilisticTravelingSalesmanProblem original, Cloner cloner) : base(original, cloner) { }
    4040    public AnalyticalProbabilisticTravelingSalesmanProblem() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Analyzers/BestPTSPSolutionAnalyzer.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Problems.PTSP {
     
    3535  /// </summary>
    3636  [Item("BestPTSPSolutionAnalyzer", "An operator for analyzing the best solution of Probabilistic Traveling Salesman Problems given in path representation using city coordinates.")]
    37   [StorableClass]
     37  [StorableType("459505F0-379B-4903-A388-8612FD732EE7")]
    3838  public sealed class BestPTSPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    3939    public bool EnabledByDefault {
     
    7070
    7171    [StorableConstructor]
    72     private BestPTSPSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     72    private BestPTSPSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    7373    private BestPTSPSolutionAnalyzer(BestPTSPSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    7474    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/AttDistance.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Problems.Instances;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("Att Distance", "Calculates the att distance.")]
    30   [StorableClass]
     30  [StorableType("7A21281C-EED9-4FE0-A6B1-DE916A074739")]
    3131  public sealed class AttDistance : DistanceCalculator {
    3232
    3333    [StorableConstructor]
    34     private AttDistance(bool deserializing) : base(deserializing) { }
     34    private AttDistance(StorableConstructorFlag _) : base(_) { }
    3535    private AttDistance(AttDistance original, Cloner cloner) : base(original, cloner) { }
    3636    public AttDistance() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/DistanceCalculator.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Problems.PTSP {
    2828  [Item("Distance calculator", "Calculates the distance between two cities given as index of a coordinates matrix.")]
    29   [StorableClass]
     29  [StorableType("7CC7E665-A6A7-478B-B978-7079E1DDBA70")]
    3030  public abstract class DistanceCalculator : Item {
    3131    [StorableConstructor]
    32     protected DistanceCalculator(bool deserializing) : base(deserializing) { }
     32    protected DistanceCalculator(StorableConstructorFlag _) : base(_) { }
    3333    protected DistanceCalculator(DistanceCalculator original, Cloner cloner) : base(original, cloner) { }
    3434    protected DistanceCalculator() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/EuclideanDistance.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Problems.Instances;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("Euclidean Distance", "Calculates the euclidean distance.")]
    30   [StorableClass]
     30  [StorableType("D769186D-11F8-4F67-A39A-4B78184334E7")]
    3131  public sealed class EuclideanDistance : DistanceCalculator {
    3232
    3333    [StorableConstructor]
    34     private EuclideanDistance(bool deserializing) : base(deserializing) { }
     34    private EuclideanDistance(StorableConstructorFlag _) : base(_) { }
    3535    private EuclideanDistance(EuclideanDistance original, Cloner cloner) : base(original, cloner) { }
    3636    public EuclideanDistance() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/GeoDistance.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Problems.Instances;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("Geo Distance", "Calculates the geo distance.")]
    30   [StorableClass]
     30  [StorableType("B6CAD594-7558-4F19-ACE3-7739D29621F1")]
    3131  public sealed class GeoDistance : DistanceCalculator {
    3232
    3333    [StorableConstructor]
    34     private GeoDistance(bool deserializing) : base(deserializing) { }
     34    private GeoDistance(StorableConstructorFlag _) : base(_) { }
    3535    private GeoDistance(GeoDistance original, Cloner cloner) : base(original, cloner) { }
    3636    public GeoDistance() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/ManhattanDistance.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Problems.Instances;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("Manhattan Distance", "Calculates the Manhattan distance.")]
    30   [StorableClass]
     30  [StorableType("1395A5AC-9A55-40F0-B5C4-1EF15284938F")]
    3131  public sealed class ManhattanDistance : DistanceCalculator {
    3232
    3333    [StorableConstructor]
    34     private ManhattanDistance(bool deserializing) : base(deserializing) { }
     34    private ManhattanDistance(StorableConstructorFlag _) : base(_) { }
    3535    private ManhattanDistance(ManhattanDistance original, Cloner cloner) : base(original, cloner) { }
    3636    public ManhattanDistance() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/MaximumDistance.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Problems.Instances;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("Maximum Distance", "Calculates the maximum distance.")]
    30   [StorableClass]
     30  [StorableType("4ADF8A83-B110-4B39-882F-B5286EFB78A9")]
    3131  public sealed class MaximumDistance : DistanceCalculator {
    3232
    3333    [StorableConstructor]
    34     private MaximumDistance(bool deserializing) : base(deserializing) { }
     34    private MaximumDistance(StorableConstructorFlag _) : base(_) { }
    3535    private MaximumDistance(MaximumDistance original, Cloner cloner) : base(original, cloner) { }
    3636    public MaximumDistance() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/RoundedEuclideanDistance.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Problems.Instances;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("Rounded Euclidean Distance", "Calculates the euclidean distance and rounds it to the nearest integer.")]
    30   [StorableClass]
     30  [StorableType("5AE6854F-505E-438A-8668-2758FEF20861")]
    3131  public sealed class RoundedEuclideanDistance : DistanceCalculator {
    3232
    3333    [StorableConstructor]
    34     private RoundedEuclideanDistance(bool deserializing) : base(deserializing) { }
     34    private RoundedEuclideanDistance(StorableConstructorFlag _) : base(_) { }
    3535    private RoundedEuclideanDistance(RoundedEuclideanDistance original, Cloner cloner) : base(original, cloner) { }
    3636    public RoundedEuclideanDistance() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/UpperEuclideanDistance.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Problems.Instances;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("Upper Euclidean Distance", "Calculates the ceiling of the euclidean distance.")]
    30   [StorableClass]
     30  [StorableType("960A75FA-C8A7-4927-9814-C454343C198E")]
    3131  public sealed class UpperEuclideanDistance : DistanceCalculator {
    3232
    3333    [StorableConstructor]
    34     private UpperEuclideanDistance(bool deserializing) : base(deserializing) { }
     34    private UpperEuclideanDistance(StorableConstructorFlag _) : base(_) { }
    3535    private UpperEuclideanDistance(UpperEuclideanDistance original, Cloner cloner) : base(original, cloner) { }
    3636    public UpperEuclideanDistance() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/DistanceMatrix.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("DistanceMatrix", "Represents a distance matrix of a Probabilistic Traveling Salesman Problem.")]
    30   [StorableClass]
     30  [StorableType("C1E6E275-FA8C-448F-AB49-8779EB0738BE")]
    3131  public sealed class DistanceMatrix : DoubleMatrix {
    3232    [StorableConstructor]
    33     private DistanceMatrix(bool deserializing) : base(deserializing) { }
     33    private DistanceMatrix(StorableConstructorFlag _) : base(_) { }
    3434    public DistanceMatrix() : base() { }
    3535    public DistanceMatrix(int rows, int columns) : base(rows, columns) { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131using HeuristicLab.Problems.Instances;
    3232using HeuristicLab.Random;
     
    3535  [Item("Estimated Probabilistic Traveling Salesman Problem (PTSP)", "Represents a probabilistic traveling salesman problem where the expected tour length is estimated by averaging over the length of tours on a number of, so called, realizations.")]
    3636  [Creatable(CreatableAttribute.Categories.CombinatorialProblems)]
    37   [StorableClass]
     37  [StorableType("D1F1DE71-54E3-40B6-856F-685CD71D97F9")]
    3838  public sealed class EstimatedProbabilisticTravelingSalesmanProblem : ProbabilisticTravelingSalesmanProblem {
    3939
     
    6060
    6161    [StorableConstructor]
    62     private EstimatedProbabilisticTravelingSalesmanProblem(bool deserializing) : base(deserializing) { }
     62    private EstimatedProbabilisticTravelingSalesmanProblem(StorableConstructorFlag _) : base(_) { }
    6363    private EstimatedProbabilisticTravelingSalesmanProblem(EstimatedProbabilisticTravelingSalesmanProblem original, Cloner cloner)
    6464      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/HeuristicLab.Problems.PTSP-3.3.csproj

    r16454 r16462  
    152152      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    153153    </Reference>
    154     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     154    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    155155      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    156156    </Reference>
  • 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()
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Moves/AnalyticalPTSPMoveEvaluator.cs

    r16453 r16462  
    2727using HeuristicLab.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Problems.PTSP {
    3232  [Item("AnalyticalPTSPMoveEvaluator", "A base class for operators which evaluate PTSP moves.")]
    33   [StorableClass]
     33  [StorableType("D23CCC08-AA7D-47C0-A465-FEAA16FECB80")]
    3434  public abstract class AnalyticalPTSPMoveEvaluator : SingleSuccessorOperator, IAnalyticalPTSPMoveEvaluator {
    3535
     
    6464
    6565    [StorableConstructor]
    66     protected AnalyticalPTSPMoveEvaluator(bool deserializing) : base(deserializing) { }
     66    protected AnalyticalPTSPMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    6767    protected AnalyticalPTSPMoveEvaluator(AnalyticalPTSPMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    6868    protected AnalyticalPTSPMoveEvaluator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Moves/EstimatedPTSPMoveEvaluator.cs

    r16453 r16462  
    2727using HeuristicLab.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Problems.PTSP {
    3232  [Item("EstimatedPTSPMoveEvaluator", "A base class for operators which evaluate PTSP moves.")]
    33   [StorableClass]
     33  [StorableType("F2F7F857-F2CD-4AB2-8656-5158BD04EFDD")]
    3434  public abstract class EstimatedPTSPMoveEvaluator : SingleSuccessorOperator, IEstimatedPTSPMoveEvaluator {
    3535
     
    6464
    6565    [StorableConstructor]
    66     protected EstimatedPTSPMoveEvaluator(bool deserializing) : base(deserializing) { }
     66    protected EstimatedPTSPMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    6767    protected EstimatedPTSPMoveEvaluator(EstimatedPTSPMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    6868    protected EstimatedPTSPMoveEvaluator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Moves/OneShift/PTSPAnalyticalInsertionMoveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.PTSP {
    3131  [Item("PTSP Analytical Insertion Move Evaluator", "Evaluates an insertion move (1-shift) by a full solution evaluation")]
    32   [StorableClass]
     32  [StorableType("FEB94986-2AD5-4A6E-89D9-A3954212810B")]
    3333  public class PTSPAnalyticalInsertionMoveEvaluator : AnalyticalPTSPMoveEvaluator, IPermutationTranslocationMoveOperator {
    3434
     
    3838
    3939    [StorableConstructor]
    40     protected PTSPAnalyticalInsertionMoveEvaluator(bool deserializing) : base(deserializing) { }
     40    protected PTSPAnalyticalInsertionMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4141    protected PTSPAnalyticalInsertionMoveEvaluator(PTSPAnalyticalInsertionMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    4242    public PTSPAnalyticalInsertionMoveEvaluator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Moves/OneShift/PTSPEstimatedInsertionMoveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.PTSP {
    3131  [Item("PTSP Estimated Insertion Move Evaluator", "Evaluates an insertion move (1-shift)")]
    32   [StorableClass]
     32  [StorableType("DAC1CBD1-BF27-4BB4-B7C5-82EC58F7F5C9")]
    3333  public class PTSPEstimatedInsertionMoveEvaluator : EstimatedPTSPMoveEvaluator, IPermutationTranslocationMoveOperator {
    3434
     
    3838
    3939    [StorableConstructor]
    40     protected PTSPEstimatedInsertionMoveEvaluator(bool deserializing) : base(deserializing) { }
     40    protected PTSPEstimatedInsertionMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4141    protected PTSPEstimatedInsertionMoveEvaluator(PTSPEstimatedInsertionMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    4242    public PTSPEstimatedInsertionMoveEvaluator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Moves/TwoOpt/PTSPAnalyticalInversionMoveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.PTSP {
    3131  [Item("PTSP Analytical Inversion Move Evaluator", "Evaluates an inversion move (2-opt) by a full solution evaluation.")]
    32   [StorableClass]
     32  [StorableType("D24FF41B-DA6E-42C6-9304-21EF01BFC61B")]
    3333  public class PTSPAnalyticalInversionMoveEvaluator : AnalyticalPTSPMoveEvaluator, IPermutationInversionMoveOperator {
    3434
     
    3838
    3939    [StorableConstructor]
    40     protected PTSPAnalyticalInversionMoveEvaluator(bool deserializing) : base(deserializing) { }
     40    protected PTSPAnalyticalInversionMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4141    protected PTSPAnalyticalInversionMoveEvaluator(PTSPAnalyticalInversionMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    4242    public PTSPAnalyticalInversionMoveEvaluator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Moves/TwoOpt/PTSPEstimatedInversionMoveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.PTSP {
    3131  [Item("PTSP Estimated Inversion Move Evaluator", "Evaluates an inversion move (2-opt) over several realizations of tours by summing up the length of all added edges and subtracting the length of all deleted edges.")]
    32   [StorableClass]
     32  [StorableType("9E418FA4-7721-40D2-9FDC-DB82723F7DBF")]
    3333  public class PTSPEstimatedInversionMoveEvaluator : EstimatedPTSPMoveEvaluator, IPermutationInversionMoveOperator {
    3434
     
    3838
    3939    [StorableConstructor]
    40     protected PTSPEstimatedInversionMoveEvaluator(bool deserializing) : base(deserializing) { }
     40    protected PTSPEstimatedInversionMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4141    protected PTSPEstimatedInversionMoveEvaluator(PTSPEstimatedInversionMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    4242    public PTSPEstimatedInversionMoveEvaluator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/ExhaustiveTwoPointFiveMoveGenerator.cs

    r16453 r16462  
    2727using HeuristicLab.Encodings.PermutationEncoding;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Problems.PTSP {
    3232  [Item("Exhaustive 2.5-MoveGenerator", "Generates all possible inversion and shift moves (2.5-opt) from a given permutation.")]
    33   [StorableClass]
     33  [StorableType("DF95E561-1F47-4845-A58D-CEF32B14461B")]
    3434  public sealed class ExhaustiveTwoPointFiveMoveGenerator : TwoPointFiveMoveGenerator, IExhaustiveMoveGenerator {
    3535
    3636    [StorableConstructor]
    37     private ExhaustiveTwoPointFiveMoveGenerator(bool deserializing) : base(deserializing) { }
     37    private ExhaustiveTwoPointFiveMoveGenerator(StorableConstructorFlag _) : base(_) { }
    3838    private ExhaustiveTwoPointFiveMoveGenerator(ExhaustiveTwoPointFiveMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    3939    public ExhaustiveTwoPointFiveMoveGenerator() : base() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/PTSPAnalyticalTwoPointFiveMoveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.PTSP {
    3131  [Item("PTSP Analytical 2.5-MoveEvaluator", "Operator that evaluates 2.5-p-opt moves of PTSP by a full solution evaluation.")]
    32   [StorableClass]
     32  [StorableType("59729BB5-2026-44E8-8C19-EBCC2303103C")]
    3333  public class PTSPAnalyticalTwoPointFiveMoveEvaluator : AnalyticalPTSPMoveEvaluator, ITwoPointFiveMoveOperator {
    3434
     
    3838
    3939    [StorableConstructor]
    40     protected PTSPAnalyticalTwoPointFiveMoveEvaluator(bool deserializing) : base(deserializing) { }
     40    protected PTSPAnalyticalTwoPointFiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4141    protected PTSPAnalyticalTwoPointFiveMoveEvaluator(PTSPAnalyticalTwoPointFiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    4242    public PTSPAnalyticalTwoPointFiveMoveEvaluator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/PTSPEstimatedTwoPointFiveMoveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.PTSP {
    3131  [Item("PTSP Estimated 2.5-MoveEvaluator", "Operator that evaluates 2.5-p-opt moves of PTSP")]
    32   [StorableClass]
     32  [StorableType("3E67BDD5-5A80-46F7-A7D6-9A67595CFD8C")]
    3333  public class PTSPEstimatedTwoPointFiveMoveEvaluator : EstimatedPTSPMoveEvaluator, ITwoPointFiveMoveOperator {
    3434
     
    3838
    3939    [StorableConstructor]
    40     protected PTSPEstimatedTwoPointFiveMoveEvaluator(bool deserializing) : base(deserializing) { }
     40    protected PTSPEstimatedTwoPointFiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4141    protected PTSPEstimatedTwoPointFiveMoveEvaluator(PTSPEstimatedTwoPointFiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    4242    public PTSPEstimatedTwoPointFiveMoveEvaluator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/StochasticTwoPointFiveMultiMoveGenerator.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.PTSP {
    3131  [Item("Stochastic 2.5-MultiMoveGenerator", "Randomly samples n from all possible inversion and shift moves (2.5-opt) from a given permutation.")]
    32   [StorableClass]
     32  [StorableType("C84AA7B3-887A-4E75-9237-60011BAEBCC6")]
    3333  public sealed class StochasticTwoPointFiveMultiMoveGenerator : TwoPointFiveMoveGenerator, IMultiMoveGenerator, IStochasticOperator {
    3434    public ILookupParameter<IRandom> RandomParameter {
     
    4545
    4646    [StorableConstructor]
    47     private StochasticTwoPointFiveMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     47    private StochasticTwoPointFiveMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4848    private StochasticTwoPointFiveMultiMoveGenerator(StochasticTwoPointFiveMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4949    public StochasticTwoPointFiveMultiMoveGenerator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/StochasticTwoPointFiveSingleMoveGenerator.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.PTSP {
    3131  [Item("Stochastic 2.5-SingleMoveGenerator", "Randomly samples a single from all possible inversion and shift moves (2.5-opt) from a given permutation.")]
    32   [StorableClass]
     32  [StorableType("A3D496C5-3BB5-4263-8F33-0DAFFCAC1BAF")]
    3333  public sealed class StochasticTwoPointFiveSingleMoveGenerator : TwoPointFiveMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
    3434    public ILookupParameter<IRandom> RandomParameter {
     
    3737
    3838    [StorableConstructor]
    39     private StochasticTwoPointFiveSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     39    private StochasticTwoPointFiveSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4040    private StochasticTwoPointFiveSingleMoveGenerator(StochasticTwoPointFiveSingleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4141    public StochasticTwoPointFiveSingleMoveGenerator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/TwoPointFiveMove.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.PermutationEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Problems.PTSP {
    2828  [Item("2.5-Move", "Represents a 2.5-move.")]
    29   [StorableClass]
     29  [StorableType("CAC6762D-DFF1-4B66-BAC7-FBCED4A52305")]
    3030  public sealed class TwoPointFiveMove : Item {
    3131    [Storable]
     
    3939
    4040    [StorableConstructor]
    41     public TwoPointFiveMove() : this(-1, -1, null, true) { }
    42     private TwoPointFiveMove(bool deserializing) : base(deserializing) { }
     41    private TwoPointFiveMove(StorableConstructorFlag _) : base(_) { }
    4342    private TwoPointFiveMove(TwoPointFiveMove original, Cloner cloner)
    4443      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/TwoPointFiveMoveGenerator.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030
    3131namespace HeuristicLab.Problems.PTSP {
    3232  [Item("TwoPointFiveMoveGenerator", "Base class for all inversion and shift (2.5-opt) move generators.")]
    33   [StorableClass]
     33  [StorableType("955C469C-4D77-4168-A428-03C39BACF9AD")]
    3434  public abstract class TwoPointFiveMoveGenerator : SingleSuccessorOperator, ITwoPointFiveMoveOperator, IMoveGenerator {
    3535    public override bool CanChangeName {
     
    4545
    4646    [StorableConstructor]
    47     protected TwoPointFiveMoveGenerator(bool deserializing) : base(deserializing) { }
     47    protected TwoPointFiveMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4848    protected TwoPointFiveMoveGenerator(TwoPointFiveMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4949    protected TwoPointFiveMoveGenerator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/TwoPointFiveMoveMaker.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Problems.PTSP {
    3232  [Item("TwoPointFiveMoveMaker", "Peforms an inversion and shift (2.5-opt) on a given permutation and updates the quality.")]
    33   [StorableClass]
     33  [StorableType("6D5923B3-47CA-47AF-8C93-9BA7134BE5BA")]
    3434  public class TwoPointFiveMoveMaker : SingleSuccessorOperator, ITwoPointFiveMoveOperator, IMoveMaker {
    3535    public override bool CanChangeName {
     
    5151
    5252    [StorableConstructor]
    53     protected TwoPointFiveMoveMaker(bool deserializing) : base(deserializing) { }
     53    protected TwoPointFiveMoveMaker(StorableConstructorFlag _) : base(_) { }
    5454    protected TwoPointFiveMoveMaker(TwoPointFiveMoveMaker original, Cloner cloner) : base(original, cloner) { }
    5555    public TwoPointFiveMoveMaker()
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/PTSP.cs

    r16453 r16462  
    3030using HeuristicLab.Optimization.Operators;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333using HeuristicLab.Problems.Instances;
    3434
    3535namespace HeuristicLab.Problems.PTSP {
    3636  [Item("Probabilistic Traveling Salesman Problem (PTSP)", "Represents a Probabilistic Traveling Salesman Problem.")]
    37   [StorableClass]
     37  [StorableType("4CB8ACF3-C3D4-4CC6-BB1F-986BDE16B30A")]
    3838  public abstract class ProbabilisticTravelingSalesmanProblem : SingleObjectiveBasicProblem<PermutationEncoding>,
    3939  IProblemInstanceConsumer<PTSPData> {
     
    9696
    9797    [StorableConstructor]
    98     protected ProbabilisticTravelingSalesmanProblem(bool deserializing) : base(deserializing) { }
     98    protected ProbabilisticTravelingSalesmanProblem(StorableConstructorFlag _) : base(_) { }
    9999    protected ProbabilisticTravelingSalesmanProblem(ProbabilisticTravelingSalesmanProblem original, Cloner cloner)
    100100      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.PTSP/3.3/PathPTSPTour.cs

    r16453 r16462  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Encodings.PermutationEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.PTSP {
     
    3333  /// </summary>
    3434  [Item("PathPTSPTour", "Represents a tour of a Probabilistic Traveling Salesman Problem given in path representation which can be visualized in the GUI.")]
    35   [StorableClass]
     35  [StorableType("8C9E50C9-4364-48F1-B681-9CFFD1147EF0")]
    3636  public sealed class PathPTSPTour : Item {
    3737    public static new Image StaticItemImage {
     
    9393
    9494    [StorableConstructor]
    95     private PathPTSPTour(bool deserializing) : base(deserializing) { }
     95    private PathPTSPTour(StorableConstructorFlag _) : base(_) { }
    9696    private PathPTSPTour(PathPTSPTour original, Cloner cloner)
    9797      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.