Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/10/20 13:10:26 (5 years ago)
Author:
chaider
Message:

#2968 merged trunk into branch

Location:
branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic
Files:
58 edited
5 copied

Legend:

Unmodified
Added
Removed
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic

  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Addition.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("483AAB50-D2E9-472E-A2FA-625F621B7CA9")]
    2828  [Item("Addition", "Symbol that represents the + operator.")]
    2929  public sealed class Addition : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Addition(bool deserializing) : base(deserializing) { }
     41    private Addition(StorableConstructorFlag _) : base(_) { }
    4242    private Addition(Addition original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/AiryA.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("713B9373-38D1-47CD-BD03-82A77A4A2728")]
    2828  [Item("AiryA", "Symbol that represents the Airy A function.")]
    2929  public sealed class AiryA : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private AiryA(bool deserializing) : base(deserializing) { }
     41    private AiryA(StorableConstructorFlag _) : base(_) { }
    4242    private AiryA(AiryA original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/AiryB.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("FF61B6CC-700F-44D3-9D1A-F3BF2F084FE4")]
    2828  [Item("AiryB", "Symbol that represents the Airy B function.")]
    2929  public sealed class AiryB : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private AiryB(bool deserializing) : base(deserializing) { }
     41    private AiryB(StorableConstructorFlag _) : base(_) { }
    4242    private AiryB(AiryB original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/And.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("814BC6C4-C631-4819-90CE-2B403E71170C")]
    2828  [Item("And", "Symbol that represents the boolean AND operator.")]
    2929  public sealed class And : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private And(bool deserializing) : base(deserializing) { }
     41    private And(StorableConstructorFlag _) : base(_) { }
    4242    private And(And original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/AutoregressiveVariable.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 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.Problems.DataAnalysis.Symbolic {
    26   [StorableClass]
     26  [StorableType("AA17605D-3F9A-4C52-89F5-34AF2AF4999C")]
    2727  [Item("AutoregressiveTargetVariable", "Represents a variable value with a time offset.")]
    2828  public sealed class AutoregressiveTargetVariable : LaggedVariable {
    2929    [StorableConstructor]
    30     private AutoregressiveTargetVariable(bool deserializing) : base(deserializing) { }
     30    private AutoregressiveTargetVariable(StorableConstructorFlag _) : base(_) { }
    3131    private AutoregressiveTargetVariable(AutoregressiveTargetVariable original, Cloner cloner)
    3232      : base(original, cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Average.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("459E521B-A921-4A0F-B63D-B298DA2CDD11")]
    2828  [Item("Average", "Symbol that represents the average (arithmetic mean) function.")]
    2929  public sealed class Average : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Average(bool deserializing) : base(deserializing) { }
     41    private Average(StorableConstructorFlag _) : base(_) { }
    4242    private Average(Average original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Bessel.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("D36513D2-D36E-412E-BC56-AA744BF1F124")]
    2828  [Item("Bessel", "Symbol that represents the Bessel function.")]
    2929  public sealed class Bessel : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Bessel(bool deserializing) : base(deserializing) { }
     41    private Bessel(StorableConstructorFlag _) : base(_) { }
    4242    private Bessel(Bessel original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/BinaryFactorVariable.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    30   [StorableClass]
     30  [StorableType("241007AC-B461-4028-BA3A-79F393FF3ACB")]
    3131  [Item("BinaryFactorVariable", "Represents a categorical variable (comparable to factors as in R) and it's value.")]
    3232  public sealed class BinaryFactorVariable : VariableBase {
     
    4747
    4848    [StorableConstructor]
    49     private BinaryFactorVariable(bool deserializing)
    50       : base(deserializing) {
     49    private BinaryFactorVariable(StorableConstructorFlag _) : base(_) {
    5150      variableValues = new Dictionary<string, List<string>>();
    5251    }
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/BinaryFactorVariableTreeNode.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 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.Random;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("FC7010CD-639B-42E1-B1D0-7DE5CEFBC8B1")]
    2828  public sealed class BinaryFactorVariableTreeNode : VariableTreeNodeBase {
    2929    public new BinaryFactorVariable Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private BinaryFactorVariableTreeNode(bool deserializing) : base(deserializing) { }
     41    private BinaryFactorVariableTreeNode(StorableConstructorFlag _) : base(_) { }
    4242    private BinaryFactorVariableTreeNode(BinaryFactorVariableTreeNode original, Cloner cloner)
    4343      : base(original, cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Constant.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    28   [StorableClass]
     28  [StorableType("5CD355EA-36E4-4E43-B8C4-9E9CF4CBC860")]
    2929  [Item("Constant", "Represents a constant value.")]
    3030  public sealed class Constant : Symbol {
     
    100100
    101101    [StorableConstructor]
    102     private Constant(bool deserializing) : base(deserializing) { }
     102    private Constant(StorableConstructorFlag _) : base(_) { }
    103103    private Constant(Constant original, Cloner cloner)
    104104      : base(original, cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/ConstantTreeNode.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Random;
    2727namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    28   [StorableClass]
     28  [StorableType("247DBD04-18F2-4184-B6F5-6E283BF06FD0")]
    2929  public sealed class ConstantTreeNode : SymbolicExpressionTreeTerminalNode {
    3030    public new Constant Symbol {
     
    4040
    4141    [StorableConstructor]
    42     private ConstantTreeNode(bool deserializing) : base(deserializing) { }
     42    private ConstantTreeNode(StorableConstructorFlag _) : base(_) { }
    4343
    4444    private ConstantTreeNode(ConstantTreeNode original, Cloner cloner)
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Cosine.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("06203C9F-F299-44E6-97B9-D0221ED340BA")]
    2828  [Item("Cosine", "Symbol that represents the cosine function.")]
    2929  public sealed class Cosine : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Cosine(bool deserializing) : base(deserializing) { }
     41    private Cosine(StorableConstructorFlag _) : base(_) { }
    4242    private Cosine(Cosine original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/CosineIntegral.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("E81D60C0-B816-458C-A200-FB7A6DD16B92")]
    2828  [Item("CosineIntegral", "Symbol that represents the cosine integral.")]
    2929  public sealed class CosineIntegral : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private CosineIntegral(bool deserializing) : base(deserializing) { }
     41    private CosineIntegral(StorableConstructorFlag _) : base(_) { }
    4242    private CosineIntegral(CosineIntegral original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Dawson.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("41CB51E4-CDD0-4082-8E4F-9F4D66376C92")]
    2828  [Item("Dawson", "Symbol that represents dawsons integral.")]
    2929  public sealed class Dawson : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Dawson(bool deserializing) : base(deserializing) { }
     41    private Dawson(StorableConstructorFlag _) : base(_) { }
    4242    private Dawson(Dawson original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Derivative.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("6207C7B5-A461-4CB2-8860-58E236BBDC41")]
    2828  [Item("Derivative", "Represents the derivative over the specified subtree.")]
    2929  public sealed class Derivative : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Derivative(bool deserializing) : base(deserializing) { }
     41    private Derivative(StorableConstructorFlag _) : base(_) { }
    4242    private Derivative(Derivative original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) { return new Derivative(this, cloner); }
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Division.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("EE4A9CF4-483A-4671-AEA2-03E3DAF2F976")]
    2828  [Item("Division", "Symbol that represents the / operator.")]
    2929  public sealed class Division : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Division(bool deserializing) : base(deserializing) { }
     41    private Division(StorableConstructorFlag _) : base(_) { }
    4242    private Division(Division original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Erf.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("2C298890-15BC-42A9-AC63-4E48B1ED4FF3")]
    2828  [Item("Erf", "Symbol that represents the error function.")]
    2929  public sealed class Erf : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Erf(bool deserializing) : base(deserializing) { }
     41    private Erf(StorableConstructorFlag _) : base(_) { }
    4242    private Erf(Erf original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Exponential.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("98360DAA-C01A-42B3-8AB1-B18E6C0835BB")]
    2828  [Item("Exponential", "Symbol that represents the exponential function.")]
    2929  public sealed class Exponential : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Exponential(bool deserializing) : base(deserializing) { }
     41    private Exponential(StorableConstructorFlag _) : base(_) { }
    4242    private Exponential(Exponential original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/ExponentialIntegralEi.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("189FCA77-9541-4F5B-9215-7AEA995C6203")]
    2828  [Item("ExponentialIntegralEi", "Symbol that represents the exponential integral (e_i).")]
    2929  public sealed class ExponentialIntegralEi : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private ExponentialIntegralEi(bool deserializing) : base(deserializing) { }
     41    private ExponentialIntegralEi(StorableConstructorFlag _) : base(_) { }
    4242    private ExponentialIntegralEi(ExponentialIntegralEi original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FactorVariable.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    30   [StorableClass]
     30  [StorableType("511B0319-0180-4C2E-81AD-3A8936BE4DE8")]
    3131  [Item("FactorVariable", "Represents a categorical variable (comparable to factors as in R).")]
    3232  public sealed class FactorVariable : VariableBase {
     
    4545
    4646    [StorableConstructor]
    47     private FactorVariable(bool deserializing)
    48       : base(deserializing) {
     47    private FactorVariable(StorableConstructorFlag _) : base(_) {
    4948      variableValues = new Dictionary<string, Dictionary<string, int>>();
    5049    }
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FactorVariableTreeNode.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2121
    2222using System;
    23 using System.Collections.Generic;
    2423using System.Linq;
    2524using HeuristicLab.Common;
    2625using HeuristicLab.Core;
    2726using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2928using HeuristicLab.Random;
    3029namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    31   [StorableClass]
     30  [StorableType("A968620F-339E-4C96-B39A-8FC8E42D6509")]
    3231  public sealed class FactorVariableTreeNode : SymbolicExpressionTreeTerminalNode, IVariableTreeNode {
    3332    public new FactorVariable Symbol {
     
    4847
    4948    [StorableConstructor]
    50     private FactorVariableTreeNode(bool deserializing) : base(deserializing) { }
     49    private FactorVariableTreeNode(StorableConstructorFlag _) : base(_) { }
    5150    private FactorVariableTreeNode(FactorVariableTreeNode original, Cloner cloner)
    5251      : base(original, cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FresnelCosineIntegral.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("6AAB7AAC-F0DD-466F-8111-0EBA3BAB51C6")]
    2828  [Item("FresnelCosineIntegral", "Symbol that represents the Fresnel cosine integral.")]
    2929  public sealed class FresnelCosineIntegral : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private FresnelCosineIntegral(bool deserializing) : base(deserializing) { }
     41    private FresnelCosineIntegral(StorableConstructorFlag _) : base(_) { }
    4242    private FresnelCosineIntegral(FresnelCosineIntegral original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FresnelSineIntegral.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("CEB592FC-E402-4A7C-A207-E4048F87DB82")]
    2828  [Item("FresnelSineIntegral", "Symbol that represents the Fresnel sine integral.")]
    2929  public sealed class FresnelSineIntegral : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private FresnelSineIntegral(bool deserializing) : base(deserializing) { }
     41    private FresnelSineIntegral(StorableConstructorFlag _) : base(_) { }
    4242    private FresnelSineIntegral(FresnelSineIntegral original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Gamma.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("8CC57AD6-B24D-4DCE-BFA0-A799804448F7")]
    2828  [Item("Gamma", "Symbol that represents the gamma function.")]
    2929  public sealed class Gamma : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Gamma(bool deserializing) : base(deserializing) { }
     41    private Gamma(StorableConstructorFlag _) : base(_) { }
    4242    private Gamma(Gamma original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/GreaterThan.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("A64DBD26-2DD7-4799-B413-AB05CDAAE749")]
    2828  [Item("GreaterThan", "Symbol that represents a greater than relation.")]
    2929  public sealed class GreaterThan : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private GreaterThan(bool deserializing) : base(deserializing) { }
     41    private GreaterThan(StorableConstructorFlag _) : base(_) { }
    4242    private GreaterThan(GreaterThan original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/HyperbolicCosineIntegral.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("C4F429C2-B26A-4BD8-AB6A-3EBE45D3EE25")]
    2828  [Item("HyperbolicCosineIntegral", "Symbol that represents the hyperbolic cosine integral.")]
    2929  public sealed class HyperbolicCosineIntegral : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private HyperbolicCosineIntegral(bool deserializing) : base(deserializing) { }
     41    private HyperbolicCosineIntegral(StorableConstructorFlag _) : base(_) { }
    4242    private HyperbolicCosineIntegral(HyperbolicCosineIntegral original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/HyperbolicSineIntegral.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("2C77DB69-380F-48B9-95FE-458C8576B886")]
    2828  [Item("HyperbolicSineIntegral", "Symbol that represents the hyperbolic sine integral.")]
    2929  public sealed class HyperbolicSineIntegral : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private HyperbolicSineIntegral(bool deserializing) : base(deserializing) { }
     41    private HyperbolicSineIntegral(StorableConstructorFlag _) : base(_) { }
    4242    private HyperbolicSineIntegral(HyperbolicSineIntegral original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/ILaggedTreeNode.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2222
    2323using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
     24using HEAL.Attic;
     25
    2426namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
     27  [StorableType("9396d5df-6a2e-4cd1-ac5a-36ca8d391927")]
    2528  public interface ILaggedTreeNode : ISymbolicExpressionTreeNode {
    2629    int Lag { get; set; }
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/IfThenElse.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("8AD33C34-9F5C-4F58-8C4C-25EA7F0A8C97")]
    2828  [Item("IfThenElse", "Symbol that represents a conditional operator.")]
    2929  public sealed class IfThenElse : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private IfThenElse(bool deserializing) : base(deserializing) { }
     41    private IfThenElse(StorableConstructorFlag _) : base(_) { }
    4242    private IfThenElse(IfThenElse original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Integral.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 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.Problems.DataAnalysis.Symbolic {
    26   [StorableClass]
     26  [StorableType("217049E2-47B0-430A-808B-F667D5EEAE39")]
    2727  [Item("Integral", "Represents the integral over the specified subtree.")]
    2828  public sealed class Integral : LaggedSymbol {
     
    3838
    3939    [StorableConstructor]
    40     private Integral(bool deserializing) : base(deserializing) { }
     40    private Integral(StorableConstructorFlag _) : base(_) { }
    4141    private Integral(Integral original, Cloner cloner) : base(original, cloner) { }
    4242    public override IDeepCloneable Clone(Cloner cloner) { return new Integral(this, cloner); }
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/LaggedSymbol.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    28   [StorableClass]
     28  [StorableType("3290F116-CD55-4749-9983-E4E5692A5666")]
    2929  [Item("LaggedSymbol", "Represents a symblol whose evaluation is shifted.")]
    3030  public abstract class LaggedSymbol : Symbol {
     
    4343
    4444    [StorableConstructor]
    45     protected LaggedSymbol(bool deserializing) : base(deserializing) { }
     45    protected LaggedSymbol(StorableConstructorFlag _) : base(_) { }
    4646    protected LaggedSymbol(LaggedSymbol original, Cloner cloner)
    4747      : base(original, cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/LaggedTreeNode.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    28   [StorableClass]
     28  [StorableType("B5DF4207-7FDD-478D-B2FD-E52D8B7CD709")]
    2929  public class LaggedTreeNode : SymbolicExpressionTreeNode, ILaggedTreeNode {
    3030    public new LaggedSymbol Symbol {
     
    3939
    4040    [StorableConstructor]
    41     protected LaggedTreeNode(bool deserializing) : base(deserializing) { }
     41    protected LaggedTreeNode(StorableConstructorFlag _) : base(_) { }
    4242    protected LaggedTreeNode(LaggedTreeNode original, Cloner cloner)
    4343      : base(original, cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/LaggedVariable.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("82D1162C-A27E-460D-97D0-497361262446")]
    2828  [Item("LaggedVariable", "Represents a variable value with a time offset.")]
    2929  public class LaggedVariable : VariableBase {
     
    4141    }
    4242    [StorableConstructor]
    43     protected LaggedVariable(bool deserializing) : base(deserializing) { }
     43    protected LaggedVariable(StorableConstructorFlag _) : base(_) { }
    4444    protected LaggedVariable(LaggedVariable original, Cloner cloner)
    4545      : base(original, cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/LaggedVariableTreeNode.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("0B35397B-5634-44DB-9350-9EC41E5D4A45")]
    2828  public sealed class LaggedVariableTreeNode : VariableTreeNodeBase, ILaggedTreeNode {
    2929    public new LaggedVariable Symbol {
     
    4242
    4343    [StorableConstructor]
    44     private LaggedVariableTreeNode(bool deserializing) : base(deserializing) { }
     44    private LaggedVariableTreeNode(StorableConstructorFlag _) : base(_) { }
    4545    private LaggedVariableTreeNode(LaggedVariableTreeNode original, Cloner cloner)
    4646      : base(original, cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/LessThan.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("1CDA8B1E-9CA1-4D55-BFB8-557BD2FB2D1C")]
    2828  [Item("LessThan", "Symbol that represents a less than relation.")]
    2929  public sealed class LessThan : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private LessThan(bool deserializing) : base(deserializing) { }
     41    private LessThan(StorableConstructorFlag _) : base(_) { }
    4242    private LessThan(LessThan original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Logarithm.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("640A38A9-CDEE-4928-BC4A-B69AD2328FB8")]
    2828  [Item("Logarithm", "Symbol that represents the logarithm function.")]
    2929  public sealed class Logarithm : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Logarithm(bool deserializing) : base(deserializing) { }
     41    private Logarithm(StorableConstructorFlag _) : base(_) { }
    4242    private Logarithm(Logarithm original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Multiplication.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("8F054D7F-82D0-400A-BAE3-8C90EA709C34")]
    2828  [Item("Multiplication", "Symbol that represents the * operator.")]
    2929  public sealed class Multiplication : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Multiplication(bool deserializing) : base(deserializing) { }
     41    private Multiplication(StorableConstructorFlag _) : base(_) { }
    4242    private Multiplication(Multiplication original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Norm.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("343418E1-2BA5-45A6-B324-3F0B78EFD95B")]
    2828  [Item("Norm", "Symbol that represents the normal distribution function.")]
    2929  public sealed class Norm : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Norm(bool deserializing) : base(deserializing) { }
     41    private Norm(StorableConstructorFlag _) : base(_) { }
    4242    private Norm(Norm original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Not.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("5AC7B0DB-F1F8-49AA-AB01-28BD49B41378")]
    2828  [Item("Not", "Symbol that represents the boolean NOT operator.")]
    2929  public sealed class Not : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Not(bool deserializing) : base(deserializing) { }
     41    private Not(StorableConstructorFlag _) : base(_) { }
    4242    private Not(Not original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Or.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("0A0574AA-B606-4633-973F-C1D888EAB386")]
    2828  [Item("Or", "Symbol that represents the boolean OR operator.")]
    2929  public sealed class Or : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Or(bool deserializing) : base(deserializing) { }
     41    private Or(StorableConstructorFlag _) : base(_) { }
    4242    private Or(Or original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Power.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("844DADA3-5315-46FD-B34D-CD76F68714EB")]
    2828  [Item("Power", "Symbol that represents the power function.")]
    2929  public sealed class Power : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Power(bool deserializing) : base(deserializing) { }
     41    private Power(StorableConstructorFlag _) : base(_) { }
    4242    private Power(Power original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Psi.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("5B0CDC8F-F87C-487F-A64B-A9D2C27F0F1A")]
    2828  [Item("Psi", "Symbol that represents the psi function.")]
    2929  public sealed class Psi : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Psi(bool deserializing) : base(deserializing) { }
     41    private Psi(StorableConstructorFlag _) : base(_) { }
    4242    private Psi(Psi original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Root.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("A6EF8F30-D00E-4620-9560-06FEAC3131C8")]
    2828  [Item("Root", "Symbol that represents the n-th root function.")]
    2929  public sealed class Root : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Root(bool deserializing) : base(deserializing) { }
     41    private Root(StorableConstructorFlag _) : base(_) { }
    4242    private Root(Root original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Sine.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("8234F316-1816-41C5-94A9-11A5F3D36A77")]
    2828  [Item("Sine", "Symbol that represents the sine function.")]
    2929  public sealed class Sine : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Sine(bool deserializing) : base(deserializing) { }
     41    private Sine(StorableConstructorFlag _) : base(_) { }
    4242    private Sine(Sine original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/SineIntegral.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("2E0DFA26-2513-4F86-B276-F35AE8F4C1CA")]
    2828  [Item("SineIntegral", "Symbol that represents the sine integral.")]
    2929  public sealed class SineIntegral : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private SineIntegral(bool deserializing) : base(deserializing) { }
     41    private SineIntegral(StorableConstructorFlag _) : base(_) { }
    4242    private SineIntegral(SineIntegral original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Square.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("A6251B59-A1CE-43A9-98C0-211B88D53DD5")]
    2828  [Item("Square", "Symbol that represents the square function.")]
    2929  public sealed class Square : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Square(bool deserializing) : base(deserializing) { }
     41    private Square(StorableConstructorFlag _) : base(_) { }
    4242    private Square(Square original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/SquareRoot.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("E5D97AE5-0656-4FE5-B493-52A400ACE9AE")]
    2828  [Item("SquareRoot", "Symbol that represents the square root function.")]
    2929  public sealed class SquareRoot : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private SquareRoot(bool deserializing) : base(deserializing) { }
     41    private SquareRoot(StorableConstructorFlag _) : base(_) { }
    4242    private SquareRoot(SquareRoot original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Subtraction.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("F50263D4-2B07-42C8-8AB6-297A54AE00CC")]
    2828  [Item("Subtraction", "Symbol that represents the - operator.")]
    2929  public sealed class Subtraction : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Subtraction(bool deserializing) : base(deserializing) { }
     41    private Subtraction(StorableConstructorFlag _) : base(_) { }
    4242    private Subtraction(Subtraction original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Tangent.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("636D006E-C4A5-494B-8E26-566B42A9B4AF")]
    2828  [Item("Tangent", "Symbol that represents the tangent trigonometric function.")]
    2929  public sealed class Tangent : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Tangent(bool deserializing) : base(deserializing) { }
     41    private Tangent(StorableConstructorFlag _) : base(_) { }
    4242    private Tangent(Tangent original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/TimeLag.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 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;
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("A9FEA73C-37C4-4948-B08E-0A12EDE169E2")]
    2828  [Item("TimeLag", "Represents a symblol whose evaluation is shifted.")]
    2929  public sealed class TimeLag : LaggedSymbol {
     
    3939
    4040    [StorableConstructor]
    41     private TimeLag(bool deserializing) : base(deserializing) { }
     41    private TimeLag(StorableConstructorFlag _) : base(_) { }
    4242    private TimeLag(TimeLag original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) { return new TimeLag(this, cloner); }
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Variable.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("9072AE0E-FA62-48D2-A416-F678D6CC2CBC")]
    2828  [Item("Variable", "Represents a variable value.")]
    2929  public sealed class Variable : VariableBase {
    3030
    3131    [StorableConstructor]
    32     private Variable(bool deserializing)
    33       : base(deserializing) {
     32    private Variable(StorableConstructorFlag _) : base(_) {
    3433    }
    3534    private Variable(Variable original, Cloner cloner)
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableBase.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    28   [StorableClass]
     28  [StorableType("F8A6AD96-28D9-4BEC-8392-8B7BA824B085")]
    2929  public abstract class VariableBase : Symbol, IVariableSymbol {
    3030    #region Properties
     
    152152
    153153    [StorableConstructor]
    154     protected VariableBase(bool deserializing)
    155       : base(deserializing) {
     154    protected VariableBase(StorableConstructorFlag _) : base(_) {
    156155      variableNames = new List<string>();
    157156      allVariableNames = new List<string>();
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableCondition.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    30   [StorableClass]
     30  [StorableType("6DD62329-E3A5-4C3B-9B38-D57E62D61CCC")]
    3131  [Item("Variable Condition", "Represents a condition that tests a given variable against a specified threshold.")]
    3232  public sealed class VariableCondition : Symbol, IVariableSymbol {
     
    192192
    193193    [StorableConstructor]
    194     private VariableCondition(bool deserializing)
    195       : base(deserializing) {
     194    private VariableCondition(StorableConstructorFlag _) : base(_) {
    196195      variableNames = new List<string>();
    197196      allVariableNames = new List<string>();
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableConditionTreeNode.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HeuristicLab.Random;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    30   [StorableClass]
     30  [StorableType("D3076BBC-7CF3-4768-8C4B-3FC4FEF041B3")]
    3131  public sealed class VariableConditionTreeNode : SymbolicExpressionTreeNode, IVariableTreeNode {
    3232    #region properties
     
    5555
    5656    [StorableConstructor]
    57     private VariableConditionTreeNode(bool deserializing) : base(deserializing) { }
     57    private VariableConditionTreeNode(StorableConstructorFlag _) : base(_) { }
    5858    private VariableConditionTreeNode(VariableConditionTreeNode original, Cloner cloner)
    5959      : base(original, cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableTreeNode.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 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.Problems.DataAnalysis.Symbolic {
    25   [StorableClass]
     25  [StorableType("E60C4216-A6BA-48DE-BA66-389B9946B70A")]
    2626  public sealed class VariableTreeNode : VariableTreeNodeBase {
    2727    public new Variable Symbol {
     
    2929    }
    3030    [StorableConstructor]
    31     private VariableTreeNode(bool deserializing) : base(deserializing) { }
     31    private VariableTreeNode(StorableConstructorFlag _) : base(_) { }
    3232    private VariableTreeNode(VariableTreeNode original, Cloner cloner)
    3333      : base(original, cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableTreeNodeBase.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Random;
    2727namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    28   [StorableClass]
     28  [StorableType("B92EF904-18EC-41FC-9123-9B9293246815")]
    2929  public abstract class VariableTreeNodeBase : SymbolicExpressionTreeTerminalNode, IVariableTreeNode {
    3030    public new VariableBase Symbol {
     
    4545
    4646    [StorableConstructor]
    47     protected VariableTreeNodeBase(bool deserializing) : base(deserializing) { }
     47    protected VariableTreeNodeBase(StorableConstructorFlag _) : base(_) { }
    4848    protected VariableTreeNodeBase(VariableTreeNodeBase original, Cloner cloner)
    4949      : base(original, cloner) {
  • branches/2968_infix_string_formatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Xor.cs

    r15583 r17503  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
    27   [StorableClass]
     27  [StorableType("36A4BD81-EA93-4497-8421-D0C9A0DCB246")]
    2828  [Item("Xor", "Symbol that represents the boolean XOR operator.")]
    2929  public sealed class Xor : Symbol {
     
    3939
    4040    [StorableConstructor]
    41     private Xor(bool deserializing) : base(deserializing) { }
     41    private Xor(StorableConstructorFlag _) : base(_) { }
    4242    private Xor(Xor original, Cloner cloner) : base(original, cloner) { }
    4343    public override IDeepCloneable Clone(Cloner cloner) {
Note: See TracChangeset for help on using the changeset viewer.