- Timestamp:
- 01/28/19 13:41:42 (6 years ago)
- Location:
- trunk
- Files:
-
- 57 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration (added) merged: 16451-16454,16462,16465-16468,16470-16472,16474,16476-16477,16479-16487,16529-16530,16539,16551-16555,16558-16559,16562-16564
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis (added) merged: 16452-16454,16462,16476,16529,16539,16558-16559
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis/3.4
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4 (added) merged: 16452-16454,16462,16476,16529,16539,16558-16559
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleModel.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Problems.DataAnalysis { … … 30 30 /// Represents classification solutions that contain an ensemble of multiple classification models 31 31 /// </summary> 32 [Storable Class]32 [StorableType("0F720A40-5CC2-4E2B-8D4E-CCAD8EB56E43")] 33 33 [Item("ClassificationEnsembleModel", "A classification model that contains an ensemble of multiple classification models")] 34 34 public class ClassificationEnsembleModel : ClassificationModel, IClassificationEnsembleModel { … … 44 44 45 45 [StorableConstructor] 46 protected ClassificationEnsembleModel( bool deserializing) : base(deserializing) { }46 protected ClassificationEnsembleModel(StorableConstructorFlag _) : base(_) { } 47 47 protected ClassificationEnsembleModel(ClassificationEnsembleModel original, Cloner cloner) 48 48 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleProblemData.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Data; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.DataAnalysis { 30 [Storable Class]30 [StorableType("58768587-0920-4B52-95E4-66B54E8E837C")] 31 31 [Item("ClassificationEnsembleProblemData", "Represents an item containing all data defining a classification problem.")] 32 32 public class ClassificationEnsembleProblemData : ClassificationProblemData { … … 65 65 66 66 [StorableConstructor] 67 protected ClassificationEnsembleProblemData( bool deserializing) : base(deserializing) { }67 protected ClassificationEnsembleProblemData(StorableConstructorFlag _) : base(_) { } 68 68 protected ClassificationEnsembleProblemData(ClassificationEnsembleProblemData original, Cloner cloner) : base(original, cloner) { } 69 69 public override IDeepCloneable Clone(Cloner cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleSolution.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Core; 28 28 using HeuristicLab.Data; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Problems.DataAnalysis { … … 33 33 /// Represents classification solutions that contain an ensemble of multiple classification models 34 34 /// </summary> 35 [Storable Class]35 [StorableType("4CDD22EE-B53D-4899-A77E-C503FF9EBC8E")] 36 36 [Item("Classification Ensemble Solution", "A classification solution that contains an ensemble of multiple classification models")] 37 37 [Creatable(CreatableAttribute.Categories.DataAnalysisEnsembles, Priority = 110)] … … 61 61 62 62 [StorableConstructor] 63 private ClassificationEnsembleSolution(bool deserializing) 64 : base(deserializing) { 63 private ClassificationEnsembleSolution(StorableConstructorFlag _) : base(_) { 65 64 classificationSolutions = new ItemCollection<IClassificationSolution>(); 66 65 } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationModel.cs
r16243 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Problems.DataAnalysis { 29 [Storable Class]29 [StorableType("7E6091F9-86FD-4C47-8935-9C35CAB4261B")] 30 30 [Item("Classification Model", "Base class for all classification models.")] 31 31 public abstract class ClassificationModel : DataAnalysisModel, IClassificationModel { … … 41 41 } 42 42 43 protected ClassificationModel(bool deserializing) 44 : base(deserializing) { 43 [StorableConstructor] 44 protected ClassificationModel(StorableConstructorFlag _) 45 : base(_) { 45 46 targetVariable = string.Empty; 46 47 } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationPerformanceMeasures.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Data; 25 25 using HeuristicLab.Optimization; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Problems.DataAnalysis { 29 [Storable Class]29 [StorableType("6F44E140-22CF-48D3-B100-B6013F2B6608")] 30 30 public class ClassificationPerformanceMeasuresResultCollection : ResultCollection { 31 31 #region result names … … 54 54 } 55 55 [StorableConstructor] 56 protected ClassificationPerformanceMeasuresResultCollection(bool deserializing) 57 : base(deserializing) { 56 protected ClassificationPerformanceMeasuresResultCollection(StorableConstructorFlag _) : base(_) { 58 57 } 59 58 -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 26 26 namespace HeuristicLab.Problems.DataAnalysis { 27 [Storable Class]27 [StorableType("93696570-A410-4885-A210-7220771B6050")] 28 28 [Item("Classification Problem", "A general classification problem.")] 29 29 public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem, IStorableContent { … … 31 31 32 32 [StorableConstructor] 33 protected ClassificationProblem( bool deserializing) : base(deserializing) { }33 protected ClassificationProblem(StorableConstructorFlag _) : base(_) { } 34 34 protected ClassificationProblem(ClassificationProblem original, Cloner cloner) : base(original, cloner) { } 35 35 public override IDeepCloneable Clone(Cloner cloner) { return new ClassificationProblem(this, cloner); } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs
r16244 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Data; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Problems.DataAnalysis { 32 [Storable Class]32 [StorableType("1C8DCCCF-4E2A-421D-9C61-7C017D584054")] 33 33 [Item("ClassificationProblemData", "Represents an item containing all data defining a classification problem.")] 34 34 public class ClassificationProblemData : DataAnalysisProblemData, IClassificationProblemData, IStorableContent { … … 279 279 280 280 [StorableConstructor] 281 protected ClassificationProblemData( bool deserializing) : base(deserializing) { }281 protected ClassificationProblemData(StorableConstructorFlag _) : base(_) { } 282 282 [StorableHook(HookType.AfterDeserialization)] 283 283 private void AfterDeserialization() { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolution.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using System.Linq; 24 24 using HeuristicLab.Common; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.DataAnalysis { … … 29 29 /// Represents a classification data analysis solution 30 30 /// </summary> 31 [Storable Class]31 [StorableType("A240D831-23D6-4432-A105-12D02D2EA75A")] 32 32 public class ClassificationSolution : ClassificationSolutionBase { 33 33 protected readonly Dictionary<int, double> evaluationCache; 34 34 35 35 [StorableConstructor] 36 protected ClassificationSolution(bool deserializing) 37 : base(deserializing) { 36 protected ClassificationSolution(StorableConstructorFlag _) : base(_) { 38 37 evaluationCache = new Dictionary<int, double>(); 39 38 } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolutionBase.cs
r16244 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Data; 27 27 using HeuristicLab.Optimization; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 using HeuristicLab.Problems.DataAnalysis.OnlineCalculators; 30 30 31 31 namespace HeuristicLab.Problems.DataAnalysis { 32 [Storable Class]32 [StorableType("60599497-EAF0-4DB0-B2E4-D58F34458D8F")] 33 33 public abstract class ClassificationSolutionBase : DataAnalysisSolution, IClassificationSolution { 34 34 private const string TrainingAccuracyResultName = "Accuracy (training)"; … … 78 78 79 79 [StorableConstructor] 80 protected ClassificationSolutionBase( bool deserializing) : base(deserializing) { }80 protected ClassificationSolutionBase(StorableConstructorFlag _) : base(_) { } 81 81 protected ClassificationSolutionBase(ClassificationSolutionBase original, Cloner cloner) 82 82 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolutionVariableImpactsCalculator.cs
r16422 r16565 2 2 3 3 /* HeuristicLab 4 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 5 5 * 6 6 * This file is part of HeuristicLab. … … 30 30 using HeuristicLab.Data; 31 31 using HeuristicLab.Parameters; 32 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;32 using HEAL.Attic; 33 33 using HeuristicLab.Random; 34 34 35 35 namespace HeuristicLab.Problems.DataAnalysis { 36 [Storable Class]36 [StorableType("768AFEDB-5641-429E-85A1-A0BE8DFDD56F")] 37 37 [Item("ClassificationSolution Impacts Calculator", "Calculation of the impacts of input variables for any classification solution")] 38 38 public sealed class ClassificationSolutionVariableImpactsCalculator : ParameterizedNamedItem { 39 39 #region Parameters/Properties 40 [StorableType("e6cd2226-10cd-4765-ae1a-924e316b6aac")] 40 41 public enum ReplacementMethodEnum { 41 42 Median, … … 44 45 Noise 45 46 } 47 48 [StorableType("84d84ccf-5d6d-432f-a946-eb499935e5c8")] 46 49 public enum FactorReplacementMethodEnum { 47 50 Best, … … 49 52 Shuffle 50 53 } 54 55 [StorableType("70f30113-df01-41b4-9e3b-2982035de498")] 51 56 public enum DataPartitionEnum { 52 57 Training, … … 85 90 #region Ctor/Cloner 86 91 [StorableConstructor] 87 private ClassificationSolutionVariableImpactsCalculator( bool deserializing) : base(deserializing) { }92 private ClassificationSolutionVariableImpactsCalculator(StorableConstructorFlag _) : base(_) { } 88 93 private ClassificationSolutionVariableImpactsCalculator(ClassificationSolutionVariableImpactsCalculator original, Cloner cloner) 89 94 : base(original, cloner) { } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ConstantClassificationSolution.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 26 26 namespace HeuristicLab.Problems.DataAnalysis { 27 [Storable Class]27 [StorableType("D5A42FE7-D21B-48F7-A812-FE69724D0098")] 28 28 [Item(Name = "Constant Classification Solution", Description = "Represents a constant classification solution (model + data).")] 29 29 public class ConstantClassificationSolution : ClassificationSolution { … … 34 34 35 35 [StorableConstructor] 36 protected ConstantClassificationSolution( bool deserializing) : base(deserializing) { }36 protected ConstantClassificationSolution(StorableConstructorFlag _) : base(_) { } 37 37 protected ConstantClassificationSolution(ConstantClassificationSolution original, Cloner cloner) : base(original, cloner) { } 38 38 public ConstantClassificationSolution(ConstantModel model, IClassificationProblemData problemData) -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationModel.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Common; 26 26 using HeuristicLab.Core; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.DataAnalysis { … … 31 31 /// Represents discriminant function classification data analysis models. 32 32 /// </summary> 33 [Storable Class]33 [StorableType("E7A8648D-C938-499F-A712-185542095708")] 34 34 [Item("DiscriminantFunctionClassificationModel", "Represents a classification model that uses a discriminant function and classification thresholds.")] 35 35 public class DiscriminantFunctionClassificationModel : ClassificationModel, IDiscriminantFunctionClassificationModel { … … 68 68 69 69 [StorableConstructor] 70 protected DiscriminantFunctionClassificationModel( bool deserializing) : base(deserializing) { }70 protected DiscriminantFunctionClassificationModel(StorableConstructorFlag _) : base(_) { } 71 71 protected DiscriminantFunctionClassificationModel(DiscriminantFunctionClassificationModel original, Cloner cloner) 72 72 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationSolution.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Problems.DataAnalysis { … … 30 30 /// Represents a classification solution that uses a discriminant function and classification thresholds. 31 31 /// </summary> 32 [Storable Class]32 [StorableType("A3480DF9-49E7-4329-AD23-57B4441033C1")] 33 33 [Item("DiscriminantFunctionClassificationSolution", "Represents a classification solution that uses a discriminant function and classification thresholds.")] 34 34 public class DiscriminantFunctionClassificationSolution : DiscriminantFunctionClassificationSolutionBase { … … 37 37 38 38 [StorableConstructor] 39 protected DiscriminantFunctionClassificationSolution(bool deserializing) 40 : base(deserializing) { 39 protected DiscriminantFunctionClassificationSolution(StorableConstructorFlag _) : base(_) { 41 40 valueEvaluationCache = new Dictionary<int, double>(); 42 41 classValueEvaluationCache = new Dictionary<int, double>(); -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationSolutionBase.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Data; 28 28 using HeuristicLab.Optimization; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Problems.DataAnalysis { … … 33 33 /// Represents a classification solution that uses a discriminant function and classification thresholds. 34 34 /// </summary> 35 [Storable Class]35 [StorableType("3668EBE0-128C-4BC4-902C-161670F98FAD")] 36 36 [Item("DiscriminantFunctionClassificationSolution", "Represents a classification solution that uses a discriminant function and classification thresholds.")] 37 37 public abstract class DiscriminantFunctionClassificationSolutionBase : ClassificationSolutionBase, IDiscriminantFunctionClassificationSolution { … … 74 74 75 75 [StorableConstructor] 76 protected DiscriminantFunctionClassificationSolutionBase( bool deserializing) : base(deserializing) { }76 protected DiscriminantFunctionClassificationSolutionBase(StorableConstructorFlag _) : base(_) { } 77 77 protected DiscriminantFunctionClassificationSolutionBase(DiscriminantFunctionClassificationSolutionBase original, Cloner cloner) 78 78 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ThresholdCalculators/AccuracyMaximizationThresholdCalculator.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Common; 26 26 using HeuristicLab.Core; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.DataAnalysis { … … 31 31 /// Represents a threshold calculator that maximizes the weighted accuracy of the classifcation model. 32 32 /// </summary> 33 [Storable Class]33 [StorableType("30BB9513-542D-4CB8-931B-9767C9CB2EFB")] 34 34 [Item("AccuracyMaximizationThresholdCalculator", "Represents a threshold calculator that maximizes the weighted accuracy of the classifcation model.")] 35 35 public class AccuracyMaximizationThresholdCalculator : ThresholdCalculator { 36 36 37 37 [StorableConstructor] 38 protected AccuracyMaximizationThresholdCalculator( bool deserializing) : base(deserializing) { }38 protected AccuracyMaximizationThresholdCalculator(StorableConstructorFlag _) : base(_) { } 39 39 protected AccuracyMaximizationThresholdCalculator(AccuracyMaximizationThresholdCalculator original, Cloner cloner) 40 40 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ThresholdCalculators/NormalDistributionCutPointsThresholdCalculator.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Common; 26 26 using HeuristicLab.Core; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.DataAnalysis { … … 31 31 /// Represents a threshold calculator that calculates thresholds as the cutting points between the estimated class distributions (assuming normally distributed class values). 32 32 /// </summary> 33 [Storable Class]33 [StorableType("D01CB5DC-606B-4CE9-B293-2D4D80A70BB8")] 34 34 [Item("NormalDistributionCutPointsThresholdCalculator", "Represents a threshold calculator that calculates thresholds as the cutting points between the estimated class distributions (assuming normally distributed class values).")] 35 35 public class NormalDistributionCutPointsThresholdCalculator : ThresholdCalculator { 36 36 37 37 [StorableConstructor] 38 protected NormalDistributionCutPointsThresholdCalculator( bool deserializing) : base(deserializing) { }38 protected NormalDistributionCutPointsThresholdCalculator(StorableConstructorFlag _) : base(_) { } 39 39 protected NormalDistributionCutPointsThresholdCalculator(NormalDistributionCutPointsThresholdCalculator original, Cloner cloner) 40 40 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ThresholdCalculators/ThresholdCalculator.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.DataAnalysis { … … 29 29 /// Base class for threshold calculators for discriminant function classification models. 30 30 /// </summary> 31 [Storable Class]31 [StorableType("F56CDC6C-D4F5-4B2D-A7C4-04E0D2255699")] 32 32 public abstract class ThresholdCalculator : NamedItem, IDiscriminantFunctionThresholdCalculator { 33 33 34 34 [StorableConstructor] 35 protected ThresholdCalculator( bool deserializing) : base(deserializing) { }35 protected ThresholdCalculator(StorableConstructorFlag _) : base(_) { } 36 36 protected ThresholdCalculator(ThresholdCalculator original, Cloner cloner) 37 37 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblem.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 26 26 namespace HeuristicLab.Problems.DataAnalysis { 27 [Storable Class]27 [StorableType("CB64B930-3C95-4663-B583-712B42E33712")] 28 28 [Item("Clustering Problem", "A general clustering problem.")] 29 29 public class ClusteringProblem : DataAnalysisProblem<IClusteringProblemData>, IClusteringProblem { 30 30 [StorableConstructor] 31 protected ClusteringProblem( bool deserializing) : base(deserializing) { }31 protected ClusteringProblem(StorableConstructorFlag _) : base(_) { } 32 32 protected ClusteringProblem(ClusteringProblem original, Cloner cloner) : base(original, cloner) { } 33 33 public override IDeepCloneable Clone(Cloner cloner) { return new ClusteringProblem(this, cloner); } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblemData.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Problems.DataAnalysis { 29 [Storable Class]29 [StorableType("B74A767A-86ED-4B0E-BC01-82A4509CB81B")] 30 30 [Item("ClusteringProblemData", "Represents an item containing all data defining a clustering problem.")] 31 31 public sealed class ClusteringProblemData : DataAnalysisProblemData, IClusteringProblemData, IStorableContent { … … 72 72 73 73 [StorableConstructor] 74 private ClusteringProblemData( bool deserializing) : base(deserializing) { }74 private ClusteringProblemData(StorableConstructorFlag _) : base(_) { } 75 75 [StorableHook(HookType.AfterDeserialization)] 76 76 private void AfterDeserialization() { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringSolution.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using System.Linq; 24 24 using HeuristicLab.Common; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.DataAnalysis { … … 29 29 /// Represents a clustering data analysis solution 30 30 /// </summary> 31 [Storable Class]31 [StorableType("51241A39-F5C6-4DC8-A27A-83875FFCB51B")] 32 32 public class ClusteringSolution : DataAnalysisSolution, IClusteringSolution { 33 33 34 34 [StorableConstructor] 35 protected ClusteringSolution( bool deserializing) : base(deserializing) { }35 protected ClusteringSolution(StorableConstructorFlag _) : base(_) { } 36 36 protected ClusteringSolution(ClusteringSolution original, Cloner cloner) 37 37 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/ConstantModel.cs
r16243 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Core; 27 27 using HeuristicLab.Data; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Problems.DataAnalysis { 31 [Storable Class]31 [StorableType("CAE567A8-86A4-4554-BF89-79FFFB4204D1")] 32 32 [Item("Constant Model", "A model that always returns the same constant value regardless of the presented input data.")] 33 33 public class ConstantModel : RegressionModel, IClassificationModel, ITimeSeriesPrognosisModel, IStringConvertibleValue { … … 43 43 44 44 [StorableConstructor] 45 protected ConstantModel( bool deserializing) : base(deserializing) { }45 protected ConstantModel(StorableConstructorFlag _) : base(_) { } 46 46 protected ConstantModel(ConstantModel original, Cloner cloner) 47 47 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisModel.cs
r16243 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Problems.DataAnalysis { 29 [Storable Class]29 [StorableType("EF0EF64F-392A-448A-B30F-1AE113C6CC88")] 30 30 [Item("DataAnalysisModel", "Base class for data analysis models.")] 31 31 public abstract class DataAnalysisModel : NamedItem, IDataAnalysisModel { 32 32 [StorableConstructor] 33 protected DataAnalysisModel( bool deserializing) : base(deserializing) { }33 protected DataAnalysisModel(StorableConstructorFlag _) : base(_) { } 34 34 protected DataAnalysisModel(DataAnalysisModel original, Cloner cloner) 35 35 : base(original, cloner) { } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblem.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Optimization; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 using HeuristicLab.Problems.Instances; 29 29 30 30 namespace HeuristicLab.Problems.DataAnalysis { 31 [Storable Class]31 [StorableType("67267E9F-8A34-4CB6-9776-DD1483131987")] 32 32 public abstract class DataAnalysisProblem<T> : Problem, IDataAnalysisProblem<T>, 33 33 IProblemInstanceConsumer<T>, IProblemInstanceExporter<T> … … 57 57 } 58 58 [StorableConstructor] 59 protected DataAnalysisProblem( bool deserializing) : base(deserializing) { }59 protected DataAnalysisProblem(StorableConstructorFlag _) : base(_) { } 60 60 61 61 protected DataAnalysisProblem(T problemData) -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs
r16244 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using System.Text;26 25 using HeuristicLab.Collections; 27 26 using HeuristicLab.Common; … … 29 28 using HeuristicLab.Data; 30 29 using HeuristicLab.Parameters; 31 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 32 31 33 32 namespace HeuristicLab.Problems.DataAnalysis { 34 [Storable Class]33 [StorableType("85AE1542-D563-434F-A760-1D181EFC2101")] 35 34 public abstract class DataAnalysisProblemData : ParameterizedNamedItem, IDataAnalysisProblemData { 36 35 protected const string DatasetParameterName = "Dataset"; … … 144 143 } 145 144 [StorableConstructor] 146 protected DataAnalysisProblemData( bool deserializing) : base(deserializing) { }145 protected DataAnalysisProblemData(StorableConstructorFlag _) : base(_) { } 147 146 148 147 [StorableHook(HookType.AfterDeserialization)] -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisSolution.cs
r16244 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Common; 26 26 using HeuristicLab.Optimization; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.DataAnalysis { … … 31 31 /// Abstract base class for data analysis solutions 32 32 /// </summary> 33 [Storable Class]33 [StorableType("339E0EAD-07D7-44C5-8E1D-AE9B2AA9A67D")] 34 34 public abstract class DataAnalysisSolution : ResultCollection, IDataAnalysisSolution { 35 35 private const string ModelResultName = "Model"; … … 72 72 73 73 [StorableConstructor] 74 protected DataAnalysisSolution( bool deserializing) : base(deserializing) { }74 protected DataAnalysisSolution(StorableConstructorFlag _) : base(_) { } 75 75 protected DataAnalysisSolution(DataAnalysisSolution original, Cloner cloner) 76 76 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval.cs
r16407 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using System.Linq; 25 25 using HeuristicLab.Common; 26 using HEAL.Attic; 26 27 27 28 namespace HeuristicLab.Problems.DataAnalysis { 29 [StorableType("849e42d3-8934-419d-9aff-64ad81c06b67")] 28 30 public class Interval : IEquatable<Interval> { 31 [Storable] 29 32 public double LowerBound { get; private set; } 33 [Storable] 30 34 public double UpperBound { get; private set; } 31 35 -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConfidenceBoundRegressionSolution.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using System.Linq; 24 24 using HeuristicLab.Common; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.DataAnalysis { … … 29 29 /// Represents a regression data analysis solution that supports confidence estimates 30 30 /// </summary> 31 [Storable Class]31 [StorableType("C2D0DE07-E8F0-4850-AAF3-E2885EC1DDB6")] 32 32 public class ConfidenceRegressionSolution : RegressionSolution, IConfidenceRegressionSolution { 33 33 protected readonly Dictionary<int, double> varianceEvaluationCache; … … 39 39 40 40 [StorableConstructor] 41 protected ConfidenceRegressionSolution(bool deserializing) 42 : base(deserializing) { 41 protected ConfidenceRegressionSolution(StorableConstructorFlag _) : base(_) { 43 42 varianceEvaluationCache = new Dictionary<int, double>(); 44 43 } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionModel.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Core; 27 27 using HeuristicLab.Data; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Problems.DataAnalysis { 31 [Storable Class]31 [StorableType("E4C0D707-F668-428F-951C-F82A475177BE")] 32 32 [Item("Constant Regression Model", "A model that always returns the same constant value regardless of the presented input data.")] 33 33 [Obsolete] … … 43 43 44 44 [StorableConstructor] 45 protected ConstantRegressionModel( bool deserializing) : base(deserializing) { }45 protected ConstantRegressionModel(StorableConstructorFlag _) : base(_) { } 46 46 protected ConstantRegressionModel(ConstantRegressionModel original, Cloner cloner) 47 47 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ConstantRegressionSolution.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 26 26 namespace HeuristicLab.Problems.DataAnalysis { 27 [Storable Class]27 [StorableType("4DDDFDFA-3AF5-468F-971F-26B8AB014338")] 28 28 [Item(Name = "Constant Regression Solution", Description = "Represents a constant regression solution (model + data).")] 29 29 public class ConstantRegressionSolution : RegressionSolution { … … 34 34 35 35 [StorableConstructor] 36 protected ConstantRegressionSolution( bool deserializing) : base(deserializing) { }36 protected ConstantRegressionSolution(StorableConstructorFlag _) : base(_) { } 37 37 protected ConstantRegressionSolution(ConstantRegressionSolution original, Cloner cloner) : base(original, cloner) { } 38 38 public ConstantRegressionSolution(ConstantModel model, IRegressionProblemData problemData) -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleModel.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Common; 26 26 using HeuristicLab.Core; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.DataAnalysis { … … 31 31 /// Represents regression solutions that contain an ensemble of multiple regression models 32 32 /// </summary> 33 [Storable Class]33 [StorableType("202C33A2-2B7A-42E2-B3F3-BE1C9A9B5B84")] 34 34 [Item("RegressionEnsembleModel", "A regression model that contains an ensemble of multiple regression models")] 35 35 public sealed class RegressionEnsembleModel : RegressionModel, IRegressionEnsembleModel { … … 89 89 90 90 [StorableConstructor] 91 private RegressionEnsembleModel( bool deserializing) : base(deserializing) { }91 private RegressionEnsembleModel(StorableConstructorFlag _) : base(_) { } 92 92 private RegressionEnsembleModel(RegressionEnsembleModel original, Cloner cloner) 93 93 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleProblemData.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Data; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.DataAnalysis { 30 [Storable Class]30 [StorableType("CB105C71-FA47-4FFC-BF56-57B6BB2E0BC7")] 31 31 [Item("RegressionEnsembleProblemData", "Represents an item containing all data defining a regression problem.")] 32 32 public sealed class RegressionEnsembleProblemData : RegressionProblemData { … … 62 62 63 63 [StorableConstructor] 64 private RegressionEnsembleProblemData( bool deserializing) : base(deserializing) { }64 private RegressionEnsembleProblemData(StorableConstructorFlag _) : base(_) { } 65 65 private RegressionEnsembleProblemData(RegressionEnsembleProblemData original, Cloner cloner) : base(original, cloner) { } 66 66 public override IDeepCloneable Clone(Cloner cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Core; 28 28 using HeuristicLab.Data; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Problems.DataAnalysis { … … 33 33 /// Represents regression solutions that contain an ensemble of multiple regression models 34 34 /// </summary> 35 [Storable Class]35 [StorableType("C5B38C31-4307-48E4-9BCD-6797C329E018")] 36 36 [Item("Regression Ensemble Solution", "A regression solution that contains an ensemble of multiple regression models")] 37 37 [Creatable(CreatableAttribute.Categories.DataAnalysisEnsembles, Priority = 100)] … … 62 62 63 63 [StorableConstructor] 64 private RegressionEnsembleSolution(bool deserializing) 65 : base(deserializing) { 64 private RegressionEnsembleSolution(StorableConstructorFlag _) : base(_) { 66 65 regressionSolutions = new ItemCollection<IRegressionSolution>(); 67 66 } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionModel.cs
r16243 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 28 28 namespace HeuristicLab.Problems.DataAnalysis { 29 [Storable Class]29 [StorableType("2998B895-4724-489C-A4CA-9ADD10C7CA49")] 30 30 [Item("Regression Model", "Base class for all regression models.")] 31 31 public abstract class RegressionModel : DataAnalysisModel, IRegressionModel { … … 41 41 } 42 42 43 protected RegressionModel(bool deserializing) 44 : base(deserializing) { 43 [StorableConstructor] 44 protected RegressionModel(StorableConstructorFlag _) 45 : base(_) { 45 46 targetVariable = string.Empty; 46 47 } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 26 26 namespace HeuristicLab.Problems.DataAnalysis { 27 [Storable Class]27 [StorableType("BD8AFF60-E8BE-4325-B1AC-08B7BDF37865")] 28 28 [Item("Regression Problem", "A general regression problem.")] 29 29 public class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>, IRegressionProblem, IStorableContent { … … 31 31 32 32 [StorableConstructor] 33 protected RegressionProblem( bool deserializing) : base(deserializing) { }33 protected RegressionProblem(StorableConstructorFlag _) : base(_) { } 34 34 protected RegressionProblem(RegressionProblem original, Cloner cloner) : base(original, cloner) { } 35 35 public override IDeepCloneable Clone(Cloner cloner) { return new RegressionProblem(this, cloner); } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs
r16244 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Data; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Problems.DataAnalysis { 32 [Storable Class]32 [StorableType("EE612297-B1AF-42D2-BF21-AF9A2D42791C")] 33 33 [Item("RegressionProblemData", "Represents an item containing all data defining a regression problem.")] 34 34 public class RegressionProblemData : DataAnalysisProblemData, IRegressionProblemData, IStorableContent { … … 122 122 123 123 [StorableConstructor] 124 protected RegressionProblemData( bool deserializing) : base(deserializing) { }124 protected RegressionProblemData(StorableConstructorFlag _) : base(_) { } 125 125 [StorableHook(HookType.AfterDeserialization)] 126 126 private void AfterDeserialization() { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolution.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using System.Linq; 24 24 using HeuristicLab.Common; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.DataAnalysis { … … 29 29 /// Represents a regression data analysis solution 30 30 /// </summary> 31 [Storable Class]31 [StorableType("00A95897-4AA4-406B-B304-5D19AA30C4B1")] 32 32 public class RegressionSolution : RegressionSolutionBase { 33 33 protected readonly Dictionary<int, double> evaluationCache; 34 34 35 35 [StorableConstructor] 36 protected RegressionSolution(bool deserializing) 37 : base(deserializing) { 36 protected RegressionSolution(StorableConstructorFlag _) : base(_) { 38 37 evaluationCache = new Dictionary<int, double>(); 39 38 } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionBase.cs
r16244 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Data; 26 26 using HeuristicLab.Optimization; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.DataAnalysis { 30 [Storable Class]30 [StorableType("03116F5E-ABBF-4966-9428-E3DC67D1D03D")] 31 31 public abstract class RegressionSolutionBase : DataAnalysisSolution, IRegressionSolution { 32 32 protected const string TrainingMeanSquaredErrorResultName = "Mean squared error (training)"; … … 160 160 161 161 [StorableConstructor] 162 protected RegressionSolutionBase( bool deserializing) : base(deserializing) { }162 protected RegressionSolutionBase(StorableConstructorFlag _) : base(_) { } 163 163 protected RegressionSolutionBase(RegressionSolutionBase original, Cloner cloner) 164 164 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionSolutionVariableImpactsCalculator.cs
r16422 r16565 2 2 3 3 /* HeuristicLab 4 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 5 5 * 6 6 * This file is part of HeuristicLab. … … 30 30 using HeuristicLab.Data; 31 31 using HeuristicLab.Parameters; 32 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;32 using HEAL.Attic; 33 33 using HeuristicLab.Random; 34 34 35 35 namespace HeuristicLab.Problems.DataAnalysis { 36 [Storable Class]36 [StorableType("414B25CD-6643-4E42-9EB2-B9A24F5E1528")] 37 37 [Item("RegressionSolution Impacts Calculator", "Calculation of the impacts of input variables for any regression solution")] 38 38 public sealed class RegressionSolutionVariableImpactsCalculator : ParameterizedNamedItem { 39 39 #region Parameters/Properties 40 [StorableType("45a48ef7-e1e6-44b7-95b1-ae9d01aa5de4")] 40 41 public enum ReplacementMethodEnum { 41 42 Median, … … 44 45 Noise 45 46 } 47 48 [StorableType("78df33f8-4715-4d25-a69a-f2bc1277fa3b")] 46 49 public enum FactorReplacementMethodEnum { 47 50 Best, … … 49 52 Shuffle 50 53 } 54 55 [StorableType("946646da-1c0b-435e-88f9-38d649fc5194")] 51 56 public enum DataPartitionEnum { 52 57 Training, … … 85 90 #region Ctor/Cloner 86 91 [StorableConstructor] 87 private RegressionSolutionVariableImpactsCalculator( bool deserializing) : base(deserializing) { }92 private RegressionSolutionVariableImpactsCalculator(StorableConstructorFlag _) : base(_) { } 88 93 private RegressionSolutionVariableImpactsCalculator(RegressionSolutionVariableImpactsCalculator original, Cloner cloner) 89 94 : base(original, cloner) { } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/Models/ConstantTimeSeriesPrognosisModel.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Common; 26 26 using HeuristicLab.Core; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.DataAnalysis { 30 [Storable Class]30 [StorableType("A69BF8CC-2A57-4FBE-A468-8D38F3B6BBA6")] 31 31 [Item("Constant TimeSeries Model", "A time series model that returns for all prediciton the same constant value.")] 32 32 [Obsolete] 33 33 public class ConstantTimeSeriesPrognosisModel : ConstantRegressionModel, ITimeSeriesPrognosisModel { 34 34 [StorableConstructor] 35 protected ConstantTimeSeriesPrognosisModel( bool deserializing) : base(deserializing) { }35 protected ConstantTimeSeriesPrognosisModel(StorableConstructorFlag _) : base(_) { } 36 36 protected ConstantTimeSeriesPrognosisModel(ConstantTimeSeriesPrognosisModel original, Cloner cloner) : base(original, cloner) { } 37 37 public override IDeepCloneable Clone(Cloner cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/Models/TimeSeriesPrognosisAutoRegressiveModel.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Common; 26 26 using HeuristicLab.Core; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.DataAnalysis { 30 [Storable Class]30 [StorableType("9C44E097-50F8-4EC1-BE1B-6A0246EC020E")] 31 31 [Item("Autoregressive TimeSeries Model", "A linear autoregressive time series model used to predict future values.")] 32 32 public class TimeSeriesPrognosisAutoRegressiveModel : RegressionModel, ITimeSeriesPrognosisModel { … … 43 43 44 44 [StorableConstructor] 45 protected TimeSeriesPrognosisAutoRegressiveModel( bool deserializing) : base(deserializing) { }45 protected TimeSeriesPrognosisAutoRegressiveModel(StorableConstructorFlag _) : base(_) { } 46 46 protected TimeSeriesPrognosisAutoRegressiveModel(TimeSeriesPrognosisAutoRegressiveModel original, Cloner cloner) 47 47 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblem.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 26 26 namespace HeuristicLab.Problems.DataAnalysis { 27 [Storable Class]27 [StorableType("F6680708-9368-4A96-AE2F-B4B7F4C3FE52")] 28 28 [Item("Time-series Prognosis Problem", "A general time-series prognosis problem.")] 29 29 public class TimeSeriesPrognosisProblem : DataAnalysisProblem<ITimeSeriesPrognosisProblemData>, ITimeSeriesPrognosisProblem { 30 30 [StorableConstructor] 31 protected TimeSeriesPrognosisProblem( bool deserializing) : base(deserializing) { }31 protected TimeSeriesPrognosisProblem(StorableConstructorFlag _) : base(_) { } 32 32 protected TimeSeriesPrognosisProblem(TimeSeriesPrognosisProblem original, Cloner cloner) : base(original, cloner) { } 33 33 public override IDeepCloneable Clone(Cloner cloner) { return new TimeSeriesPrognosisProblem(this, cloner); } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs
r16244 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Data; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Problems.DataAnalysis { 32 [Storable Class]32 [StorableType("68E790CA-24B3-4127-B06B-24E5D3078E52")] 33 33 [Item("TimeSeriesPrognosisProblemData", "Represents an item containing all data defining a time series prognosis problem.")] 34 34 public class TimeSeriesPrognosisProblemData : RegressionProblemData, ITimeSeriesPrognosisProblemData { … … 1571 1571 1572 1572 [StorableConstructor] 1573 protected TimeSeriesPrognosisProblemData( bool deserializing) : base(deserializing) { }1573 protected TimeSeriesPrognosisProblemData(StorableConstructorFlag _) : base(_) { } 1574 1574 1575 1575 protected TimeSeriesPrognosisProblemData(TimeSeriesPrognosisProblemData original, Cloner cloner) : base(original, cloner) { } -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisResults.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Data; 28 28 using HeuristicLab.Optimization; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Problems.DataAnalysis { 32 [Storable Class]32 [StorableType("E3F334B4-9980-473C-B77F-128AFAFD1DD1")] 33 33 [Item("Prognosis Results", "Represents a collection of time series prognosis results.")] 34 34 public class TimeSeriesPrognosisResults : ResultCollection { … … 330 330 331 331 [StorableConstructor] 332 public TimeSeriesPrognosisResults( bool deserializing) : base(deserializing) { }332 public TimeSeriesPrognosisResults(StorableConstructorFlag _) : base(_) { } 333 333 protected TimeSeriesPrognosisResults(TimeSeriesPrognosisResults original, Cloner cloner) 334 334 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisSolution.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using System.Linq; 24 24 using HeuristicLab.Common; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Problems.DataAnalysis { … … 29 29 /// Represents a time series prognosis data analysis solution 30 30 /// </summary> 31 [Storable Class]31 [StorableType("42CF9704-DCB2-4159-89B3-A30645399B86")] 32 32 public class TimeSeriesPrognosisSolution : TimeSeriesPrognosisSolutionBase { 33 33 [StorableConstructor] 34 protected TimeSeriesPrognosisSolution( bool deserializing) : base(deserializing) { }34 protected TimeSeriesPrognosisSolution(StorableConstructorFlag _) : base(_) { } 35 35 protected TimeSeriesPrognosisSolution(TimeSeriesPrognosisSolution original, Cloner cloner) : base(original, cloner) { } 36 36 protected internal TimeSeriesPrognosisSolution(ITimeSeriesPrognosisModel model, ITimeSeriesPrognosisProblemData problemData) -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisSolutionBase.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Data; 26 26 using HeuristicLab.Optimization; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.DataAnalysis { 30 [Storable Class]30 [StorableType("DF08D8C4-90F8-456E-855B-C8F487FF7B51")] 31 31 public abstract class TimeSeriesPrognosisSolutionBase : RegressionSolutionBase, ITimeSeriesPrognosisSolution { 32 32 #region result names … … 128 128 129 129 [StorableConstructor] 130 protected TimeSeriesPrognosisSolutionBase( bool deserializing) : base(deserializing) { }130 protected TimeSeriesPrognosisSolutionBase(StorableConstructorFlag _) : base(_) { } 131 131 protected TimeSeriesPrognosisSolutionBase(TimeSeriesPrognosisSolutionBase original, Cloner cloner) : base(original, cloner) { } 132 132 protected TimeSeriesPrognosisSolutionBase(ITimeSeriesPrognosisModel model, ITimeSeriesPrognosisProblemData problemData) -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/CopyColumnTransformation.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Data; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Problems.DataAnalysis { 31 [Storable Class]31 [StorableType("DF78A485-8B71-46A4-8A2C-68642084D201")] 32 32 [Item("CopyColumnTransformation", "Represents a transformation which represents a copied Column.")] 33 33 public class CopyColumnTransformation : Transformation { … … 50 50 51 51 [StorableConstructor] 52 protected CopyColumnTransformation( bool deserializing) : base(deserializing) { }52 protected CopyColumnTransformation(StorableConstructorFlag _) : base(_) { } 53 53 protected CopyColumnTransformation(CopyColumnTransformation original, Cloner cloner) 54 54 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ExponentialTransformation.cs
r12612 r16565 6 6 using HeuristicLab.Data; 7 7 using HeuristicLab.Parameters; 8 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;8 using HEAL.Attic; 9 9 10 10 namespace HeuristicLab.Problems.DataAnalysis { 11 [Storable Class]11 [StorableType("AAB32034-FA4A-4D70-937F-EF026C1D508A")] 12 12 [Item("Exponential Transformation", "f(x) = b ^ x | Represents a exponential transformation.")] 13 13 public class ExponentialTransformation : Transformation<double> { … … 30 30 31 31 [StorableConstructor] 32 protected ExponentialTransformation( bool deserializing) : base(deserializing) { }32 protected ExponentialTransformation(StorableConstructorFlag _) : base(_) { } 33 33 34 34 protected ExponentialTransformation(ExponentialTransformation original, Cloner cloner) -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LinearTransformation.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 28 28 using HeuristicLab.Data; 29 29 using HeuristicLab.Parameters; 30 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 31 31 32 32 namespace HeuristicLab.Problems.DataAnalysis { 33 [Storable Class]33 [StorableType("203E6A27-4430-4A9E-825A-22C1B254F5E8")] 34 34 [Item("Linear Transformation", "f(x) = k * x + d | Represents a linear transformation with multiplication and addition.")] 35 35 public class LinearTransformation : Transformation<double> { … … 66 66 67 67 [StorableConstructor] 68 protected LinearTransformation( bool deserializing) : base(deserializing) { }68 protected LinearTransformation(StorableConstructorFlag _) : base(_) { } 69 69 protected LinearTransformation(LinearTransformation original, Cloner cloner) 70 70 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LogarithmicTransformation.cs
r12612 r16565 6 6 using HeuristicLab.Data; 7 7 using HeuristicLab.Parameters; 8 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;8 using HEAL.Attic; 9 9 10 10 namespace HeuristicLab.Problems.DataAnalysis { 11 [Storable Class]11 [StorableType("D3330C77-060A-4F75-A0C5-47AC81C5F2DF")] 12 12 [Item("Logarithmic Transformation", "f(x) = log(x, b) | Represents a logarithmic transformation.")] 13 13 public class LogarithmicTransformation : Transformation<double> { … … 30 30 31 31 [StorableConstructor] 32 protected LogarithmicTransformation( bool deserializing) : base(deserializing) { }32 protected LogarithmicTransformation(StorableConstructorFlag _) : base(_) { } 33 33 protected LogarithmicTransformation(LogarithmicTransformation original, Cloner cloner) 34 34 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/PowerTransformation.cs
r12612 r16565 6 6 using HeuristicLab.Data; 7 7 using HeuristicLab.Parameters; 8 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;8 using HEAL.Attic; 9 9 10 10 namespace HeuristicLab.Problems.DataAnalysis { 11 [Storable Class]11 [StorableType("D5A6860A-AEE5-47BE-A4D2-0107AB0A90E3")] 12 12 [Item("Power Transformation", "f(x) = x ^ exp | Represents a power transformation.")] 13 13 public class PowerTransformation : Transformation<double> { … … 30 30 31 31 [StorableConstructor] 32 protected PowerTransformation( bool deserializing) : base(deserializing) { }32 protected PowerTransformation(StorableConstructorFlag _) : base(_) { } 33 33 protected PowerTransformation(PowerTransformation original, Cloner cloner) 34 34 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ReciprocalTransformation.cs
r12612 r16565 5 5 using HeuristicLab.Common; 6 6 using HeuristicLab.Core; 7 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;7 using HEAL.Attic; 8 8 namespace HeuristicLab.Problems.DataAnalysis { 9 [Storable Class]9 [StorableType("8D242A5A-5EBB-4618-958E-A7EF34151508")] 10 10 [Item("Reciprocal Transformation", "f(x) = 1 / x | Represents a reciprocal transformation.")] 11 11 public class ReciprocalTransformation : Transformation<double> { … … 18 18 19 19 [StorableConstructor] 20 protected ReciprocalTransformation( bool deserializing) : base(deserializing) { }20 protected ReciprocalTransformation(StorableConstructorFlag _) : base(_) { } 21 21 protected ReciprocalTransformation(ReciprocalTransformation original, Cloner cloner) 22 22 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ShiftStandardDistributionTransformation.cs
r14843 r16565 5 5 using HeuristicLab.Data; 6 6 using HeuristicLab.Parameters; 7 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;7 using HEAL.Attic; 8 8 9 9 namespace HeuristicLab.Problems.DataAnalysis { 10 [Storable Class]10 [StorableType("F0DC4951-64DF-4058-8E87-748D0FA1AA21")] 11 11 [Item("Shift Standard Distribution Transformation", "f(x) = ((x - m_org) / s_org ) * s_tar + m_tar | Represents Transformation to unit standard deviation and additional linear transformation to a target Mean and Standard deviation")] 12 12 public class ShiftStandardDistributionTransformation : Transformation<double> { … … 52 52 53 53 [StorableConstructor] 54 protected ShiftStandardDistributionTransformation( bool deserializing) : base(deserializing) { }54 protected ShiftStandardDistributionTransformation(StorableConstructorFlag _) : base(_) { } 55 55 protected ShiftStandardDistributionTransformation(ShiftStandardDistributionTransformation original, Cloner cloner) 56 56 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ShiftToRangeTransformation.cs
r14843 r16565 5 5 using HeuristicLab.Data; 6 6 using HeuristicLab.Parameters; 7 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;7 using HEAL.Attic; 8 8 9 9 namespace HeuristicLab.Problems.DataAnalysis { 10 [Storable Class]10 [StorableType("4A91E704-927C-4278-AA11-79C16BD8E4F2")] 11 11 [Item("Shift to Range Transformation", "f(x) = k * x + d, start <= f(x) <= end | Represents a linear Transformation using Parameters defining a target range")] 12 12 public class ShiftToRangeTransformation : LinearTransformation { … … 29 29 30 30 [StorableConstructor] 31 protected ShiftToRangeTransformation( bool deserializing) : base(deserializing) { }31 protected ShiftToRangeTransformation(StorableConstructorFlag _) : base(_) { } 32 32 protected ShiftToRangeTransformation(ShiftToRangeTransformation original, Cloner cloner) 33 33 : base(original, cloner) { -
trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/Transformation.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Data; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Problems.DataAnalysis { 31 31 32 32 [Item("Transformation", "Represents the base class for a transformation.")] 33 [Storable Class]33 [StorableType("46B380CC-6CDE-40FC-9BB4-E3FF82BA35EA")] 34 34 public abstract class Transformation : ParameterizedNamedItem, ITransformation { 35 35 protected const string ColumnParameterName = "Column"; … … 49 49 50 50 [StorableConstructor] 51 protected Transformation( bool deserializing) : base(deserializing) { }51 protected Transformation(StorableConstructorFlag _) : base(_) { } 52 52 protected Transformation(Transformation original, Cloner cloner) : base(original, cloner) { } 53 53 protected Transformation(IEnumerable<string> allowedColumns) { … … 58 58 59 59 [Item("Transformation", "Represents the base class for a transformation.")] 60 [Storable Class]60 [StorableType("F244DB89-72EA-4B41-89FA-C2E14F30AD29")] 61 61 public abstract class Transformation<T> : Transformation, ITransformation<T> { 62 62 63 63 [StorableConstructor] 64 protected Transformation( bool deserializing) : base(deserializing) { }64 protected Transformation(StorableConstructorFlag _) : base(_) { } 65 65 protected Transformation(Transformation<T> original, Cloner cloner) : base(original, cloner) { } 66 66 protected Transformation(IEnumerable<string> allowedColumns) : base(allowedColumns) { }
Note: See TracChangeset
for help on using the changeset viewer.