Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/28/18 16:10:48 (5 years ago)
Author:
jkarder
Message:

#2520: worked on reintegration of new persistence

  • added nuget references to HEAL.Fossil
  • added StorableType attributes to many classes
  • changed signature of StorableConstructors
  • removed some classes in old persistence
  • removed some unnecessary usings
Location:
branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/LdaInitializer.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/NcaInitializer.cs

    r16453 r16462  
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    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() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/PcaInitializer.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/RandomInitializer.cs

    r16453 r16462  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    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()

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/ModelCreation/INcaModelCreator.cs

    r16453 r16462  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2622using HeuristicLab.Core;
    2723

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/ModelCreation/NcaModelCreator.cs

    r16453 r16462  
    2727using HeuristicLab.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using HeuristicLab.Problems.DataAnalysis;
    3131
    3232namespace HeuristicLab.Algorithms.DataAnalysis {
    3333  [Item("NcaModelCreator", "Creates an NCA model with a given matrix.")]
    34   [StorableClass]
     34  [StorableType("30D2840C-1FE3-4A45-97FF-294C93D33D8C")]
    3535  public class NcaModelCreator : SingleSuccessorOperator, INcaModelCreator {
    3636
    … …  
    6060
    6161    [StorableConstructor]
    62     protected NcaModelCreator(bool deserializing) : base(deserializing) { }
     62    protected NcaModelCreator(StorableConstructorFlag _) : base(_) { }
    6363    protected NcaModelCreator(NcaModelCreator original, Cloner cloner) : base(original, cloner) { }
    6464    public NcaModelCreator() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaAlgorithm.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232using HeuristicLab.PluginInfrastructure;
    3333using HeuristicLab.Problems.DataAnalysis;
    … …  
    4444Regularized Neighborhood Component Analysis. Lecture Notes in Computer Science, 4522. pp. 253-262.")]
    4545  [Creatable(CreatableAttribute.Categories.DataAnalysisClassification, Priority = 170)]
    46   [StorableClass]
     46  [StorableType("3C489916-B35E-408D-B225-CAA41B156065")]
    4747  public sealed class NcaAlgorithm : EngineAlgorithm {
    4848    #region Parameter Names
    … …  
    145145
    146146    [StorableConstructor]
    147     private NcaAlgorithm(bool deserializing) : base(deserializing) { }
     147    private NcaAlgorithm(StorableConstructorFlag _) : base(_) { }
    148148    private NcaAlgorithm(NcaAlgorithm original, Cloner cloner) : base(original, cloner) { }
    149149    public NcaAlgorithm()

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaClassificationSolution.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525using HeuristicLab.Problems.DataAnalysis;
    2626
    2727namespace HeuristicLab.Algorithms.DataAnalysis {
    2828  [Item("NCA Classification Solution", "")]
    29   [StorableClass]
     29  [StorableType("3FE3A37F-2926-43EB-AC77-3C80654D93AA")]
    3030  public class NcaClassificationSolution : ClassificationSolution, INcaClassificationSolution {
    3131
    … …  
    3636
    3737    [StorableConstructor]
    38     protected NcaClassificationSolution(bool deserializing) : base(deserializing) { }
     38    protected NcaClassificationSolution(StorableConstructorFlag _) : base(_) { }
    3939    protected NcaClassificationSolution(NcaClassificationSolution original, Cloner cloner)
    4040      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaGradientCalculator.cs

    r16453 r16462  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333using HeuristicLab.Problems.DataAnalysis;
    3434
    3535namespace HeuristicLab.Algorithms.DataAnalysis {
    3636  [Item("NcaGradientCalculator", "Calculates the quality and gradient of a certain NCA matrix.")]
    37   [StorableClass]
     37  [StorableType("51A6EEB2-321D-460A-AF45-414144E06C85")]
    3838  public class NcaGradientCalculator : SingleSuccessorOperator, ISingleObjectiveOperator {
    3939
    … …  
    6969
    7070    [StorableConstructor]
    71     protected NcaGradientCalculator(bool deserializing) : base(deserializing) { }
     71    protected NcaGradientCalculator(StorableConstructorFlag _) : base(_) { }
    7272    protected NcaGradientCalculator(NcaGradientCalculator original, Cloner cloner) : base(original, cloner) { }
    7373    public NcaGradientCalculator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaModel.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.Problems.DataAnalysis;
    2828
    2929namespace HeuristicLab.Algorithms.DataAnalysis {
    3030  [Item("NCA Model", "")]
    31   [StorableClass]
     31  [StorableType("BB2F9ECA-CEAF-4983-A34C-9A42A132B7CD")]
    3232  public class NcaModel : ClassificationModel, INcaModel {
    3333    public override IEnumerable<string> VariablesUsedForPrediction {
    … …  
    4848
    4949    [StorableConstructor]
    50     protected NcaModel(bool deserializing) : base(deserializing) { }
     50    protected NcaModel(StorableConstructorFlag _) : base(_) { }
    5151    protected NcaModel(NcaModel original, Cloner cloner)
    5252      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/SolutionCreation/NcaSolutionCreator.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Problems.DataAnalysis;
    3030
    3131namespace HeuristicLab.Algorithms.DataAnalysis {
    3232  [Item("NcaSolutionCreator", "Creates an NCA solution with a given model and some given data.")]
    33   [StorableClass]
     33  [StorableType("BAAD907C-B2A2-40C8-BBEE-F8EFF12A795D")]
    3434  public class NcaSolutionCreator : SingleSuccessorOperator, INcaSolutionCreator {
    3535
    … …  
    5151
    5252    [StorableConstructor]
    53     protected NcaSolutionCreator(bool deserializing) : base(deserializing) { }
     53    protected NcaSolutionCreator(StorableConstructorFlag _) : base(_) { }
    5454    protected NcaSolutionCreator(NcaSolutionCreator original, Cloner cloner) : base(original, cloner) { }
    5555    public NcaSolutionCreator()
Note: See TracChangeset for help on using the changeset viewer.