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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/FullTreeCreator.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;
    2727using HeuristicLab.PluginInfrastructure;
    2828
    2929namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    3030  [NonDiscoverableType]
    31   [StorableClass]
     31  [StorableType("1A36CB91-B3AD-4D3D-B44F-2CA5508C55ED")]
    3232  [Item("FullTreeCreator", "An operator that creates new symbolic expression trees using the 'Full' method")]
    3333  public class FullTreeCreator : SymbolicExpressionTreeCreator,
    … …  
    3636
    3737    [StorableConstructor]
    38     protected FullTreeCreator(bool deserializing) : base(deserializing) { }
     38    protected FullTreeCreator(StorableConstructorFlag _) : base(_) { }
    3939    protected FullTreeCreator(FullTreeCreator original, Cloner cloner) : base(original, cloner) { }
    4040

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/GrowTreeCreator.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;
    2727using HeuristicLab.PluginInfrastructure;
    2828
    2929namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    3030  [NonDiscoverableType]
    31   [StorableClass]
     31  [StorableType("ECE25817-D6B8-45CA-9B03-F8B2940FF622")]
    3232  [Item("GrowTreeCreator", "An operator that creates new symbolic expression trees using the 'Grow' method")]
    3333  public class GrowTreeCreator : SymbolicExpressionTreeCreator {
    3434    [StorableConstructor]
    35     protected GrowTreeCreator(bool deserializing) : base(deserializing) { }
     35    protected GrowTreeCreator(StorableConstructorFlag _) : base(_) { }
    3636    protected GrowTreeCreator(GrowTreeCreator original, Cloner cloner) : base(original, cloner) { }
    3737

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.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.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.PluginInfrastructure;
    2929
    3030namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    3131  [NonDiscoverableType]
    32   [StorableClass]
     32  [StorableType("6B26A8D9-60CC-4723-94ED-D185BB716AD1")]
    3333  [Item("ProbabilisticTreeCreator", "An operator that creates new symbolic expression trees with uniformly distributed length")]
    3434  public class ProbabilisticTreeCreator : SymbolicExpressionTreeCreator,
    … …  
    3737
    3838    [StorableConstructor]
    39     protected ProbabilisticTreeCreator(bool deserializing) : base(deserializing) { }
     39    protected ProbabilisticTreeCreator(StorableConstructorFlag _) : base(_) { }
    4040    protected ProbabilisticTreeCreator(ProbabilisticTreeCreator original, Cloner cloner) : base(original, cloner) { }
    4141    public ProbabilisticTreeCreator()

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/RampedHalfAndHalfTreeCreator.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;
    2525using HeuristicLab.PluginInfrastructure;
    2626
    2727namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    2828  [NonDiscoverableType]
    29   [StorableClass]
     29  [StorableType("0E43AC76-6CD1-4371-90A6-05F7C5B05EC8")]
    3030  [Item("RampedHalfAndHalfTreeCreator", "An operator that creates new symbolic expression trees in an alternate way: half the trees are created usign the 'Grow' method while the other half are created using the 'Full' method")]
    3131  public class RampedHalfAndHalfTreeCreator : SymbolicExpressionTreeCreator {
    3232    [StorableConstructor]
    33     protected RampedHalfAndHalfTreeCreator(bool deserializing) : base(deserializing) { }
     33    protected RampedHalfAndHalfTreeCreator(StorableConstructorFlag _) : base(_) { }
    3434    protected RampedHalfAndHalfTreeCreator(RampedHalfAndHalfTreeCreator original, Cloner cloner) : base(original, cloner) { }
    3535

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/SymbolicExpressionTreeCreator.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.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    … …  
    3131  /// </summary>
    3232  [Item("SymbolicExpressionTreeCreator", "A base class for operators creating symbolic expression trees.")]
    33   [StorableClass]
     33  [StorableType("88CC0F00-5674-4598-A3C4-756B3B7E80CB")]
    3434  public abstract class SymbolicExpressionTreeCreator : SymbolicExpressionTreeOperator, ISymbolicExpressionTreeCreator {
    3535    private const string MaximumSymbolicExpressionTreeLengthParameterName = "MaximumSymbolicExpressionTreeLength";
    … …  
    5656
    5757    [StorableConstructor]
    58     protected SymbolicExpressionTreeCreator(bool deserializing) : base(deserializing) { }
     58    protected SymbolicExpressionTreeCreator(StorableConstructorFlag _) : base(_) { }
    5959    protected SymbolicExpressionTreeCreator(SymbolicExpressionTreeCreator original, Cloner cloner) : base(original, cloner) { }
    6060    protected SymbolicExpressionTreeCreator()
Note: See TracChangeset for help on using the changeset viewer.