Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (6 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Algorithms.DataAnalysis

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/LossFunctions/AbsoluteErrorLoss.cs

    r15583 r16565  
    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 * and the BEACON Center for the Study of Evolution in Action.
    55 *
    … …  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Algorithms.DataAnalysis {
    3030  // loss function for the weighted absolute error
    31   [StorableClass]
     31  [StorableType("C4429BDA-665F-48A2-B18F-EA1569083842")]
    3232  [Item("Absolute error loss", "")]
    3333  public sealed class AbsoluteErrorLoss : Item, ILossFunction {
    … …  
    8383    #region item implementation
    8484    [StorableConstructor]
    85     private AbsoluteErrorLoss(bool deserializing) : base(deserializing) { }
     85    private AbsoluteErrorLoss(StorableConstructorFlag _) : base(_) { }
    8686
    8787    private AbsoluteErrorLoss(AbsoluteErrorLoss original, Cloner cloner) : base(original, cloner) { }

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/LossFunctions/ILossFunction.cs

    r15583 r16565  
    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 * and the BEACON Center for the Study of Evolution in Action.
    55 *
    … …  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Core;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Algorithms.DataAnalysis {
     28  [StorableType("588270d5-61ee-4906-b30f-841f64cd6724")]
    2729  // represents an interface for loss functions used by gradient boosting
    2830  // target represents the target vector  (original targets from the problem data, never changed)

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/LossFunctions/LogisticRegressionLoss.cs

    r15583 r16565  
    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 * and the BEACON Center for the Study of Evolution in Action.
    55 *
    … …  
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Algorithms.DataAnalysis {
    3131  // Greedy Function Approximation: A Gradient Boosting Machine (page 9)
    32   [StorableClass]
     32  [StorableType("E91BD71E-9A1D-4352-BD68-062290F8BE9C")]
    3333  [Item("Logistic regression loss", "")]
    3434  public sealed class LogisticRegressionLoss : Item, ILossFunction {
    … …  
    9090    #region item implementation
    9191    [StorableConstructor]
    92     private LogisticRegressionLoss(bool deserializing) : base(deserializing) { }
     92    private LogisticRegressionLoss(StorableConstructorFlag _) : base(_) { }
    9393
    9494    private LogisticRegressionLoss(LogisticRegressionLoss original, Cloner cloner) : base(original, cloner) { }

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/LossFunctions/QuantileRegressionLoss.cs

    r15583 r16565  
    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 * and the BEACON Center for the Study of Evolution in Action.
    55 *
    … …  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.DataAnalysis {
    3232  // loss function for quantile regression
    3333  // Generalized Boosted Models - A Guide To The gbm Package, Greg Ridgeway, August 2007, page 11
    34   [StorableClass]
     34  [StorableType("B8EF6C18-C1A8-4B43-8FEA-A6900287ADDD")]
    3535  [Item("QuantileRegressionloss", "Loss function for quantile regression")]
    3636  public sealed class QuantileRegressionLoss : ParameterizedNamedItem, ILossFunction {
    … …  
    102102    #region item implementation
    103103    [StorableConstructor]
    104     private QuantileRegressionLoss(bool deserializing) : base(deserializing) { }
     104    private QuantileRegressionLoss(StorableConstructorFlag _) : base(_) { }
    105105
    106106    private QuantileRegressionLoss(QuantileRegressionLoss original, Cloner cloner)

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/LossFunctions/RelativeErrorLoss.cs

    r15583 r16565  
    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 * and the BEACON Center for the Study of Evolution in Action.
    55 *
    … …  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Algorithms.DataAnalysis {
    3030  // relative error loss is a special case of weighted absolute error loss with weights = (1/target)
    31   [StorableClass]
     31  [StorableType("1334143A-7F77-46C1-8080-0CC4F4DA8995")]
    3232  [Item("Relative error loss", "")]
    3333  public sealed class RelativeErrorLoss : Item, ILossFunction {
    … …  
    111111    #region item implementation
    112112    [StorableConstructor]
    113     private RelativeErrorLoss(bool deserializing) : base(deserializing) { }
     113    private RelativeErrorLoss(StorableConstructorFlag _) : base(_) { }
    114114
    115115    private RelativeErrorLoss(RelativeErrorLoss original, Cloner cloner) : base(original, cloner) { }

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/LossFunctions/SquaredErrorLoss.cs

    r15583 r16565  
    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 * and the BEACON Center for the Study of Evolution in Action.
    55 *
    … …  
    2323using System;
    2424using System.Collections.Generic;
    25 using System.Linq;
    2625using HeuristicLab.Common;
    2726using HeuristicLab.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2928
    3029namespace HeuristicLab.Algorithms.DataAnalysis {
    31   [StorableClass]
     30  [StorableType("5D02E552-B96E-4267-858B-22339D8CB6B2")]
    3231  [Item("Squared error loss", "")]
    3332  public sealed class SquaredErrorLoss : Item, ILossFunction {
    … …  
    7978    #region item implementation
    8079    [StorableConstructor]
    81     private SquaredErrorLoss(bool deserializing) : base(deserializing) { }
     80    private SquaredErrorLoss(StorableConstructorFlag _) : base(_) { }
    8281
    8382    private SquaredErrorLoss(SquaredErrorLoss original, Cloner cloner) : base(original, cloner) { }
Note: See TracChangeset for help on using the changeset viewer.