Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
57 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Problems.DataAnalysis

  • trunk/HeuristicLab.Problems.DataAnalysis/3.4

  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleModel.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.Problems.DataAnalysis {
     
    3030  /// Represents classification solutions that contain an ensemble of multiple classification models
    3131  /// </summary>
    32   [StorableClass]
     32  [StorableType("0F720A40-5CC2-4E2B-8D4E-CCAD8EB56E43")]
    3333  [Item("ClassificationEnsembleModel", "A classification model that contains an ensemble of multiple classification models")]
    3434  public class ClassificationEnsembleModel : ClassificationModel, IClassificationEnsembleModel {
     
    4444
    4545    [StorableConstructor]
    46     protected ClassificationEnsembleModel(bool deserializing) : base(deserializing) { }
     46    protected ClassificationEnsembleModel(StorableConstructorFlag _) : base(_) { }
    4747    protected ClassificationEnsembleModel(ClassificationEnsembleModel original, Cloner cloner)
    4848      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleProblemData.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.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableClass]
     30  [StorableType("58768587-0920-4B52-95E4-66B54E8E837C")]
    3131  [Item("ClassificationEnsembleProblemData", "Represents an item containing all data defining a classification problem.")]
    3232  public class ClassificationEnsembleProblemData : ClassificationProblemData {
     
    6565
    6666    [StorableConstructor]
    67     protected ClassificationEnsembleProblemData(bool deserializing) : base(deserializing) { }
     67    protected ClassificationEnsembleProblemData(StorableConstructorFlag _) : base(_) { }
    6868    protected ClassificationEnsembleProblemData(ClassificationEnsembleProblemData original, Cloner cloner) : base(original, cloner) { }
    6969    public override IDeepCloneable Clone(Cloner cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleSolution.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.
     
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Data;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Problems.DataAnalysis {
     
    3333  /// Represents classification solutions that contain an ensemble of multiple classification models
    3434  /// </summary>
    35   [StorableClass]
     35  [StorableType("4CDD22EE-B53D-4899-A77E-C503FF9EBC8E")]
    3636  [Item("Classification Ensemble Solution", "A classification solution that contains an ensemble of multiple classification models")]
    3737  [Creatable(CreatableAttribute.Categories.DataAnalysisEnsembles, Priority = 110)]
     
    6161
    6262    [StorableConstructor]
    63     private ClassificationEnsembleSolution(bool deserializing)
    64       : base(deserializing) {
     63    private ClassificationEnsembleSolution(StorableConstructorFlag _) : base(_) {
    6564      classificationSolutions = new ItemCollection<IClassificationSolution>();
    6665    }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationModel.cs

    r16243 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.Problems.DataAnalysis {
    29   [StorableClass]
     29  [StorableType("7E6091F9-86FD-4C47-8935-9C35CAB4261B")]
    3030  [Item("Classification Model", "Base class for all classification models.")]
    3131  public abstract class ClassificationModel : DataAnalysisModel, IClassificationModel {
     
    4141    }
    4242
    43     protected ClassificationModel(bool deserializing)
    44       : base(deserializing) {
     43    [StorableConstructor]
     44    protected ClassificationModel(StorableConstructorFlag _)
     45      : base(_) {
    4546      targetVariable = string.Empty;
    4647    }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationPerformanceMeasures.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.Data;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.DataAnalysis {
    29   [StorableClass]
     29  [StorableType("6F44E140-22CF-48D3-B100-B6013F2B6608")]
    3030  public class ClassificationPerformanceMeasuresResultCollection : ResultCollection {
    3131    #region result names
     
    5454    }
    5555    [StorableConstructor]
    56     protected ClassificationPerformanceMeasuresResultCollection(bool deserializing)
    57       : base(deserializing) {
     56    protected ClassificationPerformanceMeasuresResultCollection(StorableConstructorFlag _) : base(_) {
    5857    }
    5958
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.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;
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis {
    27   [StorableClass]
     27  [StorableType("93696570-A410-4885-A210-7220771B6050")]
    2828  [Item("Classification Problem", "A general classification problem.")]
    2929  public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem, IStorableContent {
     
    3131
    3232    [StorableConstructor]
    33     protected ClassificationProblem(bool deserializing) : base(deserializing) { }
     33    protected ClassificationProblem(StorableConstructorFlag _) : base(_) { }
    3434    protected ClassificationProblem(ClassificationProblem original, Cloner cloner) : base(original, cloner) { }
    3535    public override IDeepCloneable Clone(Cloner cloner) { return new ClassificationProblem(this, cloner); }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

    r16244 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.
     
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Problems.DataAnalysis {
    32   [StorableClass]
     32  [StorableType("1C8DCCCF-4E2A-421D-9C61-7C017D584054")]
    3333  [Item("ClassificationProblemData", "Represents an item containing all data defining a classification problem.")]
    3434  public class ClassificationProblemData : DataAnalysisProblemData, IClassificationProblemData, IStorableContent {
     
    279279
    280280    [StorableConstructor]
    281     protected ClassificationProblemData(bool deserializing) : base(deserializing) { }
     281    protected ClassificationProblemData(StorableConstructorFlag _) : base(_) { }
    282282    [StorableHook(HookType.AfterDeserialization)]
    283283    private void AfterDeserialization() {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolution.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.
     
    2323using System.Linq;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis {
     
    2929  /// Represents a classification data analysis solution
    3030  /// </summary>
    31   [StorableClass]
     31  [StorableType("A240D831-23D6-4432-A105-12D02D2EA75A")]
    3232  public class ClassificationSolution : ClassificationSolutionBase {
    3333    protected readonly Dictionary<int, double> evaluationCache;
    3434
    3535    [StorableConstructor]
    36     protected ClassificationSolution(bool deserializing)
    37       : base(deserializing) {
     36    protected ClassificationSolution(StorableConstructorFlag _) : base(_) {
    3837      evaluationCache = new Dictionary<int, double>();
    3938    }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolutionBase.cs

    r16244 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.Optimization;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Problems.DataAnalysis.OnlineCalculators;
    3030
    3131namespace HeuristicLab.Problems.DataAnalysis {
    32   [StorableClass]
     32  [StorableType("60599497-EAF0-4DB0-B2E4-D58F34458D8F")]
    3333  public abstract class ClassificationSolutionBase : DataAnalysisSolution, IClassificationSolution {
    3434    private const string TrainingAccuracyResultName = "Accuracy (training)";
     
    7878
    7979    [StorableConstructor]
    80     protected ClassificationSolutionBase(bool deserializing) : base(deserializing) { }
     80    protected ClassificationSolutionBase(StorableConstructorFlag _) : base(_) { }
    8181    protected ClassificationSolutionBase(ClassificationSolutionBase original, Cloner cloner)
    8282      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolutionVariableImpactsCalculator.cs

    r16422 r16565  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
     
    3030using HeuristicLab.Data;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    3333using HeuristicLab.Random;
    3434
    3535namespace HeuristicLab.Problems.DataAnalysis {
    36   [StorableClass]
     36  [StorableType("768AFEDB-5641-429E-85A1-A0BE8DFDD56F")]
    3737  [Item("ClassificationSolution Impacts Calculator", "Calculation of the impacts of input variables for any classification solution")]
    3838  public sealed class ClassificationSolutionVariableImpactsCalculator : ParameterizedNamedItem {
    3939    #region Parameters/Properties
     40    [StorableType("e6cd2226-10cd-4765-ae1a-924e316b6aac")]
    4041    public enum ReplacementMethodEnum {
    4142      Median,
     
    4445      Noise
    4546    }
     47
     48    [StorableType("84d84ccf-5d6d-432f-a946-eb499935e5c8")]
    4649    public enum FactorReplacementMethodEnum {
    4750      Best,
     
    4952      Shuffle
    5053    }
     54
     55    [StorableType("70f30113-df01-41b4-9e3b-2982035de498")]
    5156    public enum DataPartitionEnum {
    5257      Training,
     
    8590    #region Ctor/Cloner
    8691    [StorableConstructor]
    87     private ClassificationSolutionVariableImpactsCalculator(bool deserializing) : base(deserializing) { }
     92    private ClassificationSolutionVariableImpactsCalculator(StorableConstructorFlag _) : base(_) { }
    8893    private ClassificationSolutionVariableImpactsCalculator(ClassificationSolutionVariableImpactsCalculator original, Cloner cloner)
    8994      : base(original, cloner) { }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ConstantClassificationSolution.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;
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis {
    27   [StorableClass]
     27  [StorableType("D5A42FE7-D21B-48F7-A812-FE69724D0098")]
    2828  [Item(Name = "Constant Classification Solution", Description = "Represents a constant classification solution (model + data).")]
    2929  public class ConstantClassificationSolution : ClassificationSolution {
     
    3434
    3535    [StorableConstructor]
    36     protected ConstantClassificationSolution(bool deserializing) : base(deserializing) { }
     36    protected ConstantClassificationSolution(StorableConstructorFlag _) : base(_) { }
    3737    protected ConstantClassificationSolution(ConstantClassificationSolution original, Cloner cloner) : base(original, cloner) { }
    3838    public ConstantClassificationSolution(ConstantModel model, IClassificationProblemData problemData)
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationModel.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.
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
     
    3131  /// Represents discriminant function classification data analysis models.
    3232  /// </summary>
    33   [StorableClass]
     33  [StorableType("E7A8648D-C938-499F-A712-185542095708")]
    3434  [Item("DiscriminantFunctionClassificationModel", "Represents a classification model that uses a discriminant function and classification thresholds.")]
    3535  public class DiscriminantFunctionClassificationModel : ClassificationModel, IDiscriminantFunctionClassificationModel {
     
    6868
    6969    [StorableConstructor]
    70     protected DiscriminantFunctionClassificationModel(bool deserializing) : base(deserializing) { }
     70    protected DiscriminantFunctionClassificationModel(StorableConstructorFlag _) : base(_) { }
    7171    protected DiscriminantFunctionClassificationModel(DiscriminantFunctionClassificationModel original, Cloner cloner)
    7272      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationSolution.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.Problems.DataAnalysis {
     
    3030  /// Represents a classification solution that uses a discriminant function and classification thresholds.
    3131  /// </summary>
    32   [StorableClass]
     32  [StorableType("A3480DF9-49E7-4329-AD23-57B4441033C1")]
    3333  [Item("DiscriminantFunctionClassificationSolution", "Represents a classification solution that uses a discriminant function and classification thresholds.")]
    3434  public class DiscriminantFunctionClassificationSolution : DiscriminantFunctionClassificationSolutionBase {
     
    3737
    3838    [StorableConstructor]
    39     protected DiscriminantFunctionClassificationSolution(bool deserializing)
    40       : base(deserializing) {
     39    protected DiscriminantFunctionClassificationSolution(StorableConstructorFlag _) : base(_) {
    4140      valueEvaluationCache = new Dictionary<int, double>();
    4241      classValueEvaluationCache = new Dictionary<int, double>();
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationSolutionBase.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.
     
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Problems.DataAnalysis {
     
    3333  /// Represents a classification solution that uses a discriminant function and classification thresholds.
    3434  /// </summary>
    35   [StorableClass]
     35  [StorableType("3668EBE0-128C-4BC4-902C-161670F98FAD")]
    3636  [Item("DiscriminantFunctionClassificationSolution", "Represents a classification solution that uses a discriminant function and classification thresholds.")]
    3737  public abstract class DiscriminantFunctionClassificationSolutionBase : ClassificationSolutionBase, IDiscriminantFunctionClassificationSolution {
     
    7474
    7575    [StorableConstructor]
    76     protected DiscriminantFunctionClassificationSolutionBase(bool deserializing) : base(deserializing) { }
     76    protected DiscriminantFunctionClassificationSolutionBase(StorableConstructorFlag _) : base(_) { }
    7777    protected DiscriminantFunctionClassificationSolutionBase(DiscriminantFunctionClassificationSolutionBase original, Cloner cloner)
    7878      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ThresholdCalculators/AccuracyMaximizationThresholdCalculator.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.
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
     
    3131  /// Represents a threshold calculator that maximizes the weighted accuracy of the classifcation model.
    3232  /// </summary>
    33   [StorableClass]
     33  [StorableType("30BB9513-542D-4CB8-931B-9767C9CB2EFB")]
    3434  [Item("AccuracyMaximizationThresholdCalculator", "Represents a threshold calculator that maximizes the weighted accuracy of the classifcation model.")]
    3535  public class AccuracyMaximizationThresholdCalculator : ThresholdCalculator {
    3636
    3737    [StorableConstructor]
    38     protected AccuracyMaximizationThresholdCalculator(bool deserializing) : base(deserializing) { }
     38    protected AccuracyMaximizationThresholdCalculator(StorableConstructorFlag _) : base(_) { }
    3939    protected AccuracyMaximizationThresholdCalculator(AccuracyMaximizationThresholdCalculator original, Cloner cloner)
    4040      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ThresholdCalculators/NormalDistributionCutPointsThresholdCalculator.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.
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
     
    3131  /// Represents a threshold calculator that calculates thresholds as the cutting points between the estimated class distributions (assuming normally distributed class values).
    3232  /// </summary>
    33   [StorableClass]
     33  [StorableType("D01CB5DC-606B-4CE9-B293-2D4D80A70BB8")]
    3434  [Item("NormalDistributionCutPointsThresholdCalculator", "Represents a threshold calculator that calculates thresholds as the cutting points between the estimated class distributions (assuming normally distributed class values).")]
    3535  public class NormalDistributionCutPointsThresholdCalculator : ThresholdCalculator {
    3636
    3737    [StorableConstructor]
    38     protected NormalDistributionCutPointsThresholdCalculator(bool deserializing) : base(deserializing) { }
     38    protected NormalDistributionCutPointsThresholdCalculator(StorableConstructorFlag _) : base(_) { }
    3939    protected NormalDistributionCutPointsThresholdCalculator(NormalDistributionCutPointsThresholdCalculator original, Cloner cloner)
    4040      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ThresholdCalculators/ThresholdCalculator.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.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis {
     
    2929  /// Base class for threshold calculators for discriminant function classification models.
    3030  /// </summary>
    31   [StorableClass]
     31  [StorableType("F56CDC6C-D4F5-4B2D-A7C4-04E0D2255699")]
    3232  public abstract class ThresholdCalculator : NamedItem, IDiscriminantFunctionThresholdCalculator {
    3333
    3434    [StorableConstructor]
    35     protected ThresholdCalculator(bool deserializing) : base(deserializing) { }
     35    protected ThresholdCalculator(StorableConstructorFlag _) : base(_) { }
    3636    protected ThresholdCalculator(ThresholdCalculator original, Cloner cloner)
    3737      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblem.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;
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis {
    27   [StorableClass]
     27  [StorableType("CB64B930-3C95-4663-B583-712B42E33712")]
    2828  [Item("Clustering Problem", "A general clustering problem.")]
    2929  public class ClusteringProblem : DataAnalysisProblem<IClusteringProblemData>, IClusteringProblem {
    3030    [StorableConstructor]
    31     protected ClusteringProblem(bool deserializing) : base(deserializing) { }
     31    protected ClusteringProblem(StorableConstructorFlag _) : base(_) { }
    3232    protected ClusteringProblem(ClusteringProblem original, Cloner cloner) : base(original, cloner) { }
    3333    public override IDeepCloneable Clone(Cloner cloner) { return new ClusteringProblem(this, cloner); }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.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.Problems.DataAnalysis {
    29   [StorableClass]
     29  [StorableType("B74A767A-86ED-4B0E-BC01-82A4509CB81B")]
    3030  [Item("ClusteringProblemData", "Represents an item containing all data defining a clustering problem.")]
    3131  public sealed class ClusteringProblemData : DataAnalysisProblemData, IClusteringProblemData, IStorableContent {
     
    7272
    7373    [StorableConstructor]
    74     private ClusteringProblemData(bool deserializing) : base(deserializing) { }
     74    private ClusteringProblemData(StorableConstructorFlag _) : base(_) { }
    7575    [StorableHook(HookType.AfterDeserialization)]
    7676    private void AfterDeserialization() {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringSolution.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.
     
    2323using System.Linq;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis {
     
    2929  /// Represents a clustering data analysis solution
    3030  /// </summary>
    31   [StorableClass]
     31  [StorableType("51241A39-F5C6-4DC8-A27A-83875FFCB51B")]
    3232  public class ClusteringSolution : DataAnalysisSolution, IClusteringSolution {
    3333
    3434    [StorableConstructor]
    35     protected ClusteringSolution(bool deserializing) : base(deserializing) { }
     35    protected ClusteringSolution(StorableConstructorFlag _) : base(_) { }
    3636    protected ClusteringSolution(ClusteringSolution original, Cloner cloner)
    3737      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/ConstantModel.cs

    r16243 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.Core;
    2727using HeuristicLab.Data;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis {
    31   [StorableClass]
     31  [StorableType("CAE567A8-86A4-4554-BF89-79FFFB4204D1")]
    3232  [Item("Constant Model", "A model that always returns the same constant value regardless of the presented input data.")]
    3333  public class ConstantModel : RegressionModel, IClassificationModel, ITimeSeriesPrognosisModel, IStringConvertibleValue {
     
    4343
    4444    [StorableConstructor]
    45     protected ConstantModel(bool deserializing) : base(deserializing) { }
     45    protected ConstantModel(StorableConstructorFlag _) : base(_) { }
    4646    protected ConstantModel(ConstantModel original, Cloner cloner)
    4747      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisModel.cs

    r16243 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.Problems.DataAnalysis {
    29   [StorableClass]
     29  [StorableType("EF0EF64F-392A-448A-B30F-1AE113C6CC88")]
    3030  [Item("DataAnalysisModel", "Base class for data analysis models.")]
    3131  public abstract class DataAnalysisModel : NamedItem, IDataAnalysisModel {
    3232    [StorableConstructor]
    33     protected DataAnalysisModel(bool deserializing) : base(deserializing) { }
     33    protected DataAnalysisModel(StorableConstructorFlag _) : base(_) { }
    3434    protected DataAnalysisModel(DataAnalysisModel original, Cloner cloner)
    3535      : base(original, cloner) { }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblem.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.
     
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Problems.Instances;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis {
    31   [StorableClass]
     31  [StorableType("67267E9F-8A34-4CB6-9776-DD1483131987")]
    3232  public abstract class DataAnalysisProblem<T> : Problem, IDataAnalysisProblem<T>,
    3333    IProblemInstanceConsumer<T>, IProblemInstanceExporter<T>
     
    5757    }
    5858    [StorableConstructor]
    59     protected DataAnalysisProblem(bool deserializing) : base(deserializing) { }
     59    protected DataAnalysisProblem(StorableConstructorFlag _) : base(_) { }
    6060
    6161    protected DataAnalysisProblem(T problemData)
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs

    r16244 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.
     
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    2625using HeuristicLab.Collections;
    2726using HeuristicLab.Common;
     
    2928using HeuristicLab.Data;
    3029using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3231
    3332namespace HeuristicLab.Problems.DataAnalysis {
    34   [StorableClass]
     33  [StorableType("85AE1542-D563-434F-A760-1D181EFC2101")]
    3534  public abstract class DataAnalysisProblemData : ParameterizedNamedItem, IDataAnalysisProblemData {
    3635    protected const string DatasetParameterName = "Dataset";
     
    144143    }
    145144    [StorableConstructor]
    146     protected DataAnalysisProblemData(bool deserializing) : base(deserializing) { }
     145    protected DataAnalysisProblemData(StorableConstructorFlag _) : base(_) { }
    147146
    148147    [StorableHook(HookType.AfterDeserialization)]
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisSolution.cs

    r16244 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.
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
     
    3131  /// Abstract base class for data analysis solutions
    3232  /// </summary>
    33   [StorableClass]
     33  [StorableType("339E0EAD-07D7-44C5-8E1D-AE9B2AA9A67D")]
    3434  public abstract class DataAnalysisSolution : ResultCollection, IDataAnalysisSolution {
    3535    private const string ModelResultName = "Model";
     
    7272
    7373    [StorableConstructor]
    74     protected DataAnalysisSolution(bool deserializing) : base(deserializing) { }
     74    protected DataAnalysisSolution(StorableConstructorFlag _) : base(_) { }
    7575    protected DataAnalysisSolution(DataAnalysisSolution original, Cloner cloner)
    7676      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval.cs

    r16407 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 System.Linq;
    2525using HeuristicLab.Common;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Problems.DataAnalysis {
     29  [StorableType("849e42d3-8934-419d-9aff-64ad81c06b67")]
    2830  public class Interval : IEquatable<Interval> {
     31    [Storable]
    2932    public double LowerBound { get; private set; }
     33    [Storable]
    3034    public double UpperBound { get; private set; }
    3135
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConfidenceBoundRegressionSolution.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.
     
    2323using System.Linq;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis {
     
    2929  /// Represents a regression data analysis solution that supports confidence estimates
    3030  /// </summary>
    31   [StorableClass]
     31  [StorableType("C2D0DE07-E8F0-4850-AAF3-E2885EC1DDB6")]
    3232  public class ConfidenceRegressionSolution : RegressionSolution, IConfidenceRegressionSolution {
    3333    protected readonly Dictionary<int, double> varianceEvaluationCache;
     
    3939
    4040    [StorableConstructor]
    41     protected ConfidenceRegressionSolution(bool deserializing)
    42       : base(deserializing) {
     41    protected ConfidenceRegressionSolution(StorableConstructorFlag _) : base(_) {
    4342      varianceEvaluationCache = new Dictionary<int, double>();
    4443    }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionModel.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.Core;
    2727using HeuristicLab.Data;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis {
    31   [StorableClass]
     31  [StorableType("E4C0D707-F668-428F-951C-F82A475177BE")]
    3232  [Item("Constant Regression Model", "A model that always returns the same constant value regardless of the presented input data.")]
    3333  [Obsolete]
     
    4343
    4444    [StorableConstructor]
    45     protected ConstantRegressionModel(bool deserializing) : base(deserializing) { }
     45    protected ConstantRegressionModel(StorableConstructorFlag _) : base(_) { }
    4646    protected ConstantRegressionModel(ConstantRegressionModel original, Cloner cloner)
    4747      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionSolution.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;
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis {
    27   [StorableClass]
     27  [StorableType("4DDDFDFA-3AF5-468F-971F-26B8AB014338")]
    2828  [Item(Name = "Constant Regression Solution", Description = "Represents a constant regression solution (model + data).")]
    2929  public class ConstantRegressionSolution : RegressionSolution {
     
    3434
    3535    [StorableConstructor]
    36     protected ConstantRegressionSolution(bool deserializing) : base(deserializing) { }
     36    protected ConstantRegressionSolution(StorableConstructorFlag _) : base(_) { }
    3737    protected ConstantRegressionSolution(ConstantRegressionSolution original, Cloner cloner) : base(original, cloner) { }
    3838    public ConstantRegressionSolution(ConstantModel model, IRegressionProblemData problemData)
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleModel.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.
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
     
    3131  /// Represents regression solutions that contain an ensemble of multiple regression models
    3232  /// </summary>
    33   [StorableClass]
     33  [StorableType("202C33A2-2B7A-42E2-B3F3-BE1C9A9B5B84")]
    3434  [Item("RegressionEnsembleModel", "A regression model that contains an ensemble of multiple regression models")]
    3535  public sealed class RegressionEnsembleModel : RegressionModel, IRegressionEnsembleModel {
     
    8989
    9090    [StorableConstructor]
    91     private RegressionEnsembleModel(bool deserializing) : base(deserializing) { }
     91    private RegressionEnsembleModel(StorableConstructorFlag _) : base(_) { }
    9292    private RegressionEnsembleModel(RegressionEnsembleModel original, Cloner cloner)
    9393      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleProblemData.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.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableClass]
     30  [StorableType("CB105C71-FA47-4FFC-BF56-57B6BB2E0BC7")]
    3131  [Item("RegressionEnsembleProblemData", "Represents an item containing all data defining a regression problem.")]
    3232  public sealed class RegressionEnsembleProblemData : RegressionProblemData {
     
    6262
    6363    [StorableConstructor]
    64     private RegressionEnsembleProblemData(bool deserializing) : base(deserializing) { }
     64    private RegressionEnsembleProblemData(StorableConstructorFlag _) : base(_) { }
    6565    private RegressionEnsembleProblemData(RegressionEnsembleProblemData original, Cloner cloner) : base(original, cloner) { }
    6666    public override IDeepCloneable Clone(Cloner cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.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.
     
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Data;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Problems.DataAnalysis {
     
    3333  /// Represents regression solutions that contain an ensemble of multiple regression models
    3434  /// </summary>
    35   [StorableClass]
     35  [StorableType("C5B38C31-4307-48E4-9BCD-6797C329E018")]
    3636  [Item("Regression Ensemble Solution", "A regression solution that contains an ensemble of multiple regression models")]
    3737  [Creatable(CreatableAttribute.Categories.DataAnalysisEnsembles, Priority = 100)]
     
    6262
    6363    [StorableConstructor]
    64     private RegressionEnsembleSolution(bool deserializing)
    65       : base(deserializing) {
     64    private RegressionEnsembleSolution(StorableConstructorFlag _) : base(_) {
    6665      regressionSolutions = new ItemCollection<IRegressionSolution>();
    6766    }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionModel.cs

    r16243 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.Problems.DataAnalysis {
    29   [StorableClass]
     29  [StorableType("2998B895-4724-489C-A4CA-9ADD10C7CA49")]
    3030  [Item("Regression Model", "Base class for all regression models.")]
    3131  public abstract class RegressionModel : DataAnalysisModel, IRegressionModel {
     
    4141    }
    4242
    43     protected RegressionModel(bool deserializing)
    44       : base(deserializing) {
     43    [StorableConstructor]
     44    protected RegressionModel(StorableConstructorFlag _)
     45      : base(_) {
    4546      targetVariable = string.Empty;
    4647    }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.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;
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis {
    27   [StorableClass]
     27  [StorableType("BD8AFF60-E8BE-4325-B1AC-08B7BDF37865")]
    2828  [Item("Regression Problem", "A general regression problem.")]
    2929  public class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>, IRegressionProblem, IStorableContent {
     
    3131
    3232    [StorableConstructor]
    33     protected RegressionProblem(bool deserializing) : base(deserializing) { }
     33    protected RegressionProblem(StorableConstructorFlag _) : base(_) { }
    3434    protected RegressionProblem(RegressionProblem original, Cloner cloner) : base(original, cloner) { }
    3535    public override IDeepCloneable Clone(Cloner cloner) { return new RegressionProblem(this, cloner); }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r16244 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.
     
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Problems.DataAnalysis {
    32   [StorableClass]
     32  [StorableType("EE612297-B1AF-42D2-BF21-AF9A2D42791C")]
    3333  [Item("RegressionProblemData", "Represents an item containing all data defining a regression problem.")]
    3434  public class RegressionProblemData : DataAnalysisProblemData, IRegressionProblemData, IStorableContent {
     
    122122
    123123    [StorableConstructor]
    124     protected RegressionProblemData(bool deserializing) : base(deserializing) { }
     124    protected RegressionProblemData(StorableConstructorFlag _) : base(_) { }
    125125    [StorableHook(HookType.AfterDeserialization)]
    126126    private void AfterDeserialization() {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolution.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.
     
    2323using System.Linq;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis {
     
    2929  /// Represents a regression data analysis solution
    3030  /// </summary>
    31   [StorableClass]
     31  [StorableType("00A95897-4AA4-406B-B304-5D19AA30C4B1")]
    3232  public class RegressionSolution : RegressionSolutionBase {
    3333    protected readonly Dictionary<int, double> evaluationCache;
    3434
    3535    [StorableConstructor]
    36     protected RegressionSolution(bool deserializing)
    37       : base(deserializing) {
     36    protected RegressionSolution(StorableConstructorFlag _) : base(_) {
    3837      evaluationCache = new Dictionary<int, double>();
    3938    }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionBase.cs

    r16244 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.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableClass]
     30  [StorableType("03116F5E-ABBF-4966-9428-E3DC67D1D03D")]
    3131  public abstract class RegressionSolutionBase : DataAnalysisSolution, IRegressionSolution {
    3232    protected const string TrainingMeanSquaredErrorResultName = "Mean squared error (training)";
     
    160160
    161161    [StorableConstructor]
    162     protected RegressionSolutionBase(bool deserializing) : base(deserializing) { }
     162    protected RegressionSolutionBase(StorableConstructorFlag _) : base(_) { }
    163163    protected RegressionSolutionBase(RegressionSolutionBase original, Cloner cloner)
    164164      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionVariableImpactsCalculator.cs

    r16422 r16565  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
     
    3030using HeuristicLab.Data;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    3333using HeuristicLab.Random;
    3434
    3535namespace HeuristicLab.Problems.DataAnalysis {
    36   [StorableClass]
     36  [StorableType("414B25CD-6643-4E42-9EB2-B9A24F5E1528")]
    3737  [Item("RegressionSolution Impacts Calculator", "Calculation of the impacts of input variables for any regression solution")]
    3838  public sealed class RegressionSolutionVariableImpactsCalculator : ParameterizedNamedItem {
    3939    #region Parameters/Properties
     40    [StorableType("45a48ef7-e1e6-44b7-95b1-ae9d01aa5de4")]
    4041    public enum ReplacementMethodEnum {
    4142      Median,
     
    4445      Noise
    4546    }
     47
     48    [StorableType("78df33f8-4715-4d25-a69a-f2bc1277fa3b")]
    4649    public enum FactorReplacementMethodEnum {
    4750      Best,
     
    4952      Shuffle
    5053    }
     54
     55    [StorableType("946646da-1c0b-435e-88f9-38d649fc5194")]
    5156    public enum DataPartitionEnum {
    5257      Training,
     
    8590    #region Ctor/Cloner
    8691    [StorableConstructor]
    87     private RegressionSolutionVariableImpactsCalculator(bool deserializing) : base(deserializing) { }
     92    private RegressionSolutionVariableImpactsCalculator(StorableConstructorFlag _) : base(_) { }
    8893    private RegressionSolutionVariableImpactsCalculator(RegressionSolutionVariableImpactsCalculator original, Cloner cloner)
    8994      : base(original, cloner) { }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/Models/ConstantTimeSeriesPrognosisModel.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.
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableClass]
     30  [StorableType("A69BF8CC-2A57-4FBE-A468-8D38F3B6BBA6")]
    3131  [Item("Constant TimeSeries Model", "A time series model that returns for all prediciton the same constant value.")]
    3232  [Obsolete]
    3333  public class ConstantTimeSeriesPrognosisModel : ConstantRegressionModel, ITimeSeriesPrognosisModel {
    3434    [StorableConstructor]
    35     protected ConstantTimeSeriesPrognosisModel(bool deserializing) : base(deserializing) { }
     35    protected ConstantTimeSeriesPrognosisModel(StorableConstructorFlag _) : base(_) { }
    3636    protected ConstantTimeSeriesPrognosisModel(ConstantTimeSeriesPrognosisModel original, Cloner cloner) : base(original, cloner) { }
    3737    public override IDeepCloneable Clone(Cloner cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/Models/TimeSeriesPrognosisAutoRegressiveModel.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.
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableClass]
     30  [StorableType("9C44E097-50F8-4EC1-BE1B-6A0246EC020E")]
    3131  [Item("Autoregressive TimeSeries Model", "A linear autoregressive time series model used to predict future values.")]
    3232  public class TimeSeriesPrognosisAutoRegressiveModel : RegressionModel, ITimeSeriesPrognosisModel {
     
    4343
    4444    [StorableConstructor]
    45     protected TimeSeriesPrognosisAutoRegressiveModel(bool deserializing) : base(deserializing) { }
     45    protected TimeSeriesPrognosisAutoRegressiveModel(StorableConstructorFlag _) : base(_) { }
    4646    protected TimeSeriesPrognosisAutoRegressiveModel(TimeSeriesPrognosisAutoRegressiveModel original, Cloner cloner)
    4747      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblem.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;
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis {
    27   [StorableClass]
     27  [StorableType("F6680708-9368-4A96-AE2F-B4B7F4C3FE52")]
    2828  [Item("Time-series Prognosis Problem", "A general time-series prognosis problem.")]
    2929  public class TimeSeriesPrognosisProblem : DataAnalysisProblem<ITimeSeriesPrognosisProblemData>, ITimeSeriesPrognosisProblem {
    3030    [StorableConstructor]
    31     protected TimeSeriesPrognosisProblem(bool deserializing) : base(deserializing) { }
     31    protected TimeSeriesPrognosisProblem(StorableConstructorFlag _) : base(_) { }
    3232    protected TimeSeriesPrognosisProblem(TimeSeriesPrognosisProblem original, Cloner cloner) : base(original, cloner) { }
    3333    public override IDeepCloneable Clone(Cloner cloner) { return new TimeSeriesPrognosisProblem(this, cloner); }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs

    r16244 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.
     
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Problems.DataAnalysis {
    32   [StorableClass]
     32  [StorableType("68E790CA-24B3-4127-B06B-24E5D3078E52")]
    3333  [Item("TimeSeriesPrognosisProblemData", "Represents an item containing all data defining a time series prognosis problem.")]
    3434  public class TimeSeriesPrognosisProblemData : RegressionProblemData, ITimeSeriesPrognosisProblemData {
     
    15711571
    15721572    [StorableConstructor]
    1573     protected TimeSeriesPrognosisProblemData(bool deserializing) : base(deserializing) { }
     1573    protected TimeSeriesPrognosisProblemData(StorableConstructorFlag _) : base(_) { }
    15741574
    15751575    protected TimeSeriesPrognosisProblemData(TimeSeriesPrognosisProblemData original, Cloner cloner) : base(original, cloner) { }
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisResults.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.
     
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Problems.DataAnalysis {
    32   [StorableClass]
     32  [StorableType("E3F334B4-9980-473C-B77F-128AFAFD1DD1")]
    3333  [Item("Prognosis Results", "Represents a collection of time series prognosis results.")]
    3434  public class TimeSeriesPrognosisResults : ResultCollection {
     
    330330
    331331    [StorableConstructor]
    332     public TimeSeriesPrognosisResults(bool deserializing) : base(deserializing) { }
     332    public TimeSeriesPrognosisResults(StorableConstructorFlag _) : base(_) { }
    333333    protected TimeSeriesPrognosisResults(TimeSeriesPrognosisResults original, Cloner cloner)
    334334      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisSolution.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.
     
    2323using System.Linq;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis {
     
    2929  /// Represents a time series prognosis data analysis solution
    3030  /// </summary>
    31   [StorableClass]
     31  [StorableType("42CF9704-DCB2-4159-89B3-A30645399B86")]
    3232  public class TimeSeriesPrognosisSolution : TimeSeriesPrognosisSolutionBase {
    3333    [StorableConstructor]
    34     protected TimeSeriesPrognosisSolution(bool deserializing) : base(deserializing) { }
     34    protected TimeSeriesPrognosisSolution(StorableConstructorFlag _) : base(_) { }
    3535    protected TimeSeriesPrognosisSolution(TimeSeriesPrognosisSolution original, Cloner cloner) : base(original, cloner) { }
    3636    protected internal TimeSeriesPrognosisSolution(ITimeSeriesPrognosisModel model, ITimeSeriesPrognosisProblemData problemData)
  • trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisSolutionBase.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.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableClass]
     30  [StorableType("DF08D8C4-90F8-456E-855B-C8F487FF7B51")]
    3131  public abstract class TimeSeriesPrognosisSolutionBase : RegressionSolutionBase, ITimeSeriesPrognosisSolution {
    3232    #region result names
     
    128128
    129129    [StorableConstructor]
    130     protected TimeSeriesPrognosisSolutionBase(bool deserializing) : base(deserializing) { }
     130    protected TimeSeriesPrognosisSolutionBase(StorableConstructorFlag _) : base(_) { }
    131131    protected TimeSeriesPrognosisSolutionBase(TimeSeriesPrognosisSolutionBase original, Cloner cloner) : base(original, cloner) { }
    132132    protected TimeSeriesPrognosisSolutionBase(ITimeSeriesPrognosisModel model, ITimeSeriesPrognosisProblemData problemData)
  • 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.