Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (6 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Argument.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    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) {

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/ArgumentTreeNode.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using System;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    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) { }

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Defun.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    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) { }

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/DefunTreeNode.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2121
    2222using HeuristicLab.Common;
    23 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     23using HEAL.Attic;
    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) {

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/GroupSymbol.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    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) {

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/InvokeFunction.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    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) {

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/InvokeFunctionTreeNode.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using System;
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    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) { }

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/ProgramRootSymbol.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    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) { }

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/SimpleSymbol.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525using HeuristicLab.PluginInfrastructure;
    2626
    2727namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    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)

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/StartSymbol.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    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) { }

  • trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Symbols/Symbol.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    29   [StorableClass]
     29  [StorableType("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.