Free cookie consent management tool by TermsFeed Policy Generator

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

#2971: made branch compile with current version of trunk

Location:
branches/2971_named_intervals
Files:
18 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/Classification/ClassificationEnsembleModel.cs

    r15583 r16628  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3031  /// Represents classification solutions that contain an ensemble of multiple classification models
    3132  /// </summary>
    32   [StorableClass]
     33  [StorableType("7EA6E802-999D-4432-A13F-0DCBC1A4F8FB")]
    3334  [Item("ClassificationEnsembleModel", "A classification model that contains an ensemble of multiple classification models")]
    3435  public class ClassificationEnsembleModel : ClassificationModel, IClassificationEnsembleModel {
    … …  
    4445
    4546    [StorableConstructor]
    46     protected ClassificationEnsembleModel(bool deserializing) : base(deserializing) { }
     47    protected ClassificationEnsembleModel(StorableConstructorFlag _) : base(_) { }
    4748    protected ClassificationEnsembleModel(ClassificationEnsembleModel original, Cloner cloner)
    4849      : base(original, cloner) {

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

    r15583 r16628  
    2626using HeuristicLab.Parameters;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableClass]
     31  [StorableType("90243689-01F7-4FA2-9317-68B9CFEFC05C")]
    3132  [Item("ClassificationEnsembleProblemData", "Represents an item containing all data defining a classification problem.")]
    3233  public class ClassificationEnsembleProblemData : ClassificationProblemData {
    … …  
    6566
    6667    [StorableConstructor]
    67     protected ClassificationEnsembleProblemData(bool deserializing) : base(deserializing) { }
     68    protected ClassificationEnsembleProblemData(StorableConstructorFlag _) : base(_) { }
    6869    protected ClassificationEnsembleProblemData(ClassificationEnsembleProblemData original, Cloner cloner) : base(original, cloner) { }
    6970    public override IDeepCloneable Clone(Cloner cloner) {

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

    r15583 r16628  
    2828using HeuristicLab.Data;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3334  /// Represents classification solutions that contain an ensemble of multiple classification models
    3435  /// </summary>
    35   [StorableClass]
     36  [StorableType("BD1C63A8-1CCC-4048-88C4-AE6958B5EE6B")]
    3637  [Item("Classification Ensemble Solution", "A classification solution that contains an ensemble of multiple classification models")]
    3738  [Creatable(CreatableAttribute.Categories.DataAnalysisEnsembles, Priority = 110)]
    … …  
    6162
    6263    [StorableConstructor]
    63     private ClassificationEnsembleSolution(bool deserializing)
    64       : base(deserializing) {
     64    private ClassificationEnsembleSolution(StorableConstructorFlag _) : base(_) {
    6565      classificationSolutions = new ItemCollection<IClassificationSolution>();
    6666    }

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

    r16243 r16628  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.DataAnalysis {
    29   [StorableClass]
     30  [StorableType("E8412AEA-CDD0-4B5B-9AAF-005582F2C9A3")]
    3031  [Item("Classification Model", "Base class for all classification models.")]
    3132  public abstract class ClassificationModel : DataAnalysisModel, IClassificationModel {
    … …  
    4142    }
    4243
    43     protected ClassificationModel(bool deserializing)
    44       : base(deserializing) {
     44    [StorableConstructor]
     45    protected ClassificationModel(StorableConstructorFlag _) : base(_) {
    4546      targetVariable = string.Empty;
    4647    }

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

    r15583 r16628  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.DataAnalysis {
    29   [StorableClass]
     30  [StorableType("0C0F7F46-74F7-4CF9-8096-0E9CD2B0F0AD")]
    3031  public class ClassificationPerformanceMeasuresResultCollection : ResultCollection {
    3132    #region result names
    … …  
    5455    }
    5556    [StorableConstructor]
    56     protected ClassificationPerformanceMeasuresResultCollection(bool deserializing)
    57       : base(deserializing) {
     57    protected ClassificationPerformanceMeasuresResultCollection(StorableConstructorFlag _) : base(_) {
    5858    }
    5959

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

    r15583 r16628  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Problems.DataAnalysis {
    27   [StorableClass]
     28  [StorableType("8C336C29-8B17-4713-BC30-70F05ED190BA")]
    2829  [Item("Classification Problem", "A general classification problem.")]
    2930  public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem, IStorableContent {
    … …  
    3132
    3233    [StorableConstructor]
    33     protected ClassificationProblem(bool deserializing) : base(deserializing) { }
     34    protected ClassificationProblem(StorableConstructorFlag _) : base(_) { }
    3435    protected ClassificationProblem(ClassificationProblem original, Cloner cloner) : base(original, cloner) { }
    3536    public override IDeepCloneable Clone(Cloner cloner) { return new ClassificationProblem(this, cloner); }

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

    r16244 r16628  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.DataAnalysis {
    32   [StorableClass]
     33  [StorableType("C2833A5D-BFBA-4F81-97E8-8665804F0E44")]
    3334  [Item("ClassificationProblemData", "Represents an item containing all data defining a classification problem.")]
    3435  public class ClassificationProblemData : DataAnalysisProblemData, IClassificationProblemData, IStorableContent {
    … …  
    279280
    280281    [StorableConstructor]
    281     protected ClassificationProblemData(bool deserializing) : base(deserializing) { }
     282    protected ClassificationProblemData(StorableConstructorFlag _) : base(_) { }
    282283    [StorableHook(HookType.AfterDeserialization)]
    283284    private void AfterDeserialization() {

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

    r15583 r16628  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    2930  /// Represents a classification data analysis solution
    3031  /// </summary>
    31   [StorableClass]
     32  [StorableType("8D893EA5-D6D3-477A-9813-F057877D65B6")]
    3233  public class ClassificationSolution : ClassificationSolutionBase {
    3334    protected readonly Dictionary<int, double> evaluationCache;
    3435
    3536    [StorableConstructor]
    36     protected ClassificationSolution(bool deserializing)
    37       : base(deserializing) {
     37    protected ClassificationSolution(StorableConstructorFlag _) : base(_) {
    3838      evaluationCache = new Dictionary<int, double>();
    3939    }

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

    r16244 r16628  
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929using HeuristicLab.Problems.DataAnalysis.OnlineCalculators;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.DataAnalysis {
    32   [StorableClass]
     33  [StorableType("4A461D10-7B42-48CA-8506-610DE870AF06")]
    3334  public abstract class ClassificationSolutionBase : DataAnalysisSolution, IClassificationSolution {
    3435    private const string TrainingAccuracyResultName = "Accuracy (training)";
    … …  
    7879
    7980    [StorableConstructor]
    80     protected ClassificationSolutionBase(bool deserializing) : base(deserializing) { }
     81    protected ClassificationSolutionBase(StorableConstructorFlag _) : base(_) { }
    8182    protected ClassificationSolutionBase(ClassificationSolutionBase original, Cloner cloner)
    8283      : base(original, cloner) {

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationSolutionVariableImpactsCalculator.cs

    r16536 r16628  
    3232using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333using HeuristicLab.Random;
     34using HEAL.Attic;
    3435
    3536namespace HeuristicLab.Problems.DataAnalysis {
    36   [StorableClass]
     37  [StorableType("6E031543-7C35-47F3-9BE2-E33D1486C3D2")]
    3738  [Item("ClassificationSolution Impacts Calculator", "Calculation of the impacts of input variables for any classification solution")]
    3839  public sealed class ClassificationSolutionVariableImpactsCalculator : ParameterizedNamedItem {
    … …  
    8586    #region Ctor/Cloner
    8687    [StorableConstructor]
    87     private ClassificationSolutionVariableImpactsCalculator(bool deserializing) : base(deserializing) { }
     88    private ClassificationSolutionVariableImpactsCalculator(StorableConstructorFlag _) : base(_) { }
    8889    private ClassificationSolutionVariableImpactsCalculator(ClassificationSolutionVariableImpactsCalculator original, Cloner cloner)
    8990      : base(original, cloner) { }

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

    r15583 r16628  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Problems.DataAnalysis {
    27   [StorableClass]
     28  [StorableType("E104A01A-369B-4ACC-A37D-2E13FF205811")]
    2829  [Item(Name = "Constant Classification Solution", Description = "Represents a constant classification solution (model + data).")]
    2930  public class ConstantClassificationSolution : ClassificationSolution {
    … …  
    3435
    3536    [StorableConstructor]
    36     protected ConstantClassificationSolution(bool deserializing) : base(deserializing) { }
     37    protected ConstantClassificationSolution(StorableConstructorFlag _) : base(_) { }
    3738    protected ConstantClassificationSolution(ConstantClassificationSolution original, Cloner cloner) : base(original, cloner) { }
    3839    public ConstantClassificationSolution(ConstantModel model, IClassificationProblemData problemData)

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

    r15583 r16628  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3132  /// Represents discriminant function classification data analysis models.
    3233  /// </summary>
    33   [StorableClass]
     34  [StorableType("9408A82E-6B34-47F6-B1A0-F8C822CC0AD9")]
    3435  [Item("DiscriminantFunctionClassificationModel", "Represents a classification model that uses a discriminant function and classification thresholds.")]
    3536  public class DiscriminantFunctionClassificationModel : ClassificationModel, IDiscriminantFunctionClassificationModel {
    … …  
    6869
    6970    [StorableConstructor]
    70     protected DiscriminantFunctionClassificationModel(bool deserializing) : base(deserializing) { }
     71    protected DiscriminantFunctionClassificationModel(StorableConstructorFlag _) : base(_) { }
    7172    protected DiscriminantFunctionClassificationModel(DiscriminantFunctionClassificationModel original, Cloner cloner)
    7273      : base(original, cloner) {

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

    r15583 r16628  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3031  /// Represents a classification solution that uses a discriminant function and classification thresholds.
    3132  /// </summary>
    32   [StorableClass]
     33  [StorableType("EB59DCD7-B426-4349-8301-97541A676ECE")]
    3334  [Item("DiscriminantFunctionClassificationSolution", "Represents a classification solution that uses a discriminant function and classification thresholds.")]
    3435  public class DiscriminantFunctionClassificationSolution : DiscriminantFunctionClassificationSolutionBase {
    … …  
    3738
    3839    [StorableConstructor]
    39     protected DiscriminantFunctionClassificationSolution(bool deserializing)
    40       : base(deserializing) {
     40    protected DiscriminantFunctionClassificationSolution(StorableConstructorFlag _) : base(_) {
    4141      valueEvaluationCache = new Dictionary<int, double>();
    4242      classValueEvaluationCache = new Dictionary<int, double>();

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

    r15583 r16628  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3334  /// Represents a classification solution that uses a discriminant function and classification thresholds.
    3435  /// </summary>
    35   [StorableClass]
     36  [StorableType("269E7BE2-27E2-4E28-B42A-8527069C7292")]
    3637  [Item("DiscriminantFunctionClassificationSolution", "Represents a classification solution that uses a discriminant function and classification thresholds.")]
    3738  public abstract class DiscriminantFunctionClassificationSolutionBase : ClassificationSolutionBase, IDiscriminantFunctionClassificationSolution {
    … …  
    7475
    7576    [StorableConstructor]
    76     protected DiscriminantFunctionClassificationSolutionBase(bool deserializing) : base(deserializing) { }
     77    protected DiscriminantFunctionClassificationSolutionBase(StorableConstructorFlag _) : base(_) { }
    7778    protected DiscriminantFunctionClassificationSolutionBase(DiscriminantFunctionClassificationSolutionBase original, Cloner cloner)
    7879      : base(original, cloner) {

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

    r15583 r16628  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3132  /// Represents a threshold calculator that maximizes the weighted accuracy of the classifcation model.
    3233  /// </summary>
    33   [StorableClass]
     34  [StorableType("226D720F-A0C8-4A23-B0CC-ED083E2A133D")]
    3435  [Item("AccuracyMaximizationThresholdCalculator", "Represents a threshold calculator that maximizes the weighted accuracy of the classifcation model.")]
    3536  public class AccuracyMaximizationThresholdCalculator : ThresholdCalculator {
    3637
    3738    [StorableConstructor]
    38     protected AccuracyMaximizationThresholdCalculator(bool deserializing) : base(deserializing) { }
     39    protected AccuracyMaximizationThresholdCalculator(StorableConstructorFlag _) : base(_) { }
    3940    protected AccuracyMaximizationThresholdCalculator(AccuracyMaximizationThresholdCalculator original, Cloner cloner)
    4041      : base(original, cloner) {

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

    r15583 r16628  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    3132  /// Represents a threshold calculator that calculates thresholds as the cutting points between the estimated class distributions (assuming normally distributed class values).
    3233  /// </summary>
    33   [StorableClass]
     34  [StorableType("987423CB-F80E-4302-88EC-9B24977C11E4")]
    3435  [Item("NormalDistributionCutPointsThresholdCalculator", "Represents a threshold calculator that calculates thresholds as the cutting points between the estimated class distributions (assuming normally distributed class values).")]
    3536  public class NormalDistributionCutPointsThresholdCalculator : ThresholdCalculator {
    3637
    3738    [StorableConstructor]
    38     protected NormalDistributionCutPointsThresholdCalculator(bool deserializing) : base(deserializing) { }
     39    protected NormalDistributionCutPointsThresholdCalculator(StorableConstructorFlag _) : base(_) { }
    3940    protected NormalDistributionCutPointsThresholdCalculator(NormalDistributionCutPointsThresholdCalculator original, Cloner cloner)
    4041      : base(original, cloner) {

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

    r15583 r16628  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Problems.DataAnalysis {
    … …  
    2930  /// Base class for threshold calculators for discriminant function classification models.
    3031  /// </summary>
    31   [StorableClass]
     32  [StorableType("91983232-13A0-420D-83FF-FA4DF5733321")]
    3233  public abstract class ThresholdCalculator : NamedItem, IDiscriminantFunctionThresholdCalculator {
    3334
    3435    [StorableConstructor]
    35     protected ThresholdCalculator(bool deserializing) : base(deserializing) { }
     36    protected ThresholdCalculator(StorableConstructorFlag _) : base(_) { }
    3637    protected ThresholdCalculator(ThresholdCalculator original, Cloner cloner)
    3738      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.