- Timestamp:
- 03/28/19 16:54:20 (5 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 42 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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.Optimization; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Problems.PTSP { 32 32 [Item("Analytical Probabilistic Traveling Salesman Problem (PTSP)", "Represents a probabilistic traveling salesman problem where the expected tour length is calculated exactly.")] 33 33 [Creatable(CreatableAttribute.Categories.CombinatorialProblems)] 34 [Storable Class]34 [StorableType("509B6AB5-F4DE-4144-A031-43EEBAD02CA6")] 35 35 public sealed class AnalyticalProbabilisticTravelingSalesmanProblem : ProbabilisticTravelingSalesmanProblem { 36 36 37 37 [StorableConstructor] 38 private AnalyticalProbabilisticTravelingSalesmanProblem( bool deserializing) : base(deserializing) { }38 private AnalyticalProbabilisticTravelingSalesmanProblem(StorableConstructorFlag _) : base(_) { } 39 39 private AnalyticalProbabilisticTravelingSalesmanProblem(AnalyticalProbabilisticTravelingSalesmanProblem original, Cloner cloner) : base(original, cloner) { } 40 40 public AnalyticalProbabilisticTravelingSalesmanProblem() { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Analyzers/BestPTSPSolutionAnalyzer.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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.PTSP { … … 35 35 /// </summary> 36 36 [Item("BestPTSPSolutionAnalyzer", "An operator for analyzing the best solution of Probabilistic Traveling Salesman Problems given in path representation using city coordinates.")] 37 [Storable Class]37 [StorableType("459505F0-379B-4903-A388-8612FD732EE7")] 38 38 public sealed class BestPTSPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator { 39 39 public bool EnabledByDefault { … … 70 70 71 71 [StorableConstructor] 72 private BestPTSPSolutionAnalyzer( bool deserializing) : base(deserializing) { }72 private BestPTSPSolutionAnalyzer(StorableConstructorFlag _) : base(_) { } 73 73 private BestPTSPSolutionAnalyzer(BestPTSPSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { } 74 74 public override IDeepCloneable Clone(Cloner cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/AttDistance.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Core; 24 24 using HeuristicLab.Data; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 using HeuristicLab.Problems.Instances; 27 27 28 28 namespace HeuristicLab.Problems.PTSP { 29 29 [Item("Att Distance", "Calculates the att distance.")] 30 [Storable Class]30 [StorableType("7A21281C-EED9-4FE0-A6B1-DE916A074739")] 31 31 public sealed class AttDistance : DistanceCalculator { 32 32 33 33 [StorableConstructor] 34 private AttDistance( bool deserializing) : base(deserializing) { }34 private AttDistance(StorableConstructorFlag _) : base(_) { } 35 35 private AttDistance(AttDistance original, Cloner cloner) : base(original, cloner) { } 36 36 public AttDistance() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/DistanceCalculator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Core; 24 24 using HeuristicLab.Data; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.PTSP { 28 28 [Item("Distance calculator", "Calculates the distance between two cities given as index of a coordinates matrix.")] 29 [Storable Class]29 [StorableType("7CC7E665-A6A7-478B-B978-7079E1DDBA70")] 30 30 public abstract class DistanceCalculator : Item { 31 31 [StorableConstructor] 32 protected DistanceCalculator( bool deserializing) : base(deserializing) { }32 protected DistanceCalculator(StorableConstructorFlag _) : base(_) { } 33 33 protected DistanceCalculator(DistanceCalculator original, Cloner cloner) : base(original, cloner) { } 34 34 protected DistanceCalculator() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/EuclideanDistance.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Core; 24 24 using HeuristicLab.Data; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 using HeuristicLab.Problems.Instances; 27 27 28 28 namespace HeuristicLab.Problems.PTSP { 29 29 [Item("Euclidean Distance", "Calculates the euclidean distance.")] 30 [Storable Class]30 [StorableType("D769186D-11F8-4F67-A39A-4B78184334E7")] 31 31 public sealed class EuclideanDistance : DistanceCalculator { 32 32 33 33 [StorableConstructor] 34 private EuclideanDistance( bool deserializing) : base(deserializing) { }34 private EuclideanDistance(StorableConstructorFlag _) : base(_) { } 35 35 private EuclideanDistance(EuclideanDistance original, Cloner cloner) : base(original, cloner) { } 36 36 public EuclideanDistance() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/GeoDistance.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Core; 24 24 using HeuristicLab.Data; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 using HeuristicLab.Problems.Instances; 27 27 28 28 namespace HeuristicLab.Problems.PTSP { 29 29 [Item("Geo Distance", "Calculates the geo distance.")] 30 [Storable Class]30 [StorableType("B6CAD594-7558-4F19-ACE3-7739D29621F1")] 31 31 public sealed class GeoDistance : DistanceCalculator { 32 32 33 33 [StorableConstructor] 34 private GeoDistance( bool deserializing) : base(deserializing) { }34 private GeoDistance(StorableConstructorFlag _) : base(_) { } 35 35 private GeoDistance(GeoDistance original, Cloner cloner) : base(original, cloner) { } 36 36 public GeoDistance() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/ManhattanDistance.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Core; 24 24 using HeuristicLab.Data; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 using HeuristicLab.Problems.Instances; 27 27 28 28 namespace HeuristicLab.Problems.PTSP { 29 29 [Item("Manhattan Distance", "Calculates the Manhattan distance.")] 30 [Storable Class]30 [StorableType("1395A5AC-9A55-40F0-B5C4-1EF15284938F")] 31 31 public sealed class ManhattanDistance : DistanceCalculator { 32 32 33 33 [StorableConstructor] 34 private ManhattanDistance( bool deserializing) : base(deserializing) { }34 private ManhattanDistance(StorableConstructorFlag _) : base(_) { } 35 35 private ManhattanDistance(ManhattanDistance original, Cloner cloner) : base(original, cloner) { } 36 36 public ManhattanDistance() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/MaximumDistance.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Core; 24 24 using HeuristicLab.Data; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 using HeuristicLab.Problems.Instances; 27 27 28 28 namespace HeuristicLab.Problems.PTSP { 29 29 [Item("Maximum Distance", "Calculates the maximum distance.")] 30 [Storable Class]30 [StorableType("4ADF8A83-B110-4B39-882F-B5286EFB78A9")] 31 31 public sealed class MaximumDistance : DistanceCalculator { 32 32 33 33 [StorableConstructor] 34 private MaximumDistance( bool deserializing) : base(deserializing) { }34 private MaximumDistance(StorableConstructorFlag _) : base(_) { } 35 35 private MaximumDistance(MaximumDistance original, Cloner cloner) : base(original, cloner) { } 36 36 public MaximumDistance() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/RoundedEuclideanDistance.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Core; 24 24 using HeuristicLab.Data; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 using HeuristicLab.Problems.Instances; 27 27 28 28 namespace HeuristicLab.Problems.PTSP { 29 29 [Item("Rounded Euclidean Distance", "Calculates the euclidean distance and rounds it to the nearest integer.")] 30 [Storable Class]30 [StorableType("5AE6854F-505E-438A-8668-2758FEF20861")] 31 31 public sealed class RoundedEuclideanDistance : DistanceCalculator { 32 32 33 33 [StorableConstructor] 34 private RoundedEuclideanDistance( bool deserializing) : base(deserializing) { }34 private RoundedEuclideanDistance(StorableConstructorFlag _) : base(_) { } 35 35 private RoundedEuclideanDistance(RoundedEuclideanDistance original, Cloner cloner) : base(original, cloner) { } 36 36 public RoundedEuclideanDistance() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/UpperEuclideanDistance.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Core; 24 24 using HeuristicLab.Data; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 using HeuristicLab.Problems.Instances; 27 27 28 28 namespace HeuristicLab.Problems.PTSP { 29 29 [Item("Upper Euclidean Distance", "Calculates the ceiling of the euclidean distance.")] 30 [Storable Class]30 [StorableType("960A75FA-C8A7-4927-9814-C454343C198E")] 31 31 public sealed class UpperEuclideanDistance : DistanceCalculator { 32 32 33 33 [StorableConstructor] 34 private UpperEuclideanDistance( bool deserializing) : base(deserializing) { }34 private UpperEuclideanDistance(StorableConstructorFlag _) : base(_) { } 35 35 private UpperEuclideanDistance(UpperEuclideanDistance original, Cloner cloner) : base(original, cloner) { } 36 36 public UpperEuclideanDistance() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/DistanceMatrix.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Data; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Problems.PTSP { 29 29 [Item("DistanceMatrix", "Represents a distance matrix of a Probabilistic Traveling Salesman Problem.")] 30 [Storable Class]30 [StorableType("C1E6E275-FA8C-448F-AB49-8779EB0738BE")] 31 31 public sealed class DistanceMatrix : DoubleMatrix { 32 32 [StorableConstructor] 33 private DistanceMatrix( bool deserializing) : base(deserializing) { }33 private DistanceMatrix(StorableConstructorFlag _) : base(_) { } 34 34 public DistanceMatrix() : base() { } 35 35 public DistanceMatrix(int rows, int columns) : base(rows, columns) { } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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 using HeuristicLab.Problems.Instances; 32 32 using HeuristicLab.Random; … … 35 35 [Item("Estimated Probabilistic Traveling Salesman Problem (PTSP)", "Represents a probabilistic traveling salesman problem where the expected tour length is estimated by averaging over the length of tours on a number of, so called, realizations.")] 36 36 [Creatable(CreatableAttribute.Categories.CombinatorialProblems)] 37 [Storable Class]37 [StorableType("D1F1DE71-54E3-40B6-856F-685CD71D97F9")] 38 38 public sealed class EstimatedProbabilisticTravelingSalesmanProblem : ProbabilisticTravelingSalesmanProblem { 39 39 … … 60 60 61 61 [StorableConstructor] 62 private EstimatedProbabilisticTravelingSalesmanProblem( bool deserializing) : base(deserializing) { }62 private EstimatedProbabilisticTravelingSalesmanProblem(StorableConstructorFlag _) : base(_) { } 63 63 private EstimatedProbabilisticTravelingSalesmanProblem(EstimatedProbabilisticTravelingSalesmanProblem original, Cloner cloner) 64 64 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/HeuristicLab.Problems.PTSP-3.3.csproj
r15069 r16723 10 10 <RootNamespace>HeuristicLab.Problems.PTSP</RootNamespace> 11 11 <AssemblyName>HeuristicLab.Problems.PTSP-3.3</AssemblyName> 12 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>12 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 13 13 <FileAlignment>512</FileAlignment> 14 14 </PropertyGroup> … … 207 207 <None Include="HeuristicLab.snk" /> 208 208 </ItemGroup> 209 <ItemGroup> 210 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 211 <SpecificVersion>False</SpecificVersion> 212 <HintPath>..\..\bin\HEAL.Attic.dll</HintPath> 213 <Private>False</Private> 214 </Reference> 215 </ItemGroup> 209 216 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 210 217 <PropertyGroup> -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPAnalyticalInsertionLocalImprovement.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 29 29 using HeuristicLab.Optimization; 30 30 using HeuristicLab.Parameters; 31 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;31 using HEAL.Attic; 32 32 33 33 namespace HeuristicLab.Problems.PTSP { … … 39 39 /// </remarks> 40 40 [Item("PTSP Analytical Insertion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")] 41 [Storable Class]41 [StorableType("D63C6CB3-A5EF-4270-A252-2F5EBF1ED163")] 42 42 public sealed class PTSPAnalyticalInsertionLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, ILocalImprovementOperator { 43 43 … … 79 79 80 80 [StorableConstructor] 81 private PTSPAnalyticalInsertionLocalImprovement( bool deserializing) : base(deserializing) { }81 private PTSPAnalyticalInsertionLocalImprovement(StorableConstructorFlag _) : base(_) { } 82 82 private PTSPAnalyticalInsertionLocalImprovement(PTSPAnalyticalInsertionLocalImprovement original, Cloner cloner) : base(original, cloner) { } 83 83 public PTSPAnalyticalInsertionLocalImprovement() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPAnalyticalInversionLocalImprovement.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 29 29 using HeuristicLab.Optimization; 30 30 using HeuristicLab.Parameters; 31 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;31 using HEAL.Attic; 32 32 33 33 namespace HeuristicLab.Problems.PTSP { … … 39 39 /// </remarks> 40 40 [Item("PTSP Analytical Inversion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")] 41 [Storable Class]41 [StorableType("1594EB4E-A874-485A-B1D5-E622F9FF3FD8")] 42 42 public sealed class PTSPAnalyticalInversionLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, ILocalImprovementOperator { 43 43 … … 79 79 80 80 [StorableConstructor] 81 private PTSPAnalyticalInversionLocalImprovement( bool deserializing) : base(deserializing) { }81 private PTSPAnalyticalInversionLocalImprovement(StorableConstructorFlag _) : base(_) { } 82 82 private PTSPAnalyticalInversionLocalImprovement(PTSPAnalyticalInversionLocalImprovement original, Cloner cloner) : base(original, cloner) { } 83 83 public PTSPAnalyticalInversionLocalImprovement() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPAnalyticalTwoPointFiveLocalImprovement.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 29 29 using HeuristicLab.Optimization; 30 30 using HeuristicLab.Parameters; 31 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;31 using HEAL.Attic; 32 32 33 33 namespace HeuristicLab.Problems.PTSP { … … 39 39 /// </remarks> 40 40 [Item("PTSP Analytical 2.5 Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")] 41 [Storable Class]41 [StorableType("C139639F-D6DD-4756-8482-24F12A78C8E9")] 42 42 public sealed class PTSPAnalyticalTwoPointFiveLocalImprovement : SingleSuccessorOperator, IAnalyticalPTSPOperator, ILocalImprovementOperator { 43 43 … … 79 79 80 80 [StorableConstructor] 81 private PTSPAnalyticalTwoPointFiveLocalImprovement( bool deserializing) : base(deserializing) { }81 private PTSPAnalyticalTwoPointFiveLocalImprovement(StorableConstructorFlag _) : base(_) { } 82 82 private PTSPAnalyticalTwoPointFiveLocalImprovement(PTSPAnalyticalTwoPointFiveLocalImprovement original, Cloner cloner) : base(original, cloner) { } 83 83 public PTSPAnalyticalTwoPointFiveLocalImprovement() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPEstimatedInsertionLocalImprovement.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 29 29 using HeuristicLab.Optimization; 30 30 using HeuristicLab.Parameters; 31 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;31 using HEAL.Attic; 32 32 33 33 namespace HeuristicLab.Problems.PTSP { … … 39 39 /// </remarks> 40 40 [Item("PTSP Estimated Insertion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")] 41 [Storable Class]41 [StorableType("B2D60579-A97D-4E44-B11C-61CDA6EBEBA7")] 42 42 public sealed class PTSPEstimatedInsertionLocalImprovement : SingleSuccessorOperator, IEstimatedPTSPOperator, ILocalImprovementOperator { 43 43 … … 79 79 80 80 [StorableConstructor] 81 private PTSPEstimatedInsertionLocalImprovement( bool deserializing) : base(deserializing) { }81 private PTSPEstimatedInsertionLocalImprovement(StorableConstructorFlag _) : base(_) { } 82 82 private PTSPEstimatedInsertionLocalImprovement(PTSPEstimatedInsertionLocalImprovement original, Cloner cloner) : base(original, cloner) { } 83 83 public PTSPEstimatedInsertionLocalImprovement() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPEstimatedInversionLocalImprovement.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 29 29 using HeuristicLab.Optimization; 30 30 using HeuristicLab.Parameters; 31 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;31 using HEAL.Attic; 32 32 33 33 namespace HeuristicLab.Problems.PTSP { … … 39 39 /// </remarks> 40 40 [Item("PTSP Estimated Inversion Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")] 41 [Storable Class]41 [StorableType("AA67F3B1-2667-4F0B-A79F-4A02B89EE977")] 42 42 public sealed class PTSPEstimatedInversionLocalImprovement : SingleSuccessorOperator, IEstimatedPTSPOperator, ILocalImprovementOperator { 43 43 … … 79 79 80 80 [StorableConstructor] 81 private PTSPEstimatedInversionLocalImprovement( bool deserializing) : base(deserializing) { }81 private PTSPEstimatedInversionLocalImprovement(StorableConstructorFlag _) : base(_) { } 82 82 private PTSPEstimatedInversionLocalImprovement(PTSPEstimatedInversionLocalImprovement original, Cloner cloner) : base(original, cloner) { } 83 83 public PTSPEstimatedInversionLocalImprovement() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Improvers/PTSPEstimatedTwoPointFiveLocalImprovement.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 29 29 using HeuristicLab.Optimization; 30 30 using HeuristicLab.Parameters; 31 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;31 using HEAL.Attic; 32 32 33 33 namespace HeuristicLab.Problems.PTSP { … … 39 39 /// </remarks> 40 40 [Item("PTSP Estimated 2.5 Local Improvement", "An operator that improves probabilistic traveling salesman solutions. The operator tries to improve the probabilistic traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")] 41 [Storable Class]41 [StorableType("8B04265A-50AD-4FAD-99F8-2357D6F10CC3")] 42 42 public sealed class PTSPEstimatedTwoPointFiveLocalImprovement : SingleSuccessorOperator, IEstimatedPTSPOperator, ILocalImprovementOperator { 43 43 … … 79 79 80 80 [StorableConstructor] 81 private PTSPEstimatedTwoPointFiveLocalImprovement( bool deserializing) : base(deserializing) { }81 private PTSPEstimatedTwoPointFiveLocalImprovement(StorableConstructorFlag _) : base(_) { } 82 82 private PTSPEstimatedTwoPointFiveLocalImprovement(PTSPEstimatedTwoPointFiveLocalImprovement original, Cloner cloner) : base(original, cloner) { } 83 83 public PTSPEstimatedTwoPointFiveLocalImprovement() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Interfaces/IAnalyticalPTSPMoveEvaluator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Encodings.PermutationEncoding; 25 25 using HeuristicLab.Optimization; 26 using HEAL.Attic; 26 27 27 28 namespace HeuristicLab.Problems.PTSP { 29 [StorableType("D503E92D-9A85-46AC-ADAA-8A454B9E9C79")] 28 30 public interface IAnalyticalPTSPMoveEvaluator : IAnalyticalPTSPOperator, ISingleObjectiveMoveEvaluator, IPermutationMoveOperator { 29 31 ILookupParameter<DoubleMatrix> CoordinatesParameter { get; } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Interfaces/IAnalyticalPTSPOperator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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.PTSP { 27 [StorableType("1BB8344B-894B-48E9-9805-49938AE3F83F")] 26 28 public interface IAnalyticalPTSPOperator : IItem { 27 29 ILookupParameter<DoubleArray> ProbabilitiesParameter { get; } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Interfaces/IEstimatedPTSPMoveEvaluator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Encodings.PermutationEncoding; 25 25 using HeuristicLab.Optimization; 26 using HEAL.Attic; 26 27 27 28 namespace HeuristicLab.Problems.PTSP { 29 [StorableType("FECFFE5C-64EE-4615-A9FC-786F2B37143A")] 28 30 public interface IEstimatedPTSPMoveEvaluator : IEstimatedPTSPOperator, ISingleObjectiveMoveEvaluator, IPermutationMoveOperator { 29 31 ILookupParameter<DoubleMatrix> CoordinatesParameter { get; } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Interfaces/IEstimatedPTSPOperator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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.PTSP { 27 [StorableType("1998604C-41FF-4388-B413-8BD658D073E5")] 26 28 public interface IEstimatedPTSPOperator : IItem { 27 29 ILookupParameter<ItemList<BoolArray>> RealizationsParameter { get; } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Interfaces/ITwoPointFiveMoveOperator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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.Optimization; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Problems.PTSP { 27 [StorableType("C21E0AC3-85BD-4F40-8DD6-E79A019278E1")] 26 28 public interface ITwoPointFiveMoveOperator : IMoveOperator { 27 29 ILookupParameter<TwoPointFiveMove> TwoPointFiveMoveParameter { get; } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/AnalyticalPTSPMoveEvaluator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Operators; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Problems.PTSP { 32 32 [Item("AnalyticalPTSPMoveEvaluator", "A base class for operators which evaluate PTSP moves.")] 33 [Storable Class]33 [StorableType("D23CCC08-AA7D-47C0-A465-FEAA16FECB80")] 34 34 public abstract class AnalyticalPTSPMoveEvaluator : SingleSuccessorOperator, IAnalyticalPTSPMoveEvaluator { 35 35 … … 64 64 65 65 [StorableConstructor] 66 protected AnalyticalPTSPMoveEvaluator( bool deserializing) : base(deserializing) { }66 protected AnalyticalPTSPMoveEvaluator(StorableConstructorFlag _) : base(_) { } 67 67 protected AnalyticalPTSPMoveEvaluator(AnalyticalPTSPMoveEvaluator original, Cloner cloner) : base(original, cloner) { } 68 68 protected AnalyticalPTSPMoveEvaluator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/EstimatedPTSPMoveEvaluator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Operators; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Problems.PTSP { 32 32 [Item("EstimatedPTSPMoveEvaluator", "A base class for operators which evaluate PTSP moves.")] 33 [Storable Class]33 [StorableType("F2F7F857-F2CD-4AB2-8656-5158BD04EFDD")] 34 34 public abstract class EstimatedPTSPMoveEvaluator : SingleSuccessorOperator, IEstimatedPTSPMoveEvaluator { 35 35 … … 64 64 65 65 [StorableConstructor] 66 protected EstimatedPTSPMoveEvaluator( bool deserializing) : base(deserializing) { }66 protected EstimatedPTSPMoveEvaluator(StorableConstructorFlag _) : base(_) { } 67 67 protected EstimatedPTSPMoveEvaluator(EstimatedPTSPMoveEvaluator original, Cloner cloner) : base(original, cloner) { } 68 68 protected EstimatedPTSPMoveEvaluator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/OneShift/PTSPAnalyticalInsertionMoveEvaluator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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.PTSP { 31 31 [Item("PTSP Analytical Insertion Move Evaluator", "Evaluates an insertion move (1-shift) by a full solution evaluation")] 32 [Storable Class]32 [StorableType("FEB94986-2AD5-4A6E-89D9-A3954212810B")] 33 33 public class PTSPAnalyticalInsertionMoveEvaluator : AnalyticalPTSPMoveEvaluator, IPermutationTranslocationMoveOperator { 34 34 … … 38 38 39 39 [StorableConstructor] 40 protected PTSPAnalyticalInsertionMoveEvaluator( bool deserializing) : base(deserializing) { }40 protected PTSPAnalyticalInsertionMoveEvaluator(StorableConstructorFlag _) : base(_) { } 41 41 protected PTSPAnalyticalInsertionMoveEvaluator(PTSPAnalyticalInsertionMoveEvaluator original, Cloner cloner) : base(original, cloner) { } 42 42 public PTSPAnalyticalInsertionMoveEvaluator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/OneShift/PTSPEstimatedInsertionMoveEvaluator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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.PTSP { 31 31 [Item("PTSP Estimated Insertion Move Evaluator", "Evaluates an insertion move (1-shift)")] 32 [Storable Class]32 [StorableType("DAC1CBD1-BF27-4BB4-B7C5-82EC58F7F5C9")] 33 33 public class PTSPEstimatedInsertionMoveEvaluator : EstimatedPTSPMoveEvaluator, IPermutationTranslocationMoveOperator { 34 34 … … 38 38 39 39 [StorableConstructor] 40 protected PTSPEstimatedInsertionMoveEvaluator( bool deserializing) : base(deserializing) { }40 protected PTSPEstimatedInsertionMoveEvaluator(StorableConstructorFlag _) : base(_) { } 41 41 protected PTSPEstimatedInsertionMoveEvaluator(PTSPEstimatedInsertionMoveEvaluator original, Cloner cloner) : base(original, cloner) { } 42 42 public PTSPEstimatedInsertionMoveEvaluator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/TwoOpt/PTSPAnalyticalInversionMoveEvaluator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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.PTSP { 31 31 [Item("PTSP Analytical Inversion Move Evaluator", "Evaluates an inversion move (2-opt) by a full solution evaluation.")] 32 [Storable Class]32 [StorableType("D24FF41B-DA6E-42C6-9304-21EF01BFC61B")] 33 33 public class PTSPAnalyticalInversionMoveEvaluator : AnalyticalPTSPMoveEvaluator, IPermutationInversionMoveOperator { 34 34 … … 38 38 39 39 [StorableConstructor] 40 protected PTSPAnalyticalInversionMoveEvaluator( bool deserializing) : base(deserializing) { }40 protected PTSPAnalyticalInversionMoveEvaluator(StorableConstructorFlag _) : base(_) { } 41 41 protected PTSPAnalyticalInversionMoveEvaluator(PTSPAnalyticalInversionMoveEvaluator original, Cloner cloner) : base(original, cloner) { } 42 42 public PTSPAnalyticalInversionMoveEvaluator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/TwoOpt/PTSPEstimatedInversionMoveEvaluator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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.PTSP { 31 31 [Item("PTSP Estimated Inversion Move Evaluator", "Evaluates an inversion move (2-opt) over several realizations of tours by summing up the length of all added edges and subtracting the length of all deleted edges.")] 32 [Storable Class]32 [StorableType("9E418FA4-7721-40D2-9FDC-DB82723F7DBF")] 33 33 public class PTSPEstimatedInversionMoveEvaluator : EstimatedPTSPMoveEvaluator, IPermutationInversionMoveOperator { 34 34 … … 38 38 39 39 [StorableConstructor] 40 protected PTSPEstimatedInversionMoveEvaluator( bool deserializing) : base(deserializing) { }40 protected PTSPEstimatedInversionMoveEvaluator(StorableConstructorFlag _) : base(_) { } 41 41 protected PTSPEstimatedInversionMoveEvaluator(PTSPEstimatedInversionMoveEvaluator original, Cloner cloner) : base(original, cloner) { } 42 42 public PTSPEstimatedInversionMoveEvaluator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/ExhaustiveTwoPointFiveMoveGenerator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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.Optimization; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Problems.PTSP { 32 32 [Item("Exhaustive 2.5-MoveGenerator", "Generates all possible inversion and shift moves (2.5-opt) from a given permutation.")] 33 [Storable Class]33 [StorableType("DF95E561-1F47-4845-A58D-CEF32B14461B")] 34 34 public sealed class ExhaustiveTwoPointFiveMoveGenerator : TwoPointFiveMoveGenerator, IExhaustiveMoveGenerator { 35 35 36 36 [StorableConstructor] 37 private ExhaustiveTwoPointFiveMoveGenerator( bool deserializing) : base(deserializing) { }37 private ExhaustiveTwoPointFiveMoveGenerator(StorableConstructorFlag _) : base(_) { } 38 38 private ExhaustiveTwoPointFiveMoveGenerator(ExhaustiveTwoPointFiveMoveGenerator original, Cloner cloner) : base(original, cloner) { } 39 39 public ExhaustiveTwoPointFiveMoveGenerator() : base() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/PTSPAnalyticalTwoPointFiveMoveEvaluator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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.PTSP { 31 31 [Item("PTSP Analytical 2.5-MoveEvaluator", "Operator that evaluates 2.5-p-opt moves of PTSP by a full solution evaluation.")] 32 [Storable Class]32 [StorableType("59729BB5-2026-44E8-8C19-EBCC2303103C")] 33 33 public class PTSPAnalyticalTwoPointFiveMoveEvaluator : AnalyticalPTSPMoveEvaluator, ITwoPointFiveMoveOperator { 34 34 … … 38 38 39 39 [StorableConstructor] 40 protected PTSPAnalyticalTwoPointFiveMoveEvaluator( bool deserializing) : base(deserializing) { }40 protected PTSPAnalyticalTwoPointFiveMoveEvaluator(StorableConstructorFlag _) : base(_) { } 41 41 protected PTSPAnalyticalTwoPointFiveMoveEvaluator(PTSPAnalyticalTwoPointFiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { } 42 42 public PTSPAnalyticalTwoPointFiveMoveEvaluator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/PTSPEstimatedTwoPointFiveMoveEvaluator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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.PTSP { 31 31 [Item("PTSP Estimated 2.5-MoveEvaluator", "Operator that evaluates 2.5-p-opt moves of PTSP")] 32 [Storable Class]32 [StorableType("3E67BDD5-5A80-46F7-A7D6-9A67595CFD8C")] 33 33 public class PTSPEstimatedTwoPointFiveMoveEvaluator : EstimatedPTSPMoveEvaluator, ITwoPointFiveMoveOperator { 34 34 … … 38 38 39 39 [StorableConstructor] 40 protected PTSPEstimatedTwoPointFiveMoveEvaluator( bool deserializing) : base(deserializing) { }40 protected PTSPEstimatedTwoPointFiveMoveEvaluator(StorableConstructorFlag _) : base(_) { } 41 41 protected PTSPEstimatedTwoPointFiveMoveEvaluator(PTSPEstimatedTwoPointFiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { } 42 42 public PTSPEstimatedTwoPointFiveMoveEvaluator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/StochasticTwoPointFiveMultiMoveGenerator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Optimization; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Problems.PTSP { 31 31 [Item("Stochastic 2.5-MultiMoveGenerator", "Randomly samples n from all possible inversion and shift moves (2.5-opt) from a given permutation.")] 32 [Storable Class]32 [StorableType("C84AA7B3-887A-4E75-9237-60011BAEBCC6")] 33 33 public sealed class StochasticTwoPointFiveMultiMoveGenerator : TwoPointFiveMoveGenerator, IMultiMoveGenerator, IStochasticOperator { 34 34 public ILookupParameter<IRandom> RandomParameter { … … 45 45 46 46 [StorableConstructor] 47 private StochasticTwoPointFiveMultiMoveGenerator( bool deserializing) : base(deserializing) { }47 private StochasticTwoPointFiveMultiMoveGenerator(StorableConstructorFlag _) : base(_) { } 48 48 private StochasticTwoPointFiveMultiMoveGenerator(StochasticTwoPointFiveMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { } 49 49 public StochasticTwoPointFiveMultiMoveGenerator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/StochasticTwoPointFiveSingleMoveGenerator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Optimization; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Problems.PTSP { 31 31 [Item("Stochastic 2.5-SingleMoveGenerator", "Randomly samples a single from all possible inversion and shift moves (2.5-opt) from a given permutation.")] 32 [Storable Class]32 [StorableType("A3D496C5-3BB5-4263-8F33-0DAFFCAC1BAF")] 33 33 public sealed class StochasticTwoPointFiveSingleMoveGenerator : TwoPointFiveMoveGenerator, IStochasticOperator, ISingleMoveGenerator { 34 34 public ILookupParameter<IRandom> RandomParameter { … … 37 37 38 38 [StorableConstructor] 39 private StochasticTwoPointFiveSingleMoveGenerator( bool deserializing) : base(deserializing) { }39 private StochasticTwoPointFiveSingleMoveGenerator(StorableConstructorFlag _) : base(_) { } 40 40 private StochasticTwoPointFiveSingleMoveGenerator(StochasticTwoPointFiveSingleMoveGenerator original, Cloner cloner) : base(original, cloner) { } 41 41 public StochasticTwoPointFiveSingleMoveGenerator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/TwoPointFiveMove.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Core; 24 24 using HeuristicLab.Encodings.PermutationEncoding; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.PTSP { 28 28 [Item("2.5-Move", "Represents a 2.5-move.")] 29 [Storable Class]29 [StorableType("CAC6762D-DFF1-4B66-BAC7-FBCED4A52305")] 30 30 public sealed class TwoPointFiveMove : Item { 31 31 [Storable] … … 39 39 40 40 [StorableConstructor] 41 public TwoPointFiveMove() : this(-1, -1, null, true) { } 42 private TwoPointFiveMove(bool deserializing) : base(deserializing) { } 41 private TwoPointFiveMove(StorableConstructorFlag _) : base(_) { } 43 42 private TwoPointFiveMove(TwoPointFiveMove original, Cloner cloner) 44 43 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/TwoPointFiveMoveGenerator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Optimization; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 31 31 namespace HeuristicLab.Problems.PTSP { 32 32 [Item("TwoPointFiveMoveGenerator", "Base class for all inversion and shift (2.5-opt) move generators.")] 33 [Storable Class]33 [StorableType("955C469C-4D77-4168-A428-03C39BACF9AD")] 34 34 public abstract class TwoPointFiveMoveGenerator : SingleSuccessorOperator, ITwoPointFiveMoveOperator, IMoveGenerator { 35 35 public override bool CanChangeName { … … 45 45 46 46 [StorableConstructor] 47 protected TwoPointFiveMoveGenerator( bool deserializing) : base(deserializing) { }47 protected TwoPointFiveMoveGenerator(StorableConstructorFlag _) : base(_) { } 48 48 protected TwoPointFiveMoveGenerator(TwoPointFiveMoveGenerator original, Cloner cloner) : base(original, cloner) { } 49 49 protected TwoPointFiveMoveGenerator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/TwoPointFiveMoveMaker.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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.PTSP { 32 32 [Item("TwoPointFiveMoveMaker", "Peforms an inversion and shift (2.5-opt) on a given permutation and updates the quality.")] 33 [Storable Class]33 [StorableType("6D5923B3-47CA-47AF-8C93-9BA7134BE5BA")] 34 34 public class TwoPointFiveMoveMaker : SingleSuccessorOperator, ITwoPointFiveMoveOperator, IMoveMaker { 35 35 public override bool CanChangeName { … … 51 51 52 52 [StorableConstructor] 53 protected TwoPointFiveMoveMaker( bool deserializing) : base(deserializing) { }53 protected TwoPointFiveMoveMaker(StorableConstructorFlag _) : base(_) { } 54 54 protected TwoPointFiveMoveMaker(TwoPointFiveMoveMaker original, Cloner cloner) : base(original, cloner) { } 55 55 public TwoPointFiveMoveMaker() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/PTSP.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 30 30 using HeuristicLab.Optimization.Operators; 31 31 using HeuristicLab.Parameters; 32 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;32 using HEAL.Attic; 33 33 using HeuristicLab.Problems.Instances; 34 34 35 35 namespace HeuristicLab.Problems.PTSP { 36 36 [Item("Probabilistic Traveling Salesman Problem (PTSP)", "Represents a Probabilistic Traveling Salesman Problem.")] 37 [Storable Class]37 [StorableType("4CB8ACF3-C3D4-4CC6-BB1F-986BDE16B30A")] 38 38 public abstract class ProbabilisticTravelingSalesmanProblem : SingleObjectiveBasicProblem<PermutationEncoding>, 39 39 IProblemInstanceConsumer<PTSPData> { … … 96 96 97 97 [StorableConstructor] 98 protected ProbabilisticTravelingSalesmanProblem( bool deserializing) : base(deserializing) { }98 protected ProbabilisticTravelingSalesmanProblem(StorableConstructorFlag _) : base(_) { } 99 99 protected ProbabilisticTravelingSalesmanProblem(ProbabilisticTravelingSalesmanProblem original, Cloner cloner) 100 100 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/PathPTSPTour.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 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.PTSP { … … 33 33 /// </summary> 34 34 [Item("PathPTSPTour", "Represents a tour of a Probabilistic Traveling Salesman Problem given in path representation which can be visualized in the GUI.")] 35 [Storable Class]35 [StorableType("8C9E50C9-4364-48F1-B681-9CFFD1147EF0")] 36 36 public sealed class PathPTSPTour : Item { 37 37 public static new Image StaticItemImage { … … 93 93 94 94 [StorableConstructor] 95 private PathPTSPTour( bool deserializing) : base(deserializing) { }95 private PathPTSPTour(StorableConstructorFlag _) : base(_) { } 96 96 private PathPTSPTour(PathPTSPTour original, Cloner cloner) 97 97 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Plugin.cs.frame
r15589 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 36 36 [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")] 37 37 [PluginDependency("HeuristicLab.Parameters", "3.3")] 38 [PluginDependency("HeuristicLab. Persistence", "3.3")]38 [PluginDependency("HeuristicLab.Attic", "1.0")] 39 39 [PluginDependency("HeuristicLab.Problems.Instances", "3.3")] 40 40 [PluginDependency("HeuristicLab.Random", "3.3")]
Note: See TracChangeset
for help on using the changeset viewer.