Ignore:
Timestamp:
12/28/18 16:10:48 (2 years ago)
Author:
jkarder
Message:

#2520: worked on reintegration of new persistence

  • added nuget references to HEAL.Fossil
  • added StorableType attributes to many classes
  • changed signature of StorableConstructors
  • removed some classes in old persistence
  • removed some unnecessary usings
Location:
branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4
Files:
54 edited

Legend:

Unmodified
Added
Removed
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/BestSymbolicExpressionTreeAnalyzer.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.PluginInfrastructure;
    3030
     
    3434  /// </summary>
    3535  [Item("BestSymbolicExpressionTreeAnalyzer", "An operator that tracks the best symbolic expression trees")]
    36   [StorableClass]
     36  [StorableType("6C1884A9-F954-4E64-97DA-8831E2FF1561")]
    3737  [NonDiscoverableType]
    3838  public sealed class BestSymbolicExpressionTreeAnalyzer : SingleSuccessorOperator, ISymbolicExpressionTreeAnalyzer {
     
    6868
    6969    [StorableConstructor]
    70     private BestSymbolicExpressionTreeAnalyzer(bool deserializing) : base(deserializing) { }
     70    private BestSymbolicExpressionTreeAnalyzer(StorableConstructorFlag _) : base(_) { }
    7171    private BestSymbolicExpressionTreeAnalyzer(BestSymbolicExpressionTreeAnalyzer original, Cloner cloner)
    7272      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/MinAverageMaxSymbolicExpressionTreeLengthAnalyzer.cs

    r16453 r16462  
    2727using HeuristicLab.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
     
    3434  /// </summary>
    3535  [Item("MinAverageMaxSymbolicExpressionTreeLengthAnalyzer", "An operator that tracks the min avgerage and max length of symbolic expression trees.")]
    36   [StorableClass]
     36  [StorableType("65606B5F-4F92-4E79-9B53-9A72398A9F1B")]
    3737  public sealed class MinAverageMaxSymbolicExpressionTreeLengthAnalyzer : AlgorithmOperator, ISymbolicExpressionTreeAnalyzer {
    3838    private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree";
     
    7070
    7171    [StorableConstructor]
    72     private MinAverageMaxSymbolicExpressionTreeLengthAnalyzer(bool deserializing) : base() { }
     72    private MinAverageMaxSymbolicExpressionTreeLengthAnalyzer(StorableConstructorFlag _) : base(_) { }
    7373    private MinAverageMaxSymbolicExpressionTreeLengthAnalyzer(MinAverageMaxSymbolicExpressionTreeLengthAnalyzer original, Cloner cloner)
    7474      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionSymbolFrequencyAnalyzer.cs

    r16453 r16462  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333
    3434namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
     
    3737  /// </summary>
    3838  [Item("SymbolicExpressionSymbolFrequencyAnalyzer", "An operator that tracks frequencies of symbols in symbolic expression trees.")]
    39   [StorableClass]
     39  [StorableType("0A7CA6D1-813C-41F8-88BF-715621BA049F")]
    4040  public class SymbolicExpressionSymbolFrequencyAnalyzer : SingleSuccessorOperator, ISymbolicExpressionTreeAnalyzer {
    4141    private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree";
     
    6969
    7070    [StorableConstructor]
    71     protected SymbolicExpressionSymbolFrequencyAnalyzer(bool deserializing) : base(deserializing) { }
     71    protected SymbolicExpressionSymbolFrequencyAnalyzer(StorableConstructorFlag _) : base(_) { }
    7272    protected SymbolicExpressionSymbolFrequencyAnalyzer(SymbolicExpressionSymbolFrequencyAnalyzer original, Cloner cloner) : base(original, cloner) { }
    7373    public SymbolicExpressionSymbolFrequencyAnalyzer()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionTreeLengthAnalyzer.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
     
    3636  /// </summary>
    3737  [Item("SymbolicExpressionTreeLengthAnalyzer", "An operator that tracks tree lengths of Symbolic Expression Trees")]
    38   [StorableClass]
     38  [StorableType("8A9F09AC-40E4-4AA2-9270-9204C9460E66")]
    3939  public sealed class SymbolicExpressionTreeLengthAnalyzer : SingleSuccessorOperator, ISymbolicExpressionTreeAnalyzer {
    4040    private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree";
     
    9292
    9393    [StorableConstructor]
    94     private SymbolicExpressionTreeLengthAnalyzer(bool deserializing) : base(deserializing) { }
     94    private SymbolicExpressionTreeLengthAnalyzer(StorableConstructorFlag _) : base(_) { }
    9595    private SymbolicExpressionTreeLengthAnalyzer(SymbolicExpressionTreeLengthAnalyzer original, Cloner cloner)
    9696      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionTreeLengthCalculator.cs

    r16453 r16462  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
     
    3232  /// </summary>
    3333  [Item("SymbolicExpressionTreeLengthCalculator", "An operator that outputs the length of a symbolic expression tree.")]
    34   [StorableClass]
     34  [StorableType("33E2EF4F-AA65-4E23-9E8C-0D0674A4186B")]
    3535  public sealed class SymbolicExpressionTreeLengthCalculator : SingleSuccessorOperator {
    3636    private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree";
     
    5757
    5858    [StorableConstructor]
    59     private SymbolicExpressionTreeLengthCalculator(bool deserializing) : base(deserializing) { }
     59    private SymbolicExpressionTreeLengthCalculator(StorableConstructorFlag _) : base(_) { }
    6060    private SymbolicExpressionTreeLengthCalculator(SymbolicExpressionTreeLengthCalculator original, Cloner cloner) : base(original, cloner) { }
    6161    public SymbolicExpressionTreeLengthCalculator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentCreater.cs

    r16453 r16462  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using HeuristicLab.Random;
    3131
     
    3636  /// </summary>
    3737  [Item("ArgumentCreater", "Manipulates a symbolic expression by creating a new argument within one function-defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 106")]
    38   [StorableClass]
     38  [StorableType("2AC1EE1A-B2B4-47E7-97AF-BFC9FB2D7BA2")]
    3939  public sealed class ArgumentCreater : SymbolicExpressionTreeArchitectureManipulator, ISymbolicExpressionTreeSizeConstraintOperator {
    4040    private const string MaximumSymbolicExpressionTreeLengthParameterName = "MaximumSymbolicExpressionTreeLength";
     
    5757    #endregion
    5858    [StorableConstructor]
    59     private ArgumentCreater(bool deserializing) : base(deserializing) { }
     59    private ArgumentCreater(StorableConstructorFlag _) : base(_) { }
    6060    private ArgumentCreater(ArgumentCreater original, Cloner cloner) : base(original, cloner) { }
    6161    public ArgumentCreater()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentDeleter.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Random;
    2828
     
    3232  /// </summary>
    3333  [Item("ArgumentDeleter", "Manipulates a symbolic expression by deleting an argument from an existing function defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 112")]
    34   [StorableClass]
     34  [StorableType("5A449735-B6B7-40AB-B1D6-A626FB768F71")]
    3535  public sealed class ArgumentDeleter : SymbolicExpressionTreeArchitectureManipulator {
    3636    [StorableConstructor]
    37     private ArgumentDeleter(bool deserializing) : base(deserializing) { }
     37    private ArgumentDeleter(StorableConstructorFlag _) : base(_) { }
    3838    private ArgumentDeleter(ArgumentDeleter original, Cloner cloner) : base(original, cloner) { }
    3939    public ArgumentDeleter() : base() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentDuplicater.cs

    r16453 r16462  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Data;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Random;
    3030
     
    3535  /// </summary>
    3636  [Item("ArgumentDuplicater", "Manipulates a symbolic expression by duplicating an existing argument node of a function-defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 94")]
    37   [StorableClass]
     37  [StorableType("4F97833A-ECF6-436A-9634-1A9111302912")]
    3838  public sealed class ArgumentDuplicater : SymbolicExpressionTreeArchitectureManipulator {
    3939    [StorableConstructor]
    40     private ArgumentDuplicater(bool deserializing) : base(deserializing) { }
     40    private ArgumentDuplicater(StorableConstructorFlag _) : base(_) { }
    4141    private ArgumentDuplicater(ArgumentDuplicater original, Cloner cloner) : base(original, cloner) { }
    4242    public ArgumentDuplicater() : base() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/MultiSymbolicExpressionTreeArchitectureManipulator.cs

    r16453 r16462  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333using HeuristicLab.PluginInfrastructure;
    3434
    3535namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    3636  [Item("MultiSymbolicExpressionTreeArchitectureManipulator", "Randomly selects and applies one of its architecture manipulators every time it is called.")]
    37   [StorableClass]
     37  [StorableType("6D524953-37A3-4789-AB3A-6881E5289F49")]
    3838  public sealed class MultiSymbolicExpressionTreeArchitectureManipulator : StochasticMultiBranch<ISymbolicExpressionTreeManipulator>,
    3939    ISymbolicExpressionTreeArchitectureManipulator,
     
    8686
    8787    [StorableConstructor]
    88     private MultiSymbolicExpressionTreeArchitectureManipulator(bool deserializing) : base(deserializing) { }
     88    private MultiSymbolicExpressionTreeArchitectureManipulator(StorableConstructorFlag _) : base(_) { }
    8989    private MultiSymbolicExpressionTreeArchitectureManipulator(MultiSymbolicExpressionTreeArchitectureManipulator original, Cloner cloner) : base(original, cloner) { }
    9090    public MultiSymbolicExpressionTreeArchitectureManipulator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineCreater.cs

    r16453 r16462  
    2828using HeuristicLab.Data;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131using HeuristicLab.Random;
    3232
     
    3838  /// </summary>
    3939  [Item("SubroutineCreater", "Manipulates a symbolic expression by adding one new function-defining branch containing a proportion of a preexisting branch and by creating a reference to the new branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 97")]
    40   [StorableClass]
     40  [StorableType("2F1F0953-534F-495C-B9C5-2C64D85E9AE2")]
    4141  public sealed class SubroutineCreater : SymbolicExpressionTreeArchitectureManipulator, ISymbolicExpressionTreeSizeConstraintOperator {
    4242    private const double ARGUMENT_CUTOFF_PROBABILITY = 0.05;
     
    6060    #endregion
    6161    [StorableConstructor]
    62     private SubroutineCreater(bool deserializing) : base(deserializing) { }
     62    private SubroutineCreater(StorableConstructorFlag _) : base(_) { }
    6363    private SubroutineCreater(SubroutineCreater original, Cloner cloner) : base(original, cloner) { }
    6464    public SubroutineCreater()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineDeleter.cs

    r16453 r16462  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.Random;
    2929
     
    3434  /// </summary>
    3535  [Item("SubroutineDeleter", "Manipulates a symbolic expression by deleting a preexisting function-defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 108")]
    36   [StorableClass]
     36  [StorableType("A4AB4A79-F013-4DF4-847D-5F2C171859A7")]
    3737  public sealed class SubroutineDeleter : SymbolicExpressionTreeArchitectureManipulator {
    3838    [StorableConstructor]
    39     private SubroutineDeleter(bool deserializing) : base(deserializing) { }
     39    private SubroutineDeleter(StorableConstructorFlag _) : base(_) { }
    4040    private SubroutineDeleter(SubroutineDeleter original, Cloner cloner) : base(original, cloner) { }
    4141    public SubroutineDeleter() : base() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineDuplicater.cs

    r16453 r16462  
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Data;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using HeuristicLab.Random;
    3131
     
    3636  /// </summary>
    3737  [Item("SubroutineDuplicater", "Manipulates a symbolic expression by duplicating a preexisting function-defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 88")]
    38   [StorableClass]
     38  [StorableType("FA58A28B-95B5-43BF-B94A-99FBFF4C9316")]
    3939  public sealed class SubroutineDuplicater : SymbolicExpressionTreeArchitectureManipulator {
    4040    [StorableConstructor]
    41     private SubroutineDuplicater(bool deserializing) : base(deserializing) { }
     41    private SubroutineDuplicater(StorableConstructorFlag _) : base(_) { }
    4242    private SubroutineDuplicater(SubroutineDuplicater original, Cloner cloner)
    4343      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SymbolicExpressionTreeArchitectureManipulator.cs

    r16453 r16462  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
     
    3030  /// Base class for architecture altering operators for symbolic expression trees.
    3131  /// </summary>
    32   [StorableClass]
     32  [StorableType("7D5ACE3E-DA4F-4E2D-9723-2596AB856B4D")]
    3333  public abstract class SymbolicExpressionTreeArchitectureManipulator : SymbolicExpressionTreeManipulator, ISymbolicExpressionTreeArchitectureManipulator {
    3434    private const string MaximumFunctionArgumentsParameterName = "MaximumFunctionArguments";
     
    5454    #endregion
    5555    [StorableConstructor]
    56     protected SymbolicExpressionTreeArchitectureManipulator(bool deserializing) : base(deserializing) { }
     56    protected SymbolicExpressionTreeArchitectureManipulator(StorableConstructorFlag _) : base(_) { }
    5757    protected SymbolicExpressionTreeArchitectureManipulator(SymbolicExpressionTreeArchitectureManipulator original, Cloner cloner) : base(original, cloner) { }
    5858    public SymbolicExpressionTreeArchitectureManipulator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/FullTreeCreator.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/GrowTreeCreator.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs

    r16453 r16462  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    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()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/RampedHalfAndHalfTreeCreator.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    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
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/SymbolicExpressionTreeCreator.cs

    r16453 r16462  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs

    r16453 r16462  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using HeuristicLab.Random;
    3131
     
    3838  /// </summary> 
    3939  [Item("SubtreeSwappingCrossover", "An operator which performs subtree swapping crossover.")]
    40   [StorableClass]
     40  [StorableType("2A2552C0-11C8-4F60-90B2-5FDDD3AB2444")]
    4141  public class SubtreeCrossover : SymbolicExpressionTreeCrossover, ISymbolicExpressionTreeSizeConstraintOperator {
    4242    private const string InternalCrossoverPointProbabilityParameterName = "InternalCrossoverPointProbability";
     
    6767    #endregion
    6868    [StorableConstructor]
    69     protected SubtreeCrossover(bool deserializing) : base(deserializing) { }
     69    protected SubtreeCrossover(StorableConstructorFlag _) : base(_) { }
    7070    protected SubtreeCrossover(SubtreeCrossover original, Cloner cloner) : base(original, cloner) { }
    7171    public SubtreeCrossover()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SymbolicExpressionTreeCrossover.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
     
    3131  /// </summary>
    3232  [Item("SymbolicExpressionTreeCrossover", "A base class for operators that perform a crossover of symbolic expression trees.")]
    33   [StorableClass]
     33  [StorableType("AB6004AE-B6ED-41D7-824E-87ECDA5B0AAF")]
    3434  public abstract class SymbolicExpressionTreeCrossover : SymbolicExpressionTreeOperator, ISymbolicExpressionTreeCrossover {
    3535    private const string ParentsParameterName = "Parents";
     
    4949    #endregion
    5050    [StorableConstructor]
    51     protected SymbolicExpressionTreeCrossover(bool deserializing) : base(deserializing) { }
     51    protected SymbolicExpressionTreeCrossover(StorableConstructorFlag _) : base(_) { }
    5252    protected SymbolicExpressionTreeCrossover(SymbolicExpressionTreeCrossover original, Cloner cloner) : base(original, cloner) { }
    5353    protected SymbolicExpressionTreeCrossover()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Formatters/SymbolicExpressionTreeStringFormatter.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    2929
    3030  [Item("Default String Formatter", "The default string formatter for symbolic expression trees.")]
    31   [StorableClass]
     31  [StorableType("BF3EBDE5-D37A-4F55-AC43-C146AE8FFF24")]
    3232  public class SymbolicExpressionTreeStringFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
    3333
     
    3535
    3636    [StorableConstructor]
    37     protected SymbolicExpressionTreeStringFormatter(bool deserializing) : base(deserializing) { }
     37    protected SymbolicExpressionTreeStringFormatter(StorableConstructorFlag _) : base(_) { }
    3838    protected SymbolicExpressionTreeStringFormatter(SymbolicExpressionTreeStringFormatter original, Cloner cloner)
    3939      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/EmptySymbolicExpressionTreeGrammar.cs

    r16453 r16462  
    2727using HeuristicLab.Common;
    2828using HeuristicLab.Core;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    3232
    33   [StorableClass]
     33  [StorableType("59B5B5B9-0F49-4994-B221-856AA43C28B4")]
    3434  internal sealed class EmptySymbolicExpressionTreeGrammar : NamedItem, ISymbolicExpressionTreeGrammar {
    3535    [Storable]
     
    3737
    3838    [StorableConstructor]
    39     private EmptySymbolicExpressionTreeGrammar(bool deserializing) : base(deserializing) { }
     39    private EmptySymbolicExpressionTreeGrammar(StorableConstructorFlag _) : base(_) { }
    4040    internal EmptySymbolicExpressionTreeGrammar(ISymbolicExpressionGrammar grammar)
    4141      : base() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SimpleSymbolicExpressionGrammar.cs

    r16453 r16462  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    27   [StorableClass]
     27  [StorableType("70D190B2-22F4-41E5-9938-EFD1B14ECF43")]
    2828  public sealed class SimpleSymbolicExpressionGrammar : SymbolicExpressionGrammar {
    2929    [StorableConstructor]
    30     private SimpleSymbolicExpressionGrammar(bool deserializing) : base(deserializing) { }
     30    private SimpleSymbolicExpressionGrammar(StorableConstructorFlag _) : base(_) { }
    3131    private SimpleSymbolicExpressionGrammar(SimpleSymbolicExpressionGrammar original, Cloner cloner) : base(original, cloner) { }
    3232    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionGrammar.cs

    r16453 r16462  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    31   [StorableClass]
     31  [StorableType("925BDEE9-0D46-48DB-BA1B-DCE82C0480B3")]
    3232  public abstract class SymbolicExpressionGrammar : SymbolicExpressionGrammarBase, ISymbolicExpressionGrammar {
    3333    #region fields & properties
     
    121121
    122122    [StorableConstructor]
    123     protected SymbolicExpressionGrammar(bool deserializing)
    124       : base(deserializing) {
     123    protected SymbolicExpressionGrammar(StorableConstructorFlag _) : base(_) {
    125124      emptyGrammar = new EmptySymbolicExpressionTreeGrammar(this);
    126125    }
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionGrammarBase.cs

    r16453 r16462  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
     
    3434  /// in the sub-trees of a symbol (can be specified for each sub-tree index separately).
    3535  /// </summary>
    36   [StorableClass]
     36  [StorableType("E76C087C-4E10-488A-86D0-295A4265DA53")]
    3737  public abstract class SymbolicExpressionGrammarBase : NamedItem, ISymbolicExpressionGrammarBase {
    3838
     
    8080
    8181    [StorableConstructor]
    82     protected SymbolicExpressionGrammarBase(bool deserializing)
    83       : base(deserializing) {
     82    protected SymbolicExpressionGrammarBase(StorableConstructorFlag _) : base(_) {
    8483
    8584      symbols = new Dictionary<string, ISymbol>();
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionTreeGrammar.cs

    r16453 r16462  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    28   [StorableClass]
     28  [StorableType("ADB1DF1C-BE39-49F7-BADD-978F495EEA4D")]
    2929  internal sealed class SymbolicExpressionTreeGrammar : SymbolicExpressionGrammarBase, ISymbolicExpressionTreeGrammar {
    3030    [StorableConstructor]
    31     private SymbolicExpressionTreeGrammar(bool deserializing) : base(deserializing) { }
     31    private SymbolicExpressionTreeGrammar(StorableConstructorFlag _) : base(_) { }
    3232    private SymbolicExpressionTreeGrammar(SymbolicExpressionTreeGrammar original, Cloner cloner)
    3333      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj

    r16454 r16462  
    103103      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    104104    </Reference>
    105     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     105    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    106106      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    107107    </Reference>
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeArchitectureManipulator.cs

    r16453 r16462  
    2020#endregion
    2121
    22 using HeuristicLab.Core;
    23 using HeuristicLab.Data;
    2422
    2523namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeManipulator.cs

    r16453 r16462  
    2020#endregion
    2121
    22 using HeuristicLab.Core;
    2322using HeuristicLab.Optimization;
    2423
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/ChangeNodeTypeManipulation.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/FullTreeShaker.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/MultiSymbolicExpressionTreeManipulator.cs

    r16453 r16462  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    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()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/OnePointShaker.cs

    r16453 r16462  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    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()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/RemoveBranchManipulation.cs

    r16453 r16462  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    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()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/ReplaceBranchManipulation.cs

    r16453 r16462  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    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()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/SymbolicExpressionTreeManipulator.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    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()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTree.cs

    r16453 r16462  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    31   [StorableClass]
     31  [StorableType("E98BB36B-FBB5-4A6C-A2E5-D47E0BD0687B")]
    3232  [Item("SymbolicExpressionTree", "Represents a symbolic expression tree.")]
    3333  public class SymbolicExpressionTree : Item, ISymbolicExpressionTree {
     
    6565
    6666    [StorableConstructor]
    67     protected SymbolicExpressionTree(bool deserializing) : base(deserializing) { }
     67    protected SymbolicExpressionTree(StorableConstructorFlag _) : base(_) { }
    6868    protected SymbolicExpressionTree(SymbolicExpressionTree original, Cloner cloner)
    6969      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeEncoding.cs

    r16453 r16462  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333using HeuristicLab.PluginInfrastructure;
    3434
    3535namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    3636  [Item("SymbolicExpressionTreeEncoding", "Describes a symbolic expression tree encoding.")]
    37   [StorableClass]
     37  [StorableType("3FDE530B-771F-4280-921F-20DA50A139BA")]
    3838  public sealed class SymbolicExpressionTreeEncoding : Encoding<ISymbolicExpressionTreeCreator> {
    3939    #region Encoding Parameters
     
    158158
    159159    [StorableConstructor]
    160     private SymbolicExpressionTreeEncoding(bool deserializing) : base(deserializing) { }
     160    private SymbolicExpressionTreeEncoding(StorableConstructorFlag _) : base(_) { }
    161161    public SymbolicExpressionTreeEncoding() : this(new SimpleSymbolicExpressionGrammar()) { }
    162162    public SymbolicExpressionTreeEncoding(ISymbolicExpressionGrammar grammar) : this("SymbolicExpressionTree", grammar, 50, 50) { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    29   [StorableClass]
     29  [StorableType("E3549A82-D4C5-4AEC-A44C-D3205A618A21")]
    3030  public class SymbolicExpressionTreeNode : DeepCloneable, ISymbolicExpressionTreeNode {
    3131    [Storable]
     
    5151
    5252    [StorableConstructor]
    53     protected SymbolicExpressionTreeNode(bool deserializing) { }
     53    protected SymbolicExpressionTreeNode(StorableConstructorFlag _) { }
    5454    protected SymbolicExpressionTreeNode(SymbolicExpressionTreeNode original, Cloner cloner)
    5555      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeOperator.cs

    r16453 r16462  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
     
    3232  /// </summary>
    3333  [Item("SymbolicExpressionTreeOperator", "A base class for operators for symbolic expression trees.")]
    34   [StorableClass]
     34  [StorableType("09F2EC44-6249-4DDE-BA60-A4A3ACDF861B")]
    3535  public abstract class SymbolicExpressionTreeOperator : InstrumentedOperator, IStochasticOperator, ISymbolicExpressionTreeOperator {
    3636    private const string RandomParameterName = "Random";
     
    5151
    5252    [StorableConstructor]
    53     protected SymbolicExpressionTreeOperator(bool deserializing) : base(deserializing) { }
     53    protected SymbolicExpressionTreeOperator(StorableConstructorFlag _) : base(_) { }
    5454    protected SymbolicExpressionTreeOperator(SymbolicExpressionTreeOperator original, Cloner cloner) : base(original, cloner) { }
    5555    protected SymbolicExpressionTreeOperator()
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeProblem.cs

    r16453 r16462  
    2828using HeuristicLab.Data;
    2929using HeuristicLab.Optimization;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    33   [StorableClass]
     33  [StorableType("A1B9F4C8-5E29-493C-A483-2AC68453BC63")]
    3434  public abstract class SymbolicExpressionTreeProblem : SingleObjectiveBasicProblem<SymbolicExpressionTreeEncoding> {
    3535
    3636    // persistence
    3737    [StorableConstructor]
    38     protected SymbolicExpressionTreeProblem(bool deserializing) : base(deserializing) { }
     38    protected SymbolicExpressionTreeProblem(StorableConstructorFlag _) : base(_) { }
    3939    [StorableHook(HookType.AfterDeserialization)]
    4040    private void AfterDeserialization() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeTerminalNode.cs

    r16453 r16462  
    2424using System.Linq;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    29   [StorableClass]
     29  [StorableType("B930B7DB-7264-432D-BA59-F21432DEC88B")]
    3030  public abstract class SymbolicExpressionTreeTerminalNode : SymbolicExpressionTreeNode {
    3131    public override IEnumerable<ISymbolicExpressionTreeNode> Subtrees {
     
    3434
    3535    [StorableConstructor]
    36     protected SymbolicExpressionTreeTerminalNode(bool deserializing) : base(deserializing) { }
     36    protected SymbolicExpressionTreeTerminalNode(StorableConstructorFlag _) : base(_) { }
    3737    protected SymbolicExpressionTreeTerminalNode(SymbolicExpressionTreeTerminalNode original, Cloner cloner) : base(original, cloner) { }
    3838    protected SymbolicExpressionTreeTerminalNode() : base() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeTopLevelNode.cs

    r16453 r16462  
    2121
    2222using HeuristicLab.Common;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    26   [StorableClass]
     26  [StorableType("3888AE52-0D58-4FC4-BDAF-6112BF6AFD8A")]
    2727  public class SymbolicExpressionTreeTopLevelNode : SymbolicExpressionTreeNode {
    2828    [Storable]
     
    3636
    3737    [StorableConstructor]
    38     protected SymbolicExpressionTreeTopLevelNode(bool deserializing) : base(deserializing) { }
     38    protected SymbolicExpressionTreeTopLevelNode(StorableConstructorFlag _) : base(_) { }
    3939    protected SymbolicExpressionTreeTopLevelNode(SymbolicExpressionTreeTopLevelNode original, Cloner cloner)
    4040      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Argument.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    2626  /// <summary>
    2727  /// Symbol for function arguments
    2828  /// </summary>
    29   [StorableClass]
     29  [StorableType("B0D02BED-6A67-469E-9A7C-8651C3805329")]
    3030  [Item(Argument.ArgumentName, Argument.ArgumentDescription)]
    3131  public sealed class Argument : Symbol, IReadOnlySymbol {
     
    4949
    5050    [StorableConstructor]
    51     private Argument(bool deserializing) : base(deserializing) { }
     51    private Argument(StorableConstructorFlag _) : base(_) { }
    5252    private Argument(Argument original, Cloner cloner)
    5353      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/ArgumentTreeNode.cs

    r16453 r16462  
    2222using System;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    26   [StorableClass]
     26  [StorableType("70BA57A9-F8AB-428B-BBB9-113FA5137774")]
    2727  public sealed class ArgumentTreeNode : SymbolicExpressionTreeTerminalNode {
    2828    internal new Argument Symbol {
     
    3636
    3737    [StorableConstructor]
    38     private ArgumentTreeNode(bool deserializing) : base(deserializing) { }
     38    private ArgumentTreeNode(StorableConstructorFlag _) : base(_) { }
    3939    private ArgumentTreeNode(ArgumentTreeNode original, Cloner cloner) : base(original, cloner) { }
    4040    public ArgumentTreeNode(Argument argSymbol) : base(argSymbol) { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Defun.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    2626  /// <summary>
    2727  /// Symbol for function defining branches
    2828  /// </summary>
    29   [StorableClass]
     29  [StorableType("1854AECB-02AB-444F-959C-094548ED7932")]
    3030  [Item(Defun.DefunName, Defun.DefunDescription)]
    3131  public sealed class Defun : Symbol, IReadOnlySymbol {
     
    4343
    4444    [StorableConstructor]
    45     private Defun(bool deserializing) : base(deserializing) { }
     45    private Defun(StorableConstructorFlag _) : base(_) { }
    4646    private Defun(Defun original, Cloner cloner) : base(original, cloner) { }
    4747    public Defun() : base(Defun.DefunName, Defun.DefunDescription) { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/DefunTreeNode.cs

    r16453 r16462  
    2121
    2222using HeuristicLab.Common;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Fossil;
    2424namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    25   [StorableClass]
     25  [StorableType("0DEAAC29-2BC7-4018-8CAA-ACF77F8C89C8")]
    2626  public sealed class DefunTreeNode : SymbolicExpressionTreeTopLevelNode {
    2727    private int numberOfArguments;
     
    3939
    4040    [StorableConstructor]
    41     private DefunTreeNode(bool deserializing) : base(deserializing) { }
     41    private DefunTreeNode(StorableConstructorFlag _) : base(_) { }
    4242    private DefunTreeNode(DefunTreeNode original, Cloner cloner)
    4343      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/GroupSymbol.cs

    r16453 r16462  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    29   [StorableClass]
     29  [StorableType("B9D90B52-04E2-4B18-A293-160061DAD57F")]
    3030  public sealed class GroupSymbol : Symbol {
    3131    private const int minimumArity = 0;
     
    5050
    5151    [StorableConstructor]
    52     private GroupSymbol(bool deserializing) : base(deserializing) { }
     52    private GroupSymbol(StorableConstructorFlag _) : base(_) { }
    5353    private GroupSymbol(GroupSymbol original, Cloner cloner)
    5454      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/InvokeFunction.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    2626  /// <summary>
    2727  /// Symbol for invoking automatically defined functions
    2828  /// </summary>
    29   [StorableClass]
     29  [StorableType("F98DAAD3-1FCB-490B-9D28-160ED9718441")]
    3030  [Item(InvokeFunction.InvokeFunctionName, InvokeFunction.InvokeFunctionDescription)]
    3131  public sealed class InvokeFunction : Symbol, IReadOnlySymbol {
     
    4949
    5050    [StorableConstructor]
    51     private InvokeFunction(bool deserializing) : base(deserializing) { }
     51    private InvokeFunction(StorableConstructorFlag _) : base(_) { }
    5252    private InvokeFunction(InvokeFunction original, Cloner cloner)
    5353      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/InvokeFunctionTreeNode.cs

    r16453 r16462  
    2222using System;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    26   [StorableClass]
     26  [StorableType("E745D56A-5320-4A2A-98EF-2A2903B6ED7A")]
    2727  public sealed class InvokeFunctionTreeNode : SymbolicExpressionTreeNode {
    2828    public new InvokeFunction Symbol {
     
    3636
    3737    [StorableConstructor]
    38     private InvokeFunctionTreeNode(bool deserializing) : base(deserializing) { }
     38    private InvokeFunctionTreeNode(StorableConstructorFlag _) : base(_) { }
    3939    private InvokeFunctionTreeNode(InvokeFunctionTreeNode original, Cloner cloner) : base(original, cloner) { }
    4040    public InvokeFunctionTreeNode(InvokeFunction invokeSymbol) : base(invokeSymbol) { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/ProgramRootSymbol.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    26   [StorableClass]
     26  [StorableType("04226CD8-A4BE-4D85-BB75-442A271C0E4E")]
    2727  [Item(ProgramRootSymbol.ProgramRootSymbolName, ProgramRootSymbol.ProgramRootSymbolDescription)]
    2828  public sealed class ProgramRootSymbol : Symbol, IReadOnlySymbol {
     
    4040
    4141    [StorableConstructor]
    42     private ProgramRootSymbol(bool deserializing) : base(deserializing) { }
     42    private ProgramRootSymbol(StorableConstructorFlag _) : base(_) { }
    4343    private ProgramRootSymbol(ProgramRootSymbol original, Cloner cloner) : base(original, cloner) { }
    4444    public ProgramRootSymbol() : base(ProgramRootSymbol.ProgramRootSymbolName, ProgramRootSymbol.ProgramRootSymbolDescription) { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/SimpleSymbol.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525using HeuristicLab.PluginInfrastructure;
    2626
    2727namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    28   [StorableClass]
     28  [StorableType("71CF8C14-65CB-4393-9D46-2673A69C0729")]
    2929  [Item("SimpleSymbol", "Represents a symbol that is identified by its name.")]
    3030  [NonDiscoverableType]
     
    5050
    5151    [StorableConstructor]
    52     private SimpleSymbol(bool deserializing) : base(deserializing) { }
     52    private SimpleSymbol(StorableConstructorFlag _) : base(_) { }
    5353
    5454    private SimpleSymbol(SimpleSymbol original, Cloner cloner)
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/StartSymbol.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    26   [StorableClass]
     26  [StorableType("37172E73-BBC8-448F-B694-60705C5B4E53")]
    2727  [Item(StartSymbol.StartSymbolName, StartSymbol.StartSymbolDescription)]
    2828  public sealed class StartSymbol : Symbol, IReadOnlySymbol {
     
    4040
    4141    [StorableConstructor]
    42     private StartSymbol(bool deserializing)
    43       : base(deserializing) {
     42    private StartSymbol(StorableConstructorFlag _) : base(_) {
    4443    }
    4544    private StartSymbol(StartSymbol original, Cloner cloner) : base(original, cloner) { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Symbol.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    29   [StorableClass]
     29  [StorableType("8ECC852D-3FE4-4AD8-9F70-582C7F874AE6")]
    3030  [Item("Symbol", "Represents a symbol in a symbolic function tree.")]
    3131  public abstract class Symbol : NamedItem, ISymbol {
     
    8080
    8181    [StorableConstructor]
    82     protected Symbol(bool deserializing) : base(deserializing) { }
     82    protected Symbol(StorableConstructorFlag _) : base(_) { }
    8383    protected Symbol(Symbol original, Cloner cloner)
    8484      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.