Changeset 16565 for trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/SolutionCreation

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:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4 (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/SolutionCreation/INcaSolutionCreator.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/SolutionCreation/NcaSolutionCreator.cs (modified) (3 diffs)

trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/SolutionCreation/INcaSolutionCreator.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.
@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
+  [StorableType("0f9ff0e5-54b8-4bcd-8e1f-a3e92260803d")]
   public interface INcaSolutionCreator : IOperator {
 

trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/SolutionCreation/NcaSolutionCreator.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.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
   [Item("NcaSolutionCreator", "Creates an NCA solution with a given model and some given data.")]
-  [StorableClass]
+  [StorableType("BAAD907C-B2A2-40C8-BBEE-F8EFF12A795D")]
   public class NcaSolutionCreator : SingleSuccessorOperator, INcaSolutionCreator {
 
@@ -51 +51 @@
 
     [StorableConstructor]
-    protected NcaSolutionCreator(bool deserializing) : base(deserializing) { }
+    protected NcaSolutionCreator(StorableConstructorFlag _) : base(_) { }
     protected NcaSolutionCreator(NcaSolutionCreator original, Cloner cloner) : base(original, cloner) { }
     public NcaSolutionCreator()