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:
21 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Algorithms.DataAnalysis

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceConst.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 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Algorithms.DataAnalysis {
    30   [StorableClass]
     30  [StorableType("B359EC1D-0EAE-4800-9502-133A280CE8B0")]
    3131  [Item(Name = "CovarianceConst",
    3232    Description = "Constant covariance function for Gaussian processes.")]
     
    3939    }
    4040    [StorableConstructor]
    41     private CovarianceConst(bool deserializing)
    42       : base(deserializing) {
     41    private CovarianceConst(StorableConstructorFlag _) : base(_) {
    4342    }
    4443
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceLinear.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 *
    55 * This file is part of HeuristicLab.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Algorithms.DataAnalysis {
    28   [StorableClass]
     28  [StorableType("5C4AB3C8-48D5-4B6E-830A-89AE2A363C64")]
    2929  [Item(Name = "CovarianceLinear", Description = "Linear covariance function for Gaussian processes.")]
    3030  public sealed class CovarianceLinear : Item, ICovarianceFunction {
    3131    [StorableConstructor]
    32     private CovarianceLinear(bool deserializing) : base(deserializing) { }
     32    private CovarianceLinear(StorableConstructorFlag _) : base(_) { }
    3333    private CovarianceLinear(CovarianceLinear original, Cloner cloner)
    3434      : base(original, cloner) {
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceLinearArd.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 *
    55 * This file is part of HeuristicLab.
     
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.DataAnalysis {
    32   [StorableClass]
     32  [StorableType("A704FDF2-0566-4AB5-B752-D713831B016C")]
    3333  [Item(Name = "CovarianceLinearArd",
    3434    Description = "Linear covariance function with automatic relevance determination for Gaussian processes.")]
     
    4242
    4343    [StorableConstructor]
    44     private CovarianceLinearArd(bool deserializing) : base(deserializing) { }
     44    private CovarianceLinearArd(StorableConstructorFlag _) : base(_) { }
    4545    private CovarianceLinearArd(CovarianceLinearArd original, Cloner cloner)
    4646      : base(original, cloner) {
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceMask.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 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Algorithms.DataAnalysis {
    30   [StorableClass]
     30  [StorableType("21D5F261-B9DF-4DC4-AF42-7B223C45840F")]
    3131  [Item(Name = "CovarianceMask",
    3232    Description = "Masking covariance function for dimension selection can be used to apply a covariance function only on certain input dimensions.")]
     
    4040
    4141    [StorableConstructor]
    42     private CovarianceMask(bool deserializing)
    43       : base(deserializing) {
     42    private CovarianceMask(StorableConstructorFlag _) : base(_) {
    4443    }
    4544
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceMaternIso.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 *
    55 * This file is part of HeuristicLab.
     
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.DataAnalysis {
    32   [StorableClass]
     32  [StorableType("D251400A-4DCA-4500-9738-CE3B7BF96B0D")]
    3333  [Item(Name = "CovarianceMaternIso",
    3434    Description = "Matern covariance function for Gaussian processes.")]
     
    5353
    5454    [StorableConstructor]
    55     private CovarianceMaternIso(bool deserializing)
    56       : base(deserializing) {
     55    private CovarianceMaternIso(StorableConstructorFlag _) : base(_) {
    5756    }
    5857
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceNeuralNetwork.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 *
    55 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Algorithms.DataAnalysis {
    31   [StorableClass]
     31  [StorableType("F60E0A63-0107-44E3-920B-BB5B09E9DDDF")]
    3232  [Item(Name = "CovarianceNeuralNetwork",
    3333    Description = "Neural network covariance function for Gaussian processes.")]
     
    4848
    4949    [StorableConstructor]
    50     private CovarianceNeuralNetwork(bool deserializing)
    51       : base(deserializing) {
     50    private CovarianceNeuralNetwork(StorableConstructorFlag _) : base(_) {
    5251    }
    5352
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceNoise.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 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Algorithms.DataAnalysis {
    30   [StorableClass]
     30  [StorableType("C6AEEC11-1F8D-40D1-8D8A-DCCCE886E46C")]
    3131  [Item(Name = "CovarianceNoise",
    3232    Description = "Noise covariance function for Gaussian processes.")]
     
    4040
    4141    [StorableConstructor]
    42     private CovarianceNoise(bool deserializing)
    43       : base(deserializing) {
     42    private CovarianceNoise(StorableConstructorFlag _) : base(_) {
    4443    }
    4544
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovariancePeriodic.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 *
    55 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Algorithms.DataAnalysis {
    31   [StorableClass]
     31  [StorableType("198B5472-6CAA-4C39-BB1F-6EC16CB7801B")]
    3232  [Item(Name = "CovariancePeriodic", Description = "Periodic covariance function for Gaussian processes.")]
    3333  public sealed class CovariancePeriodic : ParameterizedNamedItem, ICovarianceFunction {
     
    5757
    5858    [StorableConstructor]
    59     private CovariancePeriodic(bool deserializing) : base(deserializing) { }
     59    private CovariancePeriodic(StorableConstructorFlag _) : base(_) { }
    6060    private CovariancePeriodic(CovariancePeriodic original, Cloner cloner)
    6161      : base(original, cloner) {
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovariancePiecewisePolynomial.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 *
    55 * This file is part of HeuristicLab.
     
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.DataAnalysis {
    32   [StorableClass]
     32  [StorableType("62C25AD5-F41F-4CC2-B589-A92CCEE7AC88")]
    3333  [Item(Name = "CovariancePiecewisePolynomial",
    3434    Description = "Piecewise polynomial covariance function with compact support for Gaussian processes.")]
     
    5353
    5454    [StorableConstructor]
    55     private CovariancePiecewisePolynomial(bool deserializing)
    56       : base(deserializing) {
     55    private CovariancePiecewisePolynomial(StorableConstructorFlag _) : base(_) {
    5756    }
    5857
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovariancePolynomial.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 *
    55 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Algorithms.DataAnalysis {
    31   [StorableClass]
     31  [StorableType("BD6DF0C6-07A2-44CE-8EDB-92561505EF6E")]
    3232  [Item(Name = "CovariancePolynomial",
    3333    Description = "Polynomial covariance function for Gaussian processes.")]
     
    5252
    5353    [StorableConstructor]
    54     private CovariancePolynomial(bool deserializing)
    55       : base(deserializing) {
     54    private CovariancePolynomial(StorableConstructorFlag _) : base(_) {
    5655    }
    5756
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceProduct.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 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Algorithms.DataAnalysis {
    30   [StorableClass]
     30  [StorableType("C65B207C-2E95-4764-8698-D0B1D1EECCF1")]
    3131  [Item(Name = "CovarianceProduct",
    3232    Description = "Product covariance function for Gaussian processes.")]
     
    4242
    4343    [StorableConstructor]
    44     private CovarianceProduct(bool deserializing)
    45       : base(deserializing) {
     44    private CovarianceProduct(StorableConstructorFlag _) : base(_) {
    4645    }
    4746
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceRationalQuadraticArd.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 *
    55 * This file is part of HeuristicLab.
     
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.DataAnalysis {
    32   [StorableClass]
     32  [StorableType("25439318-762C-4ED6-BAE7-E53860598A01")]
    3333  [Item(Name = "CovarianceRationalQuadraticArd",
    3434    Description = "Rational quadratic covariance function with automatic relevance determination for Gaussian processes.")]
     
    5656
    5757    [StorableConstructor]
    58     private CovarianceRationalQuadraticArd(bool deserializing)
    59       : base(deserializing) {
     58    private CovarianceRationalQuadraticArd(StorableConstructorFlag _) : base(_) {
    6059    }
    6160
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceRationalQuadraticIso.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 *
    55 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Algorithms.DataAnalysis {
    31   [StorableClass]
     31  [StorableType("358BE57A-13C8-40BB-B344-217984D4EB0F")]
    3232  [Item(Name = "CovarianceRationalQuadraticIso",
    3333    Description = "Isotropic rational quadratic covariance function for Gaussian processes.")]
     
    5757
    5858    [StorableConstructor]
    59     private CovarianceRationalQuadraticIso(bool deserializing)
    60       : base(deserializing) {
     59    private CovarianceRationalQuadraticIso(StorableConstructorFlag _) : base(_) {
    6160    }
    6261
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceScale.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 *
    55 * This file is part of HeuristicLab.
     
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.DataAnalysis {
    32   [StorableClass]
     32  [StorableType("4871900E-8B7A-4D74-969A-773D63198733")]
    3333  [Item(Name = "CovarianceScale",
    3434    Description = "Scale covariance function for Gaussian processes.")]
     
    4646
    4747    [StorableConstructor]
    48     private CovarianceScale(bool deserializing)
    49       : base(deserializing) {
     48    private CovarianceScale(StorableConstructorFlag _) : base(_) {
    5049    }
    5150
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceSpectralMixture.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 *
    55 * This file is part of HeuristicLab.
     
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.DataAnalysis {
    32   [StorableClass]
     32  [StorableType("FF180FAF-851D-425E-AC0B-25930CE9604C")]
    3333  [Item(Name = "CovarianceSpectralMixture",
    3434    Description = "The spectral mixture kernel described in Wilson A. G. and Adams R.P., Gaussian Process Kernels for Pattern Discovery and Exptrapolation, ICML 2013.")]
     
    6464
    6565    [StorableConstructor]
    66     private CovarianceSpectralMixture(bool deserializing)
    67       : base(deserializing) {
     66    private CovarianceSpectralMixture(StorableConstructorFlag _) : base(_) {
    6867    }
    6968
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceSquaredExponentialArd.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 *
    55 * This file is part of HeuristicLab.
     
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.DataAnalysis {
    32   [StorableClass]
     32  [StorableType("88CB6895-6CD8-4F81-8E3D-905EEBB7E77A")]
    3333  [Item(Name = "CovarianceSquaredExponentialArd", Description = "Squared exponential covariance function with automatic relevance determination for Gaussian processes.")]
    3434  public sealed class CovarianceSquaredExponentialArd : ParameterizedNamedItem, ICovarianceFunction {
     
    4848
    4949    [StorableConstructor]
    50     private CovarianceSquaredExponentialArd(bool deserializing) : base(deserializing) { }
     50    private CovarianceSquaredExponentialArd(StorableConstructorFlag _) : base(_) { }
    5151    private CovarianceSquaredExponentialArd(CovarianceSquaredExponentialArd original, Cloner cloner)
    5252      : base(original, cloner) {
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceSquaredExponentialIso.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 *
    55 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Algorithms.DataAnalysis {
    31   [StorableClass]
     31  [StorableType("1335C8EF-73CA-40F4-9124-EC6D7E3C68E0")]
    3232  [Item(Name = "CovarianceSquaredExponentialIso",
    3333    Description = "Isotropic squared exponential covariance function for Gaussian processes.")]
     
    4949
    5050    [StorableConstructor]
    51     private CovarianceSquaredExponentialIso(bool deserializing)
    52       : base(deserializing) {
     51    private CovarianceSquaredExponentialIso(StorableConstructorFlag _) : base(_) {
    5352    }
    5453
  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceFunctions/CovarianceSum.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 *
    55 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Algorithms.DataAnalysis {
    30   [StorableClass]
     30  [StorableType("8F1A684A-98BE-429A-BDA2-E1FB7DDF09F0")]
    3131  [Item(Name = "CovarianceSum",
    3232    Description = "Sum covariance function for Gaussian processes.")]
     
    4242
    4343    [StorableConstructor]
    44     private CovarianceSum(bool deserializing)
    45       : base(deserializing) {
     44    private CovarianceSum(StorableConstructorFlag _) : base(_) {
    4645    }
    4746
Note: See TracChangeset for help on using the changeset viewer.