Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/04/17 17:19:35 (8 years ago)
Author:
gkronber
Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:
branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleModel.cs

    r14185 r14927  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3030  /// Represents classification solutions that contain an ensemble of multiple classification models
    3131  /// </summary>
    32   [StorableClass]
     32  [StorableType("6761ed28-bdc7-4294-beb7-077133ad5cbc")]
    3333  [Item("ClassificationEnsembleModel", "A classification model that contains an ensemble of multiple classification models")]
    3434  public class ClassificationEnsembleModel : ClassificationModel, IClassificationEnsembleModel {

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleProblemData.cs

    r14185 r14927  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableClass]
     30  [StorableType("61402dab-c365-44bd-96fc-2b24732f73ed")]
    3131  [Item("ClassificationEnsembleProblemData", "Represents an item containing all data defining a classification problem.")]
    3232  public class ClassificationEnsembleProblemData : ClassificationProblemData {

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationEnsembleSolution.cs

    r14185 r14927  
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Data;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    3030
    3131namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3333  /// Represents classification solutions that contain an ensemble of multiple classification models
    3434  /// </summary>
    35   [StorableClass]
     35  [StorableType("fdded23f-e5c0-49b0-a0a8-2a6860606245")]
    3636  [Item("Classification Ensemble Solution", "A classification solution that contains an ensemble of multiple classification models")]
    3737  [Creatable(CreatableAttribute.Categories.DataAnalysisEnsembles, Priority = 110)]

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationModel.cs

    r14290 r14927  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Problems.DataAnalysis {
    29   [StorableClass]
     29  [StorableType("4f482a86-2129-4d3e-a4c5-e666b6aeea14")]
    3030  [Item("Classification Model", "Base class for all classification models.")]
    3131  public abstract class ClassificationModel : DataAnalysisModel, IClassificationModel {

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationPerformanceMeasures.cs

    r14185 r14927  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Problems.DataAnalysis {
    29   [StorableClass]
     29  [StorableType("b7a45896-c96b-4ed1-ab51-4af1cf9feae5")]
    3030  public class ClassificationPerformanceMeasuresResultCollection : ResultCollection {
    3131    #region result names

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis {
    27   [StorableClass]
     27  [StorableType("43dde58c-4d6c-4e2c-af47-5e170a460783")]
    2828  [Item("Classification Problem", "A general classification problem.")]
    2929  public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem, IStorableContent {

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblemData.cs

    r14185 r14927  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    3030
    3131namespace HeuristicLab.Problems.DataAnalysis {
    32   [StorableClass]
     32  [StorableType("4d9ed3cf-b3f8-4daf-9cab-74fb3942dd8c")]
    3333  [Item("ClassificationProblemData", "Represents an item containing all data defining a classification problem.")]
    3434  public class ClassificationProblemData : DataAnalysisProblemData, IClassificationProblemData, IStorableContent {

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolution.cs

    r14185 r14927  
    2323using System.Linq;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    2929  /// Represents a classification data analysis solution
    3030  /// </summary>
    31   [StorableClass]
     31  [StorableType("cc22a9ee-8a52-4d23-8f53-5e531706324b")]
    3232  public class ClassificationSolution : ClassificationSolutionBase {
    3333    protected readonly Dictionary<int, double> evaluationCache;

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolutionBase.cs

    r14290 r14927  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.Problems.DataAnalysis.OnlineCalculators;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis {
    31   [StorableClass]
     31  [StorableType("5c67f421-2918-40a5-83a4-bebcaf5e49b5")]
    3232  public abstract class ClassificationSolutionBase : DataAnalysisSolution, IClassificationSolution {
    3333    private const string TrainingAccuracyResultName = "Accuracy (training)";

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ConstantClassificationSolution.cs

    r14185 r14927  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HeuristicLab.Persistence;
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis {
    27   [StorableClass]
     27  [StorableType("9090b8ae-63f8-4932-bda0-1a70872f3f92")]
    2828  [Item(Name = "Constant Classification Solution", Description = "Represents a constant classification solution (model + data).")]
    2929  public class ConstantClassificationSolution : ClassificationSolution {

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationModel.cs

    r14185 r14927  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3131  /// Represents discriminant function classification data analysis models.
    3232  /// </summary>
    33   [StorableClass]
     33  [StorableType("08ff9689-5c56-4458-a55b-70e94e3d6b40")]
    3434  [Item("DiscriminantFunctionClassificationModel", "Represents a classification model that uses a discriminant function and classification thresholds.")]
    3535  public class DiscriminantFunctionClassificationModel : ClassificationModel, IDiscriminantFunctionClassificationModel {

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationSolution.cs

    r14185 r14927  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3030  /// Represents a classification solution that uses a discriminant function and classification thresholds.
    3131  /// </summary>
    32   [StorableClass]
     32  [StorableType("1970b1e6-0649-43dd-a8f4-48afc8bc7a46")]
    3333  [Item("DiscriminantFunctionClassificationSolution", "Represents a classification solution that uses a discriminant function and classification thresholds.")]
    3434  public class DiscriminantFunctionClassificationSolution : DiscriminantFunctionClassificationSolutionBase {

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/DiscriminantFunctionClassificationSolutionBase.cs

    r14185 r14927  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    3030
    3131namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3333  /// Represents a classification solution that uses a discriminant function and classification thresholds.
    3434  /// </summary>
    35   [StorableClass]
     35  [StorableType("0cf40763-3f72-49c4-a674-a070aec9d032")]
    3636  [Item("DiscriminantFunctionClassificationSolution", "Represents a classification solution that uses a discriminant function and classification thresholds.")]
    3737  public abstract class DiscriminantFunctionClassificationSolutionBase : ClassificationSolutionBase, IDiscriminantFunctionClassificationSolution {
    … …  
    106106
    107107      double trainingR = OnlinePearsonsRCalculator.Calculate(originalTrainingValues, estimatedTrainingValues, out errorState);
    108       TrainingRSquared = errorState == OnlineCalculatorError.None ? trainingR*trainingR : double.NaN;
     108      TrainingRSquared = errorState == OnlineCalculatorError.None ? trainingR * trainingR : double.NaN;
    109109      double testR = OnlinePearsonsRCalculator.Calculate(originalTestValues, estimatedTestValues, out errorState);
    110       TestRSquared = errorState == OnlineCalculatorError.None ? testR*testR : double.NaN;
     110      TestRSquared = errorState == OnlineCalculatorError.None ? testR * testR : double.NaN;
    111111
    112112      double trainingNormalizedGini = NormalizedGiniCalculator.Calculate(originalTrainingValues, estimatedTrainingValues, out errorState);

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ThresholdCalculators/AccuracyMaximizationThresholdCalculator.cs

    r14185 r14927  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3131  /// Represents a threshold calculator that maximizes the weighted accuracy of the classifcation model.
    3232  /// </summary>
    33   [StorableClass]
     33  [StorableType("bb9b9036-7843-4fdd-8544-6191eed7bd21")]
    3434  [Item("AccuracyMaximizationThresholdCalculator", "Represents a threshold calculator that maximizes the weighted accuracy of the classifcation model.")]
    3535  public class AccuracyMaximizationThresholdCalculator : ThresholdCalculator {
    … …  
    9393                classificationScore += problemData.GetClassificationPenalty(pair.TargetClassValue, classValues[i]);
    9494            }
    95               //all negatives
     95            //all negatives
    9696            else {
    9797              //false positive
    … …  
    116116            seriesOfEqualClassificationScores = true;
    117117          }
    118             //equal classification scores => if seriesOfEqualClassifcationScores == true update highest threshold
     118          //equal classification scores => if seriesOfEqualClassifcationScores == true update highest threshold
    119119          else if (Math.Abs(classificationScore - bestClassificationScore) < double.Epsilon && seriesOfEqualClassificationScores)
    120120            highestBestThreshold = actualThreshold;

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ThresholdCalculators/NormalDistributionCutPointsThresholdCalculator.cs

    r14185 r14927  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3131  /// Represents a threshold calculator that calculates thresholds as the cutting points between the estimated class distributions (assuming normally distributed class values).
    3232  /// </summary>
    33   [StorableClass]
     33  [StorableType("8d46742b-731e-4319-a063-bf20d458e709")]
    3434  [Item("NormalDistributionCutPointsThresholdCalculator", "Represents a threshold calculator that calculates thresholds as the cutting points between the estimated class distributions (assuming normally distributed class values).")]
    3535  public class NormalDistributionCutPointsThresholdCalculator : ThresholdCalculator {

  • branches/PersistenceReintegration/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ThresholdCalculators/ThresholdCalculator.cs

    r14185 r14927  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    2929  /// Base class for threshold calculators for discriminant function classification models.
    3030  /// </summary>
    31   [StorableClass]
     31  [StorableType("097aa7bf-3adf-436b-a369-71a3e721a8bf")]
    3232  public abstract class ThresholdCalculator : NamedItem, IDiscriminantFunctionThresholdCalculator {
    3333
Note: See TracChangeset for help on using the changeset viewer.