Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/11/20 13:36:02 (5 years ago)
Author:
bburlacu
Message:

#1772: Merge trunk changes and fix all errors and compilation warnings.

Location:
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman

    • Property svn:mergeinfo deleted
  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPCoordinatesPathEvaluator.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 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/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPDistanceMatrixEvaluator.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 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/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPEuclideanPathEvaluator.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 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/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPEvaluator.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 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/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPGeoPathEvaluator.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 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/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPRoundedEuclideanPathEvaluator.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 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/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPUpperEuclideanPathEvaluator.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 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() { }
Note: See TracChangeset for help on using the changeset viewer.