Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/04/17 17:19:35 (7 years ago)
Author:
gkronber
Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:
branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3
Files:
29 edited

Legend:

Unmodified
Added
Removed
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/BestTSPSolutionAnalyzer.cs

    r14185 r14927  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Persistence;
    3131
    3232namespace HeuristicLab.Problems.TravelingSalesman {
     
    3535  /// </summary>
    3636  [Item("BestTSPSolutionAnalyzer", "An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.")]
    37   [StorableClass]
     37  [StorableType("9eb523ef-37c3-45a8-aa2e-53317371eb82")]
    3838  public sealed class BestTSPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    3939    public bool EnabledByDefault {
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPAlleleFrequencyAnalyzer.cs

    r14185 r14927  
    2727using HeuristicLab.Encodings.PermutationEncoding;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    3030
    3131namespace HeuristicLab.Problems.TravelingSalesman {
     
    3434  /// </summary>
    3535  [Item("TSPAlleleFrequencyAnalyzer", "An operator for analyzing the frequency of alleles in solutions of Traveling Salesman Problems given in path representation.")]
    36   [StorableClass]
     36  [StorableType("65fbf069-0dec-4a62-b357-f2d77abdacad")]
    3737  public sealed class TSPAlleleFrequencyAnalyzer : AlleleFrequencyAnalyzer<Permutation> {
    3838    public LookupParameter<DoubleMatrix> CoordinatesParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPPopulationDiversityAnalyzer.cs

    r14185 r14927  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Encodings.PermutationEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.PluginInfrastructure;
    2929
     
    3737  [NonDiscoverableType]
    3838  [Item("TSPPopulationDiversityAnalyzer", "An operator for analyzing the diversity of solutions of Traveling Salesman Problems given in path representation.")]
    39   [StorableClass]
     39  [StorableType("e1027ed1-cc38-4426-9214-153eef18d0d3")]
    4040  public sealed class TSPPopulationDiversityAnalyzer : PopulationDiversityAnalyzer<Permutation> {
    4141    [StorableConstructor]
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/DistanceMatrix.cs

    r14185 r14927  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Problems.TravelingSalesman {
     
    3232  /// </summary>
    3333  [Item("DistanceMatrix", "Represents a distance matrix of a Traveling Salesman Problem.")]
    34   [StorableClass]
     34  [StorableType("71e6d76c-afbd-4995-bd23-13d1eefa9c01")]
    3535  public sealed class DistanceMatrix : DoubleMatrix {
    3636    [StorableConstructor]
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPCoordinatesPathEvaluator.cs

    r14185 r14927  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Problems.TravelingSalesman {
     
    3333  /// </summary>
    3434  [Item("TSPCoordinatesPathEvaluator", "A base class for operators which evaluate TSP solutions given in path representation using city coordinates.")]
    35   [StorableClass]
     35  [StorableType("61a1f823-a1be-4f5a-8f6b-6b3831c83752")]
    3636  public abstract class TSPCoordinatesPathEvaluator : TSPEvaluator, ITSPCoordinatesPathEvaluator {
    3737    private object locker = new object();
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPDistanceMatrixEvaluator.cs

    r14185 r14927  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Problems.TravelingSalesman {
     
    3333  /// </summary>
    3434  [Item("TSPDistanceMatrixEvaluator", "Evaluate TSP solutions given in path representation using the distance matrix.")]
    35   [StorableClass]
     35  [StorableType("4d76182b-3728-47b0-960a-316de261ff1c")]
    3636  public sealed class TSPDistanceMatrixEvaluator : TSPEvaluator, ITSPDistanceMatrixEvaluator {
    3737
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPEuclideanPathEvaluator.cs

    r14185 r14927  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
     
    3030  /// </summary>
    3131  [Item("TSPEuclideanPathEvaluator", "An operator which evaluates TSP solutions given in path representation using the Euclidean distance metric.")]
    32   [StorableClass]
     32  [StorableType("0be1653a-7456-4ff8-81a0-5e74e20bd7f4")]
    3333  public sealed class TSPEuclideanPathEvaluator : TSPCoordinatesPathEvaluator {
    3434    [StorableConstructor]
     
    4040      return new TSPEuclideanPathEvaluator(this, cloner);
    4141    }
    42    
     42
    4343    /// <summary>
    4444    /// Calculates the distance between two points using the Euclidean distance metric.
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPEvaluator.cs

    r14185 r14927  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Problems.TravelingSalesman {
     
    3232  /// </summary>
    3333  [Item("TSPEvaluator", "A base class for operators which evaluate TSP solutions.")]
    34   [StorableClass]
     34  [StorableType("596f99b3-de65-496b-87df-6c55625daa4e")]
    3535  public abstract class TSPEvaluator : InstrumentedOperator, ITSPEvaluator {
    3636    public override bool CanChangeName {
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPGeoPathEvaluator.cs

    r14185 r14927  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
     
    3030  /// </summary>
    3131  [Item("TSPGeoPathEvaluator", "An operator which evaluates TSP solutions given in path representation using the GEO distance metric (globe coordinates).")]
    32   [StorableClass]
     32  [StorableType("70b14d3f-7a33-4c51-aca7-76fcfa3d37e9")]
    3333  public sealed class TSPGeoPathEvaluator : TSPCoordinatesPathEvaluator {
    3434    private const double PI = 3.141592;
     
    4343      return new TSPGeoPathEvaluator(this, cloner);
    4444    }
    45    
     45
    4646
    4747    /// <summary>
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPRoundedEuclideanPathEvaluator.cs

    r14185 r14927  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
     
    3030  /// </summary>
    3131  [Item("TSPRoundedEuclideanPathEvaluator", "An operator which evaluates TSP solutions given in path representation using the rounded Euclidean distance metric.")]
    32   [StorableClass]
     32  [StorableType("d5fcb355-d8a3-4172-bbc3-b4e91fb30ed9")]
    3333  public sealed class TSPRoundedEuclideanPathEvaluator : TSPCoordinatesPathEvaluator {
    3434    [StorableConstructor]
     
    4040      return new TSPRoundedEuclideanPathEvaluator(this, cloner);
    4141    }
    42    
     42
    4343    /// <summary>
    4444    /// Calculates the distance between two points using the rounded Euclidean distance metric.
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPUpperEuclideanPathEvaluator.cs

    r14185 r14927  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
     
    3030  /// </summary>
    3131  [Item("TSPUpperEuclideanPathEvaluator", "An operator which evaluates TSP solutions given in path representation using the rounded up Euclidean distance metric.")]
    32   [StorableClass]
     32  [StorableType("1e39e2f6-5a24-4e8a-8661-c292b2468f52")]
    3333  public sealed class TSPUpperEuclideanPathEvaluator : TSPCoordinatesPathEvaluator {
    3434    [StorableConstructor]
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/Improvers/TSPImprovementOperator.cs

    r14185 r14927  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Persistence;
    3131
    3232namespace HeuristicLab.Problems.TravelingSalesman {
     
    3838  /// </remarks>
    3939  [Item("TSPImprovementOperator", "An operator that improves traveling salesman solutions. The operator tries to improve the traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]
    40   [StorableClass]
     40  [StorableType("1160f84a-9c42-4dd2-848d-67fd1e3b51c8")]
    4141  public sealed class TSPImprovementOperator : SingleSuccessorOperator, ISingleObjectiveImprovementOperator {
    4242    #region Parameter properties
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TSPMoveEvaluator.cs

    r14185 r14927  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    3030
    3131namespace HeuristicLab.Problems.TravelingSalesman {
     
    3434  /// </summary>
    3535  [Item("TSPMoveEvaluator", "A base class for operators which evaluate TSP moves.")]
    36   [StorableClass]
     36  [StorableType("53adaae7-5911-430e-9e43-a7cf3714c597")]
    3737  public abstract class TSPMoveEvaluator : SingleSuccessorOperator, ITSPMoveEvaluator, IMoveOperator {
    3838
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TSPPathMoveEvaluator.cs

    r14185 r14927  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Problems.TravelingSalesman {
     
    3333  /// </summary>
    3434  [Item("TSPMoveEvaluator", "A base class for operators which evaluate TSP moves.")]
    35   [StorableClass]
     35  [StorableType("950432c1-de23-44d8-a17d-ba451296ef79")]
    3636  public abstract class TSPPathMoveEvaluator : TSPMoveEvaluator, ITSPPathMoveEvaluator {
    3737    public ILookupParameter<Permutation> PermutationParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveDistanceMatrixEvaluator.cs

    r14185 r14927  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Problems.TravelingSalesman {
     
    3333  /// </summary>
    3434  [Item("TSPTranslocationMoveDistanceMatrixEvaluator", "Evaluates a translocation or insertion move (3-opt).")]
    35   [StorableClass]
     35  [StorableType("4bd06d01-e4b2-4d26-88b4-98d046062af7")]
    3636  public class TSPTranslocationMoveDistanceMatrixEvaluator : TSPMoveEvaluator, IPermutationTranslocationMoveOperator {
    3737    public override Type EvaluatorType {
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveEuclideanPathEvaluator.cs

    r14185 r14927  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
     
    3030  /// </summary>
    3131  [Item("TSPTranslocationMoveEuclideanPathEvaluator", "Operator for evaluating a translocation or insertion move (3-opt) based on euclidean distances.")]
    32   [StorableClass]
     32  [StorableType("0aa3c06b-1550-428e-bf1f-c1f74ff19a38")]
    3333  public class TSPTranslocationMoveEuclideanPathEvaluator : TSPTranslocationMovePathEvaluator {
    3434    [StorableConstructor]
     
    4040      return new TSPTranslocationMoveEuclideanPathEvaluator(this, cloner);
    4141    }
    42    
     42
    4343    public override Type EvaluatorType {
    4444      get { return typeof(TSPEuclideanPathEvaluator); }
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveGeoPathEvaluator.cs

    r14185 r14927  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
     
    3030  /// </summary>
    3131  [Item("TSPTranslocationMoveGeoPathEvaluator", "Operator for evaluating a translocation or insertion move (3-opt) based on geo (world) distances.")]
    32   [StorableClass]
     32  [StorableType("5a0b7e60-dca6-4f19-9e58-d6c7cfd81cb8")]
    3333  public class TSPTranslocationMoveGeoPathEvaluator : TSPTranslocationMovePathEvaluator {
    3434    public override Type EvaluatorType {
     
    4747      return new TSPTranslocationMoveGeoPathEvaluator(this, cloner);
    4848    }
    49    
     49
    5050
    5151    /// <summary>
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMovePathEvaluator.cs

    r14185 r14927  
    2525using HeuristicLab.Encodings.PermutationEncoding;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Problems.TravelingSalesman {
     
    3232  /// </summary>
    3333  [Item("TSPTranslocationMovePathEvaluator", "Evaluates a translocation or insertion move (3-opt) by summing up the length of all added edges and subtracting the length of all deleted edges.")]
    34   [StorableClass]
     34  [StorableType("1a57191b-864a-406f-894e-cf9d5d1061c1")]
    3535  public abstract class TSPTranslocationMovePathEvaluator : TSPPathMoveEvaluator, IPermutationTranslocationMoveOperator {
    3636    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveRoundedEuclideanPathEvaluator.cs

    r14185 r14927  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
     
    3030  /// </summary>
    3131  [Item("TSPTranslocationMoveRoundedEuclideanPathEvaluator", "Operator for evaluating a translocation or insertion move (3-opt) based on rounded euclidean distances.")]
    32   [StorableClass]
     32  [StorableType("e32094fd-ecc9-4fed-b7da-d733f0118ba3")]
    3333  public class TSPTranslocationMoveRoundedEuclideanPathEvaluator : TSPTranslocationMovePathEvaluator {
    3434    [StorableConstructor]
     
    4040      return new TSPTranslocationMoveRoundedEuclideanPathEvaluator(this, cloner);
    4141    }
    42    
     42
    4343    public override Type EvaluatorType {
    4444      get { return typeof(TSPRoundedEuclideanPathEvaluator); }
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveDistanceMatrixEvaluator.cs

    r14185 r14927  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Problems.TravelingSalesman {
     
    3333  /// </summary>
    3434  [Item("TSPInversionMoveDistanceMatrixEvaluator", "Evaluates an inversion move (2-opt) by summing up the length of all added edges and subtracting the length of all deleted edges.")]
    35   [StorableClass]
     35  [StorableType("f6390e4a-db40-4b48-875a-43995fe9a003")]
    3636  public class TSPInversionMoveDistanceMatrixEvaluator : TSPMoveEvaluator, IPermutationInversionMoveOperator {
    3737    public override Type EvaluatorType {
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveEuclideanPathEvaluator.cs

    r14185 r14927  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
     
    3030  /// </summary>
    3131  [Item("TSPInversionMoveEuclideanPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on euclidean distances.")]
    32   [StorableClass]
     32  [StorableType("498bb677-03c4-4def-9d79-8b6e295f6600")]
    3333  public class TSPInversionMoveEuclideanPathEvaluator : TSPInversionMovePathEvaluator {
    3434    [StorableConstructor]
     
    4040      return new TSPInversionMoveEuclideanPathEvaluator(this, cloner);
    4141    }
    42    
     42
    4343    public override Type EvaluatorType {
    4444      get { return typeof(TSPEuclideanPathEvaluator); }
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveGeoPathEvaluator.cs

    r14185 r14927  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
     
    3030  /// </summary>
    3131  [Item("TSPInversionMoveGeoPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on geo (world) distances.")]
    32   [StorableClass]
     32  [StorableType("394ccf1c-841c-4296-b043-f1006ff53274")]
    3333  public class TSPInversionMoveGeoPathEvaluator : TSPInversionMovePathEvaluator {
    3434    public override Type EvaluatorType {
     
    4747      return new TSPInversionMoveGeoPathEvaluator(this, cloner);
    4848    }
    49    
     49
    5050    /// <summary>
    5151    /// Calculates the distance between two points using the GEO distance metric (globe coordinates).
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMovePathEvaluator.cs

    r14185 r14927  
    2525using HeuristicLab.Encodings.PermutationEncoding;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Problems.TravelingSalesman {
     
    3232  /// </summary>
    3333  [Item("TSPInversionMovePathEvaluator", "Evaluates an inversion move (2-opt) by summing up the length of all added edges and subtracting the length of all deleted edges.")]
    34   [StorableClass]
     34  [StorableType("6e0fc670-76bc-48bd-a9a3-53abfa1dc09e")]
    3535  public abstract class TSPInversionMovePathEvaluator : TSPPathMoveEvaluator, IPermutationInversionMoveOperator {
    3636    public ILookupParameter<InversionMove> InversionMoveParameter {
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveRoundedEuclideanPathEvaluator.cs

    r14185 r14927  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
     
    3030  /// </summary>
    3131  [Item("TSPInversionMoveRoundedEuclideanPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on rounded euclidean distances.")]
    32   [StorableClass]
     32  [StorableType("e8abb03c-6da9-4453-a282-55789b624c16")]
    3333  public class TSPInversionMoveRoundedEuclideanPathEvaluator : TSPInversionMovePathEvaluator {
    3434    [StorableConstructor]
     
    4040      return new TSPInversionMoveRoundedEuclideanPathEvaluator(this, cloner);
    4141    }
    42    
     42
    4343    public override Type EvaluatorType {
    4444      get { return typeof(TSPRoundedEuclideanPathEvaluator); }
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPMultipleGuidesPathRelinker.cs

    r14185 r14927  
    2929using HeuristicLab.Optimization.Operators;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HeuristicLab.Persistence;
    3232
    3333namespace HeuristicLab.Problems.TravelingSalesman {
     
    3939  /// </remarks>
    4040  [Item("TSPMultipleGuidesPathRelinker", "An operator that relinks paths between traveling salesman solutions using a multiple guiding strategy. The operator incrementally changes the initiating solution towards the guiding solution by correcting edges as needed. For each city it choses the best edge from all guiding solutions.")]
    41   [StorableClass]
     41  [StorableType("88ab6397-c7c3-4984-b4a4-34bef9a94e78")]
    4242  public sealed class TSPMultipleGuidesPathRelinker : SingleObjectivePathRelinker {
    4343    #region Parameter properties
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPPathRelinker.cs

    r14185 r14927  
    2828using HeuristicLab.Encodings.PermutationEncoding;
    2929using HeuristicLab.Optimization.Operators;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Persistence;
    3131
    3232namespace HeuristicLab.Problems.TravelingSalesman {
     
    3838  /// </remarks>
    3939  [Item("TSPPathRelinker", "An operator that relinks paths between traveling salesman solutions. The operator incrementally assimilates the initiating solution into the guiding solution by correcting edges as needed.")]
    40   [StorableClass]
     40  [StorableType("188a0ebe-668d-48cf-8d24-d1a647688e75")]
    4141  public sealed class TSPPathRelinker : SingleObjectivePathRelinker {
    4242    [StorableConstructor]
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPSimultaneousPathRelinker.cs

    r14185 r14927  
    2828using HeuristicLab.Encodings.PermutationEncoding;
    2929using HeuristicLab.Optimization.Operators;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Persistence;
    3131
    3232namespace HeuristicLab.Problems.TravelingSalesman {
     
    3838  /// </remarks>
    3939  [Item("TSPSimultaneousPathRelinker", "An operator that relinks paths between traveling salesman solutions starting from both ends. The operator incrementally assimilates the initiating solution into the guiding solution and vice versa by correcting edges as needed.")]
    40   [StorableClass]
     40  [StorableType("d3e3a9c0-cd4f-48c8-a3e7-9a54bdf0dae8")]
    4141  public sealed class TSPSimultaneousPathRelinker : SingleObjectivePathRelinker {
    4242    [StorableConstructor]
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/PathTSPTour.cs

    r14185 r14927  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Encodings.PermutationEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Problems.TravelingSalesman {
     
    3333  /// </summary>
    3434  [Item("PathTSPTour", "Represents a tour of a Traveling Salesman Problem given in path representation which can be visualized in the GUI.")]
    35   [StorableClass]
     35  [StorableType("bd3cc3bf-13c7-43b6-b22c-4626f1673955")]
    3636  public sealed class PathTSPTour : Item {
    3737    public static new Image StaticItemImage {
  • branches/PersistenceReintegration/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

    r14185 r14927  
    3232using HeuristicLab.Optimization.Operators;
    3333using HeuristicLab.Parameters;
    34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     34using HeuristicLab.Persistence;
    3535using HeuristicLab.PluginInfrastructure;
    3636using HeuristicLab.Problems.Instances;
     
    3939  [Item("Traveling Salesman Problem (TSP)", "Represents a symmetric Traveling Salesman Problem.")]
    4040  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 100)]
    41   [StorableClass]
     41  [StorableType("9fd91a9f-da38-45f6-a0b8-463d0bd76105")]
    4242  public sealed class TravelingSalesmanProblem : SingleObjectiveHeuristicOptimizationProblem<ITSPEvaluator, IPermutationCreator>, IStorableContent,
    4343    IProblemInstanceConsumer<TSPData> {
Note: See TracChangeset for help on using the changeset viewer.