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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/ChangeNodeTypeManipulation.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.SymbolicExpressionTreeEncoding {
    29   [StorableClass]
     29  [StorableType("92D37E9F-8726-4524-AF8F-F3787641F7B9")]
    3030  [Item("ChangeNodeTypeManipulation", "Selects a random tree node and changes the symbol.")]
    3131  public sealed class ChangeNodeTypeManipulation : SymbolicExpressionTreeManipulator {
    … …  
    3333
    3434    [StorableConstructor]
    35     private ChangeNodeTypeManipulation(bool deserializing) : base(deserializing) { }
     35    private ChangeNodeTypeManipulation(StorableConstructorFlag _) : base(_) { }
    3636    private ChangeNodeTypeManipulation(ChangeNodeTypeManipulation original, Cloner cloner) : base(original, cloner) { }
    3737    public ChangeNodeTypeManipulation() : base() { }

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/FullTreeShaker.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.Parameters;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    29   [StorableClass]
     29  [StorableType("C8864746-308A-49F0-B76F-92D2C7E33574")]
    3030  [Item("FullTreeShaker", "Manipulates all nodes that have local parameters.")]
    3131  public sealed class FullTreeShaker : SymbolicExpressionTreeManipulator {
    … …  
    4343    #endregion
    4444    [StorableConstructor]
    45     private FullTreeShaker(bool deserializing) : base(deserializing) { }
     45    private FullTreeShaker(StorableConstructorFlag _) : base(_) { }
    4646    private FullTreeShaker(FullTreeShaker original, Cloner cloner) : base(original, cloner) { }
    4747    public FullTreeShaker()

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/MultiSymbolicExpressionTreeManipulator.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.
    … …  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    3333using HeuristicLab.PluginInfrastructure;
    3434
    3535namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    3636  [Item("MultiSymbolicExpressionTreeManipulator", "Randomly selects and applies one of its manipulators every time it is called.")]
    37   [StorableClass]
     37  [StorableType("0A0ED8D8-69D4-4F58-A4FD-6D97F27B4009")]
    3838  public sealed class MultiSymbolicExpressionTreeManipulator : StochasticMultiBranch<ISymbolicExpressionTreeManipulator>,
    3939    ISymbolicExpressionTreeManipulator,
    … …  
    6464
    6565    [StorableConstructor]
    66     private MultiSymbolicExpressionTreeManipulator(bool deserializing) : base(deserializing) { }
     66    private MultiSymbolicExpressionTreeManipulator(StorableConstructorFlag _) : base(_) { }
    6767    private MultiSymbolicExpressionTreeManipulator(MultiSymbolicExpressionTreeManipulator original, Cloner cloner) : base(original, cloner) { }
    6868    public MultiSymbolicExpressionTreeManipulator()

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/OnePointShaker.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;
    2828using HeuristicLab.Random;
    2929
    3030namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    31   [StorableClass]
     31  [StorableType("959330FD-85FA-4615-A047-3A1493573A42")]
    3232  [Item("OnePointShaker", "Selects a random node with local parameters and manipulates the selected node.")]
    3333  public sealed class OnePointShaker : SymbolicExpressionTreeManipulator {
    … …  
    4545    #endregion
    4646    [StorableConstructor]
    47     private OnePointShaker(bool deserializing) : base(deserializing) { }
     47    private OnePointShaker(StorableConstructorFlag _) : base(_) { }
    4848    private OnePointShaker(OnePointShaker original, Cloner cloner) : base(original, cloner) { }
    4949    public OnePointShaker()

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/RemoveBranchManipulation.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;
    2929using HeuristicLab.Random;
    3030
    3131namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    32   [StorableClass]
     32  [StorableType("639F837E-3AF9-4783-9AC2-0A4DC8991FED")]
    3333  [Item("RemoveBranchManipulation", "Removes a random sub-tree of the input tree and fixes the tree by generating random subtrees if necessary..")]
    3434  public sealed class RemoveBranchManipulation : SymbolicExpressionTreeManipulator, ISymbolicExpressionTreeSizeConstraintOperator {
    … …  
    5454
    5555    [StorableConstructor]
    56     private RemoveBranchManipulation(bool deserializing) : base(deserializing) { }
     56    private RemoveBranchManipulation(StorableConstructorFlag _) : base(_) { }
    5757    private RemoveBranchManipulation(RemoveBranchManipulation original, Cloner cloner) : base(original, cloner) { }
    5858    public RemoveBranchManipulation()

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/ReplaceBranchManipulation.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.SymbolicExpressionTreeEncoding {
    31   [StorableClass]
     31  [StorableType("92286134-0520-4A1E-B8EE-01AFAD55C3AE")]
    3232  [Item("ReplaceBranchManipulation", "Selects a branch of the tree randomly and replaces it with a newly initialized branch (using PTC2).")]
    3333  public sealed class ReplaceBranchManipulation : SymbolicExpressionTreeManipulator, ISymbolicExpressionTreeSizeConstraintOperator {
    … …  
    5353
    5454    [StorableConstructor]
    55     private ReplaceBranchManipulation(bool deserializing) : base(deserializing) { }
     55    private ReplaceBranchManipulation(StorableConstructorFlag _) : base(_) { }
    5656    private ReplaceBranchManipulation(ReplaceBranchManipulation original, Cloner cloner) : base(original, cloner) { }
    5757    public ReplaceBranchManipulation()

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/SymbolicExpressionTreeManipulator.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.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2625
    2726namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    … …  
    3029  /// </summary>
    3130  [Item("SymbolicExpressionTreeManipulator", "A base class for operators that manipulate symbolic expression trees.")]
    32   [StorableClass]
     31  [StorableType("9391A979-616B-4808-80E7-99D8802599AF")]
    3332  public abstract class SymbolicExpressionTreeManipulator : SymbolicExpressionTreeOperator, ISymbolicExpressionTreeManipulator {
    3433    [StorableConstructor]
    35     protected SymbolicExpressionTreeManipulator(bool deserializing) : base(deserializing) { }
     34    protected SymbolicExpressionTreeManipulator(StorableConstructorFlag _) : base(_) { }
    3635    protected SymbolicExpressionTreeManipulator(SymbolicExpressionTreeManipulator original, Cloner cloner) : base(original, cloner) { }
    3736    public SymbolicExpressionTreeManipulator()
Note: See TracChangeset for help on using the changeset viewer.