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:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Manipulators/GraftManipulator.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.
    … …  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    2929  [Item("Graft Manipulator", "Performs graft mutation as described in Du, J., Korkmaz, E.E., Alhajj, R., and Barker, K. 2004. Novel Clustering Approach that employs Genetic Algorithm with New Representation Scheme and Multiple Objectives. Data Warehousing and Knowledge Discovery, pp. 219-228. Springer Berlin Heidelberg.")]
    30   [StorableClass]
     30  [StorableType("B4806B37-B641-4750-B41F-FF5614156038")]
    3131  public sealed class GraftManipulator : LinearLinkageManipulator {
    3232
    3333    [StorableConstructor]
    34     private GraftManipulator(bool deserializing) : base(deserializing) { }
     34    private GraftManipulator(StorableConstructorFlag _) : base(_) { }
    3535    private GraftManipulator(GraftManipulator original, Cloner cloner) : base(original, cloner) { }
    3636    public GraftManipulator() { }

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Manipulators/MergeGroupManipulator.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.
    … …  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    3030  [Item("Merge Group Manipulator", "Performs a maximum of N merge operations on the groups. An already merged group may be merged again.")]
    31   [StorableClass]
     31  [StorableType("FE35BB56-D2B9-4309-ABF4-8C366D8596BC")]
    3232  public sealed class MergeGroupManipulator : LinearLinkageManipulator {
    3333
    … …  
    3737
    3838    [StorableConstructor]
    39     private MergeGroupManipulator(bool deserializing) : base(deserializing) { }
     39    private MergeGroupManipulator(StorableConstructorFlag _) : base(_) { }
    4040    private MergeGroupManipulator(MergeGroupManipulator original, Cloner cloner) : base(original, cloner) { }
    4141    public MergeGroupManipulator() {

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Manipulators/MoveItemManipulator.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.
    … …  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    3131  [Item("Move Item Manipulator", "Performs a maximum of N move operations between groups or to new groups. An already moved item may be moved again.")]
    32   [StorableClass]
     32  [StorableType("26B371F4-8E37-406A-AC5A-3E7734087890")]
    3333  public sealed class MoveItemManipulator : LinearLinkageManipulator {
    3434
    … …  
    3838
    3939    [StorableConstructor]
    40     private MoveItemManipulator(bool deserializing) : base(deserializing) { }
     40    private MoveItemManipulator(StorableConstructorFlag _) : base(_) { }
    4141    private MoveItemManipulator(MoveItemManipulator original, Cloner cloner) : base(original, cloner) { }
    4242    public MoveItemManipulator() {

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Manipulators/MultiLLEManipulator.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 System.Collections.Generic;
    2424using System.Linq;
    25 using System.Reflection;
    2625using HeuristicLab.Collections;
    2726using HeuristicLab.Common;
    … …  
    3029using HeuristicLab.Optimization;
    3130using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3332using HeuristicLab.PluginInfrastructure;
    3433
    3534namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    3635  [Item("Multi LLE Manipulator", "Randomly selects and applies one of its manipulators every time it is called.")]
    37   [StorableClass]
     36  [StorableType("7D22C9F6-BD21-4A21-BF8E-5F176D2260E1")]
    3837  public class MultiLinearLinkageManipulator : StochasticMultiBranch<ILinearLinkageManipulator>, ILinearLinkageManipulator, IStochasticOperator {
    3938    public override bool CanChangeName {
    … …  
    4948
    5049    [StorableConstructor]
    51     protected MultiLinearLinkageManipulator(bool deserializing) : base(deserializing) { }
     50    protected MultiLinearLinkageManipulator(StorableConstructorFlag _) : base(_) { }
    5251    protected MultiLinearLinkageManipulator(MultiLinearLinkageManipulator original, Cloner cloner) : base(original, cloner) { }
    5352    public MultiLinearLinkageManipulator()

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Manipulators/SplitGroupManipulator.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.
    … …  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Random;
    3131
    3232namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    3333  [Item("Split Group Manipulator", "Performs a maximum of N split operations on the groups. An already split group may be split again.")]
    34   [StorableClass]
     34  [StorableType("789781B8-0047-4880-ACAF-077A934AD320")]
    3535  public sealed class SplitGroupManipulator : LinearLinkageManipulator {
    3636
    … …  
    4040
    4141    [StorableConstructor]
    42     private SplitGroupManipulator(bool deserializing) : base(deserializing) { }
     42    private SplitGroupManipulator(StorableConstructorFlag _) : base(_) { }
    4343    private SplitGroupManipulator(SplitGroupManipulator original, Cloner cloner) : base(original, cloner) { }
    4444    public SplitGroupManipulator() {

  • trunk/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/Manipulators/SwapItemManipulator.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.
    … …  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Encodings.LinearLinkageEncoding {
    3030  [Item("Swap Item Manipulator", "Performs N swaps operations of two items each. The same items may be swapped multiple times, at least two groups need to be present.")]
    31   [StorableClass]
     31  [StorableType("21F18233-0752-40A2-8B9A-6E6A9E2CE456")]
    3232  public sealed class SwapItemManipulator : LinearLinkageManipulator {
    3333
    … …  
    3737
    3838    [StorableConstructor]
    39     private SwapItemManipulator(bool deserializing) : base(deserializing) { }
     39    private SwapItemManipulator(StorableConstructorFlag _) : base(_) { }
    4040    private SwapItemManipulator(SwapItemManipulator original, Cloner cloner) : base(original, cloner) { }
    4141    public SwapItemManipulator() {
Note: See TracChangeset for help on using the changeset viewer.