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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Algorithms.DataAnalysis

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestClassification.cs

    r16071 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.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Problems.DataAnalysis;
    3030
    … …  
    3535  [Item("Random Forest Classification (RF)", "Random forest classification data analysis algorithm (wrapper for ALGLIB).")]
    3636  [Creatable(CreatableAttribute.Categories.DataAnalysisClassification, Priority = 120)]
    37   [StorableClass]
     37  [StorableType("73070CC7-E85E-4851-9F26-C537AE1CC1C0")]
    3838  public sealed class RandomForestClassification : FixedDataAnalysisAlgorithm<IClassificationProblem> {
    3939    private const string RandomForestClassificationModelResultName = "Random forest classification solution";
    … …  
    9393
    9494    [StorableConstructor]
    95     private RandomForestClassification(bool deserializing) : base(deserializing) { }
     95    private RandomForestClassification(StorableConstructorFlag _) : base(_) { }
    9696    private RandomForestClassification(RandomForestClassification original, Cloner cloner)
    9797      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestClassificationSolution.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("RandomForestClassificationSolution", "Represents a random forest solution for a classification problem which can be visualized in the GUI.")]
    32   [StorableClass]
     32  [StorableType("11D108AD-931C-4504-BA87-0D5CEB2C95A9")]
    3333  public sealed class RandomForestClassificationSolution : ClassificationSolution, IRandomForestClassificationSolution {
    3434
    … …  
    4343
    4444    [StorableConstructor]
    45     private RandomForestClassificationSolution(bool deserializing) : base(deserializing) { }
     45    private RandomForestClassificationSolution(StorableConstructorFlag _) : base(_) { }
    4646    private RandomForestClassificationSolution(RandomForestClassificationSolution original, Cloner cloner)
    4747      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestModel.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.Encodings.SymbolicExpressionTreeEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Problems.DataAnalysis;
    3030using HeuristicLab.Problems.DataAnalysis.Symbolic;
    … …  
    3434  /// Represents a random forest model for regression and classification
    3535  /// </summary>
    36   [StorableClass]
     36  [StorableType("A4F688CD-1F42-4103-8449-7DE52AEF6C69")]
    3737  [Item("RandomForestModel", "Represents a random forest for regression and classification.")]
    3838  public sealed class RandomForestModel : ClassificationModel, IRandomForestModel {
    … …  
    7171
    7272    [StorableConstructor]
    73     private RandomForestModel(bool deserializing)
    74       : base(deserializing) {
     73    private RandomForestModel(StorableConstructorFlag _) : base(_) {
    7574      // for backwards compatibility (loading old solutions)
    7675      randomForest = new alglib.decisionforest();

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestRegression.cs

    r16071 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.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Problems.DataAnalysis;
    3030
    … …  
    3535  [Item("Random Forest Regression (RF)", "Random forest regression data analysis algorithm (wrapper for ALGLIB).")]
    3636  [Creatable(CreatableAttribute.Categories.DataAnalysisRegression, Priority = 120)]
    37   [StorableClass]
     37  [StorableType("721CE0EB-82AF-4E49-9900-48E1C67B5E53")]
    3838  public sealed class RandomForestRegression : FixedDataAnalysisAlgorithm<IRegressionProblem> {
    3939    private const string RandomForestRegressionModelResultName = "Random forest regression solution";
    … …  
    9292    #endregion
    9393    [StorableConstructor]
    94     private RandomForestRegression(bool deserializing) : base(deserializing) { }
     94    private RandomForestRegression(StorableConstructorFlag _) : base(_) { }
    9595    private RandomForestRegression(RandomForestRegression original, Cloner cloner)
    9696      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestRegressionSolution.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.
    … …  
    2020#endregion
    2121
    22 using System;
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2625using HeuristicLab.Problems.DataAnalysis;
    27 using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
    2826
    2927namespace HeuristicLab.Algorithms.DataAnalysis {
    … …  
    3230  /// </summary>
    3331  [Item("RandomForestRegressionSolution", "Represents a random forest solution for a regression problem which can be visualized in the GUI.")]
    34   [StorableClass]
     32  [StorableType("29F87380-B32D-4BF6-B7F8-653B8AFFAC34")]
    3533  public sealed class RandomForestRegressionSolution : ConfidenceRegressionSolution, IRandomForestRegressionSolution {
    3634
    … …  
    4543
    4644    [StorableConstructor]
    47     private RandomForestRegressionSolution(bool deserializing) : base(deserializing) { }
     45    private RandomForestRegressionSolution(StorableConstructorFlag _) : base(_) { }
    4846    private RandomForestRegressionSolution(RandomForestRegressionSolution original, Cloner cloner)
    4947      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestUtil.cs

    r15583 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.
    … …  
    3131using HeuristicLab.Data;
    3232using HeuristicLab.Parameters;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     33using HEAL.Attic;
    3434using HeuristicLab.Problems.DataAnalysis;
    3535using HeuristicLab.Random;
    … …  
    3737namespace HeuristicLab.Algorithms.DataAnalysis {
    3838  [Item("RFParameter", "A random forest parameter collection")]
    39   [StorableClass]
     39  [StorableType("40E482DA-63C5-4D39-97C7-63701CF1D021")]
    4040  public class RFParameter : ParameterCollection {
    4141    public RFParameter() {
    … …  
    4646
    4747    [StorableConstructor]
    48     protected RFParameter(bool deserializing)
    49       : base(deserializing) {
     48    protected RFParameter(StorableConstructorFlag _) : base(_) {
    5049    }
    5150
Note: See TracChangeset for help on using the changeset viewer.