Changeset 16565 for trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca
- Timestamp:
- 01/28/19 13:41:42 (6 years ago)
- Location:
- trunk
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration (added) merged: 16451-16454,16462,16465-16468,16470-16472,16474,16476-16477,16479-16487,16529-16530,16539,16551-16555,16558-16559,16562-16564
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis (added) merged: 16452-16454,16462,16468,16470,16474,16479,16529,16539,16558-16559
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4 (added) merged: 16452-16454,16462,16468,16470,16474,16479,16529,16539,16558-16559
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/INcaInitializer.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Core; 23 23 using HeuristicLab.Problems.DataAnalysis; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Algorithms.DataAnalysis { 27 [StorableType("4e8ff5de-c353-47cb-baa7-1a9be8f89456")] 26 28 public interface INcaInitializer : IOperator { 27 29 /// <summary> -
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/LdaInitializer.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 using HeuristicLab.Problems.DataAnalysis; 27 27 28 28 namespace HeuristicLab.Algorithms.DataAnalysis { 29 29 [Item("LDA", "Initializes the matrix by performing a linear discriminant analysis.")] 30 [Storable Class]30 [StorableType("587DE65A-4BAD-4AC7-8C99-A9DE2B2A7B19")] 31 31 public class LdaInitializer : NcaInitializer { 32 32 33 33 [StorableConstructor] 34 protected LdaInitializer( bool deserializing) : base(deserializing) { }34 protected LdaInitializer(StorableConstructorFlag _) : base(_) { } 35 35 protected LdaInitializer(LdaInitializer original, Cloner cloner) : base(original, cloner) { } 36 36 public LdaInitializer() : base() { } -
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/NcaInitializer.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Operators; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 using HeuristicLab.Problems.DataAnalysis; 30 30 31 31 namespace HeuristicLab.Algorithms.DataAnalysis { 32 32 [Item("NcaInitializer", "Base class for initializers for NCA.")] 33 [Storable Class]33 [StorableType("165FEA5C-173F-46E3-AA38-16E125367094")] 34 34 public abstract class NcaInitializer : SingleSuccessorOperator, INcaInitializer { 35 35 … … 45 45 46 46 [StorableConstructor] 47 protected NcaInitializer( bool deserializing) : base(deserializing) { }47 protected NcaInitializer(StorableConstructorFlag _) : base(_) { } 48 48 protected NcaInitializer(NcaInitializer original, Cloner cloner) : base(original, cloner) { } 49 49 public NcaInitializer() { -
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/PcaInitializer.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 using HeuristicLab.Problems.DataAnalysis; 27 27 28 28 namespace HeuristicLab.Algorithms.DataAnalysis { 29 29 [Item("PCA", "Initializes the matrix by performing a principal components analysis.")] 30 [Storable Class]30 [StorableType("C08B748E-61BC-4297-9ED0-383A41A699B4")] 31 31 public sealed class PcaInitializer : NcaInitializer { 32 32 33 33 [StorableConstructor] 34 private PcaInitializer( bool deserializing) : base(deserializing) { }34 private PcaInitializer(StorableConstructorFlag _) : base(_) { } 35 35 private PcaInitializer(PcaInitializer original, Cloner cloner) : base(original, cloner) { } 36 36 public PcaInitializer() : base() { } -
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/RandomInitializer.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Optimization; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 using HeuristicLab.Problems.DataAnalysis; 29 29 30 30 namespace HeuristicLab.Algorithms.DataAnalysis { 31 31 [Item("Random", "Initializes the matrix randomly.")] 32 [Storable Class]32 [StorableType("C799E0AA-1DC5-44BF-98F9-6CFEF5521BBC")] 33 33 public sealed class RandomInitializer : NcaInitializer, IStochasticOperator { 34 34 public ILookupParameter<IRandom> RandomParameter { … … 37 37 38 38 [StorableConstructor] 39 private RandomInitializer( bool deserializing) : base(deserializing) { }39 private RandomInitializer(StorableConstructorFlag _) : base(_) { } 40 40 private RandomInitializer(RandomInitializer original, Cloner cloner) : base(original, cloner) { } 41 41 public RandomInitializer() -
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Matrix.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/ModelCreation/INcaModelCreator.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 20 20 #endregion 21 21 22 using System;23 using System.Collections.Generic;24 using System.Linq;25 using System.Text;26 22 using HeuristicLab.Core; 23 using HEAL.Attic; 27 24 28 25 namespace HeuristicLab.Algorithms.DataAnalysis { 26 [StorableType("d93ecea5-379a-4569-8e0d-a80725d38d7f")] 29 27 public interface INcaModelCreator : IOperator { 30 28 -
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/ModelCreation/NcaModelCreator.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Operators; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 using HeuristicLab.Problems.DataAnalysis; 31 31 32 32 namespace HeuristicLab.Algorithms.DataAnalysis { 33 33 [Item("NcaModelCreator", "Creates an NCA model with a given matrix.")] 34 [Storable Class]34 [StorableType("30D2840C-1FE3-4A45-97FF-294C93D33D8C")] 35 35 public class NcaModelCreator : SingleSuccessorOperator, INcaModelCreator { 36 36 … … 60 60 61 61 [StorableConstructor] 62 protected NcaModelCreator( bool deserializing) : base(deserializing) { }62 protected NcaModelCreator(StorableConstructorFlag _) : base(_) { } 63 63 protected NcaModelCreator(NcaModelCreator original, Cloner cloner) : base(original, cloner) { } 64 64 public NcaModelCreator() { -
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaAlgorithm.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 29 29 using HeuristicLab.Optimization; 30 30 using HeuristicLab.Parameters; 31 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;31 using HEAL.Attic; 32 32 using HeuristicLab.PluginInfrastructure; 33 33 using HeuristicLab.Problems.DataAnalysis; … … 44 44 Regularized Neighborhood Component Analysis. Lecture Notes in Computer Science, 4522. pp. 253-262.")] 45 45 [Creatable(CreatableAttribute.Categories.DataAnalysisClassification, Priority = 170)] 46 [Storable Class]46 [StorableType("3C489916-B35E-408D-B225-CAA41B156065")] 47 47 public sealed class NcaAlgorithm : EngineAlgorithm { 48 48 #region Parameter Names … … 145 145 146 146 [StorableConstructor] 147 private NcaAlgorithm( bool deserializing) : base(deserializing) { }147 private NcaAlgorithm(StorableConstructorFlag _) : base(_) { } 148 148 private NcaAlgorithm(NcaAlgorithm original, Cloner cloner) : base(original, cloner) { } 149 149 public NcaAlgorithm() -
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaClassificationSolution.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using HeuristicLab.Common; 23 23 using HeuristicLab.Core; 24 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;24 using HEAL.Attic; 25 25 using HeuristicLab.Problems.DataAnalysis; 26 26 27 27 namespace HeuristicLab.Algorithms.DataAnalysis { 28 28 [Item("NCA Classification Solution", "")] 29 [Storable Class]29 [StorableType("3FE3A37F-2926-43EB-AC77-3C80654D93AA")] 30 30 public class NcaClassificationSolution : ClassificationSolution, INcaClassificationSolution { 31 31 … … 36 36 37 37 [StorableConstructor] 38 protected NcaClassificationSolution( bool deserializing) : base(deserializing) { }38 protected NcaClassificationSolution(StorableConstructorFlag _) : base(_) { } 39 39 protected NcaClassificationSolution(NcaClassificationSolution original, Cloner cloner) 40 40 : base(original, cloner) { -
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaGradientCalculator.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 30 30 using HeuristicLab.Optimization; 31 31 using HeuristicLab.Parameters; 32 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;32 using HEAL.Attic; 33 33 using HeuristicLab.Problems.DataAnalysis; 34 34 35 35 namespace HeuristicLab.Algorithms.DataAnalysis { 36 36 [Item("NcaGradientCalculator", "Calculates the quality and gradient of a certain NCA matrix.")] 37 [Storable Class]37 [StorableType("51A6EEB2-321D-460A-AF45-414144E06C85")] 38 38 public class NcaGradientCalculator : SingleSuccessorOperator, ISingleObjectiveOperator { 39 39 … … 69 69 70 70 [StorableConstructor] 71 protected NcaGradientCalculator( bool deserializing) : base(deserializing) { }71 protected NcaGradientCalculator(StorableConstructorFlag _) : base(_) { } 72 72 protected NcaGradientCalculator(NcaGradientCalculator original, Cloner cloner) : base(original, cloner) { } 73 73 public NcaGradientCalculator() -
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/NcaModel.cs
r16491 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 using HeuristicLab.Problems.DataAnalysis; 28 28 29 29 namespace HeuristicLab.Algorithms.DataAnalysis { 30 30 [Item("NCA Model", "")] 31 [Storable Class]31 [StorableType("BB2F9ECA-CEAF-4983-A34C-9A42A132B7CD")] 32 32 public class NcaModel : ClassificationModel, INcaModel { 33 33 public override IEnumerable<string> VariablesUsedForPrediction { … … 48 48 49 49 [StorableConstructor] 50 protected NcaModel( bool deserializing) : base(deserializing) { }50 protected NcaModel(StorableConstructorFlag _) : base(_) { } 51 51 protected NcaModel(NcaModel original, Cloner cloner) 52 52 : base(original, cloner) { -
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/SolutionCreation/INcaSolutionCreator.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using HeuristicLab.Core; 23 using HEAL.Attic; 23 24 24 25 namespace HeuristicLab.Algorithms.DataAnalysis { 26 [StorableType("0f9ff0e5-54b8-4bcd-8e1f-a3e92260803d")] 25 27 public interface INcaSolutionCreator : IOperator { 26 28 -
trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/SolutionCreation/NcaSolutionCreator.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Optimization; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 using HeuristicLab.Problems.DataAnalysis; 30 30 31 31 namespace HeuristicLab.Algorithms.DataAnalysis { 32 32 [Item("NcaSolutionCreator", "Creates an NCA solution with a given model and some given data.")] 33 [Storable Class]33 [StorableType("BAAD907C-B2A2-40C8-BBEE-F8EFF12A795D")] 34 34 public class NcaSolutionCreator : SingleSuccessorOperator, INcaSolutionCreator { 35 35 … … 51 51 52 52 [StorableConstructor] 53 protected NcaSolutionCreator( bool deserializing) : base(deserializing) { }53 protected NcaSolutionCreator(StorableConstructorFlag _) : base(_) { } 54 54 protected NcaSolutionCreator(NcaSolutionCreator original, Cloner cloner) : base(original, cloner) { } 55 55 public NcaSolutionCreator()
Note: See TracChangeset
for help on using the changeset viewer.