Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/28/19 17:42:10 (6 years ago)
Author:
gkronber
Message:

#2971: merged r16565:16631 from trunk/HeuristicLab.Problems.DataAnalysis to branch/HeuristicLab.Problems.DataAnalysis (resolving all conflicts)

Location:
branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis

  • branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HEAL.Attic;
    2828
    … …  
    3131  /// Represents classification solutions that contain an ensemble of multiple classification models
    3232  /// </summary>
    33   [StorableType("7EA6E802-999D-4432-A13F-0DCBC1A4F8FB")]
     33  [StorableType("0F720A40-5CC2-4E2B-8D4E-CCAD8EB56E43")]
    3434  [Item("ClassificationEnsembleModel", "A classification model that contains an ensemble of multiple classification models")]
    3535  public class ClassificationEnsembleModel : ClassificationModel, IClassificationEnsembleModel {

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis {
    31   [StorableType("90243689-01F7-4FA2-9317-68B9CFEFC05C")]
     31  [StorableType("58768587-0920-4B52-95E4-66B54E8E837C")]
    3232  [Item("ClassificationEnsembleProblemData", "Represents an item containing all data defining a classification problem.")]
    3333  public class ClassificationEnsembleProblemData : ClassificationProblemData {

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Data;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HEAL.Attic;
    3131
    … …  
    3434  /// Represents classification solutions that contain an ensemble of multiple classification models
    3535  /// </summary>
    36   [StorableType("BD1C63A8-1CCC-4048-88C4-AE6958B5EE6B")]
     36  [StorableType("4CDD22EE-B53D-4899-A77E-C503FF9EBC8E")]
    3737  [Item("Classification Ensemble Solution", "A classification solution that contains an ensemble of multiple classification models")]
    3838  [Creatable(CreatableAttribute.Categories.DataAnalysisEnsembles, Priority = 110)]

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableType("E8412AEA-CDD0-4B5B-9AAF-005582F2C9A3")]
     30  [StorableType("7E6091F9-86FD-4C47-8935-9C35CAB4261B")]
    3131  [Item("Classification Model", "Base class for all classification models.")]
    3232  public abstract class ClassificationModel : DataAnalysisModel, IClassificationModel {
    … …  
    4343
    4444    [StorableConstructor]
    45     protected ClassificationModel(StorableConstructorFlag _) : base(_) {
     45    protected ClassificationModel(StorableConstructorFlag _)
     46      : base(_) {
    4647      targetVariable = string.Empty;
    4748    }

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2726using HEAL.Attic;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.DataAnalysis {
    30   [StorableType("0C0F7F46-74F7-4CF9-8096-0E9CD2B0F0AD")]
     30  [StorableType("6F44E140-22CF-48D3-B100-B6013F2B6608")]
    3131  public class ClassificationPerformanceMeasuresResultCollection : ResultCollection {
    3232    #region result names

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis {
    28   [StorableType("8C336C29-8B17-4713-BC30-70F05ED190BA")]
     28  [StorableType("93696570-A410-4885-A210-7220771B6050")]
    2929  [Item("Classification Problem", "A general classification problem.")]
    3030  public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem, IStorableContent {

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3029using HEAL.Attic;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Problems.DataAnalysis {
    33   [StorableType("C2833A5D-BFBA-4F81-97E8-8665804F0E44")]
     33  [StorableType("1C8DCCCF-4E2A-421D-9C61-7C017D584054")]
    3434  [Item("ClassificationProblemData", "Represents an item containing all data defining a classification problem.")]
    3535  public class ClassificationProblemData : DataAnalysisProblemData, IClassificationProblemData, IStorableContent {

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using System.Linq;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HEAL.Attic;
    2727
    … …  
    3030  /// Represents a classification data analysis solution
    3131  /// </summary>
    32   [StorableType("8D893EA5-D6D3-477A-9813-F057877D65B6")]
     32  [StorableType("A240D831-23D6-4432-A105-12D02D2EA75A")]
    3333  public class ClassificationSolution : ClassificationSolutionBase {
    3434    protected readonly Dictionary<int, double> evaluationCache;

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Optimization;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Problems.DataAnalysis.OnlineCalculators;
    3030using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Problems.DataAnalysis {
    33   [StorableType("4A461D10-7B42-48CA-8506-610DE870AF06")]
     33  [StorableType("60599497-EAF0-4DB0-B2E4-D58F34458D8F")]
    3434  public abstract class ClassificationSolutionBase : DataAnalysisSolution, IClassificationSolution {
    3535    private const string TrainingAccuracyResultName = "Accuracy (training)";

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

    r16628 r16640  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
    … …  
    3030using HeuristicLab.Data;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    3333using HeuristicLab.Random;
    3434using HEAL.Attic;
    3535
    3636namespace HeuristicLab.Problems.DataAnalysis {
    37   [StorableType("6E031543-7C35-47F3-9BE2-E33D1486C3D2")]
     37  [StorableType("768AFEDB-5641-429E-85A1-A0BE8DFDD56F")]
    3838  [Item("ClassificationSolution Impacts Calculator", "Calculation of the impacts of input variables for any classification solution")]
    3939  public sealed class ClassificationSolutionVariableImpactsCalculator : ParameterizedNamedItem {
    4040    #region Parameters/Properties
     41    [StorableType("e6cd2226-10cd-4765-ae1a-924e316b6aac")]
    4142    public enum ReplacementMethodEnum {
    4243      Median,
    … …  
    4546      Noise
    4647    }
     48
     49    [StorableType("84d84ccf-5d6d-432f-a946-eb499935e5c8")]
    4750    public enum FactorReplacementMethodEnum {
    4851      Best,
    … …  
    5053      Shuffle
    5154    }
     55
     56    [StorableType("70f30113-df01-41b4-9e3b-2982035de498")]
    5257    public enum DataPartitionEnum {
    5358      Training,

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis {
    28   [StorableType("E104A01A-369B-4ACC-A37D-2E13FF205811")]
     28  [StorableType("D5A42FE7-D21B-48F7-A812-FE69724D0098")]
    2929  [Item(Name = "Constant Classification Solution", Description = "Represents a constant classification solution (model + data).")]
    3030  public class ConstantClassificationSolution : ClassificationSolution {

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HEAL.Attic;
    2929
    … …  
    3232  /// Represents discriminant function classification data analysis models.
    3333  /// </summary>
    34   [StorableType("9408A82E-6B34-47F6-B1A0-F8C822CC0AD9")]
     34  [StorableType("E7A8648D-C938-499F-A712-185542095708")]
    3535  [Item("DiscriminantFunctionClassificationModel", "Represents a classification model that uses a discriminant function and classification thresholds.")]
    3636  public class DiscriminantFunctionClassificationModel : ClassificationModel, IDiscriminantFunctionClassificationModel {

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HEAL.Attic;
    2828
    … …  
    3131  /// Represents a classification solution that uses a discriminant function and classification thresholds.
    3232  /// </summary>
    33   [StorableType("EB59DCD7-B426-4349-8301-97541A676ECE")]
     33  [StorableType("A3480DF9-49E7-4329-AD23-57B4441033C1")]
    3434  [Item("DiscriminantFunctionClassificationSolution", "Represents a classification solution that uses a discriminant function and classification thresholds.")]
    3535  public class DiscriminantFunctionClassificationSolution : DiscriminantFunctionClassificationSolutionBase {

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HEAL.Attic;
    3131
    … …  
    3434  /// Represents a classification solution that uses a discriminant function and classification thresholds.
    3535  /// </summary>
    36   [StorableType("269E7BE2-27E2-4E28-B42A-8527069C7292")]
     36  [StorableType("3668EBE0-128C-4BC4-902C-161670F98FAD")]
    3737  [Item("DiscriminantFunctionClassificationSolution", "Represents a classification solution that uses a discriminant function and classification thresholds.")]
    3838  public abstract class DiscriminantFunctionClassificationSolutionBase : ClassificationSolutionBase, IDiscriminantFunctionClassificationSolution {

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HEAL.Attic;
    2929
    … …  
    3232  /// Represents a threshold calculator that maximizes the weighted accuracy of the classifcation model.
    3333  /// </summary>
    34   [StorableType("226D720F-A0C8-4A23-B0CC-ED083E2A133D")]
     34  [StorableType("30BB9513-542D-4CB8-931B-9767C9CB2EFB")]
    3535  [Item("AccuracyMaximizationThresholdCalculator", "Represents a threshold calculator that maximizes the weighted accuracy of the classifcation model.")]
    3636  public class AccuracyMaximizationThresholdCalculator : ThresholdCalculator {

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HEAL.Attic;
    2929
    … …  
    3232  /// Represents a threshold calculator that calculates thresholds as the cutting points between the estimated class distributions (assuming normally distributed class values).
    3333  /// </summary>
    34   [StorableType("987423CB-F80E-4302-88EC-9B24977C11E4")]
     34  [StorableType("D01CB5DC-606B-4CE9-B293-2D4D80A70BB8")]
    3535  [Item("NormalDistributionCutPointsThresholdCalculator", "Represents a threshold calculator that calculates thresholds as the cutting points between the estimated class distributions (assuming normally distributed class values).")]
    3636  public class NormalDistributionCutPointsThresholdCalculator : ThresholdCalculator {

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

    r16628 r16640  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HEAL.Attic;
    2727
    … …  
    3030  /// Base class for threshold calculators for discriminant function classification models.
    3131  /// </summary>
    32   [StorableType("91983232-13A0-420D-83FF-FA4DF5733321")]
     32  [StorableType("F56CDC6C-D4F5-4B2D-A7C4-04E0D2255699")]
    3333  public abstract class ThresholdCalculator : NamedItem, IDiscriminantFunctionThresholdCalculator {
    3434
Note: See TracChangeset for help on using the changeset viewer.