Changeset 16842 for branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization

Timestamp:

04/19/19 11:05:52 (6 years ago)

Author:

gkronber

Message:

#2847: merged r16565:16796 from trunk/HeuristicLab.Algorithms.DataAnalysis to branch

Location:

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis

Files:

• . (modified) (1 prop)
• 3.4 (modified) (1 prop)
• 3.4/Nca/Initialization/INcaInitializer.cs (modified) (2 diffs)
• 3.4/Nca/Initialization/LdaInitializer.cs (modified) (2 diffs)
• 3.4/Nca/Initialization/NcaInitializer.cs (modified) (3 diffs)
• 3.4/Nca/Initialization/PcaInitializer.cs (modified) (2 diffs)
• 3.4/Nca/Initialization/RandomInitializer.cs (modified) (3 diffs)

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/INcaInitializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Problems.DataAnalysis;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
+  [StorableType("4e8ff5de-c353-47cb-baa7-1a9be8f89456")]
   public interface INcaInitializer : IOperator {
     /// <summary>

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/LdaInitializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
   [Item("LDA", "Initializes the matrix by performing a linear discriminant analysis.")]
-  [StorableClass]
+  [StorableType("587DE65A-4BAD-4AC7-8C99-A9DE2B2A7B19")]
   public class LdaInitializer : NcaInitializer {
 
     [StorableConstructor]
-    protected LdaInitializer(bool deserializing) : base(deserializing) { }
+    protected LdaInitializer(StorableConstructorFlag _) : base(_) { }
     protected LdaInitializer(LdaInitializer original, Cloner cloner) : base(original, cloner) { }
     public LdaInitializer() : base() { }

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/NcaInitializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -26 +26 @@
 using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
   [Item("NcaInitializer", "Base class for initializers for NCA.")]
-  [StorableClass]
+  [StorableType("165FEA5C-173F-46E3-AA38-16E125367094")]
   public abstract class NcaInitializer : SingleSuccessorOperator, INcaInitializer {
 
@@ -45 +45 @@
 
     [StorableConstructor]
-    protected NcaInitializer(bool deserializing) : base(deserializing) { }
+    protected NcaInitializer(StorableConstructorFlag _) : base(_) { }
     protected NcaInitializer(NcaInitializer original, Cloner cloner) : base(original, cloner) { }
     public NcaInitializer() {

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/PcaInitializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
   [Item("PCA", "Initializes the matrix by performing a principal components analysis.")]
-  [StorableClass]
+  [StorableType("C08B748E-61BC-4297-9ED0-383A41A699B4")]
   public sealed class PcaInitializer : NcaInitializer {
 
     [StorableConstructor]
-    private PcaInitializer(bool deserializing) : base(deserializing) { }
+    private PcaInitializer(StorableConstructorFlag _) : base(_) { }
     private PcaInitializer(PcaInitializer original, Cloner cloner) : base(original, cloner) { }
     public PcaInitializer() : base() { }

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/Initialization/RandomInitializer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
   [Item("Random", "Initializes the matrix randomly.")]
-  [StorableClass]
+  [StorableType("C799E0AA-1DC5-44BF-98F9-6CFEF5521BBC")]
   public sealed class RandomInitializer : NcaInitializer, IStochasticOperator {
     public ILookupParameter<IRandom> RandomParameter {
@@ -37 +37 @@
 
     [StorableConstructor]
-    private RandomInitializer(bool deserializing) : base(deserializing) { }
+    private RandomInitializer(StorableConstructorFlag _) : base(_) { }
     private RandomInitializer(RandomInitializer original, Cloner cloner) : base(original, cloner) { }
     public RandomInitializer()