Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/07/19 23:40:10 (6 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Algorithms.DataAnalysis

  • stable/HeuristicLab.Algorithms.DataAnalysis/3.4

  • stable/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/OneFactorClassificationModel.cs

    r15584 r17097  
    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 HeuristicLab.Problems.DataAnalysis;
    2929
    3030namespace HeuristicLab.Algorithms.DataAnalysis {
    31   [StorableClass]
     31  [StorableType("1FD28BA4-E30E-48E8-B868-24A5F2363DD0")]
    3232  [Item("OneFactor Classification Model", "A model that uses only one categorical feature (factor) to determine the class.")]
    3333  public sealed class OneFactorClassificationModel : ClassificationModel {
    … …  
    6161
    6262    [StorableConstructor]
    63     private OneFactorClassificationModel(bool deserializing) : base(deserializing) { }
     63    private OneFactorClassificationModel(StorableConstructorFlag _) : base(_) { }
    6464    private OneFactorClassificationModel(OneFactorClassificationModel original, Cloner cloner)
    6565      : base(original, cloner) {

  • stable/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/OneFactorClassificationSolution.cs

    r15584 r17097  
    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 HeuristicLab.Problems.DataAnalysis;
    2626
    2727namespace HeuristicLab.Algorithms.DataAnalysis {
    28   [StorableClass]
     28  [StorableType("7A180AA0-E963-4714-A33A-2C87C4108B93")]
    2929  [Item(Name = "OneR Classification Solution", Description = "Represents a OneR classification solution which uses only a single factor for class prediction.")]
    3030  public sealed class OneFactorClassificationSolution : ClassificationSolution {
    … …  
    3535
    3636    [StorableConstructor]
    37     private OneFactorClassificationSolution(bool deserializing) : base(deserializing) { }
     37    private OneFactorClassificationSolution(StorableConstructorFlag _) : base(_) { }
    3838    private OneFactorClassificationSolution(OneFactorClassificationSolution original, Cloner cloner) : base(original, cloner) { }
    3939    public OneFactorClassificationSolution(OneFactorClassificationModel model, IClassificationProblemData problemData)

  • stable/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/OneR.cs

    r15584 r17097  
    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.
    … …  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232using HeuristicLab.Problems.DataAnalysis;
    3333
    … …  
    3737  /// </summary>
    3838  [Item("OneR Classification", "A simple classification algorithm the searches the best single-variable split (does not support categorical features correctly). See R.C. Holte (1993). Very simple classification rules perform well on most commonly used datasets. Machine Learning. 11:63-91.")]
    39   [StorableClass]
     39  [StorableType("22D1C518-CEDA-413C-8997-D34BC06B6267")]
    4040  public sealed class OneR : FixedDataAnalysisAlgorithm<IClassificationProblem> {
    4141
    … …  
    4545
    4646    [StorableConstructor]
    47     private OneR(bool deserializing) : base(deserializing) { }
     47    private OneR(StorableConstructorFlag _) : base(_) { }
    4848
    4949    private OneR(OneR original, Cloner cloner)

  • stable/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/OneRClassificationModel.cs

    r15584 r17097  
    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 HeuristicLab.Problems.DataAnalysis;
    2929
    3030namespace HeuristicLab.Algorithms.DataAnalysis {
    31   [StorableClass]
     31  [StorableType("C3365B2F-75D6-45F7-9DD9-CD80854F9D75")]
    3232  [Item("OneR Classification Model", "A model that uses intervals for one variable to determine the class.")]
    3333  public sealed class OneRClassificationModel : ClassificationModel {
    … …  
    6161
    6262    [StorableConstructor]
    63     private OneRClassificationModel(bool deserializing) : base(deserializing) { }
     63    private OneRClassificationModel(StorableConstructorFlag _) : base(_) { }
    6464    private OneRClassificationModel(OneRClassificationModel original, Cloner cloner)
    6565      : base(original, cloner) {

  • stable/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/OneRClassificationSolution.cs

    r15584 r17097  
    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 HeuristicLab.Problems.DataAnalysis;
    2626
    2727namespace HeuristicLab.Algorithms.DataAnalysis {
    28   [StorableClass]
     28  [StorableType("971CA431-D3BC-403C-A0FB-0E6F5BA426D7")]
    2929  [Item(Name = "OneR Classification Solution", Description = "Represents a OneR classification solution which uses only a single feature with potentially multiple thresholds for class prediction.")]
    3030  public sealed class OneRClassificationSolution : ClassificationSolution {
    … …  
    3535
    3636    [StorableConstructor]
    37     private OneRClassificationSolution(bool deserializing) : base(deserializing) { }
     37    private OneRClassificationSolution(StorableConstructorFlag _) : base(_) { }
    3838    private OneRClassificationSolution(OneRClassificationSolution original, Cloner cloner) : base(original, cloner) { }
    3939    public OneRClassificationSolution(OneRClassificationModel model, IClassificationProblemData problemData)

  • stable/HeuristicLab.Algorithms.DataAnalysis/3.4/BaselineClassifiers/ZeroR.cs

    r15584 r17097  
    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.Core;
    2626using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Problems.DataAnalysis;
    2929
    … …  
    3333  /// </summary>
    3434  [Item("ZeroR Classification", "The simplest possible classifier, ZeroR always predicts the majority class.")]
    35   [StorableClass]
     35  [StorableType("A2C4BA0A-008B-44EB-B93A-3B53B867F0EA")]
    3636  public sealed class ZeroR : FixedDataAnalysisAlgorithm<IClassificationProblem> {
    3737
    3838    [StorableConstructor]
    39     private ZeroR(bool deserializing) : base(deserializing) { }
     39    private ZeroR(StorableConstructorFlag _) : base(_) { }
    4040    private ZeroR(ZeroR original, Cloner cloner)
    4141      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.