Changeset 17434 for branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman
- Timestamp:
- 02/11/20 13:36:02 (5 years ago)
- Location:
- branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman
- Files:
-
- 41 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman
- Property svn:mergeinfo deleted
-
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/BestTSPSolutionAnalyzer.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 28 28 using HeuristicLab.Optimization; 29 29 using HeuristicLab.Parameters; 30 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 31 31 32 32 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]37 [StorableType("86D3A4A2-C91C-46D4-9644-10F88F94FEA1")] 38 38 public sealed class BestTSPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator { 39 39 public bool EnabledByDefault { … … 67 67 68 68 [StorableConstructor] 69 private BestTSPSolutionAnalyzer( bool deserializing) : base(deserializing) { }69 private BestTSPSolutionAnalyzer(StorableConstructorFlag _) : base(_) { } 70 70 private BestTSPSolutionAnalyzer(BestTSPSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { } 71 71 public override IDeepCloneable Clone(Cloner cloner) { -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPAlleleFrequencyAnalyzer.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Encodings.PermutationEncoding; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]36 [StorableType("C1BBEC5A-27EF-4882-AEC6-0919FC2EF1DB")] 37 37 public sealed class TSPAlleleFrequencyAnalyzer : AlleleFrequencyAnalyzer<Permutation> { 38 38 public LookupParameter<DoubleMatrix> CoordinatesParameter { … … 44 44 45 45 [StorableConstructor] 46 private TSPAlleleFrequencyAnalyzer( bool deserializing) : base(deserializing) { }46 private TSPAlleleFrequencyAnalyzer(StorableConstructorFlag _) : base(_) { } 47 47 private TSPAlleleFrequencyAnalyzer(TSPAlleleFrequencyAnalyzer original, Cloner cloner) : base(original, cloner) { } 48 48 public TSPAlleleFrequencyAnalyzer() -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPGenealogyAnalyzer.cs
r12892 r17434 1 using HeuristicLab.Common; 1 using HEAL.Attic; 2 using HeuristicLab.Common; 2 3 using HeuristicLab.Core; 3 4 using HeuristicLab.Encodings.PermutationEncoding; … … 6 7 7 8 namespace HeuristicLab.Problems.TravelingSalesman.Analyzers { 8 [StorableClass]9 9 [Item("TSPGenealogyAnalyzer", "A genealogy analyzer for permutation encodings.")] 10 [StorableType("FA2F2F6D-886A-41B4-AF1F-F9F6DA42601B")] 10 11 public class TSPGenealogyAnalyzer : GenealogyAnalyzer<Permutation> { 11 12 public TSPGenealogyAnalyzer() { } 12 13 13 14 [StorableConstructor] 14 protected TSPGenealogyAnalyzer( bool deserializing) : base(deserializing) { }15 protected TSPGenealogyAnalyzer(StorableConstructorFlag _) : base(_) { } 15 16 16 17 public TSPGenealogyAnalyzer(TSPGenealogyAnalyzer original, Cloner cloner) : base(original, cloner) { -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPPopulationDiversityAnalyzer.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Encodings.PermutationEncoding; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 using HeuristicLab.PluginInfrastructure; 29 29 … … 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]39 [StorableType("B68CC721-AC64-44A7-BFEA-B4F0ABE1402D")] 40 40 public sealed class TSPPopulationDiversityAnalyzer : PopulationDiversityAnalyzer<Permutation> { 41 41 [StorableConstructor] 42 private TSPPopulationDiversityAnalyzer( bool deserializing) : base(deserializing) { }42 private TSPPopulationDiversityAnalyzer(StorableConstructorFlag _) : base(_) { } 43 43 private TSPPopulationDiversityAnalyzer(TSPPopulationDiversityAnalyzer original, Cloner cloner) : base(original, cloner) { } 44 44 public TSPPopulationDiversityAnalyzer() : base() { } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/DistanceMatrix.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Data; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.TravelingSalesman { … … 32 32 /// </summary> 33 33 [Item("DistanceMatrix", "Represents a distance matrix of a Traveling Salesman Problem.")] 34 [Storable Class]34 [StorableType("37D937BA-443B-44BC-AC89-C74D79D96D56")] 35 35 public sealed class DistanceMatrix : DoubleMatrix { 36 36 [StorableConstructor] 37 private DistanceMatrix( bool deserializing) : base(deserializing) { }37 private DistanceMatrix(StorableConstructorFlag _) : base(_) { } 38 38 private DistanceMatrix(DistanceMatrix original, Cloner cloner) { 39 39 throw new NotSupportedException("Distance matrices cannot be cloned."); -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPCoordinatesPathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Encodings.PermutationEncoding; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]35 [StorableType("4A8D4CC9-C6A6-4611-A140-C21FAA93EDC0")] 36 36 public abstract class TSPCoordinatesPathEvaluator : TSPEvaluator, ITSPCoordinatesPathEvaluator { 37 37 private object locker = new object(); … … 51 51 52 52 [StorableConstructor] 53 protected TSPCoordinatesPathEvaluator( bool deserializing) : base(deserializing) { }53 protected TSPCoordinatesPathEvaluator(StorableConstructorFlag _) : base(_) { } 54 54 protected TSPCoordinatesPathEvaluator(TSPCoordinatesPathEvaluator original, Cloner cloner) : base(original, cloner) { } 55 55 protected TSPCoordinatesPathEvaluator() -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPDistanceMatrixEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Encodings.PermutationEncoding; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Problems.TravelingSalesman { … … 33 33 /// </summary> 34 34 [Item("TSPDistanceMatrixEvaluator", "Evaluate TSP solutions given in path representation using the distance matrix.")] 35 [Storable Class]35 [StorableType("A52B705D-9F66-47AE-B1B4-B6969E0A6D83")] 36 36 public sealed class TSPDistanceMatrixEvaluator : TSPEvaluator, ITSPDistanceMatrixEvaluator { 37 37 … … 44 44 45 45 [StorableConstructor] 46 private TSPDistanceMatrixEvaluator( bool deserializing) : base(deserializing) { }46 private TSPDistanceMatrixEvaluator(StorableConstructorFlag _) : base(_) { } 47 47 private TSPDistanceMatrixEvaluator(TSPDistanceMatrixEvaluator original, Cloner cloner) : base(original, cloner) { } 48 48 public TSPDistanceMatrixEvaluator() -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPEuclideanPathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]32 [StorableType("583A53B5-2ABD-44C4-A530-3B5395FB5855")] 33 33 public sealed class TSPEuclideanPathEvaluator : TSPCoordinatesPathEvaluator { 34 34 [StorableConstructor] 35 private TSPEuclideanPathEvaluator( bool deserializing) : base(deserializing) { }35 private TSPEuclideanPathEvaluator(StorableConstructorFlag _) : base(_) { } 36 36 private TSPEuclideanPathEvaluator(TSPEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { } 37 37 public TSPEuclideanPathEvaluator() : base() { } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Operators; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.TravelingSalesman { … … 32 32 /// </summary> 33 33 [Item("TSPEvaluator", "A base class for operators which evaluate TSP solutions.")] 34 [Storable Class]34 [StorableType("79FAF3BB-305D-437E-9FF3-C85A561D9A85")] 35 35 public abstract class TSPEvaluator : InstrumentedOperator, ITSPEvaluator { 36 36 public override bool CanChangeName { … … 43 43 44 44 [StorableConstructor] 45 protected TSPEvaluator( bool deserializing) : base(deserializing) { }45 protected TSPEvaluator(StorableConstructorFlag _) : base(_) { } 46 46 protected TSPEvaluator(TSPEvaluator original, Cloner cloner) : base(original, cloner) { } 47 47 protected TSPEvaluator() -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPGeoPathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]32 [StorableType("A69C2CE3-6A89-4991-9743-4DE8F07149B9")] 33 33 public sealed class TSPGeoPathEvaluator : TSPCoordinatesPathEvaluator { 34 34 private const double PI = 3.141592; … … 36 36 37 37 [StorableConstructor] 38 private TSPGeoPathEvaluator( bool deserializing) : base(deserializing) { }38 private TSPGeoPathEvaluator(StorableConstructorFlag _) : base(_) { } 39 39 private TSPGeoPathEvaluator(TSPGeoPathEvaluator original, Cloner cloner) : base(original, cloner) { } 40 40 public TSPGeoPathEvaluator() : base() { } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPRoundedEuclideanPathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]32 [StorableType("AD108E29-244A-42E1-AA46-23A09C9894B9")] 33 33 public sealed class TSPRoundedEuclideanPathEvaluator : TSPCoordinatesPathEvaluator { 34 34 [StorableConstructor] 35 private TSPRoundedEuclideanPathEvaluator( bool deserializing) : base(deserializing) { }35 private TSPRoundedEuclideanPathEvaluator(StorableConstructorFlag _) : base(_) { } 36 36 private TSPRoundedEuclideanPathEvaluator(TSPRoundedEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { } 37 37 public TSPRoundedEuclideanPathEvaluator() : base() { } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPUpperEuclideanPathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]32 [StorableType("B827571E-A3F8-48A5-8908-D2C3537D40CF")] 33 33 public sealed class TSPUpperEuclideanPathEvaluator : TSPCoordinatesPathEvaluator { 34 34 [StorableConstructor] 35 private TSPUpperEuclideanPathEvaluator( bool deserializing) : base(deserializing) { }35 private TSPUpperEuclideanPathEvaluator(StorableConstructorFlag _) : base(_) { } 36 36 private TSPUpperEuclideanPathEvaluator(TSPUpperEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { } 37 37 public TSPUpperEuclideanPathEvaluator() : base() { } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj
r16130 r17434 18 18 <UpgradeBackupLocation> 19 19 </UpgradeBackupLocation> 20 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>20 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 21 21 <TargetFrameworkProfile> 22 22 </TargetFrameworkProfile> … … 239 239 </ItemGroup> 240 240 <ItemGroup> 241 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 242 <SpecificVersion>False</SpecificVersion> 243 <HintPath>..\..\bin\HEAL.Attic.dll</HintPath> 244 <Private>False</Private> 245 </Reference> 246 </ItemGroup> 247 <ItemGroup> 241 248 <ProjectReference Include="..\..\HeuristicLab.EvolutionTracking\3.4\HeuristicLab.EvolutionTracking-3.4.csproj"> 242 249 <Project>{1f75cea3-464f-4a6f-b2f0-04b9841ebc16}</Project> -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Improvers/TSPImprovementOperator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 28 28 using HeuristicLab.Optimization; 29 29 using HeuristicLab.Parameters; 30 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 31 31 32 32 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]40 [StorableType("9C3B53A4-8FE7-45FC-833B-FF3DAE578010")] 41 41 public sealed class TSPImprovementOperator : SingleSuccessorOperator, ISingleObjectiveImprovementOperator { 42 42 #region Parameter properties … … 77 77 78 78 [StorableConstructor] 79 private TSPImprovementOperator( bool deserializing) : base(deserializing) { }79 private TSPImprovementOperator(StorableConstructorFlag _) : base(_) { } 80 80 private TSPImprovementOperator(TSPImprovementOperator original, Cloner cloner) : base(original, cloner) { } 81 81 public TSPImprovementOperator() -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Interfaces/ITSPCoordinatesPathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Core; 23 23 using HeuristicLab.Data; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Problems.TravelingSalesman { 27 [StorableType("C9962138-AB3D-4C33-B5EC-9B526E0C6F82")] 26 28 /// <summary> 27 29 /// An interface which represents an evaluation operator which evaluates TSP solutions given in path representation using city coordinates. -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Interfaces/ITSPDistanceMatrixEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using HeuristicLab.Core; 23 using HEAL.Attic; 23 24 24 25 namespace HeuristicLab.Problems.TravelingSalesman { 26 [StorableType("ADEAB327-E563-42D6-845C-E9D412586A4C")] 25 27 /// <summary> 26 28 /// An interface which represents an evaluation operator which evaluates TSP solutions given in path representation using a distance matrix. -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Interfaces/ITSPEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using HeuristicLab.Optimization; 23 using HEAL.Attic; 23 24 24 25 namespace HeuristicLab.Problems.TravelingSalesman { 26 [StorableType("913DCAEA-8E40-4ADA-AB77-0E99B7C1C340")] 25 27 /// <summary> 26 28 /// An interface which represents an evaluation operator for Traveling Salesman Problems. -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Interfaces/ITSPMoveEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using System; 23 23 using HeuristicLab.Optimization; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Problems.TravelingSalesman { 27 [StorableType("2EFBA5C1-6503-4910-9EF8-F6A5D8FBAFEF")] 26 28 public interface ITSPMoveEvaluator : ISingleObjectiveMoveEvaluator, IMoveOperator { 27 29 Type EvaluatorType { get; } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Interfaces/ITSPPathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Core; 23 23 using HeuristicLab.Encodings.PermutationEncoding; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Problems.TravelingSalesman { 27 [StorableType("D500AB51-6750-44D3-B1CA-0DF2DCB43758")] 26 28 /// <summary> 27 29 /// An interface which represents an evaluation operator which evaluates TSP solutions given in path representation. -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Interfaces/ITSPPathMoveEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Data; 24 24 using HeuristicLab.Encodings.PermutationEncoding; 25 using HEAL.Attic; 25 26 26 27 namespace HeuristicLab.Problems.TravelingSalesman { 28 [StorableType("E8D13595-71B9-4F6F-B879-FDF2BDB482EB")] 27 29 public interface ITSPPathMoveEvaluator : ITSPMoveEvaluator, IPermutationMoveOperator { 28 30 ILookupParameter<DoubleMatrix> CoordinatesParameter { get; } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TSPMoveEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Optimization; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Problems.TravelingSalesman { … … 34 34 /// </summary> 35 35 [Item("TSPMoveEvaluator", "A base class for operators which evaluate TSP moves.")] 36 [Storable Class]36 [StorableType("25573174-DE4B-4076-B439-CCB5F01CE652")] 37 37 public abstract class TSPMoveEvaluator : SingleSuccessorOperator, ITSPMoveEvaluator, IMoveOperator { 38 38 … … 50 50 51 51 [StorableConstructor] 52 protected TSPMoveEvaluator( bool deserializing) : base(deserializing) { }52 protected TSPMoveEvaluator(StorableConstructorFlag _) : base(_) { } 53 53 protected TSPMoveEvaluator(TSPMoveEvaluator original, Cloner cloner) : base(original, cloner) { } 54 54 protected TSPMoveEvaluator() -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TSPPathMoveEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Encodings.PermutationEncoding; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Problems.TravelingSalesman { … … 33 33 /// </summary> 34 34 [Item("TSPMoveEvaluator", "A base class for operators which evaluate TSP moves.")] 35 [Storable Class]35 [StorableType("F4EEA3B3-BA91-4391-903B-2EDBD47CF439")] 36 36 public abstract class TSPPathMoveEvaluator : TSPMoveEvaluator, ITSPPathMoveEvaluator { 37 37 public ILookupParameter<Permutation> PermutationParameter { … … 49 49 50 50 [StorableConstructor] 51 protected TSPPathMoveEvaluator( bool deserializing) : base(deserializing) { }51 protected TSPPathMoveEvaluator(StorableConstructorFlag _) : base(_) { } 52 52 protected TSPPathMoveEvaluator(TSPPathMoveEvaluator original, Cloner cloner) : base(original, cloner) { } 53 53 protected TSPPathMoveEvaluator() -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveDistanceMatrixEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Encodings.PermutationEncoding; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Problems.TravelingSalesman { … … 33 33 /// </summary> 34 34 [Item("TSPTranslocationMoveDistanceMatrixEvaluator", "Evaluates a translocation or insertion move (3-opt).")] 35 [Storable Class]35 [StorableType("895EF1F3-6FE0-43C0-A6D4-7EEAB7B06841")] 36 36 public class TSPTranslocationMoveDistanceMatrixEvaluator : TSPMoveEvaluator, IPermutationTranslocationMoveOperator { 37 37 public override Type EvaluatorType { … … 50 50 51 51 [StorableConstructor] 52 protected TSPTranslocationMoveDistanceMatrixEvaluator( bool deserializing) : base(deserializing) { }52 protected TSPTranslocationMoveDistanceMatrixEvaluator(StorableConstructorFlag _) : base(_) { } 53 53 protected TSPTranslocationMoveDistanceMatrixEvaluator(TSPTranslocationMoveDistanceMatrixEvaluator original, Cloner cloner) : base(original, cloner) { } 54 54 public TSPTranslocationMoveDistanceMatrixEvaluator() -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveEuclideanPathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.TravelingSalesman { … … 30 30 /// </summary> 31 31 [Item("TSPTranslocationMoveEuclideanPathEvaluator", "Operator for evaluating a translocation or insertion move (3-opt) based on euclidean distances.")] 32 [Storable Class]32 [StorableType("7686F16C-12E5-4FE8-8417-BA32B39D8817")] 33 33 public class TSPTranslocationMoveEuclideanPathEvaluator : TSPTranslocationMovePathEvaluator { 34 34 [StorableConstructor] 35 protected TSPTranslocationMoveEuclideanPathEvaluator( bool deserializing) : base(deserializing) { }35 protected TSPTranslocationMoveEuclideanPathEvaluator(StorableConstructorFlag _) : base(_) { } 36 36 protected TSPTranslocationMoveEuclideanPathEvaluator(TSPTranslocationMoveEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { } 37 37 public TSPTranslocationMoveEuclideanPathEvaluator() : base() { } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveGeoPathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]32 [StorableType("3CCF9099-547F-44A3-9279-99ED96F7ACCD")] 33 33 public class TSPTranslocationMoveGeoPathEvaluator : TSPTranslocationMovePathEvaluator { 34 34 public override Type EvaluatorType { … … 40 40 41 41 [StorableConstructor] 42 protected TSPTranslocationMoveGeoPathEvaluator( bool deserializing) : base(deserializing) { }42 protected TSPTranslocationMoveGeoPathEvaluator(StorableConstructorFlag _) : base(_) { } 43 43 protected TSPTranslocationMoveGeoPathEvaluator(TSPTranslocationMoveGeoPathEvaluator original, Cloner cloner) : base(original, cloner) { } 44 44 public TSPTranslocationMoveGeoPathEvaluator() : base() { } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMovePathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Encodings.PermutationEncoding; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]34 [StorableType("DC2FBCA3-B75F-4DA2-974E-334083159D93")] 35 35 public abstract class TSPTranslocationMovePathEvaluator : TSPPathMoveEvaluator, IPermutationTranslocationMoveOperator { 36 36 public ILookupParameter<TranslocationMove> TranslocationMoveParameter { … … 39 39 40 40 [StorableConstructor] 41 protected TSPTranslocationMovePathEvaluator( bool deserializing) : base(deserializing) { }41 protected TSPTranslocationMovePathEvaluator(StorableConstructorFlag _) : base(_) { } 42 42 protected TSPTranslocationMovePathEvaluator(TSPTranslocationMovePathEvaluator original, Cloner cloner) : base(original, cloner) { } 43 43 public TSPTranslocationMovePathEvaluator() -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveRoundedEuclideanPathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]32 [StorableType("AA52F35B-DEE3-4B21-A953-07773D4ED5BC")] 33 33 public class TSPTranslocationMoveRoundedEuclideanPathEvaluator : TSPTranslocationMovePathEvaluator { 34 34 [StorableConstructor] 35 protected TSPTranslocationMoveRoundedEuclideanPathEvaluator( bool deserializing) : base(deserializing) { }35 protected TSPTranslocationMoveRoundedEuclideanPathEvaluator(StorableConstructorFlag _) : base(_) { } 36 36 protected TSPTranslocationMoveRoundedEuclideanPathEvaluator(TSPTranslocationMoveRoundedEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { } 37 37 public TSPTranslocationMoveRoundedEuclideanPathEvaluator() : base() { } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveDistanceMatrixEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Encodings.PermutationEncoding; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]35 [StorableType("1EA2C5B2-96E0-4C64-9089-F08F6D2B1CAE")] 36 36 public class TSPInversionMoveDistanceMatrixEvaluator : TSPMoveEvaluator, IPermutationInversionMoveOperator { 37 37 public override Type EvaluatorType { … … 50 50 51 51 [StorableConstructor] 52 protected TSPInversionMoveDistanceMatrixEvaluator( bool deserializing) : base(deserializing) { }52 protected TSPInversionMoveDistanceMatrixEvaluator(StorableConstructorFlag _) : base(_) { } 53 53 protected TSPInversionMoveDistanceMatrixEvaluator(TSPInversionMoveDistanceMatrixEvaluator original, Cloner cloner) : base(original, cloner) { } 54 54 public TSPInversionMoveDistanceMatrixEvaluator() -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveEuclideanPathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.TravelingSalesman { … … 30 30 /// </summary> 31 31 [Item("TSPInversionMoveEuclideanPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on euclidean distances.")] 32 [Storable Class]32 [StorableType("856F5D88-FBD5-4DC9-AC52-60C402B83F21")] 33 33 public class TSPInversionMoveEuclideanPathEvaluator : TSPInversionMovePathEvaluator { 34 34 [StorableConstructor] 35 protected TSPInversionMoveEuclideanPathEvaluator( bool deserializing) : base(deserializing) { }35 protected TSPInversionMoveEuclideanPathEvaluator(StorableConstructorFlag _) : base(_) { } 36 36 protected TSPInversionMoveEuclideanPathEvaluator(TSPInversionMoveEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { } 37 37 public TSPInversionMoveEuclideanPathEvaluator() : base() { } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveGeoPathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.TravelingSalesman { … … 30 30 /// </summary> 31 31 [Item("TSPInversionMoveGeoPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on geo (world) distances.")] 32 [Storable Class]32 [StorableType("DCBB9049-6C89-4249-BB7D-314B7C62E9E6")] 33 33 public class TSPInversionMoveGeoPathEvaluator : TSPInversionMovePathEvaluator { 34 34 public override Type EvaluatorType { … … 40 40 41 41 [StorableConstructor] 42 protected TSPInversionMoveGeoPathEvaluator( bool deserializing) : base(deserializing) { }42 protected TSPInversionMoveGeoPathEvaluator(StorableConstructorFlag _) : base(_) { } 43 43 protected TSPInversionMoveGeoPathEvaluator(TSPInversionMoveGeoPathEvaluator original, Cloner cloner) : base(original, cloner) { } 44 44 public TSPInversionMoveGeoPathEvaluator() : base() { } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMovePathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Encodings.PermutationEncoding; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]34 [StorableType("0D180690-C01E-4F64-94D9-C6F713EA195B")] 35 35 public abstract class TSPInversionMovePathEvaluator : TSPPathMoveEvaluator, IPermutationInversionMoveOperator { 36 36 public ILookupParameter<InversionMove> InversionMoveParameter { … … 39 39 40 40 [StorableConstructor] 41 protected TSPInversionMovePathEvaluator( bool deserializing) : base(deserializing) { }41 protected TSPInversionMovePathEvaluator(StorableConstructorFlag _) : base(_) { } 42 42 protected TSPInversionMovePathEvaluator(TSPInversionMovePathEvaluator original, Cloner cloner) : base(original, cloner) { } 43 43 public TSPInversionMovePathEvaluator() -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveRoundedEuclideanPathEvaluator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.TravelingSalesman { … … 30 30 /// </summary> 31 31 [Item("TSPInversionMoveRoundedEuclideanPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on rounded euclidean distances.")] 32 [Storable Class]32 [StorableType("84BE355F-BC76-4765-885F-CFCAEDA93DFD")] 33 33 public class TSPInversionMoveRoundedEuclideanPathEvaluator : TSPInversionMovePathEvaluator { 34 34 [StorableConstructor] 35 protected TSPInversionMoveRoundedEuclideanPathEvaluator( bool deserializing) : base(deserializing) { }35 protected TSPInversionMoveRoundedEuclideanPathEvaluator(StorableConstructorFlag _) : base(_) { } 36 36 protected TSPInversionMoveRoundedEuclideanPathEvaluator(TSPInversionMoveRoundedEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { } 37 37 public TSPInversionMoveRoundedEuclideanPathEvaluator() : base() { } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPMultipleGuidesPathRelinker.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 29 29 using HeuristicLab.Optimization.Operators; 30 30 using HeuristicLab.Parameters; 31 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;31 using HEAL.Attic; 32 32 33 33 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]41 [StorableType("6B5B2622-AB1D-47E6-8BBC-C6088D393149")] 42 42 public sealed class TSPMultipleGuidesPathRelinker : SingleObjectivePathRelinker { 43 43 #region Parameter properties … … 54 54 55 55 [StorableConstructor] 56 private TSPMultipleGuidesPathRelinker( bool deserializing) : base(deserializing) { }56 private TSPMultipleGuidesPathRelinker(StorableConstructorFlag _) : base(_) { } 57 57 private TSPMultipleGuidesPathRelinker(TSPMultipleGuidesPathRelinker original, Cloner cloner) : base(original, cloner) { } 58 58 public TSPMultipleGuidesPathRelinker() -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPPathRelinker.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 28 28 using HeuristicLab.Encodings.PermutationEncoding; 29 29 using HeuristicLab.Optimization.Operators; 30 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 31 31 32 32 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]40 [StorableType("0997A24C-0592-4CE4-A681-70C97890D3F7")] 41 41 public sealed class TSPPathRelinker : SingleObjectivePathRelinker { 42 42 [StorableConstructor] 43 private TSPPathRelinker( bool deserializing) : base(deserializing) { }43 private TSPPathRelinker(StorableConstructorFlag _) : base(_) { } 44 44 private TSPPathRelinker(TSPPathRelinker original, Cloner cloner) : base(original, cloner) { } 45 45 public TSPPathRelinker() : base() { } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPSimultaneousPathRelinker.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 28 28 using HeuristicLab.Encodings.PermutationEncoding; 29 29 using HeuristicLab.Optimization.Operators; 30 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 31 31 32 32 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]40 [StorableType("D44D112E-5139-4848-8A2B-66CFC5784EE4")] 41 41 public sealed class TSPSimultaneousPathRelinker : SingleObjectivePathRelinker { 42 42 [StorableConstructor] 43 private TSPSimultaneousPathRelinker( bool deserializing) : base(deserializing) { }43 private TSPSimultaneousPathRelinker(StorableConstructorFlag _) : base(_) { } 44 44 private TSPSimultaneousPathRelinker(TSPSimultaneousPathRelinker original, Cloner cloner) : base(original, cloner) { } 45 45 public TSPSimultaneousPathRelinker() : base() { } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/PathTSPTour.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Data; 27 27 using HeuristicLab.Encodings.PermutationEncoding; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Problems.TravelingSalesman { … … 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]35 [StorableType("2CAE7C49-751B-4802-9025-62E2268E47AE")] 36 36 public sealed class PathTSPTour : Item { 37 37 public static new Image StaticItemImage { … … 80 80 81 81 [StorableConstructor] 82 private PathTSPTour( bool deserializing) : base(deserializing) { }82 private PathTSPTour(StorableConstructorFlag _) : base(_) { } 83 83 private PathTSPTour(PathTSPTour original, Cloner cloner) 84 84 : base(original, cloner) { -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Plugin.cs.frame
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 /// Plugin class for HeuristicLab.Problems.TravelingSalesman plugin 27 27 /// </summary> 28 [Plugin("HeuristicLab.Problems.TravelingSalesman", "3.3.1 5.$WCREV$")]28 [Plugin("HeuristicLab.Problems.TravelingSalesman", "3.3.16.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Problems.TravelingSalesman-3.3.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Analysis", "3.3")] … … 39 39 [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")] 40 40 [PluginDependency("HeuristicLab.Parameters", "3.3")] 41 [PluginDependency("HeuristicLab. Persistence", "3.3")]41 [PluginDependency("HeuristicLab.Attic", "1.0")] 42 42 [PluginDependency("HeuristicLab.Problems.Instances", "3.3")] 43 43 public class HeuristicLabProblemsTravelingSalesmanPlugin : PluginBase { -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Properties/AssemblyInfo.cs.frame
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 31 31 [assembly: AssemblyCompany("")] 32 32 [assembly: AssemblyProduct("HeuristicLab")] 33 [assembly: AssemblyCopyright("(c) 2002-2018HEAL")]33 [assembly: AssemblyCopyright("(c) HEAL")] 34 34 [assembly: AssemblyTrademark("")] 35 35 [assembly: AssemblyCulture("")] … … 53 53 // by using the '*' as shown below: 54 54 [assembly: AssemblyVersion("3.3.0.0")] 55 [assembly: AssemblyFileVersion("3.3.1 5.$WCREV$")]55 [assembly: AssemblyFileVersion("3.3.16.$WCREV$")] -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/SimilarityCalculators/TSPSimilarityCalculator.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using System; 23 using HEAL.Attic; 23 24 using HeuristicLab.Common; 24 25 using HeuristicLab.Core; … … 37 38 [Obsolete("This operator is similar to the Hamming similarity calculator in the Encodings.PermutationEncoding namespace")] 38 39 [NonDiscoverableType] 40 [StorableType("0216BF57-995F-4F23-B422-F2C571314C5A")] 39 41 internal sealed class TSPSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator { 40 42 protected override bool IsCommutative { get { return true; } } 41 43 42 private TSPSimilarityCalculator(bool deserializing) : base(deserializing) { } 44 [StorableConstructor] 45 private TSPSimilarityCalculator(StorableConstructorFlag _) : base(_) { } 43 46 private TSPSimilarityCalculator(TSPSimilarityCalculator original, Cloner cloner) : base(original, cloner) { } 44 47 public TSPSimilarityCalculator() : base() { } -
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs
r16130 r17434 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-2018Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using System.IO; 25 25 using System.Linq; 26 using HEAL.Attic; 26 27 using HeuristicLab.Analysis; 27 28 using HeuristicLab.Common; … … 33 34 using HeuristicLab.Optimization.Operators; 34 35 using HeuristicLab.Parameters; 35 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;36 36 using HeuristicLab.PluginInfrastructure; 37 37 using HeuristicLab.Problems.Instances; … … 41 41 [Item("Traveling Salesman Problem (TSP)", "Represents a symmetric Traveling Salesman Problem.")] 42 42 [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 100)] 43 [Storable Class]43 [StorableType("F0A3550C-2B8F-497D-BF32-5763F8D7592C")] 44 44 public sealed class TravelingSalesmanProblem : SingleObjectiveHeuristicOptimizationProblem<ITSPEvaluator, IPermutationCreator>, IStorableContent, 45 45 IProblemInstanceConsumer<TSPData> { … … 112 112 113 113 [StorableConstructor] 114 private TravelingSalesmanProblem( bool deserializing) : base(deserializing) { }114 private TravelingSalesmanProblem(StorableConstructorFlag _) : base(_) { } 115 115 private TravelingSalesmanProblem(TravelingSalesmanProblem original, Cloner cloner) 116 116 : base(original, cloner) { … … 223 223 if (oldCoordinates != null) { 224 224 Parameters.Remove(oldCoordinates); 225 Parameters.Add(new OptionalValueParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the cities.", oldCoordinates.Value , oldCoordinates.GetsCollected));225 Parameters.Add(new OptionalValueParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the cities.", oldCoordinates.Value) { GetsCollected = oldCoordinates.GetsCollected }); 226 226 } 227 227
Note: See TracChangeset
for help on using the changeset viewer.