Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Algorithms.DataAnalysis

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/INcaInitializer.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.Core;
    2323using HeuristicLab.Problems.DataAnalysis;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Algorithms.DataAnalysis {
     27  [StorableType("4e8ff5de-c353-47cb-baa7-1a9be8f89456")]
    2628  public interface INcaInitializer : IOperator {
    2729    /// <summary>

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/LdaInitializer.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;
    2626using HeuristicLab.Problems.DataAnalysis;
    2727
    2828namespace HeuristicLab.Algorithms.DataAnalysis {
    2929  [Item("LDA", "Initializes the matrix by performing a linear discriminant analysis.")]
    30   [StorableClass]
     30  [StorableType("587DE65A-4BAD-4AC7-8C99-A9DE2B2A7B19")]
    3131  public class LdaInitializer : NcaInitializer {
    3232
    3333    [StorableConstructor]
    34     protected LdaInitializer(bool deserializing) : base(deserializing) { }
     34    protected LdaInitializer(StorableConstructorFlag _) : base(_) { }
    3535    protected LdaInitializer(LdaInitializer original, Cloner cloner) : base(original, cloner) { }
    3636    public LdaInitializer() : base() { }

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/NcaInitializer.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.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Problems.DataAnalysis;
    3030
    3131namespace HeuristicLab.Algorithms.DataAnalysis {
    3232  [Item("NcaInitializer", "Base class for initializers for NCA.")]
    33   [StorableClass]
     33  [StorableType("165FEA5C-173F-46E3-AA38-16E125367094")]
    3434  public abstract class NcaInitializer : SingleSuccessorOperator, INcaInitializer {
    3535
    … …  
    4545
    4646    [StorableConstructor]
    47     protected NcaInitializer(bool deserializing) : base(deserializing) { }
     47    protected NcaInitializer(StorableConstructorFlag _) : base(_) { }
    4848    protected NcaInitializer(NcaInitializer original, Cloner cloner) : base(original, cloner) { }
    4949    public NcaInitializer() {

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/PcaInitializer.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;
    2626using HeuristicLab.Problems.DataAnalysis;
    2727
    2828namespace HeuristicLab.Algorithms.DataAnalysis {
    2929  [Item("PCA", "Initializes the matrix by performing a principal components analysis.")]
    30   [StorableClass]
     30  [StorableType("C08B748E-61BC-4297-9ED0-383A41A699B4")]
    3131  public sealed class PcaInitializer : NcaInitializer {
    3232
    3333    [StorableConstructor]
    34     private PcaInitializer(bool deserializing) : base(deserializing) { }
     34    private PcaInitializer(StorableConstructorFlag _) : base(_) { }
    3535    private PcaInitializer(PcaInitializer original, Cloner cloner) : base(original, cloner) { }
    3636    public PcaInitializer() : base() { }

  • trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/RandomInitializer.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.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Problems.DataAnalysis;
    2929
    3030namespace HeuristicLab.Algorithms.DataAnalysis {
    3131  [Item("Random", "Initializes the matrix randomly.")]
    32   [StorableClass]
     32  [StorableType("C799E0AA-1DC5-44BF-98F9-6CFEF5521BBC")]
    3333  public sealed class RandomInitializer : NcaInitializer, IStochasticOperator {
    3434    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     private RandomInitializer(bool deserializing) : base(deserializing) { }
     39    private RandomInitializer(StorableConstructorFlag _) : base(_) { }
    4040    private RandomInitializer(RandomInitializer original, Cloner cloner) : base(original, cloner) { }
    4141    public RandomInitializer()
Note: See TracChangeset for help on using the changeset viewer.