Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/07/19 23:40:10 (5 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Encodings.BinaryVectorEncoding

  • stable/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Crossovers/MultiBinaryVectorCrossover.cs

    r15584 r17097  
    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.BinaryVectorEncoding {
    3434  [Item("MultiBinaryVectorCrossover", "Randomly selects and applies one of its crossovers every time it is called.")]
    35   [StorableClass]
     35  [StorableType("0ACAFFFB-E57A-4171-9D6D-A20B7A7B935E")]
    3636  public class MultiBinaryVectorCrossover : StochasticMultiBranch<IBinaryVectorCrossover>, IBinaryVectorCrossover, IStochasticOperator {
    3737    public override bool CanChangeName {
    … …  
    5151
    5252    [StorableConstructor]
    53     protected MultiBinaryVectorCrossover(bool deserializing) : base(deserializing) { }
     53    protected MultiBinaryVectorCrossover(StorableConstructorFlag _) : base(_) { }
    5454    protected MultiBinaryVectorCrossover(MultiBinaryVectorCrossover original, Cloner cloner) : base(original, cloner) { }
    5555    public MultiBinaryVectorCrossover()

  • stable/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Crossovers/NPointCrossover.cs

    r15584 r17097  
    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.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    … …  
    3636  /// </remarks>
    3737  [Item("NPointCrossover", "N point crossover for binary vectors. 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("59683F25-9315-47D9-9E06-539559C9DEE1")]
    3939  public sealed class NPointCrossover : BinaryVectorCrossover {
    4040    /// <summary>
    … …  
    4646
    4747    [StorableConstructor]
    48     private NPointCrossover(bool deserializing) : base(deserializing) { }
     48    private NPointCrossover(StorableConstructorFlag _) : base(_) { }
    4949    private NPointCrossover(NPointCrossover original, Cloner cloner) : base(original, cloner) { }
    5050    /// <summary>

  • stable/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Crossovers/SinglePointCrossover.cs

    r15584 r17097  
    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.
    … …  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.BinaryVectorEncoding {
    … …  
    3434  /// </remarks>
    3535  [Item("SinglePointCrossover", "Single point crossover for binary vectors. It is implemented based on the NPointCrossover.")]
    36   [StorableClass]
     36  [StorableType("40B6A5D5-8937-495E-8B98-2E4F8FD06D93")]
    3737  public sealed class SinglePointCrossover : BinaryVectorCrossover {
    3838
    3939    [StorableConstructor]
    40     private SinglePointCrossover(bool deserializing) : base(deserializing) { }
     40    private SinglePointCrossover(StorableConstructorFlag _) : base(_) { }
    4141    private SinglePointCrossover(SinglePointCrossover original, Cloner cloner) : base(original, cloner) { }
    4242    public SinglePointCrossover() : base() { }

  • stable/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Crossovers/UniformCrossover.cs

    r15584 r17097  
    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.BinaryVectorEncoding {
    … …  
    3333  /// </remarks>
    3434  [Item("UniformCrossover", "Uniform crossover for binary vectors. 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("6B0DDD76-EC81-4C5A-989E-239A82B78E66")]
    3636  public sealed class UniformCrossover : BinaryVectorCrossover {
    3737
    3838    [StorableConstructor]
    39     private UniformCrossover(bool deserializing) : base(deserializing) { }
     39    private UniformCrossover(StorableConstructorFlag _) : base(_) { }
    4040    private UniformCrossover(UniformCrossover original, Cloner cloner) : base(original, cloner) { }
    4141    public UniformCrossover() : base() { }
Note: See TracChangeset for help on using the changeset viewer.