Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/04/17 17:19:35 (8 years ago)
Author:
gkronber
Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:
branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4
Files:
53 edited

Legend:

Unmodified
Added
Removed

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/BestSymbolicExpressionTreeAnalyzer.cs

    r14185 r14927  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929using HeuristicLab.PluginInfrastructure;
    3030
    … …  
    3434  /// </summary>
    3535  [Item("BestSymbolicExpressionTreeAnalyzer", "An operator that tracks the best symbolic expression trees")]
    36   [StorableClass]
     36  [StorableType("3a0f5ec5-dda1-431a-950b-594fa3e96cee")]
    3737  [NonDiscoverableType]
    3838  public sealed class BestSymbolicExpressionTreeAnalyzer : SingleSuccessorOperator, ISymbolicExpressionTreeAnalyzer {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/MinAverageMaxSymbolicExpressionTreeLengthAnalyzer.cs

    r14185 r14927  
    2727using HeuristicLab.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    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("f6af0129-9c11-455b-9403-9c9b9a34012e")]
    3737  public sealed class MinAverageMaxSymbolicExpressionTreeLengthAnalyzer : AlgorithmOperator, ISymbolicExpressionTreeAnalyzer {
    3838    private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree";

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionSymbolFrequencyAnalyzer.cs

    r14185 r14927  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HeuristicLab.Persistence;
    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("0dd119a5-1947-4b31-8950-0ac4b6c89da6")]
    4040  public class SymbolicExpressionSymbolFrequencyAnalyzer : SingleSuccessorOperator, ISymbolicExpressionTreeAnalyzer {
    4141    private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree";

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionTreeLengthAnalyzer.cs

    r14185 r14927  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HeuristicLab.Persistence;
    3232
    3333namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    … …  
    3636  /// </summary>
    3737  [Item("SymbolicExpressionTreeLengthAnalyzer", "An operator that tracks tree lengths of Symbolic Expression Trees")]
    38   [StorableClass]
     38  [StorableType("9445f356-5126-4ec0-ae7d-a53862375a70")]
    3939  public sealed class SymbolicExpressionTreeLengthAnalyzer : SingleSuccessorOperator, ISymbolicExpressionTreeAnalyzer {
    4040    private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree";

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionTreeLengthCalculator.cs

    r14185 r14927  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    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("0d5c961c-7418-40db-9d0d-9cba75608057")]
    3535  public sealed class SymbolicExpressionTreeLengthCalculator : SingleSuccessorOperator {
    3636    private const string SymbolicExpressionTreeParameterName = "SymbolicExpressionTree";

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentCreater.cs

    r14185 r14927  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    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("6451c76c-3d90-4d9f-a21f-b6e6a3520355")]
    3939  public sealed class ArgumentCreater : SymbolicExpressionTreeArchitectureManipulator, ISymbolicExpressionTreeSizeConstraintOperator {
    4040    private const string MaximumSymbolicExpressionTreeLengthParameterName = "MaximumSymbolicExpressionTreeLength";
    … …  
    115115          return false;
    116116        }
    117       }
    118       catch (OverflowException) {
     117      } catch (OverflowException) {
    119118        // keep original tree
    120119        return false;

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentDeleter.cs

    r14185 r14927  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    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("6700e546-aa76-4eb1-835a-8924de1aa04c")]
    3535  public sealed class ArgumentDeleter : SymbolicExpressionTreeArchitectureManipulator {
    3636    [StorableConstructor]

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentDuplicater.cs

    r14185 r14927  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Data;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    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("c8fc6869-b21d-4b36-8494-e4e2e0356745")]
    3838  public sealed class ArgumentDuplicater : SymbolicExpressionTreeArchitectureManipulator {
    3939    [StorableConstructor]

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/MultiSymbolicExpressionTreeArchitectureManipulator.cs

    r14185 r14927  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HeuristicLab.Persistence;
    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("d43679a5-cbbe-4b71-98c3-d6e7b60b07f7")]
    3838  public sealed class MultiSymbolicExpressionTreeArchitectureManipulator : StochasticMultiBranch<ISymbolicExpressionTreeManipulator>,
    3939    ISymbolicExpressionTreeArchitectureManipulator,

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineCreater.cs

    r14185 r14927  
    2828using HeuristicLab.Data;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Persistence;
    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("4888823f-71da-46c5-9d24-9f0e319588b0")]
    4141  public sealed class SubroutineCreater : SymbolicExpressionTreeArchitectureManipulator, ISymbolicExpressionTreeSizeConstraintOperator {
    4242    private const double ARGUMENT_CUTOFF_PROBABILITY = 0.05;

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineDeleter.cs

    r14185 r14927  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    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("fbb88a4e-f46b-4739-b613-2f9540c7fcbe")]
    3737  public sealed class SubroutineDeleter : SymbolicExpressionTreeArchitectureManipulator {
    3838    [StorableConstructor]

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineDuplicater.cs

    r14185 r14927  
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Data;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    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("a8fb8888-7cac-4226-b842-1dfed7186a6b")]
    3939  public sealed class SubroutineDuplicater : SymbolicExpressionTreeArchitectureManipulator {
    4040    [StorableConstructor]

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SymbolicExpressionTreeArchitectureManipulator.cs

    r14185 r14927  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    … …  
    3030  /// Base class for architecture altering operators for symbolic expression trees.
    3131  /// </summary>
    32   [StorableClass]
     32  [StorableType("0861a771-8b8e-416c-ab95-8b9fd4aa0cb2")]
    3333  public abstract class SymbolicExpressionTreeArchitectureManipulator : SymbolicExpressionTreeManipulator, ISymbolicExpressionTreeArchitectureManipulator {
    3434    private const string MaximumFunctionArgumentsParameterName = "MaximumFunctionArguments";

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/FullTreeCreator.cs

    r14185 r14927  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727using HeuristicLab.PluginInfrastructure;
    2828
    2929namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    3030  [NonDiscoverableType]
    31   [StorableClass]
     31  [StorableType("4e596133-a481-4f90-b673-a3301ef899eb")]
    3232  [Item("FullTreeCreator", "An operator that creates new symbolic expression trees using the 'Full' method")]
    3333  public class FullTreeCreator : SymbolicExpressionTreeCreator,
    … …  
    7777      rootNode.AddSubtree(startNode);
    7878
    79       Create(random, startNode, maxTreeDepth-1);
     79      Create(random, startNode, maxTreeDepth - 1);
    8080      tree.Root = rootNode;
    8181      return tree;

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/GrowTreeCreator.cs

    r14185 r14927  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727using HeuristicLab.PluginInfrastructure;
    2828
    2929namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    3030  [NonDiscoverableType]
    31   [StorableClass]
     31  [StorableType("d8e1691b-3b2d-4835-9244-3f5bab365ef4")]
    3232  [Item("GrowTreeCreator", "An operator that creates new symbolic expression trees using the 'Grow' method")]
    3333  public class GrowTreeCreator : SymbolicExpressionTreeCreator {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs

    r14185 r14927  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.PluginInfrastructure;
    2929
    3030namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    3131  [NonDiscoverableType]
    32   [StorableClass]
     32  [StorableType("d7107203-3692-4098-a46b-40a45b532e61")]
    3333  [Item("ProbabilisticTreeCreator", "An operator that creates new symbolic expression trees with uniformly distributed length")]
    3434  public class ProbabilisticTreeCreator : SymbolicExpressionTreeCreator,

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/RampedHalfAndHalfTreeCreator.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525using HeuristicLab.PluginInfrastructure;
    2626
    2727namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    2828  [NonDiscoverableType]
    29   [StorableClass]
     29  [StorableType("ac712418-5796-4d29-be6c-8df2371e3108")]
    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 {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/SymbolicExpressionTreeCreator.cs

    r14185 r14927  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    … …  
    3131  /// </summary>
    3232  [Item("SymbolicExpressionTreeCreator", "A base class for operators creating symbolic expression trees.")]
    33   [StorableClass]
     33  [StorableType("de2325eb-560e-419b-8556-c1b5d98012cd")]
    3434  public abstract class SymbolicExpressionTreeCreator : SymbolicExpressionTreeOperator, ISymbolicExpressionTreeCreator {
    3535    private const string MaximumSymbolicExpressionTreeLengthParameterName = "MaximumSymbolicExpressionTreeLength";

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs

    r14221 r14927  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    3030using HeuristicLab.Random;
    3131
    … …  
    3838  /// </summary> 
    3939  [Item("SubtreeSwappingCrossover", "An operator which performs subtree swapping crossover.")]
    40   [StorableClass]
     40  [StorableType("81301e24-b35d-45d2-a5f3-b93518c90252")]
    4141  public class SubtreeCrossover : SymbolicExpressionTreeCrossover, ISymbolicExpressionTreeSizeConstraintOperator {
    4242    private const string InternalCrossoverPointProbabilityParameterName = "InternalCrossoverPointProbability";

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SymbolicExpressionTreeCrossover.cs

    r14185 r14927  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    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("c2c00482-033d-4f1a-98cd-7dc5e50fcc3e")]
    3434  public abstract class SymbolicExpressionTreeCrossover : SymbolicExpressionTreeOperator, ISymbolicExpressionTreeCrossover {
    3535    private const string ParentsParameterName = "Parents";

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/CutPoint.cs

    r14185 r14927  
    2929    public int ChildIndex { get; private set; }
    3030
    31     public CutPoint(ISymbolicExpressionTreeNode parent, ISymbolicExpressionTreeNode child) {     
     31    public CutPoint(ISymbolicExpressionTreeNode parent, ISymbolicExpressionTreeNode child) {
    3232      this.Parent = parent;
    3333      this.Child = child;

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Formatters/SymbolicExpressionTreeGraphvizFormatter.cs

    r14185 r14927  
    3333      // match Koza style
    3434      {"ProgramRootSymbol", "Prog"},
    35       {"StartSymbol", "RPB"}, 
     35      {"StartSymbol", "RPB"},
    3636    };
    3737

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Formatters/SymbolicExpressionTreeStringFormatter.cs

    r14185 r14927  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    2929
    3030  [Item("Default String Formatter", "The default string formatter for symbolic expression trees.")]
    31   [StorableClass]
     31  [StorableType("d3b210e0-4046-4da4-9d76-7817904a4923")]
    3232  public class SymbolicExpressionTreeStringFormatter : NamedItem, ISymbolicExpressionTreeStringFormatter {
    3333

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/EmptySymbolicExpressionTreeGrammar.cs

    r14185 r14927  
    2727using HeuristicLab.Common;
    2828using HeuristicLab.Core;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    3030
    3131namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    3232
    33   [StorableClass]
     33  [StorableType("fcf8c7ac-5b43-4b67-bab9-9e6f1c33ba88")]
    3434  internal sealed class EmptySymbolicExpressionTreeGrammar : NamedItem, ISymbolicExpressionTreeGrammar {
    3535    [Storable]

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SimpleSymbolicExpressionGrammar.cs

    r14185 r14927  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525
    2626namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    27   [StorableClass]
     27  [StorableType("25e617e3-de37-4f0f-bfe6-8299c79f38bd")]
    2828  public sealed class SimpleSymbolicExpressionGrammar : SymbolicExpressionGrammar {
    2929    [StorableConstructor]

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionGrammar.cs

    r14185 r14927  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    31   [StorableClass]
     31  [StorableType("f5c4fa60-ebc9-414d-8399-6c23707acad0")]
    3232  public abstract class SymbolicExpressionGrammar : SymbolicExpressionGrammarBase, ISymbolicExpressionGrammar {
    3333    #region fields & properties

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionGrammarBase.cs

    r14342 r14927  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    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("cb03e97f-b714-4296-972e-55373b7bd77c")]
    3737  public abstract class SymbolicExpressionGrammarBase : NamedItem, ISymbolicExpressionGrammarBase {
    3838

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionTreeGrammar.cs

    r14185 r14927  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    28   [StorableClass]
     28  [StorableType("721af7fe-af17-4800-b73e-2fe293a65aa0")]
    2929  internal sealed class SymbolicExpressionTreeGrammar : SymbolicExpressionGrammarBase, ISymbolicExpressionTreeGrammar {
    3030    [StorableConstructor]

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/ChangeNodeTypeManipulation.cs

    r14185 r14927  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    29   [StorableClass]
     29  [StorableType("78472a48-5ad6-417e-97ba-20e8182fa37d")]
    3030  [Item("ChangeNodeTypeManipulation", "Selects a random tree node and changes the symbol.")]
    3131  public sealed class ChangeNodeTypeManipulation : SymbolicExpressionTreeManipulator {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/FullTreeShaker.cs

    r14185 r14927  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626using HeuristicLab.Parameters;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    29   [StorableClass]
     29  [StorableType("cd00b865-9802-4b87-be96-081732bbc0c7")]
    3030  [Item("FullTreeShaker", "Manipulates all nodes that have local parameters.")]
    3131  public sealed class FullTreeShaker : SymbolicExpressionTreeManipulator {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/MultiSymbolicExpressionTreeManipulator.cs

    r14185 r14927  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HeuristicLab.Persistence;
    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("9255420a-97eb-4fdf-b7c6-226780d9cfa6")]
    3838  public sealed class MultiSymbolicExpressionTreeManipulator : StochasticMultiBranch<ISymbolicExpressionTreeManipulator>,
    3939    ISymbolicExpressionTreeManipulator,

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/OnePointShaker.cs

    r14185 r14927  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.Random;
    2929
    3030namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    31   [StorableClass]
     31  [StorableType("0a42e06e-a0d5-4274-8a9a-237606e18447")]
    3232  [Item("OnePointShaker", "Selects a random node with local parameters and manipulates the selected node.")]
    3333  public sealed class OnePointShaker : SymbolicExpressionTreeManipulator {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/RemoveBranchManipulation.cs

    r14185 r14927  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929using HeuristicLab.Random;
    3030
    3131namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    32   [StorableClass]
     32  [StorableType("75f530ea-e28e-4fff-8879-f83c5959cbeb")]
    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 {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/ReplaceBranchManipulation.cs

    r14185 r14927  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    31   [StorableClass]
     31  [StorableType("d17a1bb3-d6d1-4e7c-b812-cc4fc5fef0f0")]
    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 {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Manipulators/SymbolicExpressionTreeManipulator.cs

    r14185 r14927  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    … …  
    3030  /// </summary>
    3131  [Item("SymbolicExpressionTreeManipulator", "A base class for operators that manipulate symbolic expression trees.")]
    32   [StorableClass]
     32  [StorableType("6c2da117-1712-4113-9e27-d06a5b374169")]
    3333  public abstract class SymbolicExpressionTreeManipulator : SymbolicExpressionTreeOperator, ISymbolicExpressionTreeManipulator {
    3434    [StorableConstructor]
    … …  
    3737    public SymbolicExpressionTreeManipulator()
    3838      : base() {
    39      
     39
    4040    }
    4141

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTree.cs

    r14185 r14927  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    31   [StorableClass]
     31  [StorableType("220ff775-08af-4727-9a44-9678149afbe5")]
    3232  [Item("SymbolicExpressionTree", "Represents a symbolic expression tree.")]
    3333  public class SymbolicExpressionTree : Item, ISymbolicExpressionTree {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeEncoding.cs

    r14344 r14927  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HeuristicLab.Persistence;
    3333using HeuristicLab.PluginInfrastructure;
    3434
    3535namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    3636  [Item("SymbolicExpressionTreeEncoding", "Describes a symbolic expression tree encoding.")]
    37   [StorableClass]
     37  [StorableType("1d3eaef9-0d35-41f7-b189-fbe038540159")]
    3838  public sealed class SymbolicExpressionTreeEncoding : Encoding<ISymbolicExpressionTreeCreator> {
    3939    #region Encoding Parameters

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs

    r14224 r14927  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    29   [StorableClass]
     29  [StorableType("f7d19c4b-2f80-46e3-bee0-cfe8e0bf03d2")]
    3030  public class SymbolicExpressionTreeNode : DeepCloneable, ISymbolicExpressionTreeNode {
    3131    [Storable]

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeOperator.cs

    r14185 r14927  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    … …  
    3232  /// </summary>
    3333  [Item("SymbolicExpressionTreeOperator", "A base class for operators for symbolic expression trees.")]
    34   [StorableClass]
     34  [StorableType("28c7c7fd-0429-4141-b59c-2fea83030831")]
    3535  public abstract class SymbolicExpressionTreeOperator : InstrumentedOperator, IStochasticOperator, ISymbolicExpressionTreeOperator {
    3636    private const string RandomParameterName = "Random";

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeProblem.cs

    r14185 r14927  
    2828using HeuristicLab.Data;
    2929using HeuristicLab.Optimization;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Persistence;
    3131
    3232namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    33   [StorableClass]
     33  [StorableType("229745ce-05d8-4136-8d22-89f72f66b5f9")]
    3434  public abstract class SymbolicExpressionTreeProblem : SingleObjectiveBasicProblem<SymbolicExpressionTreeEncoding> {
    3535

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeTerminalNode.cs

    r14185 r14927  
    2424using System.Linq;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    29   [StorableClass]
     29  [StorableType("399b684d-7f1c-4ded-b496-1b6c536c4b73")]
    3030  public abstract class SymbolicExpressionTreeTerminalNode : SymbolicExpressionTreeNode {
    3131    public override IEnumerable<ISymbolicExpressionTreeNode> Subtrees {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeTopLevelNode.cs

    r14185 r14927  
    2121
    2222using HeuristicLab.Common;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HeuristicLab.Persistence;
    2424
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    26   [StorableClass]
     26  [StorableType("8adc1a73-b285-436e-9ecc-6a2deb6d613c")]
    2727  public class SymbolicExpressionTreeTopLevelNode : SymbolicExpressionTreeNode {
    2828    [Storable]

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Argument.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    2626  /// <summary>
    2727  /// Symbol for function arguments
    2828  /// </summary>
    29   [StorableClass]
     29  [StorableType("8992a1a5-f84a-46b3-983a-1d182dc74ad4")]
    3030  [Item(Argument.ArgumentName, Argument.ArgumentDescription)]
    3131  public sealed class Argument : Symbol, IReadOnlySymbol {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/ArgumentTreeNode.cs

    r14185 r14927  
    2222using System;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    26   [StorableClass]
     26  [StorableType("83bd3855-672d-44f7-9402-ed7abf5c19d4")]
    2727  public sealed class ArgumentTreeNode : SymbolicExpressionTreeTerminalNode {
    2828    internal new Argument Symbol {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Defun.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    2626  /// <summary>
    2727  /// Symbol for function defining branches
    2828  /// </summary>
    29   [StorableClass]
     29  [StorableType("07b0cfb4-b6e8-44d3-9b80-13d707d8b0e1")]
    3030  [Item(Defun.DefunName, Defun.DefunDescription)]
    3131  public sealed class Defun : Symbol, IReadOnlySymbol {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/DefunTreeNode.cs

    r14185 r14927  
    2121
    2222using HeuristicLab.Common;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HeuristicLab.Persistence;
    2424namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    25   [StorableClass]
     25  [StorableType("233d184e-4fb2-411b-9aad-4df1263efb7a")]
    2626  public sealed class DefunTreeNode : SymbolicExpressionTreeTopLevelNode {
    2727    private int numberOfArguments;

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/GroupSymbol.cs

    r14185 r14927  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    29   [StorableClass]
     29  [StorableType("77a03e5e-5ee0-4051-a19f-5efb6bfb3f39")]
    3030  public sealed class GroupSymbol : Symbol {
    3131    private const int minimumArity = 0;

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/InvokeFunction.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    2626  /// <summary>
    2727  /// Symbol for invoking automatically defined functions
    2828  /// </summary>
    29   [StorableClass]
     29  [StorableType("a7ab98f6-4374-475f-a78a-9d88ffb2ad4e")]
    3030  [Item(InvokeFunction.InvokeFunctionName, InvokeFunction.InvokeFunctionDescription)]
    3131  public sealed class InvokeFunction : Symbol, IReadOnlySymbol {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/InvokeFunctionTreeNode.cs

    r14185 r14927  
    2222using System;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    26   [StorableClass]
     26  [StorableType("7820cb2f-2d77-45dd-8e29-a440c2c706b3")]
    2727  public sealed class InvokeFunctionTreeNode : SymbolicExpressionTreeNode {
    2828    public new InvokeFunction Symbol {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/ProgramRootSymbol.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    26   [StorableClass]
     26  [StorableType("17c1bd3d-824a-4ec9-9228-9e1ed1578be7")]
    2727  [Item(ProgramRootSymbol.ProgramRootSymbolName, ProgramRootSymbol.ProgramRootSymbolDescription)]
    2828  public sealed class ProgramRootSymbol : Symbol, IReadOnlySymbol {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/SimpleSymbol.cs

    r14340 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525using HeuristicLab.PluginInfrastructure;
    2626
    2727namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    28   [StorableClass]
     28  [StorableType("74ee0b79-2b88-479a-8470-7295fb2d61b3")]
    2929  [Item("SimpleSymbol", "Represents a symbol that is identified by its name.")]
    3030  [NonDiscoverableType]

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/StartSymbol.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    26   [StorableClass]
     26  [StorableType("9962ed8c-17ff-4768-bcae-ef57e8f4d1a6")]
    2727  [Item(StartSymbol.StartSymbolName, StartSymbol.StartSymbolDescription)]
    2828  public sealed class StartSymbol : Symbol, IReadOnlySymbol {

  • branches/PersistenceReintegration/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Symbol.cs

    r14185 r14927  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    29   [StorableClass]
     29  [StorableType("2ef69995-c701-4dbc-abc9-c5401186811f")]
    3030  [Item("Symbol", "Represents a symbol in a symbolic function tree.")]
    3131  public abstract class Symbol : NamedItem, ISymbol {
Note: See TracChangeset for help on using the changeset viewer.