Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Encodings.PermutationEncoding

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InsertionManipulator.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.PermutationEncoding {
    … …  
    3232  /// </remarks>
    3333  [Item("InsertionManipulator", "An operator which moves randomly one element to another position in the permutation (Insertion is a special case of Translocation). It is implemented as described in Fogel, D.B. (1988). An Evolutionary Approach to the Traveling Salesman Problem, Biological Cybernetics, 60, pp. 139-144.")]
    34   [StorableClass]
     34  [StorableType("E8C09728-ACB7-491B-B87C-BE8E2B5A5B0B")]
    3535  public class InsertionManipulator : PermutationManipulator {
    3636    [StorableConstructor]
    37     protected InsertionManipulator(bool deserializing) : base(deserializing) { }
     37    protected InsertionManipulator(StorableConstructorFlag _) : base(_) { }
    3838    protected InsertionManipulator(InsertionManipulator original, Cloner cloner) : base(original, cloner) { }
    3939    public InsertionManipulator() : base() { }

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/InversionManipulator.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.PermutationEncoding {
    … …  
    3232  /// </remarks>
    3333  [Item("InversionManipulator", "An operator which inverts a randomly chosen part of a permutation. It is implemented as described in Eiben, A.E. and Smith, J.E. 2003. Introduction to Evolutionary Computation. Natural Computing Series, Springer-Verlag Berlin Heidelberg.")]
    34   [StorableClass]
     34  [StorableType("F43DF081-19FB-4082-B136-EC1A77E0468A")]
    3535  public class InversionManipulator : PermutationManipulator {
    3636    [StorableConstructor]
    37     protected InversionManipulator(bool deserializing) : base(deserializing) { }
     37    protected InversionManipulator(StorableConstructorFlag _) : base(_) { }
    3838    protected InversionManipulator(InversionManipulator original, Cloner cloner) : base(original, cloner) { }
    3939    public InversionManipulator() : base() { }

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/MultiPermutationManipulator.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.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.PluginInfrastructure;
    3232
    3333namespace HeuristicLab.Encodings.PermutationEncoding {
    3434  [Item("MultiPermutationManipulator", "Randomly selects and applies one of its manipulators every time it is called.")]
    35   [StorableClass]
     35  [StorableType("21EA3717-C907-490B-82E7-34A0B1A94EB0")]
    3636  public class MultiPermutationManipulator : StochasticMultiBranch<IPermutationManipulator>, IPermutationManipulator, IStochasticOperator {
    3737    public override bool CanChangeName {
    … …  
    4747
    4848    [StorableConstructor]
    49     protected MultiPermutationManipulator(bool deserializing) : base(deserializing) { }
     49    protected MultiPermutationManipulator(StorableConstructorFlag _) : base(_) { }
    5050    protected MultiPermutationManipulator(MultiPermutationManipulator original, Cloner cloner) : base(original, cloner) { }
    5151    public MultiPermutationManipulator()

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/ScrambleManipulator.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.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.PermutationEncoding {
    … …  
    3333  /// </remarks>
    3434  [Item("ScrambleManipulator", "An operator which manipulates a permutation array by randomly scrambling the elements in a randomly chosen interval. It is implemented as described in Syswerda, G. (1991). Schedule Optimization Using Genetic Algorithms. In Davis, L. (Ed.) Handbook of Genetic Algorithms, Van Nostrand Reinhold, New York, pp 332-349.")]
    35   [StorableClass]
     35  [StorableType("C324E297-C54E-4A18-BF41-3F0EF9595762")]
    3636  public class ScrambleManipulator : PermutationManipulator {
    3737    [StorableConstructor]
    38     protected ScrambleManipulator(bool deserializing) : base(deserializing) { }
     38    protected ScrambleManipulator(StorableConstructorFlag _) : base(_) { }
    3939    protected ScrambleManipulator(ScrambleManipulator original, Cloner cloner) : base(original, cloner) { }
    4040    public ScrambleManipulator() : base() { }

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap2Manipulator.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.PermutationEncoding {
    … …  
    3232  /// </remarks>
    3333  [Item("Swap2Manipulator", "An operator which manipulates a permutation array by swapping to randomly chosen elements. It is implemented as described in Eiben, A.E. and Smith, J.E. 2003. Introduction to Evolutionary Computation. Natural Computing Series, Springer-Verlag Berlin Heidelberg.")]
    34   [StorableClass]
     34  [StorableType("0909F09A-B27B-4962-8A7D-B4561A37D324")]
    3535  public class Swap2Manipulator : PermutationManipulator {
    3636    [StorableConstructor]
    37     protected Swap2Manipulator(bool deserializing) : base(deserializing) { }
     37    protected Swap2Manipulator(StorableConstructorFlag _) : base(_) { }
    3838    protected Swap2Manipulator(Swap2Manipulator original, Cloner cloner) : base(original, cloner) { }
    3939    public Swap2Manipulator() : base() { }

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/Swap3Manipulator.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.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Encodings.PermutationEncoding {
    … …  
    3434  /// </remarks>
    3535  [Item("Swap3Manipulator", "An operator which manipulates a permutation array by swaping three randomly chosen elements. It is implemented such that first 3 positions are randomly chosen in the interval [0;N) with N = length of the permutation with all positions being distinct from each other. Then position 1 is put in place of position 3, position 2 is put in place of position 1 and position 3 is put in place of position 2.")]
    36   [StorableClass]
     36  [StorableType("3907489F-54DF-4774-85E6-E89CE055B56C")]
    3737  public class Swap3Manipulator : PermutationManipulator {
    3838    [StorableConstructor]
    39     protected Swap3Manipulator(bool deserializing) : base(deserializing) { }
     39    protected Swap3Manipulator(StorableConstructorFlag _) : base(_) { }
    4040    protected Swap3Manipulator(Swap3Manipulator original, Cloner cloner) : base(original, cloner) { }
    4141    public Swap3Manipulator() : base() { }

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/TranslocationInversionManipulator.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.PermutationEncoding {
    … …  
    3333  /// </remarks>
    3434  [Item("TranslocationInversionManipulator", "An operator which inverts a randomly chosen part of a permutation and inserts it at a random position. It is implemented as described in Fogel, D.B. 1993. Applying Evolutionary Programming to Selected TSP Problems, Cybernetics and Systems, 22, pp. 27-36.")]
    35   [StorableClass]
     35  [StorableType("00E282D0-60ED-4A6B-B409-9CAB380DA670")]
    3636  public class TranslocationInversionManipulator : PermutationManipulator {
    3737    [StorableConstructor]
    38     protected TranslocationInversionManipulator(bool deserializing) : base(deserializing) { }
     38    protected TranslocationInversionManipulator(StorableConstructorFlag _) : base(_) { }
    3939    protected TranslocationInversionManipulator(TranslocationInversionManipulator original, Cloner cloner) : base(original, cloner) { }
    4040    public TranslocationInversionManipulator() : base() { }

  • trunk/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/TranslocationManipulator.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Encodings.PermutationEncoding {
    … …  
    3333  /// </remarks>
    3434  [Item("TranslocationManipulator", "An operator which Manipulates a permutation array by moving a randomly chosen interval of elements to another (randomly chosen) position in the array. It is implemented as described in Michalewicz, Z. 1992. Genetic Algorithms + Data Structures = Evolution Programs, Springer Verlag, Berlin Heidelberg.")]
    35   [StorableClass]
     35  [StorableType("AB07D415-33F1-46C0-83FA-F7C1151B8AC8")]
    3636  public class TranslocationManipulator : PermutationManipulator {
    3737    [StorableConstructor]
    38     protected TranslocationManipulator(bool deserializing) : base(deserializing) { }
     38    protected TranslocationManipulator(StorableConstructorFlag _) : base(_) { }
    3939    protected TranslocationManipulator(TranslocationManipulator original, Cloner cloner) : base(original, cloner) { }
    4040    public TranslocationManipulator() : base() { }
Note: See TracChangeset for help on using the changeset viewer.