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:
20 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) {
Note: See TracChangeset for help on using the changeset viewer.