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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.DataAnalysis

  • trunk/HeuristicLab.Problems.DataAnalysis/3.4

  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/CopyColumnTransformation.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.
    … …  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis {
    31   [StorableClass]
     31  [StorableType("DF78A485-8B71-46A4-8A2C-68642084D201")]
    3232  [Item("CopyColumnTransformation", "Represents a transformation which represents a copied Column.")]
    3333  public class CopyColumnTransformation : Transformation {
    … …  
    5050
    5151    [StorableConstructor]
    52     protected CopyColumnTransformation(bool deserializing) : base(deserializing) { }
     52    protected CopyColumnTransformation(StorableConstructorFlag _) : base(_) { }
    5353    protected CopyColumnTransformation(CopyColumnTransformation original, Cloner cloner)
    5454      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ExponentialTransformation.cs

    r12612 r16565  
    66using HeuristicLab.Data;
    77using HeuristicLab.Parameters;
    8 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     8using HEAL.Attic;
    99
    1010namespace HeuristicLab.Problems.DataAnalysis {
    11   [StorableClass]
     11  [StorableType("AAB32034-FA4A-4D70-937F-EF026C1D508A")]
    1212  [Item("Exponential Transformation", "f(x) = b ^ x | Represents a exponential transformation.")]
    1313  public class ExponentialTransformation : Transformation<double> {
    … …  
    3030
    3131    [StorableConstructor]
    32     protected ExponentialTransformation(bool deserializing) : base(deserializing) { }
     32    protected ExponentialTransformation(StorableConstructorFlag _) : base(_) { }
    3333
    3434    protected ExponentialTransformation(ExponentialTransformation original, Cloner cloner)

  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LinearTransformation.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.
    … …  
    2828using HeuristicLab.Data;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Problems.DataAnalysis {
    33   [StorableClass]
     33  [StorableType("203E6A27-4430-4A9E-825A-22C1B254F5E8")]
    3434  [Item("Linear Transformation", "f(x) = k * x + d | Represents a linear transformation with multiplication and addition.")]
    3535  public class LinearTransformation : Transformation<double> {
    … …  
    6666
    6767    [StorableConstructor]
    68     protected LinearTransformation(bool deserializing) : base(deserializing) { }
     68    protected LinearTransformation(StorableConstructorFlag _) : base(_) { }
    6969    protected LinearTransformation(LinearTransformation original, Cloner cloner)
    7070      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LogarithmicTransformation.cs

    r12612 r16565  
    66using HeuristicLab.Data;
    77using HeuristicLab.Parameters;
    8 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     8using HEAL.Attic;
    99
    1010namespace HeuristicLab.Problems.DataAnalysis {
    11   [StorableClass]
     11  [StorableType("D3330C77-060A-4F75-A0C5-47AC81C5F2DF")]
    1212  [Item("Logarithmic Transformation", "f(x) = log(x, b) | Represents a logarithmic transformation.")]
    1313  public class LogarithmicTransformation : Transformation<double> {
    … …  
    3030
    3131    [StorableConstructor]
    32     protected LogarithmicTransformation(bool deserializing) : base(deserializing) { }
     32    protected LogarithmicTransformation(StorableConstructorFlag _) : base(_) { }
    3333    protected LogarithmicTransformation(LogarithmicTransformation original, Cloner cloner)
    3434      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/PowerTransformation.cs

    r12612 r16565  
    66using HeuristicLab.Data;
    77using HeuristicLab.Parameters;
    8 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     8using HEAL.Attic;
    99
    1010namespace HeuristicLab.Problems.DataAnalysis {
    11   [StorableClass]
     11  [StorableType("D5A6860A-AEE5-47BE-A4D2-0107AB0A90E3")]
    1212  [Item("Power Transformation", "f(x) = x ^ exp | Represents a power transformation.")]
    1313  public class PowerTransformation : Transformation<double> {
    … …  
    3030
    3131    [StorableConstructor]
    32     protected PowerTransformation(bool deserializing) : base(deserializing) { }
     32    protected PowerTransformation(StorableConstructorFlag _) : base(_) { }
    3333    protected PowerTransformation(PowerTransformation original, Cloner cloner)
    3434      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ReciprocalTransformation.cs

    r12612 r16565  
    55using HeuristicLab.Common;
    66using HeuristicLab.Core;
    7 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     7using HEAL.Attic;
    88namespace HeuristicLab.Problems.DataAnalysis {
    9   [StorableClass]
     9  [StorableType("8D242A5A-5EBB-4618-958E-A7EF34151508")]
    1010  [Item("Reciprocal Transformation", "f(x) = 1 / x | Represents a reciprocal transformation.")]
    1111  public class ReciprocalTransformation : Transformation<double> {
    … …  
    1818
    1919    [StorableConstructor]
    20     protected ReciprocalTransformation(bool deserializing) : base(deserializing) { }
     20    protected ReciprocalTransformation(StorableConstructorFlag _) : base(_) { }
    2121    protected ReciprocalTransformation(ReciprocalTransformation original, Cloner cloner)
    2222      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ShiftStandardDistributionTransformation.cs

    r14843 r16565  
    55using HeuristicLab.Data;
    66using HeuristicLab.Parameters;
    7 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     7using HEAL.Attic;
    88
    99namespace HeuristicLab.Problems.DataAnalysis {
    10   [StorableClass]
     10  [StorableType("F0DC4951-64DF-4058-8E87-748D0FA1AA21")]
    1111  [Item("Shift Standard Distribution Transformation", "f(x) = ((x - m_org) / s_org ) * s_tar + m_tar | Represents Transformation to unit standard deviation and additional linear transformation to a target Mean and Standard deviation")]
    1212  public class ShiftStandardDistributionTransformation : Transformation<double> {
    … …  
    5252
    5353    [StorableConstructor]
    54     protected ShiftStandardDistributionTransformation(bool deserializing) : base(deserializing) { }
     54    protected ShiftStandardDistributionTransformation(StorableConstructorFlag _) : base(_) { }
    5555    protected ShiftStandardDistributionTransformation(ShiftStandardDistributionTransformation original, Cloner cloner)
    5656      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ShiftToRangeTransformation.cs

    r14843 r16565  
    55using HeuristicLab.Data;
    66using HeuristicLab.Parameters;
    7 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     7using HEAL.Attic;
    88
    99namespace HeuristicLab.Problems.DataAnalysis {
    10   [StorableClass]
     10  [StorableType("4A91E704-927C-4278-AA11-79C16BD8E4F2")]
    1111  [Item("Shift to Range Transformation", "f(x) = k * x + d, start <= f(x) <= end | Represents a linear Transformation using Parameters defining a target range")]
    1212  public class ShiftToRangeTransformation : LinearTransformation {
    … …  
    2929
    3030    [StorableConstructor]
    31     protected ShiftToRangeTransformation(bool deserializing) : base(deserializing) { }
     31    protected ShiftToRangeTransformation(StorableConstructorFlag _) : base(_) { }
    3232    protected ShiftToRangeTransformation(ShiftToRangeTransformation original, Cloner cloner)
    3333      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/Transformation.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.
    … …  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis {
    3131
    3232  [Item("Transformation", "Represents the base class for a transformation.")]
    33   [StorableClass]
     33  [StorableType("46B380CC-6CDE-40FC-9BB4-E3FF82BA35EA")]
    3434  public abstract class Transformation : ParameterizedNamedItem, ITransformation {
    3535    protected const string ColumnParameterName = "Column";
    … …  
    4949
    5050    [StorableConstructor]
    51     protected Transformation(bool deserializing) : base(deserializing) { }
     51    protected Transformation(StorableConstructorFlag _) : base(_) { }
    5252    protected Transformation(Transformation original, Cloner cloner) : base(original, cloner) { }
    5353    protected Transformation(IEnumerable<string> allowedColumns) {
    … …  
    5858
    5959  [Item("Transformation", "Represents the base class for a transformation.")]
    60   [StorableClass]
     60  [StorableType("F244DB89-72EA-4B41-89FA-C2E14F30AD29")]
    6161  public abstract class Transformation<T> : Transformation, ITransformation<T> {
    6262
    6363    [StorableConstructor]
    64     protected Transformation(bool deserializing) : base(deserializing) { }
     64    protected Transformation(StorableConstructorFlag _) : base(_) { }
    6565    protected Transformation(Transformation<T> original, Cloner cloner) : base(original, cloner) { }
    6666    protected Transformation(IEnumerable<string> allowedColumns) : base(allowedColumns) { }
Note: See TracChangeset for help on using the changeset viewer.