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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Algorithms.DataAnalysis

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearDiscriminantAnalysis.cs

    r15786 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.Encodings.SymbolicExpressionTreeEncoding;
    2929using HeuristicLab.Optimization;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.Problems.DataAnalysis;
    3232using HeuristicLab.Problems.DataAnalysis.Symbolic;
    … …  
    3939  [Item("Linear Discriminant Analysis (LDA)", "Linear discriminant analysis classification algorithm (wrapper for ALGLIB).")]
    4040  [Creatable(CreatableAttribute.Categories.DataAnalysisClassification, Priority = 100)]
    41   [StorableClass]
     41  [StorableType("032E1FDE-D140-47BF-8EB1-D63EC33B0629")]
    4242  public sealed class LinearDiscriminantAnalysis : FixedDataAnalysisAlgorithm<IClassificationProblem> {
    4343    private const string LinearDiscriminantAnalysisSolutionResultName = "Linear discriminant analysis solution";
    4444
    4545    [StorableConstructor]
    46     private LinearDiscriminantAnalysis(bool deserializing) : base(deserializing) { }
     46    private LinearDiscriminantAnalysis(StorableConstructorFlag _) : base(_) { }
    4747    private LinearDiscriminantAnalysis(LinearDiscriminantAnalysis original, Cloner cloner)
    4848      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearRegression.cs

    r16448 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.Optimization;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.Problems.DataAnalysis;
    3232using HeuristicLab.Problems.DataAnalysis.Symbolic;
    … …  
    3939  [Item("Linear Regression (LR)", "Linear regression data analysis algorithm (wrapper for ALGLIB).")]
    4040  [Creatable(CreatableAttribute.Categories.DataAnalysisRegression, Priority = 100)]
    41   [StorableClass]
     41  [StorableType("CF99D45E-F341-445E-9B9E-0587A8D9CBA7")]
    4242  public sealed class LinearRegression : FixedDataAnalysisAlgorithm<IRegressionProblem> {
    4343    private const string SolutionResultName = "Linear regression solution";
    … …  
    4545
    4646    [StorableConstructor]
    47     private LinearRegression(bool deserializing) : base(deserializing) { }
     47    private LinearRegression(StorableConstructorFlag _) : base(_) { }
    4848    private LinearRegression(LinearRegression original, Cloner cloner)
    4949      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearRegressionModel.cs

    r16449 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.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Problems.DataAnalysis;
    3030
    … …  
    3333  /// Represents a linear regression model
    3434  /// </summary>
    35   [StorableClass]
     35  [StorableType("B65FB0CA-7333-41FE-8156-FF141C54F5AF")]
    3636  [Item("Linear Regression Model", "Represents a linear regression model.")]
    3737  public sealed class LinearRegressionModel : RegressionModel, IConfidenceRegressionModel {
    … …  
    7575
    7676    [StorableConstructor]
    77     private LinearRegressionModel(bool deserializing)
    78       : base(deserializing) {
     77    private LinearRegressionModel(StorableConstructorFlag _) : base(_) {
    7978    }
    8079    private LinearRegressionModel(LinearRegressionModel original, Cloner cloner)

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassification.cs

    r15786 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.Optimization;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.Problems.DataAnalysis;
    3232
    … …  
    3737  [Item("Multinomial Logit Classification (MNL)", "Multinomial logit classification data analysis algorithm (wrapper for ALGLIB).")]
    3838  [Creatable(CreatableAttribute.Categories.DataAnalysisClassification, Priority = 180)]
    39   [StorableClass]
     39  [StorableType("F2797341-670A-491E-8652-0F154CBE99DC")]
    4040  public sealed class MultiNomialLogitClassification : FixedDataAnalysisAlgorithm<IClassificationProblem> {
    4141    private const string LogitClassificationModelResultName = "Logit classification solution";
    4242
    4343    [StorableConstructor]
    44     private MultiNomialLogitClassification(bool deserializing) : base(deserializing) { }
     44    private MultiNomialLogitClassification(StorableConstructorFlag _) : base(_) { }
    4545    private MultiNomialLogitClassification(MultiNomialLogitClassification original, Cloner cloner)
    4646      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassificationSolution.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525using HeuristicLab.Problems.DataAnalysis;
    2626
    … …  
    3030  /// </summary>
    3131  [Item("Multinomial Logit Classification Solution", "Represents a multinomial logit solution for a classification problem which can be visualized in the GUI.")]
    32   [StorableClass]
     32  [StorableType("A6F6F990-EF97-4A9C-8054-B38E39763FDB")]
    3333  public sealed class MultinomialLogitClassificationSolution : ClassificationSolution {
    3434
    … …  
    3939
    4040    [StorableConstructor]
    41     private MultinomialLogitClassificationSolution(bool deserializing) : base(deserializing) { }
     41    private MultinomialLogitClassificationSolution(StorableConstructorFlag _) : base(_) { }
    4242    private MultinomialLogitClassificationSolution(MultinomialLogitClassificationSolution original, Cloner cloner)
    4343      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitModel.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;
    2828using HeuristicLab.Problems.DataAnalysis;
    2929
    … …  
    3232  /// Represents a multinomial logit model for classification
    3333  /// </summary>
    34   [StorableClass]
     34  [StorableType("AC4174A4-9FBC-4B07-9239-1E0E6F86034D")]
    3535  [Item("Multinomial Logit Model", "Represents a multinomial logit model for classification.")]
    3636  public sealed class MultinomialLogitModel : ClassificationModel {
    … …  
    6060
    6161    [StorableConstructor]
    62     private MultinomialLogitModel(bool deserializing)
    63       : base(deserializing) {
    64       if (deserializing)
    65         logitModel = new alglib.logitmodel();
     62    private MultinomialLogitModel(StorableConstructorFlag _) : base(_) {
     63      logitModel = new alglib.logitmodel();
    6664    }
    6765    private MultinomialLogitModel(MultinomialLogitModel original, Cloner cloner)

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/Scaling.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;
    2828using HeuristicLab.Problems.DataAnalysis;
    2929
    3030namespace HeuristicLab.Algorithms.DataAnalysis {
    3131  [Obsolete("Use transformation classes in Problems.DataAnalysis instead")]
    32   [StorableClass]
     32  [StorableType("52EABC0F-B8D2-4ADD-ACC2-C825D3F1D6F3")]
    3333  [Item(Name = "Scaling", Description = "Contains information about scaling of variables for data-analysis algorithms.")]
    3434  public class Scaling : Item {
    … …  
    3636    private Dictionary<string, Tuple<double, double>> scalingParameters = new Dictionary<string, Tuple<double, double>>();
    3737    [StorableConstructor]
    38     protected Scaling(bool deserializing) : base(deserializing) { }
     38    protected Scaling(StorableConstructorFlag _) : base(_) { }
    3939    protected Scaling(Scaling original, Cloner cloner)
    4040      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.