Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/28/19 12:41:36 (5 years ago)
Author:
gkronber
Message:

#2971: made branch compile with current version of trunk

Location:
branches/2971_named_intervals
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • branches/2971_named_intervals

    • Property svn:ignore set to
      packages

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConfidenceBoundRegressionSolution.cs

    r15583 r16628  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    2930  /// Represents a regression data analysis solution that supports confidence estimates
    3031  /// </summary>
    31   [StorableClass]
     32  [StorableType("70B75674-818D-4BCB-8EA3-A8AF0B539A06")]
    3233  public class ConfidenceRegressionSolution : RegressionSolution, IConfidenceRegressionSolution {
    3334    protected readonly Dictionary<int, double> varianceEvaluationCache;
    … …  
    3940
    4041    [StorableConstructor]
    41     protected ConfidenceRegressionSolution(bool deserializing)
    42       : base(deserializing) {
     42    protected ConfidenceRegressionSolution(StorableConstructorFlag _) : base(_) {
    4343      varianceEvaluationCache = new Dictionary<int, double>();
    4444    }

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionModel.cs

    r15583 r16628  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    2930
    3031namespace HeuristicLab.Problems.DataAnalysis {
    31   [StorableClass]
     32  [StorableType("4A79CAF4-DD03-4C07-B31D-060A122B0BA0")]
    3233  [Item("Constant Regression Model", "A model that always returns the same constant value regardless of the presented input data.")]
    3334  [Obsolete]
    … …  
    4344
    4445    [StorableConstructor]
    45     protected ConstantRegressionModel(bool deserializing) : base(deserializing) { }
     46    protected ConstantRegressionModel(StorableConstructorFlag _) : base(_) { }
    4647    protected ConstantRegressionModel(ConstantRegressionModel original, Cloner cloner)
    4748      : base(original, cloner) {

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionSolution.cs

    r15583 r16628  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Problems.DataAnalysis {
    27   [StorableClass]
     28  [StorableType("13429251-9E30-430A-B9CD-53B024B61E94")]
    2829  [Item(Name = "Constant Regression Solution", Description = "Represents a constant regression solution (model + data).")]
    2930  public class ConstantRegressionSolution : RegressionSolution {
    … …  
    3435
    3536    [StorableConstructor]
    36     protected ConstantRegressionSolution(bool deserializing) : base(deserializing) { }
     37    protected ConstantRegressionSolution(StorableConstructorFlag _) : base(_) { }
    3738    protected ConstantRegressionSolution(ConstantRegressionSolution original, Cloner cloner) : base(original, cloner) { }
    3839    public ConstantRegressionSolution(ConstantModel model, IRegressionProblemData problemData)

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleModel.cs

    r15583 r16628  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3132  /// Represents regression solutions that contain an ensemble of multiple regression models
    3233  /// </summary>
    33   [StorableClass]
     34  [StorableType("CB2F632E-DDF3-47B4-98E8-E7C87BA30301")]
    3435  [Item("RegressionEnsembleModel", "A regression model that contains an ensemble of multiple regression models")]
    3536  public sealed class RegressionEnsembleModel : RegressionModel, IRegressionEnsembleModel {
    … …  
    8990
    9091    [StorableConstructor]
    91     private RegressionEnsembleModel(bool deserializing) : base(deserializing) { }
     92    private RegressionEnsembleModel(StorableConstructorFlag _) : base(_) { }
    9293    private RegressionEnsembleModel(RegressionEnsembleModel original, Cloner cloner)
    9394      : base(original, cloner) {

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleProblemData.cs

    r15583 r16628  
    2626using HeuristicLab.Parameters;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableClass]
     31  [StorableType("B6B0985C-C443-42D4-A15C-3B3CCD3710D3")]
    3132  [Item("RegressionEnsembleProblemData", "Represents an item containing all data defining a regression problem.")]
    3233  public sealed class RegressionEnsembleProblemData : RegressionProblemData {
    … …  
    6263
    6364    [StorableConstructor]
    64     private RegressionEnsembleProblemData(bool deserializing) : base(deserializing) { }
     65    private RegressionEnsembleProblemData(StorableConstructorFlag _) : base(_) { }
    6566    private RegressionEnsembleProblemData(RegressionEnsembleProblemData original, Cloner cloner) : base(original, cloner) { }
    6667    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs

    r15583 r16628  
    2828using HeuristicLab.Data;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3334  /// Represents regression solutions that contain an ensemble of multiple regression models
    3435  /// </summary>
    35   [StorableClass]
     36  [StorableType("A17F96F4-55AE-4A2F-9FA6-07231D1F7E55")]
    3637  [Item("Regression Ensemble Solution", "A regression solution that contains an ensemble of multiple regression models")]
    3738  [Creatable(CreatableAttribute.Categories.DataAnalysisEnsembles, Priority = 100)]
    … …  
    6263
    6364    [StorableConstructor]
    64     private RegressionEnsembleSolution(bool deserializing)
    65       : base(deserializing) {
     65    private RegressionEnsembleSolution(StorableConstructorFlag _) : base(_) {
    6666      regressionSolutions = new ItemCollection<IRegressionSolution>();
    6767    }

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionModel.cs

    r16243 r16628  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.DataAnalysis {
    29   [StorableClass]
     30  [StorableType("E95D7427-C747-40C2-AB4F-A1048EDECEC0")]
    3031  [Item("Regression Model", "Base class for all regression models.")]
    3132  public abstract class RegressionModel : DataAnalysisModel, IRegressionModel {
    … …  
    4142    }
    4243
    43     protected RegressionModel(bool deserializing)
    44       : base(deserializing) {
     44    [StorableConstructor]
     45    protected RegressionModel(StorableConstructorFlag _) : base(_) {
    4546      targetVariable = string.Empty;
    4647    }

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs

    r15583 r16628  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Problems.DataAnalysis {
    27   [StorableClass]
     28  [StorableType("D5CFFB52-FE65-432C-B245-927AA7DC3919")]
    2829  [Item("Regression Problem", "A general regression problem.")]
    2930  public class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>, IRegressionProblem, IStorableContent {
    … …  
    3132
    3233    [StorableConstructor]
    33     protected RegressionProblem(bool deserializing) : base(deserializing) { }
     34    protected RegressionProblem(StorableConstructorFlag _) : base(_) { }
    3435    protected RegressionProblem(RegressionProblem original, Cloner cloner) : base(original, cloner) { }
    3536    public override IDeepCloneable Clone(Cloner cloner) { return new RegressionProblem(this, cloner); }

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

    r16592 r16628  
    3030using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131using HeuristicLab.Problems.DataAnalysis.Implementation;
     32using HEAL.Attic;
    3233
    3334namespace HeuristicLab.Problems.DataAnalysis {
    34   [StorableClass]
     35  [StorableType("6538FC76-4A82-482C-93DA-04A49C3F7AF4")]
    3536  [Item("RegressionProblemData", "Represents an item containing all data defining a regression problem.")]
    3637  public class RegressionProblemData : DataAnalysisProblemData, IRegressionProblemData, IStorableContent {
    … …  
    136137
    137138    [StorableConstructor]
    138     protected RegressionProblemData(bool deserializing) : base(deserializing) { }
     139    protected RegressionProblemData(StorableConstructorFlag _) : base(_) { }
    139140    [StorableHook(HookType.AfterDeserialization)]
    140141    private void AfterDeserialization() {

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolution.cs

    r15583 r16628  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    2930  /// Represents a regression data analysis solution
    3031  /// </summary>
    31   [StorableClass]
     32  [StorableType("CE8CB5F3-6BC8-448B-80A0-DDCEDDB4F062")]
    3233  public class RegressionSolution : RegressionSolutionBase {
    3334    protected readonly Dictionary<int, double> evaluationCache;
    3435
    3536    [StorableConstructor]
    36     protected RegressionSolution(bool deserializing)
    37       : base(deserializing) {
     37    protected RegressionSolution(StorableConstructorFlag _) : base(_) {
    3838      evaluationCache = new Dictionary<int, double>();
    3939    }

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionBase.cs

    r16244 r16628  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableClass]
     31  [StorableType("881E9898-C5F3-43E2-8928-891BDE6A36D9")]
    3132  public abstract class RegressionSolutionBase : DataAnalysisSolution, IRegressionSolution {
    3233    protected const string TrainingMeanSquaredErrorResultName = "Mean squared error (training)";
    … …  
    160161
    161162    [StorableConstructor]
    162     protected RegressionSolutionBase(bool deserializing) : base(deserializing) { }
     163    protected RegressionSolutionBase(StorableConstructorFlag _) : base(_) { }
    163164    protected RegressionSolutionBase(RegressionSolutionBase original, Cloner cloner)
    164165      : base(original, cloner) {

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionVariableImpactsCalculator.cs

    r16536 r16628  
    3232using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333using HeuristicLab.Random;
     34using HEAL.Attic;
    3435
    3536namespace HeuristicLab.Problems.DataAnalysis {
    36   [StorableClass]
     37  [StorableType("B7D9FC3E-4623-4C94-9567-471CD06EB0B5")]
    3738  [Item("RegressionSolution Impacts Calculator", "Calculation of the impacts of input variables for any regression solution")]
    3839  public sealed class RegressionSolutionVariableImpactsCalculator : ParameterizedNamedItem {
    … …  
    8586    #region Ctor/Cloner
    8687    [StorableConstructor]
    87     private RegressionSolutionVariableImpactsCalculator(bool deserializing) : base(deserializing) { }
     88    private RegressionSolutionVariableImpactsCalculator(StorableConstructorFlag _) : base(_) { }
    8889    private RegressionSolutionVariableImpactsCalculator(RegressionSolutionVariableImpactsCalculator original, Cloner cloner)
    8990      : base(original, cloner) { }
Note: See TracChangeset for help on using the changeset viewer.