Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/28/19 16:54:20 (6 years ago)
Author:
abeham
Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

  • it doesn't build
Location:
branches/2521_ProblemRefactoring
Files:
40 edited

Legend:

Unmodified
Added
Removed

  • branches/2521_ProblemRefactoring

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/BestTSPSolutionAnalyzer.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3535  /// </summary>
    3636  [Item("BestTSPSolutionAnalyzer", "An operator for analyzing the best solution of Traveling Salesman Problems given in path representation using city coordinates.")]
    37   [StorableClass]
     37  [StorableType("86D3A4A2-C91C-46D4-9644-10F88F94FEA1")]
    3838  public sealed class BestTSPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    3939    public bool EnabledByDefault {
    … …  
    6767
    6868    [StorableConstructor]
    69     private BestTSPSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     69    private BestTSPSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    7070    private BestTSPSolutionAnalyzer(BestTSPSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    7171    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPAlleleFrequencyAnalyzer.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Encodings.PermutationEncoding;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3434  /// </summary>
    3535  [Item("TSPAlleleFrequencyAnalyzer", "An operator for analyzing the frequency of alleles in solutions of Traveling Salesman Problems given in path representation.")]
    36   [StorableClass]
     36  [StorableType("C1BBEC5A-27EF-4882-AEC6-0919FC2EF1DB")]
    3737  public sealed class TSPAlleleFrequencyAnalyzer : AlleleFrequencyAnalyzer<Permutation> {
    3838    public LookupParameter<DoubleMatrix> CoordinatesParameter {
    … …  
    4444
    4545    [StorableConstructor]
    46     private TSPAlleleFrequencyAnalyzer(bool deserializing) : base(deserializing) { }
     46    private TSPAlleleFrequencyAnalyzer(StorableConstructorFlag _) : base(_) { }
    4747    private TSPAlleleFrequencyAnalyzer(TSPAlleleFrequencyAnalyzer original, Cloner cloner) : base(original, cloner) { }
    4848    public TSPAlleleFrequencyAnalyzer()

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPPopulationDiversityAnalyzer.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Encodings.PermutationEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.PluginInfrastructure;
    2929
    … …  
    3737  [NonDiscoverableType]
    3838  [Item("TSPPopulationDiversityAnalyzer", "An operator for analyzing the diversity of solutions of Traveling Salesman Problems given in path representation.")]
    39   [StorableClass]
     39  [StorableType("B68CC721-AC64-44A7-BFEA-B4F0ABE1402D")]
    4040  public sealed class TSPPopulationDiversityAnalyzer : PopulationDiversityAnalyzer<Permutation> {
    4141    [StorableConstructor]
    42     private TSPPopulationDiversityAnalyzer(bool deserializing) : base(deserializing) { }
     42    private TSPPopulationDiversityAnalyzer(StorableConstructorFlag _) : base(_) { }
    4343    private TSPPopulationDiversityAnalyzer(TSPPopulationDiversityAnalyzer original, Cloner cloner) : base(original, cloner) { }
    4444    public TSPPopulationDiversityAnalyzer() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/DistanceMatrix.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3232  /// </summary>
    3333  [Item("DistanceMatrix", "Represents a distance matrix of a Traveling Salesman Problem.")]
    34   [StorableClass]
     34  [StorableType("37D937BA-443B-44BC-AC89-C74D79D96D56")]
    3535  public sealed class DistanceMatrix : DoubleMatrix {
    3636    [StorableConstructor]
    37     private DistanceMatrix(bool deserializing) : base(deserializing) { }
     37    private DistanceMatrix(StorableConstructorFlag _) : base(_) { }
    3838    private DistanceMatrix(DistanceMatrix original, Cloner cloner) {
    3939      throw new NotSupportedException("Distance matrices cannot be cloned.");

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPCoordinatesPathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3333  /// </summary>
    3434  [Item("TSPCoordinatesPathEvaluator", "A base class for operators which evaluate TSP solutions given in path representation using city coordinates.")]
    35   [StorableClass]
     35  [StorableType("4A8D4CC9-C6A6-4611-A140-C21FAA93EDC0")]
    3636  public abstract class TSPCoordinatesPathEvaluator : TSPEvaluator, ITSPCoordinatesPathEvaluator {
    3737    private object locker = new object();
    … …  
    5151
    5252    [StorableConstructor]
    53     protected TSPCoordinatesPathEvaluator(bool deserializing) : base(deserializing) { }
     53    protected TSPCoordinatesPathEvaluator(StorableConstructorFlag _) : base(_) { }
    5454    protected TSPCoordinatesPathEvaluator(TSPCoordinatesPathEvaluator original, Cloner cloner) : base(original, cloner) { }
    5555    protected TSPCoordinatesPathEvaluator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPDistanceMatrixEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3333  /// </summary>
    3434  [Item("TSPDistanceMatrixEvaluator", "Evaluate TSP solutions given in path representation using the distance matrix.")]
    35   [StorableClass]
     35  [StorableType("A52B705D-9F66-47AE-B1B4-B6969E0A6D83")]
    3636  public sealed class TSPDistanceMatrixEvaluator : TSPEvaluator, ITSPDistanceMatrixEvaluator {
    3737
    … …  
    4444
    4545    [StorableConstructor]
    46     private TSPDistanceMatrixEvaluator(bool deserializing) : base(deserializing) { }
     46    private TSPDistanceMatrixEvaluator(StorableConstructorFlag _) : base(_) { }
    4747    private TSPDistanceMatrixEvaluator(TSPDistanceMatrixEvaluator original, Cloner cloner) : base(original, cloner) { }
    4848    public TSPDistanceMatrixEvaluator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPEuclideanPathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3030  /// </summary>
    3131  [Item("TSPEuclideanPathEvaluator", "An operator which evaluates TSP solutions given in path representation using the Euclidean distance metric.")]
    32   [StorableClass]
     32  [StorableType("583A53B5-2ABD-44C4-A530-3B5395FB5855")]
    3333  public sealed class TSPEuclideanPathEvaluator : TSPCoordinatesPathEvaluator {
    3434    [StorableConstructor]
    35     private TSPEuclideanPathEvaluator(bool deserializing) : base(deserializing) { }
     35    private TSPEuclideanPathEvaluator(StorableConstructorFlag _) : base(_) { }
    3636    private TSPEuclideanPathEvaluator(TSPEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { }
    3737    public TSPEuclideanPathEvaluator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3232  /// </summary>
    3333  [Item("TSPEvaluator", "A base class for operators which evaluate TSP solutions.")]
    34   [StorableClass]
     34  [StorableType("79FAF3BB-305D-437E-9FF3-C85A561D9A85")]
    3535  public abstract class TSPEvaluator : InstrumentedOperator, ITSPEvaluator {
    3636    public override bool CanChangeName {
    … …  
    4343
    4444    [StorableConstructor]
    45     protected TSPEvaluator(bool deserializing) : base(deserializing) { }
     45    protected TSPEvaluator(StorableConstructorFlag _) : base(_) { }
    4646    protected TSPEvaluator(TSPEvaluator original, Cloner cloner) : base(original, cloner) { }
    4747    protected TSPEvaluator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPGeoPathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3030  /// </summary>
    3131  [Item("TSPGeoPathEvaluator", "An operator which evaluates TSP solutions given in path representation using the GEO distance metric (globe coordinates).")]
    32   [StorableClass]
     32  [StorableType("A69C2CE3-6A89-4991-9743-4DE8F07149B9")]
    3333  public sealed class TSPGeoPathEvaluator : TSPCoordinatesPathEvaluator {
    3434    private const double PI = 3.141592;
    … …  
    3636
    3737    [StorableConstructor]
    38     private TSPGeoPathEvaluator(bool deserializing) : base(deserializing) { }
     38    private TSPGeoPathEvaluator(StorableConstructorFlag _) : base(_) { }
    3939    private TSPGeoPathEvaluator(TSPGeoPathEvaluator original, Cloner cloner) : base(original, cloner) { }
    4040    public TSPGeoPathEvaluator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPRoundedEuclideanPathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3030  /// </summary>
    3131  [Item("TSPRoundedEuclideanPathEvaluator", "An operator which evaluates TSP solutions given in path representation using the rounded Euclidean distance metric.")]
    32   [StorableClass]
     32  [StorableType("AD108E29-244A-42E1-AA46-23A09C9894B9")]
    3333  public sealed class TSPRoundedEuclideanPathEvaluator : TSPCoordinatesPathEvaluator {
    3434    [StorableConstructor]
    35     private TSPRoundedEuclideanPathEvaluator(bool deserializing) : base(deserializing) { }
     35    private TSPRoundedEuclideanPathEvaluator(StorableConstructorFlag _) : base(_) { }
    3636    private TSPRoundedEuclideanPathEvaluator(TSPRoundedEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { }
    3737    public TSPRoundedEuclideanPathEvaluator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPUpperEuclideanPathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3030  /// </summary>
    3131  [Item("TSPUpperEuclideanPathEvaluator", "An operator which evaluates TSP solutions given in path representation using the rounded up Euclidean distance metric.")]
    32   [StorableClass]
     32  [StorableType("B827571E-A3F8-48A5-8908-D2C3537D40CF")]
    3333  public sealed class TSPUpperEuclideanPathEvaluator : TSPCoordinatesPathEvaluator {
    3434    [StorableConstructor]
    35     private TSPUpperEuclideanPathEvaluator(bool deserializing) : base(deserializing) { }
     35    private TSPUpperEuclideanPathEvaluator(StorableConstructorFlag _) : base(_) { }
    3636    private TSPUpperEuclideanPathEvaluator(TSPUpperEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { }
    3737    public TSPUpperEuclideanPathEvaluator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj

    r12978 r16723  
    1818    <UpgradeBackupLocation>
    1919    </UpgradeBackupLocation>
    20     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     20    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    2121    <TargetFrameworkProfile>
    2222    </TargetFrameworkProfile>
    … …  
    250250    </BootstrapperPackage>
    251251  </ItemGroup>
     252  <ItemGroup>
     253    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     254      <SpecificVersion>False</SpecificVersion>
     255      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
     256      <Private>False</Private>
     257    </Reference>
     258  </ItemGroup>
    252259  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    253260  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Improvers/TSPImprovementOperator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3838  /// </remarks>
    3939  [Item("TSPImprovementOperator", "An operator that improves traveling salesman solutions. The operator tries to improve the traveling salesman solution by swapping two randomly chosen edges for a certain number of times.")]
    40   [StorableClass]
     40  [StorableType("9C3B53A4-8FE7-45FC-833B-FF3DAE578010")]
    4141  public sealed class TSPImprovementOperator : SingleSuccessorOperator, ISingleObjectiveImprovementOperator {
    4242    #region Parameter properties
    … …  
    7777
    7878    [StorableConstructor]
    79     private TSPImprovementOperator(bool deserializing) : base(deserializing) { }
     79    private TSPImprovementOperator(StorableConstructorFlag _) : base(_) { }
    8080    private TSPImprovementOperator(TSPImprovementOperator original, Cloner cloner) : base(original, cloner) { }
    8181    public TSPImprovementOperator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Interfaces/ITSPCoordinatesPathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Data;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.TravelingSalesman {
     27  [StorableType("C9962138-AB3D-4C33-B5EC-9B526E0C6F82")]
    2628  /// <summary>
    2729  /// An interface which represents an evaluation operator which evaluates TSP solutions given in path representation using city coordinates.

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Interfaces/ITSPDistanceMatrixEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2121
    2222using HeuristicLab.Core;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.TravelingSalesman {
     26  [StorableType("ADEAB327-E563-42D6-845C-E9D412586A4C")]
    2527  /// <summary>
    2628  /// An interface which represents an evaluation operator which evaluates TSP solutions given in path representation using a distance matrix.

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Interfaces/ITSPEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2121
    2222using HeuristicLab.Optimization;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.TravelingSalesman {
     26  [StorableType("913DCAEA-8E40-4ADA-AB77-0E99B7C1C340")]
    2527  /// <summary>
    2628  /// An interface which represents an evaluation operator for Traveling Salesman Problems.

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Interfaces/ITSPMoveEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using System;
    2323using HeuristicLab.Optimization;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.TravelingSalesman {
     27  [StorableType("2EFBA5C1-6503-4910-9EF8-F6A5D8FBAFEF")]
    2628  public interface ITSPMoveEvaluator : ISingleObjectiveMoveEvaluator, IMoveOperator {
    2729    Type EvaluatorType { get; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Interfaces/ITSPPathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Encodings.PermutationEncoding;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.TravelingSalesman {
     27  [StorableType("D500AB51-6750-44D3-B1CA-0DF2DCB43758")]
    2628  /// <summary>
    2729  /// An interface which represents an evaluation operator which evaluates TSP solutions given in path representation.

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Interfaces/ITSPPathMoveEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Data;
    2424using HeuristicLab.Encodings.PermutationEncoding;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Problems.TravelingSalesman {
     28  [StorableType("E8D13595-71B9-4F6F-B879-FDF2BDB482EB")]
    2729  public interface ITSPPathMoveEvaluator : ITSPMoveEvaluator, IPermutationMoveOperator {
    2830    ILookupParameter<DoubleMatrix> CoordinatesParameter { get; }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TSPMoveEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3434  /// </summary>
    3535  [Item("TSPMoveEvaluator", "A base class for operators which evaluate TSP moves.")]
    36   [StorableClass]
     36  [StorableType("25573174-DE4B-4076-B439-CCB5F01CE652")]
    3737  public abstract class TSPMoveEvaluator : SingleSuccessorOperator, ITSPMoveEvaluator, IMoveOperator {
    3838
    … …  
    5050
    5151    [StorableConstructor]
    52     protected TSPMoveEvaluator(bool deserializing) : base(deserializing) { }
     52    protected TSPMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    5353    protected TSPMoveEvaluator(TSPMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    5454    protected TSPMoveEvaluator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TSPPathMoveEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3333  /// </summary>
    3434  [Item("TSPMoveEvaluator", "A base class for operators which evaluate TSP moves.")]
    35   [StorableClass]
     35  [StorableType("F4EEA3B3-BA91-4391-903B-2EDBD47CF439")]
    3636  public abstract class TSPPathMoveEvaluator : TSPMoveEvaluator, ITSPPathMoveEvaluator {
    3737    public ILookupParameter<Permutation> PermutationParameter {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected TSPPathMoveEvaluator(bool deserializing) : base(deserializing) { }
     51    protected TSPPathMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    5252    protected TSPPathMoveEvaluator(TSPPathMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    5353    protected TSPPathMoveEvaluator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveDistanceMatrixEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3333  /// </summary>
    3434  [Item("TSPTranslocationMoveDistanceMatrixEvaluator", "Evaluates a translocation or insertion move (3-opt).")]
    35   [StorableClass]
     35  [StorableType("895EF1F3-6FE0-43C0-A6D4-7EEAB7B06841")]
    3636  public class TSPTranslocationMoveDistanceMatrixEvaluator : TSPMoveEvaluator, IPermutationTranslocationMoveOperator {
    3737    public override Type EvaluatorType {
    … …  
    5050
    5151    [StorableConstructor]
    52     protected TSPTranslocationMoveDistanceMatrixEvaluator(bool deserializing) : base(deserializing) { }
     52    protected TSPTranslocationMoveDistanceMatrixEvaluator(StorableConstructorFlag _) : base(_) { }
    5353    protected TSPTranslocationMoveDistanceMatrixEvaluator(TSPTranslocationMoveDistanceMatrixEvaluator original, Cloner cloner) : base(original, cloner) { }
    5454    public TSPTranslocationMoveDistanceMatrixEvaluator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveEuclideanPathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3030  /// </summary>
    3131  [Item("TSPTranslocationMoveEuclideanPathEvaluator", "Operator for evaluating a translocation or insertion move (3-opt) based on euclidean distances.")]
    32   [StorableClass]
     32  [StorableType("7686F16C-12E5-4FE8-8417-BA32B39D8817")]
    3333  public class TSPTranslocationMoveEuclideanPathEvaluator : TSPTranslocationMovePathEvaluator {
    3434    [StorableConstructor]
    35     protected TSPTranslocationMoveEuclideanPathEvaluator(bool deserializing) : base(deserializing) { }
     35    protected TSPTranslocationMoveEuclideanPathEvaluator(StorableConstructorFlag _) : base(_) { }
    3636    protected TSPTranslocationMoveEuclideanPathEvaluator(TSPTranslocationMoveEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { }
    3737    public TSPTranslocationMoveEuclideanPathEvaluator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveGeoPathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3030  /// </summary>
    3131  [Item("TSPTranslocationMoveGeoPathEvaluator", "Operator for evaluating a translocation or insertion move (3-opt) based on geo (world) distances.")]
    32   [StorableClass]
     32  [StorableType("3CCF9099-547F-44A3-9279-99ED96F7ACCD")]
    3333  public class TSPTranslocationMoveGeoPathEvaluator : TSPTranslocationMovePathEvaluator {
    3434    public override Type EvaluatorType {
    … …  
    4040
    4141    [StorableConstructor]
    42     protected TSPTranslocationMoveGeoPathEvaluator(bool deserializing) : base(deserializing) { }
     42    protected TSPTranslocationMoveGeoPathEvaluator(StorableConstructorFlag _) : base(_) { }
    4343    protected TSPTranslocationMoveGeoPathEvaluator(TSPTranslocationMoveGeoPathEvaluator original, Cloner cloner) : base(original, cloner) { }
    4444    public TSPTranslocationMoveGeoPathEvaluator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMovePathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Encodings.PermutationEncoding;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3232  /// </summary>
    3333  [Item("TSPTranslocationMovePathEvaluator", "Evaluates a translocation or insertion move (3-opt) by summing up the length of all added edges and subtracting the length of all deleted edges.")]
    34   [StorableClass]
     34  [StorableType("DC2FBCA3-B75F-4DA2-974E-334083159D93")]
    3535  public abstract class TSPTranslocationMovePathEvaluator : TSPPathMoveEvaluator, IPermutationTranslocationMoveOperator {
    3636    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
    … …  
    3939
    4040    [StorableConstructor]
    41     protected TSPTranslocationMovePathEvaluator(bool deserializing) : base(deserializing) { }
     41    protected TSPTranslocationMovePathEvaluator(StorableConstructorFlag _) : base(_) { }
    4242    protected TSPTranslocationMovePathEvaluator(TSPTranslocationMovePathEvaluator original, Cloner cloner) : base(original, cloner) { }
    4343    public TSPTranslocationMovePathEvaluator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveRoundedEuclideanPathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3030  /// </summary>
    3131  [Item("TSPTranslocationMoveRoundedEuclideanPathEvaluator", "Operator for evaluating a translocation or insertion move (3-opt) based on rounded euclidean distances.")]
    32   [StorableClass]
     32  [StorableType("AA52F35B-DEE3-4B21-A953-07773D4ED5BC")]
    3333  public class TSPTranslocationMoveRoundedEuclideanPathEvaluator : TSPTranslocationMovePathEvaluator {
    3434    [StorableConstructor]
    35     protected TSPTranslocationMoveRoundedEuclideanPathEvaluator(bool deserializing) : base(deserializing) { }
     35    protected TSPTranslocationMoveRoundedEuclideanPathEvaluator(StorableConstructorFlag _) : base(_) { }
    3636    protected TSPTranslocationMoveRoundedEuclideanPathEvaluator(TSPTranslocationMoveRoundedEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { }
    3737    public TSPTranslocationMoveRoundedEuclideanPathEvaluator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveDistanceMatrixEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3333  /// </summary>
    3434  [Item("TSPInversionMoveDistanceMatrixEvaluator", "Evaluates an inversion move (2-opt) by summing up the length of all added edges and subtracting the length of all deleted edges.")]
    35   [StorableClass]
     35  [StorableType("1EA2C5B2-96E0-4C64-9089-F08F6D2B1CAE")]
    3636  public class TSPInversionMoveDistanceMatrixEvaluator : TSPMoveEvaluator, IPermutationInversionMoveOperator {
    3737    public override Type EvaluatorType {
    … …  
    5050
    5151    [StorableConstructor]
    52     protected TSPInversionMoveDistanceMatrixEvaluator(bool deserializing) : base(deserializing) { }
     52    protected TSPInversionMoveDistanceMatrixEvaluator(StorableConstructorFlag _) : base(_) { }
    5353    protected TSPInversionMoveDistanceMatrixEvaluator(TSPInversionMoveDistanceMatrixEvaluator original, Cloner cloner) : base(original, cloner) { }
    5454    public TSPInversionMoveDistanceMatrixEvaluator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveEuclideanPathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3030  /// </summary>
    3131  [Item("TSPInversionMoveEuclideanPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on euclidean distances.")]
    32   [StorableClass]
     32  [StorableType("856F5D88-FBD5-4DC9-AC52-60C402B83F21")]
    3333  public class TSPInversionMoveEuclideanPathEvaluator : TSPInversionMovePathEvaluator {
    3434    [StorableConstructor]
    35     protected TSPInversionMoveEuclideanPathEvaluator(bool deserializing) : base(deserializing) { }
     35    protected TSPInversionMoveEuclideanPathEvaluator(StorableConstructorFlag _) : base(_) { }
    3636    protected TSPInversionMoveEuclideanPathEvaluator(TSPInversionMoveEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { }
    3737    public TSPInversionMoveEuclideanPathEvaluator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveGeoPathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3030  /// </summary>
    3131  [Item("TSPInversionMoveGeoPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on geo (world) distances.")]
    32   [StorableClass]
     32  [StorableType("DCBB9049-6C89-4249-BB7D-314B7C62E9E6")]
    3333  public class TSPInversionMoveGeoPathEvaluator : TSPInversionMovePathEvaluator {
    3434    public override Type EvaluatorType {
    … …  
    4040
    4141    [StorableConstructor]
    42     protected TSPInversionMoveGeoPathEvaluator(bool deserializing) : base(deserializing) { }
     42    protected TSPInversionMoveGeoPathEvaluator(StorableConstructorFlag _) : base(_) { }
    4343    protected TSPInversionMoveGeoPathEvaluator(TSPInversionMoveGeoPathEvaluator original, Cloner cloner) : base(original, cloner) { }
    4444    public TSPInversionMoveGeoPathEvaluator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMovePathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Encodings.PermutationEncoding;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3232  /// </summary>
    3333  [Item("TSPInversionMovePathEvaluator", "Evaluates an inversion move (2-opt) by summing up the length of all added edges and subtracting the length of all deleted edges.")]
    34   [StorableClass]
     34  [StorableType("0D180690-C01E-4F64-94D9-C6F713EA195B")]
    3535  public abstract class TSPInversionMovePathEvaluator : TSPPathMoveEvaluator, IPermutationInversionMoveOperator {
    3636    public ILookupParameter<InversionMove> InversionMoveParameter {
    … …  
    3939
    4040    [StorableConstructor]
    41     protected TSPInversionMovePathEvaluator(bool deserializing) : base(deserializing) { }
     41    protected TSPInversionMovePathEvaluator(StorableConstructorFlag _) : base(_) { }
    4242    protected TSPInversionMovePathEvaluator(TSPInversionMovePathEvaluator original, Cloner cloner) : base(original, cloner) { }
    4343    public TSPInversionMovePathEvaluator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveRoundedEuclideanPathEvaluator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3030  /// </summary>
    3131  [Item("TSPInversionMoveRoundedEuclideanPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on rounded euclidean distances.")]
    32   [StorableClass]
     32  [StorableType("84BE355F-BC76-4765-885F-CFCAEDA93DFD")]
    3333  public class TSPInversionMoveRoundedEuclideanPathEvaluator : TSPInversionMovePathEvaluator {
    3434    [StorableConstructor]
    35     protected TSPInversionMoveRoundedEuclideanPathEvaluator(bool deserializing) : base(deserializing) { }
     35    protected TSPInversionMoveRoundedEuclideanPathEvaluator(StorableConstructorFlag _) : base(_) { }
    3636    protected TSPInversionMoveRoundedEuclideanPathEvaluator(TSPInversionMoveRoundedEuclideanPathEvaluator original, Cloner cloner) : base(original, cloner) { }
    3737    public TSPInversionMoveRoundedEuclideanPathEvaluator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPMultipleGuidesPathRelinker.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2929using HeuristicLab.Optimization.Operators;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3939  /// </remarks>
    4040  [Item("TSPMultipleGuidesPathRelinker", "An operator that relinks paths between traveling salesman solutions using a multiple guiding strategy. The operator incrementally changes the initiating solution towards the guiding solution by correcting edges as needed. For each city it choses the best edge from all guiding solutions.")]
    41   [StorableClass]
     41  [StorableType("6B5B2622-AB1D-47E6-8BBC-C6088D393149")]
    4242  public sealed class TSPMultipleGuidesPathRelinker : SingleObjectivePathRelinker {
    4343    #region Parameter properties
    … …  
    5454
    5555    [StorableConstructor]
    56     private TSPMultipleGuidesPathRelinker(bool deserializing) : base(deserializing) { }
     56    private TSPMultipleGuidesPathRelinker(StorableConstructorFlag _) : base(_) { }
    5757    private TSPMultipleGuidesPathRelinker(TSPMultipleGuidesPathRelinker original, Cloner cloner) : base(original, cloner) { }
    5858    public TSPMultipleGuidesPathRelinker()

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPPathRelinker.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2828using HeuristicLab.Encodings.PermutationEncoding;
    2929using HeuristicLab.Optimization.Operators;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3838  /// </remarks>
    3939  [Item("TSPPathRelinker", "An operator that relinks paths between traveling salesman solutions. The operator incrementally assimilates the initiating solution into the guiding solution by correcting edges as needed.")]
    40   [StorableClass]
     40  [StorableType("0997A24C-0592-4CE4-A681-70C97890D3F7")]
    4141  public sealed class TSPPathRelinker : SingleObjectivePathRelinker {
    4242    [StorableConstructor]
    43     private TSPPathRelinker(bool deserializing) : base(deserializing) { }
     43    private TSPPathRelinker(StorableConstructorFlag _) : base(_) { }
    4444    private TSPPathRelinker(TSPPathRelinker original, Cloner cloner) : base(original, cloner) { }
    4545    public TSPPathRelinker() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPSimultaneousPathRelinker.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2828using HeuristicLab.Encodings.PermutationEncoding;
    2929using HeuristicLab.Optimization.Operators;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3838  /// </remarks>
    3939  [Item("TSPSimultaneousPathRelinker", "An operator that relinks paths between traveling salesman solutions starting from both ends. The operator incrementally assimilates the initiating solution into the guiding solution and vice versa by correcting edges as needed.")]
    40   [StorableClass]
     40  [StorableType("D44D112E-5139-4848-8A2B-66CFC5784EE4")]
    4141  public sealed class TSPSimultaneousPathRelinker : SingleObjectivePathRelinker {
    4242    [StorableConstructor]
    43     private TSPSimultaneousPathRelinker(bool deserializing) : base(deserializing) { }
     43    private TSPSimultaneousPathRelinker(StorableConstructorFlag _) : base(_) { }
    4444    private TSPSimultaneousPathRelinker(TSPSimultaneousPathRelinker original, Cloner cloner) : base(original, cloner) { }
    4545    public TSPSimultaneousPathRelinker() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/PathTSPTour.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Encodings.PermutationEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.TravelingSalesman {
    … …  
    3333  /// </summary>
    3434  [Item("PathTSPTour", "Represents a tour of a Traveling Salesman Problem given in path representation which can be visualized in the GUI.")]
    35   [StorableClass]
     35  [StorableType("2CAE7C49-751B-4802-9025-62E2268E47AE")]
    3636  public sealed class PathTSPTour : Item {
    3737    public static new Image StaticItemImage {
    … …  
    8080
    8181    [StorableConstructor]
    82     private PathTSPTour(bool deserializing) : base(deserializing) { }
     82    private PathTSPTour(StorableConstructorFlag _) : base(_) { }
    8383    private PathTSPTour(PathTSPTour original, Cloner cloner)
    8484      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Plugin.cs.frame

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3939  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
    4040  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    41   [PluginDependency("HeuristicLab.Persistence", "3.3")]
     41  [PluginDependency("HeuristicLab.Attic", "1.0")]
    4242  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4343  public class HeuristicLabProblemsTravelingSalesmanPlugin : PluginBase {

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/Properties/AssemblyInfo.cs.frame

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/SimilarityCalculators/TSPSimilarityCalculator.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2121
    2222using System;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    … …  
    3738  [Obsolete("This operator is similar to the Hamming similarity calculator in the Encodings.PermutationEncoding namespace")]
    3839  [NonDiscoverableType]
     40  [StorableType("0216BF57-995F-4F23-B422-F2C571314C5A")]
    3941  internal sealed class TSPSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
    4042    protected override bool IsCommutative { get { return true; } }
    4143
    42     private TSPSimilarityCalculator(bool deserializing) : base(deserializing) { }
     44    [StorableConstructor]
     45    private TSPSimilarityCalculator(StorableConstructorFlag _) : base(_) { }
    4346    private TSPSimilarityCalculator(TSPSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
    4447    public TSPSimilarityCalculator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

    r16692 r16723  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3232using HeuristicLab.Optimization.Operators;
    3333using HeuristicLab.Parameters;
    34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     34using HEAL.Attic;
    3535using HeuristicLab.PluginInfrastructure;
    3636using HeuristicLab.Problems.Instances;
    … …  
    3939  [Item("Traveling Salesman Problem (TSP)", "Represents a symmetric Traveling Salesman Problem.")]
    4040  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 100)]
    41   [StorableClass]
     41  [StorableType("F0A3550C-2B8F-497D-BF32-5763F8D7592C")]
    4242  public sealed class TravelingSalesmanProblem : SingleObjectiveHeuristicOptimizationProblem<ITSPEvaluator, IPermutationCreator>,
    4343    ISingleObjectiveProblem<PermutationEncoding, Permutation>, IStorableContent, IProblemInstanceConsumer<TSPData> {
    … …  
    100100
    101101    [StorableConstructor]
    102     private TravelingSalesmanProblem(bool deserializing) : base(deserializing) { }
     102    private TravelingSalesmanProblem(StorableConstructorFlag _) : base(_) { }
    103103    private TravelingSalesmanProblem(TravelingSalesmanProblem original, Cloner cloner)
    104104      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.