Context Navigation

← Previous Change
Next Change →

HeuristicLab.Problems.TravelingSalesman

Timestamp:

03/03/17 11:41:43 (8 years ago)

Author:

gkronber

Message:

#2520

renamed StorableClass -> StorableType
changed persistence to use GUIDs instead of type names

Location:

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3

Files:

: 29 edited

Analyzers/BestTSPSolutionAnalyzer.cs (modified) (1 diff)
Analyzers/TSPAlleleFrequencyAnalyzer.cs (modified) (1 diff)
Analyzers/TSPPopulationDiversityAnalyzer.cs (modified) (1 diff)
DistanceMatrix.cs (modified) (1 diff)
Evaluators/TSPCoordinatesPathEvaluator.cs (modified) (1 diff)
Evaluators/TSPDistanceMatrixEvaluator.cs (modified) (1 diff)
Evaluators/TSPEuclideanPathEvaluator.cs (modified) (1 diff)
Evaluators/TSPEvaluator.cs (modified) (1 diff)
Evaluators/TSPGeoPathEvaluator.cs (modified) (1 diff)
Evaluators/TSPRoundedEuclideanPathEvaluator.cs (modified) (1 diff)
Evaluators/TSPUpperEuclideanPathEvaluator.cs (modified) (1 diff)
Improvers/TSPImprovementOperator.cs (modified) (1 diff)
MoveEvaluators/TSPMoveEvaluator.cs (modified) (1 diff)
MoveEvaluators/TSPPathMoveEvaluator.cs (modified) (1 diff)
MoveEvaluators/ThreeOpt/TSPTranslocationMoveDistanceMatrixEvaluator.cs (modified) (1 diff)
MoveEvaluators/ThreeOpt/TSPTranslocationMoveEuclideanPathEvaluator.cs (modified) (1 diff)
MoveEvaluators/ThreeOpt/TSPTranslocationMoveGeoPathEvaluator.cs (modified) (1 diff)
MoveEvaluators/ThreeOpt/TSPTranslocationMovePathEvaluator.cs (modified) (1 diff)
MoveEvaluators/ThreeOpt/TSPTranslocationMoveRoundedEuclideanPathEvaluator.cs (modified) (1 diff)
MoveEvaluators/TwoOpt/TSPInversionMoveDistanceMatrixEvaluator.cs (modified) (1 diff)
MoveEvaluators/TwoOpt/TSPInversionMoveEuclideanPathEvaluator.cs (modified) (1 diff)
MoveEvaluators/TwoOpt/TSPInversionMoveGeoPathEvaluator.cs (modified) (1 diff)
MoveEvaluators/TwoOpt/TSPInversionMovePathEvaluator.cs (modified) (1 diff)
MoveEvaluators/TwoOpt/TSPInversionMoveRoundedEuclideanPathEvaluator.cs (modified) (1 diff)
PathRelinkers/TSPMultipleGuidesPathRelinker.cs (modified) (1 diff)
PathRelinkers/TSPPathRelinker.cs (modified) (1 diff)
PathRelinkers/TSPSimultaneousPathRelinker.cs (modified) (1 diff)
PathTSPTour.cs (modified) (1 diff)
TravelingSalesmanProblem.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/BestTSPSolutionAnalyzer.cs

r13368	r14711
35	35	/// </summary>
36	36	[Item("BestTSPSolutionAnalyzer", "An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.")]
37		[Storable~~Class~~("93FBABDD-63C5-4000-A0AF-8ADDE1DCAFD6")]
	37	[StorableType("93FBABDD-63C5-4000-A0AF-8ADDE1DCAFD6")]
38	38	public sealed class BestTSPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
39	39	public bool EnabledByDefault {

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPAlleleFrequencyAnalyzer.cs

r13368	r14711
34	34	/// </summary>
35	35	[Item("TSPAlleleFrequencyAnalyzer", "An operator for analyzing the frequency of alleles in solutions of Traveling Salesman Problems given in path representation.")]
36		[Storable~~Class~~("37BC44F2-3DAC-4382-A8A7-AB2CABA56451")]
	36	[StorableType("37BC44F2-3DAC-4382-A8A7-AB2CABA56451")]
37	37	public sealed class TSPAlleleFrequencyAnalyzer : AlleleFrequencyAnalyzer<Permutation> {
38	38	public LookupParameter<DoubleMatrix> CoordinatesParameter {

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPPopulationDiversityAnalyzer.cs

r13368	r14711
37	37	[NonDiscoverableType]
38	38	[Item("TSPPopulationDiversityAnalyzer", "An operator for analyzing the diversity of solutions of Traveling Salesman Problems given in path representation.")]
39		[Storable~~Class~~("555FC028-D1CB-457E-8FB2-3822D01FA8F9")]
	39	[StorableType("555FC028-D1CB-457E-8FB2-3822D01FA8F9")]
40	40	public sealed class TSPPopulationDiversityAnalyzer : PopulationDiversityAnalyzer<Permutation> {
41	41	[StorableConstructor]

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/DistanceMatrix.cs

r13368	r14711
32	32	/// </summary>
33	33	[Item("DistanceMatrix", "Represents a distance matrix of a Traveling Salesman Problem.")]
34		[Storable~~Class~~("F92F37AE-51DD-4903-AF6A-DD64B15A031F")]
	34	[StorableType("F92F37AE-51DD-4903-AF6A-DD64B15A031F")]
35	35	public sealed class DistanceMatrix : DoubleMatrix {
36	36	[StorableConstructor]

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPCoordinatesPathEvaluator.cs

r13368	r14711
33	33	/// </summary>
34	34	[Item("TSPCoordinatesPathEvaluator", "A base class for operators which evaluate TSP solutions given in path representation using city coordinates.")]
35		[Storable~~Class~~("E3C6028D-2A63-4EEF-9ADB-1973D26182DF")]
	35	[StorableType("E3C6028D-2A63-4EEF-9ADB-1973D26182DF")]
36	36	public abstract class TSPCoordinatesPathEvaluator : TSPEvaluator, ITSPCoordinatesPathEvaluator {
37	37	private object locker = new object();

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPDistanceMatrixEvaluator.cs

r13368	r14711
33	33	/// </summary>
34	34	[Item("TSPDistanceMatrixEvaluator", "Evaluate TSP solutions given in path representation using the distance matrix.")]
35		[Storable~~Class~~("94453741-C017-435E-A447-F8262D59E6BF")]
	35	[StorableType("94453741-C017-435E-A447-F8262D59E6BF")]
36	36	public sealed class TSPDistanceMatrixEvaluator : TSPEvaluator, ITSPDistanceMatrixEvaluator {
37	37

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPEuclideanPathEvaluator.cs

r13368	r14711
30	30	/// </summary>
31	31	[Item("TSPEuclideanPathEvaluator", "An operator which evaluates TSP solutions given in path representation using the Euclidean distance metric.")]
32		[Storable~~Class~~("5B8BAFBB-4238-4FDF-9469-1397E9A346E8")]
	32	[StorableType("5B8BAFBB-4238-4FDF-9469-1397E9A346E8")]
33	33	public sealed class TSPEuclideanPathEvaluator : TSPCoordinatesPathEvaluator {
34	34	[StorableConstructor]

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPEvaluator.cs

r13368	r14711
32	32	/// </summary>
33	33	[Item("TSPEvaluator", "A base class for operators which evaluate TSP solutions.")]
34		[Storable~~Class~~("D77A51C2-37E9-4EF2-9CFA-36B36ED4D802")]
	34	[StorableType("D77A51C2-37E9-4EF2-9CFA-36B36ED4D802")]
35	35	public abstract class TSPEvaluator : InstrumentedOperator, ITSPEvaluator {
36	36	public override bool CanChangeName {

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPGeoPathEvaluator.cs

r13368	r14711
30	30	/// </summary>
31	31	[Item("TSPGeoPathEvaluator", "An operator which evaluates TSP solutions given in path representation using the GEO distance metric (globe coordinates).")]
32		[Storable~~Class~~("82A42F17-C81D-47DE-9B3B-539C7641BDAE")]
	32	[StorableType("82A42F17-C81D-47DE-9B3B-539C7641BDAE")]
33	33	public sealed class TSPGeoPathEvaluator : TSPCoordinatesPathEvaluator {
34	34	private const double PI = 3.141592;

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPRoundedEuclideanPathEvaluator.cs

r13368	r14711
30	30	/// </summary>
31	31	[Item("TSPRoundedEuclideanPathEvaluator", "An operator which evaluates TSP solutions given in path representation using the rounded Euclidean distance metric.")]
32		[Storable~~Class~~("D00B8E4C-8660-43B2-BD79-577639CF81C0")]
	32	[StorableType("D00B8E4C-8660-43B2-BD79-577639CF81C0")]
33	33	public sealed class TSPRoundedEuclideanPathEvaluator : TSPCoordinatesPathEvaluator {
34	34	[StorableConstructor]

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPUpperEuclideanPathEvaluator.cs

r13368	r14711
30	30	/// </summary>
31	31	[Item("TSPUpperEuclideanPathEvaluator", "An operator which evaluates TSP solutions given in path representation using the rounded up Euclidean distance metric.")]
32		[Storable~~Class~~("243A948D-9404-4FD0-B4D5-A23A483C2738")]
	32	[StorableType("243A948D-9404-4FD0-B4D5-A23A483C2738")]
33	33	public sealed class TSPUpperEuclideanPathEvaluator : TSPCoordinatesPathEvaluator {
34	34	[StorableConstructor]

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/Improvers/TSPImprovementOperator.cs

r13368	r14711
38	38	/// </remarks>
39	39	[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		[Storable~~Class~~("197E1043-C0F7-4F09-AF71-8489DB13D219")]
	40	[StorableType("197E1043-C0F7-4F09-AF71-8489DB13D219")]
41	41	public sealed class TSPImprovementOperator : SingleSuccessorOperator, ISingleObjectiveImprovementOperator {
42	42	#region Parameter properties

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TSPMoveEvaluator.cs

r13368	r14711
34	34	/// </summary>
35	35	[Item("TSPMoveEvaluator", "A base class for operators which evaluate TSP moves.")]
36		[Storable~~Class~~("D3A8F739-8AC7-48BA-A173-5C28569FE12F")]
	36	[StorableType("D3A8F739-8AC7-48BA-A173-5C28569FE12F")]
37	37	public abstract class TSPMoveEvaluator : SingleSuccessorOperator, ITSPMoveEvaluator, IMoveOperator {
38	38

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TSPPathMoveEvaluator.cs

r13368	r14711
33	33	/// </summary>
34	34	[Item("TSPMoveEvaluator", "A base class for operators which evaluate TSP moves.")]
35		[Storable~~Class~~("BC838D99-042D-47D4-905B-F1394BA6B6E7")]
	35	[StorableType("BC838D99-042D-47D4-905B-F1394BA6B6E7")]
36	36	public abstract class TSPPathMoveEvaluator : TSPMoveEvaluator, ITSPPathMoveEvaluator {
37	37	public ILookupParameter<Permutation> PermutationParameter {

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveDistanceMatrixEvaluator.cs

r13368	r14711
33	33	/// </summary>
34	34	[Item("TSPTranslocationMoveDistanceMatrixEvaluator", "Evaluates a translocation or insertion move (3-opt).")]
35		[Storable~~Class~~("BAE4AA5C-83B2-4A09-9CDC-836BDDA5221F")]
	35	[StorableType("BAE4AA5C-83B2-4A09-9CDC-836BDDA5221F")]
36	36	public class TSPTranslocationMoveDistanceMatrixEvaluator : TSPMoveEvaluator, IPermutationTranslocationMoveOperator {
37	37	public override Type EvaluatorType {

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveEuclideanPathEvaluator.cs

r13368	r14711
30	30	/// </summary>
31	31	[Item("TSPTranslocationMoveEuclideanPathEvaluator", "Operator for evaluating a translocation or insertion move (3-opt) based on euclidean distances.")]
32		[Storable~~Class~~("683A58C4-DC1D-41EA-88D9-A40ADB913DEC")]
	32	[StorableType("683A58C4-DC1D-41EA-88D9-A40ADB913DEC")]
33	33	public class TSPTranslocationMoveEuclideanPathEvaluator : TSPTranslocationMovePathEvaluator {
34	34	[StorableConstructor]

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveGeoPathEvaluator.cs

r13368	r14711
30	30	/// </summary>
31	31	[Item("TSPTranslocationMoveGeoPathEvaluator", "Operator for evaluating a translocation or insertion move (3-opt) based on geo (world) distances.")]
32		[Storable~~Class~~("B9D45307-743D-46E9-BB04-671D88B341D4")]
	32	[StorableType("B9D45307-743D-46E9-BB04-671D88B341D4")]
33	33	public class TSPTranslocationMoveGeoPathEvaluator : TSPTranslocationMovePathEvaluator {
34	34	public override Type EvaluatorType {

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMovePathEvaluator.cs

r13368	r14711
32	32	/// </summary>
33	33	[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		[Storable~~Class~~("7D41A96C-4747-4331-A45F-3BE310A85F21")]
	34	[StorableType("7D41A96C-4747-4331-A45F-3BE310A85F21")]
35	35	public abstract class TSPTranslocationMovePathEvaluator : TSPPathMoveEvaluator, IPermutationTranslocationMoveOperator {
36	36	public ILookupParameter<TranslocationMove> TranslocationMoveParameter {

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveRoundedEuclideanPathEvaluator.cs

r13368	r14711
30	30	/// </summary>
31	31	[Item("TSPTranslocationMoveRoundedEuclideanPathEvaluator", "Operator for evaluating a translocation or insertion move (3-opt) based on rounded euclidean distances.")]
32		[Storable~~Class~~("2965AFB8-A737-47F2-A30D-438A39F1EEB2")]
	32	[StorableType("2965AFB8-A737-47F2-A30D-438A39F1EEB2")]
33	33	public class TSPTranslocationMoveRoundedEuclideanPathEvaluator : TSPTranslocationMovePathEvaluator {
34	34	[StorableConstructor]

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveDistanceMatrixEvaluator.cs

r13368	r14711
33	33	/// </summary>
34	34	[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		[Storable~~Class~~("E77A24BA-77C0-4F46-BBBB-D508B42F10F5")]
	35	[StorableType("E77A24BA-77C0-4F46-BBBB-D508B42F10F5")]
36	36	public class TSPInversionMoveDistanceMatrixEvaluator : TSPMoveEvaluator, IPermutationInversionMoveOperator {
37	37	public override Type EvaluatorType {

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveEuclideanPathEvaluator.cs

r13368	r14711
30	30	/// </summary>
31	31	[Item("TSPInversionMoveEuclideanPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on euclidean distances.")]
32		[Storable~~Class~~("1D73F835-2941-427E-B1B1-C7E913C5F3F6")]
	32	[StorableType("1D73F835-2941-427E-B1B1-C7E913C5F3F6")]
33	33	public class TSPInversionMoveEuclideanPathEvaluator : TSPInversionMovePathEvaluator {
34	34	[StorableConstructor]

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveGeoPathEvaluator.cs

r13368	r14711
30	30	/// </summary>
31	31	[Item("TSPInversionMoveGeoPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on geo (world) distances.")]
32		[Storable~~Class~~("485443EF-9D6B-418A-A917-CE46D7C83EC5")]
	32	[StorableType("485443EF-9D6B-418A-A917-CE46D7C83EC5")]
33	33	public class TSPInversionMoveGeoPathEvaluator : TSPInversionMovePathEvaluator {
34	34	public override Type EvaluatorType {

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMovePathEvaluator.cs

r13368	r14711
32	32	/// </summary>
33	33	[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		[Storable~~Class~~("76FD27FC-B0A6-451F-BB78-C0B7F028FB89")]
	34	[StorableType("76FD27FC-B0A6-451F-BB78-C0B7F028FB89")]
35	35	public abstract class TSPInversionMovePathEvaluator : TSPPathMoveEvaluator, IPermutationInversionMoveOperator {
36	36	public ILookupParameter<InversionMove> InversionMoveParameter {

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveRoundedEuclideanPathEvaluator.cs

r13368	r14711
30	30	/// </summary>
31	31	[Item("TSPInversionMoveRoundedEuclideanPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on rounded euclidean distances.")]
32		[Storable~~Class~~("DAC73CA3-CAC8-4391-813A-9A30A4A2ACDA")]
	32	[StorableType("DAC73CA3-CAC8-4391-813A-9A30A4A2ACDA")]
33	33	public class TSPInversionMoveRoundedEuclideanPathEvaluator : TSPInversionMovePathEvaluator {
34	34	[StorableConstructor]

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPMultipleGuidesPathRelinker.cs

r13368	r14711
39	39	/// </remarks>
40	40	[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		[Storable~~Class~~("BB3E6CA9-FADC-4B8F-9765-3E57047BCD80")]
	41	[StorableType("BB3E6CA9-FADC-4B8F-9765-3E57047BCD80")]
42	42	public sealed class TSPMultipleGuidesPathRelinker : SingleObjectivePathRelinker {
43	43	#region Parameter properties

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPPathRelinker.cs

r13368	r14711
38	38	/// </remarks>
39	39	[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		[Storable~~Class~~("A4EA2725-FE98-43CD-85EA-4417CBDADD63")]
	40	[StorableType("A4EA2725-FE98-43CD-85EA-4417CBDADD63")]
41	41	public sealed class TSPPathRelinker : SingleObjectivePathRelinker {
42	42	[StorableConstructor]

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPSimultaneousPathRelinker.cs

r13368	r14711
38	38	/// </remarks>
39	39	[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		[Storable~~Class~~("09E28798-0BBB-44B0-8D09-FA70517B1D0B")]
	40	[StorableType("09E28798-0BBB-44B0-8D09-FA70517B1D0B")]
41	41	public sealed class TSPSimultaneousPathRelinker : SingleObjectivePathRelinker {
42	42	[StorableConstructor]

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/PathTSPTour.cs

r13368	r14711
33	33	/// </summary>
34	34	[Item("PathTSPTour", "Represents a tour of a Traveling Salesman Problem given in path representation which can be visualized in the GUI.")]
35		[Storable~~Class~~("41A729C4-8091-4922-91F7-EEF90C45164A")]
	35	[StorableType("41A729C4-8091-4922-91F7-EEF90C45164A")]
36	36	public sealed class PathTSPTour : Item {
37	37	public static new Image StaticItemImage {

branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

r13368	r14711
39	39	[Item("Traveling Salesman Problem (TSP)", "Represents a symmetric Traveling Salesman Problem.")]
40	40	[Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 100)]
41		[Storable~~Class~~("FAC70D8A-6077-4E7A-AD57-A9CDDC4D53A7")]
	41	[StorableType("FAC70D8A-6077-4E7A-AD57-A9CDDC4D53A7")]
42	42	public sealed class TravelingSalesmanProblem : SingleObjectiveHeuristicOptimizationProblem<ITSPEvaluator, IPermutationCreator>, IStorableContent,
43	43	IProblemInstanceConsumer<TSPData> {

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 14711 for branches/PersistenceOverhaul/HeuristicLab.Problems.TravelingSalesman

Legend:

Download in other formats: