Changeset 16565 for trunk/HeuristicLab.Core/3.3/Collections/DirectedGraph

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.Core (modified) (1 prop)
• HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.cs (modified) (5 diffs)
• HeuristicLab.Core/3.3/Collections/DirectedGraph/DirectedGraph.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/DirectedGraph/Vertex.cs (modified) (5 diffs)

trunk/HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.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 System;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Core {
   [Item("Arc", "A graph arc connecting two graph vertices, that can have a weight, label, and data object for holding additional info")]
-  [StorableClass]
+  [StorableType("E91E40A2-FE77-49F0-866E-5127F3C1AC79")]
   public class Arc : Item, IArc {
     [Storable]
@@ -58 +58 @@
 
     [StorableConstructor]
-    protected Arc(bool deserializing) : base(deserializing) { }
+    protected Arc(StorableConstructorFlag _) : base(_) { }
 
     public Arc(IVertex source, IVertex target) {
@@ -82 +82 @@
   }
 
-  [StorableClass]
+  [StorableType("5F06782E-3BD2-4A9D-B030-BE1D6A6B714F")]
   public class Arc<T> : Arc, IArc<T> where T : class, IDeepCloneable {
     [Storable]
@@ -105 +105 @@
     }
 
-    public Arc(bool deserializing)
-      : base(deserializing) {
+    [StorableConstructor]
+    public Arc(StorableConstructorFlag _)
+      : base(_) {
     }
 

trunk/HeuristicLab.Core/3.3/Collections/DirectedGraph/DirectedGraph.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.Common;
 using HeuristicLab.Common.Resources;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Core {
   [Item("DirectedGraph", "Generic class representing a directed graph with custom vertices and content")]
-  [StorableClass]
+  [StorableType("C7DF8A65-95AE-4D73-950B-27A8086D7DA2")]
   public class DirectedGraph : Item, IDirectedGraph {
     public override Image ItemImage { get { return VSImageLibrary.Graph; } }
@@ -70 +70 @@
 
     [StorableConstructor]
-    protected DirectedGraph(bool serializing)
-      : base(serializing) {
+    protected DirectedGraph(StorableConstructorFlag _) : base(_) {
     }
 

trunk/HeuristicLab.Core/3.3/Collections/DirectedGraph/Vertex.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.
@@ -24 +24 @@
 using System.Linq;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Core {
   [Item("Vertex", "An object representing a vertex in the graph. It can have a text label, a weight, and an additional data object.")]
-  [StorableClass]
+  [StorableType("3FA3AAFA-05FF-4BE9-BD72-05A822A5E8CC")]
   public class Vertex : Item, IVertex {
     [Storable]
@@ -67 +67 @@
 
     [StorableConstructor]
-    public Vertex(bool deserializing) : base(deserializing) { }
+    public Vertex(StorableConstructorFlag _) : base(_) { }
 
     [StorableHook(HookType.AfterDeserialization)]
@@ -141 +141 @@
   }
 
-  [StorableClass]
+  [StorableType("ED2FD106-6F97-415A-A6D0-7F6690426910")]
   public class Vertex<T> : Vertex, IVertex<T> where T : class,IDeepCloneable {
     [Storable]
@@ -155 +155 @@
 
     [StorableConstructor]
-    protected Vertex(bool deserializing) : base(deserializing) { }
+    protected Vertex(StorableConstructorFlag _) : base(_) { }
 
     protected Vertex(Vertex<T> original, Cloner cloner)