Changeset 17434 for branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph

Timestamp:

02/11/20 13:36:02 (5 years ago)

Author:

bburlacu

Message:

#1772: Merge trunk changes and fix all errors and compilation warnings.

Location:

branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph

Files:

• GenealogyGraph.cs (modified) (3 diffs)
• GenealogyGraphArc.cs (modified) (3 diffs)
• GenealogyGraphNode.cs (modified) (4 diffs)

branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs

@@ -26 +26 @@
 using System.Linq;
 using System.Text;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.EvolutionTracking {
-  [StorableClass]
+namespace HeuristicLab.EvolutionTracking
+{
   [Item("GenealogyGraph", "A class representing a genealogy graph")]
-  public class GenealogyGraph : DirectedGraph, IGenealogyGraph {
+  [StorableType("66DCA305-87F7-41D8-91CF-68415B1809A8")]
+  public class GenealogyGraph : DirectedGraph, IGenealogyGraph
+  {
     private Dictionary<object, IGenealogyGraphNode> contentMap;
     private Dictionary<string, IGenealogyGraphNode> idMap;
@@ -71 +74 @@
 
     [StorableConstructor]
-    protected GenealogyGraph(bool deserializing)
-      : base(deserializing) {
-    }
+    protected GenealogyGraph(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
@@ -191 +192 @@
 
   [Item("GenealogyGraph", "A genealogy graph in which the vertex data is of type T")]
-  [StorableClass]
-  public class GenealogyGraph<T> : GenealogyGraph, IGenealogyGraph<T> where T : class, IItem {
+  [StorableType("3F5043F7-2538-4B76-BA12-062A4CEF5A1A")]
+  public class GenealogyGraph<T> : GenealogyGraph, IGenealogyGraph<T> where T : class, IItem
+  {
     public GenealogyGraph() { }
     private GenealogyGraph(GenealogyGraph original, Cloner cloner)

branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraphArc.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -25 +26 @@
 
 namespace HeuristicLab.EvolutionTracking {
-  [StorableClass]
   [Item("GenealogyGraphArc", "A graph arc connecting two GenealogyGraphNodes and holding some data.")]
+  [StorableType("011C69C6-7E84-4AB0-8DBB-9A5BB69D9484")]
   public class GenealogyGraphArc : Arc<IDeepCloneable>, IGenealogyGraphArc {
     [StorableConstructor]
-    protected GenealogyGraphArc(bool deserializing) : base(deserializing) { }
+    protected GenealogyGraphArc(StorableConstructorFlag _) : base(_) { }
     protected GenealogyGraphArc(GenealogyGraphArc original, Cloner cloner)
       : base(original, cloner) { }
@@ -50 +51 @@
   }
 
-  [StorableClass]
   [Item("GenealogyGraphArc", "")]
+  [StorableType("47612662-7C98-44F8-94D0-132B425889F5")]
   public class GenealogyGraphArc<T> : GenealogyGraphArc where T : class,IItem {
     [StorableConstructor]
-    protected GenealogyGraphArc(bool deserializing) : base(deserializing) { }
+    protected GenealogyGraphArc(StorableConstructorFlag _) : base(_) { }
 
     protected GenealogyGraphArc(GenealogyGraphArc original, Cloner cloner)

branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraphNode.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +29 @@
 
 namespace HeuristicLab.EvolutionTracking {
-  [StorableClass]
   [Item("GenealogGraphNode", "A class representing a node in the GenealogyGraph")]
+  [StorableType("3112AC58-F11A-435A-A669-8C9B6EF88F40")]
   public class GenealogyGraphNode : Vertex<IDeepCloneable>, IGenealogyGraphNode {
     [StorableConstructor]
-    protected GenealogyGraphNode(bool deserializing) : base(deserializing) { }
+    protected GenealogyGraphNode(StorableConstructorFlag _) : base(_) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -132 +133 @@
   }
 
-  [StorableClass]
   [Item("GenealogyGraphNode", "A genealogy graph node which also has a Content")]
+  [StorableType("68BE4E3D-2578-4C06-BF03-8583BA03022F")]
   public class GenealogyGraphNode<T> : GenealogyGraphNode, IGenealogyGraphNode<T> where T : class, IItem {
     public new T Data {
@@ -141 +142 @@
 
     [StorableConstructor]
-    protected GenealogyGraphNode(bool deserializing) : base(deserializing) { }
+    protected GenealogyGraphNode(StorableConstructorFlag _) : base(_) { }
 
     public GenealogyGraphNode(IDeepCloneable content) : base(content) { }