Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/28/18 16:10:48 (6 years ago)
Author:
jkarder
Message:

#2520: worked on reintegration of new persistence

  • added nuget references to HEAL.Fossil
  • added StorableType attributes to many classes
  • changed signature of StorableConstructors
  • removed some classes in old persistence
  • removed some unnecessary usings
Location:
branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConfidenceBoundRegressionSolution.cs

    r16453 r16462  
    2323using System.Linq;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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    }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionModel.cs

    r16453 r16462  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Data;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    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) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionSolution.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    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)

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleModel.cs

    r16453 r16462  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    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) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleProblemData.cs

    r16453 r16462  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    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) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs

    r16453 r16462  
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Data;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    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    }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionModel.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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    }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    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); }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r16453 r16462  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    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() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolution.cs

    r16453 r16462  
    2323using System.Linq;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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    }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionBase.cs

    r16453 r16462  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    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) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionVariableImpactsCalculator.cs

    r16453 r16462  
    3030using HeuristicLab.Data;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    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 {
    … …  
    8585    #region Ctor/Cloner
    8686    [StorableConstructor]
    87     private RegressionSolutionVariableImpactsCalculator(bool deserializing) : base(deserializing) { }
     87    private RegressionSolutionVariableImpactsCalculator(StorableConstructorFlag _) : base(_) { }
    8888    private RegressionSolutionVariableImpactsCalculator(RegressionSolutionVariableImpactsCalculator original, Cloner cloner)
    8989      : base(original, cloner) { }
Note: See TracChangeset for help on using the changeset viewer.