Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/15/19 13:36:51 (6 years ago)
Author:
abeham
Message:

#2457: merged trunk into branch

Location:
branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/CosaCrossover.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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 {
    … …  
    3636  /// </remarks>
    3737  [Item("CosaCrossover", "An operator which performs the crossover described in the COSA optimization method. It is implemented as described in Wendt, O. 1994. COSA: COoperative Simulated Annealing - Integration von Genetischen Algorithmen und Simulated Annealing am Beispiel der Tourenplanung. Dissertation Thesis. IWI Frankfurt.")]
    38   [StorableClass]
     38  [StorableType("2C6B5F27-A921-4CDD-A484-35B8824CDDBE")]
    3939  public class CosaCrossover : PermutationCrossover {
    4040    [StorableConstructor]
    41     protected CosaCrossover(bool deserializing) : base(deserializing) { }
     41    protected CosaCrossover(StorableConstructorFlag _) : base(_) { }
    4242    protected CosaCrossover(CosaCrossover original, Cloner cloner) : base(original, cloner) { }
    4343    public CosaCrossover() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/CyclicCrossover.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("CyclicCrossover", "An operator which performs the cyclic crossover on two permutations. 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.")]
    35   [StorableClass]
     35  [StorableType("7C4797B7-A154-4702-AEEB-5511A170858B")]
    3636  public class CyclicCrossover : PermutationCrossover {
    3737    [StorableConstructor]
    38     protected CyclicCrossover(bool deserializing) : base(deserializing) { }
     38    protected CyclicCrossover(StorableConstructorFlag _) : base(_) { }
    3939    protected CyclicCrossover(CyclicCrossover original, Cloner cloner) : base(original, cloner) { }
    4040    public CyclicCrossover() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/CyclicCrossover2.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("CyclicCrossover2", "An operator which performs the cyclic crossover on two permutations. It is implemented as described in Affenzeller, M. et al. 2009. Genetic Algorithms and Genetic Programming - Modern Concepts and Practical Applications. CRC Press. p. 136.")]
    36   [StorableClass]
     36  [StorableType("B1550E88-0F0B-452F-94EC-F457761A58F3")]
    3737  public class CyclicCrossover2 : PermutationCrossover {
    3838    [StorableConstructor]
    39     protected CyclicCrossover2(bool deserializing) : base(deserializing) { }
     39    protected CyclicCrossover2(StorableConstructorFlag _) : base(_) { }
    4040    protected CyclicCrossover2(CyclicCrossover2 original, Cloner cloner) : base(original, cloner) { }
    4141    public CyclicCrossover2() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/EdgeRecombinationCrossover.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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 {
    … …  
    3636  /// </remarks>
    3737  [Item("EdgeRecombinationCrossover", "An operator which performs the edge recombination crossover on two permutations. It is implemented as described in Whitley et.al. 1991, The Traveling Salesman and Sequence Scheduling, in Davis, L. (Ed.), Handbook of Genetic Algorithms, New York, pp. 350-372.")]
    38   [StorableClass]
     38  [StorableType("4A2E0B7A-F92A-4085-8F3A-149FA010FEB0")]
    3939  public class EdgeRecombinationCrossover : PermutationCrossover {
    4040    [StorableConstructor]
    41     protected EdgeRecombinationCrossover(bool deserializing) : base(deserializing) { }
     41    protected EdgeRecombinationCrossover(StorableConstructorFlag _) : base(_) { }
    4242    protected EdgeRecombinationCrossover(EdgeRecombinationCrossover original, Cloner cloner) : base(original, cloner) { }
    4343    public EdgeRecombinationCrossover() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/MaximalPreservativeCrossover.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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 {
    … …  
    3636  /// </remarks>
    3737  [Item("MaximalPreservativeCrossover", "An operator which performs the maximal preservative crossover on two permutations. It is implemented as described in Mühlenbein, H. 1991. Evolution in time and space - the parallel genetic algorithm. FOUNDATIONS OF GENETIC ALGORITHMS, pp. 316-337. Morgan Kaufmann.")]
    38   [StorableClass]
     38  [StorableType("FEC5CCFA-C7E6-4A2E-88C0-C537329BEE73")]
    3939  public class MaximalPreservativeCrossover : PermutationCrossover {
    4040    [StorableConstructor]
    41     protected MaximalPreservativeCrossover(bool deserializing) : base(deserializing) { }
     41    protected MaximalPreservativeCrossover(StorableConstructorFlag _) : base(_) { }
    4242    protected MaximalPreservativeCrossover(MaximalPreservativeCrossover original, Cloner cloner) : base(original, cloner) { }
    4343    public MaximalPreservativeCrossover() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/MultiPermutationCrossover.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("MultiPermutationCrossover", "Randomly selects and applies one of its crossovers every time it is called.")]
    35   [StorableClass]
     35  [StorableType("C4F47F2E-FAF5-4AC6-B8AB-42F8A11D8703")]
    3636  public class MultiPermutationCrossover : StochasticMultiBranch<IPermutationCrossover>, IPermutationCrossover, IStochasticOperator {
    3737    public override bool CanChangeName {
    … …  
    5151
    5252    [StorableConstructor]
    53     protected MultiPermutationCrossover(bool deserializing) : base(deserializing) { }
     53    protected MultiPermutationCrossover(StorableConstructorFlag _) : base(_) { }
    5454    protected MultiPermutationCrossover(MultiPermutationCrossover original, Cloner cloner) : base(original, cloner) { }
    5555    public MultiPermutationCrossover()

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/OrderBasedCrossover.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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 {
    … …  
    3636  /// </remarks>
    3737  [Item("OrderBasedCrossover", "An operator which performs an order based crossover of two permutations. 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.")]
    38   [StorableClass]
     38  [StorableType("399EAAF3-ECDF-46AE-9DB6-1D99E45EBA66")]
    3939  public class OrderBasedCrossover : PermutationCrossover {
    4040    [StorableConstructor]
    41     protected OrderBasedCrossover(bool deserializing) : base(deserializing) { }
     41    protected OrderBasedCrossover(StorableConstructorFlag _) : base(_) { }
    4242    protected OrderBasedCrossover(OrderBasedCrossover original, Cloner cloner) : base(original, cloner) { }
    4343    public OrderBasedCrossover() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/OrderCrossover.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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 {
    … …  
    3636  /// </remarks>
    3737  [Item("OrderCrossover", "An operator which performs an order crossover of two permutations. 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.")]
    38   [StorableClass]
     38  [StorableType("DEF33012-C7C5-4C09-8FCD-1145353D06A2")]
    3939  public class OrderCrossover : PermutationCrossover {
    4040    [StorableConstructor]
    41     protected OrderCrossover(bool deserializing) : base(deserializing) { }
     41    protected OrderCrossover(StorableConstructorFlag _) : base(_) { }
    4242    protected OrderCrossover(OrderCrossover original, Cloner cloner) : base(original, cloner) { }
    4343    public OrderCrossover() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/OrderCrossover2.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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 {
    … …  
    3535  /// </remarks>
    3636  [Item("OrderCrossover2", "An operator which performs an order crossover of two permutations. It is implemented as described in Affenzeller, M. et al. 2009. Genetic Algorithms and Genetic Programming - Modern Concepts and Practical Applications. CRC Press. p. 135.")]
    37   [StorableClass]
     37  [StorableType("9E9A828E-E853-43FD-A39B-F47D17BCE539")]
    3838  public class OrderCrossover2 : PermutationCrossover {
    3939    [StorableConstructor]
    40     protected OrderCrossover2(bool deserializing) : base(deserializing) { }
     40    protected OrderCrossover2(StorableConstructorFlag _) : base(_) { }
    4141    protected OrderCrossover2(OrderCrossover2 original, Cloner cloner) : base(original, cloner) { }
    4242    public OrderCrossover2() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/PartiallyMatchedCrossover.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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 {
    … …  
    3535  /// </remarks>
    3636  [Item("PartiallyMatchedCrossover", "An operator which performs the partially matched crossover on two permutations. It is implemented as described in Fogel, D.B. 1988. An Evolutionary Approach to the Traveling Salesman Problem. Biological Cybernetics, 60, pp. 139-144, Springer-Verlag.")]
    37   [StorableClass]
     37  [StorableType("BE92E88C-0A05-4E56-884A-BAFFE6A86F4F")]
    3838  public class PartiallyMatchedCrossover : PermutationCrossover {
    3939    [StorableConstructor]
    40     protected PartiallyMatchedCrossover(bool deserializing) : base(deserializing) { }
     40    protected PartiallyMatchedCrossover(StorableConstructorFlag _) : base(_) { }
    4141    protected PartiallyMatchedCrossover(PartiallyMatchedCrossover original, Cloner cloner) : base(original, cloner) { }
    4242    public PartiallyMatchedCrossover() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/PositionBasedCrossover.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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("PositionBasedCrossover", "An operator which performs the position based crossover on two permutations. 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("9C707A94-E432-4A1C-94F4-FA69ED639289")]
    3636  public class PositionBasedCrossover : PermutationCrossover {
    3737    [StorableConstructor]
    38     protected PositionBasedCrossover(bool deserializing) : base(deserializing) { }
     38    protected PositionBasedCrossover(StorableConstructorFlag _) : base(_) { }
    3939    protected PositionBasedCrossover(PositionBasedCrossover original, Cloner cloner) : base(original, cloner) { }
    4040    public PositionBasedCrossover() : base() { }

  • branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/UniformLikeCrossover.cs

    r14600 r16956  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2016 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.
    … …  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.PermutationEncoding {
    2929  [Item("UniformLikeCrossover", "The ULX crossover tries to maintain the position in the permutation. It randomly chooses from left to right one of its parents' alleles at each position. Missing entries are then filled randomly later. It is described in Tate, D. M. and Smith, A. E. 1995. A genetic approach to the quadratic assignment problem. Computers & Operations Research, vol. 22, pp. 73-83.")]
    30   [StorableClass]
     30  [StorableType("5FCF5C48-80A1-4A08-9561-F01FDCB8D20D")]
    3131  public sealed class UniformLikeCrossover : PermutationCrossover {
    3232    [StorableConstructor]
    33     private UniformLikeCrossover(bool deserializing) : base(deserializing) { }
     33    private UniformLikeCrossover(StorableConstructorFlag _) : base(_) { }
    3434    private UniformLikeCrossover(UniformLikeCrossover original, Cloner cloner) : base(original, cloner) { }
    3535    public UniformLikeCrossover() : base() { }
Note: See TracChangeset for help on using the changeset viewer.