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/GaussianProcess/MeanFunctions/MeanConst.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.
    … …  
    2121
    2222using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    2523using HeuristicLab.Common;
    2624using HeuristicLab.Core;
    2725using HeuristicLab.Data;
    2826using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    3028
    3129namespace HeuristicLab.Algorithms.DataAnalysis {
    32   [StorableClass]
     30  [StorableType("6E29FC23-D11B-4F32-9101-DB2BF5B2F29E")]
    3331  [Item(Name = "MeanConst", Description = "Constant mean function for Gaussian processes.")]
    3432  public sealed class MeanConst : ParameterizedNamedItem, IMeanFunction {
    … …  
    3836
    3937    [StorableConstructor]
    40     private MeanConst(bool deserializing) : base(deserializing) { }
     38    private MeanConst(StorableConstructorFlag _) : base(_) { }
    4139    private MeanConst(MeanConst original, Cloner cloner)
    4240      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanFunctions/MeanLinear.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("B5F37A3E-1004-4C24-ADDE-C830757A9ABE")]
    3232  [Item(Name = "MeanLinear", Description = "Linear mean function for Gaussian processes.")]
    3333  public sealed class MeanLinear : ParameterizedNamedItem, IMeanFunction {
    … …  
    3737
    3838    [StorableConstructor]
    39     private MeanLinear(bool deserializing) : base(deserializing) { }
     39    private MeanLinear(StorableConstructorFlag _) : base(_) { }
    4040    private MeanLinear(MeanLinear original, Cloner cloner)
    4141      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanFunctions/MeanModel.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.Core;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Problems.DataAnalysis;
    2929
    3030namespace HeuristicLab.Algorithms.DataAnalysis {
    31   [StorableClass]
     31  [StorableType("4A05BC94-CC08-45E0-989A-516B1C1CC956")]
    3232  [Item(Name = "MeanModel", Description = "A mean function for Gaussian processes that uses a regression solution created with a different algorithm to calculate the mean.")]
    3333  // essentially an adaptor which maps from IMeanFunction to IRegressionSolution
    … …  
    4242
    4343    [StorableConstructor]
    44     private MeanModel(bool deserializing) : base(deserializing) { }
     44    private MeanModel(StorableConstructorFlag _) : base(_) { }
    4545    private MeanModel(MeanModel original, Cloner cloner)
    4646      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanFunctions/MeanProduct.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.
    … …  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Algorithms.DataAnalysis {
    29   [StorableClass]
     29  [StorableType("27D33B4E-6100-419E-B4EA-6D5EFDBFF823")]
    3030  [Item(Name = "MeanProduct", Description = "Product of mean functions for Gaussian processes.")]
    3131  public sealed class MeanProduct : Item, IMeanFunction {
    … …  
    4141
    4242    [StorableConstructor]
    43     private MeanProduct(bool deserializing)
    44       : base(deserializing) {
     43    private MeanProduct(StorableConstructorFlag _) : base(_) {
    4544    }
    4645

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanFunctions/MeanSum.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.
    … …  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Algorithms.DataAnalysis {
    29   [StorableClass]
     29  [StorableType("E8BB7879-43C7-4B9A-B9AC-C9CC482BC0D7")]
    3030  [Item(Name = "MeanSum", Description = "Sum of mean functions for Gaussian processes.")]
    3131  public sealed class MeanSum : Item, IMeanFunction {
    … …  
    4040
    4141    [StorableConstructor]
    42     private MeanSum(bool deserializing) : base(deserializing) { }
     42    private MeanSum(StorableConstructorFlag _) : base(_) { }
    4343    private MeanSum(MeanSum original, Cloner cloner)
    4444      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanFunctions/MeanZero.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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Algorithms.DataAnalysis {
    27   [StorableClass]
     27  [StorableType("7B76ECDD-A7B1-450F-B542-D25E19480FC5")]
    2828  [Item(Name = "MeanZero", Description = "Constant zero mean function for Gaussian processes.")]
    2929  public sealed class MeanZero : Item, IMeanFunction {
    3030    [StorableConstructor]
    31     private MeanZero(bool deserializing) : base(deserializing) { }
     31    private MeanZero(StorableConstructorFlag _) : base(_) { }
    3232    private MeanZero(MeanZero original, Cloner cloner)
    3333      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.