Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (5 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/AttDistance.cs

    r15583 r16565  
    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.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.Instances;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("Att Distance", "Calculates the att distance.")]
    30   [StorableClass]
     30  [StorableType("7A21281C-EED9-4FE0-A6B1-DE916A074739")]
    3131  public sealed class AttDistance : DistanceCalculator {
    3232
    3333    [StorableConstructor]
    34     private AttDistance(bool deserializing) : base(deserializing) { }
     34    private AttDistance(StorableConstructorFlag _) : base(_) { }
    3535    private AttDistance(AttDistance original, Cloner cloner) : base(original, cloner) { }
    3636    public AttDistance() { }

  • trunk/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/DistanceCalculator.cs

    r15583 r16565  
    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.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.PTSP {
    2828  [Item("Distance calculator", "Calculates the distance between two cities given as index of a coordinates matrix.")]
    29   [StorableClass]
     29  [StorableType("7CC7E665-A6A7-478B-B978-7079E1DDBA70")]
    3030  public abstract class DistanceCalculator : Item {
    3131    [StorableConstructor]
    32     protected DistanceCalculator(bool deserializing) : base(deserializing) { }
     32    protected DistanceCalculator(StorableConstructorFlag _) : base(_) { }
    3333    protected DistanceCalculator(DistanceCalculator original, Cloner cloner) : base(original, cloner) { }
    3434    protected DistanceCalculator() { }

  • trunk/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/EuclideanDistance.cs

    r15583 r16565  
    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.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.Instances;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("Euclidean Distance", "Calculates the euclidean distance.")]
    30   [StorableClass]
     30  [StorableType("D769186D-11F8-4F67-A39A-4B78184334E7")]
    3131  public sealed class EuclideanDistance : DistanceCalculator {
    3232
    3333    [StorableConstructor]
    34     private EuclideanDistance(bool deserializing) : base(deserializing) { }
     34    private EuclideanDistance(StorableConstructorFlag _) : base(_) { }
    3535    private EuclideanDistance(EuclideanDistance original, Cloner cloner) : base(original, cloner) { }
    3636    public EuclideanDistance() { }

  • trunk/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/GeoDistance.cs

    r15583 r16565  
    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.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.Instances;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("Geo Distance", "Calculates the geo distance.")]
    30   [StorableClass]
     30  [StorableType("B6CAD594-7558-4F19-ACE3-7739D29621F1")]
    3131  public sealed class GeoDistance : DistanceCalculator {
    3232
    3333    [StorableConstructor]
    34     private GeoDistance(bool deserializing) : base(deserializing) { }
     34    private GeoDistance(StorableConstructorFlag _) : base(_) { }
    3535    private GeoDistance(GeoDistance original, Cloner cloner) : base(original, cloner) { }
    3636    public GeoDistance() { }

  • trunk/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/ManhattanDistance.cs

    r15583 r16565  
    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.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.Instances;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("Manhattan Distance", "Calculates the Manhattan distance.")]
    30   [StorableClass]
     30  [StorableType("1395A5AC-9A55-40F0-B5C4-1EF15284938F")]
    3131  public sealed class ManhattanDistance : DistanceCalculator {
    3232
    3333    [StorableConstructor]
    34     private ManhattanDistance(bool deserializing) : base(deserializing) { }
     34    private ManhattanDistance(StorableConstructorFlag _) : base(_) { }
    3535    private ManhattanDistance(ManhattanDistance original, Cloner cloner) : base(original, cloner) { }
    3636    public ManhattanDistance() { }

  • trunk/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/MaximumDistance.cs

    r15583 r16565  
    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.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.Instances;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("Maximum Distance", "Calculates the maximum distance.")]
    30   [StorableClass]
     30  [StorableType("4ADF8A83-B110-4B39-882F-B5286EFB78A9")]
    3131  public sealed class MaximumDistance : DistanceCalculator {
    3232
    3333    [StorableConstructor]
    34     private MaximumDistance(bool deserializing) : base(deserializing) { }
     34    private MaximumDistance(StorableConstructorFlag _) : base(_) { }
    3535    private MaximumDistance(MaximumDistance original, Cloner cloner) : base(original, cloner) { }
    3636    public MaximumDistance() { }

  • trunk/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/RoundedEuclideanDistance.cs

    r15583 r16565  
    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.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.Instances;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("Rounded Euclidean Distance", "Calculates the euclidean distance and rounds it to the nearest integer.")]
    30   [StorableClass]
     30  [StorableType("5AE6854F-505E-438A-8668-2758FEF20861")]
    3131  public sealed class RoundedEuclideanDistance : DistanceCalculator {
    3232
    3333    [StorableConstructor]
    34     private RoundedEuclideanDistance(bool deserializing) : base(deserializing) { }
     34    private RoundedEuclideanDistance(StorableConstructorFlag _) : base(_) { }
    3535    private RoundedEuclideanDistance(RoundedEuclideanDistance original, Cloner cloner) : base(original, cloner) { }
    3636    public RoundedEuclideanDistance() { }

  • trunk/HeuristicLab.Problems.PTSP/3.3/DistanceCalculators/UpperEuclideanDistance.cs

    r15583 r16565  
    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.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Problems.Instances;
    2727
    2828namespace HeuristicLab.Problems.PTSP {
    2929  [Item("Upper Euclidean Distance", "Calculates the ceiling of the euclidean distance.")]
    30   [StorableClass]
     30  [StorableType("960A75FA-C8A7-4927-9814-C454343C198E")]
    3131  public sealed class UpperEuclideanDistance : DistanceCalculator {
    3232
    3333    [StorableConstructor]
    34     private UpperEuclideanDistance(bool deserializing) : base(deserializing) { }
     34    private UpperEuclideanDistance(StorableConstructorFlag _) : base(_) { }
    3535    private UpperEuclideanDistance(UpperEuclideanDistance original, Cloner cloner) : base(original, cloner) { }
    3636    public UpperEuclideanDistance() { }
Note: See TracChangeset for help on using the changeset viewer.