From 3756285cf1fb06cbd28aa4f272ffcca18ec654c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Wed, 6 Oct 2021 23:47:56 +0200
Subject: [PATCH 01/39] Optimize the remove operations of AdjacencyGraph.

See #40.
---
 .../Structures/Graphs/AdjacencyGraph.cs       | 107 ++++++++++++++----
 1 file changed, 85 insertions(+), 22 deletions(-)

diff --git a/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs b/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs
index 7a54ca0ac..0b11a6bb7 100644
--- a/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs
@@ -1,7 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+#if SUPPORTS_AGGRESSIVE_INLINING
+using System.Runtime.CompilerServices;
+#endif
 using JetBrains.Annotations;
 using QuikGraph.Collections;
 
@@ -311,33 +314,48 @@ protected virtual void OnVertexAdded([NotNull] TVertex vertex)
             VertexAdded?.Invoke(vertex);
         }
 
-        /// <inheritdoc />
-        public virtual bool RemoveVertex(TVertex vertex)
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void RemoveInEdges([NotNull, InstantHandle] Predicate<TVertex> shouldRemove)
         {
-            if (!ContainsVertex(vertex))
-                return false;
+            Debug.Assert(shouldRemove != null);
 
-            // Remove out edges
-            IEdgeList<TVertex, TEdge> edges = _vertexEdges[vertex];
-            _vertexEdges.Remove(vertex);
-
-            // Run over edges and remove each edge touching the vertex
+            // Run over edges and remove each edge touching the vertices to remove
             foreach (KeyValuePair<TVertex, IEdgeList<TVertex, TEdge>> pair in _vertexEdges)
             {
-                // Collect edges to remove
-                foreach (TEdge edge in pair.Value.Clone())
+                // Collect indexes of edges to remove
+                var indexesToRemove = new List<int>();
+                for (int i = 0; i < pair.Value.Count; ++i)
                 {
-                    if (EqualityComparer<TVertex>.Default.Equals(edge.Target, vertex))
+                    TEdge edge = pair.Value[i];
+                    if (shouldRemove(edge.Target))
                     {
-                        pair.Value.Remove(edge);
-                        OnEdgeRemoved(edge);
-                        --EdgeCount;
+                        indexesToRemove.Add(i);
                     }
                 }
+
+                // Remove collected edges
+                for (int i = indexesToRemove.Count - 1; i >= 0; --i)
+                {
+                    int indexToRemove = indexesToRemove[i];
+                    TEdge edgeToRemove = pair.Value[indexToRemove];
+                    pair.Value.RemoveAt(indexToRemove);
+                    OnEdgeRemoved(edgeToRemove);
+                }
+
+                EdgeCount -= indexesToRemove.Count;
             }
 
-            EdgeCount -= edges.Count;
             Debug.Assert(EdgeCount >= 0);
+        }
+
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void NotifyEdgesRemoved([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
+        {
+            Debug.Assert(edges != null);
 
             if (EdgeRemoved != null) // Lazily notify
             {
@@ -346,7 +364,24 @@ public virtual bool RemoveVertex(TVertex vertex)
                     OnEdgeRemoved(edge);
                 }
             }
+        }
+
+        /// <inheritdoc />
+        public virtual bool RemoveVertex(TVertex vertex)
+        {
+            if (!ContainsVertex(vertex))
+                return false;
+
+            // Remove out edges
+            IEdgeList<TVertex, TEdge> edges = _vertexEdges[vertex];
+            _vertexEdges.Remove(vertex);
+            EdgeCount -= edges.Count;
+            Debug.Assert(EdgeCount >= 0);
+
+            // Remove in edges (Run over edges and remove each edge touching the vertex)
+            RemoveInEdges(v => EqualityComparer<TVertex>.Default.Equals(v, vertex));
 
+            NotifyEdgesRemoved(edges);
             OnVertexRemoved(vertex);
 
             return true;
@@ -372,13 +407,41 @@ public int RemoveVertexIf(VertexPredicate<TVertex> predicate)
             if (predicate is null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            var vertices = new VertexList<TVertex>();
-            vertices.AddRange(Vertices.Where(vertex => predicate(vertex)));
+            var verticesToRemove = new VertexList<TVertex>();
+            verticesToRemove.AddRange(Vertices.Where(vertex => predicate(vertex)));
+
+            // Remove out edges
+            var verticesEdgesToRemove = new VertexEdgeDictionary<TVertex, TEdge>(verticesToRemove.Count);
+            foreach (TVertex vertex in verticesToRemove)
+            {
+                verticesEdgesToRemove[vertex] = _vertexEdges[vertex];
+                _vertexEdges.Remove(vertex);
+            }
+            EdgeCount -= verticesEdgesToRemove.Sum(pair => pair.Value.Count);
+            Debug.Assert(EdgeCount >= 0);
+
+            // Remove in edges (Run over edges and remove each edge touching vertices to remove)
+            RemoveInEdges(v => verticesToRemove.Contains(v, EqualityComparer<TVertex>.Default));
+
+            NotifyEdgesRemoved(verticesEdgesToRemove.Values.SelectMany(edges => edges));
+            NotifyVerticesRemoved();
+
+            return verticesToRemove.Count;
+
+            #region Local function
 
-            foreach (TVertex vertex in vertices)
-                RemoveVertex(vertex);
+            void NotifyVerticesRemoved()
+            {
+                if (VertexRemoved != null) // Lazily notify
+                {
+                    foreach (TVertex vertex in verticesToRemove)
+                    {
+                        OnVertexRemoved(vertex);
+                    }
+                }
+            }
 
-            return vertices.Count;
+            #endregion
         }
 
         /// <inheritdoc />

From fdfede359760ec6c811beef6492eeef73d6fb95a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sun, 10 Oct 2021 01:19:46 +0200
Subject: [PATCH 02/39] Various cleans and optimizations.

Fix #40.
---
 .../Structures/Graphs/AdjacencyGraph.cs       | 252 ++++++++++--------
 .../Structures/Graphs/ArrayAdjacencyGraph.cs  |   6 +-
 .../Graphs/ArrayBidirectionalGraph.cs         |   8 +-
 .../Graphs/BidirectionalAdapterGraph.cs       |  14 +-
 .../Structures/Graphs/BidirectionalGraph.cs   | 241 +++++++++++------
 .../Graphs/BidirectionalMatrixGraph.cs        |  78 ++++--
 .../Graphs/ClusteredAdjacencyGraph.cs         |  66 +++--
 .../Graphs/CompressedSparseRowGraph.cs        |  11 +-
 .../DelegateBidirectionalIncidenceGraph.cs    |   6 +-
 .../Graphs/DelegateVertexAndEdgeListGraph.cs  |  16 +-
 .../Structures/Graphs/EdgeListGraph.cs        |  64 +++--
 .../Graphs/UndirectedBidirectionalGraph.cs    |   4 +-
 .../Structures/Graphs/UndirectedGraph.cs      | 219 ++++++++++-----
 .../Structures/Graphs/AdjacencyGraphTests.cs  |   3 +
 .../Graphs/BidirectionalGraphTests.cs         |   3 +
 .../Graphs/ClusteredAdjacencyGraphTests.cs    |  11 +-
 .../GraphTestsBase.RemoveVertices.cs          |  63 +++++
 .../Structures/Graphs/UndirectedGraphTests.cs |  12 +
 18 files changed, 717 insertions(+), 360 deletions(-)

diff --git a/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs b/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs
index 0b11a6bb7..f8add4644 100644
--- a/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs
@@ -107,7 +107,7 @@ public AdjacencyGraph(bool allowParallelEdges, int vertexCapacity, int edgeCapac
         public int VertexCount => _vertexEdges.Count;
 
         [NotNull]
-        private readonly IVertexEdgeDictionary<TVertex, TEdge> _vertexEdges;
+        private IVertexEdgeDictionary<TVertex, TEdge> _vertexEdges;
 
         /// <inheritdoc />
         public virtual IEnumerable<TVertex> Vertices => _vertexEdges.Keys.AsEnumerable();
@@ -167,14 +167,14 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
             if (target == null)
                 throw new ArgumentNullException(nameof(target));
 
-            if (_vertexEdges.TryGetValue(source, out IEdgeList<TVertex, TEdge> edgeList)
-                && edgeList.Count > 0)
+            if (_vertexEdges.TryGetValue(source, out IEdgeList<TVertex, TEdge> outEdges)
+                && outEdges.Count > 0)
             {
-                foreach (TEdge e in edgeList)
+                foreach (TEdge outEdge in outEdges)
                 {
-                    if (EqualityComparer<TVertex>.Default.Equals(e.Target, target))
+                    if (EqualityComparer<TVertex>.Default.Equals(outEdge.Target, target))
                     {
-                        edge = e;
+                        edge = outEdge;
                         return true;
                     }
                 }
@@ -218,8 +218,8 @@ public int OutDegree(TVertex vertex)
             if (vertex == null)
                 throw new ArgumentNullException(nameof(vertex));
 
-            if (_vertexEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> edges))
-                return edges.Count;
+            if (_vertexEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> outEdges))
+                return outEdges.Count;
             throw new VertexNotFoundException();
         }
 
@@ -240,9 +240,9 @@ public virtual bool TryGetOutEdges(TVertex vertex, out IEnumerable<TEdge> edges)
             if (vertex == null)
                 throw new ArgumentNullException(nameof(vertex));
 
-            if (_vertexEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> edgeList))
+            if (_vertexEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> outEdges))
             {
-                edges = edgeList.AsEnumerable();
+                edges = outEdges.AsEnumerable();
                 return true;
             }
 
@@ -271,10 +271,11 @@ public virtual bool AddVertex(TVertex vertex)
             if (ContainsVertex(vertex))
                 return false;
 
-            if (EdgeCapacity > 0)
-                _vertexEdges.Add(vertex, new EdgeList<TVertex, TEdge>(EdgeCapacity));
-            else
-                _vertexEdges.Add(vertex, new EdgeList<TVertex, TEdge>());
+            _vertexEdges.Add(
+                vertex,
+                EdgeCapacity > 0
+                    ? new EdgeList<TVertex, TEdge>(EdgeCapacity)
+                    : new EdgeList<TVertex, TEdge>());
 
             OnVertexAdded(vertex);
 
@@ -294,7 +295,9 @@ public virtual int AddVertexRange(IEnumerable<TVertex> vertices)
             foreach (TVertex vertex in verticesArray)
             {
                 if (AddVertex(vertex))
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -317,51 +320,13 @@ protected virtual void OnVertexAdded([NotNull] TVertex vertex)
 #if SUPPORTS_AGGRESSIVE_INLINING
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
 #endif
-        private void RemoveInEdges([NotNull, InstantHandle] Predicate<TVertex> shouldRemove)
-        {
-            Debug.Assert(shouldRemove != null);
-
-            // Run over edges and remove each edge touching the vertices to remove
-            foreach (KeyValuePair<TVertex, IEdgeList<TVertex, TEdge>> pair in _vertexEdges)
-            {
-                // Collect indexes of edges to remove
-                var indexesToRemove = new List<int>();
-                for (int i = 0; i < pair.Value.Count; ++i)
-                {
-                    TEdge edge = pair.Value[i];
-                    if (shouldRemove(edge.Target))
-                    {
-                        indexesToRemove.Add(i);
-                    }
-                }
-
-                // Remove collected edges
-                for (int i = indexesToRemove.Count - 1; i >= 0; --i)
-                {
-                    int indexToRemove = indexesToRemove[i];
-                    TEdge edgeToRemove = pair.Value[indexToRemove];
-                    pair.Value.RemoveAt(indexToRemove);
-                    OnEdgeRemoved(edgeToRemove);
-                }
-
-                EdgeCount -= indexesToRemove.Count;
-            }
-
-            Debug.Assert(EdgeCount >= 0);
-        }
-
-#if SUPPORTS_AGGRESSIVE_INLINING
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-#endif
-        private void NotifyEdgesRemoved([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
+        private void NotifyVerticesRemoved([NotNull, ItemNotNull] ICollection<TVertex> vertices)
         {
-            Debug.Assert(edges != null);
-
-            if (EdgeRemoved != null) // Lazily notify
+            if (VertexRemoved != null) // Lazily notify
             {
-                foreach (TEdge edge in edges)
+                foreach (TVertex vertex in vertices)
                 {
-                    OnEdgeRemoved(edge);
+                    OnVertexRemoved(vertex);
                 }
             }
         }
@@ -373,15 +338,15 @@ public virtual bool RemoveVertex(TVertex vertex)
                 return false;
 
             // Remove out edges
-            IEdgeList<TVertex, TEdge> edges = _vertexEdges[vertex];
+            IEdgeList<TVertex, TEdge> edgesToRemove = _vertexEdges[vertex];
             _vertexEdges.Remove(vertex);
-            EdgeCount -= edges.Count;
+            EdgeCount -= edgesToRemove.Count;
             Debug.Assert(EdgeCount >= 0);
 
             // Remove in edges (Run over edges and remove each edge touching the vertex)
             RemoveInEdges(v => EqualityComparer<TVertex>.Default.Equals(v, vertex));
 
-            NotifyEdgesRemoved(edges);
+            NotifyEdgesRemoved(edgesToRemove);
             OnVertexRemoved(vertex);
 
             return true;
@@ -411,37 +376,22 @@ public int RemoveVertexIf(VertexPredicate<TVertex> predicate)
             verticesToRemove.AddRange(Vertices.Where(vertex => predicate(vertex)));
 
             // Remove out edges
-            var verticesEdgesToRemove = new VertexEdgeDictionary<TVertex, TEdge>(verticesToRemove.Count);
+            var verticesEdgesRemoved = new VertexEdgeDictionary<TVertex, TEdge>(verticesToRemove.Count);
             foreach (TVertex vertex in verticesToRemove)
             {
-                verticesEdgesToRemove[vertex] = _vertexEdges[vertex];
+                verticesEdgesRemoved[vertex] = _vertexEdges[vertex];
                 _vertexEdges.Remove(vertex);
             }
-            EdgeCount -= verticesEdgesToRemove.Sum(pair => pair.Value.Count);
+            EdgeCount -= verticesEdgesRemoved.Sum(pair => pair.Value.Count);
             Debug.Assert(EdgeCount >= 0);
 
             // Remove in edges (Run over edges and remove each edge touching vertices to remove)
             RemoveInEdges(v => verticesToRemove.Contains(v, EqualityComparer<TVertex>.Default));
 
-            NotifyEdgesRemoved(verticesEdgesToRemove.Values.SelectMany(edges => edges));
-            NotifyVerticesRemoved();
+            NotifyEdgesRemoved(verticesEdgesRemoved.Values.SelectMany(edges => edges));
+            NotifyVerticesRemoved(verticesToRemove);
 
             return verticesToRemove.Count;
-
-            #region Local function
-
-            void NotifyVerticesRemoved()
-            {
-                if (VertexRemoved != null) // Lazily notify
-                {
-                    foreach (TVertex vertex in verticesToRemove)
-                    {
-                        OnVertexRemoved(vertex);
-                    }
-                }
-            }
-
-            #endregion
         }
 
         /// <inheritdoc />
@@ -472,7 +422,9 @@ public int AddVerticesAndEdgeRange(IEnumerable<TEdge> edges)
             foreach (TEdge edge in edgesArray)
             {
                 if (AddVerticesAndEdge(edge))
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -482,6 +434,10 @@ public int AddVerticesAndEdgeRange(IEnumerable<TEdge> edges)
 
         #region IMutableEdgeListGraph<TVertex,TEdge>
 
+        [Pure]
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         private bool AddEdgeInternal([NotNull] TEdge edge)
         {
             Debug.Assert(edge != null);
@@ -521,7 +477,9 @@ public int AddEdgeRange(IEnumerable<TEdge> edges)
             foreach (TEdge edge in edgesArray)
             {
                 if (AddEdge(edge))
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -541,17 +499,68 @@ protected virtual void OnEdgeAdded([NotNull] TEdge edge)
             EdgeAdded?.Invoke(edge);
         }
 
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void RemoveInEdges([NotNull, InstantHandle] Predicate<TVertex> shouldRemove)
+        {
+            Debug.Assert(shouldRemove != null);
+
+            // Run over edges and remove each edge touching the vertices to remove
+            foreach (KeyValuePair<TVertex, IEdgeList<TVertex, TEdge>> pair in _vertexEdges)
+            {
+                // Collect indexes of edges to remove
+                var indexesToRemove = new List<int>();
+                var edgesToRemove = new List<TEdge>();
+                for (int i = 0; i < pair.Value.Count; ++i)
+                {
+                    TEdge edge = pair.Value[i];
+                    if (shouldRemove(edge.Target))
+                    {
+                        indexesToRemove.Add(i);
+                        edgesToRemove.Add(edge);
+                    }
+                }
+
+                // Remove collected edges
+                for (int i = indexesToRemove.Count - 1; i >= 0; --i)
+                {
+                    pair.Value.RemoveAt(indexesToRemove[i]);
+                }
+
+                EdgeCount -= indexesToRemove.Count;
+                Debug.Assert(EdgeCount >= 0);
+                NotifyEdgesRemoved(edgesToRemove);
+            }
+        }
+
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void NotifyEdgesRemoved([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
+        {
+            Debug.Assert(edges != null);
+
+            if (EdgeRemoved != null) // Lazily notify
+            {
+                // Enumeration is only made on safe enumerable
+                foreach (TEdge edge in edges)
+                {
+                    OnEdgeRemoved(edge);
+                }
+            }
+        }
+
         /// <inheritdoc />
         public virtual bool RemoveEdge(TEdge edge)
         {
             if (edge == null)
                 throw new ArgumentNullException(nameof(edge));
 
-            if (_vertexEdges.TryGetValue(edge.Source, out IEdgeList<TVertex, TEdge> edges)
-                && edges.Remove(edge))
+            if (_vertexEdges.TryGetValue(edge.Source, out IEdgeList<TVertex, TEdge> outEdges)
+                && outEdges.Remove(edge))
             {
                 --EdgeCount;
-
                 Debug.Assert(EdgeCount >= 0);
 
                 OnEdgeRemoved(edge);
@@ -575,26 +584,35 @@ protected virtual void OnEdgeRemoved([NotNull] TEdge edge)
             EdgeRemoved?.Invoke(edge);
         }
 
-        /// <inheritdoc />
-        public int RemoveEdgeIf(EdgePredicate<TVertex, TEdge> predicate)
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private int RemoveEdgesInternal([NotNull] ICollection<TEdge> edgesToRemove)
         {
-            if (predicate is null)
-                throw new ArgumentNullException(nameof(predicate));
-
-            var edgesToRemove = new EdgeList<TVertex, TEdge>();
-            edgesToRemove.AddRange(Edges.Where(edge => predicate(edge)));
-
             foreach (TEdge edge in edgesToRemove)
             {
-                OnEdgeRemoved(edge);
                 _vertexEdges[edge.Source].Remove(edge);
             }
 
             EdgeCount -= edgesToRemove.Count;
+            Debug.Assert(EdgeCount >= 0);
+            NotifyEdgesRemoved(edgesToRemove);
 
             return edgesToRemove.Count;
         }
 
+        /// <inheritdoc />
+        public int RemoveEdgeIf(EdgePredicate<TVertex, TEdge> predicate)
+        {
+            if (predicate is null)
+                throw new ArgumentNullException(nameof(predicate));
+
+            var edgesToRemove = new EdgeList<TVertex, TEdge>();
+            edgesToRemove.AddRange(Edges.Where(edge => predicate(edge)));
+
+            return RemoveEdgesInternal(edgesToRemove);
+        }
+
         #endregion
 
         #region IMutableIncidenceGraph<TVertex,TEdge>
@@ -604,36 +622,35 @@ public int RemoveOutEdgeIf(TVertex vertex, EdgePredicate<TVertex, TEdge> predica
         {
             if (predicate is null)
                 throw new ArgumentNullException(nameof(predicate));
-            if (!_vertexEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> outEdges))
-                return 0;
-
-            var edgesToRemove = new EdgeList<TVertex, TEdge>();
-            edgesToRemove.AddRange(outEdges.Where(edge => predicate(edge)));
 
-            foreach (TEdge edge in edgesToRemove)
-                RemoveEdge(edge);
+            if (_vertexEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> outEdges))
+            {
+                var edgesToRemove = new EdgeList<TVertex, TEdge>();
+                edgesToRemove.AddRange(outEdges.Where(edge => predicate(edge)));
+                return RemoveEdgesInternal(edgesToRemove);
+            }
 
-            return edgesToRemove.Count;
+            return 0;
         }
 
+        #endregion
+
+        #region IMutableIncidenceGraph<TVertex,TEdge>
+
         /// <inheritdoc />
         public void ClearOutEdges(TVertex vertex)
         {
             if (vertex == null)
                 throw new ArgumentNullException(nameof(vertex));
 
-            if (!_vertexEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> outEdges))
-                return;
-
-            int count = outEdges.Count;
-            if (EdgeRemoved != null) // Lazily notify
+            if (_vertexEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> outEdges))
             {
-                foreach (TEdge edge in outEdges)
-                    OnEdgeRemoved(edge);
+                _vertexEdges[vertex] = new EdgeList<TVertex, TEdge>();
+                EdgeCount -= outEdges.Count;
+                Debug.Assert(EdgeCount >= 0);
+                NotifyEdgesRemoved(outEdges);
+                outEdges.Clear();
             }
-
-            outEdges.Clear();
-            EdgeCount -= count;
         }
 
         /// <summary>
@@ -649,7 +666,9 @@ public void ClearEdges([NotNull] TVertex vertex)
         public void TrimEdgeExcess()
         {
             foreach (IEdgeList<TVertex, TEdge> edges in _vertexEdges.Values)
+            {
                 edges.TrimExcess();
+            }
         }
 
         #endregion
@@ -659,16 +678,13 @@ public void TrimEdgeExcess()
         /// <inheritdoc />
         public void Clear()
         {
-            if (EdgeRemoved != null) // Lazily notify
-            {
-                foreach (TEdge edge in _vertexEdges.SelectMany(edges => edges.Value).Distinct())
-                    OnEdgeRemoved(edge);
-                foreach (TVertex vertex in _vertexEdges.Keys)
-                    OnVertexRemoved(vertex);
-            }
-
-            _vertexEdges.Clear();
+            IVertexEdgeDictionary<TVertex, TEdge> vertexEdges = _vertexEdges;
+            _vertexEdges = new VertexEdgeDictionary<TVertex, TEdge>();
             EdgeCount = 0;
+
+            NotifyEdgesRemoved(vertexEdges.SelectMany(edges => edges.Value).Distinct());
+            NotifyVerticesRemoved(vertexEdges.Keys);
+            vertexEdges.Clear();
         }
 
         #endregion
diff --git a/src/QuikGraph/Structures/Graphs/ArrayAdjacencyGraph.cs b/src/QuikGraph/Structures/Graphs/ArrayAdjacencyGraph.cs
index b23b06a30..69402f29b 100644
--- a/src/QuikGraph/Structures/Graphs/ArrayAdjacencyGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/ArrayAdjacencyGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -97,8 +97,8 @@ public bool ContainsEdge(TEdge edge)
             if (edge == null)
                 throw new ArgumentNullException(nameof(edge));
 
-            if (_vertexOutEdges.TryGetValue(edge.Source, out TEdge[] edges))
-                return edges.Any(e => EqualityComparer<TEdge>.Default.Equals(e, edge));
+            if (_vertexOutEdges.TryGetValue(edge.Source, out TEdge[] outEdges))
+                return outEdges.Any(outEdge => EqualityComparer<TEdge>.Default.Equals(outEdge, edge));
             return false;
         }
 
diff --git a/src/QuikGraph/Structures/Graphs/ArrayBidirectionalGraph.cs b/src/QuikGraph/Structures/Graphs/ArrayBidirectionalGraph.cs
index 60424c70a..bfa92057a 100644
--- a/src/QuikGraph/Structures/Graphs/ArrayBidirectionalGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/ArrayBidirectionalGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -28,7 +28,7 @@ public sealed class ArrayBidirectionalGraph<TVertex, TEdge> : IBidirectionalGrap
 #if SUPPORTS_SERIALIZATION
         [Serializable]
 #endif
-        private class InOutEdges
+        private sealed class InOutEdges
         {
             [NotNull, ItemNotNull]
             public TEdge[] OutEdges { get; }
@@ -120,7 +120,7 @@ public bool ContainsEdge(TEdge edge)
 
             if (_vertexEdges.TryGetValue(edge.Source, out InOutEdges inOutEdges))
             {
-                return inOutEdges.OutEdges.Any(e => EqualityComparer<TEdge>.Default.Equals(e, edge));
+                return inOutEdges.OutEdges.Any(outEdge => EqualityComparer<TEdge>.Default.Equals(outEdge, edge));
             }
 
             return false;
@@ -170,7 +170,7 @@ public bool TryGetEdges(TVertex source, TVertex target, out IEnumerable<TEdge> e
 
             if (_vertexEdges.TryGetValue(source, out InOutEdges inOutEdges))
             {
-                edges = inOutEdges.OutEdges.Where(edge => EqualityComparer<TVertex>.Default.Equals(edge.Target, target));
+                edges = inOutEdges.OutEdges.Where(outEdge => EqualityComparer<TVertex>.Default.Equals(outEdge.Target, target));
                 return true;
             }
 
diff --git a/src/QuikGraph/Structures/Graphs/BidirectionalAdapterGraph.cs b/src/QuikGraph/Structures/Graphs/BidirectionalAdapterGraph.cs
index 6557d1589..e1438efe2 100644
--- a/src/QuikGraph/Structures/Graphs/BidirectionalAdapterGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/BidirectionalAdapterGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -170,8 +170,8 @@ public int InDegree(TVertex vertex)
             if (vertex == null)
                 throw new ArgumentNullException(nameof(vertex));
 
-            if (_inEdges.TryGetValue(vertex, out EdgeList<TVertex, TEdge> edges))
-                return edges.Count;
+            if (_inEdges.TryGetValue(vertex, out EdgeList<TVertex, TEdge> inEdges))
+                return inEdges.Count;
             throw new VertexNotFoundException();
         }
 
@@ -181,8 +181,8 @@ public IEnumerable<TEdge> InEdges(TVertex vertex)
             if (vertex == null)
                 throw new ArgumentNullException(nameof(vertex));
 
-            if (_inEdges.TryGetValue(vertex, out EdgeList<TVertex, TEdge> edges))
-                return edges.AsEnumerable();
+            if (_inEdges.TryGetValue(vertex, out EdgeList<TVertex, TEdge> inEdges))
+                return inEdges.AsEnumerable();
             throw new VertexNotFoundException();
         }
 
@@ -192,9 +192,9 @@ public bool TryGetInEdges(TVertex vertex, out IEnumerable<TEdge> edges)
             if (vertex == null)
                 throw new ArgumentNullException(nameof(vertex));
 
-            if (_inEdges.TryGetValue(vertex, out EdgeList<TVertex, TEdge> edgeList))
+            if (_inEdges.TryGetValue(vertex, out EdgeList<TVertex, TEdge> inEdges))
             {
-                edges = edgeList.AsEnumerable();
+                edges = inEdges.AsEnumerable();
                 return true;
             }
 
diff --git a/src/QuikGraph/Structures/Graphs/BidirectionalGraph.cs b/src/QuikGraph/Structures/Graphs/BidirectionalGraph.cs
index 04dc8852d..06175c65d 100644
--- a/src/QuikGraph/Structures/Graphs/BidirectionalGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/BidirectionalGraph.cs
@@ -1,7 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+#if SUPPORTS_AGGRESSIVE_INLINING
+using System.Runtime.CompilerServices;
+#endif
 using JetBrains.Annotations;
 using QuikGraph.Collections;
 
@@ -174,13 +177,13 @@ public int OutDegree(TVertex vertex)
             if (vertex == null)
                 throw new ArgumentNullException(nameof(vertex));
 
-            if (_vertexOutEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> edges))
-                return edges.Count;
+            if (_vertexOutEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> outEdges))
+                return outEdges.Count;
             throw new VertexNotFoundException();
         }
 
         [NotNull]
-        private readonly IVertexEdgeDictionary<TVertex, TEdge> _vertexOutEdges;
+        private IVertexEdgeDictionary<TVertex, TEdge> _vertexOutEdges;
 
         /// <inheritdoc />
         public IEnumerable<TEdge> OutEdges(TVertex vertex)
@@ -232,11 +235,11 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
             if (_vertexOutEdges.TryGetValue(source, out IEdgeList<TVertex, TEdge> outEdges)
                 && outEdges.Count > 0)
             {
-                foreach (TEdge e in outEdges)
+                foreach (TEdge outEdge in outEdges)
                 {
-                    if (EqualityComparer<TVertex>.Default.Equals(e.Target, target))
+                    if (EqualityComparer<TVertex>.Default.Equals(outEdge.Target, target))
                     {
-                        edge = e;
+                        edge = outEdge;
                         return true;
                     }
                 }
@@ -286,7 +289,7 @@ public int InDegree(TVertex vertex)
         }
 
         [NotNull]
-        private readonly IVertexEdgeDictionary<TVertex, TEdge> _vertexInEdges;
+        private IVertexEdgeDictionary<TVertex, TEdge> _vertexInEdges;
 
         /// <inheritdoc />
         public IEnumerable<TEdge> InEdges(TVertex vertex)
@@ -336,17 +339,16 @@ public int Degree(TVertex vertex)
         /// <inheritdoc />
         public void Clear()
         {
-            if (EdgeRemoved != null) // Lazily notify
-            {
-                foreach (TEdge edge in _vertexOutEdges.SelectMany(edges => edges.Value).Distinct())
-                    OnEdgeRemoved(edge);
-                foreach (TVertex vertex in _vertexOutEdges.Keys)
-                    OnVertexRemoved(vertex);
-            }
-
-            _vertexOutEdges.Clear();
-            _vertexInEdges.Clear();
+            IVertexEdgeDictionary<TVertex, TEdge> vertexOutEdges = _vertexOutEdges;
+            _vertexOutEdges = new VertexEdgeDictionary<TVertex, TEdge>();
+            IVertexEdgeDictionary<TVertex, TEdge> vertexInEdges = _vertexInEdges;
+            _vertexInEdges = new VertexEdgeDictionary<TVertex, TEdge>();
             EdgeCount = 0;
+
+            NotifyEdgesRemoved(vertexOutEdges.SelectMany(edges => edges.Value).Distinct());
+            NotifyVerticesRemoved(vertexOutEdges.Keys);
+            vertexOutEdges.Clear();
+            vertexInEdges.Clear();
         }
 
         #endregion
@@ -388,7 +390,9 @@ public virtual int AddVertexRange(IEnumerable<TVertex> vertices)
             foreach (TVertex vertex in verticesArray)
             {
                 if (AddVertex(vertex))
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -408,37 +412,55 @@ protected virtual void OnVertexAdded([NotNull] TVertex vertex)
             VertexAdded?.Invoke(vertex);
         }
 
-        /// <inheritdoc />
-        public virtual bool RemoveVertex(TVertex vertex)
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void NotifyVerticesRemoved([NotNull, ItemNotNull] ICollection<TVertex> vertices)
         {
-            if (!ContainsVertex(vertex))
-                return false;
-
-            // Collect edges to remove
-            var edgesToRemove = new EdgeList<TVertex, TEdge>();
-            foreach (TEdge outEdge in OutEdges(vertex))
+            if (VertexRemoved != null) // Lazily notify
             {
-                _vertexInEdges[outEdge.Target].Remove(outEdge);
-                edgesToRemove.Add(outEdge);
+                foreach (TVertex vertex in vertices)
+                {
+                    OnVertexRemoved(vertex);
+                }
             }
+        }
 
-            foreach (TEdge inEdge in InEdges(vertex))
+        [NotNull, ItemNotNull]
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private IEnumerable<TEdge> RemoveInOutEdges([NotNull] TVertex vertex)
+        {
+            IEdgeList<TVertex, TEdge> outEdges = _vertexOutEdges[vertex];
+            _vertexOutEdges.Remove(vertex);
+            foreach (TEdge outEdge in outEdges)
             {
-                // Might already have been removed
-                if (_vertexOutEdges[inEdge.Source].Remove(inEdge))
-                    edgesToRemove.Add(inEdge);
+                _vertexInEdges[outEdge.Target].Remove(outEdge);
             }
 
-            // Notify users
-            if (EdgeRemoved != null)
+            IEdgeList<TVertex, TEdge> inEdges = _vertexInEdges[vertex];
+            _vertexInEdges.Remove(vertex);
+            foreach (TEdge inEdge in inEdges)
             {
-                foreach (TEdge edge in edgesToRemove)
-                    OnEdgeRemoved(edge);
+                _vertexOutEdges[inEdge.Source].Remove(inEdge);
             }
 
-            _vertexOutEdges.Remove(vertex);
-            _vertexInEdges.Remove(vertex);
-            EdgeCount -= edgesToRemove.Count;
+            EdgeCount -= outEdges.Count + inEdges.Count;
+            Debug.Assert(EdgeCount >= 0);
+
+            return outEdges.Concat(inEdges);
+        }
+
+        /// <inheritdoc />
+        public virtual bool RemoveVertex(TVertex vertex)
+        {
+            if (!ContainsVertex(vertex))
+                return false;
+
+            IEnumerable<TEdge> inOutEdges = RemoveInOutEdges(vertex);
+
+            NotifyEdgesRemoved(inOutEdges);
             OnVertexRemoved(vertex);
 
             return true;
@@ -467,8 +489,12 @@ public int RemoveVertexIf(VertexPredicate<TVertex> predicate)
             var verticesToRemove = new VertexList<TVertex>();
             verticesToRemove.AddRange(Vertices.Where(vertex => predicate(vertex)));
 
-            foreach (TVertex vertex in verticesToRemove)
-                RemoveVertex(vertex);
+            IEnumerable<TEdge> edgesRemoved = verticesToRemove.Aggregate(
+                Enumerable.Empty<TEdge>(),
+                (current, vertex) => current.Concat(RemoveInOutEdges(vertex)));
+
+            NotifyEdgesRemoved(edgesRemoved);
+            NotifyVerticesRemoved(verticesToRemove);
 
             return verticesToRemove.Count;
         }
@@ -477,6 +503,9 @@ public int RemoveVertexIf(VertexPredicate<TVertex> predicate)
 
         #region IMutableEdgeListGraph<TVertex,TEdge>
 
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         private bool AddEdgeInternal([NotNull] TEdge edge)
         {
             Debug.Assert(edge != null);
@@ -517,7 +546,9 @@ public int AddEdgeRange(IEnumerable<TEdge> edges)
             foreach (TEdge edge in edgesArray)
             {
                 if (AddEdge(edge))
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -537,6 +568,23 @@ protected virtual void OnEdgeAdded([NotNull] TEdge edge)
             EdgeAdded?.Invoke(edge);
         }
 
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void NotifyEdgesRemoved([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
+        {
+            Debug.Assert(edges != null);
+
+            if (EdgeRemoved != null) // Lazily notify
+            {
+                // Enumeration is only made on safe enumerable
+                foreach (TEdge edge in edges)
+                {
+                    OnEdgeRemoved(edge);
+                }
+            }
+        }
+
         /// <inheritdoc />
         public virtual bool RemoveEdge(TEdge edge)
         {
@@ -548,7 +596,6 @@ public virtual bool RemoveEdge(TEdge edge)
             {
                 _vertexInEdges[edge.Target].Remove(edge);
                 --EdgeCount;
-
                 Debug.Assert(EdgeCount >= 0);
 
                 OnEdgeRemoved(edge);
@@ -572,6 +619,24 @@ protected virtual void OnEdgeRemoved([NotNull] TEdge edge)
             EdgeRemoved?.Invoke(edge);
         }
 
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private int RemoveEdgesInternal([NotNull] ICollection<TEdge> edgesToRemove)
+        {
+            foreach (TEdge edge in edgesToRemove)
+            {
+                _vertexOutEdges[edge.Source].Remove(edge);
+                _vertexInEdges[edge.Target].Remove(edge);
+            }
+
+            EdgeCount -= edgesToRemove.Count;
+            Debug.Assert(EdgeCount >= 0);
+            NotifyEdgesRemoved(edgesToRemove);
+
+            return edgesToRemove.Count;
+        }
+
         /// <inheritdoc />
         public int RemoveEdgeIf(EdgePredicate<TVertex, TEdge> predicate)
         {
@@ -581,10 +646,7 @@ public int RemoveEdgeIf(EdgePredicate<TVertex, TEdge> predicate)
             var edgesToRemove = new EdgeList<TVertex, TEdge>();
             edgesToRemove.AddRange(Edges.Where(edge => predicate(edge)));
 
-            foreach (TEdge edge in edgesToRemove)
-                RemoveEdge(edge);
-
-            return edgesToRemove.Count;
+            return RemoveEdgesInternal(edgesToRemove);
         }
 
         #endregion
@@ -615,7 +677,9 @@ public int AddVerticesAndEdgeRange(IEnumerable<TEdge> edges)
             foreach (TEdge edge in edgesArray)
             {
                 if (AddVerticesAndEdge(edge))
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -630,16 +694,15 @@ public int RemoveOutEdgeIf(TVertex vertex, EdgePredicate<TVertex, TEdge> predica
         {
             if (predicate is null)
                 throw new ArgumentNullException(nameof(predicate));
-            if (!_vertexOutEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> outEdges))
-                return 0;
-
-            var edgesToRemove = new EdgeList<TVertex, TEdge>();
-            edgesToRemove.AddRange(outEdges.Where(edge => predicate(edge)));
 
-            foreach (TEdge edge in edgesToRemove)
-                RemoveEdge(edge);
+            if (_vertexOutEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> outEdges))
+            {
+                var edgesToRemove = new EdgeList<TVertex, TEdge>();
+                edgesToRemove.AddRange(outEdges.Where(edge => predicate(edge)));
+                return RemoveEdgesInternal(edgesToRemove);
+            }
 
-            return edgesToRemove.Count;
+            return 0;
         }
 
         /// <inheritdoc />
@@ -648,26 +711,33 @@ public void ClearOutEdges(TVertex vertex)
             if (vertex == null)
                 throw new ArgumentNullException(nameof(vertex));
 
-            if (!_vertexOutEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> outEdges))
-                return;
-
-            foreach (TEdge edge in outEdges)
+            if (_vertexOutEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> outEdges))
             {
-                _vertexInEdges[edge.Target].Remove(edge);
-                OnEdgeRemoved(edge);
-            }
+                _vertexOutEdges[vertex] = new EdgeList<TVertex, TEdge>();
+                foreach (TEdge outEdge in outEdges)
+                {
+                    _vertexInEdges[outEdge.Target].Remove(outEdge);
+                }
 
-            EdgeCount -= outEdges.Count;
-            outEdges.Clear();
+                EdgeCount -= outEdges.Count;
+                Debug.Assert(EdgeCount >= 0);
+                NotifyEdgesRemoved(outEdges);
+                outEdges.Clear();
+            }
         }
 
         /// <inheritdoc />
         public void TrimEdgeExcess()
         {
-            foreach (IEdgeList<TVertex, TEdge> edges in _vertexInEdges.Values)
-                edges.TrimExcess();
-            foreach (IEdgeList<TVertex, TEdge> edges in _vertexOutEdges.Values)
-                edges.TrimExcess();
+            foreach (IEdgeList<TVertex, TEdge> inEdges in _vertexInEdges.Values)
+            {
+                inEdges.TrimExcess();
+            }
+
+            foreach (IEdgeList<TVertex, TEdge> outEdges in _vertexOutEdges.Values)
+            {
+                outEdges.TrimExcess();
+            }
         }
 
         #endregion
@@ -679,16 +749,15 @@ public int RemoveInEdgeIf(TVertex vertex, EdgePredicate<TVertex, TEdge> predicat
         {
             if (predicate is null)
                 throw new ArgumentNullException(nameof(predicate));
-            if (!_vertexInEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> inEdges))
-                return 0;
-
-            var edgesToRemove = new EdgeList<TVertex, TEdge>();
-            edgesToRemove.AddRange(inEdges.Where(edge => predicate(edge)));
 
-            foreach (TEdge edge in edgesToRemove)
-                RemoveEdge(edge);
+            if (_vertexInEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> inEdges))
+            {
+                var edgesToRemove = new EdgeList<TVertex, TEdge>();
+                edgesToRemove.AddRange(inEdges.Where(edge => predicate(edge)));
+                return RemoveEdgesInternal(edgesToRemove);
+            }
 
-            return edgesToRemove.Count;
+            return 0;
         }
 
         /// <inheritdoc />
@@ -697,17 +766,19 @@ public void ClearInEdges(TVertex vertex)
             if (vertex == null)
                 throw new ArgumentNullException(nameof(vertex));
 
-            if (!_vertexInEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> inEdges))
-                return;
-
-            foreach (TEdge edge in inEdges)
+            if (_vertexInEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> inEdges))
             {
-                _vertexOutEdges[edge.Source].Remove(edge);
-                OnEdgeRemoved(edge);
-            }
+                _vertexInEdges[vertex] = new EdgeList<TVertex, TEdge>();
+                foreach (TEdge inEdge in inEdges)
+                {
+                    _vertexOutEdges[inEdge.Source].Remove(inEdge);
+                }
 
-            EdgeCount -= inEdges.Count;
-            inEdges.Clear();
+                EdgeCount -= inEdges.Count;
+                Debug.Assert(EdgeCount >= 0);
+                NotifyEdgesRemoved(inEdges);
+                inEdges.Clear();
+            }
         }
 
         /// <inheritdoc />
@@ -778,7 +849,9 @@ public void MergeVerticesIf(
 
             // Applying merge recursively
             foreach (TVertex vertex in mergeVertices)
+            {
                 MergeVertex(vertex, edgeFactory);
+            }
         }
 
         #region ICloneable
diff --git a/src/QuikGraph/Structures/Graphs/BidirectionalMatrixGraph.cs b/src/QuikGraph/Structures/Graphs/BidirectionalMatrixGraph.cs
index 5f0d330a0..851e21a8a 100644
--- a/src/QuikGraph/Structures/Graphs/BidirectionalMatrixGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/BidirectionalMatrixGraph.cs
@@ -1,7 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+#if SUPPORTS_AGGRESSIVE_INLINING
+using System.Runtime.CompilerServices;
+#endif
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -200,7 +203,9 @@ public int OutDegree(int vertex)
             for (int j = 0; j < VertexCount; ++j)
             {
                 if (_edges[vertex, j] != null)
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -279,7 +284,9 @@ public int InDegree(int vertex)
             for (int i = 0; i < VertexCount; ++i)
             {
                 if (_edges[i, vertex] != null)
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -344,19 +351,20 @@ public int Degree(int vertex)
         /// <inheritdoc />
         public void Clear()
         {
+            EdgeCount = 0;
             for (int i = 0; i < VertexCount; ++i)
             {
                 for (int j = 0; j < VertexCount; ++j)
                 {
                     TEdge edge = _edges[i, j];
-                    _edges[i, j] = default(TEdge);
+                    _edges[i, j] = null;
 
                     if (edge != null)
+                    {
                         OnEdgeRemoved(edge);
+                    }
                 }
             }
-
-            EdgeCount = 0;
         }
 
         #endregion
@@ -383,7 +391,7 @@ public int RemoveInEdgeIf(int vertex, [NotNull, InstantHandle] EdgePredicate<int
                 TEdge edge = _edges[i, vertex];
                 if (edge != null && predicate(edge))
                 {
-                    RemoveEdge(edge);
+                    RemoveEdgeInternal(edge);
                     ++count;
                 }
             }
@@ -391,13 +399,18 @@ public int RemoveInEdgeIf(int vertex, [NotNull, InstantHandle] EdgePredicate<int
             return count;
         }
 
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         private void ClearInEdgesInternal(int vertex)
         {
             for (int i = 0; i < VertexCount; ++i)
             {
                 TEdge edge = _edges[i, vertex];
                 if (edge != null)
-                    RemoveEdge(edge);
+                {
+                    RemoveEdgeInternal(edge);
+                }
             }
         }
 
@@ -450,7 +463,7 @@ public int RemoveOutEdgeIf(int vertex, [NotNull, InstantHandle] EdgePredicate<in
                 TEdge edge = _edges[vertex, j];
                 if (edge != null && predicate(edge))
                 {
-                    RemoveEdge(edge);
+                    RemoveEdgeInternal(edge);
                     ++count;
                 }
             }
@@ -458,13 +471,18 @@ public int RemoveOutEdgeIf(int vertex, [NotNull, InstantHandle] EdgePredicate<in
             return count;
         }
 
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         private void ClearOutEdgesInternal(int vertex)
         {
             for (int j = 0; j < VertexCount; ++j)
             {
                 TEdge edge = _edges[vertex, j];
                 if (edge != null)
-                    RemoveEdge(edge);
+                {
+                    RemoveEdgeInternal(edge);
+                }
             }
         }
 
@@ -491,14 +509,15 @@ public bool AddEdge(TEdge edge)
                 throw new ArgumentNullException(nameof(edge));
             AssertAreInGraph(edge.Source, edge.Target);
 
-            if (_edges[edge.Source, edge.Target] != null)
-                throw new ParallelEdgeNotAllowedException();
-
-            _edges[edge.Source, edge.Target] = edge;
-            ++EdgeCount;
-            OnEdgeAdded(edge);
+            if (_edges[edge.Source, edge.Target] is null)
+            {
+                _edges[edge.Source, edge.Target] = edge;
+                ++EdgeCount;
+                OnEdgeAdded(edge);
+                return true;
+            }
 
-            return true;
+            throw new ParallelEdgeNotAllowedException();
         }
 
         /// <inheritdoc />
@@ -514,7 +533,9 @@ public int AddEdgeRange(IEnumerable<TEdge> edges)
             foreach (TEdge edge in edgesArray)
             {
                 if (AddEdge(edge))
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -534,6 +555,20 @@ protected virtual void OnEdgeAdded([NotNull] TEdge edge)
             EdgeAdded?.Invoke(edge);
         }
 
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void RemoveEdgeInternal([NotNull] TEdge edge)
+        {
+            Debug.Assert(edge != null);
+            Debug.Assert(_edges[edge.Source, edge.Target] != null);
+
+            _edges[edge.Source, edge.Target] = null;
+            --EdgeCount;
+            Debug.Assert(EdgeCount >= 0);
+            OnEdgeRemoved(edge);
+        }
+
         /// <inheritdoc />
         public bool RemoveEdge(TEdge edge)
         {
@@ -541,18 +576,13 @@ public bool RemoveEdge(TEdge edge)
                 throw new ArgumentNullException(nameof(edge));
             if (!AreInGraph(edge.Source, edge.Target))
                 return false;
-
             TEdge edgeToRemove = _edges[edge.Source, edge.Target];
-            if (edgeToRemove != null)
-            {
-                _edges[edge.Source, edge.Target] = null;
+            if (edgeToRemove is null)
+                return false;
 
-                --EdgeCount;
-                OnEdgeRemoved(edgeToRemove);
-                return true;
-            }
+            RemoveEdgeInternal(edgeToRemove);
 
-            return false;
+            return true;
         }
 
         /// <inheritdoc />
diff --git a/src/QuikGraph/Structures/Graphs/ClusteredAdjacencyGraph.cs b/src/QuikGraph/Structures/Graphs/ClusteredAdjacencyGraph.cs
index 4f132ec28..10c0cc7c9 100644
--- a/src/QuikGraph/Structures/Graphs/ClusteredAdjacencyGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/ClusteredAdjacencyGraph.cs
@@ -3,7 +3,11 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+#if SUPPORTS_AGGRESSIVE_INLINING
+using System.Runtime.CompilerServices;
+#endif
 using JetBrains.Annotations;
+using QuikGraph.Collections;
 
 namespace QuikGraph
 {
@@ -258,7 +262,9 @@ public virtual int AddVertexRange([NotNull, ItemNotNull] IEnumerable<TVertex> ve
             foreach (TVertex vertex in verticesArray)
             {
                 if (AddVertex(vertex))
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -282,6 +288,18 @@ private void RemoveChildVertex([NotNull] TVertex vertex)
             }
         }
 
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void RemoveVertexInternal([NotNull] TVertex vertex)
+        {
+            Debug.Assert(vertex != null);
+
+            RemoveChildVertex(vertex);
+            Wrapped.RemoveVertex(vertex);
+            Parent?.RemoveVertex(vertex);
+        }
+
         /// <summary>
         /// Removes the given vertex from this graph.
         /// </summary>
@@ -295,9 +313,7 @@ public virtual bool RemoveVertex([NotNull] TVertex vertex)
             if (!Wrapped.ContainsVertex(vertex))
                 return false;
 
-            RemoveChildVertex(vertex);
-            Wrapped.RemoveVertex(vertex);
-            Parent?.RemoveVertex(vertex);
+            RemoveVertexInternal(vertex);
 
             return true;
         }
@@ -312,14 +328,15 @@ public int RemoveVertexIf([NotNull, InstantHandle] VertexPredicate<TVertex> pred
             if (predicate is null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            TVertex[] verticesToRemove = Vertices
-                .Where(vertex => predicate(vertex))
-                .ToArray();
+            var verticesToRemove = new VertexList<TVertex>();
+            verticesToRemove.AddRange(Vertices.Where(vertex => predicate(vertex)));
 
             foreach (TVertex vertex in verticesToRemove)
-                RemoveVertex(vertex);
+            {
+                RemoveVertexInternal(vertex);
+            }
 
-            return verticesToRemove.Length;
+            return verticesToRemove.Count;
         }
 
         /// <summary>
@@ -354,7 +371,9 @@ public int AddVerticesAndEdgeRange([NotNull, ItemNotNull] IEnumerable<TEdge> edg
             foreach (TEdge edge in edgesArray)
             {
                 if (AddVerticesAndEdge(edge))
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -371,7 +390,9 @@ public virtual bool AddEdge([NotNull] TEdge edge)
                 throw new ArgumentNullException(nameof(edge));
 
             if (Parent != null && !Parent.ContainsEdge(edge))
+            {
                 Parent.AddEdge(edge);
+            }
             return Wrapped.AddEdge(edge);
         }
 
@@ -392,7 +413,9 @@ public int AddEdgeRange([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
             foreach (TEdge edge in edgesArray)
             {
                 if (AddEdge(edge))
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -412,6 +435,18 @@ private void RemoveChildEdge([NotNull] TEdge edge)
             }
         }
 
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void RemoveEdgeInternal([NotNull] TEdge edge)
+        {
+            Debug.Assert(edge != null);
+
+            RemoveChildEdge(edge);
+            Wrapped.RemoveEdge(edge);
+            Parent?.RemoveEdge(edge);
+        }
+
         /// <summary>
         /// Removes the <paramref name="edge"/> from this graph.
         /// </summary>
@@ -425,9 +460,7 @@ public virtual bool RemoveEdge([NotNull] TEdge edge)
             if (!Wrapped.ContainsEdge(edge))
                 return false;
 
-            RemoveChildEdge(edge);
-            Wrapped.RemoveEdge(edge);
-            Parent?.RemoveEdge(edge);
+            RemoveEdgeInternal(edge);
 
             return true;
         }
@@ -442,14 +475,15 @@ public int RemoveEdgeIf([NotNull, InstantHandle] EdgePredicate<TVertex, TEdge> p
             if (predicate is null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            var edgesToRemove = Wrapped.Edges
-                .Where(edge => predicate(edge))
-                .ToArray();
+            var edgesToRemove = new EdgeList<TVertex, TEdge>();
+            edgesToRemove.AddRange(Edges.Where(edge => predicate(edge)));
 
             foreach (TEdge edge in edgesToRemove)
-                RemoveEdge(edge);
+            {
+                RemoveEdgeInternal(edge);
+            }
 
-            return edgesToRemove.Length;
+            return edgesToRemove.Count;
         }
 
         /// <summary>
diff --git a/src/QuikGraph/Structures/Graphs/CompressedSparseRowGraph.cs b/src/QuikGraph/Structures/Graphs/CompressedSparseRowGraph.cs
index 3d139207b..2a8ed4203 100644
--- a/src/QuikGraph/Structures/Graphs/CompressedSparseRowGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/CompressedSparseRowGraph.cs
@@ -1,6 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
+#if SUPPORTS_AGGRESSIVE_INLINING
+using System.Runtime.CompilerServices;
+#endif
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -108,7 +112,7 @@ public static CompressedSparseRowGraph<TVertex> FromGraph<TEdge>(
         public int VertexCount => _outEdgeStartRanges.Count;
 
         /// <inheritdoc />
-        public IEnumerable<TVertex> Vertices => _outEdgeStartRanges.Keys;
+        public IEnumerable<TVertex> Vertices => _outEdgeStartRanges.Keys.AsEnumerable();
 
         /// <inheritdoc />
         public bool ContainsVertex(TVertex vertex)
@@ -258,6 +262,9 @@ public IEnumerable<SEquatableEdge<TVertex>> OutEdges(TVertex vertex)
 
         [Pure]
         [NotNull]
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         private IEnumerable<SEquatableEdge<TVertex>> OutEdgesIterator([NotNull] TVertex vertex)
         {
             Debug.Assert(vertex != null);
diff --git a/src/QuikGraph/Structures/Graphs/DelegateBidirectionalIncidenceGraph.cs b/src/QuikGraph/Structures/Graphs/DelegateBidirectionalIncidenceGraph.cs
index cc8e1b75d..93458cbff 100644
--- a/src/QuikGraph/Structures/Graphs/DelegateBidirectionalIncidenceGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/DelegateBidirectionalIncidenceGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -58,8 +58,8 @@ public IEnumerable<TEdge> InEdges(TVertex vertex)
             if (vertex == null)
                 throw new ArgumentNullException(nameof(vertex));
 
-            if (_tryGetInEdgesFunc(vertex, out IEnumerable<TEdge> result))
-                return result;
+            if (_tryGetInEdgesFunc(vertex, out IEnumerable<TEdge> inEdges))
+                return inEdges;
             throw new VertexNotFoundException();
         }
 
diff --git a/src/QuikGraph/Structures/Graphs/DelegateVertexAndEdgeListGraph.cs b/src/QuikGraph/Structures/Graphs/DelegateVertexAndEdgeListGraph.cs
index 0253cbe02..0bcbdcb45 100644
--- a/src/QuikGraph/Structures/Graphs/DelegateVertexAndEdgeListGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/DelegateVertexAndEdgeListGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -69,7 +69,7 @@ public bool IsEdgesEmpty
         /// <inheritdoc />
         public virtual IEnumerable<TEdge> Edges =>
             _vertices.SelectMany(
-                vertex => OutEdges(vertex).Where(edge => EqualityComparer<TVertex>.Default.Equals(edge.Source, vertex)));
+                vertex => OutEdges(vertex).Where(outEdge => EqualityComparer<TVertex>.Default.Equals(outEdge.Source, vertex)));
 
         /// <inheritdoc />
         public bool ContainsEdge(TEdge edge)
@@ -77,8 +77,8 @@ public bool ContainsEdge(TEdge edge)
             if (edge == null)
                 throw new ArgumentNullException(nameof(edge));
 
-            if (TryGetOutEdges(edge.Source, out IEnumerable<TEdge> edges))
-                return edges.Any(e => EqualityComparer<TEdge>.Default.Equals(e, edge));
+            if (TryGetOutEdges(edge.Source, out IEnumerable<TEdge> outEdges))
+                return outEdges.Any(outEdge => EqualityComparer<TEdge>.Default.Equals(outEdge, edge));
             return false;
         }
 
@@ -143,7 +143,7 @@ internal override IEnumerable<TEdge> OutEdgesInternal(TVertex vertex)
         {
             if (!ContainsVertexInternal(vertex))
                 throw new VertexNotFoundException();
-            return base.OutEdgesInternal(vertex).Where(edge => FilterEdges(edge, vertex));
+            return base.OutEdgesInternal(vertex).Where(outEdge => FilterEdges(outEdge, vertex));
         }
 
         /// <inheritdoc />
@@ -157,11 +157,11 @@ internal override bool TryGetOutEdgesInternal(TVertex vertex, out IEnumerable<TE
 
             // Ignore return because "vertex" exists in the graph
             // so it should always return true.
-            base.TryGetOutEdgesInternal(vertex, out IEnumerable<TEdge> unfilteredEdges);
+            base.TryGetOutEdgesInternal(vertex, out IEnumerable<TEdge> unfilteredOutEdges);
 
-            edges = unfilteredEdges is null
+            edges = unfilteredOutEdges is null
                 ? Enumerable.Empty<TEdge>()
-                : unfilteredEdges.Where(edge => FilterEdges(edge, vertex));
+                : unfilteredOutEdges.Where(outEdge => FilterEdges(outEdge, vertex));
 
             return true;
         }
diff --git a/src/QuikGraph/Structures/Graphs/EdgeListGraph.cs b/src/QuikGraph/Structures/Graphs/EdgeListGraph.cs
index d5323777b..262720fe6 100644
--- a/src/QuikGraph/Structures/Graphs/EdgeListGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/EdgeListGraph.cs
@@ -1,7 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+#if SUPPORTS_AGGRESSIVE_INLINING
+using System.Runtime.CompilerServices;
+#endif
 using JetBrains.Annotations;
 using QuikGraph.Collections;
 
@@ -62,6 +65,8 @@ public EdgeListGraph(bool isDirected, bool allowParallelEdges)
         /// <inheritdoc />
         public IEnumerable<TVertex> Vertices => GetVertices().AsEnumerable();
 
+        [Pure]
+        [NotNull, ItemNotNull]
         private HashSet<TVertex> GetVertices()
         {
             var vertices = new HashSet<TVertex>();
@@ -89,8 +94,7 @@ public bool ContainsVertex(TVertex vertex)
         #region IEdgeSet<TVertex,TEdge>
 
         [NotNull]
-        private readonly EdgeEdgeDictionary<TVertex, TEdge> _edges
-            = new EdgeEdgeDictionary<TVertex, TEdge>();
+        private EdgeEdgeDictionary<TVertex, TEdge> _edges = new EdgeEdgeDictionary<TVertex, TEdge>();
 
         /// <inheritdoc />
         public bool IsEdgesEmpty => _edges.Count == 0;
@@ -99,7 +103,7 @@ private readonly EdgeEdgeDictionary<TVertex, TEdge> _edges
         public int EdgeCount => _edges.Count;
 
         /// <inheritdoc />
-        public IEnumerable<TEdge> Edges => _edges.Keys;
+        public IEnumerable<TEdge> Edges => _edges.Keys.AsEnumerable();
 
         /// <inheritdoc />
         public bool ContainsEdge(TEdge edge)
@@ -110,6 +114,7 @@ public bool ContainsEdge(TEdge edge)
             return _edges.ContainsKey(edge);
         }
 
+        [Pure]
         private bool ContainsEdge(TVertex source, TVertex target)
         {
             Debug.Assert(source != null);
@@ -152,7 +157,9 @@ public int AddVerticesAndEdgeRange([NotNull, ItemNotNull] IEnumerable<TEdge> edg
             foreach (TEdge edge in edgesArray)
             {
                 if (AddVerticesAndEdge(edge))
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -191,7 +198,9 @@ public int AddEdgeRange(IEnumerable<TEdge> edges)
             foreach (TEdge edge in edgesArray)
             {
                 if (AddEdge(edge))
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -211,17 +220,20 @@ protected virtual void OnEdgeAdded([NotNull] TEdge edge)
             EdgeAdded?.Invoke(edge);
         }
 
-        private bool RemoveEdgeInternal([NotNull] TEdge edge)
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void NotifyEdgesRemoved([NotNull, ItemNotNull] ICollection<TEdge> edges)
         {
-            Debug.Assert(edge != null);
+            Debug.Assert(edges != null);
 
-            if (_edges.Remove(edge))
+            if (EdgeRemoved != null) // Lazily notify
             {
-                OnEdgeRemoved(edge);
-                return true;
+                foreach (TEdge edge in edges)
+                {
+                    OnEdgeRemoved(edge);
+                }
             }
-
-            return false;
         }
 
         /// <inheritdoc />
@@ -230,7 +242,13 @@ public bool RemoveEdge(TEdge edge)
             if (edge == null)
                 throw new ArgumentNullException(nameof(edge));
 
-            return RemoveEdgeInternal(edge);
+            if (_edges.Remove(edge))
+            {
+                OnEdgeRemoved(edge);
+                return true;
+            }
+
+            return false;
         }
 
         /// <inheritdoc />
@@ -253,11 +271,17 @@ public int RemoveEdgeIf(EdgePredicate<TVertex, TEdge> predicate)
             if (predicate is null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            TEdge[] edgesToRemove = Edges.Where(edge => predicate(edge)).ToArray();
+            var edgesToRemove = new EdgeList<TVertex, TEdge>();
+            edgesToRemove.AddRange(Edges.Where(edge => predicate(edge)));
 
             foreach (TEdge edge in edgesToRemove)
-                RemoveEdgeInternal(edge);
-            return edgesToRemove.Length;
+            {
+                _edges.Remove(edge);
+            }
+
+            NotifyEdgesRemoved(edgesToRemove);
+
+            return edgesToRemove.Count;
         }
 
         #endregion
@@ -265,11 +289,11 @@ public int RemoveEdgeIf(EdgePredicate<TVertex, TEdge> predicate)
         /// <inheritdoc />
         public void Clear()
         {
-            EdgeEdgeDictionary<TVertex, TEdge> edges = _edges.Clone();
-            _edges.Clear();
-
-            foreach (TEdge edge in edges.Keys)
-                OnEdgeRemoved(edge);
+            EdgeEdgeDictionary<TVertex, TEdge> edges = _edges;
+            _edges = new EdgeEdgeDictionary<TVertex, TEdge>();
+            
+            NotifyEdgesRemoved(edges.Keys);
+            edges.Clear();
         }
 
         #region ICloneable
diff --git a/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs b/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs
index c5fbb72fd..056bb932b 100644
--- a/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -140,7 +140,7 @@ public IEnumerable<TEdge> AdjacentEdges(TVertex vertex)
                     .Concat(
                         OriginalGraph.InEdges(vertex)
                             // We skip self edges here since
-                            // We already did those in the out-edge run
+                            // We already got them out-edge run
                             .Where(inEdge => !inEdge.IsSelfEdge()));
         }
 
diff --git a/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs b/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs
index d6ddfb27a..adb4edf04 100644
--- a/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs
@@ -1,10 +1,13 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 #if !SUPPORTS_TYPE_FULL_FEATURES
 using System.Reflection;
 #endif
+#if SUPPORTS_AGGRESSIVE_INLINING
+using System.Runtime.CompilerServices;
+#endif
 #if SUPPORTS_SERIALIZATION && NETSTANDARD2_0
 using System.Runtime.Serialization;
 using System.Security.Permissions;
@@ -33,7 +36,7 @@ public class UndirectedGraph<TVertex, TEdge> : IMutableUndirectedGraph<TVertex,
         where TEdge : IEdge<TVertex>
     {
         [NotNull]
-        private readonly IVertexEdgeDictionary<TVertex, TEdge> _adjacentEdges =
+        private IVertexEdgeDictionary<TVertex, TEdge> _adjacentEdges =
             new VertexEdgeDictionary<TVertex, TEdge>();
 
         /// <summary>
@@ -123,7 +126,7 @@ public IEnumerable<TVertex> AdjacentVertices([NotNull] TVertex vertex)
 
             adjacentVertices.Remove(vertex);
 
-            return adjacentVertices;
+            return adjacentVertices.AsEnumerable();
         }
 
         #region IGraph<TVertex,TEdge>
@@ -167,7 +170,7 @@ public bool ContainsVertex(TVertex vertex)
         public int EdgeCount { get; private set; }
 
         [NotNull, ItemNotNull]
-        private readonly IList<TEdge> _edges = new List<TEdge>();
+        private IList<TEdge> _edges = new List<TEdge>();
 
         /// <inheritdoc />
         public IEnumerable<TEdge> Edges => _edges.AsEnumerable();
@@ -196,6 +199,7 @@ public bool ContainsEdge(TVertex source, TVertex target)
             return TryGetEdge(source, target, out _);
         }
 
+        [Pure]
         private bool ContainsEdgeBetweenVertices([NotNull, ItemNotNull] IEnumerable<TEdge> edges, [NotNull] TEdge edge)
         {
             Debug.Assert(edges != null);
@@ -265,18 +269,15 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
 
             _reorder(source, target, out source, out target);
 
-            if (!_adjacentEdges.TryGetValue(source, out IEdgeList<TVertex, TEdge> adjacentEdges))
-            {
-                edge = default(TEdge);
-                return false;
-            }
-
-            foreach (TEdge adjacentEdge in adjacentEdges)
+            if (_adjacentEdges.TryGetValue(source, out IEdgeList<TVertex, TEdge> adjacentEdges))
             {
-                if (EdgeEqualityComparer(adjacentEdge, source, target))
+                foreach (TEdge adjacentEdge in adjacentEdges)
                 {
-                    edge = adjacentEdge;
-                    return true;
+                    if (EdgeEqualityComparer(adjacentEdge, source, target))
+                    {
+                        edge = adjacentEdge;
+                        return true;
+                    }
                 }
             }
 
@@ -302,17 +303,16 @@ public void TrimEdgeExcess()
         /// <inheritdoc />
         public void Clear()
         {
-            if (EdgeRemoved != null) // Lazily notify
-            {
-                foreach (TEdge edge in _edges)
-                    OnEdgeRemoved(edge);
-                foreach (TVertex vertex in _adjacentEdges.Keys)
-                    OnVertexRemoved(vertex);
-            }
-
-            _edges.Clear();
-            _adjacentEdges.Clear();
+            IList<TEdge> edges = _edges;
+            _edges = new List<TEdge>();
+            IVertexEdgeDictionary<TVertex, TEdge> adjacentEdges = _adjacentEdges;
+            _adjacentEdges = new VertexEdgeDictionary<TVertex, TEdge>();
             EdgeCount = 0;
+
+            NotifyEdgesRemoved(edges);
+            NotifyVerticesRemoved(adjacentEdges.Keys);
+            edges.Clear();
+            adjacentEdges.Clear();
         }
 
         #endregion
@@ -333,6 +333,23 @@ protected virtual void OnVertexAdded([NotNull] TVertex vertex)
             VertexAdded?.Invoke(vertex);
         }
 
+        /// <inheritdoc />
+        public bool AddVertex(TVertex vertex)
+        {
+            if (ContainsVertex(vertex))
+                return false;
+
+            _adjacentEdges.Add(
+                vertex,
+                EdgeCapacity > 0
+                    ? new EdgeList<TVertex, TEdge>(EdgeCapacity)
+                    : new EdgeList<TVertex, TEdge>());
+
+            OnVertexAdded(vertex);
+
+            return true;
+        }
+
         /// <inheritdoc />
         public int AddVertexRange(IEnumerable<TVertex> vertices)
         {
@@ -346,28 +363,15 @@ public int AddVertexRange(IEnumerable<TVertex> vertices)
             foreach (TVertex vertex in verticesArray)
             {
                 if (AddVertex(vertex))
+                {
                     ++count;
+                }
             }
 
             return count;
         }
 
-        /// <inheritdoc />
-        public bool AddVertex(TVertex vertex)
-        {
-            if (ContainsVertex(vertex))
-                return false;
-
-            var edges = EdgeCapacity < 0
-                ? new EdgeList<TVertex, TEdge>()
-                : new EdgeList<TVertex, TEdge>(EdgeCapacity);
-
-            _adjacentEdges.Add(vertex, edges);
-            OnVertexAdded(vertex);
-
-            return true;
-        }
-
+        [Pure]
         [NotNull]
         private IEdgeList<TVertex, TEdge> AddAndReturnEdges([NotNull] TVertex vertex)
         {
@@ -375,9 +379,9 @@ private IEdgeList<TVertex, TEdge> AddAndReturnEdges([NotNull] TVertex vertex)
 
             if (!_adjacentEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> edges))
             {
-                _adjacentEdges[vertex] = edges = EdgeCapacity < 0
-                    ? new EdgeList<TVertex, TEdge>()
-                    : new EdgeList<TVertex, TEdge>(EdgeCapacity);
+                _adjacentEdges[vertex] = edges = EdgeCapacity > 0
+                    ? new EdgeList<TVertex, TEdge>(EdgeCapacity)
+                    : new EdgeList<TVertex, TEdge>();
 
                 OnVertexAdded(vertex);
             }
@@ -399,6 +403,20 @@ protected virtual void OnVertexRemoved([NotNull] TVertex vertex)
             VertexRemoved?.Invoke(vertex);
         }
 
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void NotifyVerticesRemoved([NotNull, ItemNotNull] IEnumerable<TVertex> vertices)
+        {
+            if (VertexRemoved != null) // Lazily notify
+            {
+                foreach (TVertex vertex in vertices)
+                {
+                    OnVertexRemoved(vertex);
+                }
+            }
+        }
+
         /// <inheritdoc />
         public bool RemoveVertex(TVertex vertex)
         {
@@ -406,7 +424,9 @@ public bool RemoveVertex(TVertex vertex)
 
             bool removed = _adjacentEdges.Remove(vertex);
             if (removed)
+            {
                 OnVertexRemoved(vertex);
+            }
 
             return removed;
         }
@@ -417,14 +437,18 @@ public int RemoveVertexIf(VertexPredicate<TVertex> predicate)
             if (predicate is null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            TVertex[] verticesToRemove = Vertices
-                .Where(vertex => predicate(vertex))
-                .ToArray();
+            var verticesToRemove = new VertexList<TVertex>();
+            verticesToRemove.AddRange(Vertices.Where(vertex => predicate(vertex)));
 
             foreach (TVertex vertex in verticesToRemove)
-                RemoveVertex(vertex);
+            {
+                ClearAdjacentEdges(vertex);
+                _adjacentEdges.Remove(vertex);
+            }
 
-            return verticesToRemove.Length;
+            NotifyVerticesRemoved(verticesToRemove);
+
+            return verticesToRemove.Count;
         }
 
         #endregion
@@ -436,14 +460,15 @@ public int RemoveAdjacentEdgeIf(TVertex vertex, EdgePredicate<TVertex, TEdge> pr
         {
             if (predicate is null)
                 throw new ArgumentNullException(nameof(predicate));
-            if (!_adjacentEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> adjacentEdges))
-                return 0;
 
-            var edges = new List<TEdge>();
-            edges.AddRange(adjacentEdges.Where(edge => predicate(edge)));
+            if (_adjacentEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> adjacentEdges))
+            {
+                var edgesToRemove = new VertexList<TEdge>();
+                edgesToRemove.AddRange(adjacentEdges.Where(edge => predicate(edge)));
+                return RemoveEdgesInternal(edgesToRemove);
+            }
 
-            RemoveEdges(edges);
-            return edges.Count;
+            return 0;
         }
 
         /// <inheritdoc />
@@ -452,22 +477,29 @@ public void ClearAdjacentEdges(TVertex vertex)
             if (vertex == null)
                 throw new ArgumentNullException(nameof(vertex));
 
-            if (!_adjacentEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> adjacentEdges))
-                return;
+            if (_adjacentEdges.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> adjacentEdges))
+            {
+                IEdgeList<TVertex, TEdge> edgesToRemove = adjacentEdges.Clone();
+                adjacentEdges.Clear();
+                EdgeCount -= edgesToRemove.Count;
+                Debug.Assert(EdgeCount >= 0);
 
-            IEdgeList<TVertex, TEdge> edgesToRemove = adjacentEdges.Clone();
-            EdgeCount -= edgesToRemove.Count;
+                foreach (TEdge edge in edgesToRemove)
+                {
+                    if (_adjacentEdges.TryGetValue(edge.Target, out adjacentEdges))
+                    {
+                        adjacentEdges.Remove(edge);
+                    }
 
-            foreach (TEdge edge in edgesToRemove)
-            {
-                if (_adjacentEdges.TryGetValue(edge.Target, out adjacentEdges))
-                    adjacentEdges.Remove(edge);
+                    if (_adjacentEdges.TryGetValue(edge.Source, out adjacentEdges))
+                    {
+                        adjacentEdges.Remove(edge);
+                    }
 
-                if (_adjacentEdges.TryGetValue(edge.Source, out adjacentEdges))
-                    adjacentEdges.Remove(edge);
+                    _edges.Remove(edge);
+                }
 
-                _edges.Remove(edge);
-                OnEdgeRemoved(edge);
+                NotifyEdgesRemoved(edgesToRemove);
             }
         }
 
@@ -499,7 +531,9 @@ public bool AddVerticesAndEdge(TEdge edge)
             _edges.Add(edge);
             sourceEdges.Add(edge);
             if (!edge.IsSelfEdge())
+            {
                 targetEdges.Add(edge);
+            }
 
             ++EdgeCount;
             OnEdgeAdded(edge);
@@ -520,7 +554,9 @@ public int AddVerticesAndEdgeRange(IEnumerable<TEdge> edges)
             foreach (TEdge edge in edgesArray)
             {
                 if (AddVerticesAndEdge(edge))
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -566,7 +602,9 @@ public int AddEdgeRange(IEnumerable<TEdge> edges)
             foreach (TEdge edge in edgesArray)
             {
                 if (AddEdge(edge))
+                {
                     ++count;
+                }
             }
 
             return count;
@@ -586,6 +624,22 @@ protected virtual void OnEdgeAdded([NotNull] TEdge edge)
             EdgeAdded?.Invoke(edge);
         }
 
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void NotifyEdgesRemoved([NotNull, ItemNotNull] ICollection<TEdge> edges)
+        {
+            Debug.Assert(edges != null);
+
+            if (EdgeRemoved != null) // Lazily notify
+            {
+                foreach (TEdge edge in edges)
+                {
+                    OnEdgeRemoved(edge);
+                }
+            }
+        }
+
         /// <inheritdoc />
         public bool RemoveEdge(TEdge edge)
         {
@@ -598,9 +652,10 @@ public bool RemoveEdge(TEdge edge)
                 _edges.Remove(edge);
 
                 if (!edge.IsSelfEdge())
+                {
                     _adjacentEdges[edge.Target].Remove(edge);
+                }
                 --EdgeCount;
-
                 Debug.Assert(EdgeCount >= 0);
 
                 OnEdgeRemoved(edge);
@@ -630,10 +685,36 @@ public int RemoveEdgeIf(EdgePredicate<TVertex, TEdge> predicate)
             if (predicate is null)
                 throw new ArgumentNullException(nameof(predicate));
 
-            return RemoveEdges(
+            return RemoveEdgesInternal(
                 Edges.Where(edge => predicate(edge)).ToArray());
         }
 
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private int RemoveEdgesInternal([NotNull, ItemNotNull] ICollection<TEdge> edgesToRemove)
+        {
+            foreach (TEdge edge in edgesToRemove)
+            {
+                if (_adjacentEdges.TryGetValue(edge.Source, out IEdgeList<TVertex, TEdge> adjacentEdges)
+                    && adjacentEdges.Remove(edge))
+                {
+                    _edges.Remove(edge);
+
+                    if (!edge.IsSelfEdge())
+                    {
+                        _adjacentEdges[edge.Target].Remove(edge);
+                    }
+                }
+            }
+
+            EdgeCount -= edgesToRemove.Count;
+            Debug.Assert(EdgeCount >= 0);
+            NotifyEdgesRemoved(edgesToRemove);
+
+            return edgesToRemove.Count;
+        }
+
         /// <summary>
         /// Removes the given set of edges.
         /// </summary>
@@ -651,7 +732,9 @@ public int RemoveEdges([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
             foreach (TEdge edge in edgesArray)
             {
                 if (RemoveEdge(edge))
+                {
                     ++count;
+                }
             }
 
             return count;
diff --git a/tests/QuikGraph.Tests/Structures/Graphs/AdjacencyGraphTests.cs b/tests/QuikGraph.Tests/Structures/Graphs/AdjacencyGraphTests.cs
index 15a2b330f..0d571306b 100644
--- a/tests/QuikGraph.Tests/Structures/Graphs/AdjacencyGraphTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Graphs/AdjacencyGraphTests.cs
@@ -341,6 +341,9 @@ public void RemoveVertexIf()
         {
             var graph = new AdjacencyGraph<int, Edge<int>>();
             RemoveVertexIf_Test(graph);
+
+            graph = new AdjacencyGraph<int, Edge<int>>();
+            RemoveVertexIf_Test2(graph);
         }
 
         [Test]
diff --git a/tests/QuikGraph.Tests/Structures/Graphs/BidirectionalGraphTests.cs b/tests/QuikGraph.Tests/Structures/Graphs/BidirectionalGraphTests.cs
index f4016eb0f..79743fa67 100644
--- a/tests/QuikGraph.Tests/Structures/Graphs/BidirectionalGraphTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Graphs/BidirectionalGraphTests.cs
@@ -746,6 +746,9 @@ public void RemoveVertexIf()
         {
             var graph = new BidirectionalGraph<int, Edge<int>>();
             RemoveVertexIf_Test(graph);
+
+            graph = new BidirectionalGraph<int, Edge<int>>();
+            RemoveVertexIf_Test2(graph);
         }
 
         [Test]
diff --git a/tests/QuikGraph.Tests/Structures/Graphs/ClusteredAdjacencyGraphTests.cs b/tests/QuikGraph.Tests/Structures/Graphs/ClusteredAdjacencyGraphTests.cs
index 5e8796822..f9d8efbe3 100644
--- a/tests/QuikGraph.Tests/Structures/Graphs/ClusteredAdjacencyGraphTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Graphs/ClusteredAdjacencyGraphTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -526,10 +526,19 @@ public void RemoveVertexIf()
             var graph1 = new ClusteredAdjacencyGraph<int, Edge<int>>(wrappedGraph1);
             RemoveVertexIf_Clusters_Test(graph1);
 
+            wrappedGraph1 = new AdjacencyGraph<int, Edge<int>>();
+            graph1 = new ClusteredAdjacencyGraph<int, Edge<int>>(wrappedGraph1);
+            RemoveVertexIf_Clusters_Test2(graph1);
+
             var wrappedGraph2 = new AdjacencyGraph<int, Edge<int>>();
             var graph2 = new ClusteredAdjacencyGraph<int, Edge<int>>(wrappedGraph2);
             var subGraph2 = new ClusteredAdjacencyGraph<int, Edge<int>>(graph2);
             RemoveVertexIf_Clusters_Test(subGraph2);
+
+            wrappedGraph2 = new AdjacencyGraph<int, Edge<int>>();
+            graph2 = new ClusteredAdjacencyGraph<int, Edge<int>>(wrappedGraph2);
+            subGraph2 = new ClusteredAdjacencyGraph<int, Edge<int>>(graph2);
+            RemoveVertexIf_Clusters_Test2(subGraph2);
         }
 
         [Test]
diff --git a/tests/QuikGraph.Tests/Structures/Graphs/GraphTestsBases/GraphTestsBase.RemoveVertices.cs b/tests/QuikGraph.Tests/Structures/Graphs/GraphTestsBases/GraphTestsBase.RemoveVertices.cs
index eafa67459..5e461caf7 100644
--- a/tests/QuikGraph.Tests/Structures/Graphs/GraphTestsBases/GraphTestsBase.RemoveVertices.cs
+++ b/tests/QuikGraph.Tests/Structures/Graphs/GraphTestsBases/GraphTestsBase.RemoveVertices.cs
@@ -216,6 +216,53 @@ void CheckCounters(int expectedRemovedVertices, int expectedRemovedEdges)
             #endregion
         }
 
+        protected static void RemoveVertexIf_Test2(
+            [NotNull] IMutableVertexAndEdgeSet<int, Edge<int>> graph)
+        {
+            int verticesRemoved = 0;
+            int edgesRemoved = 0;
+
+            // ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
+            graph.VertexRemoved += v =>
+            {
+                Assert.IsNotNull(v);
+                // ReSharper disable once AccessToModifiedClosure
+                ++verticesRemoved;
+            };
+            // ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
+            graph.EdgeRemoved += e =>
+            {
+                Assert.IsNotNull(e);
+                // ReSharper disable once AccessToModifiedClosure
+                ++edgesRemoved;
+            };
+
+            var edge11 = new Edge<int>(1, 1);
+            var edge13 = new Edge<int>(1, 3);
+            var edge24 = new Edge<int>(2, 4);
+            var edge31 = new Edge<int>(3, 1);
+            var edge32 = new Edge<int>(3, 2);
+            var edge34 = new Edge<int>(3, 4);
+            graph.AddVerticesAndEdgeRange(new[] { edge11, edge13, edge24, edge31, edge32, edge34 });
+
+            Assert.AreEqual(2, graph.RemoveVertexIf(vertex => vertex == 1 || vertex  == 3));
+            CheckCounters(2, 5);
+            AssertHasVertices(graph, new[] { 2, 4 });
+            AssertHasEdges(graph, new[] { edge24 });
+
+            #region Local function
+
+            void CheckCounters(int expectedRemovedVertices, int expectedRemovedEdges)
+            {
+                Assert.AreEqual(expectedRemovedVertices, verticesRemoved);
+                Assert.AreEqual(expectedRemovedEdges, edgesRemoved);
+                verticesRemoved = 0;
+                edgesRemoved = 0;
+            }
+
+            #endregion
+        }
+
         protected static void RemoveVertexIf_Clusters_Test(
             [NotNull] ClusteredAdjacencyGraph<int, Edge<int>> graph)
         {
@@ -237,6 +284,22 @@ protected static void RemoveVertexIf_Clusters_Test(
             AssertEmptyGraph(graph);
         }
 
+        protected static void RemoveVertexIf_Clusters_Test2(
+            [NotNull] ClusteredAdjacencyGraph<int, Edge<int>> graph)
+        {
+            var edge11 = new Edge<int>(1, 1);
+            var edge13 = new Edge<int>(1, 3);
+            var edge24 = new Edge<int>(2, 4);
+            var edge31 = new Edge<int>(3, 1);
+            var edge32 = new Edge<int>(3, 2);
+            var edge34 = new Edge<int>(3, 4);
+            graph.AddVerticesAndEdgeRange(new[] { edge11, edge13, edge24, edge31, edge32, edge34 });
+
+            Assert.AreEqual(2, graph.RemoveVertexIf(vertex => vertex == 1 || vertex == 3));
+            AssertHasVertices(graph, new[] { 2, 4 });
+            AssertHasEdges(graph, new[] { edge24 });
+        }
+
         protected static void RemoveVertexIf_Throws_Test<TVertex>(
             [NotNull] IMutableVertexSet<TVertex> graph)
             where TVertex : class
diff --git a/tests/QuikGraph.Tests/Structures/Graphs/UndirectedGraphTests.cs b/tests/QuikGraph.Tests/Structures/Graphs/UndirectedGraphTests.cs
index 2fdef8af0..9b8fa0504 100644
--- a/tests/QuikGraph.Tests/Structures/Graphs/UndirectedGraphTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Graphs/UndirectedGraphTests.cs
@@ -379,6 +379,9 @@ public void RemoveVertexIf()
         {
             var graph = new UndirectedGraph<int, Edge<int>>();
             RemoveVertexIf_Test(graph);
+
+            graph = new UndirectedGraph<int, Edge<int>>();
+            RemoveVertexIf_Test2(graph);
         }
 
         [Test]
@@ -659,6 +662,15 @@ private static void ClearEdgesCommon([NotNull, InstantHandle] Action<UndirectedG
             AssertNoEdge(graph);
             CheckCounter(1);
 
+            var edge11 = new Edge<int>(1, 1);
+            graph.AddVerticesAndEdgeRange(new[] { edge11, edge12, edge13, edge23, edge31, edge32 });
+
+            // Clear self edge
+            clearEdges(graph, 1);
+
+            AssertHasEdges(graph, new[] { edge23, edge32 });
+            CheckCounter(4);
+
             #region Local function
 
             void CheckCounter(int expectedRemovedEdges)

From ae67182f29de7b5e328b2aa974a9fb4350dfbf11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sun, 10 Oct 2021 23:18:13 +0200
Subject: [PATCH 03/39] Clean various SonarQube issues.

---
 src/QuikGraph.Graphviz/Dot/GraphvizVertex.cs  | 34 ++++++---
 .../GraphMLDeserializer.cs                    | 12 +--
 .../StronglyConnectedComponentAlgorithm.cs    |  7 +-
 .../Algorithms/EulerianTrailAlgorithm.cs      | 31 ++++----
 .../TransitionFactoryImplicitGraph.cs         | 15 ++--
 .../GraphPartition/KernighanLinAlgorithm.cs   |  4 +-
 .../ReverseEdgeAugmentorAlgorithm.cs          | 16 ++--
 .../EdgePredecessorRecorderObserver.cs        |  9 +--
 .../VertexPredecessorPathRecorderObserver.cs  |  9 +--
 src/QuikGraph/Algorithms/PageRankAlgorithm.cs | 10 +--
 .../ShortestPath/YenShortestPathsAlgorithm.cs | 35 ++++-----
 .../SourceFirstTopologicalSortAlgorithm.cs    | 10 +--
 .../Algorithms/TransitiveAlgorithmHelper.cs   |  3 +-
 .../Collections/ForestDisjointSet.cs          |  4 +-
 .../Extensions/AlgorithmExtensions.cs         |  4 +-
 .../Graphs/FilteredIncidenceGraph.cs          | 11 +--
 .../Structures/Graphs/AdjacencyGraph.cs       | 54 +++-----------
 .../Structures/Graphs/ArrayAdjacencyGraph.cs  |  9 +--
 .../Graphs/ArrayBidirectionalGraph.cs         |  9 +--
 .../Structures/Graphs/ArrayUndirectedGraph.cs | 12 +--
 .../Structures/Graphs/BidirectionalGraph.cs   | 54 +++-----------
 .../Graphs/BidirectionalMatrixGraph.cs        | 11 +--
 .../Graphs/ClusteredAdjacencyGraph.cs         | 33 +--------
 .../Graphs/DelegateImplicitUndirectedGraph.cs | 11 +--
 .../Graphs/DelegateIncidenceGraph.cs          | 11 +--
 .../Structures/Graphs/EdgeListGraph.cs        | 22 +-----
 .../Graphs/UndirectedBidirectionalGraph.cs    | 10 +--
 .../Structures/Graphs/UndirectedGraph.cs      | 73 +++----------------
 28 files changed, 164 insertions(+), 359 deletions(-)

diff --git a/src/QuikGraph.Graphviz/Dot/GraphvizVertex.cs b/src/QuikGraph.Graphviz/Dot/GraphvizVertex.cs
index 22abd701a..f61179113 100644
--- a/src/QuikGraph.Graphviz/Dot/GraphvizVertex.cs
+++ b/src/QuikGraph.Graphviz/Dot/GraphvizVertex.cs
@@ -289,19 +289,10 @@ private void TextRelatedPropertiesToDot([NotNull] IDictionary<string, object> pr
 #if SUPPORTS_AGGRESSIVE_INLINING
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
 #endif
-        private void ShapeRelatedPropertiesToDot(
-            [CanBeNull] GraphvizVertex commonFormat,
-            [NotNull] IDictionary<string, object> properties)
+        private void LabelOrRecordToDot(
+            [NotNull] IDictionary<string, object> properties,
+            GraphvizVertexShape shape)
         {
-            if (Shape != GraphvizVertexShape.Unspecified)
-            {
-                properties["shape"] = Shape;
-            }
-
-            GraphvizVertexShape shape = Shape == GraphvizVertexShape.Unspecified && commonFormat != null
-                ? commonFormat.Shape
-                : Shape;
-
             if (shape == GraphvizVertexShape.Record)
             {
                 // Priority to label to allow custom record generation process
@@ -320,6 +311,25 @@ private void ShapeRelatedPropertiesToDot(
                     ? (object)new HtmlString(Label)
                     : Escape(Label);
             }
+        }
+
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void ShapeRelatedPropertiesToDot(
+            [CanBeNull] GraphvizVertex commonFormat,
+            [NotNull] IDictionary<string, object> properties)
+        {
+            if (Shape != GraphvizVertexShape.Unspecified)
+            {
+                properties["shape"] = Shape;
+            }
+
+            GraphvizVertexShape shape = Shape == GraphvizVertexShape.Unspecified && commonFormat != null
+                ? commonFormat.Shape
+                : Shape;
+
+            LabelOrRecordToDot(properties, shape);
 
             if (shape == GraphvizVertexShape.Polygon)
             {
diff --git a/src/QuikGraph.Serialization/GraphMLDeserializer.cs b/src/QuikGraph.Serialization/GraphMLDeserializer.cs
index ead44be06..8b9731e33 100644
--- a/src/QuikGraph.Serialization/GraphMLDeserializer.cs
+++ b/src/QuikGraph.Serialization/GraphMLDeserializer.cs
@@ -1,8 +1,9 @@
-#if SUPPORTS_GRAPHS_SERIALIZATION
+#if SUPPORTS_GRAPHS_SERIALIZATION
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
 using System.Xml;
@@ -124,10 +125,11 @@ private static Delegate CreateSetDefaultDelegate(
                 ILGenerator generator = method.GetILGenerator();
 
                 // We need to create the switch for each property
-                foreach (PropertySerializationInfo info in SerializationHelpers.GetAttributeProperties(elementType))
+                IEnumerable<PropertyInfo> properties = SerializationHelpers
+                    .GetAttributeProperties(elementType)
+                    .Select(info => info.Property);
+                foreach (PropertyInfo property in properties)
                 {
-                    PropertyInfo property = info.Property;
-
                     var defaultValueAttribute = Attribute.GetCustomAttribute(property, typeof(DefaultValueAttribute)) as DefaultValueAttribute;
                     if (defaultValueAttribute is null)
                         continue;
@@ -270,7 +272,7 @@ public void Deserialize(
             worker.Deserialize();
         }
 
-        private class ReaderWorker
+        private sealed class ReaderWorker
         {
             [NotNull]
             private readonly XmlReader _reader;
diff --git a/src/QuikGraph/Algorithms/ConnectedComponents/StronglyConnectedComponentAlgorithm.cs b/src/QuikGraph/Algorithms/ConnectedComponents/StronglyConnectedComponentAlgorithm.cs
index 5ba194120..fe1391248 100644
--- a/src/QuikGraph/Algorithms/ConnectedComponents/StronglyConnectedComponentAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/ConnectedComponents/StronglyConnectedComponentAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -223,11 +223,12 @@ private void OnVertexDiscovered([NotNull] TVertex vertex)
 
         private void OnVertexFinished([NotNull] TVertex vertex)
         {
-            foreach (TEdge edge in VisitedGraph.OutEdges(vertex))
+            foreach (TVertex target in VisitedGraph.OutEdges(vertex).Select(edge => edge.Target))
             {
-                TVertex target = edge.Target;
                 if (Components[target] == int.MaxValue)
+                {
                     Roots[vertex] = MinDiscoverTime(Roots[vertex], Roots[target]);
+                }
             }
 
             if (EqualityComparer<TVertex>.Default.Equals(Roots[vertex], vertex))
diff --git a/src/QuikGraph/Algorithms/EulerianTrailAlgorithm.cs b/src/QuikGraph/Algorithms/EulerianTrailAlgorithm.cs
index 242bdcd98..ebd4dbbaf 100644
--- a/src/QuikGraph/Algorithms/EulerianTrailAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/EulerianTrailAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -157,17 +157,18 @@ private bool Search([NotNull] TVertex vertex)
         /// Looks for a new path to add to the current vertex.
         /// </summary>
         /// <returns>True a new path was found, false otherwise.</returns>
+        [Pure]
         private bool Visit()
         {
             // Find a vertex that needs to be visited
-            foreach (TEdge edge in _circuit)
+            foreach (TVertex source in _circuit.Select(edge => edge.Source))
             {
-                bool edgeFound = TrySelectSingleOutEdgeNotInCircuit(edge.Source, out TEdge foundEdge);
+                bool edgeFound = TrySelectSingleOutEdgeNotInCircuit(source, out TEdge foundEdge);
                 if (!edgeFound)
                     continue;
 
                 OnVisitEdge(foundEdge);
-                _currentVertex = edge.Source;
+                _currentVertex = source;
                 if (Search(_currentVertex))
                     return true;
             }
@@ -181,6 +182,7 @@ private bool Visit()
         /// </summary>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>Number of Eulerian trails.</returns>
+        [Pure]
         public static int ComputeEulerianPathCount(
             [NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> graph)
         {
@@ -202,6 +204,7 @@ public static int ComputeEulerianPathCount(
         /// Merges the temporary circuit with the current circuit.
         /// </summary>
         /// <returns>True if all the graph edges are in the circuit.</returns>
+        [Pure]
         private bool CircuitAugmentation()
         {
             var newCircuit = new List<TEdge>(_circuit.Count + _temporaryCircuit.Count);
@@ -274,21 +277,18 @@ protected override void InternalCompute()
 
         #endregion
 
+        [Pure]
         private bool HasEdgeToward([NotNull] TVertex u, [NotNull] TVertex v)
         {
-            bool foundEdge = false;
-            foreach (TEdge edge in VisitedGraph.OutEdges(v))
-            {
-                if (EqualityComparer<TVertex>.Default.Equals(edge.Target, u))
-                {
-                    foundEdge = true;
-                    break;
-                }
-            }
+            Debug.Assert(u != null);
+            Debug.Assert(v != null);
 
-            return foundEdge;
+            return VisitedGraph
+                .OutEdges(v)
+                .Any(outEdge => EqualityComparer<TVertex>.Default.Equals(outEdge.Target, u));
         }
 
+        [Pure]
         private bool FindAdjacentOddVertex(
             [NotNull] TVertex u,
             [NotNull, ItemNotNull] ICollection<TVertex> oddVertices,
@@ -297,9 +297,8 @@ private bool FindAdjacentOddVertex(
         {
             bool found = false;
             foundAdjacent = false;
-            foreach (TEdge edge in VisitedGraph.OutEdges(u))
+            foreach (TVertex v in VisitedGraph.OutEdges(u).Select(outEdge => outEdge.Target))
             {
-                TVertex v = edge.Target;
                 if (!EqualityComparer<TVertex>.Default.Equals(v, u) && oddVertices.Contains(v))
                 {
                     foundAdjacent = true;
diff --git a/src/QuikGraph/Algorithms/Exploration/TransitionFactoryImplicitGraph.cs b/src/QuikGraph/Algorithms/Exploration/TransitionFactoryImplicitGraph.cs
index 3543be6ff..7fae07a22 100644
--- a/src/QuikGraph/Algorithms/Exploration/TransitionFactoryImplicitGraph.cs
+++ b/src/QuikGraph/Algorithms/Exploration/TransitionFactoryImplicitGraph.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_CLONEABLE
+#if SUPPORTS_CLONEABLE
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -242,16 +242,13 @@ private IEdgeList<TVertex, TEdge> ExploreFactoriesForVertex([NotNull] TVertex ve
                 if (edges is null)
                     edges = new EdgeList<TVertex, TEdge>();
 
-                foreach (TEdge edge in transitionFactory.Apply(vertex))
+                foreach (TEdge edge in transitionFactory.Apply(vertex).Where(edge => SuccessorVertexPredicate(edge.Target)))
                 {
-                    if (SuccessorVertexPredicate(edge.Target))
-                    {
-                        AddToNotProcessedCacheIfNecessary(edge.Target, transitionFactory);
+                    AddToNotProcessedCacheIfNecessary(edge.Target, transitionFactory);
 
-                        if (SuccessorEdgePredicate(edge))
-                        {
-                            edges.Add(edge);
-                        }
+                    if (SuccessorEdgePredicate(edge))
+                    {
+                        edges.Add(edge);
                     }
                 }
             }
diff --git a/src/QuikGraph/Algorithms/GraphPartition/KernighanLinAlgorithm.cs b/src/QuikGraph/Algorithms/GraphPartition/KernighanLinAlgorithm.cs
index b8f8c8d91..408199dde 100644
--- a/src/QuikGraph/Algorithms/GraphPartition/KernighanLinAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/GraphPartition/KernighanLinAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -46,7 +46,7 @@ public KernighanLinAlgorithm(
         /// </summary>
         public Partition<TVertex> Partition { get; private set; }
 
-        private class SwapPair
+        private sealed class SwapPair
         {
             public TVertex Vertex1 { get; }
             public TVertex Vertex2 { get; }
diff --git a/src/QuikGraph/Algorithms/MaximumFlow/ReverseEdgeAugmentorAlgorithm.cs b/src/QuikGraph/Algorithms/MaximumFlow/ReverseEdgeAugmentorAlgorithm.cs
index 3429ebfc9..15feeeebf 100644
--- a/src/QuikGraph/Algorithms/MaximumFlow/ReverseEdgeAugmentorAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/MaximumFlow/ReverseEdgeAugmentorAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -79,23 +79,25 @@ private void OnReservedEdgeAdded([NotNull] TEdge edge)
         /// <param name="edge">Edge to find its corresponding reversed one.</param>
         /// <param name="foundReversedEdge">Found reversed edge.</param>
         /// <returns>True if the reversed edge was found, false otherwise.</returns>
+        [Pure]
         private bool FindReversedEdge([NotNull] TEdge edge, out TEdge foundReversedEdge)
         {
             Debug.Assert(edge != null);
 
-            foreach (TEdge reversedEdge in VisitedGraph.OutEdges(edge.Target))
+            IEnumerable<TEdge> reversedEdges = VisitedGraph
+                .OutEdges(edge.Target)
+                .Where(reversedEdge => EqualityComparer<TVertex>.Default.Equals(reversedEdge.Target, edge.Source));
+            foreach (TEdge reversedEdge in reversedEdges)
             {
-                if (EqualityComparer<TVertex>.Default.Equals(reversedEdge.Target, edge.Source))
-                {
-                    foundReversedEdge = reversedEdge;
-                    return true;
-                }
+                foundReversedEdge = reversedEdge;
+                return true;
             }
 
             foundReversedEdge = default(TEdge);
             return false;
         }
 
+        [Pure]
         [NotNull, ItemNotNull]
         private IEnumerable<TEdge> FindEdgesToReverse()
         {
diff --git a/src/QuikGraph/Algorithms/Observers/EdgePredecessorRecorderObserver.cs b/src/QuikGraph/Algorithms/Observers/EdgePredecessorRecorderObserver.cs
index ccc256d24..ee88dd25e 100644
--- a/src/QuikGraph/Algorithms/Observers/EdgePredecessorRecorderObserver.cs
+++ b/src/QuikGraph/Algorithms/Observers/EdgePredecessorRecorderObserver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -182,11 +182,8 @@ private void OnEdgeFinished([NotNull] TEdge finishedEdge)
         {
             Debug.Assert(finishedEdge != null);
 
-            foreach (TEdge edge in EdgesPredecessors.Values)
-            {
-                if (EqualityComparer<TEdge>.Default.Equals(finishedEdge, edge))
-                    return;
-            }
+            if (EdgesPredecessors.Values.Any(edge => EqualityComparer<TEdge>.Default.Equals(finishedEdge, edge)))
+                return;
 
             EndPathEdges.Add(finishedEdge);
         }
diff --git a/src/QuikGraph/Algorithms/Observers/VertexPredecessorPathRecorderObserver.cs b/src/QuikGraph/Algorithms/Observers/VertexPredecessorPathRecorderObserver.cs
index 0c2cf5908..5d8742bb6 100644
--- a/src/QuikGraph/Algorithms/Observers/VertexPredecessorPathRecorderObserver.cs
+++ b/src/QuikGraph/Algorithms/Observers/VertexPredecessorPathRecorderObserver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -97,11 +97,8 @@ private void OnVertexFinished([NotNull] TVertex vertex)
         {
             Debug.Assert(vertex != null);
 
-            foreach (TEdge edge in VerticesPredecessors.Values)
-            {
-                if (EqualityComparer<TVertex>.Default.Equals(edge.Source, vertex))
-                    return;
-            }
+            if (VerticesPredecessors.Values.Any(edge => EqualityComparer<TVertex>.Default.Equals(edge.Source, vertex)))
+                return;
 
             EndPathVertices.Add(vertex);
         }
diff --git a/src/QuikGraph/Algorithms/PageRankAlgorithm.cs b/src/QuikGraph/Algorithms/PageRankAlgorithm.cs
index 9c968ea41..b269e6456 100644
--- a/src/QuikGraph/Algorithms/PageRankAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/PageRankAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -128,11 +128,9 @@ protected override void InternalCompute()
                     double rank = pair.Value;
 
                     // Compute sum of PR(pj)/L(pj)
-                    double r = 0;
-                    foreach (TEdge edge in filterGraph.InEdges(vertex))
-                    {
-                        r += Ranks[edge.Source] / filterGraph.OutDegree(edge.Source);
-                    }
+                    double r = filterGraph.InEdges(vertex)
+                        .Select(edge => edge.Source)
+                        .Sum(source => Ranks[source] / filterGraph.OutDegree(source));
 
                     // Add sourceRank and store it
                     double newRank = (1 - Damping) + Damping * r;
diff --git a/src/QuikGraph/Algorithms/ShortestPath/YenShortestPathsAlgorithm.cs b/src/QuikGraph/Algorithms/ShortestPath/YenShortestPathsAlgorithm.cs
index 092364a2a..4315ce555 100644
--- a/src/QuikGraph/Algorithms/ShortestPath/YenShortestPathsAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/ShortestPath/YenShortestPathsAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -150,17 +150,20 @@ public YenShortestPathsAlgorithm(
             _filter = filter ?? DefaultFilter;
         }
 
+        [Pure]
         [NotNull]
         private static IEnumerable<SortedPath> DefaultFilter([NotNull] IEnumerable<SortedPath> paths)
         {
             return paths;
         }
 
+        [Pure]
         private static double DefaultGetWeights([NotNull] EquatableTaggedEdge<TVertex, double> edge)
         {
             return edge.Tag;
         }
 
+        [Pure]
         private double GetPathDistance([ItemNotNull] SortedPath edges)
         {
             return edges.Sum(edge => _weights(edge));
@@ -211,6 +214,7 @@ private SortedPath GetInitialShortestPath()
                 : (SortedPath?)null;
         }
 
+        [Pure]
         [CanBeNull]
         private static SortedPath? ExtractShortestPathCandidate(
             [NotNull] List<SortedPath> shortestPaths,
@@ -222,21 +226,18 @@ private SortedPath GetInitialShortestPath()
             {
                 newPath = shortestPathCandidates.Dequeue();
                 isNewPath = true;
-                foreach (SortedPath path in shortestPaths)
+                // Check to see if this candidate path duplicates a previously found path
+                if (shortestPaths.Any(path => newPath.Value.Equals(path)))
                 {
-                    // Check to see if this candidate path duplicates a previously found path
-                    if (newPath.Value.Equals(path))
-                    {
-                        isNewPath = false;
-                        newPath = null;
-                        break;
-                    }
+                    isNewPath = false;
+                    newPath = null;
                 }
             }
 
             return newPath;
         }
 
+        [Pure]
         private bool SearchAndAddKthShortestPath(
             SortedPath previousPath,
             [NotNull] List<SortedPath> shortestPaths,
@@ -254,21 +255,17 @@ private bool SearchAndAddKthShortestPath(
                 // The sequence of nodes from the source to the spur node of the previous k-shortest path
                 EquatableTaggedEdge<TVertex, double>[] rootPath = previousPath.GetEdges(i);
 
-                foreach (SortedPath path in shortestPaths)
+                foreach (SortedPath path in shortestPaths.Where(path => rootPath.SequenceEqual(path.GetEdges(i))))
                 {
-                    if (rootPath.SequenceEqual(path.GetEdges(i)))
-                    {
-                        // Remove the links that are part of the previous shortest paths which share the same root path
-                        EquatableTaggedEdge<TVertex, double> edgeToRemove = path.GetEdge(i);
-                        _edgesToRestore.Add(edgeToRemove);
-                        _graph.RemoveEdge(edgeToRemove);
-                    }
+                    // Remove the links that are part of the previous shortest paths which share the same root path
+                    EquatableTaggedEdge<TVertex, double> edgeToRemove = path.GetEdge(i);
+                    _edgesToRestore.Add(edgeToRemove);
+                    _graph.RemoveEdge(edgeToRemove);
                 }
 
                 var verticesToRestore = new List<TVertex>();
-                foreach (EquatableTaggedEdge<TVertex, double> rootPathEdge in rootPath)
+                foreach (TVertex source in rootPath.Select(rootPathEdge => rootPathEdge.Source))
                 {
-                    TVertex source = rootPathEdge.Source;
                     if (!EqualityComparer<TVertex>.Default.Equals(spurVertex, source))
                     {
                         verticesToRestore.Add(source);
diff --git a/src/QuikGraph/Algorithms/TopologicalSort/SourceFirstTopologicalSortAlgorithm.cs b/src/QuikGraph/Algorithms/TopologicalSort/SourceFirstTopologicalSortAlgorithm.cs
index 5c2d3a8b8..744c90162 100644
--- a/src/QuikGraph/Algorithms/TopologicalSort/SourceFirstTopologicalSortAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/TopologicalSort/SourceFirstTopologicalSortAlgorithm.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
@@ -108,13 +108,13 @@ protected override void InternalCompute()
                 OnVertexAdded(vertex);
 
                 // Update the count of its adjacent vertices
-                foreach (TEdge edge in VisitedGraph.OutEdges(vertex))
+                foreach (TVertex target in VisitedGraph.OutEdges(vertex).Select(outEdge => outEdge.Target))
                 {
-                    --InDegrees[edge.Target];
+                    --InDegrees[target];
 
-                    Debug.Assert(InDegrees[edge.Target] >= 0);
+                    Debug.Assert(InDegrees[target] >= 0);
 
-                    _heap.Update(edge.Target);
+                    _heap.Update(target);
                 }
             }
 
diff --git a/src/QuikGraph/Algorithms/TransitiveAlgorithmHelper.cs b/src/QuikGraph/Algorithms/TransitiveAlgorithmHelper.cs
index fb186d48b..764568485 100644
--- a/src/QuikGraph/Algorithms/TransitiveAlgorithmHelper.cs
+++ b/src/QuikGraph/Algorithms/TransitiveAlgorithmHelper.cs
@@ -59,9 +59,8 @@ public void InternalCompute(
                 verticesAncestors[vertexId] = vertexAncestors;
 
                 // Get indirect ancestors
-                foreach (TEdge inEdge in _graph.InEdges(vertexId))
+                foreach (TVertex predecessor in _graph.InEdges(vertexId).Select(inEdge => inEdge.Source))
                 {
-                    TVertex predecessor = inEdge.Source;
                     vertexPredecessors.Add(predecessor);
 
                     // Add all the ancestors of the predecessors
diff --git a/src/QuikGraph/Collections/ForestDisjointSet.cs b/src/QuikGraph/Collections/ForestDisjointSet.cs
index 38938f1f8..af9aa9000 100644
--- a/src/QuikGraph/Collections/ForestDisjointSet.cs
+++ b/src/QuikGraph/Collections/ForestDisjointSet.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -17,7 +17,7 @@ public class ForestDisjointSet<T> : IDisjointSet<T>
 #if DEBUG
         [DebuggerDisplay("{" + nameof(_id) + "}:{" + nameof(Rank) + "}->{" + nameof(Parent) + "}")]
 #endif
-        private class Element
+        private sealed class Element
         {
 #if DEBUG
             private readonly int _id;
diff --git a/src/QuikGraph/Extensions/AlgorithmExtensions.cs b/src/QuikGraph/Extensions/AlgorithmExtensions.cs
index 765384c28..fb5e2478c 100644
--- a/src/QuikGraph/Extensions/AlgorithmExtensions.cs
+++ b/src/QuikGraph/Extensions/AlgorithmExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -842,7 +842,7 @@ public static bool IsDirectedAcyclicGraph<TVertex, TEdge>(
             return new DagTester<TVertex, TEdge>().IsDag(graph);
         }
 
-        private class DagTester<TVertex, TEdge>
+        private sealed class DagTester<TVertex, TEdge>
             where TEdge : IEdge<TVertex>
         {
             private bool _isDag = true;
diff --git a/src/QuikGraph/Predicates/Graphs/FilteredIncidenceGraph.cs b/src/QuikGraph/Predicates/Graphs/FilteredIncidenceGraph.cs
index 1fb358347..e7f4c3225 100644
--- a/src/QuikGraph/Predicates/Graphs/FilteredIncidenceGraph.cs
+++ b/src/QuikGraph/Predicates/Graphs/FilteredIncidenceGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -50,13 +50,10 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
                 && VertexPredicate(target)
                 && BaseGraph.TryGetEdges(source, target, out IEnumerable<TEdge> unfilteredEdges))
             {
-                foreach (TEdge unfilteredEdge in unfilteredEdges)
+                foreach (TEdge unfilteredEdge in unfilteredEdges.Where(unfilteredEdge => EdgePredicate(unfilteredEdge)))
                 {
-                    if (EdgePredicate(unfilteredEdge))
-                    {
-                        edge = unfilteredEdge;
-                        return true;
-                    }
+                    edge = unfilteredEdge;
+                    return true;
                 }
             }
 
diff --git a/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs b/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs
index f8add4644..704ea7031 100644
--- a/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs
@@ -170,13 +170,10 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
             if (_vertexEdges.TryGetValue(source, out IEdgeList<TVertex, TEdge> outEdges)
                 && outEdges.Count > 0)
             {
-                foreach (TEdge outEdge in outEdges)
+                foreach (TEdge outEdge in outEdges.Where(outEdge => EqualityComparer<TVertex>.Default.Equals(outEdge.Target, target)))
                 {
-                    if (EqualityComparer<TVertex>.Default.Equals(outEdge.Target, target))
-                    {
-                        edge = outEdge;
-                        return true;
-                    }
+                    edge = outEdge;
+                    return true;
                 }
             }
 
@@ -291,16 +288,7 @@ public virtual int AddVertexRange(IEnumerable<TVertex> vertices)
             if (verticesArray.Any(v => v == null))
                 throw new ArgumentNullException(nameof(vertices), "At least one vertex is null.");
 
-            int count = 0;
-            foreach (TVertex vertex in verticesArray)
-            {
-                if (AddVertex(vertex))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return verticesArray.Count(AddVertex);
         }
 
         /// <inheritdoc />
@@ -418,16 +406,7 @@ public int AddVerticesAndEdgeRange(IEnumerable<TEdge> edges)
             if (edgesArray.Any(e => e == null))
                 throw new ArgumentNullException(nameof(edges), "At least one edge is null.");
 
-            int count = 0;
-            foreach (TEdge edge in edgesArray)
-            {
-                if (AddVerticesAndEdge(edge))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return edgesArray.Count(AddVerticesAndEdge);
         }
 
         #endregion
@@ -473,16 +452,7 @@ public int AddEdgeRange(IEnumerable<TEdge> edges)
             if (edgesArray.Any(e => e == null))
                 throw new ArgumentNullException(nameof(edges), "At least one edge is null.");
 
-            int count = 0;
-            foreach (TEdge edge in edgesArray)
-            {
-                if (AddEdge(edge))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return edgesArray.Count(AddEdge);
         }
 
         /// <inheritdoc />
@@ -507,25 +477,25 @@ private void RemoveInEdges([NotNull, InstantHandle] Predicate<TVertex> shouldRem
             Debug.Assert(shouldRemove != null);
 
             // Run over edges and remove each edge touching the vertices to remove
-            foreach (KeyValuePair<TVertex, IEdgeList<TVertex, TEdge>> pair in _vertexEdges)
+            foreach (IEdgeList<TVertex, TEdge> outEdges in _vertexEdges.Select(pair => pair.Value))
             {
                 // Collect indexes of edges to remove
                 var indexesToRemove = new List<int>();
                 var edgesToRemove = new List<TEdge>();
-                for (int i = 0; i < pair.Value.Count; ++i)
+                for (int i = 0; i < outEdges.Count; ++i)
                 {
-                    TEdge edge = pair.Value[i];
-                    if (shouldRemove(edge.Target))
+                    TEdge outEdge = outEdges[i];
+                    if (shouldRemove(outEdge.Target))
                     {
                         indexesToRemove.Add(i);
-                        edgesToRemove.Add(edge);
+                        edgesToRemove.Add(outEdge);
                     }
                 }
 
                 // Remove collected edges
                 for (int i = indexesToRemove.Count - 1; i >= 0; --i)
                 {
-                    pair.Value.RemoveAt(indexesToRemove[i]);
+                    outEdges.RemoveAt(indexesToRemove[i]);
                 }
 
                 EdgeCount -= indexesToRemove.Count;
diff --git a/src/QuikGraph/Structures/Graphs/ArrayAdjacencyGraph.cs b/src/QuikGraph/Structures/Graphs/ArrayAdjacencyGraph.cs
index 69402f29b..2ddbc35fd 100644
--- a/src/QuikGraph/Structures/Graphs/ArrayAdjacencyGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/ArrayAdjacencyGraph.cs
@@ -181,13 +181,10 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
 
             if (_vertexOutEdges.TryGetValue(source, out TEdge[] outEdges))
             {
-                foreach (TEdge outEdge in outEdges)
+                foreach (TEdge outEdge in outEdges.Where(outEdge => EqualityComparer<TVertex>.Default.Equals(outEdge.Target, target)))
                 {
-                    if (EqualityComparer<TVertex>.Default.Equals(outEdge.Target, target))
-                    {
-                        edge = outEdge;
-                        return true;
-                    }
+                    edge = outEdge;
+                    return true;
                 }
             }
 
diff --git a/src/QuikGraph/Structures/Graphs/ArrayBidirectionalGraph.cs b/src/QuikGraph/Structures/Graphs/ArrayBidirectionalGraph.cs
index bfa92057a..f1bba93c4 100644
--- a/src/QuikGraph/Structures/Graphs/ArrayBidirectionalGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/ArrayBidirectionalGraph.cs
@@ -146,13 +146,10 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
 
             if (_vertexEdges.TryGetValue(source, out InOutEdges inOutEdges))
             {
-                foreach (TEdge outEdge in inOutEdges.OutEdges)
+                foreach (TEdge outEdge in inOutEdges.OutEdges.Where(outEdge => EqualityComparer<TVertex>.Default.Equals(outEdge.Target, target)))
                 {
-                    if (EqualityComparer<TVertex>.Default.Equals(outEdge.Target, target))
-                    {
-                        edge = outEdge;
-                        return true;
-                    }
+                    edge = outEdge;
+                    return true;
                 }
             }
 
diff --git a/src/QuikGraph/Structures/Graphs/ArrayUndirectedGraph.cs b/src/QuikGraph/Structures/Graphs/ArrayUndirectedGraph.cs
index b738fc137..560c04298 100644
--- a/src/QuikGraph/Structures/Graphs/ArrayUndirectedGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/ArrayUndirectedGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -182,15 +182,9 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
                 target = temp;
             }
 
-            if (!_vertexEdges.TryGetValue(source, out TEdge[] adjacentEdges))
+            if (_vertexEdges.TryGetValue(source, out TEdge[] adjacentEdges))
             {
-                edge = default(TEdge);
-                return false;
-            }
-
-            foreach (TEdge adjacentEdge in adjacentEdges)
-            {
-                if (EdgeEqualityComparer(adjacentEdge, source, target))
+                foreach (TEdge adjacentEdge in adjacentEdges.Where(adjacentEdge => EdgeEqualityComparer(adjacentEdge, source, target)))
                 {
                     edge = adjacentEdge;
                     return true;
diff --git a/src/QuikGraph/Structures/Graphs/BidirectionalGraph.cs b/src/QuikGraph/Structures/Graphs/BidirectionalGraph.cs
index 06175c65d..026ff80ae 100644
--- a/src/QuikGraph/Structures/Graphs/BidirectionalGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/BidirectionalGraph.cs
@@ -235,13 +235,10 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
             if (_vertexOutEdges.TryGetValue(source, out IEdgeList<TVertex, TEdge> outEdges)
                 && outEdges.Count > 0)
             {
-                foreach (TEdge outEdge in outEdges)
+                foreach (TEdge outEdge in outEdges.Where(outEdge => EqualityComparer<TVertex>.Default.Equals(outEdge.Target, target)))
                 {
-                    if (EqualityComparer<TVertex>.Default.Equals(outEdge.Target, target))
-                    {
-                        edge = outEdge;
-                        return true;
-                    }
+                    edge = outEdge;
+                    return true;
                 }
             }
 
@@ -386,16 +383,7 @@ public virtual int AddVertexRange(IEnumerable<TVertex> vertices)
             if (verticesArray.Any(v => v == null))
                 throw new ArgumentNullException(nameof(vertices), "At least one vertex is null.");
 
-            int count = 0;
-            foreach (TVertex vertex in verticesArray)
-            {
-                if (AddVertex(vertex))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return verticesArray.Count(AddVertex);
         }
 
         /// <inheritdoc />
@@ -542,16 +530,7 @@ public int AddEdgeRange(IEnumerable<TEdge> edges)
             if (edgesArray.Any(e => e == null))
                 throw new ArgumentNullException(nameof(edges), "At least one edge is null.");
 
-            int count = 0;
-            foreach (TEdge edge in edgesArray)
-            {
-                if (AddEdge(edge))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return edgesArray.Count(AddEdge);
         }
 
         /// <inheritdoc />
@@ -673,16 +652,7 @@ public int AddVerticesAndEdgeRange(IEnumerable<TEdge> edges)
             if (edgesArray.Any(e => e == null))
                 throw new ArgumentNullException(nameof(edges), "At least one edge is null.");
 
-            int count = 0;
-            foreach (TEdge edge in edgesArray)
-            {
-                if (AddVerticesAndEdge(edge))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return edgesArray.Count(AddVerticesAndEdge);
         }
 
         #endregion
@@ -815,15 +785,15 @@ public void MergeVertex(
             RemoveVertex(vertex);
 
             // Add edges from each source to each target
-            foreach (TEdge source in inEdges)
+            foreach (TVertex source in inEdges.Select(source => source.Source))
             {
-                foreach (TEdge target in outEdges)
+                IEnumerable<TVertex> targets = outEdges
+                    .Where(target => !EqualityComparer<TVertex>.Default.Equals(vertex, target.Target))
+                    .Select(target => target.Target);
+                foreach (TVertex target in targets)
                 {
-                    if (EqualityComparer<TVertex>.Default.Equals(vertex, target.Target))
-                        continue;
-
                     // We add an new edge
-                    AddEdgeInternal(edgeFactory(source.Source, target.Target));
+                    AddEdgeInternal(edgeFactory(source, target));
                 }
             }
         }
diff --git a/src/QuikGraph/Structures/Graphs/BidirectionalMatrixGraph.cs b/src/QuikGraph/Structures/Graphs/BidirectionalMatrixGraph.cs
index 851e21a8a..073c5704b 100644
--- a/src/QuikGraph/Structures/Graphs/BidirectionalMatrixGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/BidirectionalMatrixGraph.cs
@@ -529,16 +529,7 @@ public int AddEdgeRange(IEnumerable<TEdge> edges)
             if (edgesArray.Any(e => e == null))
                 throw new ArgumentNullException(nameof(edges), "At least one edge is null.");
 
-            int count = 0;
-            foreach (TEdge edge in edgesArray)
-            {
-                if (AddEdge(edge))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return edgesArray.Count(AddEdge);
         }
 
         /// <inheritdoc />
diff --git a/src/QuikGraph/Structures/Graphs/ClusteredAdjacencyGraph.cs b/src/QuikGraph/Structures/Graphs/ClusteredAdjacencyGraph.cs
index 10c0cc7c9..8ec3ae9db 100644
--- a/src/QuikGraph/Structures/Graphs/ClusteredAdjacencyGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/ClusteredAdjacencyGraph.cs
@@ -258,16 +258,7 @@ public virtual int AddVertexRange([NotNull, ItemNotNull] IEnumerable<TVertex> ve
             if (verticesArray.Any(v => v == null))
                 throw new ArgumentNullException(nameof(vertices), "At least one vertex is null.");
 
-            int count = 0;
-            foreach (TVertex vertex in verticesArray)
-            {
-                if (AddVertex(vertex))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return verticesArray.Count(AddVertex);
         }
 
         /// <summary>
@@ -367,16 +358,7 @@ public int AddVerticesAndEdgeRange([NotNull, ItemNotNull] IEnumerable<TEdge> edg
             if (edgesArray.Any(e => e == null))
                 throw new ArgumentNullException(nameof(edges), "At least one edge is null.");
 
-            int count = 0;
-            foreach (TEdge edge in edgesArray)
-            {
-                if (AddVerticesAndEdge(edge))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return edgesArray.Count(AddVerticesAndEdge);
         }
 
         /// <summary>
@@ -409,16 +391,7 @@ public int AddEdgeRange([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
             if (edgesArray.Any(e => e == null))
                 throw new ArgumentNullException(nameof(edges), "At least one edge is null.");
 
-            int count = 0;
-            foreach (TEdge edge in edgesArray)
-            {
-                if (AddEdge(edge))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return edgesArray.Count(AddEdge);
         }
 
         private void RemoveChildEdge([NotNull] TEdge edge)
diff --git a/src/QuikGraph/Structures/Graphs/DelegateImplicitUndirectedGraph.cs b/src/QuikGraph/Structures/Graphs/DelegateImplicitUndirectedGraph.cs
index 50e381e46..d3a5a021a 100644
--- a/src/QuikGraph/Structures/Graphs/DelegateImplicitUndirectedGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/DelegateImplicitUndirectedGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -115,13 +115,10 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
 
             if (TryGetAdjacentEdges(source, out IEnumerable<TEdge> adjacentEdges))
             {
-                foreach (TEdge adjacentEdge in adjacentEdges)
+                foreach (TEdge adjacentEdge in adjacentEdges.Where(adjacentEdge => EdgeEqualityComparer(adjacentEdge, source, target)))
                 {
-                    if (EdgeEqualityComparer(adjacentEdge, source, target))
-                    {
-                        edge = adjacentEdge;
-                        return true;
-                    }
+                    edge = adjacentEdge;
+                    return true;
                 }
             }
 
diff --git a/src/QuikGraph/Structures/Graphs/DelegateIncidenceGraph.cs b/src/QuikGraph/Structures/Graphs/DelegateIncidenceGraph.cs
index 1d6d6a721..ff9ef1c98 100644
--- a/src/QuikGraph/Structures/Graphs/DelegateIncidenceGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/DelegateIncidenceGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -51,13 +51,10 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
 
             if (TryGetOutEdges(source, out IEnumerable<TEdge> outEdges))
             {
-                foreach (TEdge outEdge in outEdges)
+                foreach (TEdge outEdge in outEdges.Where(outEdge => EqualityComparer<TVertex>.Default.Equals(outEdge.Target, target)))
                 {
-                    if (EqualityComparer<TVertex>.Default.Equals(outEdge.Target, target))
-                    {
-                        edge = outEdge;
-                        return true;
-                    }
+                    edge = outEdge;
+                    return true;
                 }
             }
 
diff --git a/src/QuikGraph/Structures/Graphs/EdgeListGraph.cs b/src/QuikGraph/Structures/Graphs/EdgeListGraph.cs
index 262720fe6..0ff275fbd 100644
--- a/src/QuikGraph/Structures/Graphs/EdgeListGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/EdgeListGraph.cs
@@ -153,16 +153,7 @@ public int AddVerticesAndEdgeRange([NotNull, ItemNotNull] IEnumerable<TEdge> edg
             if (edgesArray.Any(e => e == null))
                 throw new ArgumentNullException(nameof(edges), "At least one edge is null.");
 
-            int count = 0;
-            foreach (TEdge edge in edgesArray)
-            {
-                if (AddVerticesAndEdge(edge))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return edgesArray.Count(AddVerticesAndEdge);
         }
 
         /// <inheritdoc />
@@ -194,16 +185,7 @@ public int AddEdgeRange(IEnumerable<TEdge> edges)
             if (edgesArray.Any(e => e == null))
                 throw new ArgumentNullException(nameof(edges), "At least one edge is null.");
 
-            int count = 0;
-            foreach (TEdge edge in edgesArray)
-            {
-                if (AddEdge(edge))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return edgesArray.Count(AddEdge);
         }
 
         /// <inheritdoc />
diff --git a/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs b/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs
index 056bb932b..b29185f86 100644
--- a/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs
@@ -173,15 +173,9 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
 
             _reorder(source, target, out source, out target);
 
-            if (!ContainsVertex(source))
+            if (ContainsVertex(source))
             {
-                edge = default(TEdge);
-                return false;
-            }
-
-            foreach (TEdge adjacentEdge in AdjacentEdges(source))
-            {
-                if (EdgeEqualityComparer(adjacentEdge, source, target))
+                foreach (TEdge adjacentEdge in AdjacentEdges(source).Where(adjacentEdge => EdgeEqualityComparer(adjacentEdge, source, target)))
                 {
                     edge = adjacentEdge;
                     return true;
diff --git a/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs b/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs
index adb4edf04..a14485edb 100644
--- a/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs
@@ -181,16 +181,8 @@ public bool ContainsEdge(TEdge edge)
             if (edge == null)
                 throw new ArgumentNullException(nameof(edge));
 
-            if (!_adjacentEdges.TryGetValue(edge.Source, out IEdgeList<TVertex, TEdge> adjacentEdges))
-                return false;
-
-            foreach (TEdge adjacentEdge in adjacentEdges)
-            {
-                if (EqualityComparer<TEdge>.Default.Equals(adjacentEdge, edge))
-                    return true;
-            }
-
-            return false;
+            return _adjacentEdges.TryGetValue(edge.Source, out IEdgeList<TVertex, TEdge> adjacentEdges)
+                   && adjacentEdges.Any(adjacentEdge => EqualityComparer<TEdge>.Default.Equals(adjacentEdge, edge));
         }
 
         /// <inheritdoc />
@@ -207,13 +199,7 @@ private bool ContainsEdgeBetweenVertices([NotNull, ItemNotNull] IEnumerable<TEdg
 
             TVertex source = edge.Source;
             TVertex target = edge.Target;
-            foreach (TEdge e in edges)
-            {
-                if (EdgeEqualityComparer(e, source, target))
-                    return true;
-            }
-
-            return false;
+            return edges.Any(e => EdgeEqualityComparer(e, source, target));
         }
 
         #endregion
@@ -271,13 +257,10 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
 
             if (_adjacentEdges.TryGetValue(source, out IEdgeList<TVertex, TEdge> adjacentEdges))
             {
-                foreach (TEdge adjacentEdge in adjacentEdges)
+                foreach (TEdge adjacentEdge in adjacentEdges.Where(adjacentEdge => EdgeEqualityComparer(adjacentEdge, source, target)))
                 {
-                    if (EdgeEqualityComparer(adjacentEdge, source, target))
-                    {
-                        edge = adjacentEdge;
-                        return true;
-                    }
+                    edge = adjacentEdge;
+                    return true;
                 }
             }
 
@@ -359,16 +342,7 @@ public int AddVertexRange(IEnumerable<TVertex> vertices)
             if (verticesArray.Any(v => v == null))
                 throw new ArgumentNullException(nameof(vertices), "At least one vertex is null.");
 
-            int count = 0;
-            foreach (TVertex vertex in verticesArray)
-            {
-                if (AddVertex(vertex))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return verticesArray.Count(AddVertex);
         }
 
         [Pure]
@@ -550,16 +524,7 @@ public int AddVerticesAndEdgeRange(IEnumerable<TEdge> edges)
             if (edgesArray.Any(e => e == null))
                 throw new ArgumentNullException(nameof(edges), "At least one edge is null.");
 
-            int count = 0;
-            foreach (TEdge edge in edgesArray)
-            {
-                if (AddVerticesAndEdge(edge))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return edgesArray.Count(AddVerticesAndEdge);
         }
 
         /// <inheritdoc />
@@ -598,16 +563,7 @@ public int AddEdgeRange(IEnumerable<TEdge> edges)
             if (edgesArray.Any(e => e == null))
                 throw new ArgumentNullException(nameof(edges), "At least one edge is null.");
 
-            int count = 0;
-            foreach (TEdge edge in edgesArray)
-            {
-                if (AddEdge(edge))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return edgesArray.Count(AddEdge);
         }
 
         /// <inheritdoc />
@@ -728,16 +684,7 @@ public int RemoveEdges([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
             if (edgesArray.Any(e => e == null))
                 throw new ArgumentNullException(nameof(edges), "At least one edge is null.");
 
-            int count = 0;
-            foreach (TEdge edge in edgesArray)
-            {
-                if (RemoveEdge(edge))
-                {
-                    ++count;
-                }
-            }
-
-            return count;
+            return edgesArray.Count(RemoveEdge);
         }
 
         #endregion

From 65dabe7c06ec8eed04b000e9b99ad1c1a686b058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Mon, 11 Oct 2021 20:01:57 +0200
Subject: [PATCH 04/39] Remove dependency to System.Reflection.TypeExtensions
 from QuikGraph.

---
 src/QuikGraph/Compatibility/TypeUtils.cs                    | 4 ++--
 src/QuikGraph/Extensions/EdgeExtensions.cs                  | 6 +++++-
 src/QuikGraph/QuikGraph.csproj                              | 5 -----
 .../Structures/Graphs/UndirectedBidirectionalGraph.cs       | 4 ++++
 src/QuikGraph/Structures/Graphs/UndirectedGraph.cs          | 6 +++++-
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/QuikGraph/Compatibility/TypeUtils.cs b/src/QuikGraph/Compatibility/TypeUtils.cs
index 611693b3f..79d9540bf 100644
--- a/src/QuikGraph/Compatibility/TypeUtils.cs
+++ b/src/QuikGraph/Compatibility/TypeUtils.cs
@@ -1,4 +1,4 @@
-#if !SUPPORTS_TYPE_FULL_FEATURES
+#if !SUPPORTS_TYPE_FULL_FEATURES
 using System;
 using System.Collections.Generic;
 using System.Reflection;
@@ -32,7 +32,7 @@ internal static class TypeUtils
         };
 
         /// <summary>
-        /// Get the <see cref="TypeCode"/> of the given <see cref="Type"/>.
+        /// Gets the <see cref="TypeCode"/> of the given <see cref="Type"/>.
         /// </summary>
         /// <remarks>Kind of equivalent to the System function for compatibility, but not really...</remarks>
         /// <param name="type"><see cref="Type"/> to get the <see cref="TypeCode"/>.</param>
diff --git a/src/QuikGraph/Extensions/EdgeExtensions.cs b/src/QuikGraph/Extensions/EdgeExtensions.cs
index 5d3197593..786a82373 100644
--- a/src/QuikGraph/Extensions/EdgeExtensions.cs
+++ b/src/QuikGraph/Extensions/EdgeExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -295,7 +295,11 @@ public static bool TryGetPath<TVertex, TEdge>(
         [NotNull]
         public static EdgeEqualityComparer<TVertex> GetUndirectedVertexEquality<TVertex, TEdge>()
         {
+#if SUPPORTS_TYPE_FULL_FEATURES
             if (typeof(IUndirectedEdge<TVertex>).IsAssignableFrom(typeof(TEdge)))
+#else
+            if (typeof(IUndirectedEdge<TVertex>).GetTypeInfo().IsAssignableFrom(typeof(TEdge).GetTypeInfo()))
+#endif
                 return SortedVertexEquality;
             return UndirectedVertexEquality;
         }
diff --git a/src/QuikGraph/QuikGraph.csproj b/src/QuikGraph/QuikGraph.csproj
index ca88f992d..028bab8b9 100644
--- a/src/QuikGraph/QuikGraph.csproj
+++ b/src/QuikGraph/QuikGraph.csproj
@@ -76,9 +76,4 @@ Misc:
     <AssemblyTitle>QuikGraph .NET Standard 2.0</AssemblyTitle>
     <DefineConstants>$(DefineConstants);NETSTANDARD2_0;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_SORTEDSET;SUPPORTS_AGGRESSIVE_INLINING;SUPPORTS_CRYPTO_RANDOM;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
-
-  <!-- Dependencies -->
-  <ItemGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs b/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs
index b29185f86..b6f02e74d 100644
--- a/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs
@@ -37,7 +37,11 @@ public UndirectedBidirectionalGraph([NotNull] IBidirectionalGraph<TVertex, TEdge
         {
             OriginalGraph = originalGraph ?? throw new ArgumentNullException(nameof(originalGraph));
 
+#if SUPPORTS_TYPE_FULL_FEATURES
             _reorder = typeof(IUndirectedEdge<TVertex>).IsAssignableFrom(typeof(TEdge))
+#else
+            _reorder = typeof(IUndirectedEdge<TVertex>).GetTypeInfo().IsAssignableFrom(typeof(TEdge).GetTypeInfo())
+#endif
                 ? (ReorderVertices)((TVertex source, TVertex target, out TVertex orderedSource, out TVertex orderedTarget) =>
                 {
                     if (Comparer<TVertex>.Default.Compare(source, target) > 0)
diff --git a/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs b/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs
index a14485edb..8e54fcb50 100644
--- a/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -69,7 +69,11 @@ public UndirectedGraph(bool allowParallelEdges, [NotNull] EdgeEqualityComparer<T
             AllowParallelEdges = allowParallelEdges;
             EdgeEqualityComparer = edgeEqualityComparer ?? throw new ArgumentNullException(nameof(edgeEqualityComparer));
 
+#if SUPPORTS_TYPE_FULL_FEATURES
             _reorder = typeof(IUndirectedEdge<TVertex>).IsAssignableFrom(typeof(TEdge))
+#else
+            _reorder = typeof(IUndirectedEdge<TVertex>).GetTypeInfo().IsAssignableFrom(typeof(TEdge).GetTypeInfo())
+#endif
                 ? (ReorderVertices)((TVertex source, TVertex target, out TVertex orderedSource, out TVertex orderedTarget) =>
                 {
                     if (Comparer<TVertex>.Default.Compare(source, target) > 0)

From fa432af7d51a074ec7d6e5ebb3e59f05c01f874c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Tue, 12 Oct 2021 00:26:43 +0200
Subject: [PATCH 05/39] Update QuikGraph.Serialization dependencies.

Also add target .NET Standard 2.1 to further reduce dependencies.
---
 .../QuikGraph.Serialization.csproj                 | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj b/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj
index 356e3ffc8..58f6e2572 100644
--- a/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj
+++ b/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net35;net40;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
 
     <GeneratePackageOnBuild>$(Generate_QuikGraph_Serialization)</GeneratePackageOnBuild>
 
@@ -42,7 +42,7 @@ Updates:
     <EmbeddedResource Include="graphml-parseinfo.xsd" />
     <EmbeddedResource Include="xlink.xsd" />
   </ItemGroup>
-  
+
   <!-- Targets defines -->
   <PropertyGroup Condition="'$(TargetFramework)'=='net35'">
     <AssemblyTitle>QuikGraph.Serialization .NET 3.5</AssemblyTitle>
@@ -61,7 +61,11 @@ Updates:
     <AssemblyTitle>QuikGraph.Serialization .NET Standard 2.0</AssemblyTitle>
     <DefineConstants>$(DefineConstants);NETSTANDARD2_0;SUPPORTS_SERIALIZATION;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_XML_DTD_PROCESSING;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
-  
+  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
+    <AssemblyTitle>QuikGraph.Serialization .NET Standard 2.1</AssemblyTitle>
+    <DefineConstants>$(DefineConstants);NETSTANDARD2_1;SUPPORTS_SERIALIZATION;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_XML_DTD_PROCESSING;$(AdditionalConstants)</DefineConstants>
+  </PropertyGroup>
+
   <!-- Dependencies -->
   <!-- Externals -->
   <ItemGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
@@ -69,9 +73,9 @@ Updates:
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
   </ItemGroup>
-  
+
   <ItemGroup Condition="'$(TargetFramework)'=='netstandard1.3' OR '$(TargetFramework)'=='netstandard2.0'">
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
   </ItemGroup>
 
   <!-- Projects -->

From 4db1ceafc72a1b970cbb9e77c1052979629468af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Wed, 13 Oct 2021 22:00:54 +0200
Subject: [PATCH 06/39] Complete xml documentation related to exceptions and
 fix some doc generation issues.

---
 src/QuikGraph.Data/DataRelationEdge.cs        |   5 +-
 src/QuikGraph.Data/DataSetGraph.cs            |   3 +-
 src/QuikGraph.Data/DataSetGraphExtensions.cs  |   8 +-
 .../DataSetGraphPopulatorAlgorithm.cs         |  10 +-
 .../DataSetGraphvizAlgorithm.cs               |  10 +-
 src/QuikGraph.Graphviz/Dot/GraphvizEdge.cs    |   5 +
 .../Dot/GraphvizEdgeExtremity.cs              |   1 +
 .../Dot/GraphvizEdgeLabel.cs                  |   1 +
 src/QuikGraph.Graphviz/Dot/GraphvizFont.cs    |   2 +
 src/QuikGraph.Graphviz/Dot/GraphvizGraph.cs   |   1 +
 src/QuikGraph.Graphviz/Dot/GraphvizLayer.cs   |   4 +-
 .../Dot/GraphvizLayerCollection.cs            |  18 ++-
 src/QuikGraph.Graphviz/Dot/GraphvizRecord.cs  |   3 +-
 .../Dot/GraphvizRecordCell.cs                 |   3 +-
 .../Dot/GraphvizRecordCellCollection.cs       |  15 ++-
 src/QuikGraph.Graphviz/Dot/GraphvizSize.cs    |   4 +-
 .../Events/FormatClusterEventArgs.cs          |   2 +
 .../Extensions/GraphvizExtensions.cs          |   9 +-
 src/QuikGraph.Graphviz/FileDotEngine.cs       |   4 +-
 src/QuikGraph.Graphviz/GraphvizAlgorithm.cs   |  17 +++
 src/QuikGraph.Graphviz/Helpers/DotEscapers.cs |   5 +-
 src/QuikGraph.Graphviz/Helpers/HtmlString.cs  |   1 +
 .../Interfaces/IDotEngine.cs                  |   4 +-
 .../Renderers/CondensatedGraphRenderer.cs     |   1 +
 .../EdgeMergeCondensatedGraphRenderer.cs      |   1 +
 .../Renderers/GraphRendererBase.cs            |   1 +
 .../Events/MsaglEdgeEventArgs.cs              |   8 +-
 .../Events/MsaglVertexEventArgs.cs            |   8 +-
 .../MsaglDefaultGraphPopulator.cs             |   5 +-
 src/QuikGraph.MSAGL/MsaglGraphExtensions.cs   |  35 ++++-
 src/QuikGraph.MSAGL/MsaglGraphPopulator.cs    |  13 +-
 .../MsaglIdentifiableGraphPopulator.cs        |   4 +-
 .../MsaglToStringGraphPopulator.cs            |   3 +-
 src/QuikGraph.Petri/Interfaces/IExpression.cs |   3 +-
 .../Interfaces/IMutablePetriNet.cs            |  14 +-
 .../Interfaces/IPetriVertex.cs                |   4 +-
 src/QuikGraph.Petri/PetriNetSimulator.cs      |   3 +-
 src/QuikGraph.Petri/Structures/Arc.cs         |   7 +-
 src/QuikGraph.Petri/Structures/PetriNet.cs    |   3 +-
 src/QuikGraph.Petri/Structures/Place.cs       |   3 +-
 src/QuikGraph.Petri/Structures/Transition.cs  |   4 +-
 .../DirectedGraphMLAlgorithm.cs               |  11 +-
 .../DirectedGraphMLExtensions.cs              |  78 +++++++----
 .../GraphMLDeserializer.cs                    |  19 ++-
 .../GraphMLExtensions.cs                      |  61 ++++++++-
 .../GraphMLSerializer.cs                      |  14 +-
 .../GraphMLXmlResolver.cs                     |   3 +-
 .../Helpers/SerializationHelpers.cs           |   6 +-
 .../SerializationExtensions.cs                |  61 +++++++--
 .../XmlReaderExtensions.cs                    |  25 +++-
 .../XmlSerializableGraph.cs                   |   5 +-
 .../XmlWriterExtensions.cs                    |   2 +-
 src/QuikGraph/Algorithms/AlgorithmBase.cs     |  27 +++-
 .../Assignment/HungarianAlgorithm.cs          |  38 ++++--
 .../Assignment/HungarianIteration.cs          |   6 +
 .../Cliques/MaximumCliqueAlgorithmBase.cs     |   4 +-
 .../CondensationGraphAlgorithm.cs             |   3 +-
 .../Algorithms/Condensation/CondensedEdge.cs  |   4 +-
 .../EdgeMergeCondensationGraphAlgorithm.cs    |   7 +-
 .../Algorithms/Condensation/MergedEdge.cs     |   8 +-
 .../ConnectedComponentsAlgorithm.cs           |   7 +-
 ...IncrementalConnectedComponentsAlgorithm.cs |  15 ++-
 .../StronglyConnectedComponentAlgorithm.cs    |   5 +
 .../WeaklyConnectedComponentsAlgorithm.cs     |  19 ++-
 .../Algorithms/EulerianTrailAlgorithm.cs      |  25 +++-
 .../CloneableVertexGraphExplorerAlgorithm.cs  |  18 ++-
 .../Exploration/ITransitionFactory.cs         |   4 +-
 .../TransitionFactoryImplicitGraph.cs         |  22 ++-
 .../GraphPartition/KernighanLinAlgorithm.cs   |  11 ++
 .../Algorithms/GraphPartition/Partition.cs    |   6 +-
 .../Algorithms/IsEulerianGraphAlgorithm.cs    |   4 +-
 .../Algorithms/IsHamiltonianGraphAlgorithm.cs |   4 +-
 .../MaximumBipartiteMatchingAlgorithm.cs      |   7 +-
 .../AllVerticesGraphAugmentorAlgorithm.cs     |   8 +-
 ...iteToMaximumFlowGraphAugmentorAlgorithm.cs |  10 ++
 .../EdmondsKarpMaximumFlowAlgorithm.cs        |  18 ++-
 .../GraphAugmentorAlgorithmBase.cs            |   5 +-
 .../MaximumFlow/GraphBalancingAlgorithm.cs    |  30 +++--
 .../MaximumFlow/MaximumFlowAlgorithmBase.cs   |  13 +-
 .../MultiSourceSinkGraphAugmentorAlgorithm.cs |  12 +-
 .../ReverseEdgeAugmentorAlgorithm.cs          |  12 +-
 .../KruskalMinimumSpanningTreeAlgorithm.cs    |  10 +-
 .../PrimMinimumSpanningTreeAlgorithm.cs       |   6 +-
 .../EdgePredecessorRecorderObserver.cs        |   6 +
 .../Observers/EdgeRecorderObserver.cs         |   3 +-
 ...ndirectedVertexDistanceRecorderObserver.cs |   6 +-
 ...rectedVertexPredecessorRecorderObserver.cs |   7 +-
 .../VertexDistanceRecorderObserver.cs         |   8 +-
 .../VertexPredecessorPathRecorderObserver.cs  |   8 +-
 .../VertexPredecessorRecorderObserver.cs      |   7 +-
 .../Observers/VertexRecorderObserver.cs       |   3 +-
 .../Observers/VertexTimeStamperObserver.cs    |   9 +-
 src/QuikGraph/Algorithms/PageRankAlgorithm.cs |   4 +
 .../Algorithms/RandomGraphFactory.cs          |  32 ++++-
 .../CyclePoppingRandomTreeAlgorithm.cs        |  16 ++-
 .../Algorithms/RandomWalks/IEdgeChain.cs      |   8 +-
 .../RandomWalks/RandomWalkAlgorithm.cs        |   9 +-
 .../VanishingWeightedMarkovEdgeChain.cs       |   4 +-
 .../RandomWalks/WeightedMarkedEdgeChain.cs    |   3 +-
 .../WeightedMarkovEdgeChainBase.cs            |   3 +-
 ...offmanPavleyRankedShortestPathAlgorithm.cs |  21 ++-
 .../RankedShortestPathAlgorithmBase.cs        |   5 +-
 .../Algorithms/RootedAlgorithmBase.cs         |  16 ++-
 .../Algorithms/RootedSearchAlgorithmBase.cs   |  16 ++-
 .../BestFirstFrontierSearchAlgorithm.cs       |  10 +-
 .../BidirectionalDepthFirstSearchAlgorithm.cs |  12 +-
 .../Search/BreadthFirstSearchAlgorithm.cs     |  19 ++-
 .../Search/DepthFirstSearchAlgorithm.cs       |  18 ++-
 .../Search/EdgeDepthFirstSearchAlgorithm.cs   |  12 +-
 .../ImplicitDepthFirstSearchAlgorithm.cs      |   7 +-
 .../ImplicitEdgeDepthFirstSearchAlgorithm.cs  |  11 +-
 .../UndirectedBreathFirstSearchAlgorithm.cs   |  13 +-
 .../UndirectedDepthFirstSearchAlgorithm.cs    |  15 ++-
 .../Algorithms/Services/AlgorithmServices.cs  |   4 +-
 .../Algorithms/Services/CancelManager.cs      |   4 +
 .../AStarShortestPathAlgorithm.cs             |  13 ++
 .../BellmanFordShortestPathAlgorithm.cs       |  13 +-
 .../ShortestPath/DagShortestPathAlgorithm.cs  |  12 ++
 .../DijkstraShortestPathAlgorithm.cs          |  10 ++
 .../FloydWarshallAllShortestPathAlgorithm.cs  |  23 +++-
 .../ShortestPath/ShortestPathAlgorithmBase.cs |   7 +
 ...UndirectedDijkstraShortestPathAlgorithm.cs |  10 ++
 .../UndirectedShortestPathAlgorithmBase.cs    |  14 +-
 .../ShortestPath/YenShortestPathsAlgorithm.cs |  28 ++--
 src/QuikGraph/Algorithms/TSP/TSP.cs           |   4 +-
 src/QuikGraph/Algorithms/TSP/TasksManager.cs  |   1 +
 ...rjanOfflineLeastCommonAncestorAlgorithm.cs |  11 +-
 ...stBidirectionalTopologicalSortAlgorithm.cs |   6 +-
 .../SourceFirstTopologicalSortAlgorithm.cs    |   3 +-
 .../TopologicalSortAlgorithm.cs               |   3 +-
 ...UndirectedFirstTopologicalSortAlgorithm.cs |   5 +-
 .../UndirectedTopologicalSortAlgorithm.cs     |   3 +-
 .../Algorithms/TransitiveClosureAlgorithm.cs  |   6 +-
 .../TransitiveReductionAlgorithm.cs           |  10 +-
 .../VertexColoringAlgorithm.cs                |   1 +
 ...inimumVertexCoverApproximationAlgorithm.cs |   6 +-
 src/QuikGraph/Collections/BinaryHeap.cs       |  37 +++--
 src/QuikGraph/Collections/BinaryQueue.cs      |   5 +-
 .../Collections/EdgeEdgeDictionary.cs         |  10 +-
 src/QuikGraph/Collections/EdgeList.cs         |   4 +-
 src/QuikGraph/Collections/FibonacciHeap.cs    |  21 ++-
 .../Collections/FibonacciHeapCell.cs          |   6 +-
 src/QuikGraph/Collections/FibonacciQueue.cs   |  11 +-
 .../Collections/ForestDisjointSet.cs          |   3 +
 src/QuikGraph/Collections/Queue.cs            |   4 +-
 src/QuikGraph/Collections/SoftHeap.cs         |  17 ++-
 .../Collections/VertexEdgeDictionary.cs       |   8 +-
 src/QuikGraph/Collections/VertexList.cs       |   4 +-
 src/QuikGraph/Compatibility/SortedSet.cs      |  28 ++--
 src/QuikGraph/Events/EdgeEventArgs.cs         |   3 +-
 .../Events/UndirectedEdgeEventArgs.cs         |   3 +-
 src/QuikGraph/Events/VertexEventArgs.cs       |   3 +-
 .../Exceptions/NegativeCapacityException.cs   |   7 +-
 .../Exceptions/NegativeCycleGraphException.cs |   7 +-
 .../Exceptions/NegativeWeightException.cs     |   7 +-
 .../Exceptions/NoPathFoundException.cs        |   7 +-
 .../Exceptions/NonAcyclicGraphException.cs    |   7 +-
 .../NonStronglyConnectedGraphException.cs     |   7 +-
 .../ParallelEdgeNotAllowedException.cs        |   7 +-
 .../Exceptions/QuikGraphException.cs          |   7 +-
 .../Exceptions/VertexNotFoundException.cs     |   7 +-
 .../Extensions/AlgorithmExtensions.cs         | 126 +++++++++++++++++-
 src/QuikGraph/Extensions/EdgeExtensions.cs    |  25 +++-
 src/QuikGraph/Extensions/GraphExtensions.cs   |  70 +++++++++-
 src/QuikGraph/Helpers/CryptoRandom.cs         |   6 +-
 src/QuikGraph/Helpers/GraphEqualityHelpers.cs |   4 +-
 .../Algorithms/IDistancesCollection.cs        |   6 +-
 .../Algorithms/IVertexColorizerAlgorithm.cs   |   4 +-
 .../Algorithms/Observers/IObserver.cs         |   7 +-
 .../Interfaces/Collections/IDisjointSet.cs    |   9 +-
 .../Interfaces/Collections/IQueue.cs          |   4 +-
 .../Interfaces/Edges/ICloneableEdge.cs        |   4 +-
 src/QuikGraph/Interfaces/Edges/IEdgeSet.cs    |   3 +-
 .../Graphs/IBidirectionalIncidenceGraph.cs    |  14 +-
 .../Interfaces/Graphs/IClusteredGraph.cs      |   3 +-
 src/QuikGraph/Interfaces/Graphs/IHierarchy.cs |  23 +++-
 .../Interfaces/Graphs/IImplicitGraph.cs       |  12 +-
 .../Graphs/IImplicitUndirectedGraph.cs        |  15 ++-
 .../Interfaces/Graphs/IIncidenceGraph.cs      |   8 +-
 .../Graphs/IMutableBidirectionalGraph.cs      |   6 +-
 .../Graphs/IMutableEdgeListGraph.cs           |   8 +-
 .../Graphs/IMutableIncidenceGraph.cs          |   5 +-
 .../Graphs/IMutableUndirectedGraph.cs         |   5 +-
 .../Graphs/IMutableVertexAndEdgeSet.cs        |   6 +-
 .../Graphs/ITermBidirectionalGraph.cs         |  28 +++-
 .../Interfaces/Vertices/IImplicitVertexSet.cs |   3 +-
 .../Interfaces/Vertices/IMutableVertexSet.cs  |   8 +-
 .../Graphs/FilteredBidirectionalGraph.cs      |   5 +-
 .../Graphs/FilteredEdgeListGraph.cs           |   5 +-
 .../Predicates/Graphs/FilteredGraph.cs        |   6 +-
 .../Graphs/FilteredImplicitGraph.cs           |   5 +-
 .../Graphs/FilteredImplicitVertexSetGraph.cs  |   5 +-
 .../Graphs/FilteredIncidenceGraph.cs          |   3 +
 .../Graphs/FilteredUndirectedGraph.cs         |   5 +-
 .../Graphs/FilteredVertexAndEdgeListGraph.cs  |   5 +-
 .../Graphs/FilteredVertexListGraph.cs         |   5 +-
 .../Predicates/InDictionaryVertexPredicate.cs |   4 +-
 .../Predicates/IsolatedVertexPredicate.cs     |   4 +-
 .../Predicates/ResidualEdgePrediate.cs        |   5 +-
 .../ReversedResidualEdgePredicate.cs          |   5 +-
 .../Predicates/SinkVertexPredicate.cs         |   4 +-
 src/QuikGraph/Structures/Edges/Edge.cs        |   4 +-
 .../Structures/Edges/EquatableEdge.cs         |   4 +-
 .../Structures/Edges/EquatableTaggedEdge.cs   |   4 +-
 .../Structures/Edges/EquatableTermEdge.cs     |   8 +-
 .../Edges/EquatableUndirectedEdge.cs          |   4 +-
 src/QuikGraph/Structures/Edges/SEdge.cs       |   4 +-
 .../Structures/Edges/SEquatableEdge.cs        |   9 +-
 .../Structures/Edges/SEquatableTaggedEdge.cs  |   9 +-
 .../Structures/Edges/SReversedEdge.cs         |   3 +-
 src/QuikGraph/Structures/Edges/STaggedEdge.cs |   4 +-
 .../Structures/Edges/STaggedUndirectedEdge.cs |   7 +-
 .../Structures/Edges/SUndirectedEdge.cs       |   4 +-
 src/QuikGraph/Structures/Edges/TaggedEdge.cs  |   4 +-
 .../Structures/Edges/TaggedUndirectedEdge.cs  |   4 +-
 src/QuikGraph/Structures/Edges/TermEdge.cs    |   8 +-
 .../Structures/Edges/UndirectedEdge.cs        |   7 +-
 .../Structures/Graphs/AdjacencyGraph.cs       |   7 +-
 .../Structures/Graphs/ArrayAdjacencyGraph.cs  |  19 +--
 .../Graphs/ArrayBidirectionalGraph.cs         |  21 +--
 .../Structures/Graphs/ArrayUndirectedGraph.cs |  30 ++---
 .../Graphs/BidirectionalAdapterGraph.cs       |   1 +
 .../Structures/Graphs/BidirectionalGraph.cs   |   5 +
 .../Graphs/BidirectionalMatrixGraph.cs        |   6 +-
 .../Graphs/ClusteredAdjacencyGraph.cs         |  21 +++
 .../Graphs/CompressedSparseRowGraph.cs        |  21 +--
 .../DelegateBidirectionalIncidenceGraph.cs    |   2 +
 .../Graphs/DelegateImplicitGraph.cs           |   3 +-
 .../Graphs/DelegateImplicitUndirectedGraph.cs |   3 +
 .../Graphs/DelegateIncidenceGraph.cs          |   1 +
 .../Graphs/DelegateUndirectedGraph.cs         |   4 +-
 .../Graphs/DelegateVertexAndEdgeListGraph.cs  |   2 +
 .../Structures/Graphs/EdgeListGraph.cs        |   4 +
 .../Graphs/ReversedBidirectionalGraph.cs      |   3 +-
 .../Graphs/UndirectedBidirectionalGraph.cs    |   8 +-
 .../Structures/Graphs/UndirectedGraph.cs      |   8 +-
 .../DirectedGraphMLExtensionsTests.cs         |   6 +-
 .../GraphMLSerializerTests.cs                 |   2 +-
 .../Algorithms/RandomGraphFactoryTests.cs     |  46 ++++---
 .../YenShortestPathsAlgorithmTests.cs         |  39 +++---
 240 files changed, 1913 insertions(+), 560 deletions(-)

diff --git a/src/QuikGraph.Data/DataRelationEdge.cs b/src/QuikGraph.Data/DataRelationEdge.cs
index 1cb574453..2afc2a041 100644
--- a/src/QuikGraph.Data/DataRelationEdge.cs
+++ b/src/QuikGraph.Data/DataRelationEdge.cs
@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Data;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Data
 {
     /// <summary>
-    /// Represents a relation between <see cref="DataTable"/>s.
+    /// Represents a relation between <see cref="T:System.Data.DataTable"/>s.
     /// </summary>
     public sealed class DataRelationEdge : IEdge<DataTable>
     {
@@ -13,6 +13,7 @@ public sealed class DataRelationEdge : IEdge<DataTable>
         /// Initializes a new instance of the <see cref="DataRelationEdge"/> class.
         /// </summary>
         /// <param name="relation">Data relation.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="relation"/> is <see langword="null"/>.</exception>
         public DataRelationEdge([NotNull] DataRelation relation)
         {
             Relation = relation ?? throw new ArgumentNullException(nameof(relation));
diff --git a/src/QuikGraph.Data/DataSetGraph.cs b/src/QuikGraph.Data/DataSetGraph.cs
index 918ab1e77..f4e605fc2 100644
--- a/src/QuikGraph.Data/DataSetGraph.cs
+++ b/src/QuikGraph.Data/DataSetGraph.cs
@@ -10,7 +10,7 @@ namespace QuikGraph.Data
     public class DataSetGraph : BidirectionalGraph<DataTable, DataRelationEdge>
     {
         /// <summary>
-        /// Wrapped <see cref="System.Data.DataSet"/>.
+        /// Wrapped <see cref="T:System.Data.DataSet"/>.
         /// </summary>
         public DataSet DataSet { get; }
 
@@ -18,6 +18,7 @@ public class DataSetGraph : BidirectionalGraph<DataTable, DataRelationEdge>
         /// Initializes a new instance of the <see cref="DataSetGraph"/> class.
         /// </summary>
         /// <param name="dataSet">Set of data.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="dataSet"/> is <see langword="null"/>.</exception>
         internal DataSetGraph([NotNull] DataSet dataSet)
         {
             DataSet = dataSet ?? throw new ArgumentNullException(nameof(dataSet));
diff --git a/src/QuikGraph.Data/DataSetGraphExtensions.cs b/src/QuikGraph.Data/DataSetGraphExtensions.cs
index 8f0ec5486..28f38580f 100644
--- a/src/QuikGraph.Data/DataSetGraphExtensions.cs
+++ b/src/QuikGraph.Data/DataSetGraphExtensions.cs
@@ -4,15 +4,16 @@
 namespace QuikGraph.Data
 {
     /// <summary>
-    /// Extensions related to <see cref="DataSet"/> and <see cref="DataSetGraph"/>.
+    /// Extensions related to <see cref="T:System.Data.DataSet"/> and <see cref="DataSetGraph"/>.
     /// </summary>
     public static class DataSetGraphExtensions
     {
         /// <summary>
         /// Converts this <paramref name="dataSet"/> into a graph representation of it.
         /// </summary>
-        /// <param name="dataSet"><see cref="DataSet"/> to convert to graph.</param>
-        /// <returns>Graph representing the <see cref="DataSet"/>.</returns>
+        /// <param name="dataSet"><see cref="T:System.Data.DataSet"/> to convert to graph.</param>
+        /// <returns>Graph representing the <see cref="T:System.Data.DataSet"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="dataSet"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static DataSetGraph ToGraph([NotNull] this DataSet dataSet)
@@ -29,6 +30,7 @@ public static DataSetGraph ToGraph([NotNull] this DataSet dataSet)
         /// </summary>
         /// <param name="graph">Graph to convert.</param>
         /// <returns>Graph serialized in DOT format.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static string ToGraphviz([NotNull] this DataSetGraph graph)
diff --git a/src/QuikGraph.Data/DataSetGraphPopulatorAlgorithm.cs b/src/QuikGraph.Data/DataSetGraphPopulatorAlgorithm.cs
index 75ab9822f..005aad8a0 100644
--- a/src/QuikGraph.Data/DataSetGraphPopulatorAlgorithm.cs
+++ b/src/QuikGraph.Data/DataSetGraphPopulatorAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Data;
 using JetBrains.Annotations;
 using QuikGraph.Algorithms;
@@ -6,12 +6,12 @@
 namespace QuikGraph.Data
 {
     /// <summary>
-    /// Algorithm that take a <see cref="System.Data.DataSet"/> and convert it as a graph representation.
+    /// Algorithm that take a <see cref="T:System.Data.DataSet"/> and convert it as a graph representation.
     /// </summary>
     public sealed class DataSetGraphPopulatorAlgorithm : AlgorithmBase<IMutableVertexAndEdgeSet<DataTable, DataRelationEdge>>
     {
         /// <summary>
-        /// <see cref="System.Data.DataSet"/> to represent as a graph.
+        /// <see cref="T:System.Data.DataSet"/> to represent as a graph.
         /// </summary>
         [NotNull]
         public DataSet DataSet { get; }
@@ -20,7 +20,9 @@ public sealed class DataSetGraphPopulatorAlgorithm : AlgorithmBase<IMutableVerte
         /// Initializes a new instance of the <see cref="DataSetGraphPopulatorAlgorithm"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to fill from <paramref name="dataSet"/>.</param>
-        /// <param name="dataSet"><see cref="System.Data.DataSet"/> to use to fill <paramref name="visitedGraph"/>.</param>
+        /// <param name="dataSet"><see cref="T:System.Data.DataSet"/> to use to fill <paramref name="visitedGraph"/>.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="dataSet"/> is <see langword="null"/>.</exception>
         public DataSetGraphPopulatorAlgorithm(
             [NotNull] IMutableVertexAndEdgeSet<DataTable, DataRelationEdge> visitedGraph,
             [NotNull] DataSet dataSet)
diff --git a/src/QuikGraph.Data/DataSetGraphvizAlgorithm.cs b/src/QuikGraph.Data/DataSetGraphvizAlgorithm.cs
index 996e67760..41affebab 100644
--- a/src/QuikGraph.Data/DataSetGraphvizAlgorithm.cs
+++ b/src/QuikGraph.Data/DataSetGraphvizAlgorithm.cs
@@ -16,6 +16,7 @@ public class DataSetGraphvizAlgorithm : GraphvizAlgorithm<DataTable, DataRelatio
         /// Initializes a new instance of the <see cref="DataSetGraphvizAlgorithm"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to convert to DOT.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public DataSetGraphvizAlgorithm([NotNull] DataSetGraph visitedGraph)
             : base(visitedGraph)
         {
@@ -27,6 +28,7 @@ public DataSetGraphvizAlgorithm([NotNull] DataSetGraph visitedGraph)
         /// </summary>
         /// <param name="visitedGraph">Graph to convert to DOT.</param>
         /// <param name="imageType">Target output image type.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public DataSetGraphvizAlgorithm(
             [NotNull] DataSetGraph visitedGraph,
             GraphvizImageType imageType)
@@ -45,10 +47,10 @@ private void InitializeFormat()
         }
 
         /// <summary>
-        /// Formats a <see cref="DataTable"/> (a table).
+        /// Formats a <see cref="T:System.Data.DataTable"/> (a table).
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="args"></param>
+        /// <param name="sender">The <see cref="GraphvizAlgorithm{TVertex,TEdge}"/> performing the formatting.</param>
+        /// <param name="args">Vertex event arguments.</param>
         protected virtual void FormatTable([NotNull] object sender, [NotNull] FormatVertexEventArgs<DataTable> args)
         {
             Debug.Assert(sender != null);
@@ -95,6 +97,8 @@ protected virtual void FormatTable([NotNull] object sender, [NotNull] FormatVert
         /// <summary>
         /// Formats a <see cref="DataRelationEdge"/> (a relation between tables).
         /// </summary>
+        /// <param name="sender">The <see cref="GraphvizAlgorithm{TVertex,TEdge}"/> performing the formatting.</param>
+        /// <param name="args">Edge event arguments.</param>
         protected virtual void FormatRelation([NotNull] object sender, [NotNull] FormatEdgeEventArgs<DataTable, DataRelationEdge> args)
         {
             Debug.Assert(sender != null);
diff --git a/src/QuikGraph.Graphviz/Dot/GraphvizEdge.cs b/src/QuikGraph.Graphviz/Dot/GraphvizEdge.cs
index 2f0e1560b..3e1e8ceed 100644
--- a/src/QuikGraph.Graphviz/Dot/GraphvizEdge.cs
+++ b/src/QuikGraph.Graphviz/Dot/GraphvizEdge.cs
@@ -28,6 +28,7 @@ public class GraphvizEdge
         /// <summary>
         /// Label.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
         [NotNull]
         public GraphvizEdgeLabel Label
         {
@@ -78,6 +79,8 @@ public GraphvizEdgeLabel Label
         /// <summary>
         /// Edge head.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException">Set extremity is not corresponding to a head one.</exception>
         [NotNull]
         public GraphvizEdgeExtremity Head
         {
@@ -110,6 +113,8 @@ public GraphvizEdgeExtremity Head
         /// <summary>
         /// Tail.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException">Set extremity is not corresponding to a tail one.</exception>
         [NotNull]
         public GraphvizEdgeExtremity Tail
         {
diff --git a/src/QuikGraph.Graphviz/Dot/GraphvizEdgeExtremity.cs b/src/QuikGraph.Graphviz/Dot/GraphvizEdgeExtremity.cs
index e41c05cc1..6a6358646 100644
--- a/src/QuikGraph.Graphviz/Dot/GraphvizEdgeExtremity.cs
+++ b/src/QuikGraph.Graphviz/Dot/GraphvizEdgeExtremity.cs
@@ -81,6 +81,7 @@ public GraphvizEdgeExtremity(bool isHead)
         /// Adds this edge extremity parameters to the given <paramref name="parameters"/> map.
         /// </summary>
         /// <param name="parameters">Parameter map to fill.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="parameters"/> is <see langword="null"/>.</exception>
         public void AddParameters([NotNull] IDictionary parameters)
         {
             if (parameters is null)
diff --git a/src/QuikGraph.Graphviz/Dot/GraphvizEdgeLabel.cs b/src/QuikGraph.Graphviz/Dot/GraphvizEdgeLabel.cs
index ce566be09..2c95e1b15 100644
--- a/src/QuikGraph.Graphviz/Dot/GraphvizEdgeLabel.cs
+++ b/src/QuikGraph.Graphviz/Dot/GraphvizEdgeLabel.cs
@@ -62,6 +62,7 @@ public class GraphvizEdgeLabel
         /// Adds this edge label parameters to the given <paramref name="parameters"/> map.
         /// </summary>
         /// <param name="parameters">Parameter map to fill.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="parameters"/> is <see langword="null"/>.</exception>
         public void AddParameters([NotNull] IDictionary parameters)
         {
             if (parameters is null)
diff --git a/src/QuikGraph.Graphviz/Dot/GraphvizFont.cs b/src/QuikGraph.Graphviz/Dot/GraphvizFont.cs
index 787f3dd71..c58499792 100644
--- a/src/QuikGraph.Graphviz/Dot/GraphvizFont.cs
+++ b/src/QuikGraph.Graphviz/Dot/GraphvizFont.cs
@@ -28,6 +28,8 @@ public sealed class GraphvizFont
         /// </summary>
         /// <param name="name">Font name.</param>
         /// <param name="sizeInPoints">Font size.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="name"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="sizeInPoints"/> is negative or equal to 0.</exception>
         public GraphvizFont([NotNull] string name, float sizeInPoints)
         {
             if (string.IsNullOrEmpty(name))
diff --git a/src/QuikGraph.Graphviz/Dot/GraphvizGraph.cs b/src/QuikGraph.Graphviz/Dot/GraphvizGraph.cs
index 1e10c2811..800826dac 100644
--- a/src/QuikGraph.Graphviz/Dot/GraphvizGraph.cs
+++ b/src/QuikGraph.Graphviz/Dot/GraphvizGraph.cs
@@ -24,6 +24,7 @@ public class GraphvizGraph
         /// <summary>
         /// Graph name.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
         public string Name
         {
             get => _name;
diff --git a/src/QuikGraph.Graphviz/Dot/GraphvizLayer.cs b/src/QuikGraph.Graphviz/Dot/GraphvizLayer.cs
index e71fbd72b..46bdc354d 100644
--- a/src/QuikGraph.Graphviz/Dot/GraphvizLayer.cs
+++ b/src/QuikGraph.Graphviz/Dot/GraphvizLayer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Graphviz.Dot
@@ -15,6 +15,7 @@ public class GraphvizLayer
         /// Initializes a new instance of the <see cref="GraphvizLayer"/> class.
         /// </summary>
         /// <param name="name">Layer name.</param>
+        /// <exception cref="T:System.ArgumentException"><paramref name="name"/> is <see langword="null"/> or empty.</exception>
         public GraphvizLayer([NotNull] string name)
         {
             SetName(name);
@@ -32,6 +33,7 @@ private void SetName([NotNull] string name)
         /// <summary>
         /// Layer name.
         /// </summary>
+        /// <exception cref="T:System.ArgumentException">Set value is <see langword="null"/> or empty.</exception>
         public string Name
         {
             get => _name;
diff --git a/src/QuikGraph.Graphviz/Dot/GraphvizLayerCollection.cs b/src/QuikGraph.Graphviz/Dot/GraphvizLayerCollection.cs
index 81038fd39..f19bfe13e 100644
--- a/src/QuikGraph.Graphviz/Dot/GraphvizLayerCollection.cs
+++ b/src/QuikGraph.Graphviz/Dot/GraphvizLayerCollection.cs
@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Text;
 using JetBrains.Annotations;
@@ -23,18 +24,20 @@ public GraphvizLayerCollection()
         /// <summary>
         /// Initializes a new instance of the <see cref="GraphvizLayerCollection"/> class.
         /// </summary>
-        /// <param name="list">The list that is wrapped by the new collection.</param>
-        public GraphvizLayerCollection([NotNull, ItemNotNull] GraphvizLayer[] list)
-            : base(list)
+        /// <param name="collection">The collection that is wrapped by the new collection.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="collection"/> is <see langword="null"/>.</exception>
+        public GraphvizLayerCollection([NotNull, ItemNotNull] IList<GraphvizLayer> collection)
+            : base(collection)
         {
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GraphvizLayerCollection"/> class.
         /// </summary>
-        /// <param name="list">The list that is wrapped by the new collection.</param>
-        public GraphvizLayerCollection([NotNull, ItemNotNull] GraphvizLayerCollection list)
-            : base(list)
+        /// <param name="collection">The collection that is wrapped by the new collection.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="collection"/> is <see langword="null"/>.</exception>
+        public GraphvizLayerCollection([NotNull, ItemNotNull] GraphvizLayerCollection collection)
+            : base(collection)
         {
         }
 
@@ -45,6 +48,7 @@ public GraphvizLayerCollection([NotNull, ItemNotNull] GraphvizLayerCollection li
         /// Allowed collection item separators.
         /// <see href="https://www.graphviz.org/doc/info/attrs.html#d:layersep">See more</see>
         /// </summary>
+        /// <exception cref="T:System.ArgumentException">Set value is <see langword="null"/> or empty.</exception>
         [NotNull]
         public string Separators
         {
diff --git a/src/QuikGraph.Graphviz/Dot/GraphvizRecord.cs b/src/QuikGraph.Graphviz/Dot/GraphvizRecord.cs
index 811655f02..63aa28246 100644
--- a/src/QuikGraph.Graphviz/Dot/GraphvizRecord.cs
+++ b/src/QuikGraph.Graphviz/Dot/GraphvizRecord.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using JetBrains.Annotations;
 
@@ -18,6 +18,7 @@ public class GraphvizRecord
         /// <summary>
         /// Record cells.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
         [NotNull, ItemNotNull]
         public GraphvizRecordCellCollection Cells
         {
diff --git a/src/QuikGraph.Graphviz/Dot/GraphvizRecordCell.cs b/src/QuikGraph.Graphviz/Dot/GraphvizRecordCell.cs
index 1d7e32f7f..f2bd95845 100644
--- a/src/QuikGraph.Graphviz/Dot/GraphvizRecordCell.cs
+++ b/src/QuikGraph.Graphviz/Dot/GraphvizRecordCell.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using JetBrains.Annotations;
 using static QuikGraph.Graphviz.DotEscapers;
@@ -19,6 +19,7 @@ public class GraphvizRecordCell
         /// <summary>
         /// Record cells.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
         [NotNull, ItemNotNull]
         public GraphvizRecordCellCollection Cells
         {
diff --git a/src/QuikGraph.Graphviz/Dot/GraphvizRecordCellCollection.cs b/src/QuikGraph.Graphviz/Dot/GraphvizRecordCellCollection.cs
index b1c2275c3..690acb650 100644
--- a/src/QuikGraph.Graphviz/Dot/GraphvizRecordCellCollection.cs
+++ b/src/QuikGraph.Graphviz/Dot/GraphvizRecordCellCollection.cs
@@ -1,6 +1,7 @@
-#if SUPPORTS_SERIALIZATION
+#if SUPPORTS_SERIALIZATION
 using System;
 #endif
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using JetBrains.Annotations;
 
@@ -24,18 +25,18 @@ public GraphvizRecordCellCollection()
         /// <summary>
         /// Initializes a new instance of the <see cref="GraphvizRecordCellCollection"/> class.
         /// </summary>
-        /// <param name="list">The list that is wrapped by the new collection.</param>
-        public GraphvizRecordCellCollection([NotNull, ItemNotNull] GraphvizRecordCell[] list)
-            : base(list)
+        /// <param name="collection">The collection that is wrapped by the new collection.</param>
+        public GraphvizRecordCellCollection([NotNull, ItemNotNull] IList<GraphvizRecordCell> collection)
+            : base(collection)
         {
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GraphvizRecordCellCollection"/> class.
         /// </summary>
-        /// <param name="list">The list that is wrapped by the new collection.</param>
-        public GraphvizRecordCellCollection([NotNull, ItemNotNull] GraphvizRecordCellCollection list)
-            : base(list)
+        /// <param name="collection">The collection that is wrapped by the new collection.</param>
+        public GraphvizRecordCellCollection([NotNull, ItemNotNull] GraphvizRecordCellCollection collection)
+            : base(collection)
         {
         }
     }
diff --git a/src/QuikGraph.Graphviz/Dot/GraphvizSize.cs b/src/QuikGraph.Graphviz/Dot/GraphvizSize.cs
index 21450476c..06fc974d2 100644
--- a/src/QuikGraph.Graphviz/Dot/GraphvizSize.cs
+++ b/src/QuikGraph.Graphviz/Dot/GraphvizSize.cs
@@ -43,6 +43,7 @@ public struct GraphvizSizeF
         /// </summary>
         /// <param name="width">Width.</param>
         /// <param name="height">Height.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="width"/> and/or <paramref name="height"/> is negative.</exception>
         public GraphvizSizeF(float width, float height)
         {
             if (width < 0.0 || height < 0.0)
@@ -114,9 +115,10 @@ public struct GraphvizSize
         /// </summary>
         /// <param name="width">Width.</param>
         /// <param name="height">Height.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="width"/> and/or <paramref name="height"/> is negative.</exception>
         public GraphvizSize(int width, int height)
         {
-            if (width < 0.0 || height < 0.0)
+            if (width < 0 || height < 0)
                 throw new ArgumentException("Width and height must be positive or 0.");
 
             Width = width;
diff --git a/src/QuikGraph.Graphviz/Events/FormatClusterEventArgs.cs b/src/QuikGraph.Graphviz/Events/FormatClusterEventArgs.cs
index e02975fe9..962a57c08 100644
--- a/src/QuikGraph.Graphviz/Events/FormatClusterEventArgs.cs
+++ b/src/QuikGraph.Graphviz/Events/FormatClusterEventArgs.cs
@@ -18,6 +18,8 @@ public class FormatClusterEventArgs<TVertex, TEdge> : EventArgs
         /// </summary>
         /// <param name="clusteredGraph">Graph to format.</param>
         /// <param name="graphFormat">Graph format.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="clusteredGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graphFormat"/> is <see langword="null"/>.</exception>
         public FormatClusterEventArgs([NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> clusteredGraph, [NotNull] GraphvizGraph graphFormat)
         {
             Cluster = clusteredGraph ?? throw new ArgumentNullException(nameof(clusteredGraph));
diff --git a/src/QuikGraph.Graphviz/Extensions/GraphvizExtensions.cs b/src/QuikGraph.Graphviz/Extensions/GraphvizExtensions.cs
index ec7f943d2..a4c83a27c 100644
--- a/src/QuikGraph.Graphviz/Extensions/GraphvizExtensions.cs
+++ b/src/QuikGraph.Graphviz/Extensions/GraphvizExtensions.cs
@@ -8,7 +8,7 @@
 namespace QuikGraph.Graphviz
 {
     /// <summary>
-    /// Helper extensions to render graphs to graphviz
+    /// Helper extensions to render graphs to graphviz.
     /// </summary>
     public static class GraphvizExtensions
     {
@@ -19,6 +19,7 @@ public static class GraphvizExtensions
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to convert.</param>
         /// <returns>Graph serialized in DOT format.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static string ToGraphviz<TVertex, TEdge>([NotNull] this IEdgeListGraph<TVertex, TEdge> graph)
@@ -36,6 +37,8 @@ public static string ToGraphviz<TVertex, TEdge>([NotNull] this IEdgeListGraph<TV
         /// <param name="graph">Graph to convert.</param>
         /// <param name="initAlgorithm">Delegate that initializes the DOT generation algorithm.</param>
         /// <returns>Graph serialized in DOT format.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="initAlgorithm"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static string ToGraphviz<TVertex, TEdge>(
@@ -67,6 +70,7 @@ public static string ToGraphviz<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to convert.</param>
         /// <returns>The svg graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static string ToSvg<TVertex, TEdge>([NotNull] this IEdgeListGraph<TVertex, TEdge> graph)
@@ -85,6 +89,8 @@ public static string ToSvg<TVertex, TEdge>([NotNull] this IEdgeListGraph<TVertex
         /// <param name="graph">Graph to convert.</param>
         /// <param name="initAlgorithm">Delegate that initializes the DOT generation algorithm.</param>
         /// <returns>The svg graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="initAlgorithm"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static string ToSvg<TVertex, TEdge>(
@@ -101,6 +107,7 @@ public static string ToSvg<TVertex, TEdge>(
         /// </summary>
         /// <param name="dot">The dot graph</param>
         /// <returns>The svg graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="dot"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static string ToSvg([NotNull] string dot)
diff --git a/src/QuikGraph.Graphviz/FileDotEngine.cs b/src/QuikGraph.Graphviz/FileDotEngine.cs
index 9adf627db..dfef0927b 100644
--- a/src/QuikGraph.Graphviz/FileDotEngine.cs
+++ b/src/QuikGraph.Graphviz/FileDotEngine.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using QuikGraph.Graphviz.Dot;
 
@@ -19,7 +19,9 @@ public string Run(GraphvizImageType imageType, string dot, string outputFilePath
 
             string output = outputFilePath;
             if (!output.EndsWith(".dot", StringComparison.OrdinalIgnoreCase))
+            {
                 output += ".dot";
+            }
 
             File.WriteAllText(output, dot);
             return output;
diff --git a/src/QuikGraph.Graphviz/GraphvizAlgorithm.cs b/src/QuikGraph.Graphviz/GraphvizAlgorithm.cs
index 0ba0142af..a6aee85dc 100644
--- a/src/QuikGraph.Graphviz/GraphvizAlgorithm.cs
+++ b/src/QuikGraph.Graphviz/GraphvizAlgorithm.cs
@@ -22,6 +22,7 @@ public class GraphvizAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="GraphvizAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="graph">Graph to convert to DOT.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         public GraphvizAlgorithm([NotNull] IEdgeListGraph<TVertex, TEdge> graph)
             : this(graph, GraphvizImageType.Png)
         {
@@ -32,6 +33,7 @@ public GraphvizAlgorithm([NotNull] IEdgeListGraph<TVertex, TEdge> graph)
         /// </summary>
         /// <param name="graph">Graph to convert to DOT.</param>
         /// <param name="imageType">Target output image type.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         public GraphvizAlgorithm(
             [NotNull] IEdgeListGraph<TVertex, TEdge> graph,
             GraphvizImageType imageType)
@@ -68,6 +70,7 @@ public GraphvizAlgorithm(
         /// <summary>
         /// Graph to convert.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
         [NotNull]
         public IEdgeListGraph<TVertex, TEdge> VisitedGraph
         {
@@ -105,7 +108,9 @@ private void OnFormatCluster([NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> c
             formatCluster(this, args);
             string dot = args.GraphFormat.ToDot();
             if (dot.Length != 0)
+            {
                 Output.WriteLine(dot);
+            }
         }
 
         /// <summary>
@@ -126,7 +131,9 @@ private void OnFormatVertex([NotNull] TVertex vertex)
 
                 string dot = vertexFormat.InternalToDot(CommonVertexFormat);
                 if (dot.Length != 0)
+                {
                     Output.Write($" [{dot}]");
+                }
             }
             Output.WriteLine(";");
         }
@@ -148,7 +155,9 @@ private void OnFormatEdge([NotNull] TEdge edge)
 
                 string dot = edgeFormat.ToDot();
                 if (dot.Length != 0)
+                {
                     Output.Write($" [{dot}]");
+                }
             }
             Output.WriteLine(";");
         }
@@ -177,13 +186,19 @@ public string Generate()
 
             string graphFormat = GraphFormat.ToDot();
             if (graphFormat.Length > 0)
+            {
                 Output.WriteLine(graphFormat);
+            }
             string vertexFormat = CommonVertexFormat.ToDot();
             if (vertexFormat.Length > 0)
+            {
                 Output.WriteLine($"node [{vertexFormat}];");
+            }
             string edgeFormat = CommonEdgeFormat.ToDot();
             if (edgeFormat.Length > 0)
+            {
                 Output.WriteLine($"edge [{edgeFormat}];");
+            }
 
             // Initialize vertices map
             var verticesColors = new Dictionary<TVertex, GraphColor>();
@@ -215,6 +230,8 @@ public string Generate()
         /// and puts result in <paramref name="outputFilePath"/>.
         /// </summary>
         /// <returns>File path containing DOT serialization of <see cref="VisitedGraph"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="dot"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="outputFilePath"/> is <see langword="null"/> or empty.</exception>
         [NotNull]
         public string Generate([NotNull] IDotEngine dot, [NotNull] string outputFilePath)
         {
diff --git a/src/QuikGraph.Graphviz/Helpers/DotEscapers.cs b/src/QuikGraph.Graphviz/Helpers/DotEscapers.cs
index db7c138b2..8995cada9 100644
--- a/src/QuikGraph.Graphviz/Helpers/DotEscapers.cs
+++ b/src/QuikGraph.Graphviz/Helpers/DotEscapers.cs
@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Graphviz
@@ -38,6 +38,7 @@ public static class DotEscapers
         /// </summary>
         /// <param name="value">String value to escape.</param>
         /// <returns>Escaped string.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="value"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static string EscapePort([NotNull] string value)
@@ -52,6 +53,7 @@ public static string EscapePort([NotNull] string value)
         /// </summary>
         /// <param name="value">String value to escape.</param>
         /// <returns>Escaped string.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="value"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static string EscapeRecord([NotNull] string value)
@@ -68,6 +70,7 @@ public static string EscapeRecord([NotNull] string value)
         /// </summary>
         /// <param name="value">String value to escape.</param>
         /// <returns>Escaped string.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="value"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static string Escape([NotNull] string value)
diff --git a/src/QuikGraph.Graphviz/Helpers/HtmlString.cs b/src/QuikGraph.Graphviz/Helpers/HtmlString.cs
index 50c12c0be..bc129c065 100644
--- a/src/QuikGraph.Graphviz/Helpers/HtmlString.cs
+++ b/src/QuikGraph.Graphviz/Helpers/HtmlString.cs
@@ -11,6 +11,7 @@ internal struct HtmlString
         /// Initializes a new instance of the <see cref="HtmlString"/> struct.
         /// </summary>
         /// <param name="html">HTML string.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="html"/> is <see langword="null"/>.</exception>
         public HtmlString([NotNull] string html)
         {
             String = html;
diff --git a/src/QuikGraph.Graphviz/Interfaces/IDotEngine.cs b/src/QuikGraph.Graphviz/Interfaces/IDotEngine.cs
index b7e2025c1..7a6355037 100644
--- a/src/QuikGraph.Graphviz/Interfaces/IDotEngine.cs
+++ b/src/QuikGraph.Graphviz/Interfaces/IDotEngine.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using QuikGraph.Graphviz.Dot;
 
 namespace QuikGraph.Graphviz
@@ -16,6 +16,8 @@ public interface IDotEngine
         /// <param name="dot">Graph serialized using Dot language.</param>
         /// <param name="outputFilePath">Target file path.</param>
         /// <returns>Path to the saved result.</returns>
+        /// <exception cref="T:System.ArgumentException"><paramref name="dot"/> is <see langword="null"/> or empty.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="outputFilePath"/> is <see langword="null"/> or empty.</exception>
         [NotNull]
         string Run(
             GraphvizImageType imageType,
diff --git a/src/QuikGraph.Graphviz/Renderers/CondensatedGraphRenderer.cs b/src/QuikGraph.Graphviz/Renderers/CondensatedGraphRenderer.cs
index 0370f21be..133bea225 100644
--- a/src/QuikGraph.Graphviz/Renderers/CondensatedGraphRenderer.cs
+++ b/src/QuikGraph.Graphviz/Renderers/CondensatedGraphRenderer.cs
@@ -18,6 +18,7 @@ public class CondensatedGraphRenderer<TVertex, TEdge, TGraph> : GraphRendererBas
         /// Initializes a new instance of the <see cref="CondensatedGraphRenderer{TVertex,TEdge,TGraph}"/> class.
         /// </summary>
         /// <param name="graph">Graph to convert to DOT.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         public CondensatedGraphRenderer(
             [NotNull] IEdgeListGraph<TGraph, CondensedEdge<TVertex, TEdge, TGraph>> graph)
             : base(graph)
diff --git a/src/QuikGraph.Graphviz/Renderers/EdgeMergeCondensatedGraphRenderer.cs b/src/QuikGraph.Graphviz/Renderers/EdgeMergeCondensatedGraphRenderer.cs
index 815a1d3f2..790da218e 100644
--- a/src/QuikGraph.Graphviz/Renderers/EdgeMergeCondensatedGraphRenderer.cs
+++ b/src/QuikGraph.Graphviz/Renderers/EdgeMergeCondensatedGraphRenderer.cs
@@ -16,6 +16,7 @@ public class EdgeMergeCondensatedGraphRenderer<TVertex, TEdge> : GraphRendererBa
         /// Initializes a new instance of the <see cref="EdgeMergeCondensatedGraphRenderer{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="graph">Graph to convert to DOT.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         public EdgeMergeCondensatedGraphRenderer(
             [NotNull] IEdgeListGraph<TVertex, MergedEdge<TVertex, TEdge>> graph)
             : base(graph)
diff --git a/src/QuikGraph.Graphviz/Renderers/GraphRendererBase.cs b/src/QuikGraph.Graphviz/Renderers/GraphRendererBase.cs
index 428877c88..ad4ffc324 100644
--- a/src/QuikGraph.Graphviz/Renderers/GraphRendererBase.cs
+++ b/src/QuikGraph.Graphviz/Renderers/GraphRendererBase.cs
@@ -17,6 +17,7 @@ public abstract class GraphRendererBase<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="GraphvizAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="graph">Graph to convert to DOT.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         protected GraphRendererBase([NotNull] IEdgeListGraph<TVertex, TEdge> graph)
         {
             Graphviz = new GraphvizAlgorithm<TVertex, TEdge>(graph);
diff --git a/src/QuikGraph.MSAGL/Events/MsaglEdgeEventArgs.cs b/src/QuikGraph.MSAGL/Events/MsaglEdgeEventArgs.cs
index 923554072..d0f658545 100644
--- a/src/QuikGraph.MSAGL/Events/MsaglEdgeEventArgs.cs
+++ b/src/QuikGraph.MSAGL/Events/MsaglEdgeEventArgs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 using Microsoft.Msagl.Drawing;
 
@@ -17,7 +17,9 @@ public class MsaglEdgeEventArgs<TVertex, TEdge> : EdgeEventArgs<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="MsaglEdgeEventArgs{TVertex, TEdge}"/> class.
         /// </summary>
         /// <param name="edge">Concerned edge.</param>
-        /// <param name="msaglEdge">Concerned <see cref="Edge"/>.</param>
+        /// <param name="msaglEdge">Concerned <see cref="T:Microsoft.Msagl.Drawing.Edge"/>.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="msaglEdge"/> is <see langword="null"/>.</exception>
         public MsaglEdgeEventArgs([NotNull] TEdge edge, [NotNull] Edge msaglEdge)
             : base(edge)
         {
@@ -25,7 +27,7 @@ public MsaglEdgeEventArgs([NotNull] TEdge edge, [NotNull] Edge msaglEdge)
         }
 
         /// <summary>
-        /// Edge concerned by the event.
+        /// <see cref="T:Microsoft.Msagl.Drawing.Edge"/> concerned by the event.
         /// </summary>
         [NotNull]
         public Edge MsaglEdge { get; }
diff --git a/src/QuikGraph.MSAGL/Events/MsaglVertexEventArgs.cs b/src/QuikGraph.MSAGL/Events/MsaglVertexEventArgs.cs
index a580ae6a3..809fc7da8 100644
--- a/src/QuikGraph.MSAGL/Events/MsaglVertexEventArgs.cs
+++ b/src/QuikGraph.MSAGL/Events/MsaglVertexEventArgs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 using Microsoft.Msagl.Drawing;
 
@@ -15,7 +15,9 @@ public class MsaglVertexEventArgs<TVertex> : VertexEventArgs<TVertex>
         /// Initializes a new instance of the <see cref="MsaglVertexEventArgs{TVertex}"/> class.
         /// </summary>
         /// <param name="vertex">Concerned vertex.</param>
-        /// <param name="node">Concerned <see cref="Microsoft.Msagl.Drawing.Node"/>.</param>
+        /// <param name="node">Concerned <see cref="T:Microsoft.Msagl.Drawing.Node"/>.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="node"/> is <see langword="null"/>.</exception>
         public MsaglVertexEventArgs([NotNull] TVertex vertex, [NotNull] Node node)
             : base(vertex)
         {
@@ -23,7 +25,7 @@ public MsaglVertexEventArgs([NotNull] TVertex vertex, [NotNull] Node node)
         }
 
         /// <summary>
-        /// <see cref="Microsoft.Msagl.Drawing.Node"/> concerned by the event.
+        /// <see cref="T:Microsoft.Msagl.Drawing.Node"/> concerned by the event.
         /// </summary>
         [NotNull]
         public Node Node { get; }
diff --git a/src/QuikGraph.MSAGL/MsaglDefaultGraphPopulator.cs b/src/QuikGraph.MSAGL/MsaglDefaultGraphPopulator.cs
index dd08b2385..e9d60c2d8 100644
--- a/src/QuikGraph.MSAGL/MsaglDefaultGraphPopulator.cs
+++ b/src/QuikGraph.MSAGL/MsaglDefaultGraphPopulator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -20,6 +20,7 @@ public class MsaglDefaultGraphPopulator<TVertex, TEdge> : MsaglGraphPopulator<TV
         /// Initializes a new instance of the <see cref="MsaglDefaultGraphPopulator{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to convert to MSAGL graph.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public MsaglDefaultGraphPopulator([NotNull] IEdgeListGraph<TVertex, TEdge> visitedGraph)
             : base(visitedGraph)
         {
@@ -41,7 +42,7 @@ protected override void OnFinished(EventArgs args)
             Debug.Assert(args != null);
 
             _verticesIds = null;
-            
+
             base.OnFinished(args);
         }
 
diff --git a/src/QuikGraph.MSAGL/MsaglGraphExtensions.cs b/src/QuikGraph.MSAGL/MsaglGraphExtensions.cs
index cea6b4129..04fedcc7d 100644
--- a/src/QuikGraph.MSAGL/MsaglGraphExtensions.cs
+++ b/src/QuikGraph.MSAGL/MsaglGraphExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 using Microsoft.Msagl.Drawing;
 
@@ -16,6 +16,7 @@ public static class MsaglGraphExtensions
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to convert to MSAGL graph.</param>
         /// <returns>Graph populator.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         public static MsaglGraphPopulator<TVertex, TEdge> CreateMsaglPopulator<TVertex, TEdge>(
             [NotNull] this IEdgeListGraph<TVertex, TEdge> graph)
             where TEdge : IEdge<TVertex>
@@ -32,6 +33,7 @@ public static MsaglGraphPopulator<TVertex, TEdge> CreateMsaglPopulator<TVertex,
         /// <param name="format">Graph format.</param>
         /// <param name="formatProvider">Graph format provider.</param>
         /// <returns>Graph populator.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         public static MsaglGraphPopulator<TVertex, TEdge> CreateMsaglPopulator<TVertex, TEdge>(
             [NotNull] this IEdgeListGraph<TVertex, TEdge> graph,
             [CanBeNull] string format,
@@ -40,7 +42,7 @@ public static MsaglGraphPopulator<TVertex, TEdge> CreateMsaglPopulator<TVertex,
         {
             return new MsaglToStringGraphPopulator<TVertex, TEdge>(graph, format, formatProvider);
         }
-        
+
         /// <summary>
         /// Creates an <see cref="MsaglGraphPopulator{TVertex,TEdge}"/>.
         /// </summary>
@@ -49,6 +51,8 @@ public static MsaglGraphPopulator<TVertex, TEdge> CreateMsaglPopulator<TVertex,
         /// <param name="graph">Graph to convert to MSAGL graph.</param>
         /// <param name="vertexIdentity">Delegate that given a vertex return its identifier.</param>
         /// <returns>Graph populator.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexIdentity"/> is <see langword="null"/>.</exception>
         public static MsaglGraphPopulator<TVertex, TEdge> CreateMsaglPopulator<TVertex, TEdge>(
             [NotNull] this IEdgeListGraph<TVertex, TEdge> graph,
             [NotNull] VertexIdentity<TVertex> vertexIdentity)
@@ -58,7 +62,7 @@ public static MsaglGraphPopulator<TVertex, TEdge> CreateMsaglPopulator<TVertex,
         }
 
         /// <summary>
-        /// Converts <paramref name="graph"/> to an <see cref="Microsoft.Msagl.Drawing.Graph"/>.
+        /// Converts <paramref name="graph"/> to an <see cref="T:Microsoft.Msagl.Drawing.Graph"/>.
         /// </summary>
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <typeparam name="TEdge">Edge type.</typeparam>
@@ -66,6 +70,7 @@ public static MsaglGraphPopulator<TVertex, TEdge> CreateMsaglPopulator<TVertex,
         /// <param name="nodeAdded">Node added delegate.</param>
         /// <param name="edgeAdded">Edge added delegate.</param>
         /// <returns>MSAGL Graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         public static Graph ToMsaglGraph<TVertex, TEdge>(
             [NotNull] this IEdgeListGraph<TVertex, TEdge> graph,
             [CanBeNull] MsaglVertexNodeEventHandler<TVertex> nodeAdded = null,
@@ -76,9 +81,14 @@ public static Graph ToMsaglGraph<TVertex, TEdge>(
             try
             {
                 if (nodeAdded != null)
+                {
                     populator.NodeAdded += nodeAdded;
+                }
+
                 if (edgeAdded != null)
+                {
                     populator.EdgeAdded += edgeAdded;
+                }
 
                 populator.Compute();
                 return populator.MsaglGraph;
@@ -86,14 +96,19 @@ public static Graph ToMsaglGraph<TVertex, TEdge>(
             finally
             {
                 if (nodeAdded != null)
+                {
                     populator.NodeAdded -= nodeAdded;
+                }
+
                 if (edgeAdded != null)
+                {
                     populator.EdgeAdded -= edgeAdded;
+                }
             }
         }
 
         /// <summary>
-        /// Converts <paramref name="graph"/> to an <see cref="Microsoft.Msagl.Drawing.Graph"/>.
+        /// Converts <paramref name="graph"/> to an <see cref="T:Microsoft.Msagl.Drawing.Graph"/>.
         /// </summary>
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <typeparam name="TEdge">Edge type.</typeparam>
@@ -102,6 +117,8 @@ public static Graph ToMsaglGraph<TVertex, TEdge>(
         /// <param name="nodeAdded">Node added delegate.</param>
         /// <param name="edgeAdded">Edge added delegate.</param>
         /// <returns>MSAGL Graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexIdentity"/> is <see langword="null"/>.</exception>
         public static Graph ToMsaglGraph<TVertex, TEdge>(
             [NotNull] this IEdgeListGraph<TVertex, TEdge> graph,
             [NotNull] VertexIdentity<TVertex> vertexIdentity,
@@ -113,9 +130,14 @@ public static Graph ToMsaglGraph<TVertex, TEdge>(
             try
             {
                 if (nodeAdded != null)
+                {
                     populator.NodeAdded += nodeAdded;
+                }
+
                 if (edgeAdded != null)
+                {
                     populator.EdgeAdded += edgeAdded;
+                }
 
                 populator.Compute();
                 return populator.MsaglGraph;
@@ -123,9 +145,14 @@ public static Graph ToMsaglGraph<TVertex, TEdge>(
             finally
             {
                 if (nodeAdded != null)
+                {
                     populator.NodeAdded -= nodeAdded;
+                }
+
                 if (edgeAdded != null)
+                {
                     populator.EdgeAdded -= edgeAdded;
+                }
             }
         }
     }
diff --git a/src/QuikGraph.MSAGL/MsaglGraphPopulator.cs b/src/QuikGraph.MSAGL/MsaglGraphPopulator.cs
index 3b6431118..058a020d0 100644
--- a/src/QuikGraph.MSAGL/MsaglGraphPopulator.cs
+++ b/src/QuikGraph.MSAGL/MsaglGraphPopulator.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using JetBrains.Annotations;
 using Microsoft.Msagl.Drawing;
 using QuikGraph.Algorithms;
@@ -17,6 +17,7 @@ public abstract class MsaglGraphPopulator<TVertex, TEdge> : AlgorithmBase<IEdgeL
         /// Initializes a new instance of the <see cref="MsaglGraphPopulator{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to convert to MSAGL graph.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         protected MsaglGraphPopulator([NotNull] IEdgeListGraph<TVertex, TEdge> visitedGraph)
             : base(visitedGraph)
         {
@@ -35,7 +36,7 @@ protected MsaglGraphPopulator([NotNull] IEdgeListGraph<TVertex, TEdge> visitedGr
         public event MsaglVertexNodeEventHandler<TVertex> NodeAdded;
         
         /// <summary>
-        /// Called when a <see cref="Node"/> is added.
+        /// Called when a <see cref="T:Microsoft.Msagl.Drawing.Node"/> is added.
         /// </summary>
         /// <param name="args">Event arguments.</param>
         protected virtual void OnNodeAdded([NotNull] MsaglVertexEventArgs<TVertex> args)
@@ -51,7 +52,7 @@ protected virtual void OnNodeAdded([NotNull] MsaglVertexEventArgs<TVertex> args)
         public event MsaglEdgeEventHandler<TVertex, TEdge> EdgeAdded;
 
         /// <summary>
-        /// Called when an <see cref="Edge"/> is added.
+        /// Called when an <see cref="T:Microsoft.Msagl.Drawing.Edge"/> is added.
         /// </summary>
         /// <param name="args">Event arguments.</param>
         protected virtual void OnEdgeAdded([NotNull] MsaglEdgeEventArgs<TVertex, TEdge> args)
@@ -94,14 +95,16 @@ protected override void InternalCompute()
         /// Called when a <paramref name="vertex"/> should be added to the graph.
         /// </summary>
         /// <param name="vertex">Vertex to add.</param>
-        /// <returns>Added <see cref="Node"/>.</returns>
+        /// <returns>Added <see cref="T:Microsoft.Msagl.Drawing.Node"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         protected abstract Node AddNode([NotNull] TVertex vertex);
 
         /// <summary>
         /// Called when an <paramref name="edge"/> should be added to the graph.
         /// </summary>
         /// <param name="edge">Edge to add.</param>
-        /// <returns>Added <see cref="Edge"/>.</returns>
+        /// <returns>Added <see cref="T:Microsoft.Msagl.Drawing.Edge"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         protected abstract Edge AddEdge([NotNull] TEdge edge);
     }
 }
\ No newline at end of file
diff --git a/src/QuikGraph.MSAGL/MsaglIdentifiableGraphPopulator.cs b/src/QuikGraph.MSAGL/MsaglIdentifiableGraphPopulator.cs
index 29db73400..01092da9e 100644
--- a/src/QuikGraph.MSAGL/MsaglIdentifiableGraphPopulator.cs
+++ b/src/QuikGraph.MSAGL/MsaglIdentifiableGraphPopulator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 using Microsoft.Msagl.Drawing;
 
@@ -20,6 +20,8 @@ public sealed class MsaglIdentifiableGraphPopulator<TVertex, TEdge> : MsaglGraph
         /// </summary>
         /// <param name="visitedGraph">Graph to convert to MSAGL graph.</param>
         /// <param name="vertexIdentity">Delegate that given a vertex return its identifier.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexIdentity"/> is <see langword="null"/>.</exception>
         public MsaglIdentifiableGraphPopulator(
             [NotNull] IEdgeListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] VertexIdentity<TVertex> vertexIdentity)
diff --git a/src/QuikGraph.MSAGL/MsaglToStringGraphPopulator.cs b/src/QuikGraph.MSAGL/MsaglToStringGraphPopulator.cs
index 9adc6625d..8c92cd5f8 100644
--- a/src/QuikGraph.MSAGL/MsaglToStringGraphPopulator.cs
+++ b/src/QuikGraph.MSAGL/MsaglToStringGraphPopulator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 
 namespace QuikGraph.MSAGL
@@ -17,6 +17,7 @@ public sealed class MsaglToStringGraphPopulator<TVertex, TEdge> : MsaglDefaultGr
         /// <param name="visitedGraph">Graph to convert to MSAGL graph.</param>
         /// <param name="formatProvider">Graph format provider.</param>
         /// <param name="format">Graph format.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public MsaglToStringGraphPopulator(
             [NotNull] IEdgeListGraph<TVertex, TEdge> visitedGraph,
             [CanBeNull] string format = null,
diff --git a/src/QuikGraph.Petri/Interfaces/IExpression.cs b/src/QuikGraph.Petri/Interfaces/IExpression.cs
index ed199f9ad..91e013cdf 100644
--- a/src/QuikGraph.Petri/Interfaces/IExpression.cs
+++ b/src/QuikGraph.Petri/Interfaces/IExpression.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Petri
@@ -12,6 +12,7 @@ public interface IExpression<TToken>
         /// <summary>
         /// Evaluates <paramref name="markings"/>.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="markings"/> is <see langword="null"/>.</exception>
         [NotNull, ItemNotNull]
         IList<TToken> Evaluate([NotNull, ItemNotNull] IList<TToken> markings);
     }
diff --git a/src/QuikGraph.Petri/Interfaces/IMutablePetriNet.cs b/src/QuikGraph.Petri/Interfaces/IMutablePetriNet.cs
index 1ac039f55..8706e95aa 100644
--- a/src/QuikGraph.Petri/Interfaces/IMutablePetriNet.cs
+++ b/src/QuikGraph.Petri/Interfaces/IMutablePetriNet.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace QuikGraph.Petri
 {
@@ -13,32 +13,38 @@ public interface IMutablePetriNet<TToken> : IPetriNet<TToken>
         /// </summary>
         /// <param name="name">Place name.</param>
         /// <returns>Added <see cref="IPlace{TToken}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="name"/> is <see langword="null"/>.</exception>
         [NotNull]
         IPlace<TToken> AddPlace([NotNull] string name);
-        
+
         /// <summary>
         /// Adds a <see cref="ITransition{TToken}"/> with given <paramref name="name"/> to this Petri net.
         /// </summary>
         /// <param name="name">Transition name.</param>
         /// <returns>Added <see cref="ITransition{TToken}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="name"/> is <see langword="null"/>.</exception>
         [NotNull]
         ITransition<TToken> AddTransition([NotNull] string name);
-        
+
         /// <summary>
         /// Adds an <see cref="IArc{TToken}"/> with given source <paramref name="place"/> and target <paramref name="transition"/> to this Petri net.
         /// </summary>
         /// <param name="place">Source place.</param>
         /// <param name="transition">Target transition.</param>
         /// <returns>Added <see cref="IArc{TToken}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="place"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="transition"/> is <see langword="null"/>.</exception>
         [NotNull]
         IArc<TToken> AddArc([NotNull] IPlace<TToken> place, [NotNull] ITransition<TToken> transition);
-        
+
         /// <summary>
         /// Adds an <see cref="IArc{TToken}"/> with given source <paramref name="transition"/> and target <paramref name="place"/> to this Petri net.
         /// </summary>
         /// <param name="transition">Source transition.</param>
         /// <param name="place">Target place.</param>
         /// <returns>Added <see cref="IArc{TToken}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="transition"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="place"/> is <see langword="null"/>.</exception>
         [NotNull]
         IArc<TToken> AddArc([NotNull] ITransition<TToken> transition, [NotNull] IPlace<TToken> place);
     }
diff --git a/src/QuikGraph.Petri/Interfaces/IPetriVertex.cs b/src/QuikGraph.Petri/Interfaces/IPetriVertex.cs
index 42d679485..03b1c5505 100644
--- a/src/QuikGraph.Petri/Interfaces/IPetriVertex.cs
+++ b/src/QuikGraph.Petri/Interfaces/IPetriVertex.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace QuikGraph.Petri
 {
@@ -11,7 +11,7 @@ public interface IPetriVertex
         /// Gets or sets the name of the node.
         /// </summary>
         /// <value>
-        /// A <see cref="string"/> representing the name of the node.
+        /// A <see cref="T:System.String"/> representing the name of the node.
         /// </value>
         [NotNull]
         string Name { get; }
diff --git a/src/QuikGraph.Petri/PetriNetSimulator.cs b/src/QuikGraph.Petri/PetriNetSimulator.cs
index 899b9afdd..ea9756648 100644
--- a/src/QuikGraph.Petri/PetriNetSimulator.cs
+++ b/src/QuikGraph.Petri/PetriNetSimulator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -21,6 +21,7 @@ public sealed class PetriNetSimulator<TToken>
         /// Initializes a new instance of the <see cref="PetriNetSimulator{TToken}"/> class.
         /// </summary>
         /// <param name="net">Petri net to simulate.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="net"/> is <see langword="null"/>.</exception>
         public PetriNetSimulator([NotNull] IPetriNet<TToken> net)
         {
             Net = net ?? throw new ArgumentNullException(nameof(net));
diff --git a/src/QuikGraph.Petri/Structures/Arc.cs b/src/QuikGraph.Petri/Structures/Arc.cs
index ee8a59012..c8a1f5508 100644
--- a/src/QuikGraph.Petri/Structures/Arc.cs
+++ b/src/QuikGraph.Petri/Structures/Arc.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Petri
@@ -13,6 +13,8 @@ internal sealed class Arc<TToken> : Edge<IPetriVertex>, IArc<TToken>
         /// </summary>
         /// <param name="place">Place (Source).</param>
         /// <param name="transition">Transition (Target).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="place"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="transition"/> is <see langword="null"/>.</exception>
         public Arc([NotNull] IPlace<TToken> place, [NotNull] ITransition<TToken> transition)
             : base(place, transition)
         {
@@ -26,6 +28,8 @@ public Arc([NotNull] IPlace<TToken> place, [NotNull] ITransition<TToken> transit
         /// </summary>
         /// <param name="transition">Transition (Source).</param>
         /// <param name="place">Place (Target).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="transition"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="place"/> is <see langword="null"/>.</exception>
         public Arc([NotNull] ITransition<TToken> transition, [NotNull] IPlace<TToken> place)
             : base(place, transition)
         {
@@ -47,6 +51,7 @@ public Arc([NotNull] ITransition<TToken> transition, [NotNull] IPlace<TToken> pl
         private IExpression<TToken> _annotation = new IdentityExpression<TToken>();
 
         /// <inheritdoc />
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
         public IExpression<TToken> Annotation
         {
             get => _annotation;
diff --git a/src/QuikGraph.Petri/Structures/PetriNet.cs b/src/QuikGraph.Petri/Structures/PetriNet.cs
index c0c74b0f1..80a4219f1 100644
--- a/src/QuikGraph.Petri/Structures/PetriNet.cs
+++ b/src/QuikGraph.Petri/Structures/PetriNet.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_SERIALIZATION || SUPPORTS_CLONEABLE
+#if SUPPORTS_SERIALIZATION || SUPPORTS_CLONEABLE
 using System;
 #endif
 using System.Collections.Generic;
@@ -31,6 +31,7 @@ public PetriNet()
         /// <summary>
         /// Copy constructor.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="other"/> is <see langword="null"/>.</exception>
         private PetriNet([NotNull] PetriNet<TToken> other)
         {
             Debug.Assert(other != null);
diff --git a/src/QuikGraph.Petri/Structures/Place.cs b/src/QuikGraph.Petri/Structures/Place.cs
index 40976fbd1..1aa232ea9 100644
--- a/src/QuikGraph.Petri/Structures/Place.cs
+++ b/src/QuikGraph.Petri/Structures/Place.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -18,6 +18,7 @@ internal sealed class Place<TToken> : IPlace<TToken>
         /// Initializes a new instance of the <see cref="Place{TToken}"/> class.
         /// </summary>
         /// <param name="name">Place name.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="name"/> is <see langword="null"/>.</exception>
         public Place([NotNull] string name)
         {
             Name = name ?? throw new ArgumentNullException(nameof(name));
diff --git a/src/QuikGraph.Petri/Structures/Transition.cs b/src/QuikGraph.Petri/Structures/Transition.cs
index 297ef3d57..003ea0725 100644
--- a/src/QuikGraph.Petri/Structures/Transition.cs
+++ b/src/QuikGraph.Petri/Structures/Transition.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Petri
@@ -12,6 +12,7 @@ internal sealed class Transition<TToken> : ITransition<TToken>
         /// Initializes a new instance of the <see cref="Transition{Token}"/> class.
         /// </summary>
         /// <param name="name">Transition name.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="name"/> is <see langword="null"/>.</exception>
         public Transition([NotNull] string name)
         {
             Name = name ?? throw new ArgumentNullException(nameof(name));
@@ -24,6 +25,7 @@ public Transition([NotNull] string name)
         private IConditionExpression<TToken> _condition = new AlwaysTrueConditionExpression<TToken>();
 
         /// <inheritdoc />
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
         public IConditionExpression<TToken> Condition
         {
             get => _condition;
diff --git a/src/QuikGraph.Serialization/DirectedGraphMLAlgorithm.cs b/src/QuikGraph.Serialization/DirectedGraphMLAlgorithm.cs
index 3a31f87b4..a32fa5237 100644
--- a/src/QuikGraph.Serialization/DirectedGraphMLAlgorithm.cs
+++ b/src/QuikGraph.Serialization/DirectedGraphMLAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -27,15 +27,18 @@ public sealed class DirectedGraphMLAlgorithm<TVertex, TEdge> : AlgorithmBase<IVe
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="vertexIdentity">Vertex identity method.</param>
-        /// <param name="edgeIdentities">Edge identity method.</param>
+        /// <param name="edgeIdentity">Edge identity method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexIdentity"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeIdentity"/> is <see langword="null"/>.</exception>
         public DirectedGraphMLAlgorithm(
             [NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] VertexIdentity<TVertex> vertexIdentity,
-            [NotNull] EdgeIdentity<TVertex, TEdge> edgeIdentities)
+            [NotNull] EdgeIdentity<TVertex, TEdge> edgeIdentity)
             : base(visitedGraph)
         {
             _vertexIdentity = vertexIdentity ?? throw new ArgumentNullException(nameof(vertexIdentity));
-            _edgeIdentity = edgeIdentities ?? throw new ArgumentNullException(nameof(edgeIdentities));
+            _edgeIdentity = edgeIdentity ?? throw new ArgumentNullException(nameof(edgeIdentity));
         }
 
         /// <summary>
diff --git a/src/QuikGraph.Serialization/DirectedGraphMLExtensions.cs b/src/QuikGraph.Serialization/DirectedGraphMLExtensions.cs
index 48738d8e9..3b586c5fd 100644
--- a/src/QuikGraph.Serialization/DirectedGraphMLExtensions.cs
+++ b/src/QuikGraph.Serialization/DirectedGraphMLExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Xml;
@@ -29,20 +29,26 @@ public static class DirectedGraphMLExtensions
         /// </summary>
         /// <param name="graph">Graph instance to write.</param>
         /// <param name="filePath">Path to the file to write into.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="filePath"/> is <see langword="null"/>.</exception>
         public static void WriteXml([NotNull] this DirectedGraph graph, [NotNull] string filePath)
         {
             if (string.IsNullOrEmpty(filePath))
                 throw new ArgumentException("Must provide a file path.", nameof(filePath));
 
             using (StreamWriter stream = File.CreateText(filePath))
+            {
                 WriteXml(graph, stream);
+            }
         }
 
         /// <summary>
-        /// Writes the DGML data structure to the <see cref="XmlWriter"/>.
+        /// Writes the DGML data structure to the <see cref="T:System.Xml.XmlWriter"/>.
         /// </summary>
         /// <param name="graph">Graph instance to write.</param>
         /// <param name="writer">XML writer in which writing graph data.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="writer"/> is <see langword="null"/>.</exception>
         public static void WriteXml([NotNull] this DirectedGraph graph, [NotNull] XmlWriter writer)
         {
             if (graph is null)
@@ -54,10 +60,12 @@ public static void WriteXml([NotNull] this DirectedGraph graph, [NotNull] XmlWri
         }
 
         /// <summary>
-        /// Writes the DGML data structure to the <see cref="XmlWriter"/>.
+        /// Writes the DGML data structure to the <see cref="T:System.Xml.XmlWriter"/>.
         /// </summary>
         /// <param name="graph">Graph instance to write.</param>
         /// <param name="stream">Stream in which writing graph data.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="stream"/> is <see langword="null"/>.</exception>
         public static void WriteXml([NotNull] this DirectedGraph graph, [NotNull] Stream stream)
         {
             if (graph is null)
@@ -69,10 +77,12 @@ public static void WriteXml([NotNull] this DirectedGraph graph, [NotNull] Stream
         }
 
         /// <summary>
-        /// Writes the DGML data structure to the <see cref="TextWriter"/>.
+        /// Writes the DGML data structure to the <see cref="T:System.IO.TextWriter"/>.
         /// </summary>
         /// <param name="graph">Graph instance to write.</param>
         /// <param name="writer">Text writer in which writing graph data.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="writer"/> is <see langword="null"/>.</exception>
         public static void WriteXml([NotNull] this DirectedGraph graph, [NotNull] TextWriter writer)
         {
             if (graph is null)
@@ -88,18 +98,19 @@ public static void WriteXml([NotNull] this DirectedGraph graph, [NotNull] TextWr
         /// </summary>
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <typeparam name="TEdge">Edge type.</typeparam>
-        /// <param name="visitedGraph">Graph to convert to <see cref="DirectedGraph"/>.</param>
+        /// <param name="graph">Graph to convert to <see cref="DirectedGraph"/>.</param>
         /// <returns>Converted graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static DirectedGraph ToDirectedGraphML<TVertex, TEdge>(
-            [NotNull] this IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph)
+            [NotNull] this IVertexAndEdgeListGraph<TVertex, TEdge> graph)
             where TEdge : IEdge<TVertex>
         {
             return ToDirectedGraphML(
-                visitedGraph,
-                visitedGraph.GetVertexIdentity(),
-                visitedGraph.GetEdgeIdentity());
+                graph,
+                graph.GetVertexIdentity(),
+                graph.GetEdgeIdentity());
         }
 
         /// <summary>
@@ -107,26 +118,28 @@ public static DirectedGraph ToDirectedGraphML<TVertex, TEdge>(
         /// </summary>
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <typeparam name="TEdge">Edge type.</typeparam>
-        /// <param name="visitedGraph">Graph to convert to <see cref="DirectedGraph"/>.</param>
-        /// <param name="vertexColors">Function that gives the color of a vertex.</param>
+        /// <param name="graph">Graph to convert to <see cref="DirectedGraph"/>.</param>
+        /// <param name="verticesColors">Function that gives the color of a vertex.</param>
         /// <returns>Converted graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesColors"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static DirectedGraph ToDirectedGraphML<TVertex, TEdge>(
-            [NotNull] this IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
-            [NotNull] Func<TVertex, GraphColor> vertexColors)
+            [NotNull] this IVertexAndEdgeListGraph<TVertex, TEdge> graph,
+            [NotNull] Func<TVertex, GraphColor> verticesColors)
             where TEdge : IEdge<TVertex>
         {
-            if (vertexColors is null)
-                throw new ArgumentNullException(nameof(vertexColors));
+            if (verticesColors is null)
+                throw new ArgumentNullException(nameof(verticesColors));
 
             return ToDirectedGraphML(
-                visitedGraph,
-                visitedGraph.GetVertexIdentity(),
-                visitedGraph.GetEdgeIdentity(),
+                graph,
+                graph.GetVertexIdentity(),
+                graph.GetEdgeIdentity(),
                 (vertex, node) =>
                 {
-                    GraphColor color = vertexColors(vertex);
+                    GraphColor color = verticesColors(vertex);
                     switch (color)
                     {
                         case GraphColor.Black:
@@ -148,20 +161,23 @@ public static DirectedGraph ToDirectedGraphML<TVertex, TEdge>(
         /// </summary>
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <typeparam name="TEdge">Edge type.</typeparam>
-        /// <param name="visitedGraph">Graph to convert to <see cref="DirectedGraph"/>.</param>
+        /// <param name="graph">Graph to convert to <see cref="DirectedGraph"/>.</param>
         /// <param name="vertexIdentity">Vertex identity method.</param>
         /// <param name="edgeIdentity">Edge identity method.</param>
         /// <returns>Converted graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexIdentity"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeIdentity"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static DirectedGraph ToDirectedGraphML<TVertex, TEdge>(
-            [NotNull] this IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
+            [NotNull] this IVertexAndEdgeListGraph<TVertex, TEdge> graph,
             [NotNull] VertexIdentity<TVertex> vertexIdentity,
             [NotNull] EdgeIdentity<TVertex, TEdge> edgeIdentity)
             where TEdge : IEdge<TVertex>
         {
             return ToDirectedGraphML(
-                visitedGraph,
+                graph,
                 vertexIdentity,
                 edgeIdentity,
                 null,
@@ -173,16 +189,19 @@ public static DirectedGraph ToDirectedGraphML<TVertex, TEdge>(
         /// </summary>
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <typeparam name="TEdge">Edge type.</typeparam>
-        /// <param name="visitedGraph">Graph to convert to <see cref="DirectedGraph"/>.</param>
+        /// <param name="graph">Graph to convert to <see cref="DirectedGraph"/>.</param>
         /// <param name="vertexIdentity">Vertex identity method.</param>
         /// <param name="edgeIdentity">Edge identity method.</param>
         /// <param name="formatNode">Formats a vertex into a <see cref="DirectedGraphNode"/>.</param>
         /// <param name="formatEdge">Formats an edge into a <see cref="DirectedGraphLink"/>.</param>
         /// <returns>Converted graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexIdentity"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeIdentity"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static DirectedGraph ToDirectedGraphML<TVertex, TEdge>(
-            [NotNull] this IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
+            [NotNull] this IVertexAndEdgeListGraph<TVertex, TEdge> graph,
             [NotNull] VertexIdentity<TVertex> vertexIdentity,
             [NotNull] EdgeIdentity<TVertex, TEdge> edgeIdentity,
             [CanBeNull] Action<TVertex, DirectedGraphNode> formatNode,
@@ -190,14 +209,20 @@ public static DirectedGraph ToDirectedGraphML<TVertex, TEdge>(
             where TEdge : IEdge<TVertex>
         {
             var algorithm = new DirectedGraphMLAlgorithm<TVertex, TEdge>(
-                visitedGraph,
+                graph,
                 vertexIdentity,
                 edgeIdentity);
 
             if (formatNode != null)
+            {
                 algorithm.FormatNode += formatNode;
+            }
+
             if (formatEdge != null)
+            {
                 algorithm.FormatEdge += formatEdge;
+            }
+
             algorithm.Compute();
 
             return algorithm.DirectedGraph;
@@ -210,6 +235,7 @@ public static DirectedGraph ToDirectedGraphML<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to open.</param>
         /// <param name="filePath">Path to the file to save.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         public static void OpenAsDGML<TVertex, TEdge>(
             [NotNull] this IVertexAndEdgeListGraph<TVertex, TEdge> graph,
             [CanBeNull] string filePath)
@@ -219,7 +245,9 @@ public static void OpenAsDGML<TVertex, TEdge>(
                 throw new ArgumentNullException(nameof(graph));
 
             if (filePath is null)
+            {
                 filePath = "graph.DGML";
+            }
 
             graph.ToDirectedGraphML().WriteXml(filePath);
 
diff --git a/src/QuikGraph.Serialization/GraphMLDeserializer.cs b/src/QuikGraph.Serialization/GraphMLDeserializer.cs
index 8b9731e33..5ba033d36 100644
--- a/src/QuikGraph.Serialization/GraphMLDeserializer.cs
+++ b/src/QuikGraph.Serialization/GraphMLDeserializer.cs
@@ -22,7 +22,7 @@ namespace QuikGraph.Serialization
     /// <remarks>
     /// <para>
     /// Custom vertex, edge and graph attributes can be specified by 
-    /// using the <see cref="System.Xml.Serialization.XmlAttributeAttribute"/> attribute on properties (field not supported).
+    /// using the <see cref="T:System.Xml.Serialization.XmlAttributeAttribute"/> attribute on properties (field not supported).
     /// </para>
     /// <para>
     /// The serializer uses LCG (lightweight code generation) to generate the 
@@ -253,6 +253,14 @@ private static Delegate CreateReadDelegate(
         /// <param name="graph">Graph instance to fill.</param>
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="reader"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Deserializing value on property without setter, or with invalid default value.</exception>
+        /// <exception cref="T:System.InvalidOperationException"><see cref="GraphMLTag"/> or <see cref="GraphTag"/> not found.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Failure while reading elements from GraphML.</exception>
+        /// <exception cref="T:System.NotSupportedException">Deserializing graph with unsupported property type.</exception>
         public void Deserialize(
             [NotNull] XmlReader reader,
             [NotNull] TGraph graph,
@@ -345,13 +353,12 @@ private void ReadElements()
                 var vertices = new Dictionary<string, TVertex>(StringComparer.Ordinal);
 
                 // Read vertices or edges
-                XmlReader reader = _reader;
-                while (reader.Read())
+                while (_reader.Read())
                 {
-                    if (reader.NodeType == XmlNodeType.Element
-                        && reader.NamespaceURI == _graphMLNamespace)
+                    if (_reader.NodeType == XmlNodeType.Element
+                        && _reader.NamespaceURI == _graphMLNamespace)
                     {
-                        switch (reader.Name)
+                        switch (_reader.Name)
                         {
                             case NodeTag:
                                 ReadVertex(vertices);
diff --git a/src/QuikGraph.Serialization/GraphMLExtensions.cs b/src/QuikGraph.Serialization/GraphMLExtensions.cs
index 96190d497..3b943205b 100644
--- a/src/QuikGraph.Serialization/GraphMLExtensions.cs
+++ b/src/QuikGraph.Serialization/GraphMLExtensions.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_GRAPHS_SERIALIZATION
+#if SUPPORTS_GRAPHS_SERIALIZATION
 using System;
 #if SUPPORTS_XML_DTD_PROCESSING
 using System.Diagnostics;
@@ -29,6 +29,10 @@ public static class GraphMLExtensions
         /// <typeparam name="TGraph">Graph type.</typeparam>
         /// <param name="graph">Graph instance to serialize.</param>
         /// <param name="filePath">Path to the file where serializing the graph.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="filePath"/> is <see langword="null"/> or empty.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Failure while writing elements to GraphML.</exception>
+        /// <exception cref="T:System.NotSupportedException">Serializing value on property without getter, or with unsupported property type.</exception>
         public static void SerializeToGraphML<TVertex, TEdge, TGraph>(
             [NotNull] this TGraph graph,
             [NotNull] string filePath)
@@ -56,6 +60,12 @@ public static void SerializeToGraphML<TVertex, TEdge, TGraph>(
         /// <param name="filePath">Path to the file where serializing the graph.</param>
         /// <param name="vertexIdentity">Vertex identity method.</param>
         /// <param name="edgeIdentity">Edge identity method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexIdentity"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeIdentity"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="filePath"/> is <see langword="null"/> or empty.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Failure while writing elements to GraphML.</exception>
+        /// <exception cref="T:System.NotSupportedException">Serializing value on property without getter, or with unsupported property type.</exception>
         public static void SerializeToGraphML<TVertex, TEdge, TGraph>(
             [NotNull] this TGraph graph,
             [NotNull] string filePath,
@@ -83,6 +93,10 @@ public static void SerializeToGraphML<TVertex, TEdge, TGraph>(
         /// <typeparam name="TGraph">Graph type.</typeparam>
         /// <param name="graph">Graph instance to serialize.</param>
         /// <param name="writer">The XML writer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="writer"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Failure while writing elements to GraphML.</exception>
+        /// <exception cref="T:System.NotSupportedException">Serializing value on property without getter, or with unsupported property type.</exception>
         public static void SerializeToGraphML<TVertex, TEdge, TGraph>(
             [NotNull] this TGraph graph,
             [NotNull] XmlWriter writer)
@@ -108,6 +122,12 @@ public static void SerializeToGraphML<TVertex, TEdge, TGraph>(
         /// <param name="writer">The XML writer.</param>
         /// <param name="vertexIdentity">Vertex identity method.</param>
         /// <param name="edgeIdentity">Edge identity method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="writer"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexIdentity"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeIdentity"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Failure while writing elements to GraphML.</exception>
+        /// <exception cref="T:System.NotSupportedException">Serializing value on property without getter, or with unsupported property type.</exception>
         public static void SerializeToGraphML<TVertex, TEdge, TGraph>(
             [NotNull] this TGraph graph,
             [NotNull] XmlWriter writer,
@@ -134,6 +154,14 @@ public static void SerializeToGraphML<TVertex, TEdge, TGraph>(
         /// <param name="reader">The XML reader.</param>
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="reader"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Deserializing value on property without setter, or with invalid default value.</exception>
+        /// <exception cref="T:System.InvalidOperationException"><see cref="XmlConstants.GraphMLTag"/> or <see cref="XmlConstants.GraphTag"/> not found.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Failure while reading elements from GraphML.</exception>
+        /// <exception cref="T:System.NotSupportedException">Deserializing graph with unsupported property type.</exception>
         public static void DeserializeFromGraphML<TVertex, TEdge, TGraph>(
             [NotNull] this TGraph graph,
             [NotNull] XmlReader reader,
@@ -156,6 +184,14 @@ public static void DeserializeFromGraphML<TVertex, TEdge, TGraph>(
         /// <param name="reader">Reader stream.</param>
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="reader"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Deserializing value on property without setter, or with invalid default value.</exception>
+        /// <exception cref="T:System.InvalidOperationException"><see cref="XmlConstants.GraphMLTag"/> or <see cref="XmlConstants.GraphTag"/> not found.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Failure while reading elements from GraphML.</exception>
+        /// <exception cref="T:System.NotSupportedException">Deserializing graph with unsupported property type.</exception>
         public static void DeserializeFromGraphML<TVertex, TEdge, TGraph>(
             [NotNull] this TGraph graph,
             [NotNull] TextReader reader,
@@ -197,6 +233,14 @@ public static void DeserializeFromGraphML<TVertex, TEdge, TGraph>(
         /// <param name="filePath">Path to the file to load.</param>
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="filePath"/> is <see langword="null"/> or empty.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Deserializing value on property without setter, or with invalid default value.</exception>
+        /// <exception cref="T:System.InvalidOperationException"><see cref="XmlConstants.GraphMLTag"/> or <see cref="XmlConstants.GraphTag"/> not found.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Failure while reading elements from GraphML.</exception>
+        /// <exception cref="T:System.NotSupportedException">Deserializing graph with unsupported property type.</exception>
         public static void DeserializeFromGraphML<TVertex, TEdge, TGraph>(
             [NotNull] this TGraph graph,
             [NotNull] string filePath,
@@ -209,7 +253,9 @@ public static void DeserializeFromGraphML<TVertex, TEdge, TGraph>(
                 throw new ArgumentException("Must provide a file path.", nameof(filePath));
 
             using (var reader = new StreamReader(filePath))
+            {
                 DeserializeFromGraphML(graph, reader, vertexFactory, edgeFactory);
+            }
         }
 
 #if SUPPORTS_XML_DTD_PROCESSING
@@ -224,6 +270,14 @@ public static void DeserializeFromGraphML<TVertex, TEdge, TGraph>(
         /// <param name="reader">Reader stream.</param>
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="reader"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Deserializing value on property without setter, or with invalid default value.</exception>
+        /// <exception cref="T:System.InvalidOperationException"><see cref="XmlConstants.GraphMLTag"/> or <see cref="XmlConstants.GraphTag"/> not found.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Failure while reading elements from GraphML.</exception>
+        /// <exception cref="T:System.NotSupportedException">Deserializing graph with unsupported property type.</exception>
         public static void DeserializeAndValidateFromGraphML<TVertex, TEdge, TGraph>(
             [NotNull] this TGraph graph,
             [NotNull] TextReader reader,
@@ -258,7 +312,9 @@ public static void DeserializeAndValidateFromGraphML<TVertex, TEdge, TGraph>(
 
                 // Read and validate
                 using (XmlReader xmlReader = XmlReader.Create(reader, settings))
+                {
                     serializer.Deserialize(xmlReader, graph, vertexFactory, edgeFactory);
+                }
             }
             finally
             {
@@ -273,8 +329,11 @@ private static void AddGraphMLSchema([NotNull] XmlReaderSettings settings, [NotN
                 Debug.Assert(xsdStream != null, "GraphML schema resource not found.");
 
                 settings.Schemas.XmlResolver = resolver;
+                // ReSharper disable once AssignNullToNotNullAttribute, Justification: assert above
                 using (XmlReader xsdReader = XmlReader.Create(xsdStream, settings))
+                {
                     settings.Schemas.Add(GraphMLXmlResolver.GraphMLNamespace, xsdReader);
+                }
             }
         }
 
diff --git a/src/QuikGraph.Serialization/GraphMLSerializer.cs b/src/QuikGraph.Serialization/GraphMLSerializer.cs
index 45da0a008..0a55adbe3 100644
--- a/src/QuikGraph.Serialization/GraphMLSerializer.cs
+++ b/src/QuikGraph.Serialization/GraphMLSerializer.cs
@@ -21,7 +21,7 @@ namespace QuikGraph.Serialization
     /// <remarks>
     /// <para>
     /// Custom vertex, edge and graph attributes can be specified by 
-    /// using the <see cref="System.Xml.Serialization.XmlAttributeAttribute"/> attribute on properties (field not supported).
+    /// using the <see cref="T:System.Xml.Serialization.XmlAttributeAttribute"/> attribute on properties (field not supported).
     /// </para>
     /// <para>
     /// The serializer uses LCG (lightweight code generation) to generate the 
@@ -187,6 +187,12 @@ private static Delegate CreateWriteDelegate([NotNull] Type elementType, [NotNull
         /// <param name="graph">Graph instance to serialize.</param>
         /// <param name="vertexIdentity">Vertex identity method.</param>
         /// <param name="edgeIdentity">Edge identity method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="writer"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexIdentity"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeIdentity"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Failure while writing elements to GraphML.</exception>
+        /// <exception cref="T:System.NotSupportedException">Serializing value on property without getter, or with unsupported property type.</exception>
         public void Serialize(
             [NotNull] XmlWriter writer,
             [NotNull] TGraph graph,
@@ -259,8 +265,10 @@ public void Serialize()
             private void WriteHeader()
             {
                 if (_serializer.EmitDocumentDeclaration)
+                {
                     _writer.WriteStartDocument();
-                _writer.WriteStartElement("", GraphMLTag, GraphMLXmlResolver.GraphMLNamespace);
+                }
+                _writer.WriteStartElement(string.Empty, GraphMLTag, GraphMLXmlResolver.GraphMLNamespace);
             }
 
             private void WriteFooter()
@@ -408,7 +416,7 @@ private void WriteAttributeDefinitions([NotNull] string elementName, [NotNull] T
                                 break;
                             case TypeCode.Object:
                                 if (defaultValueType.IsArray)
-                                    throw new NotImplementedException("Default values for array types are not implemented.");
+                                    throw new NotSupportedException("Default values for array types are not supported.");
                                 throw new NotSupportedException(
                                     $"Property type {property.DeclaringType}.{property.Name} not supported by the GraphML schema.");
                             default:
diff --git a/src/QuikGraph.Serialization/GraphMLXmlResolver.cs b/src/QuikGraph.Serialization/GraphMLXmlResolver.cs
index 45d2d4044..4f40f3337 100644
--- a/src/QuikGraph.Serialization/GraphMLXmlResolver.cs
+++ b/src/QuikGraph.Serialization/GraphMLXmlResolver.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_GRAPHS_SERIALIZATION
+#if SUPPORTS_GRAPHS_SERIALIZATION
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -29,6 +29,7 @@ public GraphMLXmlResolver()
         /// Initializes a new instance of the <see cref="GraphMLXmlResolver"/> class.
         /// </summary>
         /// <param name="baseResolver">Base XML resolver.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="baseResolver"/> is <see langword="null"/>.</exception>
         public GraphMLXmlResolver([NotNull] XmlResolver baseResolver)
         {
             _baseResolver = baseResolver ?? throw new ArgumentNullException(nameof(baseResolver));
diff --git a/src/QuikGraph.Serialization/Helpers/SerializationHelpers.cs b/src/QuikGraph.Serialization/Helpers/SerializationHelpers.cs
index 6e45c7fb2..27233df8d 100644
--- a/src/QuikGraph.Serialization/Helpers/SerializationHelpers.cs
+++ b/src/QuikGraph.Serialization/Helpers/SerializationHelpers.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_GRAPHS_SERIALIZATION
+#if SUPPORTS_GRAPHS_SERIALIZATION
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -39,8 +39,8 @@ private static bool IsIndexed([NotNull] PropertyInfo property)
         /// <summary>
         /// Gets all properties that are marked with <see cref="XmlAttributeAttribute"/> on given type.
         /// </summary>
-        /// <param name="type"></param>
-        /// <returns></returns>
+        /// <param name="type">Object type.</param>
+        /// <returns>Enumerable of serializable properties information.</returns>
         [Pure]
         [NotNull]
         public static IEnumerable<PropertySerializationInfo> GetAttributeProperties([CanBeNull] Type type)
diff --git a/src/QuikGraph.Serialization/SerializationExtensions.cs b/src/QuikGraph.Serialization/SerializationExtensions.cs
index deefc40a7..71c1cf496 100644
--- a/src/QuikGraph.Serialization/SerializationExtensions.cs
+++ b/src/QuikGraph.Serialization/SerializationExtensions.cs
@@ -23,6 +23,9 @@ public static class SerializationExtensions
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">The graph to serialize.</param>
         /// <param name="stream">Stream in which serializing the graph.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="stream"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="stream"/> is not writable.</exception>
         public static void SerializeToBinary<TVertex, TEdge>(
             [NotNull] this IGraph<TVertex, TEdge> graph,
             [NotNull] Stream stream)
@@ -48,13 +51,15 @@ public static void SerializeToBinary<TVertex, TEdge>(
         /// <param name="stream">Stream from which deserializing the graph.</param>
         /// <param name="binder">
         /// <para>
-        /// <see cref="SerializationBinder"/> used during deserialization.
+        /// <see cref="T:System.Runtime.Serialization.SerializationBinder"/> used during deserialization.
         /// It can be used to check/filter/replace/upgrade types that are loaded.
         /// </para>
         /// <para>It is also useful in security scenarios.</para>
         /// <para>By default no binder is used.</para>
         /// </param>
         /// <returns>Deserialized graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="stream"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="stream"/> is not readable.</exception>
         [Pure]
         public static TGraph DeserializeFromBinary<TVertex, TEdge, TGraph>(
             [NotNull] this Stream stream,
@@ -154,7 +159,7 @@ private static TGraph DeserializeFromXmlInternal<TVertex, TEdge, TGraph>(
         }
 
         /// <summary>
-        /// Deserializes a graph instance from a generic XML stream, using an <see cref="XPathDocument"/>.
+        /// Deserializes a graph instance from a generic XML stream, using an <see cref="T:System.Xml.XPath.XPathDocument"/>.
         /// </summary>
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <typeparam name="TEdge">Edge type.</typeparam>
@@ -167,7 +172,14 @@ private static TGraph DeserializeFromXmlInternal<TVertex, TEdge, TGraph>(
         /// <param name="vertexFactory">Delegate that instantiates a vertex instance, given the vertex node.</param>
         /// <param name="edgeFactory">Delegate that instantiates an edge instance, given the edge node.</param>
         /// <returns>Deserialized graph.</returns>
-        /// <exception cref="InvalidOperationException">
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="document"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graphFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/> or creates <see langword="null"/> vertex.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/> or creates <see langword="null"/> edge.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="graphXPath"/> is <see langword="null"/> or empty.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="vertexXPath"/> is <see langword="null"/> or empty.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="edgeXPath"/> is <see langword="null"/> or empty.</exception>
+        /// <exception cref="T:System.InvalidOperationException">
         /// If the <paramref name="document"/> does not allow to get an XML navigator
         /// or if the <paramref name="graphXPath"/> does not allow to get graph node.
         /// </exception>
@@ -210,7 +222,7 @@ public static TGraph DeserializeFromXml<TVertex, TEdge, TGraph>(
 #endif
 
         /// <summary>
-        /// Deserializes a graph instance from a generic XML stream, using an <see cref="XmlReader"/>.
+        /// Deserializes a graph instance from a generic XML stream, using an <see cref="T:System.Xml.XmlReader"/>.
         /// </summary>
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <typeparam name="TEdge">Edge type.</typeparam>
@@ -223,7 +235,14 @@ public static TGraph DeserializeFromXml<TVertex, TEdge, TGraph>(
         /// <param name="vertexFactory">Delegate that instantiates a vertex instance, given the vertex node.</param>
         /// <param name="edgeFactory">Delegate that instantiates an edge instance, given the edge node.</param>
         /// <returns>Deserialized graph.</returns>
-        /// <exception cref="InvalidOperationException">If the graph node cannot be found.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="reader"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graphPredicate"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexPredicate"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgePredicate"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graphFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/> or creates <see langword="null"/> vertex.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/> or creates <see langword="null"/> edge.</exception>
+        /// <exception cref="T:System.InvalidOperationException">If the graph node cannot be found.</exception>
         [Pure]
         public static TGraph DeserializeFromXml<TVertex, TEdge, TGraph>(
             [NotNull] this XmlReader reader,
@@ -255,7 +274,7 @@ public static TGraph DeserializeFromXml<TVertex, TEdge, TGraph>(
         }
 
         /// <summary>
-        /// Deserializes a graph from a generic XML stream, using an <see cref="XmlReader"/>.
+        /// Deserializes a graph from a generic XML stream, using an <see cref="T:System.Xml.XmlReader"/>.
         /// </summary>
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <typeparam name="TEdge">Edge type.</typeparam>
@@ -269,7 +288,15 @@ public static TGraph DeserializeFromXml<TVertex, TEdge, TGraph>(
         /// <param name="vertexFactory">Delegate that instantiates a vertex instance, given the vertex node.</param>
         /// <param name="edgeFactory">Delegate that instantiates an edge instance, given the edge node.</param>
         /// <returns>Deserialized graph.</returns>
-        /// <exception cref="InvalidOperationException">If the graph node cannot be found.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="reader"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="namespaceUri"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graphFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/> or creates <see langword="null"/> vertex.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/> or creates <see langword="null"/> edge.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="graphElementName"/> is <see langword="null"/> or empty.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="vertexElementName"/> is <see langword="null"/> or empty.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="edgeElementName"/> is <see langword="null"/> or empty.</exception>
+        /// <exception cref="T:System.InvalidOperationException">If the graph node cannot be found.</exception>
         [Pure]
         public static TGraph DeserializeFromXml<TVertex, TEdge, TGraph>(
             [NotNull] this XmlReader reader,
@@ -303,7 +330,7 @@ public static TGraph DeserializeFromXml<TVertex, TEdge, TGraph>(
         }
 
         /// <summary>
-        /// Serializes a graph instance to a generic XML stream, using an <see cref="XmlWriter"/>.
+        /// Serializes a graph instance to a generic XML stream, using an <see cref="T:System.Xml.XmlWriter"/>.
         /// </summary>
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <typeparam name="TEdge">Edge type.</typeparam>
@@ -316,6 +343,14 @@ public static TGraph DeserializeFromXml<TVertex, TEdge, TGraph>(
         /// <param name="vertexElementName">Name of the vertex element.</param>
         /// <param name="edgeElementName">Name of the edge element.</param>
         /// <param name="namespaceUri">XML namespace.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="writer"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="namespaceUri"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexIdentity"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeIdentity"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="graphElementName"/> is <see langword="null"/> or empty.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="vertexElementName"/> is <see langword="null"/> or empty.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="edgeElementName"/> is <see langword="null"/> or empty.</exception>
         public static void SerializeToXml<TVertex, TEdge, TGraph>(
             [NotNull] this TGraph graph,
             [NotNull] XmlWriter writer,
@@ -343,7 +378,7 @@ public static void SerializeToXml<TVertex, TEdge, TGraph>(
         }
 
         /// <summary>
-        /// Serializes a graph instance to a generic XML stream, using an <see cref="XmlWriter"/>.
+        /// Serializes a graph instance to a generic XML stream, using an <see cref="T:System.Xml.XmlWriter"/>.
         /// </summary>
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <typeparam name="TEdge">Edge type.</typeparam>
@@ -359,6 +394,14 @@ public static void SerializeToXml<TVertex, TEdge, TGraph>(
         /// <param name="writeGraphAttributes">Delegate to write graph attributes (optional).</param>
         /// <param name="writeVertexAttributes">Delegate to write vertex attributes (optional).</param>
         /// <param name="writeEdgeAttributes">Delegate to write edge attributes (optional).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="writer"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="namespaceUri"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexIdentity"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeIdentity"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="graphElementName"/> is <see langword="null"/> or empty.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="vertexElementName"/> is <see langword="null"/> or empty.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="edgeElementName"/> is <see langword="null"/> or empty.</exception>
         public static void SerializeToXml<TVertex, TEdge, TGraph>(
             [NotNull] this TGraph graph,
             [NotNull] XmlWriter writer,
diff --git a/src/QuikGraph.Serialization/XmlReaderExtensions.cs b/src/QuikGraph.Serialization/XmlReaderExtensions.cs
index 8aaaece2e..39d7111e6 100644
--- a/src/QuikGraph.Serialization/XmlReaderExtensions.cs
+++ b/src/QuikGraph.Serialization/XmlReaderExtensions.cs
@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Xml;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Serialization
 {
     /// <summary>
-    /// Extensions for <see cref="XmlReader"/> to help deserializing graph data.
+    /// Extensions for <see cref="T:System.Xml.XmlReader"/> to help deserializing graph data.
     /// </summary>
     public static class XmlReaderExtensions
     {
@@ -16,6 +16,9 @@ public static class XmlReaderExtensions
         /// <param name="localName">Node name.</param>
         /// <param name="namespaceURI">XML namespace.</param>
         /// <returns>Boolean array.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="localName"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="namespaceURI"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="localName"/> is empty.</exception>
         [Pure]
         [CanBeNull]
         public static bool[] ReadElementContentAsBooleanArray(
@@ -33,6 +36,9 @@ public static bool[] ReadElementContentAsBooleanArray(
         /// <param name="localName">Node name.</param>
         /// <param name="namespaceURI">XML namespace.</param>
         /// <returns>Int array.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="localName"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="namespaceURI"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="localName"/> is empty.</exception>
         [Pure]
         [CanBeNull]
         public static int[] ReadElementContentAsInt32Array(
@@ -50,6 +56,9 @@ public static int[] ReadElementContentAsInt32Array(
         /// <param name="localName">Node name.</param>
         /// <param name="namespaceURI">XML namespace.</param>
         /// <returns>Long array.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="localName"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="namespaceURI"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="localName"/> is empty.</exception>
         [Pure]
         [CanBeNull]
         public static long[] ReadElementContentAsInt64Array(
@@ -67,6 +76,9 @@ public static long[] ReadElementContentAsInt64Array(
         /// <param name="localName">Node name.</param>
         /// <param name="namespaceURI">XML namespace.</param>
         /// <returns>Float array.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="localName"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="namespaceURI"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="localName"/> is empty.</exception>
         [Pure]
         [CanBeNull]
         public static float[] ReadElementContentAsSingleArray(
@@ -84,6 +96,9 @@ public static float[] ReadElementContentAsSingleArray(
         /// <param name="localName">Node name.</param>
         /// <param name="namespaceURI">XML namespace.</param>
         /// <returns>Double array.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="localName"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="namespaceURI"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="localName"/> is empty.</exception>
         [Pure]
         [CanBeNull]
         public static double[] ReadElementContentAsDoubleArray(
@@ -101,6 +116,9 @@ public static double[] ReadElementContentAsDoubleArray(
         /// <param name="localName">Node name.</param>
         /// <param name="namespaceURI">XML namespace.</param>
         /// <returns>String array.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="localName"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="namespaceURI"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="localName"/> is empty.</exception>
         [Pure]
         [CanBeNull]
         public static string[] ReadElementContentAsStringArray(
@@ -120,6 +138,9 @@ public static string[] ReadElementContentAsStringArray(
         /// <param name="namespaceURI">XML namespace.</param>
         /// <param name="stringToT">Converts the XML element string as <typeparamref name="T"/>.</param>
         /// <returns>Array of <typeparamref name="T"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="localName"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="namespaceURI"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="localName"/> is empty.</exception>
         [Pure]
         [CanBeNull]
         public static T[] ReadElementContentAsArray<T>(
diff --git a/src/QuikGraph.Serialization/XmlSerializableGraph.cs b/src/QuikGraph.Serialization/XmlSerializableGraph.cs
index e828ca7b6..ff3693628 100644
--- a/src/QuikGraph.Serialization/XmlSerializableGraph.cs
+++ b/src/QuikGraph.Serialization/XmlSerializableGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Xml.Serialization;
@@ -32,6 +32,7 @@ public XmlSerializableGraph()
         /// Initializes a new instance of the <see cref="XmlSerializableGraph{TVertex,TEdge,TGraph}"/> class.
         /// </summary>
         /// <param name="graph">Graph to serialize.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         public XmlSerializableGraph([NotNull] TGraph graph)
         {
             if (graph == null)
@@ -113,6 +114,7 @@ IEnumerator IEnumerable.GetEnumerator()
             /// Adds a vertex to this serializable graph.
             /// </summary>
             /// <param name="vertex">Vertex to add.</param>
+            /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
             public void Add([NotNull] TVertex vertex)
             {
                 if (vertex == null)
@@ -161,6 +163,7 @@ IEnumerator IEnumerable.GetEnumerator()
             /// Adds an edge to this serializable graph.
             /// </summary>
             /// <param name="edge">Edge to add.</param>
+            /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
             public void Add([NotNull] TEdge edge)
             {
                 if (edge == null)
diff --git a/src/QuikGraph.Serialization/XmlWriterExtensions.cs b/src/QuikGraph.Serialization/XmlWriterExtensions.cs
index 965127bf2..2c7b1c365 100644
--- a/src/QuikGraph.Serialization/XmlWriterExtensions.cs
+++ b/src/QuikGraph.Serialization/XmlWriterExtensions.cs
@@ -5,7 +5,7 @@
 namespace QuikGraph.Serialization
 {
     /// <summary>
-    /// Extensions for <see cref="XmlWriter"/> to help serializing graph data.
+    /// Extensions for <see cref="T:System.Xml.XmlWriter"/> to help serializing graph data.
     /// </summary>
     public static class XmlWriterExtensions
     {
diff --git a/src/QuikGraph/Algorithms/AlgorithmBase.cs b/src/QuikGraph/Algorithms/AlgorithmBase.cs
index 229928b90..0e003732d 100644
--- a/src/QuikGraph/Algorithms/AlgorithmBase.cs
+++ b/src/QuikGraph/Algorithms/AlgorithmBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 #if SUPPORTS_AGGRESSIVE_INLINING
@@ -23,13 +23,16 @@ public abstract class AlgorithmBase<TGraph> : IAlgorithm<TGraph>, IAlgorithmComp
         /// </summary>
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         protected AlgorithmBase([CanBeNull] IAlgorithmComponent host, [NotNull] TGraph visitedGraph)
         {
             if (visitedGraph == null)
                 throw new ArgumentNullException(nameof(visitedGraph));
 
             if (host is null)
+            {
                 host = this;
+            }
             VisitedGraph = visitedGraph;
             _algorithmServices = new AlgorithmServices(host);
         }
@@ -38,6 +41,7 @@ protected AlgorithmBase([CanBeNull] IAlgorithmComponent host, [NotNull] TGraph v
         /// Initializes a new instance of the <see cref="AlgorithmBase{TGraph}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         protected AlgorithmBase([NotNull] TGraph visitedGraph)
         {
             if (visitedGraph == null)
@@ -67,6 +71,7 @@ public ComputationState State
         }
 
         /// <inheritdoc />
+        /// <exception cref="T:System.InvalidOperationException">Something went wrong when running the algorithm.</exception>
         public void Compute()
         {
             BeginComputation();
@@ -104,7 +109,9 @@ public void Abort()
             }
 
             if (raise)
+            {
                 OnStateChanged(EventArgs.Empty);
+            }
         }
 
         /// <inheritdoc />
@@ -113,7 +120,7 @@ public void Abort()
         /// <summary>
         /// Called on algorithm state changed.
         /// </summary>
-        /// <param name="args"><see cref="EventArgs.Empty"/>.</param>
+        /// <param name="args"><see cref="F:EventArgs.Empty"/>.</param>
         protected virtual void OnStateChanged([NotNull] EventArgs args)
         {
             Debug.Assert(args != null);
@@ -127,7 +134,7 @@ protected virtual void OnStateChanged([NotNull] EventArgs args)
         /// <summary>
         /// Called on algorithm start.
         /// </summary>
-        /// <param name="args"><see cref="EventArgs.Empty"/>.</param>
+        /// <param name="args"><see cref="F:EventArgs.Empty"/>.</param>
         protected virtual void OnStarted([NotNull] EventArgs args)
         {
             Debug.Assert(args != null);
@@ -141,7 +148,7 @@ protected virtual void OnStarted([NotNull] EventArgs args)
         /// <summary>
         /// Called on algorithm finished.
         /// </summary>
-        /// <param name="args"><see cref="EventArgs.Empty"/>.</param>
+        /// <param name="args"><see cref="F:EventArgs.Empty"/>.</param>
         protected virtual void OnFinished([NotNull] EventArgs args)
         {
             Debug.Assert(args != null);
@@ -155,7 +162,7 @@ protected virtual void OnFinished([NotNull] EventArgs args)
         /// <summary>
         /// Called on algorithm abort.
         /// </summary>
-        /// <param name="args"><see cref="EventArgs.Empty"/>.</param>
+        /// <param name="args"><see cref="F:EventArgs.Empty"/>.</param>
         protected virtual void OnAborted([NotNull] EventArgs args)
         {
             Debug.Assert(args != null);
@@ -181,6 +188,7 @@ protected virtual void OnAborted([NotNull] EventArgs args)
         public IAlgorithmServices Services => _algorithmServices;
 
         /// <inheritdoc />
+        /// <exception cref="T:System.InvalidOperationException">Requested service is not present on algorithm.</exception>
         public T GetService<T>()
         {
             if (!TryGetService(out T service))
@@ -211,6 +219,7 @@ public bool TryGetService<T>(out T service)
         /// <param name="service">Found service.</param>
         /// <returns>True if the service was found, false otherwise.</returns>
         [Pure]
+        [ContractAnnotation("=> true, service:notnull;=> false, service:null")]
         protected virtual bool TryGetService([NotNull] Type serviceType, out object service)
         {
             if (serviceType is null)
@@ -219,15 +228,21 @@ protected virtual bool TryGetService([NotNull] Type serviceType, out object serv
             lock (SyncRoot)
             {
                 if (_services is null)
+                {
                     _services = new Dictionary<Type, object>();
+                }
 
                 if (_services.TryGetValue(serviceType, out service))
                     return service != null;
 
                 if (serviceType == typeof(ICancelManager))
+                {
                     _services[serviceType] = service = new CancelManager();
+                }
                 else
+                {
                     _services[serviceType] = null;
+                }
 
                 return service != null;
             }
@@ -238,7 +253,7 @@ protected virtual bool TryGetService([NotNull] Type serviceType, out object serv
         /// <summary>
         /// Throws if a cancellation of the algorithm was requested.
         /// </summary>
-        /// <exception cref="OperationCanceledException">
+        /// <exception cref="T:System.OperationCanceledException">
         /// If the algorithm cancellation service indicates <see cref="ICancelManager.IsCancelling"/> is true.
         /// </exception>
 #if SUPPORTS_AGGRESSIVE_INLINING
diff --git a/src/QuikGraph/Algorithms/Assignment/HungarianAlgorithm.cs b/src/QuikGraph/Algorithms/Assignment/HungarianAlgorithm.cs
index 1f8efbe80..e67b08e68 100644
--- a/src/QuikGraph/Algorithms/Assignment/HungarianAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/Assignment/HungarianAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
@@ -72,6 +72,7 @@ public enum Steps
         /// Initializes a new instance of the <see cref="HungarianAlgorithm"/> class.
         /// </summary>
         /// <param name="costs">Costs matrix.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="costs"/> is <see langword="null"/>.</exception>
         public HungarianAlgorithm([NotNull] int[,] costs)
         {
             _costs = costs ?? throw new ArgumentNullException(nameof(costs));
@@ -135,27 +136,23 @@ private Steps ComputeStep(Steps step)
             {
                 case Steps.Step1:
                 {
-                    Steps currentStep = step;
                     _step = RunStep1(_masks, _colsCovered, _width, _height);
-                    return currentStep;
+                    return step;
                 }
                 case Steps.Step2:
                 {
-                    Steps currentStep = step;
                     _step = RunStep2(_costs, _masks, _rowsCovered, _colsCovered, _width, _height, ref _pathStart);
-                    return currentStep;
+                    return step;
                 }
                 case Steps.Step3:
                 {
-                    Steps currentStep = step;
                     _step = RunStep3(_masks, _rowsCovered, _colsCovered, _width, _height, _path, _pathStart);
-                    return currentStep;
+                    return step;
                 }
                 case Steps.Step4:
                 {
-                    Steps currentStep = step;
                     _step = RunStep4(_costs, _rowsCovered, _colsCovered, _width, _height);
-                    return currentStep;
+                    return step;
                 }
             }
 
@@ -209,9 +206,14 @@ private Steps RunInitStep()
             {
                 int min = int.MaxValue;
                 for (int j = 0; j < _width; ++j)
+                {
                     min = Math.Min(min, _costs[i, j]);
+                }
+
                 for (int j = 0; j < _width; ++j)
+                {
                     _costs[i, j] -= min;
+                }
             }
 
             // Set 1 where job assigned
@@ -237,7 +239,9 @@ private static Steps RunStep1(
                 for (int j = 0; j < width; ++j)
                 {
                     if (masks[i, j] == 1)
+                    {
                         colsCovered[j] = true;
+                    }
                 }
             }
 
@@ -245,7 +249,9 @@ private static Steps RunStep1(
             for (int j = 0; j < width; ++j)
             {
                 if (colsCovered[j])
+                {
                     ++colsCoveredCount;
+                }
             }
 
             return colsCoveredCount == height ? Steps.End : Steps.Step2;
@@ -326,9 +332,14 @@ private static Steps RunStep4(
                 for (int j = 0; j < width; ++j)
                 {
                     if (rowsCovered[i])
+                    {
                         costs[i, j] += minValue;
+                    }
+
                     if (!colsCovered[j])
+                    {
                         costs[i, j] -= minValue;
+                    }
                 }
             }
 
@@ -386,7 +397,9 @@ private static int FindMinimum(
                 for (int j = 0; j < width; ++j)
                 {
                     if (!rowsCovered[i] && !colsCovered[j])
+                    {
                         minValue = Math.Min(minValue, costs[i, j]);
+                    }
                 }
             }
 
@@ -442,9 +455,14 @@ private static void ClearCovers(
             int height)
         {
             for (int i = 0; i < height; ++i)
+            {
                 rowsCovered[i] = false;
+            }
+
             for (int j = 0; j < width; ++j)
+            {
                 colsCovered[j] = false;
+            }
         }
 
         private static void ClearPrimes(
@@ -457,7 +475,9 @@ private static void ClearPrimes(
                 for (int j = 0; j < width; ++j)
                 {
                     if (masks[i, j] == 2)
+                    {
                         masks[i, j] = 0;
+                    }
                 }
             }
         }
diff --git a/src/QuikGraph/Algorithms/Assignment/HungarianIteration.cs b/src/QuikGraph/Algorithms/Assignment/HungarianIteration.cs
index 3b746469f..49596fb43 100644
--- a/src/QuikGraph/Algorithms/Assignment/HungarianIteration.cs
+++ b/src/QuikGraph/Algorithms/Assignment/HungarianIteration.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Algorithms.Assignment
@@ -46,6 +47,11 @@ internal HungarianIteration(
             [NotNull] bool[] columnsCovered, 
             HungarianAlgorithm.Steps step)
         {
+            Debug.Assert(costs != null);
+            Debug.Assert(mask != null);
+            Debug.Assert(rowsCovered != null);
+            Debug.Assert(columnsCovered != null);
+
             Matrix = costs;
             Mask = mask;
             RowsCovered = rowsCovered;
diff --git a/src/QuikGraph/Algorithms/Cliques/MaximumCliqueAlgorithmBase.cs b/src/QuikGraph/Algorithms/Cliques/MaximumCliqueAlgorithmBase.cs
index 5a1ca100d..c32170b2c 100644
--- a/src/QuikGraph/Algorithms/Cliques/MaximumCliqueAlgorithmBase.cs
+++ b/src/QuikGraph/Algorithms/Cliques/MaximumCliqueAlgorithmBase.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_SERIALIZATION
+#if SUPPORTS_SERIALIZATION
 using System;
 #endif
 using JetBrains.Annotations;
@@ -22,6 +22,7 @@ public abstract class MaximumCliqueAlgorithmBase<TVertex, TEdge> : AlgorithmBase
         /// </summary>
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         protected MaximumCliqueAlgorithmBase(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph)
@@ -33,6 +34,7 @@ protected MaximumCliqueAlgorithmBase(
         /// Initializes a new instance of the <see cref="MaximumCliqueAlgorithmBase{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         protected MaximumCliqueAlgorithmBase([NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph)
             : base(visitedGraph)
         {
diff --git a/src/QuikGraph/Algorithms/Condensation/CondensationGraphAlgorithm.cs b/src/QuikGraph/Algorithms/Condensation/CondensationGraphAlgorithm.cs
index 18e6ac3c1..b781ca7c1 100644
--- a/src/QuikGraph/Algorithms/Condensation/CondensationGraphAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/Condensation/CondensationGraphAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using QuikGraph.Algorithms.ConnectedComponents;
@@ -19,6 +19,7 @@ public sealed class CondensationGraphAlgorithm<TVertex, TEdge, TGraph> : Algorit
         /// Initializes a new instance of the <see cref="CondensationGraphAlgorithm{TVertex,TEdge,TGraph}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public CondensationGraphAlgorithm([NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph)
             : base(visitedGraph)
         {
diff --git a/src/QuikGraph/Algorithms/Condensation/CondensedEdge.cs b/src/QuikGraph/Algorithms/Condensation/CondensedEdge.cs
index 0527a6db7..e1db4f687 100644
--- a/src/QuikGraph/Algorithms/Condensation/CondensedEdge.cs
+++ b/src/QuikGraph/Algorithms/Condensation/CondensedEdge.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_SERIALIZATION
+#if SUPPORTS_SERIALIZATION
 using System;
 #endif
 using System.Collections.Generic;
@@ -24,6 +24,8 @@ public sealed class CondensedEdge<TVertex, TEdge, TGraph> : Edge<TGraph>
         /// </summary>
         /// <param name="source">The source graph.</param>
         /// <param name="target">The target graph.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public CondensedEdge([NotNull] TGraph source, [NotNull] TGraph target)
             : base(source, target)
         {
diff --git a/src/QuikGraph/Algorithms/Condensation/EdgeMergeCondensationGraphAlgorithm.cs b/src/QuikGraph/Algorithms/Condensation/EdgeMergeCondensationGraphAlgorithm.cs
index 58a997fce..d1a407706 100644
--- a/src/QuikGraph/Algorithms/Condensation/EdgeMergeCondensationGraphAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/Condensation/EdgeMergeCondensationGraphAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -19,6 +19,9 @@ public sealed class EdgeMergeCondensationGraphAlgorithm<TVertex, TEdge> : Algori
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="condensedGraph">Graph that will contains the condensation of the <paramref name="visitedGraph"/>.</param>
         /// <param name="vertexPredicate">Vertex predicate used to filter the vertices to put in the condensed graph.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="condensedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexPredicate"/> is <see langword="null"/>.</exception>
         public EdgeMergeCondensationGraphAlgorithm(
             [NotNull] IBidirectionalGraph<TVertex, TEdge> visitedGraph,
             [NotNull] IMutableBidirectionalGraph<TVertex, MergedEdge<TVertex, TEdge>> condensedGraph,
@@ -53,7 +56,9 @@ protected override void InternalCompute()
             {
                 CondensedGraph.AddVertex(vertex);
                 if (!VertexPredicate(vertex))
+                {
                     filteredVertices.Enqueue(vertex);
+                }
             }
 
             // Adding all edges
diff --git a/src/QuikGraph/Algorithms/Condensation/MergedEdge.cs b/src/QuikGraph/Algorithms/Condensation/MergedEdge.cs
index 2a1a77eb8..d430b5a13 100644
--- a/src/QuikGraph/Algorithms/Condensation/MergedEdge.cs
+++ b/src/QuikGraph/Algorithms/Condensation/MergedEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
@@ -20,6 +20,8 @@ public sealed class MergedEdge<TVertex, TEdge> : Edge<TVertex>
         /// </summary>
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public MergedEdge([NotNull] TVertex source, [NotNull] TVertex target)
             : base(source, target)
         {
@@ -40,6 +42,8 @@ public MergedEdge([NotNull] TVertex source, [NotNull] TVertex target)
         /// <param name="inEdge">First edge.</param>
         /// <param name="outEdge">Second edge.</param>
         /// <returns>The merged edge.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="inEdge"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="outEdge"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static MergedEdge<TVertex, TEdge> Merge(
@@ -63,7 +67,7 @@ public static MergedEdge<TVertex, TEdge> Merge(
     }
 
     /// <summary>
-    /// Helpers for <see cref="Condensation.MergedEdge{TVertex,TEdge}"/>.
+    /// Helpers for <see cref="MergedEdge{TVertex,TEdge}"/>.
     /// </summary>
     public static class MergedEdge
     {
diff --git a/src/QuikGraph/Algorithms/ConnectedComponents/ConnectedComponentsAlgorithm.cs b/src/QuikGraph/Algorithms/ConnectedComponents/ConnectedComponentsAlgorithm.cs
index 01b27e47f..a725eeadb 100644
--- a/src/QuikGraph/Algorithms/ConnectedComponents/ConnectedComponentsAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/ConnectedComponents/ConnectedComponentsAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using QuikGraph.Algorithms.Search;
@@ -20,6 +20,7 @@ public sealed class ConnectedComponentsAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="ConnectedComponentsAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public ConnectedComponentsAlgorithm([NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph)
             : this(visitedGraph, new Dictionary<TVertex, int>())
         {
@@ -30,6 +31,8 @@ public ConnectedComponentsAlgorithm([NotNull] IUndirectedGraph<TVertex, TEdge> v
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="components">Graph components.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="components"/> is <see langword="null"/>.</exception>
         public ConnectedComponentsAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
             [NotNull] IDictionary<TVertex, int> components)
@@ -43,6 +46,8 @@ public ConnectedComponentsAlgorithm(
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="components">Graph components.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="components"/> is <see langword="null"/>.</exception>
         public ConnectedComponentsAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
diff --git a/src/QuikGraph/Algorithms/ConnectedComponents/IncrementalConnectedComponentsAlgorithm.cs b/src/QuikGraph/Algorithms/ConnectedComponents/IncrementalConnectedComponentsAlgorithm.cs
index 7e0d5872a..4f953368d 100644
--- a/src/QuikGraph/Algorithms/ConnectedComponents/IncrementalConnectedComponentsAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/ConnectedComponents/IncrementalConnectedComponentsAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -25,6 +25,7 @@ public sealed class IncrementalConnectedComponentsAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="IncrementalConnectedComponentsAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public IncrementalConnectedComponentsAlgorithm(
             [NotNull] IMutableVertexAndEdgeSet<TVertex, TEdge> visitedGraph)
             : this(null, visitedGraph)
@@ -36,6 +37,7 @@ public IncrementalConnectedComponentsAlgorithm(
         /// </summary>
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public IncrementalConnectedComponentsAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IMutableVertexAndEdgeSet<TVertex, TEdge> visitedGraph)
@@ -52,11 +54,15 @@ protected override void InternalCompute()
 
             // Initialize one set per vertex
             foreach (TVertex vertex in VisitedGraph.Vertices)
+            {
                 _sets.MakeSet(vertex);
+            }
 
             // Join existing edges
             foreach (TEdge edge in VisitedGraph.Edges)
+            {
                 _sets.Union(edge.Source, edge.Target);
+            }
 
             // Hook to graph event
             if (_hooked)
@@ -75,6 +81,7 @@ protected override void InternalCompute()
         /// <summary>
         /// Number of components.
         /// </summary>
+        /// <exception cref="T:System.InvalidOperationException">The algorithm has not been run.</exception>
         public int ComponentCount
         {
             get
@@ -92,6 +99,7 @@ public int ComponentCount
         /// Value contains the vertex -> component index map.
         /// </summary>
         /// <returns>Number of components associated to components vertex mapping.</returns>
+        /// <exception cref="T:System.InvalidOperationException">The algorithm has not been run.</exception>
         public KeyValuePair<int, IDictionary<TVertex, int>> GetComponents()
         {
             if (_sets is null)
@@ -99,13 +107,18 @@ public KeyValuePair<int, IDictionary<TVertex, int>> GetComponents()
 
             var representatives = new Dictionary<TVertex, int>(_sets.SetCount);
             if (_components is null)
+            {
                 _components = new Dictionary<TVertex, int>(VisitedGraph.VertexCount);
+            }
+
             foreach (TVertex vertex in VisitedGraph.Vertices)
             {
                 TVertex representative = _sets.FindSet(vertex);
                 // ReSharper disable once AssignNullToNotNullAttribute, Justification: All graph vertices are in a set
                 if (!representatives.TryGetValue(representative, out int index))
+                {
                     representatives[representative] = index = representatives.Count;
+                }
                 _components[vertex] = index;
             }
 
diff --git a/src/QuikGraph/Algorithms/ConnectedComponents/StronglyConnectedComponentAlgorithm.cs b/src/QuikGraph/Algorithms/ConnectedComponents/StronglyConnectedComponentAlgorithm.cs
index fe1391248..fcfe43cee 100644
--- a/src/QuikGraph/Algorithms/ConnectedComponents/StronglyConnectedComponentAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/ConnectedComponents/StronglyConnectedComponentAlgorithm.cs
@@ -31,6 +31,7 @@ public sealed class StronglyConnectedComponentsAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="StronglyConnectedComponentsAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public StronglyConnectedComponentsAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph)
             : this(visitedGraph, new Dictionary<TVertex, int>())
@@ -42,6 +43,8 @@ public StronglyConnectedComponentsAlgorithm(
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="components">Graph components.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="components"/> is <see langword="null"/>.</exception>
         public StronglyConnectedComponentsAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] IDictionary<TVertex, int> components)
@@ -55,6 +58,8 @@ public StronglyConnectedComponentsAlgorithm(
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="components">Graph components.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="components"/> is <see langword="null"/>.</exception>
         public StronglyConnectedComponentsAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
diff --git a/src/QuikGraph/Algorithms/ConnectedComponents/WeaklyConnectedComponentsAlgorithm.cs b/src/QuikGraph/Algorithms/ConnectedComponents/WeaklyConnectedComponentsAlgorithm.cs
index 7fa28ce83..baf624a3f 100644
--- a/src/QuikGraph/Algorithms/ConnectedComponents/WeaklyConnectedComponentsAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/ConnectedComponents/WeaklyConnectedComponentsAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -35,6 +35,7 @@ public sealed class WeaklyConnectedComponentsAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="WeaklyConnectedComponentsAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public WeaklyConnectedComponentsAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph)
             : this(visitedGraph, new Dictionary<TVertex, int>())
@@ -46,6 +47,8 @@ public WeaklyConnectedComponentsAlgorithm(
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="components">Graph components.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="components"/> is <see langword="null"/>.</exception>
         public WeaklyConnectedComponentsAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] IDictionary<TVertex, int> components)
@@ -59,6 +62,8 @@ public WeaklyConnectedComponentsAlgorithm(
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="components">Graph components.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="components"/> is <see langword="null"/>.</exception>
         public WeaklyConnectedComponentsAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
@@ -104,7 +109,6 @@ public BidirectionalGraph<TVertex, TEdge>[] Graphs
 
                 return _graphs;
             }
-
         }
 
         #region AlgorithmBase<TGraph>
@@ -175,7 +179,9 @@ private void MergeEquivalentComponents()
                 int component = Components[vertex];
                 int equivalent = GetComponentEquivalence(component);
                 if (component != equivalent)
+                {
                     Components[vertex] = equivalent;
+                }
             }
         }
 
@@ -206,7 +212,9 @@ private void ReduceComponentsIndexes()
             {
                 int component = Components[vertex];
                 if (_componentEquivalences.TryGetValue(component, out int newComponentValue))
+                {
                     Components[vertex] = newComponentValue;
+                }
             }
         }
 
@@ -273,12 +281,11 @@ private int GetComponentEquivalence(int component)
             // Path compression
             if (compress)
             {
-                int c = component;
-                temp = _componentEquivalences[c];
+                temp = _componentEquivalences[component];
                 while (temp != equivalent)
                 {
-                    temp = _componentEquivalences[c];
-                    _componentEquivalences[c] = equivalent;
+                    temp = _componentEquivalences[component];
+                    _componentEquivalences[component] = equivalent;
                 }
             }
 
diff --git a/src/QuikGraph/Algorithms/EulerianTrailAlgorithm.cs b/src/QuikGraph/Algorithms/EulerianTrailAlgorithm.cs
index ebd4dbbaf..5f73ff568 100644
--- a/src/QuikGraph/Algorithms/EulerianTrailAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/EulerianTrailAlgorithm.cs
@@ -32,6 +32,7 @@ public sealed class EulerianTrailAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="EulerianTrailAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public EulerianTrailAlgorithm(
             [NotNull] IMutableVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph)
             : this(null, visitedGraph)
@@ -43,6 +44,7 @@ public EulerianTrailAlgorithm(
         /// </summary>
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public EulerianTrailAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IMutableVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph)
@@ -149,7 +151,7 @@ private bool Search([NotNull] TVertex vertex)
                 _temporaryCircuit.Remove(edge);
             }
 
-            // It's a dead end.
+            // It's a dead end
             return false;
         }
 
@@ -182,6 +184,7 @@ private bool Visit()
         /// </summary>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>Number of Eulerian trails.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         public static int ComputeEulerianPathCount(
             [NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> graph)
@@ -256,12 +259,13 @@ protected override void InternalCompute()
                 return;
 
             if (!TryGetRootVertex(out TVertex root))
+            {
                 root = VisitedGraph.Vertices.First();
+            }
 
             _currentVertex = root;
 
             // Start search
-            // ReSharper disable once AssignNullToNotNullAttribute, Justification: Found vertex cannot be null
             Search(_currentVertex);
             if (CircuitAugmentation())
                 return; // Circuit is found
@@ -323,6 +327,11 @@ private bool FindAdjacentOddVertex(
         /// </summary>
         /// <param name="edgeFactory">Edge factory method.</param>
         /// <returns>Temporary edges list.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">
+        /// Number of odd vertices is not even, failed to add temporary edge to <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>,
+        /// or failed to compute eulerian trail.
+        /// </exception>
         [NotNull, ItemNotNull]
         public TEdge[] AddTemporaryEdges([NotNull, InstantHandle] EdgeFactory<TVertex, TEdge> edgeFactory)
         {
@@ -393,7 +402,9 @@ public void RemoveTemporaryEdges()
         {
             // Remove from graph
             foreach (TEdge edge in _temporaryEdges)
+            {
                 VisitedGraph.RemoveEdge(edge);
+            }
             _temporaryEdges.Clear();
         }
 
@@ -421,7 +432,9 @@ public IEnumerable<ICollection<TEdge>> Trails()
                     trail = new List<TEdge>();
                 }
                 else
+                {
                     trail.Add(edge);
+                }
             }
 
             if (trail.Count != 0)
@@ -455,7 +468,8 @@ public IEnumerable<ICollection<TEdge>> Trails()
         /// </remarks>
         /// <param name="startingVertex">Starting vertex.</param>
         /// <returns>Eulerian trail set, all starting at <paramref name="startingVertex"/>.</returns>
-        /// <exception cref="InvalidOperationException">Eulerian trail not computed yet.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="startingVertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Eulerian trail not computed yet.</exception>
         [NotNull, ItemNotNull]
         public IEnumerable<ICollection<TEdge>> Trails([NotNull] TVertex startingVertex)
         {
@@ -465,6 +479,7 @@ public IEnumerable<ICollection<TEdge>> Trails([NotNull] TVertex startingVertex)
             return TrailsInternal(startingVertex);
         }
 
+        [Pure]
         private int FindFirstEdgeInCircuit([NotNull] TVertex startingVertex)
         {
             int i;
@@ -514,7 +529,9 @@ private IEnumerable<ICollection<TEdge>> TrailsInternal([NotNull] TVertex startin
                         trail = new List<TEdge>(path);
                     }
                     else
+                    {
                         trail.Add(edge);
+                    }
                 }
 
                 // Starting again on the circuit
@@ -534,7 +551,9 @@ private IEnumerable<ICollection<TEdge>> TrailsInternal([NotNull] TVertex startin
                         trail = new List<TEdge>(path);
                     }
                     else
+                    {
                         trail.Add(edge);
+                    }
                 }
             }
 
diff --git a/src/QuikGraph/Algorithms/Exploration/CloneableVertexGraphExplorerAlgorithm.cs b/src/QuikGraph/Algorithms/Exploration/CloneableVertexGraphExplorerAlgorithm.cs
index d58c4c37d..743e79945 100644
--- a/src/QuikGraph/Algorithms/Exploration/CloneableVertexGraphExplorerAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/Exploration/CloneableVertexGraphExplorerAlgorithm.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_CLONEABLE
+#if SUPPORTS_CLONEABLE
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -23,6 +23,7 @@ public sealed class CloneableVertexGraphExplorerAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="CloneableVertexGraphExplorerAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public CloneableVertexGraphExplorerAlgorithm(
             [NotNull] IMutableVertexAndEdgeSet<TVertex, TEdge> visitedGraph)
             : this(null, visitedGraph)
@@ -34,6 +35,7 @@ public CloneableVertexGraphExplorerAlgorithm(
         /// </summary>
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public CloneableVertexGraphExplorerAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IMutableVertexAndEdgeSet<TVertex, TEdge> visitedGraph)
@@ -54,6 +56,7 @@ public CloneableVertexGraphExplorerAlgorithm(
         /// <summary>
         /// Predicate that a vertex must match to be added in the graph.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
         [NotNull]
         public VertexPredicate<TVertex> AddVertexPredicate
         {
@@ -67,6 +70,7 @@ public VertexPredicate<TVertex> AddVertexPredicate
         /// <summary>
         /// Predicate that checks if a given vertex should be explored or ignored.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
         [NotNull]
         public VertexPredicate<TVertex> ExploreVertexPredicate
         {
@@ -80,6 +84,7 @@ public VertexPredicate<TVertex> ExploreVertexPredicate
         /// <summary>
         /// Predicate that an edge must match to be added in the graph.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
         [NotNull]
         public EdgePredicate<TVertex, TEdge> AddEdgePredicate
         {
@@ -94,6 +99,7 @@ public EdgePredicate<TVertex, TEdge> AddEdgePredicate
         /// <summary>
         /// Predicate that checks if the exploration is finished or not.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
         [NotNull]
         public Predicate<CloneableVertexGraphExplorerAlgorithm<TVertex, TEdge>> FinishedPredicate
         {
@@ -174,6 +180,7 @@ private void OnEdgeSkipped([NotNull] TEdge edge)
         /// Adds a new <see cref="ITransitionFactory{TVertex,TEdge}"/> to this algorithm.
         /// </summary>
         /// <param name="transitionFactory">Transition factory to add.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="transitionFactory"/> is <see langword="null"/>.</exception>
         public void AddTransitionFactory([NotNull] ITransitionFactory<TVertex, TEdge> transitionFactory)
         {
             if (transitionFactory is null)
@@ -186,6 +193,7 @@ public void AddTransitionFactory([NotNull] ITransitionFactory<TVertex, TEdge> tr
         /// Adds new <see cref="ITransitionFactory{TVertex,TEdge}"/>s to this algorithm.
         /// </summary>
         /// <param name="transitionFactories">Transition factories to add.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="transitionFactories"/> is <see langword="null"/>.</exception>
         public void AddTransitionFactories(
             [NotNull, ItemNotNull] IEnumerable<ITransitionFactory<TVertex, TEdge>> transitionFactories)
         {
@@ -248,7 +256,7 @@ protected override void InternalCompute()
                 }
 
                 TVertex current = _unExploredVertices.Dequeue();
-                TVertex clone = (TVertex)current.Clone();
+                var clone = (TVertex)current.Clone();
 
                 // Let's make sure we want to explore this one
                 if (!ExploreVertexPredicate(clone))
@@ -341,9 +349,13 @@ public DefaultFinishedPredicate(int maxVertexCount, int maxEdgeCount)
             /// </summary>
             /// <param name="algorithm">Algorithm explorer to check.</param>
             /// <returns>True if the explorer can continue to explore, false otherwise.</returns>
+            /// <exception cref="T:System.ArgumentNullException"><paramref name="algorithm"/> is <see langword="null"/>.</exception>
             [Pure]
-            public bool Test(CloneableVertexGraphExplorerAlgorithm<TVertex, TEdge> algorithm)
+            public bool Test([NotNull] CloneableVertexGraphExplorerAlgorithm<TVertex, TEdge> algorithm)
             {
+                if (algorithm is null)
+                    throw new ArgumentNullException(nameof(algorithm));
+
                 if (algorithm.VisitedGraph.VertexCount > MaxVertexCount)
                     return false;
 
diff --git a/src/QuikGraph/Algorithms/Exploration/ITransitionFactory.cs b/src/QuikGraph/Algorithms/Exploration/ITransitionFactory.cs
index 71a030234..3cece82be 100644
--- a/src/QuikGraph/Algorithms/Exploration/ITransitionFactory.cs
+++ b/src/QuikGraph/Algorithms/Exploration/ITransitionFactory.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_CLONEABLE
+#if SUPPORTS_CLONEABLE
 using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
@@ -23,6 +23,7 @@ public interface ITransitionFactory<in TVertex, TEdge>
         /// </summary>
         /// <param name="vertex">Vertex to check.</param>
         /// <returns>True if the vertex is valid, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         bool IsValid([NotNull] TVertex vertex);
 
         /// <summary>
@@ -30,6 +31,7 @@ public interface ITransitionFactory<in TVertex, TEdge>
         /// </summary>
         /// <param name="source">Source vertex.</param>
         /// <returns>Edges resulting of the apply.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
         [NotNull, ItemNotNull]
         IEnumerable<TEdge> Apply([NotNull] TVertex source);
     }
diff --git a/src/QuikGraph/Algorithms/Exploration/TransitionFactoryImplicitGraph.cs b/src/QuikGraph/Algorithms/Exploration/TransitionFactoryImplicitGraph.cs
index 7fae07a22..651c73c08 100644
--- a/src/QuikGraph/Algorithms/Exploration/TransitionFactoryImplicitGraph.cs
+++ b/src/QuikGraph/Algorithms/Exploration/TransitionFactoryImplicitGraph.cs
@@ -55,6 +55,7 @@ private void MoveMainCacheToNotProcessedVertices()
         /// Adds a new <see cref="ITransitionFactory{TVertex,TEdge}"/> to this graph.
         /// </summary>
         /// <param name="transitionFactory">Transition factory to add.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="transitionFactory"/> is <see langword="null"/>.</exception>
         public void AddTransitionFactory([NotNull] ITransitionFactory<TVertex, TEdge> transitionFactory)
         {
             if (transitionFactory is null)
@@ -68,6 +69,7 @@ public void AddTransitionFactory([NotNull] ITransitionFactory<TVertex, TEdge> tr
         /// Adds new <see cref="ITransitionFactory{TVertex,TEdge}"/>s to this graph.
         /// </summary>
         /// <param name="transitionFactories">Transition factories to add.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="transitionFactories"/> is <see langword="null"/>.</exception>
         public void AddTransitionFactories(
             [NotNull, ItemNotNull] IEnumerable<ITransitionFactory<TVertex, TEdge>> transitionFactories)
         {
@@ -97,10 +99,12 @@ public bool RemoveTransitionFactory([CanBeNull] ITransitionFactory<TVertex, TEdg
 
             void CleanNotProcessedCache()
             {
-                foreach (var pair in _verticesNotProcessedCache.ToArray())
+                foreach (KeyValuePair<TVertex, HashSet<ITransitionFactory<TVertex, TEdge>>> pair in _verticesNotProcessedCache.ToArray())
                 {
                     if (pair.Value.Count == 0 || pair.Value.Contains(transitionFactory))
+                    {
                         _verticesNotProcessedCache.Remove(pair.Key);
+                    }
                 }
             }
 
@@ -133,6 +137,7 @@ public bool ContainsTransitionFactory([CanBeNull] ITransitionFactory<TVertex, TE
         /// <summary>
         /// Predicate that a vertex must match to be the successor (target) of an edge.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
         [NotNull]
         public VertexPredicate<TVertex> SuccessorVertexPredicate
         {
@@ -150,6 +155,7 @@ public VertexPredicate<TVertex> SuccessorVertexPredicate
         /// <summary>
         /// Predicate that an edge must match to be the successor of a source vertex.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
         [NotNull]
         public EdgePredicate<TVertex, TEdge> SuccessorEdgePredicate
         {
@@ -240,7 +246,9 @@ private IEdgeList<TVertex, TEdge> ExploreFactoriesForVertex([NotNull] TVertex ve
                     continue;
 
                 if (edges is null)
+                {
                     edges = new EdgeList<TVertex, TEdge>();
+                }
 
                 foreach (TEdge edge in transitionFactory.Apply(vertex).Where(edge => SuccessorVertexPredicate(edge.Target)))
                 {
@@ -264,16 +272,16 @@ public bool TryGetOutEdges(TVertex vertex, out IEnumerable<TEdge> edges)
 
             bool wasNotProcessed = _verticesNotProcessedCache.Remove(vertex);
 
-            if (!_verticesEdgesCache.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> e))
+            if (!_verticesEdgesCache.TryGetValue(vertex, out IEdgeList<TVertex, TEdge> edgeList))
             {
-                e = ExploreFactoriesForVertex(vertex);
+                edgeList = ExploreFactoriesForVertex(vertex);
 
-                if (e is null)
+                if (edgeList is null)
                 {
                     // Vertex has no out edges
                     if (wasNotProcessed)
                     {
-                        e = new EdgeList<TVertex, TEdge>();
+                        edgeList = new EdgeList<TVertex, TEdge>();
                     }
                     else
                     {
@@ -282,10 +290,10 @@ public bool TryGetOutEdges(TVertex vertex, out IEnumerable<TEdge> edges)
                     }
                 }
 
-                _verticesEdgesCache[vertex] = e;
+                _verticesEdgesCache[vertex] = edgeList;
             }
 
-            edges = e.AsEnumerable();
+            edges = edgeList.AsEnumerable();
             return true;
         }
 
diff --git a/src/QuikGraph/Algorithms/GraphPartition/KernighanLinAlgorithm.cs b/src/QuikGraph/Algorithms/GraphPartition/KernighanLinAlgorithm.cs
index 408199dde..0cf86246f 100644
--- a/src/QuikGraph/Algorithms/GraphPartition/KernighanLinAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/GraphPartition/KernighanLinAlgorithm.cs
@@ -32,6 +32,7 @@ public sealed class KernighanLinAlgorithm<TVertex, TEdge> : AlgorithmBase<IUndir
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="nbIterations">Number of iterations to perform.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public KernighanLinAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
             int nbIterations)
@@ -134,9 +135,13 @@ private double GetVertexCost([NotNull] TVertex vertex)
                     continue;
 
                 if (vertexIsInA != vertexNeighborIsInA) // External
+                {
                     cost += edge.Tag;
+                }
                 else
+                {
                     cost -= edge.Tag;
+                }
             }
 
             return cost;
@@ -156,7 +161,9 @@ private IEnumerable<TVertex> GetNeighbors([NotNull] TVertex vertex)
             }
 
             if (neighbors.Contains(vertex))
+            {
                 neighbors.Remove(vertex);
+            }
 
             return neighbors;
         }
@@ -226,9 +233,13 @@ private void GetStartPartition()
             foreach (TVertex vertex in VisitedGraph.Vertices)
             {
                 if (i < _partitionSize)
+                {
                     _vertexSetA.Add(vertex);
+                }
                 else
+                {
                     _vertexSetB.Add(vertex);
+                }
 
                 ++i;
             }
diff --git a/src/QuikGraph/Algorithms/GraphPartition/Partition.cs b/src/QuikGraph/Algorithms/GraphPartition/Partition.cs
index 784813b7f..e54b02b9f 100644
--- a/src/QuikGraph/Algorithms/GraphPartition/Partition.cs
+++ b/src/QuikGraph/Algorithms/GraphPartition/Partition.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_SORTEDSET
+#if SUPPORTS_SORTEDSET
 using System.Collections.Generic;
 #else
 using QuikGraph.Collections;
@@ -36,6 +36,8 @@ public struct Partition<TVertex>
         /// <param name="vertexSetA">First partition vertex set.</param>
         /// <param name="vertexSetB">Second partition vertex set.</param>
         /// <param name="cutCost">Cost of the partition cut.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexSetA"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexSetB"/> is <see langword="null"/>.</exception>
         public Partition(
             [NotNull, ItemNotNull] SortedSet<TVertex> vertexSetA,
             [NotNull, ItemNotNull] SortedSet<TVertex> vertexSetB, 
@@ -52,6 +54,7 @@ public Partition(
         /// <param name="partition1">First partition.</param>
         /// <param name="partition2">Second partition.</param>
         /// <returns>True if both partitions are at least equivalent, false otherwise.</returns>
+        [Pure]
         public static bool AreEquivalent(Partition<TVertex> partition1, Partition<TVertex> partition2)
         {
             return partition1.VertexSetA.SetEquals(partition2.VertexSetA) 
@@ -74,6 +77,7 @@ public static class PartitionHelpers
         /// <param name="partition1">First partition.</param>
         /// <param name="partition2">Second partition.</param>
         /// <returns>True if both partitions are at least equivalent, false otherwise.</returns>
+        [Pure]
         public static bool AreEquivalent<TVertex>(Partition<TVertex> partition1, Partition<TVertex> partition2)
         {
             return Partition<TVertex>.AreEquivalent(partition1, partition2);
diff --git a/src/QuikGraph/Algorithms/IsEulerianGraphAlgorithm.cs b/src/QuikGraph/Algorithms/IsEulerianGraphAlgorithm.cs
index c42e7202f..8edb4a5a6 100644
--- a/src/QuikGraph/Algorithms/IsEulerianGraphAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/IsEulerianGraphAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -22,6 +22,7 @@ public class IsEulerianGraphAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="IsEulerianGraphAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="graph">Graph to check.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         public IsEulerianGraphAlgorithm([NotNull] IUndirectedGraph<TVertex, TEdge> graph)
         {
             if (graph is null)
@@ -139,6 +140,7 @@ public static class IsEulerianGraphAlgorithm
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to check.</param>
         /// <returns>True if the <paramref name="graph"/> is Eulerian, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         public static bool IsEulerian<TVertex, TEdge>(
             [NotNull] IUndirectedGraph<TVertex, TEdge> graph)
diff --git a/src/QuikGraph/Algorithms/IsHamiltonianGraphAlgorithm.cs b/src/QuikGraph/Algorithms/IsHamiltonianGraphAlgorithm.cs
index 0c0420bed..0323a1d76 100644
--- a/src/QuikGraph/Algorithms/IsHamiltonianGraphAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/IsHamiltonianGraphAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using JetBrains.Annotations;
@@ -23,6 +23,7 @@ public class IsHamiltonianGraphAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="IsHamiltonianGraphAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="graph">Graph to check.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         public IsHamiltonianGraphAlgorithm([NotNull] IUndirectedGraph<TVertex, TEdge> graph)
         {
             if (graph is null)
@@ -143,6 +144,7 @@ public static class IsHamiltonianGraphAlgorithm
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to check.</param>
         /// <returns>True if the <paramref name="graph"/> is Hamiltonian, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         public static bool IsHamiltonian<TVertex, TEdge>(
             [NotNull] IUndirectedGraph<TVertex, TEdge> graph)
diff --git a/src/QuikGraph/Algorithms/MaximumBipartiteMatchingAlgorithm.cs b/src/QuikGraph/Algorithms/MaximumBipartiteMatchingAlgorithm.cs
index 9d3ea5660..efd9bf1fd 100644
--- a/src/QuikGraph/Algorithms/MaximumBipartiteMatchingAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/MaximumBipartiteMatchingAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using QuikGraph.Algorithms.MaximumFlow;
@@ -22,6 +22,11 @@ public sealed class MaximumBipartiteMatchingAlgorithm<TVertex, TEdge> : Algorith
         /// <param name="verticesToSink">Vertices from which creating augmented edge to super sink.</param>
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="sourceToVertices"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesToSink"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
         public MaximumBipartiteMatchingAlgorithm(
             [NotNull] IMutableVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
             [NotNull, ItemNotNull] IEnumerable<TVertex> sourceToVertices,
diff --git a/src/QuikGraph/Algorithms/MaximumFlow/AllVerticesGraphAugmentorAlgorithm.cs b/src/QuikGraph/Algorithms/MaximumFlow/AllVerticesGraphAugmentorAlgorithm.cs
index 7da30aaa1..6ffcf20b1 100644
--- a/src/QuikGraph/Algorithms/MaximumFlow/AllVerticesGraphAugmentorAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/MaximumFlow/AllVerticesGraphAugmentorAlgorithm.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using QuikGraph.Algorithms.Services;
 
 namespace QuikGraph.Algorithms.MaximumFlow
@@ -19,6 +19,9 @@ public sealed class AllVerticesGraphAugmentorAlgorithm<TVertex, TEdge>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
         public AllVerticesGraphAugmentorAlgorithm(
             [NotNull] IMutableVertexAndEdgeSet<TVertex, TEdge> visitedGraph,
             [NotNull] VertexFactory<TVertex> vertexFactory,
@@ -34,6 +37,9 @@ public AllVerticesGraphAugmentorAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
         public AllVerticesGraphAugmentorAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IMutableVertexAndEdgeSet<TVertex, TEdge> visitedGraph,
diff --git a/src/QuikGraph/Algorithms/MaximumFlow/BipartiteToMaximumFlowGraphAugmentorAlgorithm.cs b/src/QuikGraph/Algorithms/MaximumFlow/BipartiteToMaximumFlowGraphAugmentorAlgorithm.cs
index 150168444..88d109be2 100644
--- a/src/QuikGraph/Algorithms/MaximumFlow/BipartiteToMaximumFlowGraphAugmentorAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/MaximumFlow/BipartiteToMaximumFlowGraphAugmentorAlgorithm.cs
@@ -26,6 +26,11 @@ internal sealed class BipartiteToMaximumFlowGraphAugmentorAlgorithm<TVertex, TEd
         /// <param name="verticesToSink">Vertices from which creating augmented edge to super sink.</param>
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="sourceToVertices"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesToSink"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
         public BipartiteToMaximumFlowGraphAugmentorAlgorithm(
             [NotNull] IMutableVertexAndEdgeSet<TVertex, TEdge> visitedGraph,
             [NotNull, ItemNotNull] IEnumerable<TVertex> sourceToVertices,
@@ -45,6 +50,11 @@ public BipartiteToMaximumFlowGraphAugmentorAlgorithm(
         /// <param name="verticesToSink">Vertices from which creating augmented edge to super sink.</param>
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="sourceToVertices"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesToSink"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
         public BipartiteToMaximumFlowGraphAugmentorAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IMutableVertexAndEdgeSet<TVertex, TEdge> visitedGraph,
diff --git a/src/QuikGraph/Algorithms/MaximumFlow/EdmondsKarpMaximumFlowAlgorithm.cs b/src/QuikGraph/Algorithms/MaximumFlow/EdmondsKarpMaximumFlowAlgorithm.cs
index 288e1c1dd..07af24118 100644
--- a/src/QuikGraph/Algorithms/MaximumFlow/EdmondsKarpMaximumFlowAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/MaximumFlow/EdmondsKarpMaximumFlowAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -27,6 +27,11 @@ public sealed class EdmondsKarpMaximumFlowAlgorithm<TVertex, TEdge> : MaximumFlo
         /// <param name="capacities">Function that given an edge return the capacity of this edge.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
         /// <param name="reverseEdgesAugmentorAlgorithm">Algorithm that is in of charge of augmenting the graph (creating missing reversed edges).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="capacities"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="reverseEdgesAugmentorAlgorithm"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="reverseEdgesAugmentorAlgorithm"/> targets a graph different from <paramref name="visitedGraph"/>.</exception>
         public EdmondsKarpMaximumFlowAlgorithm(
             [NotNull] IMutableVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> capacities,
@@ -44,6 +49,11 @@ public EdmondsKarpMaximumFlowAlgorithm(
         /// <param name="capacities">Function that given an edge return the capacity of this edge.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
         /// <param name="reverseEdgesAugmentorAlgorithm">Algorithm that is in of charge augmenting the graph (creating missing reversed edges).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="capacities"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="reverseEdgesAugmentorAlgorithm"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="reverseEdgesAugmentorAlgorithm"/> targets a graph different from <paramref name="visitedGraph"/>.</exception>
         public EdmondsKarpMaximumFlowAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IMutableVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
@@ -156,12 +166,16 @@ protected override void InternalCompute()
                     bfs.Compute(Source);
 
                 if (VerticesColors[Sink] != GraphColor.White)
+                {
                     Augment(Source, Sink);
+                }
             }
 
             MaxFlow = 0;
             foreach (TEdge edge in graph.OutEdges(Source))
-                MaxFlow += (Capacities(edge) - ResidualCapacities[edge]);
+            {
+                MaxFlow += Capacities(edge) - ResidualCapacities[edge];
+            }
         }
 
         #endregion
diff --git a/src/QuikGraph/Algorithms/MaximumFlow/GraphAugmentorAlgorithmBase.cs b/src/QuikGraph/Algorithms/MaximumFlow/GraphAugmentorAlgorithmBase.cs
index 0c69b3ba0..1454c1a57 100644
--- a/src/QuikGraph/Algorithms/MaximumFlow/GraphAugmentorAlgorithmBase.cs
+++ b/src/QuikGraph/Algorithms/MaximumFlow/GraphAugmentorAlgorithmBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -23,6 +23,9 @@ public abstract class GraphAugmentorAlgorithmBase<TVertex, TEdge, TGraph> : Algo
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
         protected GraphAugmentorAlgorithmBase(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] TGraph visitedGraph,
diff --git a/src/QuikGraph/Algorithms/MaximumFlow/GraphBalancingAlgorithm.cs b/src/QuikGraph/Algorithms/MaximumFlow/GraphBalancingAlgorithm.cs
index a7f5b0871..b60d0c345 100644
--- a/src/QuikGraph/Algorithms/MaximumFlow/GraphBalancingAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/MaximumFlow/GraphBalancingAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -26,6 +26,13 @@ public sealed class GraphBalancerAlgorithm<TVertex, TEdge>
         /// <param name="sink">Flow sink vertex.</param>
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="sink"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="visitedGraph"/> does not contain <paramref name="source"/> vertex.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="visitedGraph"/> does not contain <paramref name="sink"/> vertex.</exception>
         public GraphBalancerAlgorithm(
             [NotNull] IMutableBidirectionalGraph<TVertex, TEdge> visitedGraph,
             [NotNull] TVertex source,
@@ -68,6 +75,14 @@ public GraphBalancerAlgorithm(
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
         /// <param name="capacities">Edges capacities.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="sink"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="capacities"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="visitedGraph"/> does not contain <paramref name="source"/> vertex.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="visitedGraph"/> does not contain <paramref name="sink"/> vertex.</exception>
         public GraphBalancerAlgorithm(
             [NotNull] IMutableBidirectionalGraph<TVertex, TEdge> visitedGraph,
             [NotNull] TVertex source,
@@ -95,7 +110,9 @@ public GraphBalancerAlgorithm(
 
             // Setting preflow = l(e) = 1
             foreach (TEdge edge in VisitedGraph.Edges)
+            {
                 _preFlow.Add(edge, 1);
+            }
         }
 
         /// <summary>
@@ -266,12 +283,7 @@ public int GetBalancingIndex([NotNull] TVertex vertex)
             if (vertex == null)
                 throw new ArgumentNullException(nameof(vertex));
 
-            int balancingIndex = 0;
-            foreach (TEdge edge in VisitedGraph.OutEdges(vertex))
-            {
-                int preFlow = _preFlow[edge];
-                balancingIndex += preFlow;
-            }
+            int balancingIndex = VisitedGraph.OutEdges(vertex).Sum(edge => _preFlow[edge]);
 
             foreach (TEdge edge in VisitedGraph.InEdges(vertex))
             {
@@ -285,7 +297,7 @@ public int GetBalancingIndex([NotNull] TVertex vertex)
         /// <summary>
         /// Runs the graph balancing algorithm.
         /// </summary>
-        /// <exception cref="InvalidOperationException">If the graph is already balanced.</exception>
+        /// <exception cref="T:System.InvalidOperationException">If the graph is already balanced.</exception>
         public void Balance()
         {
             if (Balanced)
@@ -375,7 +387,7 @@ bool IsSourceOrSink(TVertex v)
         /// <summary>
         /// Runs the graph unbalancing algorithm.
         /// </summary>
-        /// <exception cref="InvalidOperationException">If the graph is not balanced.</exception>
+        /// <exception cref="T:System.InvalidOperationException">If the graph is not balanced.</exception>
         public void UnBalance()
         {
             if (!Balanced)
diff --git a/src/QuikGraph/Algorithms/MaximumFlow/MaximumFlowAlgorithmBase.cs b/src/QuikGraph/Algorithms/MaximumFlow/MaximumFlowAlgorithmBase.cs
index 9e2b688a5..c123fbf70 100644
--- a/src/QuikGraph/Algorithms/MaximumFlow/MaximumFlowAlgorithmBase.cs
+++ b/src/QuikGraph/Algorithms/MaximumFlow/MaximumFlowAlgorithmBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using QuikGraph.Algorithms.Services;
@@ -22,6 +22,9 @@ public abstract class MaximumFlowAlgorithm<TVertex, TEdge>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="capacities">Function that given an edge return the capacity of this edge.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="capacities"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
         protected MaximumFlowAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IMutableVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
@@ -103,11 +106,16 @@ public GraphColor GetVertexColor(TVertex vertex)
         #endregion
 
         /// <summary>
-        /// Compute the maximum flow value.
+        /// Computes the maximum flow value.
         /// </summary>
         /// <param name="source">Flow source vertex.</param>
         /// <param name="sink">Flow sink vertex.</param>
         /// <returns>Maximum flow value.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="sink"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Something went wrong when running the algorithm.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="source"/> is not part of <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="sink"/> is not part of <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.</exception>
         public double Compute([NotNull] TVertex source, [NotNull] TVertex sink)
         {
             if (source == null)
@@ -123,5 +131,4 @@ public double Compute([NotNull] TVertex source, [NotNull] TVertex sink)
             return MaxFlow;
         }
     }
-
 }
\ No newline at end of file
diff --git a/src/QuikGraph/Algorithms/MaximumFlow/MultiSourceSinkGraphAugmentorAlgorithm.cs b/src/QuikGraph/Algorithms/MaximumFlow/MultiSourceSinkGraphAugmentorAlgorithm.cs
index be5d89f24..1dea09bf3 100644
--- a/src/QuikGraph/Algorithms/MaximumFlow/MultiSourceSinkGraphAugmentorAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/MaximumFlow/MultiSourceSinkGraphAugmentorAlgorithm.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using QuikGraph.Algorithms.Services;
 
 namespace QuikGraph.Algorithms.MaximumFlow
@@ -18,6 +18,9 @@ public sealed class MultiSourceSinkGraphAugmentorAlgorithm<TVertex, TEdge>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
         public MultiSourceSinkGraphAugmentorAlgorithm(
             [NotNull] IMutableBidirectionalGraph<TVertex, TEdge> visitedGraph,
             [NotNull] VertexFactory<TVertex> vertexFactory,
@@ -33,6 +36,9 @@ public MultiSourceSinkGraphAugmentorAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="vertexFactory">Vertex factory method.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
         public MultiSourceSinkGraphAugmentorAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IMutableBidirectionalGraph<TVertex, TEdge> visitedGraph,
@@ -51,11 +57,15 @@ protected override void AugmentGraph()
 
                 // Is source
                 if (VisitedGraph.IsInEdgesEmpty(vertex))
+                {
                     AddAugmentedEdge(SuperSource, vertex);
+                }
 
                 // Is sink
                 if (VisitedGraph.IsOutEdgesEmpty(vertex))
+                {
                     AddAugmentedEdge(vertex, SuperSink);
+                }
             }
         }
     }
diff --git a/src/QuikGraph/Algorithms/MaximumFlow/ReverseEdgeAugmentorAlgorithm.cs b/src/QuikGraph/Algorithms/MaximumFlow/ReverseEdgeAugmentorAlgorithm.cs
index 15feeeebf..665d34e13 100644
--- a/src/QuikGraph/Algorithms/MaximumFlow/ReverseEdgeAugmentorAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/MaximumFlow/ReverseEdgeAugmentorAlgorithm.cs
@@ -21,6 +21,8 @@ public sealed class ReversedEdgeAugmentorAlgorithm<TVertex, TEdge> : IDisposable
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeFactory">Edge factory method.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
         public ReversedEdgeAugmentorAlgorithm(
             [NotNull] IMutableVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] EdgeFactory<TVertex, TEdge> edgeFactory)
@@ -114,7 +116,9 @@ private IEnumerable<TEdge> FindEdgesToReverse()
 
                     // Setup reversed if needed
                     if (!ReversedEdges.ContainsKey(reversedEdge))
+                    {
                         ReversedEdges[reversedEdge] = edge;
+                    }
 
                     continue;
                 }
@@ -154,7 +158,7 @@ private void AddReversedEdges([NotNull, ItemNotNull] IEnumerable<TEdge> notRever
         /// <summary>
         /// Adds auxiliary edges to <see cref="VisitedGraph"/> to store residual flows.
         /// </summary>
-        /// <exception cref="InvalidOperationException">If the graph is already augmented.</exception>
+        /// <exception cref="T:System.InvalidOperationException">If the graph is already augmented.</exception>
         public void AddReversedEdges()
         {
             if (Augmented)
@@ -172,14 +176,16 @@ public void AddReversedEdges()
         /// <summary>
         /// Removes reversed edges that were added.
         /// </summary>
-        /// <exception cref="InvalidOperationException">If the graph was not augmented yet.</exception>
+        /// <exception cref="T:System.InvalidOperationException">If the graph was not augmented yet.</exception>
         public void RemoveReversedEdges()
         {
             if (!Augmented)
                 throw new InvalidOperationException("Graph is not augmented yet.");
 
             foreach (TEdge edge in _augmentedEdges)
+            {
                 VisitedGraph.RemoveEdge(edge);
+            }
 
             _augmentedEdges.Clear();
             ReversedEdges.Clear();
@@ -193,7 +199,9 @@ public void RemoveReversedEdges()
         void IDisposable.Dispose()
         {
             if (Augmented)
+            {
                 RemoveReversedEdges();
+            }
         }
 
         #endregion
diff --git a/src/QuikGraph/Algorithms/MinimumSpanningTree/KruskalMinimumSpanningTreeAlgorithm.cs b/src/QuikGraph/Algorithms/MinimumSpanningTree/KruskalMinimumSpanningTreeAlgorithm.cs
index 2c819b9ab..7708e36c5 100644
--- a/src/QuikGraph/Algorithms/MinimumSpanningTree/KruskalMinimumSpanningTreeAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/MinimumSpanningTree/KruskalMinimumSpanningTreeAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using JetBrains.Annotations;
 using QuikGraph.Algorithms.Services;
@@ -24,6 +24,8 @@ public sealed class KruskalMinimumSpanningTreeAlgorithm<TVertex, TEdge>
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public KruskalMinimumSpanningTreeAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights)
@@ -37,6 +39,8 @@ public KruskalMinimumSpanningTreeAlgorithm(
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public KruskalMinimumSpanningTreeAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
@@ -79,13 +83,17 @@ protected override void InternalCompute()
         {
             var sets = new ForestDisjointSet<TVertex>(VisitedGraph.VertexCount);
             foreach (TVertex vertex in VisitedGraph.Vertices)
+            {
                 sets.MakeSet(vertex);
+            }
 
             ThrowIfCancellationRequested();
 
             var queue = new BinaryQueue<TEdge, double>(_edgeWeights);
             foreach (TEdge edge in VisitedGraph.Edges)
+            {
                 queue.Enqueue(edge);
+            }
 
             ThrowIfCancellationRequested();
 
diff --git a/src/QuikGraph/Algorithms/MinimumSpanningTree/PrimMinimumSpanningTreeAlgorithm.cs b/src/QuikGraph/Algorithms/MinimumSpanningTree/PrimMinimumSpanningTreeAlgorithm.cs
index 537295563..978109af3 100644
--- a/src/QuikGraph/Algorithms/MinimumSpanningTree/PrimMinimumSpanningTreeAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/MinimumSpanningTree/PrimMinimumSpanningTreeAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -26,6 +26,8 @@ public sealed class PrimMinimumSpanningTreeAlgorithm<TVertex, TEdge>
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public PrimMinimumSpanningTreeAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights)
@@ -39,6 +41,8 @@ public PrimMinimumSpanningTreeAlgorithm(
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public PrimMinimumSpanningTreeAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
diff --git a/src/QuikGraph/Algorithms/Observers/EdgePredecessorRecorderObserver.cs b/src/QuikGraph/Algorithms/Observers/EdgePredecessorRecorderObserver.cs
index ee88dd25e..1c6975f2e 100644
--- a/src/QuikGraph/Algorithms/Observers/EdgePredecessorRecorderObserver.cs
+++ b/src/QuikGraph/Algorithms/Observers/EdgePredecessorRecorderObserver.cs
@@ -30,6 +30,7 @@ public EdgePredecessorRecorderObserver()
         /// Initializes a new instance of the <see cref="EdgePredecessorRecorderObserver{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="edgesPredecessors">Edges predecessors.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgesPredecessors"/> is <see langword="null"/>.</exception>
         public EdgePredecessorRecorderObserver(
             [NotNull] IDictionary<TEdge, TEdge> edgesPredecessors)
         {
@@ -74,6 +75,7 @@ public IDisposable Attach(IEdgePredecessorRecorderAlgorithm<TVertex, TEdge> algo
         /// </summary>
         /// <param name="startingEdge">Starting edge.</param>
         /// <returns>Edge path.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="startingEdge"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         public ICollection<TEdge> Path([NotNull] TEdge startingEdge)
@@ -111,6 +113,8 @@ public IEnumerable<ICollection<TEdge>> AllPaths()
         /// <param name="startingEdge">Starting edge.</param>
         /// <param name="colors">Edges colors mapping.</param>
         /// <returns>Merged path.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="startingEdge"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="colors"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         public ICollection<TEdge> MergedPath(
@@ -175,7 +179,9 @@ private void OnEdgeDiscovered([NotNull] TEdge edge, [NotNull] TEdge targetEdge)
             Debug.Assert(targetEdge != null);
 
             if (!EqualityComparer<TEdge>.Default.Equals(edge, targetEdge))
+            {
                 EdgesPredecessors[targetEdge] = edge;
+            }
         }
 
         private void OnEdgeFinished([NotNull] TEdge finishedEdge)
diff --git a/src/QuikGraph/Algorithms/Observers/EdgeRecorderObserver.cs b/src/QuikGraph/Algorithms/Observers/EdgeRecorderObserver.cs
index 743ccf357..47e004a52 100644
--- a/src/QuikGraph/Algorithms/Observers/EdgeRecorderObserver.cs
+++ b/src/QuikGraph/Algorithms/Observers/EdgeRecorderObserver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -30,6 +30,7 @@ public EdgeRecorderObserver()
         /// Initializes a new instance of the <see cref="EdgeRecorderObserver{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="edges">Set of edges.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edges"/> is <see langword="null"/>.</exception>
         public EdgeRecorderObserver([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
         {
             if (edges is null)
diff --git a/src/QuikGraph/Algorithms/Observers/UndirectedVertexDistanceRecorderObserver.cs b/src/QuikGraph/Algorithms/Observers/UndirectedVertexDistanceRecorderObserver.cs
index 812fe2822..47421bec8 100644
--- a/src/QuikGraph/Algorithms/Observers/UndirectedVertexDistanceRecorderObserver.cs
+++ b/src/QuikGraph/Algorithms/Observers/UndirectedVertexDistanceRecorderObserver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -19,6 +19,7 @@ public sealed class UndirectedVertexDistanceRecorderObserver<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="UndirectedVertexDistanceRecorderObserver{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public UndirectedVertexDistanceRecorderObserver([NotNull] Func<TEdge, double> edgeWeights)
             : this(edgeWeights, DistanceRelaxers.EdgeShortestDistance, new Dictionary<TVertex, double>())
         {
@@ -30,6 +31,9 @@ public UndirectedVertexDistanceRecorderObserver([NotNull] Func<TEdge, double> ed
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
         /// <param name="distances">Distances per vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distances"/> is <see langword="null"/>.</exception>
         public UndirectedVertexDistanceRecorderObserver(
             [NotNull] Func<TEdge, double> edgeWeights,
             [NotNull] IDistanceRelaxer distanceRelaxer,
diff --git a/src/QuikGraph/Algorithms/Observers/UndirectedVertexPredecessorRecorderObserver.cs b/src/QuikGraph/Algorithms/Observers/UndirectedVertexPredecessorRecorderObserver.cs
index ad3600a32..39c612589 100644
--- a/src/QuikGraph/Algorithms/Observers/UndirectedVertexPredecessorRecorderObserver.cs
+++ b/src/QuikGraph/Algorithms/Observers/UndirectedVertexPredecessorRecorderObserver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -30,6 +30,7 @@ public UndirectedVertexPredecessorRecorderObserver()
         /// Initializes a new instance of the <see cref="UndirectedVertexPredecessorRecorderObserver{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="verticesPredecessors">Vertices predecessors.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesPredecessors"/> is <see langword="null"/>.</exception>
         public UndirectedVertexPredecessorRecorderObserver(
             [NotNull] IDictionary<TVertex, TEdge> verticesPredecessors)
         {
@@ -70,8 +71,10 @@ private void OnEdgeDiscovered([NotNull] object sender, [NotNull] UndirectedEdgeE
         /// <param name="vertex">Path ending vertex.</param>
         /// <param name="path">Path to the ending vertex.</param>
         /// <returns>True if a path was found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
-        public bool TryGetPath(TVertex vertex, out IEnumerable<TEdge> path)
+        [ContractAnnotation("=> true, path:notnull;=> false, path:null")]
+        public bool TryGetPath([NotNull] TVertex vertex, [ItemNotNull] out IEnumerable<TEdge> path)
         {
             return VerticesPredecessors.TryGetPath(vertex, out path);
         }
diff --git a/src/QuikGraph/Algorithms/Observers/VertexDistanceRecorderObserver.cs b/src/QuikGraph/Algorithms/Observers/VertexDistanceRecorderObserver.cs
index 85108bb1b..44c0cf683 100644
--- a/src/QuikGraph/Algorithms/Observers/VertexDistanceRecorderObserver.cs
+++ b/src/QuikGraph/Algorithms/Observers/VertexDistanceRecorderObserver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -18,6 +18,7 @@ public sealed class VertexDistanceRecorderObserver<TVertex, TEdge> : IObserver<I
         /// Initializes a new instance of the <see cref="VertexDistanceRecorderObserver{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public VertexDistanceRecorderObserver([NotNull] Func<TEdge, double> edgeWeights)
             : this(edgeWeights, DistanceRelaxers.EdgeShortestDistance, new Dictionary<TVertex, double>())
         {
@@ -29,6 +30,9 @@ public VertexDistanceRecorderObserver([NotNull] Func<TEdge, double> edgeWeights)
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
         /// <param name="distances">Distances per vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distances"/> is <see langword="null"/>.</exception>
         public VertexDistanceRecorderObserver(
             [NotNull] Func<TEdge, double> edgeWeights,
             [NotNull] IDistanceRelaxer distanceRelaxer,
@@ -76,7 +80,9 @@ private void OnEdgeDiscovered([NotNull] TEdge edge)
             Debug.Assert(edge != null);
 
             if (!Distances.TryGetValue(edge.Source, out double sourceDistance))
+            {
                 Distances[edge.Source] = sourceDistance = DistanceRelaxer.InitialDistance;
+            }
             Distances[edge.Target] = DistanceRelaxer.Combine(sourceDistance, EdgeWeights(edge));
         }
     }
diff --git a/src/QuikGraph/Algorithms/Observers/VertexPredecessorPathRecorderObserver.cs b/src/QuikGraph/Algorithms/Observers/VertexPredecessorPathRecorderObserver.cs
index 5d8742bb6..bc0a65361 100644
--- a/src/QuikGraph/Algorithms/Observers/VertexPredecessorPathRecorderObserver.cs
+++ b/src/QuikGraph/Algorithms/Observers/VertexPredecessorPathRecorderObserver.cs
@@ -31,6 +31,7 @@ public VertexPredecessorPathRecorderObserver()
         /// Initializes a new instance of the <see cref="VertexPredecessorPathRecorderObserver{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="verticesPredecessors">Vertices predecessors.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesPredecessors"/> is <see langword="null"/>.</exception>
         public VertexPredecessorPathRecorderObserver(
             [NotNull] IDictionary<TVertex, TEdge> verticesPredecessors)
         {
@@ -58,12 +59,7 @@ public VertexPredecessorPathRecorderObserver(
         public IEnumerable<IEnumerable<TEdge>> AllPaths()
         {
             return EndPathVertices
-                .Select(vertex =>
-                {
-                    if (VerticesPredecessors.TryGetPath(vertex, out IEnumerable<TEdge> path))
-                        return path;
-                    return null;
-                })
+                .Select(vertex => VerticesPredecessors.TryGetPath(vertex, out IEnumerable<TEdge> path) ? path : null)
                 .Where(path => path != null);
         }
 
diff --git a/src/QuikGraph/Algorithms/Observers/VertexPredecessorRecorderObserver.cs b/src/QuikGraph/Algorithms/Observers/VertexPredecessorRecorderObserver.cs
index fbb84d2df..ec276f012 100644
--- a/src/QuikGraph/Algorithms/Observers/VertexPredecessorRecorderObserver.cs
+++ b/src/QuikGraph/Algorithms/Observers/VertexPredecessorRecorderObserver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -29,6 +29,7 @@ public VertexPredecessorRecorderObserver()
         /// Initializes a new instance of the <see cref="VertexPredecessorRecorderObserver{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="verticesPredecessors">Vertices predecessors.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesPredecessors"/> is <see langword="null"/>.</exception>
         public VertexPredecessorRecorderObserver(
             [NotNull] IDictionary<TVertex, TEdge> verticesPredecessors)
         {
@@ -68,8 +69,10 @@ private void OnEdgeDiscovered([NotNull] TEdge edge)
         /// <param name="vertex">Path ending vertex.</param>
         /// <param name="path">Path to the ending vertex.</param>
         /// <returns>True if a path was found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
-        public bool TryGetPath([NotNull] TVertex vertex, out IEnumerable<TEdge> path)
+        [ContractAnnotation("=> true, path:notnull;=> false, path:null")]
+        public bool TryGetPath([NotNull] TVertex vertex, [ItemNotNull] out IEnumerable<TEdge> path)
         {
             return VerticesPredecessors.TryGetPath(vertex, out path);
         }
diff --git a/src/QuikGraph/Algorithms/Observers/VertexRecorderObserver.cs b/src/QuikGraph/Algorithms/Observers/VertexRecorderObserver.cs
index 626b053cd..7b696b023 100644
--- a/src/QuikGraph/Algorithms/Observers/VertexRecorderObserver.cs
+++ b/src/QuikGraph/Algorithms/Observers/VertexRecorderObserver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -28,6 +28,7 @@ public VertexRecorderObserver()
         /// Initializes a new instance of the <see cref="VertexRecorderObserver{TVertex}"/> class.
         /// </summary>
         /// <param name="vertices">Set of vertices.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertices"/> is <see langword="null"/>.</exception>
         public VertexRecorderObserver([NotNull, ItemNotNull] IEnumerable<TVertex> vertices)
         {
             if (vertices is null)
diff --git a/src/QuikGraph/Algorithms/Observers/VertexTimeStamperObserver.cs b/src/QuikGraph/Algorithms/Observers/VertexTimeStamperObserver.cs
index 1921615e9..81238acf9 100644
--- a/src/QuikGraph/Algorithms/Observers/VertexTimeStamperObserver.cs
+++ b/src/QuikGraph/Algorithms/Observers/VertexTimeStamperObserver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -29,6 +29,7 @@ public VertexTimeStamperObserver()
         /// Initializes a new instance of the <see cref="VertexTimeStamperObserver{TVertex}"/> class.
         /// </summary>
         /// <param name="discoverTimes">Vertices discover times.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="discoverTimes"/> is <see langword="null"/>.</exception>
         public VertexTimeStamperObserver([NotNull] IDictionary<TVertex, int> discoverTimes)
         {
             DiscoverTimes = discoverTimes ?? throw new ArgumentNullException(nameof(discoverTimes));
@@ -40,6 +41,8 @@ public VertexTimeStamperObserver([NotNull] IDictionary<TVertex, int> discoverTim
         /// </summary>
         /// <param name="discoverTimes">Vertices discover times.</param>
         /// <param name="finishTimes">Vertices fully treated times.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="discoverTimes"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="finishTimes"/> is <see langword="null"/>.</exception>
         public VertexTimeStamperObserver(
             [NotNull] IDictionary<TVertex, int> discoverTimes,
             [NotNull] IDictionary<TVertex, int> finishTimes)
@@ -70,13 +73,17 @@ public IDisposable Attach(IVertexTimeStamperAlgorithm<TVertex> algorithm)
 
             algorithm.DiscoverVertex += OnVertexDiscovered;
             if (FinishTimes != null)
+            {
                 algorithm.FinishVertex += OnVertexFinished;
+            }
 
             return Finally(() =>
             {
                 algorithm.DiscoverVertex -= OnVertexDiscovered;
                 if (FinishTimes != null)
+                {
                     algorithm.FinishVertex -= OnVertexFinished;
+                }
             });
         }
 
diff --git a/src/QuikGraph/Algorithms/PageRankAlgorithm.cs b/src/QuikGraph/Algorithms/PageRankAlgorithm.cs
index b269e6456..9aa02694d 100644
--- a/src/QuikGraph/Algorithms/PageRankAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/PageRankAlgorithm.cs
@@ -18,6 +18,7 @@ public sealed class PageRankAlgorithm<TVertex, TEdge> : AlgorithmBase<IBidirecti
         /// Initializes a new instance of the <see cref="PageRankAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public PageRankAlgorithm([NotNull] IBidirectionalGraph<TVertex, TEdge> visitedGraph)
             : base(visitedGraph)
         {
@@ -35,6 +36,7 @@ public PageRankAlgorithm([NotNull] IBidirectionalGraph<TVertex, TEdge> visitedGr
         /// Gets or sets the damping rate [0-1].
         /// </summary>
         /// <remarks>By default it uses 0.85 which is the value generally used.</remarks>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">Value is negative or higher than 1.</exception>
         public double Damping
         {
             get => _damping;
@@ -51,6 +53,7 @@ public double Damping
         /// <summary>
         /// Gets or sets the error tolerance (used to stop the algorithm).
         /// </summary>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">Value is negative.</exception>
         public double Tolerance
         {
             get => _tolerance;
@@ -67,6 +70,7 @@ public double Tolerance
         /// <summary>
         /// Gets or sets the maximum number of iterations.
         /// </summary>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">Value is negative or equal 0.</exception>
         public int MaxIterations
         {
             get => _maxIterations;
diff --git a/src/QuikGraph/Algorithms/RandomGraphFactory.cs b/src/QuikGraph/Algorithms/RandomGraphFactory.cs
index 903adc01b..31d693122 100644
--- a/src/QuikGraph/Algorithms/RandomGraphFactory.cs
+++ b/src/QuikGraph/Algorithms/RandomGraphFactory.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
@@ -16,6 +16,8 @@ public static class RandomGraphFactory
         /// <param name="graph">The graph.</param>
         /// <param name="rng">Random number generator.</param>
         /// <returns>Chosen vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="rng"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static TVertex GetVertex<TVertex>(
@@ -35,6 +37,10 @@ public static TVertex GetVertex<TVertex>(
         /// <param name="count">Number of vertices in the set.</param>
         /// <param name="rng">Random number generator.</param>
         /// <returns>Chosen vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertices"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="rng"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="count"/> is negative or equal 0.</exception>
+        /// <exception cref="T:System.InvalidOperationException"><paramref name="count"/> is higher than <paramref name="vertices"/> count.</exception>
         [Pure]
         [NotNull]
         public static TVertex GetVertex<TVertex>(
@@ -69,6 +75,8 @@ public static TVertex GetVertex<TVertex>(
         /// <param name="graph">The graph.</param>
         /// <param name="rng">Random number generator.</param>
         /// <returns>Chosen vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="rng"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static TEdge GetEdge<TVertex, TEdge>(
@@ -90,6 +98,10 @@ public static TEdge GetEdge<TVertex, TEdge>(
         /// <param name="count">Number of edges in the set.</param>
         /// <param name="rng">Random number generator.</param>
         /// <returns>Chosen vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edges"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="rng"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="count"/> is negative or equal 0.</exception>
+        /// <exception cref="T:System.InvalidOperationException"><paramref name="count"/> is higher than <paramref name="edges"/> count.</exception>
         [Pure]
         [NotNull]
         public static TEdge GetEdge<TVertex, TEdge>(
@@ -136,8 +148,8 @@ private static void CreateInternal<TVertex, TEdge>(
             if (rng is null)
                 throw new ArgumentNullException(nameof(rng));
             if (vertexCount <= 0)
-                throw new ArgumentOutOfRangeException(nameof(vertexCount), "Must have at least one vertex.");
-            if (edgeCount <= 0)
+                throw new ArgumentOutOfRangeException(nameof(vertexCount), "Must request at least one vertex.");
+            if (edgeCount < 0)
                 throw new ArgumentOutOfRangeException(nameof(edgeCount), "Must not be negative.");
 
             var vertices = new TVertex[vertexCount];
@@ -160,7 +172,9 @@ private static void CreateInternal<TVertex, TEdge>(
                 while (!selfEdges && EqualityComparer<TVertex>.Default.Equals(a, b));
 
                 if (graph.AddEdge(edgeFactory(a, b)))
+                {
                     ++j;
+                }
             }
         }
 
@@ -177,6 +191,12 @@ private static void CreateInternal<TVertex, TEdge>(
         /// <param name="vertexCount">Number of vertices to create.</param>
         /// <param name="edgeCount">Number of edges to create.</param>
         /// <param name="selfEdges">Indicates if self edge are allowed.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="rng"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="vertexCount"/> is negative or equal 0.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="edgeCount"/> is negative.</exception>
         public static void Create<TVertex, TEdge>(
             [NotNull] IMutableVertexAndEdgeListGraph<TVertex, TEdge> graph,
             [NotNull, InstantHandle] VertexFactory<TVertex> vertexFactory,
@@ -203,6 +223,12 @@ public static void Create<TVertex, TEdge>(
         /// <param name="vertexCount">Number of vertices to create.</param>
         /// <param name="edgeCount">Number of edges to create.</param>
         /// <param name="selfEdges">Indicates if self edge are allowed.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="rng"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="vertexCount"/> is negative or equal 0.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="edgeCount"/> is negative.</exception>
         public static void Create<TVertex, TEdge>(
             [NotNull] IMutableUndirectedGraph<TVertex, TEdge> graph,
             [NotNull, InstantHandle] VertexFactory<TVertex> vertexFactory,
diff --git a/src/QuikGraph/Algorithms/RandomWalks/CyclePoppingRandomTreeAlgorithm.cs b/src/QuikGraph/Algorithms/RandomWalks/CyclePoppingRandomTreeAlgorithm.cs
index b1bd2231f..8e9a5eecf 100644
--- a/src/QuikGraph/Algorithms/RandomWalks/CyclePoppingRandomTreeAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/RandomWalks/CyclePoppingRandomTreeAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -25,6 +25,7 @@ public sealed class CyclePoppingRandomTreeAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="CyclePoppingRandomTreeAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public CyclePoppingRandomTreeAlgorithm([NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph)
             : this(visitedGraph, new NormalizedMarkovEdgeChain<TVertex, TEdge>())
         {
@@ -35,6 +36,8 @@ public CyclePoppingRandomTreeAlgorithm([NotNull] IVertexListGraph<TVertex, TEdge
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeChain">Edge chain strategy to use.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeChain"/> is <see langword="null"/>.</exception>
         public CyclePoppingRandomTreeAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] IMarkovEdgeChain<TVertex, TEdge> edgeChain)
@@ -48,6 +51,8 @@ public CyclePoppingRandomTreeAlgorithm(
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeChain">Edge chain strategy to use.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeChain"/> is <see langword="null"/>.</exception>
         public CyclePoppingRandomTreeAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
@@ -92,6 +97,7 @@ public GraphColor GetVertexColor(TVertex vertex)
         /// <summary>
         /// Gets or sets the random number generator used in <see cref="RandomTree"/>.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException">Set value is <see langword="null"/>.</exception>
         [NotNull]
         public Random Rand
         {
@@ -276,6 +282,8 @@ private void ClearTree([NotNull] TVertex vertex)
         /// Runs a random tree generation starting at <paramref name="root"/> vertex.
         /// </summary>
         /// <param name="root">Tree starting vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> is part of <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.</exception>
         public void RandomTreeWithRoot([NotNull] TVertex root)
         {
             if (!VisitedGraph.ContainsVertex(root))
@@ -301,6 +309,7 @@ public void RandomTree()
             } while (!success);
         }
 
+        [Pure]
         private bool Attempt(double epsilon)
         {
             Initialize();
@@ -321,8 +330,11 @@ private bool Attempt(double epsilon)
             return true;
         }
 
+        [Pure]
         private bool Explore(double eps, [NotNull] TVertex vertex, ref int numRoots)
         {
+            Debug.Assert(vertex != null);
+
             var visited = new Dictionary<TEdge, int>();
             TVertex current = vertex;
             while (NotInTree(current))
@@ -352,6 +364,8 @@ private bool Explore(double eps, [NotNull] TVertex vertex, ref int numRoots)
 
         private void Colorize([NotNull] TVertex vertex)
         {
+            Debug.Assert(vertex != null);
+
             TVertex current = vertex;
             while (NotInTree(current))
             {
diff --git a/src/QuikGraph/Algorithms/RandomWalks/IEdgeChain.cs b/src/QuikGraph/Algorithms/RandomWalks/IEdgeChain.cs
index 62029e958..2185c03dd 100644
--- a/src/QuikGraph/Algorithms/RandomWalks/IEdgeChain.cs
+++ b/src/QuikGraph/Algorithms/RandomWalks/IEdgeChain.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Algorithms.RandomWalks
@@ -18,7 +18,10 @@ public interface IEdgeChain<TVertex, TEdge>
         /// <param name="vertex">The vertex.</param>
         /// <param name="successor">Found successor, otherwise null.</param>
         /// <returns>True if a successor was found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
+        [ContractAnnotation("=> true, successor:notnull;=> false, successor:null")]
         bool TryGetSuccessor([NotNull] IImplicitGraph<TVertex, TEdge> graph, [NotNull] TVertex vertex, out TEdge successor);
 
         /// <summary>
@@ -28,7 +31,10 @@ public interface IEdgeChain<TVertex, TEdge>
         /// <param name="vertex">The vertex.</param>
         /// <param name="successor">Found successor, otherwise null.</param>
         /// <returns>True if a successor was found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edges"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
+        [ContractAnnotation("=> true, successor:notnull;=> false, successor:null")]
         bool TryGetSuccessor([NotNull, ItemNotNull] IEnumerable<TEdge> edges, [NotNull] TVertex vertex, out TEdge successor);
     }
 }
\ No newline at end of file
diff --git a/src/QuikGraph/Algorithms/RandomWalks/RandomWalkAlgorithm.cs b/src/QuikGraph/Algorithms/RandomWalks/RandomWalkAlgorithm.cs
index a73ce8769..c4fc95818 100644
--- a/src/QuikGraph/Algorithms/RandomWalks/RandomWalkAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/RandomWalks/RandomWalkAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using JetBrains.Annotations;
 
@@ -18,6 +18,7 @@ public sealed class RandomWalkAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="RandomWalkAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public RandomWalkAlgorithm([NotNull] IImplicitGraph<TVertex, TEdge> visitedGraph)
             : this(visitedGraph, new NormalizedMarkovEdgeChain<TVertex, TEdge>())
         {
@@ -28,6 +29,8 @@ public RandomWalkAlgorithm([NotNull] IImplicitGraph<TVertex, TEdge> visitedGraph
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeChain">Edge chain strategy to use.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeChain"/> is <see langword="null"/>.</exception>
         public RandomWalkAlgorithm(
             [NotNull] IImplicitGraph<TVertex, TEdge> visitedGraph,
             [NotNull] IEdgeChain<TVertex, TEdge> edgeChain)
@@ -107,6 +110,7 @@ protected override void InternalCompute()
         /// Generates a random walk with 100 steps.
         /// </summary>
         /// <param name="root">Root vertex.</param>
+        /// <exception cref="VertexNotFoundException"><paramref name="root"/> is not part of <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.</exception>
         public void Generate([NotNull] TVertex root)
         {
             Generate(root, 100);
@@ -116,7 +120,8 @@ public void Generate([NotNull] TVertex root)
         /// Generates a random walk with <paramref name="walkCount"/> steps.
         /// </summary>
         /// <param name="root">Root vertex.</param>
-        /// <param name="walkCount">Number of steps for the random walk.</param>
+        /// <param name="walkCount">Number of steps for the random walk.</param>VertexNotFoundException
+        /// <exception cref="VertexNotFoundException"><paramref name="root"/> is not part of <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.</exception>
         public void Generate([NotNull] TVertex root, int walkCount)
         {
             AssertRootInGraph(root);
diff --git a/src/QuikGraph/Algorithms/RandomWalks/VanishingWeightedMarkovEdgeChain.cs b/src/QuikGraph/Algorithms/RandomWalks/VanishingWeightedMarkovEdgeChain.cs
index 8caf92c39..e5fc24445 100644
--- a/src/QuikGraph/Algorithms/RandomWalks/VanishingWeightedMarkovEdgeChain.cs
+++ b/src/QuikGraph/Algorithms/RandomWalks/VanishingWeightedMarkovEdgeChain.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 
@@ -16,6 +16,7 @@ public sealed class VanishingWeightedMarkovEdgeChain<TVertex, TEdge> : WeightedM
         /// Initializes a new instance of the <see cref="VanishingWeightedMarkovEdgeChain{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="edgeWeights">Map that contains edge weights.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public VanishingWeightedMarkovEdgeChain([NotNull] IDictionary<TEdge, double> edgeWeights)
             : this(edgeWeights, 0.2)
         {
@@ -26,6 +27,7 @@ public VanishingWeightedMarkovEdgeChain([NotNull] IDictionary<TEdge, double> edg
         /// </summary>
         /// <param name="edgeWeights">Map that contains edge weights.</param>
         /// <param name="factor">Vanishing factor.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public VanishingWeightedMarkovEdgeChain([NotNull] IDictionary<TEdge, double> edgeWeights, double factor)
             : base(edgeWeights)
         {
diff --git a/src/QuikGraph/Algorithms/RandomWalks/WeightedMarkedEdgeChain.cs b/src/QuikGraph/Algorithms/RandomWalks/WeightedMarkedEdgeChain.cs
index f8331293e..f55350b1b 100644
--- a/src/QuikGraph/Algorithms/RandomWalks/WeightedMarkedEdgeChain.cs
+++ b/src/QuikGraph/Algorithms/RandomWalks/WeightedMarkedEdgeChain.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 
@@ -16,6 +16,7 @@ public sealed class WeightedMarkovEdgeChain<TVertex, TEdge> : WeightedMarkovEdge
         /// Initializes a new instance of the <see cref="WeightedMarkovEdgeChainBase{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="edgeWeights">Map that contains edge weights.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public WeightedMarkovEdgeChain([NotNull] IDictionary<TEdge, double> edgeWeights)
             : base(edgeWeights)
         {
diff --git a/src/QuikGraph/Algorithms/RandomWalks/WeightedMarkovEdgeChainBase.cs b/src/QuikGraph/Algorithms/RandomWalks/WeightedMarkovEdgeChainBase.cs
index bc8db71ae..389ad984a 100644
--- a/src/QuikGraph/Algorithms/RandomWalks/WeightedMarkovEdgeChainBase.cs
+++ b/src/QuikGraph/Algorithms/RandomWalks/WeightedMarkovEdgeChainBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -18,6 +18,7 @@ public abstract class WeightedMarkovEdgeChainBase<TVertex, TEdge> : MarkovEdgeCh
         /// Initializes a new instance of the <see cref="WeightedMarkovEdgeChainBase{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="edgeWeights">Map that contains edge weights.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         protected WeightedMarkovEdgeChainBase([NotNull] IDictionary<TEdge, double> edgeWeights)
         {
             Weights = edgeWeights ?? throw new ArgumentNullException(nameof(edgeWeights));
diff --git a/src/QuikGraph/Algorithms/RankedShortestPath/HoffmanPavleyRankedShortestPathAlgorithm.cs b/src/QuikGraph/Algorithms/RankedShortestPath/HoffmanPavleyRankedShortestPathAlgorithm.cs
index cb5c47cf1..bd1730d27 100644
--- a/src/QuikGraph/Algorithms/RankedShortestPath/HoffmanPavleyRankedShortestPathAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/RankedShortestPath/HoffmanPavleyRankedShortestPathAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -35,6 +35,8 @@ public sealed class HoffmanPavleyRankedShortestPathAlgorithm<TVertex, TEdge>
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that for a given edge provide its weight.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public HoffmanPavleyRankedShortestPathAlgorithm(
             [NotNull] IBidirectionalGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights)
@@ -48,6 +50,9 @@ public HoffmanPavleyRankedShortestPathAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that for a given edge provide its weight.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public HoffmanPavleyRankedShortestPathAlgorithm(
             [NotNull] IBidirectionalGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights,
@@ -63,6 +68,9 @@ public HoffmanPavleyRankedShortestPathAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that for a given edge provide its weight.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public HoffmanPavleyRankedShortestPathAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IBidirectionalGraph<TVertex, TEdge> visitedGraph,
@@ -77,6 +85,7 @@ public HoffmanPavleyRankedShortestPathAlgorithm(
         /// Sets the target vertex.
         /// </summary>
         /// <param name="target">Target vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public void SetTargetVertex([NotNull] TVertex target)
         {
             if (target == null)
@@ -92,6 +101,7 @@ public void SetTargetVertex([NotNull] TVertex target)
         /// <param name="target">Target vertex if set, otherwise null.</param>
         /// <returns>True if the target vertex was set, false otherwise.</returns>
         [Pure]
+        [ContractAnnotation("=> true, target:notnull;=> false, target:null")]
         public bool TryGetTargetVertex(out TVertex target)
         {
             if (_hasTargetVertex)
@@ -109,6 +119,11 @@ public bool TryGetTargetVertex(out TVertex target)
         /// </summary>
         /// <param name="root">Root vertex.</param>
         /// <param name="target">Target vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> is not part of <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="target"/> is not part of <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Something went wrong when running the algorithm.</exception>
         public void Compute([NotNull] TVertex root, [NotNull] TVertex target)
         {
             if (root == null)
@@ -238,7 +253,9 @@ private void ComputeMinimumTree(
 
             successors = new Dictionary<TVertex, TEdge>();
             foreach (KeyValuePair<TVertex, SReversedEdge<TVertex, TEdge>> pair in successorsObserver.VerticesPredecessors)
+            {
                 successors.Add(pair.Key, pair.Value.OriginalEdge);
+            }
 
             distances = distancesObserver.Distances;
 
@@ -289,7 +306,9 @@ private void EnqueueDeviationPaths(
 
                 // Detection of loops
                 if (edgeIndex == 0)
+                {
                     pathVertices[edge.Source] = 0;
+                }
 
                 // We should really allow only one key
                 if (pathVertices.ContainsKey(edge.Target))
diff --git a/src/QuikGraph/Algorithms/RankedShortestPath/RankedShortestPathAlgorithmBase.cs b/src/QuikGraph/Algorithms/RankedShortestPath/RankedShortestPathAlgorithmBase.cs
index 7184acd7f..63a5e33a5 100644
--- a/src/QuikGraph/Algorithms/RankedShortestPath/RankedShortestPathAlgorithmBase.cs
+++ b/src/QuikGraph/Algorithms/RankedShortestPath/RankedShortestPathAlgorithmBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -23,6 +23,8 @@ public abstract class RankedShortestPathAlgorithmBase<TVertex, TEdge, TGraph> :
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         protected RankedShortestPathAlgorithmBase(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] TGraph visitedGraph,
@@ -37,6 +39,7 @@ protected RankedShortestPathAlgorithmBase(
         /// <summary>
         /// Gets or sets the maximum number of shortest path to find.
         /// </summary>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">Value is lower or equal to 1.</exception>
         public int ShortestPathCount
         {
             get => _shortestPathCount;
diff --git a/src/QuikGraph/Algorithms/RootedAlgorithmBase.cs b/src/QuikGraph/Algorithms/RootedAlgorithmBase.cs
index 80152f679..430692034 100644
--- a/src/QuikGraph/Algorithms/RootedAlgorithmBase.cs
+++ b/src/QuikGraph/Algorithms/RootedAlgorithmBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 #if SUPPORTS_AGGRESSIVE_INLINING
@@ -31,6 +31,7 @@ public abstract class RootedAlgorithmBase<TVertex, TGraph> : AlgorithmBase<TGrap
         /// </summary>
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         protected RootedAlgorithmBase(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] TGraph visitedGraph)
@@ -44,6 +45,7 @@ protected RootedAlgorithmBase(
         /// <param name="root">Root vertex if set, otherwise null.</param>
         /// <returns>True if the root vertex was set, false otherwise.</returns>
         [Pure]
+        [ContractAnnotation("=> true, root:notnull;=> false, root:null")]
         public bool TryGetRootVertex(out TVertex root)
         {
             if (_hasRootVertex)
@@ -60,6 +62,7 @@ public bool TryGetRootVertex(out TVertex root)
         /// Sets the root vertex.
         /// </summary>
         /// <param name="root">Root vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
         public void SetRootVertex([NotNull] TVertex root)
         {
             if (root == null)
@@ -70,7 +73,9 @@ public void SetRootVertex([NotNull] TVertex root)
             _hasRootVertex = true;
 
             if (changed)
+            {
                 OnRootVertexChanged(EventArgs.Empty);
+            }
         }
 
         /// <summary>
@@ -83,7 +88,9 @@ public void ClearRootVertex()
             _hasRootVertex = false;
 
             if (hasRoot)
+            {
                 OnRootVertexChanged(EventArgs.Empty);
+            }
         }
 
         /// <summary>
@@ -94,7 +101,7 @@ public void ClearRootVertex()
         /// <summary>
         /// Called on each root vertex change.
         /// </summary>
-        /// <param name="args"><see cref="EventArgs.Empty"/>.</param>
+        /// <param name="args"><see cref="F:EventArgs.Empty"/>.</param>
         protected virtual void OnRootVertexChanged([NotNull] EventArgs args)
         {
             Debug.Assert(args != null);
@@ -107,7 +114,7 @@ protected virtual void OnRootVertexChanged([NotNull] EventArgs args)
         /// <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.
         /// </summary>
         /// <returns>Root vertex.</returns>
-        /// <exception cref="InvalidOperationException">If the root vertex has not been set.</exception>
+        /// <exception cref="T:System.InvalidOperationException">If the root vertex has not been set.</exception>
         /// <exception cref="VertexNotFoundException">
         /// If the set root vertex is not part of the <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.
         /// </exception>
@@ -140,6 +147,9 @@ protected void AssertRootInGraph([NotNull] TVertex root)
         /// Runs the algorithm with the given <paramref name="root"/> vertex.
         /// </summary>
         /// <param name="root">Root vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> is not part of <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Something went wrong when running the algorithm.</exception>
         public virtual void Compute([NotNull] TVertex root)
         {
             SetRootVertex(root);
diff --git a/src/QuikGraph/Algorithms/RootedSearchAlgorithmBase.cs b/src/QuikGraph/Algorithms/RootedSearchAlgorithmBase.cs
index c43b59d04..0afc1d602 100644
--- a/src/QuikGraph/Algorithms/RootedSearchAlgorithmBase.cs
+++ b/src/QuikGraph/Algorithms/RootedSearchAlgorithmBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -28,6 +28,7 @@ public abstract class RootedSearchAlgorithmBase<TVertex, TGraph> : RootedAlgorit
         /// </summary>
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         protected RootedSearchAlgorithmBase(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] TGraph visitedGraph)
@@ -41,6 +42,7 @@ protected RootedSearchAlgorithmBase(
         /// <param name="target">Target vertex if set, otherwise null.</param>
         /// <returns>True if the target vertex was set, false otherwise.</returns>
         [Pure]
+        [ContractAnnotation("=> true, target:notnull;=> false, target:null")]
         public bool TryGetTargetVertex(out TVertex target)
         {
             if (_hasTargetVertex)
@@ -57,6 +59,7 @@ public bool TryGetTargetVertex(out TVertex target)
         /// Sets the target vertex.
         /// </summary>
         /// <param name="target">Target vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public void SetTargetVertex([NotNull] TVertex target)
         {
             if (target == null)
@@ -67,7 +70,9 @@ public void SetTargetVertex([NotNull] TVertex target)
             _hasTargetVertex = true;
 
             if (changed)
+            {
                 OnTargetVertexChanged(EventArgs.Empty);
+            }
         }
 
         /// <summary>
@@ -81,7 +86,9 @@ public void ClearTargetVertex()
             _hasTargetVertex = false;
 
             if (hasTarget)
+            {
                 OnTargetVertexChanged(EventArgs.Empty);
+            }
         }
 
         /// <summary>
@@ -92,7 +99,7 @@ public void ClearTargetVertex()
         /// <summary>
         /// Called on each target vertex change.
         /// </summary>
-        /// <param name="args"><see cref="EventArgs.Empty"/>.</param>
+        /// <param name="args"><see cref="F:EventArgs.Empty"/>.</param>
         protected virtual void OnTargetVertexChanged([NotNull] EventArgs args)
         {
             Debug.Assert(args != null);
@@ -118,6 +125,11 @@ protected virtual void OnTargetReached()
         /// </summary>
         /// <param name="root">Root vertex.</param>
         /// <param name="target">Target vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> is not part of <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="target"/> is not part of <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Something went wrong when running the algorithm.</exception>
         public void Compute([NotNull] TVertex root, [NotNull] TVertex target)
         {
             if (root == null)
diff --git a/src/QuikGraph/Algorithms/Search/BestFirstFrontierSearchAlgorithm.cs b/src/QuikGraph/Algorithms/Search/BestFirstFrontierSearchAlgorithm.cs
index 0f598e5b3..31427edbe 100644
--- a/src/QuikGraph/Algorithms/Search/BestFirstFrontierSearchAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/Search/BestFirstFrontierSearchAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -33,6 +33,9 @@ public sealed class BestFirstFrontierSearchAlgorithm<TVertex, TEdge>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that for a given edge provide its weight.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public BestFirstFrontierSearchAlgorithm(
             [NotNull] IBidirectionalIncidenceGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights,
@@ -48,6 +51,9 @@ public BestFirstFrontierSearchAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that for a given edge provide its weight.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public BestFirstFrontierSearchAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IBidirectionalIncidenceGraph<TVertex, TEdge> visitedGraph,
@@ -143,7 +149,9 @@ private void ExpandNode(
                     // as used in any of the copies
                     operators[edge] = GraphColor.Gray;
                     if (open.MinimumUpdate(nCost, edge.Target))
+                    {
                         OnTreeEdge(edge);
+                    }
                 }
                 else
                 {
diff --git a/src/QuikGraph/Algorithms/Search/BidirectionalDepthFirstSearchAlgorithm.cs b/src/QuikGraph/Algorithms/Search/BidirectionalDepthFirstSearchAlgorithm.cs
index 0ca07069c..f6068345a 100644
--- a/src/QuikGraph/Algorithms/Search/BidirectionalDepthFirstSearchAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/Search/BidirectionalDepthFirstSearchAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -26,6 +26,7 @@ public sealed class BidirectionalDepthFirstSearchAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="BidirectionalDepthFirstSearchAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public BidirectionalDepthFirstSearchAlgorithm(
             [NotNull] IBidirectionalGraph<TVertex, TEdge> visitedGraph)
             : this(visitedGraph, new Dictionary<TVertex, GraphColor>())
@@ -37,6 +38,8 @@ public BidirectionalDepthFirstSearchAlgorithm(
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="verticesColors">Vertices associated to their colors (treatment states).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesColors"/> is <see langword="null"/>.</exception>
         public BidirectionalDepthFirstSearchAlgorithm(
             [NotNull] IBidirectionalGraph<TVertex, TEdge> visitedGraph,
             [NotNull] IDictionary<TVertex, GraphColor> verticesColors)
@@ -50,6 +53,8 @@ public BidirectionalDepthFirstSearchAlgorithm(
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="verticesColors">Vertices associated to their colors (treatment states).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesColors"/> is <see langword="null"/>.</exception>
         public BidirectionalDepthFirstSearchAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IBidirectionalGraph<TVertex, TEdge> visitedGraph,
@@ -71,11 +76,12 @@ public BidirectionalDepthFirstSearchAlgorithm(
         /// Gets or sets the maximum exploration depth, from the start vertex.
         /// </summary>
         /// <remarks>
-        /// Defaulted at <see cref="int.MaxValue"/>.
+        /// Defaulted to <see cref="F:int.MaxValue"/>.
         /// </remarks>
         /// <value>
         /// Maximum exploration depth.
         /// </value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">Value is negative or equal to 0.</exception>
         public int MaxDepth
         {
             get => _maxDepth;
@@ -209,7 +215,9 @@ protected override void InternalCompute()
                 Visit(root, 0);
 
                 if (ProcessAllComponents)
+                {
                     VisitAllWhiteVertices(); // All remaining vertices (because there are not white marked)
+                }
             }
             else
             {
diff --git a/src/QuikGraph/Algorithms/Search/BreadthFirstSearchAlgorithm.cs b/src/QuikGraph/Algorithms/Search/BreadthFirstSearchAlgorithm.cs
index 953cc9bff..1bb3987df 100644
--- a/src/QuikGraph/Algorithms/Search/BreadthFirstSearchAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/Search/BreadthFirstSearchAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -30,6 +30,7 @@ public sealed class BreadthFirstSearchAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="BreadthFirstSearchAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public BreadthFirstSearchAlgorithm([NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph)
             : this(visitedGraph, new Collections.Queue<TVertex>(), new Dictionary<TVertex, GraphColor>())
         {
@@ -41,6 +42,9 @@ public BreadthFirstSearchAlgorithm([NotNull] IVertexListGraph<TVertex, TEdge> vi
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="vertexQueue">Queue of vertices to treat.</param>
         /// <param name="verticesColors">Vertices associated to their colors (treatment states).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexQueue"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesColors"/> is <see langword="null"/>.</exception>
         public BreadthFirstSearchAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] IQueue<TVertex> vertexQueue,
@@ -56,6 +60,9 @@ public BreadthFirstSearchAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="vertexQueue">Queue of vertices to treat.</param>
         /// <param name="verticesColors">Vertices associated to their colors (treatment states).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexQueue"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesColors"/> is <see langword="null"/>.</exception>
         public BreadthFirstSearchAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
@@ -73,6 +80,10 @@ public BreadthFirstSearchAlgorithm(
         /// <param name="vertexQueue">Queue of vertices to treat.</param>
         /// <param name="verticesColors">Vertices associated to their colors (treatment states).</param>
         /// <param name="outEdgesFilter">Function that is used filter out-edges of a vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexQueue"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesColors"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="outEdgesFilter"/> is <see langword="null"/>.</exception>
         public BreadthFirstSearchAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
@@ -244,7 +255,9 @@ protected override void InternalCompute()
             {
                 // Enqueue roots
                 foreach (TVertex root in VisitedGraph.Roots())
+                {
                     EnqueueRoot(root);
+                }
             }
 
             FlushVisitQueue();
@@ -313,9 +326,13 @@ private void FlushVisitQueue()
                     {
                         OnNonTreeEdge(edge);
                         if (vColor == GraphColor.Gray)
+                        {
                             OnGrayTarget(edge);
+                        }
                         else
+                        {
                             OnBlackTarget(edge);
+                        }
                     }
                 }
 
diff --git a/src/QuikGraph/Algorithms/Search/DepthFirstSearchAlgorithm.cs b/src/QuikGraph/Algorithms/Search/DepthFirstSearchAlgorithm.cs
index 99d1e048e..7bd893194 100644
--- a/src/QuikGraph/Algorithms/Search/DepthFirstSearchAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/Search/DepthFirstSearchAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -23,6 +23,7 @@ public sealed class DepthFirstSearchAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="DepthFirstSearchAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public DepthFirstSearchAlgorithm([NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph)
             : this(visitedGraph, new Dictionary<TVertex, GraphColor>())
         {
@@ -33,6 +34,8 @@ public DepthFirstSearchAlgorithm([NotNull] IVertexListGraph<TVertex, TEdge> visi
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="verticesColors">Vertices associated to their colors (treatment states).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesColors"/> is <see langword="null"/>.</exception>
         public DepthFirstSearchAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] IDictionary<TVertex, GraphColor> verticesColors)
@@ -45,6 +48,7 @@ public DepthFirstSearchAlgorithm(
         /// </summary>
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public DepthFirstSearchAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph)
@@ -58,6 +62,8 @@ public DepthFirstSearchAlgorithm(
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="verticesColors">Vertices associated to their colors (treatment states).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesColors"/> is <see langword="null"/>.</exception>
         public DepthFirstSearchAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
@@ -76,6 +82,9 @@ public DepthFirstSearchAlgorithm(
         /// Delegate that takes the enumeration of out-edges and filters/reorders
         /// them. All vertices passed to the method should be enumerated once and only once.
         /// </param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesColors"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="outEdgesFilter"/> is <see langword="null"/>.</exception>
         public DepthFirstSearchAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
@@ -105,11 +114,12 @@ public DepthFirstSearchAlgorithm(
         /// Gets or sets the maximum exploration depth, from the start vertex.
         /// </summary>
         /// <remarks>
-        /// Defaulted at <see cref="int.MaxValue"/>.
+        /// Defaulted to <see cref="F:int.MaxValue"/>.
         /// </remarks>
         /// <value>
         /// Maximum exploration depth.
         /// </value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">Value is negative or equal to 0.</exception>
         public int MaxDepth
         {
             get => _maxDepth;
@@ -243,7 +253,9 @@ protected override void InternalCompute()
                 Visit(root);
 
                 if (ProcessAllComponents)
+                {
                     VisitAllWhiteVertices(); // All remaining vertices (because there are not white marked)
+                }
             }
             else
             {
@@ -320,7 +332,7 @@ private void Visit([NotNull] TVertex root)
             VerticesColors[root] = GraphColor.Gray;
             OnDiscoverVertex(root);
 
-            var enumerable = OutEdgesFilter(VisitedGraph.OutEdges(root));
+            IEnumerable<TEdge> enumerable = OutEdgesFilter(VisitedGraph.OutEdges(root));
             todoStack.Push(new SearchFrame(root, enumerable.GetEnumerator(), 0));
 
             while (todoStack.Count > 0)
diff --git a/src/QuikGraph/Algorithms/Search/EdgeDepthFirstSearchAlgorithm.cs b/src/QuikGraph/Algorithms/Search/EdgeDepthFirstSearchAlgorithm.cs
index 095c4e450..aff79e56b 100644
--- a/src/QuikGraph/Algorithms/Search/EdgeDepthFirstSearchAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/Search/EdgeDepthFirstSearchAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -26,6 +26,7 @@ public sealed class EdgeDepthFirstSearchAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="EdgeDepthFirstSearchAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public EdgeDepthFirstSearchAlgorithm(
             [NotNull] IEdgeListAndIncidenceGraph<TVertex, TEdge> visitedGraph)
             : this(visitedGraph, new Dictionary<TEdge, GraphColor>())
@@ -37,6 +38,8 @@ public EdgeDepthFirstSearchAlgorithm(
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgesColors">Edges associated to their colors (treatment states).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgesColors"/> is <see langword="null"/>.</exception>
         public EdgeDepthFirstSearchAlgorithm(
             [NotNull] IEdgeListAndIncidenceGraph<TVertex, TEdge> visitedGraph,
             [NotNull] IDictionary<TEdge, GraphColor> edgesColors)
@@ -50,6 +53,8 @@ public EdgeDepthFirstSearchAlgorithm(
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgesColors">Edges associated to their colors (treatment states).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgesColors"/> is <see langword="null"/>.</exception>
         public EdgeDepthFirstSearchAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IEdgeListAndIncidenceGraph<TVertex, TEdge> visitedGraph,
@@ -71,11 +76,12 @@ public EdgeDepthFirstSearchAlgorithm(
         /// Gets or sets the maximum exploration depth, from the start vertex.
         /// </summary>
         /// <remarks>
-        /// Defaulted at <see cref="int.MaxValue"/>.
+        /// Defaulted to <see cref="F:int.MaxValue"/>.
         /// </remarks>
         /// <value>
         /// Maximum exploration depth.
         /// </value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">Value is negative or equal to 0.</exception>
         public int MaxDepth
         {
             get => _maxDepth;
@@ -216,7 +222,9 @@ protected override void InternalCompute()
 
                 // Process the rest of the graph edges
                 if (ProcessAllComponents)
+                {
                     VisitAllWhiteEdges();
+                }
             }
             else
             {
diff --git a/src/QuikGraph/Algorithms/Search/ImplicitDepthFirstSearchAlgorithm.cs b/src/QuikGraph/Algorithms/Search/ImplicitDepthFirstSearchAlgorithm.cs
index 448ee7d07..f3854a482 100644
--- a/src/QuikGraph/Algorithms/Search/ImplicitDepthFirstSearchAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/Search/ImplicitDepthFirstSearchAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -21,6 +21,7 @@ public sealed class ImplicitDepthFirstSearchAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="ImplicitDepthFirstSearchAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public ImplicitDepthFirstSearchAlgorithm(
             [NotNull] IIncidenceGraph<TVertex, TEdge> visitedGraph)
             : this(null, visitedGraph)
@@ -32,6 +33,7 @@ public ImplicitDepthFirstSearchAlgorithm(
         /// </summary>
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public ImplicitDepthFirstSearchAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IIncidenceGraph<TVertex, TEdge> visitedGraph)
@@ -51,11 +53,12 @@ public ImplicitDepthFirstSearchAlgorithm(
         /// Gets or sets the maximum exploration depth, from the start vertex.
         /// </summary>
         /// <remarks>
-        /// Defaulted at <see cref="int.MaxValue"/>.
+        /// Defaulted to <see cref="F:int.MaxValue"/>.
         /// </remarks>
         /// <value>
         /// Maximum exploration depth.
         /// </value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">Value is negative or equal to 0.</exception>
         public int MaxDepth
         {
             get => _maxDepth;
diff --git a/src/QuikGraph/Algorithms/Search/ImplicitEdgeDepthFirstSearchAlgorithm.cs b/src/QuikGraph/Algorithms/Search/ImplicitEdgeDepthFirstSearchAlgorithm.cs
index d213b8486..1b6a68b40 100644
--- a/src/QuikGraph/Algorithms/Search/ImplicitEdgeDepthFirstSearchAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/Search/ImplicitEdgeDepthFirstSearchAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -24,6 +24,7 @@ public sealed class ImplicitEdgeDepthFirstSearchAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="ImplicitEdgeDepthFirstSearchAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public ImplicitEdgeDepthFirstSearchAlgorithm(
             [NotNull] IIncidenceGraph<TVertex, TEdge> visitedGraph)
             : this(null, visitedGraph)
@@ -35,6 +36,7 @@ public ImplicitEdgeDepthFirstSearchAlgorithm(
         /// </summary>
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public ImplicitEdgeDepthFirstSearchAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IIncidenceGraph<TVertex, TEdge> visitedGraph)
@@ -48,11 +50,12 @@ public ImplicitEdgeDepthFirstSearchAlgorithm(
         /// Gets or sets the maximum exploration depth, from the start vertex.
         /// </summary>
         /// <remarks>
-        /// Defaulted at <see cref="int.MaxValue"/>.
+        /// Defaulted to <see cref="F:int.MaxValue"/>.
         /// </remarks>
         /// <value>
         /// Maximum exploration depth.
         /// </value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">Value is negative or equal to 0.</exception>
         public int MaxDepth
         {
             get => _maxDepth;
@@ -226,9 +229,13 @@ private void Visit([NotNull] TEdge startingEdge, int depth)
                 else
                 {
                     if (color == GraphColor.Gray)
+                    {
                         OnBackEdge(edge);
+                    }
                     else
+                    {
                         OnForwardOrCrossEdge(edge);
+                    }
                 }
             }
 
diff --git a/src/QuikGraph/Algorithms/Search/UndirectedBreathFirstSearchAlgorithm.cs b/src/QuikGraph/Algorithms/Search/UndirectedBreathFirstSearchAlgorithm.cs
index cca5c1c70..f5e4a6e67 100644
--- a/src/QuikGraph/Algorithms/Search/UndirectedBreathFirstSearchAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/Search/UndirectedBreathFirstSearchAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -26,6 +26,7 @@ public sealed class UndirectedBreadthFirstSearchAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="UndirectedBreadthFirstSearchAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public UndirectedBreadthFirstSearchAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph)
             : this(visitedGraph, new Collections.Queue<TVertex>(), new Dictionary<TVertex, GraphColor>())
@@ -38,6 +39,9 @@ public UndirectedBreadthFirstSearchAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="vertexQueue">Queue of vertices to treat.</param>
         /// <param name="verticesColors">Vertices associated to their colors (treatment states).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexQueue"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesColors"/> is <see langword="null"/>.</exception>
         public UndirectedBreadthFirstSearchAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
             [NotNull] IQueue<TVertex> vertexQueue,
@@ -53,6 +57,9 @@ public UndirectedBreadthFirstSearchAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="vertexQueue">Queue of vertices to treat.</param>
         /// <param name="verticesColors">Vertices associated to their colors (treatment states).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexQueue"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesColors"/> is <see langword="null"/>.</exception>
         public UndirectedBreadthFirstSearchAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
@@ -290,9 +297,13 @@ private void ExploreAdjacentEdges([NotNull] TVertex u)
                 {
                     OnNonTreeEdge(edge, reversed);
                     if (vColor == GraphColor.Gray)
+                    {
                         OnGrayTarget(edge, reversed);
+                    }
                     else
+                    {
                         OnBlackTarget(edge, reversed);
+                    }
                 }
             }
         }
diff --git a/src/QuikGraph/Algorithms/Search/UndirectedDepthFirstSearchAlgorithm.cs b/src/QuikGraph/Algorithms/Search/UndirectedDepthFirstSearchAlgorithm.cs
index c0e304c63..3cd4eafa3 100644
--- a/src/QuikGraph/Algorithms/Search/UndirectedDepthFirstSearchAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/Search/UndirectedDepthFirstSearchAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -23,6 +23,7 @@ public sealed class UndirectedDepthFirstSearchAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="UndirectedDepthFirstSearchAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public UndirectedDepthFirstSearchAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph)
             : this(visitedGraph, new Dictionary<TVertex, GraphColor>())
@@ -34,6 +35,8 @@ public UndirectedDepthFirstSearchAlgorithm(
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="verticesColors">Vertices associated to their colors (treatment states).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesColors"/> is <see langword="null"/>.</exception>
         public UndirectedDepthFirstSearchAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
             [NotNull] IDictionary<TVertex, GraphColor> verticesColors)
@@ -47,6 +50,8 @@ public UndirectedDepthFirstSearchAlgorithm(
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="verticesColors">Vertices associated to their colors (treatment states).</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesColors"/> is <see langword="null"/>.</exception>
         public UndirectedDepthFirstSearchAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
@@ -65,6 +70,9 @@ public UndirectedDepthFirstSearchAlgorithm(
         /// Delegate that takes the enumeration of out-edges and filters/reorders
         /// them. All vertices passed to the method should be enumerated once and only once.
         /// </param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="verticesColors"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="adjacentEdgesFilter"/> is <see langword="null"/>.</exception>
         public UndirectedDepthFirstSearchAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
@@ -94,11 +102,12 @@ public UndirectedDepthFirstSearchAlgorithm(
         /// Gets or sets the maximum exploration depth, from the start vertex.
         /// </summary>
         /// <remarks>
-        /// Defaulted at <see cref="int.MaxValue"/>.
+        /// Defaulted to <see cref="F:int.MaxValue"/>.
         /// </remarks>
         /// <value>
         /// Maximum exploration depth.
         /// </value>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">Value is negative or equal to 0.</exception>
         public int MaxDepth
         {
             get => _maxDepth;
@@ -251,7 +260,9 @@ protected override void InternalCompute()
                 Visit(root);
 
                 if (ProcessAllComponents)
+                {
                     VisitAllWhiteVertices(); // All remaining vertices (because there are not white marked)
+                }
             }
             else
             {
diff --git a/src/QuikGraph/Algorithms/Services/AlgorithmServices.cs b/src/QuikGraph/Algorithms/Services/AlgorithmServices.cs
index 87726169e..960bc15d9 100644
--- a/src/QuikGraph/Algorithms/Services/AlgorithmServices.cs
+++ b/src/QuikGraph/Algorithms/Services/AlgorithmServices.cs
@@ -1,5 +1,4 @@
-
-using System;
+using System;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Algorithms.Services
@@ -16,6 +15,7 @@ internal sealed class AlgorithmServices : IAlgorithmServices
         /// Initializes a new instance of the <see cref="AlgorithmServices"/> class.
         /// </summary>
         /// <param name="host">Algorithm host.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="host"/> is <see langword="null"/>.</exception>
         public AlgorithmServices([NotNull] IAlgorithmComponent host)
         {
             _host = host ?? throw new ArgumentNullException(nameof(host));
diff --git a/src/QuikGraph/Algorithms/Services/CancelManager.cs b/src/QuikGraph/Algorithms/Services/CancelManager.cs
index 5107b6d8a..531dcf3ee 100644
--- a/src/QuikGraph/Algorithms/Services/CancelManager.cs
+++ b/src/QuikGraph/Algorithms/Services/CancelManager.cs
@@ -16,7 +16,9 @@ public void Cancel()
         {
             int value = Interlocked.Increment(ref _cancelling);
             if (value == 0)
+            {
                 CancelRequested?.Invoke(this, EventArgs.Empty);
+            }
         }
 
         private int _cancelling;
@@ -32,7 +34,9 @@ public void ResetCancel()
         {
             int value = Interlocked.Exchange(ref _cancelling, 0);
             if (value != 0)
+            {
                 CancelReset?.Invoke(this, EventArgs.Empty);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/QuikGraph/Algorithms/ShortestPath/AStarShortestPathAlgorithm.cs b/src/QuikGraph/Algorithms/ShortestPath/AStarShortestPathAlgorithm.cs
index 26c25ccf7..b8e089af6 100644
--- a/src/QuikGraph/Algorithms/ShortestPath/AStarShortestPathAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/ShortestPath/AStarShortestPathAlgorithm.cs
@@ -29,6 +29,9 @@ public sealed class AStarShortestPathAlgorithm<TVertex, TEdge>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="costHeuristic">Function that computes a cost for a given vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="costHeuristic"/> is <see langword="null"/>.</exception>
         public AStarShortestPathAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights,
@@ -44,6 +47,10 @@ public AStarShortestPathAlgorithm(
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="costHeuristic">Function that computes a cost for a given vertex.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="costHeuristic"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public AStarShortestPathAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights,
@@ -61,6 +68,10 @@ public AStarShortestPathAlgorithm(
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="costHeuristic">Function that computes a cost for a given vertex.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="costHeuristic"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public AStarShortestPathAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
@@ -219,7 +230,9 @@ protected override void InternalCompute()
                 foreach (TVertex vertex in VisitedGraph.Vertices)
                 {
                     if (VerticesColors[vertex] == GraphColor.White)
+                    {
                         ComputeFromRoot(vertex);
+                    }
                 }
             }
         }
diff --git a/src/QuikGraph/Algorithms/ShortestPath/BellmanFordShortestPathAlgorithm.cs b/src/QuikGraph/Algorithms/ShortestPath/BellmanFordShortestPathAlgorithm.cs
index 412c0ac12..2ef3f5fa5 100644
--- a/src/QuikGraph/Algorithms/ShortestPath/BellmanFordShortestPathAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/ShortestPath/BellmanFordShortestPathAlgorithm.cs
@@ -35,6 +35,8 @@ public sealed class BellmanFordShortestPathAlgorithm<TVertex, TEdge>
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public BellmanFordShortestPathAlgorithm(
             [NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights)
@@ -48,6 +50,9 @@ public BellmanFordShortestPathAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public BellmanFordShortestPathAlgorithm(
             [NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights,
@@ -63,6 +68,9 @@ public BellmanFordShortestPathAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public BellmanFordShortestPathAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
@@ -209,12 +217,11 @@ protected override void InternalCompute()
                     break;
             }
 
-            IDistanceRelaxer relaxer = DistanceRelaxer;
             foreach (TEdge edge in VisitedGraph.Edges)
             {
                 double edgeWeight = Weights(edge);
-                if (relaxer.Compare(
-                        relaxer.Combine(GetVertexDistance(edge.Source), edgeWeight),
+                if (DistanceRelaxer.Compare(
+                        DistanceRelaxer.Combine(GetVertexDistance(edge.Source), edgeWeight),
                         GetVertexDistance(edge.Target)) < 0)
                 {
                     OnEdgeMinimized(edge);
diff --git a/src/QuikGraph/Algorithms/ShortestPath/DagShortestPathAlgorithm.cs b/src/QuikGraph/Algorithms/ShortestPath/DagShortestPathAlgorithm.cs
index 2d2a22c72..b525c2be1 100644
--- a/src/QuikGraph/Algorithms/ShortestPath/DagShortestPathAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/ShortestPath/DagShortestPathAlgorithm.cs
@@ -22,6 +22,8 @@ public sealed class DagShortestPathAlgorithm<TVertex, TEdge>
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public DagShortestPathAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights)
@@ -35,6 +37,9 @@ public DagShortestPathAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public DagShortestPathAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights,
@@ -50,6 +55,9 @@ public DagShortestPathAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public DagShortestPathAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
@@ -187,9 +195,13 @@ private void ComputeNoInit([NotNull] TVertex root)
 
                     bool decreased = Relax(edge);
                     if (decreased)
+                    {
                         OnTreeEdge(edge);
+                    }
                     else
+                    {
                         OnEdgeNotRelaxed(edge);
+                    }
                 }
 
                 VerticesColors[vertex] = GraphColor.Black;
diff --git a/src/QuikGraph/Algorithms/ShortestPath/DijkstraShortestPathAlgorithm.cs b/src/QuikGraph/Algorithms/ShortestPath/DijkstraShortestPathAlgorithm.cs
index 4286e80f1..9d416e931 100644
--- a/src/QuikGraph/Algorithms/ShortestPath/DijkstraShortestPathAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/ShortestPath/DijkstraShortestPathAlgorithm.cs
@@ -26,6 +26,8 @@ public sealed class DijkstraShortestPathAlgorithm<TVertex, TEdge>
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public DijkstraShortestPathAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights)
@@ -39,6 +41,9 @@ public DijkstraShortestPathAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public DijkstraShortestPathAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights,
@@ -54,6 +59,9 @@ public DijkstraShortestPathAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public DijkstraShortestPathAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
@@ -188,7 +196,9 @@ protected override void InternalCompute()
                 foreach (TVertex vertex in VisitedGraph.Vertices)
                 {
                     if (VerticesColors[vertex] == GraphColor.White)
+                    {
                         ComputeFromRoot(vertex);
+                    }
                 }
             }
         }
diff --git a/src/QuikGraph/Algorithms/ShortestPath/FloydWarshallAllShortestPathAlgorithm.cs b/src/QuikGraph/Algorithms/ShortestPath/FloydWarshallAllShortestPathAlgorithm.cs
index 90a54ef5f..3d3f0357d 100644
--- a/src/QuikGraph/Algorithms/ShortestPath/FloydWarshallAllShortestPathAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/ShortestPath/FloydWarshallAllShortestPathAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -81,6 +81,8 @@ public override string ToString()
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public FloydWarshallAllShortestPathAlgorithm(
             [NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights)
@@ -94,6 +96,9 @@ public FloydWarshallAllShortestPathAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public FloydWarshallAllShortestPathAlgorithm(
             [NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights,
@@ -109,6 +114,9 @@ public FloydWarshallAllShortestPathAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public FloydWarshallAllShortestPathAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
@@ -129,6 +137,8 @@ public FloydWarshallAllShortestPathAlgorithm(
         /// <param name="target">Target vertex.</param>
         /// <param name="distance">Associated distance (cost).</param>
         /// <returns>True if the distance was found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public bool TryGetDistance([NotNull] TVertex source, [NotNull] TVertex target, out double distance)
         {
             if (source == null)
@@ -154,6 +164,10 @@ public bool TryGetDistance([NotNull] TVertex source, [NotNull] TVertex target, o
         /// <param name="target">Target vertex.</param>
         /// <param name="path">The found path, otherwise null.</param>
         /// <returns>True if a path linking both vertices was found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Failed to find a predecessor vertex while getting path.</exception>
+        [ContractAnnotation("=> true, path:notnull;=> false, path:null")]
         public bool TryGetPath(
             [NotNull] TVertex source,
             [NotNull] TVertex target,
@@ -173,6 +187,7 @@ public bool TryGetPath(
             return TryGetPathInternal(source, target, out path);
         }
 
+        [ContractAnnotation("=> true, path:notnull;=> false, path:null")]
         private bool TryGetPathInternal(
             [NotNull] TVertex source,
             [NotNull] TVertex target,
@@ -246,9 +261,13 @@ protected override void Initialize()
                 SEquatableEdge<TVertex> ij = edge.ToVertexPair();
                 double cost = _weights(edge);
                 if (!_data.TryGetValue(ij, out VertexData data))
+                {
                     _data[ij] = new VertexData(cost, edge);
+                }
                 else if (cost < data.Distance)
+                {
                     _data[ij] = new VertexData(cost, edge);
+                }
             }
         }
 
@@ -261,7 +280,9 @@ protected override void InternalCompute()
 
             // Walk each vertices and make sure cost self-cost 0
             foreach (TVertex vertex in vertices)
+            {
                 _data[new SEquatableEdge<TVertex>(vertex, vertex)] = new VertexData(0, default(TEdge));
+            }
 
             ThrowIfCancellationRequested();
 
diff --git a/src/QuikGraph/Algorithms/ShortestPath/ShortestPathAlgorithmBase.cs b/src/QuikGraph/Algorithms/ShortestPath/ShortestPathAlgorithmBase.cs
index 103dcbc52..25dfcd1bd 100644
--- a/src/QuikGraph/Algorithms/ShortestPath/ShortestPathAlgorithmBase.cs
+++ b/src/QuikGraph/Algorithms/ShortestPath/ShortestPathAlgorithmBase.cs
@@ -32,6 +32,8 @@ public abstract class ShortestPathAlgorithmBase<TVertex, TEdge, TGraph>
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         protected ShortestPathAlgorithmBase(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] TGraph visitedGraph,
@@ -47,6 +49,9 @@ protected ShortestPathAlgorithmBase(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         protected ShortestPathAlgorithmBase(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] TGraph visitedGraph,
@@ -85,6 +90,7 @@ protected void SetVertexDistance([NotNull] TVertex vertex, double distance)
         }
 
         /// <inheritdoc />
+        /// <exception cref="T:System.InvalidOperationException">Algorithm has not been run.</exception>
         public bool TryGetDistance(TVertex vertex, out double distance)
         {
             if (vertex == null)
@@ -96,6 +102,7 @@ public bool TryGetDistance(TVertex vertex, out double distance)
         }
 
         /// <inheritdoc />
+        /// <exception cref="T:System.InvalidOperationException">Algorithm has not been run.</exception>
         public double GetDistance(TVertex vertex)
         {
             bool vertexFound = TryGetDistance(vertex, out double distance);
diff --git a/src/QuikGraph/Algorithms/ShortestPath/UndirectedDijkstraShortestPathAlgorithm.cs b/src/QuikGraph/Algorithms/ShortestPath/UndirectedDijkstraShortestPathAlgorithm.cs
index 8ede72bc6..acf552151 100644
--- a/src/QuikGraph/Algorithms/ShortestPath/UndirectedDijkstraShortestPathAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/ShortestPath/UndirectedDijkstraShortestPathAlgorithm.cs
@@ -26,6 +26,8 @@ public sealed class UndirectedDijkstraShortestPathAlgorithm<TVertex, TEdge>
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public UndirectedDijkstraShortestPathAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights)
@@ -39,6 +41,9 @@ public UndirectedDijkstraShortestPathAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public UndirectedDijkstraShortestPathAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights,
@@ -54,6 +59,9 @@ public UndirectedDijkstraShortestPathAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         public UndirectedDijkstraShortestPathAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
@@ -175,7 +183,9 @@ protected override void InternalCompute()
                 foreach (TVertex vertex in VisitedGraph.Vertices)
                 {
                     if (VerticesColors[vertex] == GraphColor.White)
+                    {
                         ComputeFromRoot(vertex);
+                    }
                 }
             }
         }
diff --git a/src/QuikGraph/Algorithms/ShortestPath/UndirectedShortestPathAlgorithmBase.cs b/src/QuikGraph/Algorithms/ShortestPath/UndirectedShortestPathAlgorithmBase.cs
index e52f52c61..1b6f22bfd 100644
--- a/src/QuikGraph/Algorithms/ShortestPath/UndirectedShortestPathAlgorithmBase.cs
+++ b/src/QuikGraph/Algorithms/ShortestPath/UndirectedShortestPathAlgorithmBase.cs
@@ -30,6 +30,8 @@ public abstract class UndirectedShortestPathAlgorithmBase<TVertex, TEdge>
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         protected UndirectedShortestPathAlgorithmBase(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
@@ -45,6 +47,9 @@ protected UndirectedShortestPathAlgorithmBase(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="distanceRelaxer">Distance relaxer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceRelaxer"/> is <see langword="null"/>.</exception>
         protected UndirectedShortestPathAlgorithmBase(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
@@ -83,6 +88,7 @@ protected void SetVertexDistance([NotNull] TVertex vertex, double distance)
         }
 
         /// <inheritdoc />
+        /// <exception cref="T:System.InvalidOperationException">Algorithm has not been run.</exception>
         public bool TryGetDistance(TVertex vertex, out double distance)
         {
             if (vertex == null)
@@ -94,6 +100,7 @@ public bool TryGetDistance(TVertex vertex, out double distance)
         }
 
         /// <inheritdoc />
+        /// <exception cref="T:System.InvalidOperationException">Algorithm has not been run.</exception>
         public double GetDistance(TVertex vertex)
         {
             bool vertexFound = TryGetDistance(vertex, out double distance);
@@ -188,7 +195,7 @@ protected virtual void OnTreeEdge([NotNull] TEdge edge, bool reversed)
         /// <param name="source">Source vertex.</param>
         /// <param name="target">Target vertex.</param>
         /// <returns>True if relaxation decreased the target vertex distance, false otherwise.</returns>
-        protected bool Relax(TEdge edge, TVertex source, TVertex target)
+        protected bool Relax([NotNull] TEdge edge, [NotNull] TVertex source, [NotNull] TVertex target)
         {
             Debug.Assert(edge != null);
             Debug.Assert(source != null);
@@ -204,9 +211,8 @@ protected bool Relax(TEdge edge, TVertex source, TVertex target)
             double dv = GetVertexDistance(target);
             double we = Weights(edge);
 
-            IDistanceRelaxer relaxer = DistanceRelaxer;
-            double duwe = relaxer.Combine(du, we);
-            if (relaxer.Compare(duwe, dv) < 0)
+            double duwe = DistanceRelaxer.Combine(du, we);
+            if (DistanceRelaxer.Compare(duwe, dv) < 0)
             {
                 SetVertexDistance(target, duwe);
                 return true;
diff --git a/src/QuikGraph/Algorithms/ShortestPath/YenShortestPathsAlgorithm.cs b/src/QuikGraph/Algorithms/ShortestPath/YenShortestPathsAlgorithm.cs
index 4315ce555..b2c30b51f 100644
--- a/src/QuikGraph/Algorithms/ShortestPath/YenShortestPathsAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/ShortestPath/YenShortestPathsAlgorithm.cs
@@ -60,7 +60,9 @@ internal EquatableTaggedEdge<TVertex, double> GetEdge(int i)
             internal EquatableTaggedEdge<TVertex, double>[] GetEdges(int count)
             {
                 if (count > _edges.Count)
+                {
                     count = _edges.Count;
+                }
 
                 Debug.Assert(count >= 0 && count <= _edges.Count);
 
@@ -117,7 +119,7 @@ IEnumerator IEnumerable.GetEnumerator()
         /// Initializes a new instance of the <see cref="YenShortestPathsAlgorithm{TVertex}"/> class.
         /// </summary>
         /// <remarks>
-        /// <see cref="double"/> for tag type (edge) which comes from Dijkstra’s algorithm, which is used to get one shortest path.
+        /// <see cref="T:System.Double"/> for tag type (edge) which comes from Dijkstra’s algorithm, which is used to get one shortest path.
         /// </remarks>
         /// <param name="graph">Graph to visit.</param>
         /// <param name="source">Source vertex.</param>
@@ -125,6 +127,12 @@ IEnumerator IEnumerable.GetEnumerator()
         /// <param name="k">Maximum number of path to search.</param>
         /// <param name="edgeWeights">Optional function that computes the weight for a given edge.</param>
         /// <param name="filter">Optional filter of found paths.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="source"/> is not part of <paramref name="graph"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="target"/> is not part of <paramref name="graph"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="k"/> is lower than 1.</exception>
         public YenShortestPathsAlgorithm(
             [NotNull] AdjacencyGraph<TVertex, EquatableTaggedEdge<TVertex, double>> graph,
             [NotNull] TVertex source,
@@ -139,6 +147,10 @@ public YenShortestPathsAlgorithm(
                 throw new ArgumentNullException(nameof(source));
             if (target == null)
                 throw new ArgumentNullException(nameof(target));
+            if (!graph.ContainsVertex(source))
+                throw new ArgumentException("Source must be in the graph", nameof(source));
+            if (!graph.ContainsVertex(target))
+                throw new ArgumentException("Target must be in the graph", nameof(source));
             if (k < 1)
                 throw new ArgumentOutOfRangeException(nameof(k), "Value must be positive.");
 
@@ -169,18 +181,9 @@ private double GetPathDistance([ItemNotNull] SortedPath edges)
             return edges.Sum(edge => _weights(edge));
         }
 
-        private void AssertSourceAndTargetInGraph()
-        {
-            // In case the root or target vertex is not in the graph then there is no path found
-            if (!_graph.ContainsVertex(_sourceVertex) || !_graph.ContainsVertex(_targetVertex))
-                throw new NoPathFoundException();
-        }
-
         [Pure]
         private SortedPath GetInitialShortestPath()
         {
-            AssertSourceAndTargetInGraph();
-
             // Find the first shortest way from source to target
             SortedPath? shortestPath = GetShortestPathInGraph(_graph, _sourceVertex, _targetVertex);
             // In case of Dijkstra’s algorithm couldn't find any ways
@@ -206,7 +209,9 @@ private SortedPath GetInitialShortestPath()
             var recorder = new VertexPredecessorRecorderObserver<TVertex, EquatableTaggedEdge<TVertex, double>>();
 
             using (recorder.Attach(algorithm))
+            {
                 algorithm.Compute(source);
+            }
 
             // Get shortest path from start (source) vertex to target
             return recorder.TryGetPath(target, out IEnumerable<EquatableTaggedEdge<TVertex, double>> path)
@@ -284,7 +289,9 @@ private bool SearchAndAddKthShortestPath(
 
                     // Add the potential k-shortest path to the heap
                     if (!shortestPathCandidates.Contains(totalPath))
+                    {
                         shortestPathCandidates.Enqueue(totalPath);
+                    }
                 }
 
                 // Add back the edges and nodes that were removed from the graph
@@ -313,6 +320,7 @@ private bool SearchAndAddKthShortestPath(
         /// Runs the algorithm.
         /// </summary>
         /// <returns>Found paths.</returns>
+        /// <exception cref="NoPathFoundException">No shortest path was found.</exception>
         [Pure]
         [NotNull]
         public IEnumerable<SortedPath> Execute()
diff --git a/src/QuikGraph/Algorithms/TSP/TSP.cs b/src/QuikGraph/Algorithms/TSP/TSP.cs
index bbc90aa88..8bf39ed0a 100644
--- a/src/QuikGraph/Algorithms/TSP/TSP.cs
+++ b/src/QuikGraph/Algorithms/TSP/TSP.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using QuikGraph.Algorithms.ShortestPath;
@@ -36,6 +36,8 @@ public class TSP<TVertex, TEdge, TGraph> : ShortestPathAlgorithmBase<TVertex, TE
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         public TSP(
             [NotNull] TGraph visitedGraph,
             [NotNull] Func<TEdge, double> edgeWeights)
diff --git a/src/QuikGraph/Algorithms/TSP/TasksManager.cs b/src/QuikGraph/Algorithms/TSP/TasksManager.cs
index 7ba9f9801..e9fe385f3 100644
--- a/src/QuikGraph/Algorithms/TSP/TasksManager.cs
+++ b/src/QuikGraph/Algorithms/TSP/TasksManager.cs
@@ -33,6 +33,7 @@ public void AddTask([NotNull] Task<TVertex, TEdge> task)
         /// Gets and removes the task with minimal priority.
         /// </summary>
         /// <returns>The <see cref="Task{TVertex,TEdge}"/>.</returns>
+        [Pure]
         [NotNull]
         public Task<TVertex, TEdge> GetTask()
         {
diff --git a/src/QuikGraph/Algorithms/TarjanOfflineLeastCommonAncestorAlgorithm.cs b/src/QuikGraph/Algorithms/TarjanOfflineLeastCommonAncestorAlgorithm.cs
index d77e23a12..e705b3fb1 100644
--- a/src/QuikGraph/Algorithms/TarjanOfflineLeastCommonAncestorAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/TarjanOfflineLeastCommonAncestorAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -38,6 +38,7 @@ public sealed class TarjanOfflineLeastCommonAncestorAlgorithm<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="TarjanOfflineLeastCommonAncestorAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public TarjanOfflineLeastCommonAncestorAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph)
             : this(null, visitedGraph)
@@ -49,6 +50,7 @@ public TarjanOfflineLeastCommonAncestorAlgorithm(
         /// </summary>
         /// <param name="host">Host to use if set, otherwise use this reference.</param>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public TarjanOfflineLeastCommonAncestorAlgorithm(
             [CanBeNull] IAlgorithmComponent host,
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph)
@@ -115,6 +117,7 @@ protected override void InternalCompute()
         /// <param name="pairs">Vertices pairs if set.</param>
         /// <returns>True if vertex pairs were set, false otherwise.</returns>
         [Pure]
+        [ContractAnnotation("=> true, pairs:notnull;=> false, pairs:null")]
         public bool TryGetVertexPairs(out IEnumerable<SEquatableEdge<TVertex>> pairs)
         {
             pairs = _pairs;
@@ -125,6 +128,8 @@ public bool TryGetVertexPairs(out IEnumerable<SEquatableEdge<TVertex>> pairs)
         /// Sets vertices pairs.
         /// </summary>
         /// <param name="pairs">Vertices pairs.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="pairs"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="pairs"/> is empty or any vertex from pairs is not part of <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.</exception>
         public void SetVertexPairs([NotNull] IEnumerable<SEquatableEdge<TVertex>> pairs)
         {
             if (pairs is null)
@@ -145,6 +150,10 @@ public void SetVertexPairs([NotNull] IEnumerable<SEquatableEdge<TVertex>> pairs)
         /// </summary>
         /// <param name="root">Root vertex.</param>
         /// <param name="pairs">Vertices pairs.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="pairs"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> is not part of <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="pairs"/> is empty or any vertex from pairs is not part of <see cref="AlgorithmBase{TGraph}.VisitedGraph"/>.</exception>
         public void Compute([NotNull] TVertex root, [NotNull] IEnumerable<SEquatableEdge<TVertex>> pairs)
         {
             SetVertexPairs(pairs);
diff --git a/src/QuikGraph/Algorithms/TopologicalSort/SourceFirstBidirectionalTopologicalSortAlgorithm.cs b/src/QuikGraph/Algorithms/TopologicalSort/SourceFirstBidirectionalTopologicalSortAlgorithm.cs
index b080819ff..4a17f12fd 100644
--- a/src/QuikGraph/Algorithms/TopologicalSort/SourceFirstBidirectionalTopologicalSortAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/TopologicalSort/SourceFirstBidirectionalTopologicalSortAlgorithm.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
@@ -27,6 +27,7 @@ public sealed class SourceFirstBidirectionalTopologicalSortAlgorithm<TVertex, TE
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="capacity">Sorted vertices capacity.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public SourceFirstBidirectionalTopologicalSortAlgorithm(
             [NotNull] IBidirectionalGraph<TVertex, TEdge> visitedGraph,
             int capacity = -1)
@@ -40,6 +41,7 @@ public SourceFirstBidirectionalTopologicalSortAlgorithm(
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="direction">Sort direction.</param>
         /// <param name="capacity">Sorted vertices capacity.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public SourceFirstBidirectionalTopologicalSortAlgorithm(
             [NotNull] IBidirectionalGraph<TVertex, TEdge> visitedGraph,
             TopologicalSortDirection direction,
@@ -58,7 +60,7 @@ public SourceFirstBidirectionalTopologicalSortAlgorithm(
         public TVertex[] SortedVertices { get; private set; }
 
         /// <summary>
-        /// Vertices in degrees.
+        /// Vertices in-degrees.
         /// </summary>
         [NotNull]
         public IDictionary<TVertex, int> InDegrees { get; } = new Dictionary<TVertex, int>();
diff --git a/src/QuikGraph/Algorithms/TopologicalSort/SourceFirstTopologicalSortAlgorithm.cs b/src/QuikGraph/Algorithms/TopologicalSort/SourceFirstTopologicalSortAlgorithm.cs
index 744c90162..58a898a96 100644
--- a/src/QuikGraph/Algorithms/TopologicalSort/SourceFirstTopologicalSortAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/TopologicalSort/SourceFirstTopologicalSortAlgorithm.cs
@@ -25,6 +25,7 @@ public sealed class SourceFirstTopologicalSortAlgorithm<TVertex, TEdge> : Algori
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="capacity">Sorted vertices capacity.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public SourceFirstTopologicalSortAlgorithm(
             [NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph,
             int capacity = -1)
@@ -41,7 +42,7 @@ public SourceFirstTopologicalSortAlgorithm(
         public TVertex[] SortedVertices { get; private set; }
 
         /// <summary>
-        /// Vertices in degrees.
+        /// Vertices in-degrees.
         /// </summary>
         [NotNull]
         public IDictionary<TVertex, int> InDegrees { get; } = new Dictionary<TVertex, int>();
diff --git a/src/QuikGraph/Algorithms/TopologicalSort/TopologicalSortAlgorithm.cs b/src/QuikGraph/Algorithms/TopologicalSort/TopologicalSortAlgorithm.cs
index b3c58c558..7a34a9448 100644
--- a/src/QuikGraph/Algorithms/TopologicalSort/TopologicalSortAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/TopologicalSort/TopologicalSortAlgorithm.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
@@ -24,6 +24,7 @@ public sealed class TopologicalSortAlgorithm<TVertex, TEdge>
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="capacity">Sorted vertices capacity.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public TopologicalSortAlgorithm(
             [NotNull] IVertexListGraph<TVertex, TEdge> visitedGraph,
             int capacity = -1)
diff --git a/src/QuikGraph/Algorithms/TopologicalSort/UndirectedFirstTopologicalSortAlgorithm.cs b/src/QuikGraph/Algorithms/TopologicalSort/UndirectedFirstTopologicalSortAlgorithm.cs
index 18bfff4c3..3a0fcf314 100644
--- a/src/QuikGraph/Algorithms/TopologicalSort/UndirectedFirstTopologicalSortAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/TopologicalSort/UndirectedFirstTopologicalSortAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -26,6 +26,7 @@ public sealed class UndirectedFirstTopologicalSortAlgorithm<TVertex, TEdge> : Al
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="capacity">Sorted vertices capacity.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public UndirectedFirstTopologicalSortAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
             int capacity = -1)
@@ -126,7 +127,9 @@ void UpdateAdjacentDegree(TVertex vertex)
                         throw new InvalidOperationException("Degree is negative, and cannot be.");
 
                     if (_heap.Contains(other))
+                    {
                         _heap.Update(other);
+                    }
                 }
             }
 
diff --git a/src/QuikGraph/Algorithms/TopologicalSort/UndirectedTopologicalSortAlgorithm.cs b/src/QuikGraph/Algorithms/TopologicalSort/UndirectedTopologicalSortAlgorithm.cs
index 078f74500..2ca414dd5 100644
--- a/src/QuikGraph/Algorithms/TopologicalSort/UndirectedTopologicalSortAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/TopologicalSort/UndirectedTopologicalSortAlgorithm.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using QuikGraph.Algorithms.Search;
@@ -21,6 +21,7 @@ public sealed class UndirectedTopologicalSortAlgorithm<TVertex, TEdge> : Algorit
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="capacity">Sorted vertices capacity.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public UndirectedTopologicalSortAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph,
             int capacity = -1)
diff --git a/src/QuikGraph/Algorithms/TransitiveClosureAlgorithm.cs b/src/QuikGraph/Algorithms/TransitiveClosureAlgorithm.cs
index 967f6d597..79de5e3bf 100644
--- a/src/QuikGraph/Algorithms/TransitiveClosureAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/TransitiveClosureAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Algorithms
@@ -17,6 +17,8 @@ public class TransitiveClosureAlgorithm<TVertex, TEdge> : AlgorithmBase<Bidirect
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <param name="edgeFactory">Function that create an edge between the 2 given vertices.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
         public TransitiveClosureAlgorithm(
             [NotNull] BidirectionalGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TVertex, TVertex, TEdge> edgeFactory)
@@ -47,7 +49,9 @@ protected override void InternalCompute()
             algorithmHelper.InternalCompute((graph, u, v, found, edge) =>
             {
                 if (!found)
+                {
                     graph.AddEdge(_createEdge(u, v));
+                }
             });
         }
 
diff --git a/src/QuikGraph/Algorithms/TransitiveReductionAlgorithm.cs b/src/QuikGraph/Algorithms/TransitiveReductionAlgorithm.cs
index 3eccdedf4..5cb043be8 100644
--- a/src/QuikGraph/Algorithms/TransitiveReductionAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/TransitiveReductionAlgorithm.cs
@@ -1,9 +1,4 @@
-/*
- * Code by Yoad Snapir <yoadsn@gmail.com> with a bit of refactoring.
- * Taken from https://github.com/yoadsn/ArrowDiagramGenerator because PR was not opened.
- **/
-
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace QuikGraph.Algorithms
 {
@@ -20,6 +15,7 @@ public class TransitiveReductionAlgorithm<TVertex, TEdge> : AlgorithmBase<Bidire
         /// Initializes a new instance of the <see cref="TransitiveReductionAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public TransitiveReductionAlgorithm(
             [NotNull] BidirectionalGraph<TVertex, TEdge> visitedGraph)
             : base(visitedGraph)
@@ -46,7 +42,9 @@ protected override void InternalCompute()
             algorithmHelper.InternalCompute((graph, u, v, found, edge) =>
             {
                 if (found)
+                {
                     graph.RemoveEdge(edge);
+                }
             });
         }
 
diff --git a/src/QuikGraph/Algorithms/VertexColoration/VertexColoringAlgorithm.cs b/src/QuikGraph/Algorithms/VertexColoration/VertexColoringAlgorithm.cs
index 78d1feef7..8988baded 100644
--- a/src/QuikGraph/Algorithms/VertexColoration/VertexColoringAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/VertexColoration/VertexColoringAlgorithm.cs
@@ -17,6 +17,7 @@ public sealed class VertexColoringAlgorithm<TVertex, TEdge> : AlgorithmBase<IUnd
         /// Initializes a new instance of the <see cref="VertexColoringAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to visit.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public VertexColoringAlgorithm([NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph)
             : base(visitedGraph)
         {
diff --git a/src/QuikGraph/Algorithms/VertexCover/MinimumVertexCoverApproximationAlgorithm.cs b/src/QuikGraph/Algorithms/VertexCover/MinimumVertexCoverApproximationAlgorithm.cs
index c4221c404..496ab5627 100644
--- a/src/QuikGraph/Algorithms/VertexCover/MinimumVertexCoverApproximationAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/VertexCover/MinimumVertexCoverApproximationAlgorithm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using JetBrains.Annotations;
 using QuikGraph.Collections;
@@ -30,6 +30,7 @@ public sealed class MinimumVertexCoverApproximationAlgorithm<TVertex, TEdge> : A
         /// </summary>
         /// <remarks>This constructor will use <see cref="CryptoRandom"/> ad random number generator.</remarks>
         /// <param name="graph">Graph to compute the cover.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         public MinimumVertexCoverApproximationAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> graph)
             : this(graph, new CryptoRandom())
@@ -40,6 +41,7 @@ public MinimumVertexCoverApproximationAlgorithm(
         /// Initializes a new instance of the <see cref="MinimumVertexCoverApproximationAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="graph">Graph to compute the cover.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         public MinimumVertexCoverApproximationAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> graph)
             : this(graph, new Random())
@@ -52,6 +54,8 @@ public MinimumVertexCoverApproximationAlgorithm(
         /// </summary>
         /// <param name="graph">Graph to compute the cover.</param>
         /// <param name="rng">Random number generator.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="rng"/> is <see langword="null"/>.</exception>
         public MinimumVertexCoverApproximationAlgorithm(
             [NotNull] IUndirectedGraph<TVertex, TEdge> graph,
             [NotNull] Random rng)
diff --git a/src/QuikGraph/Collections/BinaryHeap.cs b/src/QuikGraph/Collections/BinaryHeap.cs
index 0926d3af2..a15612e5c 100644
--- a/src/QuikGraph/Collections/BinaryHeap.cs
+++ b/src/QuikGraph/Collections/BinaryHeap.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -49,6 +49,7 @@ public BinaryHeap()
         /// Initializes a new instance of the <see cref="BinaryHeap{TPriority,TValue}"/> class.
         /// </summary>
         /// <param name="capacity">Heap capacity.</param>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="capacity"/> is negative.</exception>
         public BinaryHeap(int capacity)
             : this(capacity, Comparer<TPriority>.Default.Compare)
         {
@@ -58,6 +59,7 @@ public BinaryHeap(int capacity)
         /// Initializes a new instance of the <see cref="BinaryHeap{TPriority,TValue}"/> class.
         /// </summary>
         /// <param name="priorityComparison">Priority comparer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="priorityComparison"/> is <see langword="null"/>.</exception>
         public BinaryHeap([NotNull] Comparison<TPriority> priorityComparison)
             : this(DefaultCapacity, priorityComparison)
         {
@@ -68,6 +70,8 @@ public BinaryHeap([NotNull] Comparison<TPriority> priorityComparison)
         /// </summary>
         /// <param name="capacity">Heap capacity.</param>
         /// <param name="priorityComparison">Priority comparer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="priorityComparison"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="capacity"/> is negative.</exception>
         public BinaryHeap(int capacity, [NotNull] Comparison<TPriority> priorityComparison)
         {
             if (capacity < 0)
@@ -173,7 +177,7 @@ private void MinHeapifyUp(int start)
         /// Gets the minimum pair.
         /// </summary>
         /// <returns>The minimal pair.</returns>
-        /// <exception cref="InvalidOperationException">The heap is empty.</exception>
+        /// <exception cref="T:System.InvalidOperationException">The heap is empty.</exception>
         public KeyValuePair<TPriority, TValue> Minimum()
         {
             if (Count == 0)
@@ -185,7 +189,7 @@ public KeyValuePair<TPriority, TValue> Minimum()
         /// Gets and removes the minimal pair.
         /// </summary>
         /// <returns>The minimal pair.</returns>
-        /// <exception cref="InvalidOperationException">The heap is empty.</exception>
+        /// <exception cref="T:System.InvalidOperationException">The heap is empty.</exception>
         public KeyValuePair<TPriority, TValue> RemoveMinimum()
         {
 #if BINARY_HEAP_DEBUG
@@ -220,9 +224,13 @@ private void MinHeapifyDown(int index)
                 int right = 2 * index + 2;
                 int smallest = index;
                 if (left < Count && Less(left, smallest))
+                {
                     smallest = left;
+                }
                 if (right < Count && Less(right, smallest))
+                {
                     smallest = right;
+                }
 
                 if (smallest == index)
                     break;
@@ -266,14 +274,17 @@ public void Update([NotNull] TPriority priority, [NotNull] TValue value)
             // If it exists, update, else add
             if (index > -1)
             {
-                TPriority newPriority = priority;
                 TPriority oldPriority = _items[index].Key;
-                _items[index] = new KeyValuePair<TPriority, TValue>(newPriority, value);
+                _items[index] = new KeyValuePair<TPriority, TValue>(priority, value);
 
-                if (PriorityComparison(newPriority, oldPriority) > 0)
+                if (PriorityComparison(priority, oldPriority) > 0)
+                {
                     MinHeapifyDown(index);
-                else if (PriorityComparison(newPriority, oldPriority) < 0)
+                }
+                else if (PriorityComparison(priority, oldPriority) < 0)
+                {
                     MinHeapifyUp(index);
+                }
             }
             else
             {
@@ -394,7 +405,9 @@ public TValue[] ToArray()
         {
             var array = new TValue[Count];
             for (int i = 0; i < Count; ++i)
+            {
                 array[i] = _items[i].Value;
+            }
             return array;
         }
 
@@ -421,25 +434,31 @@ private string EntryToString(int i)
             TPriority k = kvp.Key;
             TValue v = kvp.Value;
 
-            return $"{k.ToString()} {(v == null ? "null" : v.ToString())}";
+            return $"{k} {(v == null ? "null" : v.ToString())}";
         }
 
         /// <summary>
         /// Checks if this heap is consistent (fulfill indexing rule).
         /// </summary>
         /// <returns>True if the heap is consistent, false otherwise.</returns>
+        [Pure]
         internal bool IsConsistent()
         {
             int wrong = -1;
 
-            for (int i = 0; i < Count; i++)
+            for (int i = 0; i < Count; ++i)
             {
                 int l = 2 * i + 1;
                 int r = 2 * i + 2;
                 if (l < Count && !LessOrEqual(i, l))
+                {
                     wrong = i;
+                }
+
                 if (r < Count && !LessOrEqual(i, r))
+                {
                     wrong = i;
+                }
             }
 
             bool correct = wrong == -1;
diff --git a/src/QuikGraph/Collections/BinaryQueue.cs b/src/QuikGraph/Collections/BinaryQueue.cs
index e4ef38177..43ac2804b 100644
--- a/src/QuikGraph/Collections/BinaryQueue.cs
+++ b/src/QuikGraph/Collections/BinaryQueue.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -26,6 +26,7 @@ public sealed class BinaryQueue<TVertex, TDistance> : IPriorityQueue<TVertex>
         /// Initializes a new instance of the <see cref="BinaryQueue{TVertex,TDistance}"/> class.
         /// </summary>
         /// <param name="distanceFunc">Function that compute the distance for a given vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceFunc"/> is <see langword="null"/>.</exception>
         public BinaryQueue([NotNull] Func<TVertex, TDistance> distanceFunc)
             : this(distanceFunc, Comparer<TDistance>.Default.Compare)
         {
@@ -36,6 +37,8 @@ public BinaryQueue([NotNull] Func<TVertex, TDistance> distanceFunc)
         /// </summary>
         /// <param name="distanceFunc">Function that compute the distance for a given vertex.</param>
         /// <param name="distanceComparison">Comparer of distances.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceFunc"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceComparison"/> is <see langword="null"/>.</exception>
         public BinaryQueue(
             [NotNull] Func<TVertex, TDistance> distanceFunc, 
             [NotNull] Comparison<TDistance> distanceComparison)
diff --git a/src/QuikGraph/Collections/EdgeEdgeDictionary.cs b/src/QuikGraph/Collections/EdgeEdgeDictionary.cs
index df9374424..f1098b16b 100644
--- a/src/QuikGraph/Collections/EdgeEdgeDictionary.cs
+++ b/src/QuikGraph/Collections/EdgeEdgeDictionary.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_SERIALIZATION || SUPPORTS_CLONEABLE
+#if SUPPORTS_SERIALIZATION || SUPPORTS_CLONEABLE
 using System;
 #endif
 using System.Collections.Generic;
@@ -34,17 +34,13 @@ public EdgeEdgeDictionary()
         /// Initializes a new instance of the <see cref="EdgeEdgeDictionary{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="capacity">Dictionary capacity.</param>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="capacity"/> is negative.</exception>
         public EdgeEdgeDictionary(int capacity)
             : base(capacity)
         {
         }
 
 #if SUPPORTS_SERIALIZATION
-        /// <summary>
-        /// Initializes a new instance of <see cref="EdgeEdgeDictionary{TVertex,TEdge}"/> with serialized data.
-        /// </summary>
-        /// <param name="info"><see cref="SerializationInfo"/> that contains serialized data.</param>
-        /// <param name="context"><see cref="StreamingContext"/> that contains contextual information.</param>
         private EdgeEdgeDictionary(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
@@ -60,7 +56,9 @@ public EdgeEdgeDictionary<TVertex, TEdge> Clone()
         {
             var clone = new EdgeEdgeDictionary<TVertex, TEdge>(Count);
             foreach (KeyValuePair<TEdge, TEdge> pair in this)
+            {
                 clone.Add(pair.Key, pair.Value);
+            }
             return clone;
         }
 
diff --git a/src/QuikGraph/Collections/EdgeList.cs b/src/QuikGraph/Collections/EdgeList.cs
index 9ea916993..07f607ca3 100644
--- a/src/QuikGraph/Collections/EdgeList.cs
+++ b/src/QuikGraph/Collections/EdgeList.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_SERIALIZATION || SUPPORTS_CLONEABLE
+#if SUPPORTS_SERIALIZATION || SUPPORTS_CLONEABLE
 using System;
 #endif
 using System.Collections.Generic;
@@ -28,12 +28,14 @@ public EdgeList()
         /// Initializes a new instance of the <see cref="EdgeList{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="capacity">List capacity.</param>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="capacity"/> is negative.</exception>
         public EdgeList(int capacity)
             : base(capacity)
         {
         }
 
         /// <inheritdoc />
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="other"/> is <see langword="null"/>.</exception>
         public EdgeList([NotNull] EdgeList<TVertex, TEdge> other)
             : base(other)
         {
diff --git a/src/QuikGraph/Collections/FibonacciHeap.cs b/src/QuikGraph/Collections/FibonacciHeap.cs
index a69637894..8656b4dc2 100644
--- a/src/QuikGraph/Collections/FibonacciHeap.cs
+++ b/src/QuikGraph/Collections/FibonacciHeap.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -50,6 +50,7 @@ public FibonacciHeap(HeapDirection direction)
         /// </summary>
         /// <param name="direction">Heap direction.</param>
         /// <param name="priorityComparison">Priority comparer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="priorityComparison"/> is <see langword="null"/>.</exception>
         public FibonacciHeap(HeapDirection direction, [NotNull] Comparison<TPriority> priorityComparison)
         {
             _cells = new FibonacciHeapLinkedList<TPriority, TValue>();
@@ -91,6 +92,7 @@ public FibonacciHeap(HeapDirection direction, [NotNull] Comparison<TPriority> pr
         /// </summary>
         /// <param name="priority">Value priority.</param>
         /// <param name="value">Value to add.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="priority"/> is <see langword="null"/>.</exception>
         public FibonacciHeapCell<TPriority, TValue> Enqueue([NotNull] TPriority priority, [CanBeNull] TValue value)
         {
             if (priority == null)
@@ -127,6 +129,8 @@ public FibonacciHeapCell<TPriority, TValue> Enqueue([NotNull] TPriority priority
         /// </summary>
         /// <param name="cell">Cell to update the priority.</param>
         /// <param name="newPriority">New priority.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="cell"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="newPriority"/> is <see langword="null"/>.</exception>
         public void ChangeKey([NotNull] FibonacciHeapCell<TPriority, TValue> cell, [NotNull] TPriority newPriority)
         {
             if (cell is null)
@@ -225,7 +229,9 @@ private void UpdateCellOppositeDirection([NotNull] FibonacciHeapCell<TPriority,
                     if (PriorityComparison(cell.Priority, child.Priority) * _directionMultiplier > 0)
                     {
                         if (toUpdate is null)
+                        {
                             toUpdate = new List<FibonacciHeapCell<TPriority, TValue>>();
+                        }
                         toUpdate.Add(child);
                     }
                 }
@@ -281,6 +287,7 @@ private void UpdateCellsDegree([NotNull] FibonacciHeapCell<TPriority, TValue> ce
         /// Deletes the given <paramref name="cell"/> from this heap.
         /// </summary>
         /// <param name="cell">Cell to delete.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="cell"/> is <see langword="null"/>.</exception>
         public void Delete([NotNull] FibonacciHeapCell<TPriority, TValue> cell)
         {
             if (cell is null)
@@ -294,6 +301,7 @@ public void Delete([NotNull] FibonacciHeapCell<TPriority, TValue> cell)
         /// Dequeues an element from the heap.
         /// </summary>
         /// <returns>Removed element.</returns>
+        /// <exception cref="T:System.InvalidOperationException">The heap is empty.</exception>
         public KeyValuePair<TPriority, TValue> Dequeue()
         {
             if (Count == 0)
@@ -355,7 +363,7 @@ private void CompressHeap()
             FibonacciHeapCell<TPriority, TValue> cell = _cells.First;
             while (cell != null)
             {
-                var nextCell = ReduceCell(ref cell);
+                FibonacciHeapCell<TPriority, TValue> nextCell = ReduceCell(ref cell);
 
                 _degreeToCell[cell.Degree] = cell;
                 cell = nextCell;
@@ -422,7 +430,8 @@ private void ReduceCells(
         /// Merges the given <paramref name="heap"/> into this heap.
         /// </summary>
         /// <param name="heap">Heap to merge.</param>
-        /// <exception cref="Exception">If the heap is not in the same direction.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="heap"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException"><paramref name="heap"/> is not in the same direction as this heap.</exception>
         public void Merge([NotNull] FibonacciHeap<TPriority, TValue> heap)
         {
             if (heap is null)
@@ -515,9 +524,7 @@ public string DrawHeap()
         {
             var lines = new List<string>();
             int columnPosition = 0;
-            var list = new List<CellLevel>();
-            foreach (FibonacciHeapCell<TPriority, TValue> cell in _cells)
-                list.Add(new CellLevel(cell, 0));
+            var list = _cells.Select(cell => new CellLevel(cell, 0)).ToList();
             list.Reverse();
 
             var stack = new Stack<CellLevel>(list);
@@ -526,7 +533,9 @@ public string DrawHeap()
                 CellLevel currentCell = stack.Pop();
                 int lineNum = currentCell.Level;
                 if (lines.Count <= lineNum)
+                {
                     lines.Add(string.Empty);
+                }
 
                 string currentLine = lines[lineNum];
                 currentLine = currentLine.PadRight(columnPosition, ' ');
diff --git a/src/QuikGraph/Collections/FibonacciHeapCell.cs b/src/QuikGraph/Collections/FibonacciHeapCell.cs
index 8d6204dac..66b0372a9 100644
--- a/src/QuikGraph/Collections/FibonacciHeapCell.cs
+++ b/src/QuikGraph/Collections/FibonacciHeapCell.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_SERIALIZATION
+#if SUPPORTS_SERIALIZATION
 using System;
 #endif
 using System.Collections.Generic;
@@ -66,9 +66,9 @@ public sealed class FibonacciHeapCell<TPriority, TValue>
         public FibonacciHeapCell<TPriority, TValue> Next { get; internal set; }
 
         /// <summary>
-        /// Converts this cell to a <see cref="KeyValuePair{TPriority,TValue}"/>.
+        /// Converts this cell to a <see cref="T:System.Collections.Generic.KeyValuePair{TPriority,TValue}"/>.
         /// </summary>
-        /// <returns>A corresponding <see cref="KeyValuePair{TPriority,TValue}"/>.</returns>
+        /// <returns>A corresponding <see cref="T:System.Collections.Generic.KeyValuePair{TPriority,TValue}"/>.</returns>
         [Pure]
         public KeyValuePair<TPriority, TValue> ToKeyValuePair()
         {
diff --git a/src/QuikGraph/Collections/FibonacciQueue.cs b/src/QuikGraph/Collections/FibonacciQueue.cs
index b0842e950..0a5fd93a5 100644
--- a/src/QuikGraph/Collections/FibonacciQueue.cs
+++ b/src/QuikGraph/Collections/FibonacciQueue.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -31,6 +31,7 @@ public sealed class FibonacciQueue<TVertex, TDistance> : IPriorityQueue<TVertex>
         /// Initializes a new instance of the <see cref="BinaryQueue{TVertex,TDistance}"/> class.
         /// </summary>
         /// <param name="distanceFunc">Function that compute the distance for a given vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceFunc"/> is <see langword="null"/>.</exception>
         public FibonacciQueue([NotNull] Func<TVertex, TDistance> distanceFunc)
             : this(0, null, distanceFunc, Comparer<TDistance>.Default.Compare)
         {
@@ -42,6 +43,8 @@ public FibonacciQueue([NotNull] Func<TVertex, TDistance> distanceFunc)
         /// <param name="capacity">Initial capacity.</param>
         /// <param name="values">Set of vertices (null if <paramref name="capacity"/> is 0).</param>
         /// <param name="distanceFunc">Function that compute the distance for a given vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceFunc"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="capacity"/> is negative.</exception>
         public FibonacciQueue(
             int capacity,
             [CanBeNull, ItemNotNull] IEnumerable<TVertex> values,
@@ -57,6 +60,9 @@ public FibonacciQueue(
         /// <param name="values">Set of vertices (null if <paramref name="capacity"/> is 0).</param>
         /// <param name="distanceFunc">Function that compute the distance for a given vertex.</param>
         /// <param name="distanceComparison">Comparer of distances.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceFunc"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceComparison"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="capacity"/> is negative.</exception>
         public FibonacciQueue(
             int capacity,
             [CanBeNull, ItemNotNull] IEnumerable<TVertex> values,
@@ -92,6 +98,7 @@ public FibonacciQueue(
         /// Initializes a new instance of the <see cref="FibonacciQueue{TVertex,TDistance}"/> class.
         /// </summary>
         /// <param name="values">Dictionary of vertices associates to their distance.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="values"/> is <see langword="null"/>.</exception>
         public FibonacciQueue(
             [NotNull] Dictionary<TVertex, TDistance> values)
             : this(values, Comparer<TDistance>.Default.Compare)
@@ -103,6 +110,8 @@ public FibonacciQueue(
         /// </summary>
         /// <param name="values">Dictionary of vertices associates to their distance.</param>
         /// <param name="distanceComparison">Comparer of distances.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="values"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceComparison"/> is <see langword="null"/>.</exception>
         public FibonacciQueue(
             [NotNull] Dictionary<TVertex, TDistance> values,
             [NotNull] Comparison<TDistance> distanceComparison)
diff --git a/src/QuikGraph/Collections/ForestDisjointSet.cs b/src/QuikGraph/Collections/ForestDisjointSet.cs
index af9aa9000..f9a7f5447 100644
--- a/src/QuikGraph/Collections/ForestDisjointSet.cs
+++ b/src/QuikGraph/Collections/ForestDisjointSet.cs
@@ -61,6 +61,7 @@ public ForestDisjointSet()
         /// Initializes a new instance of the <see cref="ForestDisjointSet{T}"/> class.
         /// </summary>
         /// <param name="capacity">Element capacity.</param>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="capacity"/> is negative or <see cref="F:int.MaxValue"/>.</exception>
         public ForestDisjointSet(int capacity)
         {
             if (capacity < 0 || capacity >= int.MaxValue)
@@ -132,7 +133,9 @@ private static Element FindNoCompression([NotNull] Element element)
             // Find root
             Element current = element;
             while (current.Parent != null)
+            {
                 current = current.Parent;
+            }
 
             Debug.Assert(current != null);
             return current;
diff --git a/src/QuikGraph/Collections/Queue.cs b/src/QuikGraph/Collections/Queue.cs
index f0ba55d56..8c3a8fc8b 100644
--- a/src/QuikGraph/Collections/Queue.cs
+++ b/src/QuikGraph/Collections/Queue.cs
@@ -1,10 +1,10 @@
-#if SUPPORTS_SERIALIZATION
+#if SUPPORTS_SERIALIZATION
 using System;
 #endif
 
 namespace QuikGraph.Collections
 {
-    /// <inheritdoc cref="System.Collections.Generic.Queue{T}" />
+    /// <inheritdoc cref="IQueue{T}" />
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
diff --git a/src/QuikGraph/Collections/SoftHeap.cs b/src/QuikGraph/Collections/SoftHeap.cs
index 86e72fb1c..436bffb31 100644
--- a/src/QuikGraph/Collections/SoftHeap.cs
+++ b/src/QuikGraph/Collections/SoftHeap.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -105,6 +105,8 @@ private sealed class Head
         /// </summary>
         /// <param name="maximumErrorRate">Indicates the maximum error rate to respect.</param>
         /// <param name="keyMaxValue">Gives the maximum key value.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="keyMaxValue"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="maximumErrorRate"/> is not in range ]0, 0.5].</exception>
         public SoftHeap(double maximumErrorRate, [NotNull] TKey keyMaxValue)
             : this(maximumErrorRate, keyMaxValue, Comparer<TKey>.Default.Compare)
         {
@@ -116,6 +118,9 @@ public SoftHeap(double maximumErrorRate, [NotNull] TKey keyMaxValue)
         /// <param name="maximumErrorRate">Indicates the maximum error rate to respect.</param>
         /// <param name="keyMaxValue">Gives the maximum key value.</param>
         /// <param name="comparison">Key comparer.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="keyMaxValue"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="comparison"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="maximumErrorRate"/> is not in range ]0, 0.5].</exception>
         public SoftHeap(double maximumErrorRate, [NotNull] TKey keyMaxValue, [NotNull] Comparison<TKey> comparison)
         {
             if (keyMaxValue == null)
@@ -166,6 +171,8 @@ public SoftHeap(double maximumErrorRate, [NotNull] TKey keyMaxValue, [NotNull] C
         /// </summary>
         /// <param name="key">Key.</param>
         /// <param name="value">Value to add.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="key"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="key"/> is superior to <see cref="KeyMaxValue"/>.</exception>
         public void Add([NotNull] TKey key, [CanBeNull] TValue value)
         {
             if (key == null)
@@ -236,7 +243,9 @@ private void FixMinList([NotNull] Head head)
             while (head != _header)
             {
                 if (KeyComparison(tmpMin.Queue.CKey, head.Queue.CKey) > 0)
+                {
                     tmpMin = head;
+                }
 
                 head.SuffixMin = tmpMin;
                 head = head.Prev;
@@ -298,7 +307,9 @@ private void SoftenHeap([NotNull] Node node)
                     node.Next.ILTail.Next = node.IL;
                     node.IL = node.Next.IL;
                     if (node.ILTail == null)
+                    {
                         node.ILTail = node.Next.ILTail;
+                    }
                     node.CKey = node.Next.CKey;
                 }
             } // End second shift
@@ -327,7 +338,7 @@ private void UpdateChildAndNext([NotNull] Node node)
         /// Gets and removes the minimal pair.
         /// </summary>
         /// <returns>The minimal pair.</returns>
-        /// <exception cref="InvalidOperationException">The heap is empty.</exception>
+        /// <exception cref="T:System.InvalidOperationException">The heap is empty.</exception>
         public KeyValuePair<TKey, TValue> RemoveMinimum()
         {
             if (Count == 0)
@@ -376,7 +387,9 @@ public KeyValuePair<TKey, TValue> RemoveMinimum()
             TValue value = head.Queue.IL.Value;
             head.Queue.IL = head.Queue.IL.Next;
             if (head.Queue.IL is null)
+            {
                 head.Queue.ILTail = null;
+            }
 
             --Count;
             return new KeyValuePair<TKey, TValue>(min, value);
diff --git a/src/QuikGraph/Collections/VertexEdgeDictionary.cs b/src/QuikGraph/Collections/VertexEdgeDictionary.cs
index aa19432c7..95f6d08e8 100644
--- a/src/QuikGraph/Collections/VertexEdgeDictionary.cs
+++ b/src/QuikGraph/Collections/VertexEdgeDictionary.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_SERIALIZATION || SUPPORTS_CLONEABLE
+#if SUPPORTS_SERIALIZATION || SUPPORTS_CLONEABLE
 using System;
 #endif
 using System.Collections.Generic;
@@ -33,17 +33,13 @@ public VertexEdgeDictionary()
         /// Initializes a new instance of the <see cref="VertexEdgeDictionary{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="capacity">Dictionary capacity.</param>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="capacity"/> is negative.</exception>
         public VertexEdgeDictionary(int capacity)
             : base(capacity)
         {
         }
 
 #if SUPPORTS_SERIALIZATION
-        /// <summary>
-        /// Initializes a new instance of <see cref="VertexEdgeDictionary{TVertex,TEdge}"/> with serialized data.
-        /// </summary>
-        /// <param name="info"><see cref="SerializationInfo"/> that contains serialized data.</param>
-        /// <param name="context"><see cref="StreamingContext"/> that contains contextual information.</param>
         private VertexEdgeDictionary(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
diff --git a/src/QuikGraph/Collections/VertexList.cs b/src/QuikGraph/Collections/VertexList.cs
index cfe968829..11d964f89 100644
--- a/src/QuikGraph/Collections/VertexList.cs
+++ b/src/QuikGraph/Collections/VertexList.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_SERIALIZATION || SUPPORTS_CLONEABLE
+#if SUPPORTS_SERIALIZATION || SUPPORTS_CLONEABLE
 using System;
 #endif
 using System.Collections.Generic;
@@ -29,12 +29,14 @@ public VertexList()
         /// Initializes a new instance of the <see cref="VertexList{TVertex}"/> class.
         /// </summary>
         /// <param name="capacity">List capacity.</param>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="capacity"/> is negative.</exception>
         public VertexList(int capacity)
             : base(capacity)
         {
         }
 
         /// <inheritdoc />
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="other"/> is <see langword="null"/>.</exception>
         public VertexList([NotNull] VertexList<TVertex> other)
             : base(other)
         {
diff --git a/src/QuikGraph/Compatibility/SortedSet.cs b/src/QuikGraph/Compatibility/SortedSet.cs
index 382626db0..b05512436 100644
--- a/src/QuikGraph/Compatibility/SortedSet.cs
+++ b/src/QuikGraph/Compatibility/SortedSet.cs
@@ -100,6 +100,7 @@ public SortedSet([CanBeNull] IComparer<T> comparer)
         /// with given <paramref name="collection"/>.
         /// </summary>
         /// <param name="collection">Initial elements to add.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="collection"/> is <see langword="null"/>.</exception>
         public SortedSet([NotNull, ItemCanBeNull] IEnumerable<T> collection)
             : this(collection, Comparer<T>.Default)
         {
@@ -112,6 +113,7 @@ public SortedSet([NotNull, ItemCanBeNull] IEnumerable<T> collection)
         /// </summary>
         /// <param name="collection">Initial elements to add.</param>
         /// <param name="comparer"><see cref="Comparer{T}"/> to use.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="collection"/> is <see langword="null"/>.</exception>
         public SortedSet([NotNull, ItemCanBeNull] IEnumerable<T> collection, [CanBeNull] IComparer<T> comparer)
             : this(comparer)
         {
@@ -199,12 +201,8 @@ public SortedSet([NotNull, ItemCanBeNull] IEnumerable<T> collection, [CanBeNull]
         private SerializationInfo _serializationInfo; // A temporary variable which we need during deserialization.
 
         /// <summary>
-        /// Initializes a new instance of <see cref="SortedSet{T}"/> with serialized data.
+        /// Constructor used during runtime serialization.
         /// </summary>
-        /// <param name="info"><see cref="SerializationInfo"/> that contains serialized data
-        /// concerning the thrown exception.</param>
-        /// <param name="context"><see cref="StreamingContext"/> that contains contextual information.</param>
-
         protected SortedSet(SerializationInfo info, StreamingContext context)
         {
             _serializationInfo = info;
@@ -649,7 +647,11 @@ public void CopyTo(T[] array, int index)
         /// Copies the content of this <see cref="SortedSet{T}"/> to the given array.
         /// Starts at given <paramref name="index"/> and copies <paramref name="count"/> elements.
         /// </summary>
-        public void CopyTo(T[] array, int index, int count)
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="array"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="array"/> is too small.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="index"/> is negative.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="count"/> is negative.</exception>
+        public void CopyTo([NotNull] T[] array, int index, int count)
         {
             if (array is null)
                 throw new ArgumentNullException(nameof(array));
@@ -1005,7 +1007,7 @@ private static void Split4Node([NotNull] Node node)
         /// The caller object is important as <see cref="UnionWith"/> uses the Comparator
         /// associated with THIS to check equality.
         /// </remarks>
-        /// <exception cref="ArgumentNullException">If <paramref name="other"/> is null.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="other"/> is <see langword="null"/>.</exception>
         public void UnionWith([NotNull, ItemCanBeNull] IEnumerable<T> other)
         {
             if (other is null)
@@ -1165,7 +1167,7 @@ private static Node ConstructRootFromSortedArray(
         /// The caller object is important as <see cref="IntersectWith"/> uses the Comparator
         /// associated with THIS to check equality.
         /// </remarks>
-        /// <exception cref="ArgumentNullException">If <paramref name="other"/> is null.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="other"/> is <see langword="null"/>.</exception>
         public void IntersectWith([NotNull, ItemCanBeNull] IEnumerable<T> other)
         {
             if (other is null)
@@ -1247,7 +1249,7 @@ private void IntersectWithEnumerable([NotNull, ItemCanBeNull] IEnumerable<T> oth
         /// The caller object is important as <see cref="ExceptWith"/> uses the Comparator
         /// associated with THIS to check equality.
         /// </remarks>
-        /// <exception cref="ArgumentNullException">If <paramref name="other"/> is null.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="other"/> is <see langword="null"/>.</exception>
         public void ExceptWith([NotNull, ItemCanBeNull] IEnumerable<T> other)
         {
             if (other is null)
@@ -1288,6 +1290,7 @@ public void ExceptWith([NotNull, ItemCanBeNull] IEnumerable<T> other)
         /// <summary>
         /// Checks whether this Tree has all elements in common with <see cref="IEnumerable{T}"/> <paramref name="other"/>.
         /// </summary>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="other"/> is <see langword="null"/>.</exception>
         public bool SetEquals([NotNull, ItemCanBeNull] IEnumerable<T> other)
         {
             if (other is null)
@@ -1413,8 +1416,9 @@ private unsafe ElementCount CheckUniqueAndUnfoundElements(IEnumerable<T> other,
         /// <summary>
         /// Removes elements matching the given <paramref name="predicate"/>.
         /// </summary>
-        /// <param name="predicate"></param>
-        /// <returns></returns>
+        /// <param name="predicate">Predicate to match to removed elements.</param>
+        /// <returns>Number of removed elements.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="predicate"/> is <see langword="null"/>.</exception>
         public int RemoveWhere([NotNull] Predicate<T> predicate)
         {
             if (predicate is null)
@@ -1488,7 +1492,7 @@ public T Max
         [NotNull, ItemCanBeNull]
         public IEnumerable<T> Reverse()
         {
-            Enumerator e = new Enumerator(this, true);
+            var e = new Enumerator(this, true);
             while (e.MoveNext())
             {
                 yield return e.Current;
diff --git a/src/QuikGraph/Events/EdgeEventArgs.cs b/src/QuikGraph/Events/EdgeEventArgs.cs
index e7df17b7a..9f80a5dea 100644
--- a/src/QuikGraph/Events/EdgeEventArgs.cs
+++ b/src/QuikGraph/Events/EdgeEventArgs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -18,6 +18,7 @@ public class EdgeEventArgs<TVertex, TEdge> : EventArgs
         /// Initializes a new instance of the <see cref="EdgeEventArgs{TVertex, TEdge}"/> class.
         /// </summary>
         /// <param name="edge">Concerned edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         public EdgeEventArgs([NotNull] TEdge edge)
         {
             if (edge == null)
diff --git a/src/QuikGraph/Events/UndirectedEdgeEventArgs.cs b/src/QuikGraph/Events/UndirectedEdgeEventArgs.cs
index 96269c57a..726721a71 100644
--- a/src/QuikGraph/Events/UndirectedEdgeEventArgs.cs
+++ b/src/QuikGraph/Events/UndirectedEdgeEventArgs.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_SERIALIZATION
+#if SUPPORTS_SERIALIZATION
 using System;
 #endif
 using JetBrains.Annotations;
@@ -21,6 +21,7 @@ public class UndirectedEdgeEventArgs<TVertex, TEdge> : EdgeEventArgs<TVertex, TE
         /// </summary>
         /// <param name="edge">The edge.</param>
         /// <param name="reversed">Indicates if the edge should be reversed or not.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         public UndirectedEdgeEventArgs([NotNull] TEdge edge, bool reversed)
             : base(edge)
         {
diff --git a/src/QuikGraph/Events/VertexEventArgs.cs b/src/QuikGraph/Events/VertexEventArgs.cs
index c68b1d1eb..b78bc0a6e 100644
--- a/src/QuikGraph/Events/VertexEventArgs.cs
+++ b/src/QuikGraph/Events/VertexEventArgs.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -16,6 +16,7 @@ public class VertexEventArgs<TVertex> : EventArgs
         /// Initializes a new instance of the <see cref="VertexEventArgs{TVertex}"/> class.
         /// </summary>
         /// <param name="vertex">Concerned vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         public VertexEventArgs([NotNull] TVertex vertex)
         {
             if (vertex == null)
diff --git a/src/QuikGraph/Exceptions/NegativeCapacityException.cs b/src/QuikGraph/Exceptions/NegativeCapacityException.cs
index 6d6944279..b56c043ab 100644
--- a/src/QuikGraph/Exceptions/NegativeCapacityException.cs
+++ b/src/QuikGraph/Exceptions/NegativeCapacityException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 #if SUPPORTS_SERIALIZATION
 using System.Runtime.Serialization;
 #endif
@@ -32,11 +32,8 @@ public NegativeCapacityException([NotNull] string message, [CanBeNull] Exception
 
 #if SUPPORTS_SERIALIZATION
         /// <summary>
-        /// Initializes a new instance of <see cref="NegativeCapacityException"/> with serialized data.
+        /// Constructor used during runtime serialization.
         /// </summary>
-        /// <param name="info"><see cref="SerializationInfo"/> that contains serialized data
-        /// concerning the thrown exception.</param>
-        /// <param name="context"><see cref="StreamingContext"/> that contains contextual information.</param>
         protected NegativeCapacityException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
diff --git a/src/QuikGraph/Exceptions/NegativeCycleGraphException.cs b/src/QuikGraph/Exceptions/NegativeCycleGraphException.cs
index f0b3d5a71..d4fc9c1ae 100644
--- a/src/QuikGraph/Exceptions/NegativeCycleGraphException.cs
+++ b/src/QuikGraph/Exceptions/NegativeCycleGraphException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 #if SUPPORTS_SERIALIZATION
 using System.Runtime.Serialization;
 #endif
@@ -32,11 +32,8 @@ public NegativeCycleGraphException([NotNull] string message, [CanBeNull] Excepti
 
 #if SUPPORTS_SERIALIZATION
         /// <summary>
-        /// Initializes a new instance of <see cref="NegativeCycleGraphException"/> with serialized data.
+        /// Constructor used during runtime serialization.
         /// </summary>
-        /// <param name="info"><see cref="SerializationInfo"/> that contains serialized data
-        /// concerning the thrown exception.</param>
-        /// <param name="context"><see cref="StreamingContext"/> that contains contextual information.</param>
         protected NegativeCycleGraphException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
diff --git a/src/QuikGraph/Exceptions/NegativeWeightException.cs b/src/QuikGraph/Exceptions/NegativeWeightException.cs
index 2339ab44c..f346f4c63 100644
--- a/src/QuikGraph/Exceptions/NegativeWeightException.cs
+++ b/src/QuikGraph/Exceptions/NegativeWeightException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 #if SUPPORTS_SERIALIZATION
 using System.Runtime.Serialization;
 #endif
@@ -32,11 +32,8 @@ public NegativeWeightException([NotNull] string message, [CanBeNull] Exception i
 
 #if SUPPORTS_SERIALIZATION
         /// <summary>
-        /// Initializes a new instance of <see cref="NegativeWeightException"/> with serialized data.
+        /// Constructor used during runtime serialization.
         /// </summary>
-        /// <param name="info"><see cref="SerializationInfo"/> that contains serialized data
-        /// concerning the thrown exception.</param>
-        /// <param name="context"><see cref="StreamingContext"/> that contains contextual information.</param>
         protected NegativeWeightException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
diff --git a/src/QuikGraph/Exceptions/NoPathFoundException.cs b/src/QuikGraph/Exceptions/NoPathFoundException.cs
index 5c28d3a34..d1491accc 100644
--- a/src/QuikGraph/Exceptions/NoPathFoundException.cs
+++ b/src/QuikGraph/Exceptions/NoPathFoundException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 #if SUPPORTS_SERIALIZATION
 using System.Runtime.Serialization;
 #endif
@@ -32,11 +32,8 @@ public NoPathFoundException([NotNull] string message, [CanBeNull] Exception inne
 
 #if SUPPORTS_SERIALIZATION
         /// <summary>
-        /// Initializes a new instance of <see cref="NoPathFoundException"/> with serialized data.
+        /// Constructor used during runtime serialization.
         /// </summary>
-        /// <param name="info"><see cref="SerializationInfo"/> that contains serialized data
-        /// concerning the thrown exception.</param>
-        /// <param name="context"><see cref="StreamingContext"/> that contains contextual information.</param>
         protected NoPathFoundException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
diff --git a/src/QuikGraph/Exceptions/NonAcyclicGraphException.cs b/src/QuikGraph/Exceptions/NonAcyclicGraphException.cs
index 51bc8aee2..69cb70a65 100644
--- a/src/QuikGraph/Exceptions/NonAcyclicGraphException.cs
+++ b/src/QuikGraph/Exceptions/NonAcyclicGraphException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 #if SUPPORTS_SERIALIZATION
 using System.Runtime.Serialization;
 #endif
@@ -32,11 +32,8 @@ public NonAcyclicGraphException([NotNull] string message, [CanBeNull] Exception
 
 #if SUPPORTS_SERIALIZATION
         /// <summary>
-        /// Initializes a new instance of <see cref="NonAcyclicGraphException"/> with serialized data.
+        /// Constructor used during runtime serialization.
         /// </summary>
-        /// <param name="info"><see cref="SerializationInfo"/> that contains serialized data
-        /// concerning the thrown exception.</param>
-        /// <param name="context"><see cref="StreamingContext"/> that contains contextual information.</param>
         protected NonAcyclicGraphException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
diff --git a/src/QuikGraph/Exceptions/NonStronglyConnectedGraphException.cs b/src/QuikGraph/Exceptions/NonStronglyConnectedGraphException.cs
index e023f0403..930beb29d 100644
--- a/src/QuikGraph/Exceptions/NonStronglyConnectedGraphException.cs
+++ b/src/QuikGraph/Exceptions/NonStronglyConnectedGraphException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 #if SUPPORTS_SERIALIZATION
 using System.Runtime.Serialization;
 #endif
@@ -32,11 +32,8 @@ public NonStronglyConnectedGraphException([NotNull] string message, [CanBeNull]
 
 #if SUPPORTS_SERIALIZATION
         /// <summary>
-        /// Initializes a new instance of <see cref="NonStronglyConnectedGraphException"/> with serialized data.
+        /// Constructor used during runtime serialization.
         /// </summary>
-        /// <param name="info"><see cref="SerializationInfo"/> that contains serialized data
-        /// concerning the thrown exception.</param>
-        /// <param name="context"><see cref="StreamingContext"/> that contains contextual information.</param>
         protected NonStronglyConnectedGraphException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
diff --git a/src/QuikGraph/Exceptions/ParallelEdgeNotAllowedException.cs b/src/QuikGraph/Exceptions/ParallelEdgeNotAllowedException.cs
index 2c38ea4d0..c5ec4c6e7 100644
--- a/src/QuikGraph/Exceptions/ParallelEdgeNotAllowedException.cs
+++ b/src/QuikGraph/Exceptions/ParallelEdgeNotAllowedException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 #if SUPPORTS_SERIALIZATION
 using System.Runtime.Serialization;
@@ -32,11 +32,8 @@ public ParallelEdgeNotAllowedException([NotNull] string message, [CanBeNull] Exc
 
 #if SUPPORTS_SERIALIZATION
         /// <summary>
-        /// Initializes a new instance of <see cref="ParallelEdgeNotAllowedException"/> with serialized data.
+        /// Constructor used during runtime serialization.
         /// </summary>
-        /// <param name="info"><see cref="SerializationInfo"/> that contains serialized data
-        /// concerning the thrown exception.</param>
-        /// <param name="context"><see cref="StreamingContext"/> that contains contextual information.</param>
         protected ParallelEdgeNotAllowedException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
diff --git a/src/QuikGraph/Exceptions/QuikGraphException.cs b/src/QuikGraph/Exceptions/QuikGraphException.cs
index 3e2764bb8..86bfb1b1e 100644
--- a/src/QuikGraph/Exceptions/QuikGraphException.cs
+++ b/src/QuikGraph/Exceptions/QuikGraphException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 #if SUPPORTS_SERIALIZATION
 using System.Runtime.Serialization;
 #endif
@@ -26,11 +26,8 @@ protected QuikGraphException([NotNull] string message, [CanBeNull] Exception inn
 
 #if SUPPORTS_SERIALIZATION
         /// <summary>
-        /// Initializes a new instance of <see cref="QuikGraphException"/> with serialized data.
+        /// Constructor used during runtime serialization.
         /// </summary>
-        /// <param name="info"><see cref="SerializationInfo"/> that contains serialized data
-        /// concerning the thrown exception.</param>
-        /// <param name="context"><see cref="StreamingContext"/> that contains contextual information.</param>
         protected QuikGraphException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
diff --git a/src/QuikGraph/Exceptions/VertexNotFoundException.cs b/src/QuikGraph/Exceptions/VertexNotFoundException.cs
index cb713d6db..2b11d16bc 100644
--- a/src/QuikGraph/Exceptions/VertexNotFoundException.cs
+++ b/src/QuikGraph/Exceptions/VertexNotFoundException.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 #if SUPPORTS_SERIALIZATION
 using System.Runtime.Serialization;
 #endif
@@ -32,11 +32,8 @@ public VertexNotFoundException([NotNull] string message, [CanBeNull] Exception i
 
 #if SUPPORTS_SERIALIZATION
         /// <summary>
-        /// Initializes a new instance of <see cref="VertexNotFoundException"/> with serialized data.
+        /// Constructor used during runtime serialization.
         /// </summary>
-        /// <param name="info"><see cref="SerializationInfo"/> that contains serialized data
-        /// concerning the thrown exception.</param>
-        /// <param name="context"><see cref="StreamingContext"/> that contains contextual information.</param>
         protected VertexNotFoundException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
diff --git a/src/QuikGraph/Extensions/AlgorithmExtensions.cs b/src/QuikGraph/Extensions/AlgorithmExtensions.cs
index fb5e2478c..33169f02d 100644
--- a/src/QuikGraph/Extensions/AlgorithmExtensions.cs
+++ b/src/QuikGraph/Extensions/AlgorithmExtensions.cs
@@ -34,6 +34,7 @@ public static class AlgorithmExtensions
         /// <typeparam name="TValue">Value type.</typeparam>
         /// <param name="dictionary">Dictionary on which getting the key access method.</param>
         /// <returns>A function allowing key indexed access.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="dictionary"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static Func<TKey, TValue> GetIndexer<TKey, TValue>([NotNull] IDictionary<TKey, TValue> dictionary)
@@ -61,6 +62,7 @@ public static Func<TKey, TValue> GetIndexer<TKey, TValue>([NotNull] IDictionary<
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <param name="graph">The graph.</param>
         /// <returns>A function that computes a vertex identity for the given <paramref name="graph"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static VertexIdentity<TVertex> GetVertexIdentity<TVertex>([NotNull] this IVertexSet<TVertex> graph)
@@ -97,7 +99,9 @@ public static VertexIdentity<TVertex> GetVertexIdentity<TVertex>([NotNull] this
             return vertex =>
             {
                 if (!ids.TryGetValue(vertex, out string id))
+                {
                     ids[vertex] = id = ids.Count.ToString();
+                }
                 return id;
             };
         }
@@ -109,6 +113,7 @@ public static VertexIdentity<TVertex> GetVertexIdentity<TVertex>([NotNull] this
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">The graph.</param>
         /// <returns>A function that computes an edge identity for the given <paramref name="graph"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static EdgeIdentity<TVertex, TEdge> GetEdgeIdentity<TVertex, TEdge>([NotNull] this IEdgeSet<TVertex, TEdge> graph)
@@ -122,7 +127,9 @@ public static EdgeIdentity<TVertex, TEdge> GetEdgeIdentity<TVertex, TEdge>([NotN
             return edge =>
             {
                 if (!ids.TryGetValue(edge, out string id))
+                {
                     ids[edge] = id = ids.Count.ToString();
+                }
                 return id;
             };
         }
@@ -139,7 +146,9 @@ private static TryFunc<TVertex, IEnumerable<TEdge>> RunDirectedRootedAlgorithm<T
 
             var predecessorRecorder = new VertexPredecessorRecorderObserver<TVertex, TEdge>();
             using (predecessorRecorder.Attach(algorithm))
+            {
                 algorithm.Compute(source);
+            }
 
             IDictionary<TVertex, TEdge> predecessors = predecessorRecorder.VerticesPredecessors;
             return (TVertex vertex, out IEnumerable<TEdge> edges) => predecessors.TryGetPath(vertex, out edges);
@@ -155,6 +164,9 @@ private static TryFunc<TVertex, IEnumerable<TEdge>> RunDirectedRootedAlgorithm<T
         /// <param name="graph">The graph to visit.</param>
         /// <param name="root">Starting vertex.</param>
         /// <returns>A function that allow to get edges connected to a given vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> is not part of <paramref name="graph"/>.</exception>
         [Pure]
         [NotNull]
         public static TryFunc<TVertex, IEnumerable<TEdge>> TreeBreadthFirstSearch<TVertex, TEdge>(
@@ -178,6 +190,9 @@ public static TryFunc<TVertex, IEnumerable<TEdge>> TreeBreadthFirstSearch<TVerte
         /// <param name="graph">The graph to visit.</param>
         /// <param name="root">Starting vertex.</param>
         /// <returns>A function that allow to get edges connected to a given vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> is not part of <paramref name="graph"/>.</exception>
         [Pure]
         [NotNull]
         public static TryFunc<TVertex, IEnumerable<TEdge>> TreeDepthFirstSearch<TVertex, TEdge>(
@@ -202,6 +217,9 @@ public static TryFunc<TVertex, IEnumerable<TEdge>> TreeDepthFirstSearch<TVertex,
         /// <param name="graph">The graph to visit.</param>
         /// <param name="root">Starting vertex.</param>
         /// <returns>A function that allow to get edges connected to a given vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> is not part of <paramref name="graph"/>.</exception>
         [Pure]
         [NotNull]
         public static TryFunc<TVertex, IEnumerable<TEdge>> TreeCyclePoppingRandom<TVertex, TEdge>(
@@ -223,6 +241,11 @@ public static TryFunc<TVertex, IEnumerable<TEdge>> TreeCyclePoppingRandom<TVerte
         /// <param name="root">Starting vertex.</param>
         /// <param name="edgeChain">Markov edge chain.</param>
         /// <returns>A function that allow to get edges connected to a given vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeChain"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> is not part of <paramref name="graph"/>.</exception>
+        /// <exception cref="T:System.InvalidOperationException">Something went wrong when running the algorithm.</exception>
         [Pure]
         [NotNull]
         public static TryFunc<TVertex, IEnumerable<TEdge>> TreeCyclePoppingRandom<TVertex, TEdge>(
@@ -250,6 +273,10 @@ public static TryFunc<TVertex, IEnumerable<TEdge>> TreeCyclePoppingRandom<TVerte
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="root">Starting vertex.</param>
         /// <returns>A function that allow to get paths starting from <paramref name="root"/> vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> is not part of <paramref name="graph"/>.</exception>
         [Pure]
         [NotNull]
         public static TryFunc<TVertex, IEnumerable<TEdge>> ShortestPathsDijkstra<TVertex, TEdge>(
@@ -275,6 +302,10 @@ public static TryFunc<TVertex, IEnumerable<TEdge>> ShortestPathsDijkstra<TVertex
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="root">Starting vertex.</param>
         /// <returns>A function that allow to get paths starting from <paramref name="root"/> vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> is not part of <paramref name="graph"/>.</exception>
         [Pure]
         [NotNull]
         public static TryFunc<TVertex, IEnumerable<TEdge>> ShortestPathsDijkstra<TVertex, TEdge>(
@@ -286,7 +317,9 @@ public static TryFunc<TVertex, IEnumerable<TEdge>> ShortestPathsDijkstra<TVertex
             var algorithm = new UndirectedDijkstraShortestPathAlgorithm<TVertex, TEdge>(graph, edgeWeights);
             var predecessorRecorder = new UndirectedVertexPredecessorRecorderObserver<TVertex, TEdge>();
             using (predecessorRecorder.Attach(algorithm))
+            {
                 algorithm.Compute(root);
+            }
 
             IDictionary<TVertex, TEdge> predecessors = predecessorRecorder.VerticesPredecessors;
             return (TVertex vertex, out IEnumerable<TEdge> edges) => predecessors.TryGetPath(vertex, out edges);
@@ -304,6 +337,11 @@ public static TryFunc<TVertex, IEnumerable<TEdge>> ShortestPathsDijkstra<TVertex
         /// <param name="costHeuristic">Function that computes a cost for a given vertex.</param>
         /// <param name="root">Starting vertex.</param>
         /// <returns>A function that allow to get paths starting from <paramref name="root"/> vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="costHeuristic"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> is not part of <paramref name="graph"/>.</exception>
         [Pure]
         [NotNull]
         public static TryFunc<TVertex, IEnumerable<TEdge>> ShortestPathsAStar<TVertex, TEdge>(
@@ -331,6 +369,10 @@ public static TryFunc<TVertex, IEnumerable<TEdge>> ShortestPathsAStar<TVertex, T
         /// <param name="root">Starting vertex.</param>
         /// <param name="hasNegativeCycle">Indicates if a negative cycle has been found or not.</param>
         /// <returns>A function that allow to get paths starting from <paramref name="root"/> vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> is not part of <paramref name="graph"/>.</exception>
         [Pure]
         [NotNull]
         public static TryFunc<TVertex, IEnumerable<TEdge>> ShortestPathsBellmanFord<TVertex, TEdge>(
@@ -350,7 +392,9 @@ public static TryFunc<TVertex, IEnumerable<TEdge>> ShortestPathsBellmanFord<TVer
             var algorithm = new BellmanFordShortestPathAlgorithm<TVertex, TEdge>(graph, edgeWeights);
             var predecessorRecorder = new VertexPredecessorRecorderObserver<TVertex, TEdge>();
             using (predecessorRecorder.Attach(algorithm))
+            {
                 algorithm.Compute(root);
+            }
 
             hasNegativeCycle = algorithm.FoundNegativeCycle;
 
@@ -369,6 +413,10 @@ public static TryFunc<TVertex, IEnumerable<TEdge>> ShortestPathsBellmanFord<TVer
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <param name="root">Starting vertex.</param>
         /// <returns>A function that allow to get paths starting from <paramref name="root"/> vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> is not part of <paramref name="graph"/>.</exception>
         [Pure]
         [NotNull]
         public static TryFunc<TVertex, IEnumerable<TEdge>> ShortestPathsDag<TVertex, TEdge>(
@@ -406,6 +454,12 @@ public static TryFunc<TVertex, IEnumerable<TEdge>> ShortestPathsDag<TVertex, TEd
         /// <param name="target">Target vertex.</param>
         /// <param name="maxCount">Maximal number of path to search.</param>
         /// <returns>Enumeration of paths to go from <paramref name="root"/> vertex to <paramref name="target"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="root"/> or <paramref name="target"/> are not part of <paramref name="graph"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="maxCount"/> is lower or equal to 1.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         public static IEnumerable<IEnumerable<TEdge>> RankedShortestPathHoffmanPavley<TVertex, TEdge>(
@@ -434,6 +488,7 @@ public static IEnumerable<IEnumerable<TEdge>> RankedShortestPathHoffmanPavley<TV
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>Sink vertices.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         public static IEnumerable<TVertex> Sinks<TVertex, TEdge>(
@@ -452,6 +507,7 @@ public static IEnumerable<TVertex> Sinks<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>Root vertices.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         public static IEnumerable<TVertex> Roots<TVertex, TEdge>(
@@ -477,6 +533,7 @@ public static IEnumerable<TVertex> Roots<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>Root vertices.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         public static IEnumerable<TVertex> Roots<TVertex, TEdge>(
@@ -495,6 +552,7 @@ public static IEnumerable<TVertex> Roots<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>Root vertices.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         public static IEnumerable<TVertex> IsolatedVertices<TVertex, TEdge>(
@@ -515,6 +573,7 @@ public static IEnumerable<TVertex> IsolatedVertices<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>Sorted vertices (topological sort).</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         /// <exception cref="NonAcyclicGraphException">If the input graph has a cycle.</exception>
         [Pure]
         [NotNull, ItemNotNull]
@@ -537,6 +596,7 @@ public static IEnumerable<TVertex> TopologicalSort<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>Sorted vertices (topological sort).</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         /// <exception cref="NonAcyclicGraphException">If the input graph has a cycle.</exception>
         [Pure]
         [NotNull, ItemNotNull]
@@ -559,6 +619,7 @@ public static IEnumerable<TVertex> TopologicalSort<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>Sorted vertices (topological sort).</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         /// <exception cref="NonAcyclicGraphException">If the input graph has a cycle.</exception>
         [Pure]
         [NotNull, ItemNotNull]
@@ -581,6 +642,7 @@ public static IEnumerable<TVertex> SourceFirstTopologicalSort<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>Sorted vertices (topological sort).</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         /// <exception cref="NonAcyclicGraphException">If the input graph has a cycle.</exception>
         [Pure]
         [NotNull, ItemNotNull]
@@ -604,6 +666,7 @@ public static IEnumerable<TVertex> SourceFirstTopologicalSort<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>Sorted vertices (topological sort).</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         /// <exception cref="NonAcyclicGraphException">If the input graph has a cycle.</exception>
         [Pure]
         public static IEnumerable<TVertex> SourceFirstBidirectionalTopologicalSort<TVertex, TEdge>(
@@ -621,6 +684,7 @@ public static IEnumerable<TVertex> SourceFirstBidirectionalTopologicalSort<TVert
         /// <param name="graph">Graph to visit.</param>
         /// <param name="direction">Topological sort direction.</param>
         /// <returns>Sorted vertices (topological sort).</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         /// <exception cref="NonAcyclicGraphException">If the input graph has a cycle.</exception>
         [Pure]
         [NotNull, ItemNotNull]
@@ -649,7 +713,8 @@ public static IEnumerable<TVertex> SourceFirstBidirectionalTopologicalSort<TVert
         /// <param name="graph">Graph to visit.</param>
         /// <param name="components">Found components.</param>
         /// <returns>Number of component found.</returns>
-        [Pure]
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="components"/> is <see langword="null"/>.</exception>
         public static int ConnectedComponents<TVertex, TEdge>(
             [NotNull] this IUndirectedGraph<TVertex, TEdge> graph,
             [NotNull] IDictionary<TVertex, int> components)
@@ -669,7 +734,9 @@ public static int ConnectedComponents<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to visit.</param>
         /// <param name="getComponents">A function retrieve components of the <paramref name="graph"/>.</param>
-        /// <returns>A <see cref="IDisposable"/> of the used algorithm.</returns>
+        /// <returns>A <see cref="T:System.IDisposable"/> of the used algorithm.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        [Pure]
         [NotNull]
         public static IDisposable IncrementalConnectedComponents<TVertex, TEdge>(
             [NotNull] this IMutableVertexAndEdgeSet<TVertex, TEdge> graph,
@@ -690,7 +757,8 @@ public static IDisposable IncrementalConnectedComponents<TVertex, TEdge>(
         /// <param name="graph">Graph to visit.</param>
         /// <param name="components">Found components.</param>
         /// <returns>Number of component found.</returns>
-        [Pure]
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="components"/> is <see langword="null"/>.</exception>
         public static int StronglyConnectedComponents<TVertex, TEdge>(
             [NotNull] this IVertexListGraph<TVertex, TEdge> graph,
             [NotNull] IDictionary<TVertex, int> components)
@@ -709,7 +777,8 @@ public static int StronglyConnectedComponents<TVertex, TEdge>(
         /// <param name="graph">Graph to visit.</param>
         /// <param name="components">Found components.</param>
         /// <returns>Number of component found.</returns>
-        [Pure]
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="components"/> is <see langword="null"/>.</exception>
         public static int WeaklyConnectedComponents<TVertex, TEdge>(
             [NotNull] this IVertexListGraph<TVertex, TEdge> graph,
             [NotNull] IDictionary<TVertex, int> components)
@@ -728,6 +797,7 @@ public static int WeaklyConnectedComponents<TVertex, TEdge>(
         /// <typeparam name="TGraph">Graph type.</typeparam>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>The condensed graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static IMutableBidirectionalGraph<TGraph, CondensedEdge<TVertex, TEdge, TGraph>> CondensateStronglyConnected<TVertex, TEdge, TGraph>(
@@ -751,6 +821,7 @@ public static IMutableBidirectionalGraph<TGraph, CondensedEdge<TVertex, TEdge, T
         /// <typeparam name="TGraph">Graph type.</typeparam>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>The condensed graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static IMutableBidirectionalGraph<TGraph, CondensedEdge<TVertex, TEdge, TGraph>> CondensateWeaklyConnected<TVertex, TEdge, TGraph>(
@@ -774,6 +845,8 @@ public static IMutableBidirectionalGraph<TGraph, CondensedEdge<TVertex, TEdge, T
         /// <param name="graph">Graph to visit.</param>
         /// <param name="vertexPredicate">Vertex predicate used to filter the vertices to put in the condensed graph.</param>
         /// <returns>The condensed graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexPredicate"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static IMutableBidirectionalGraph<TVertex, MergedEdge<TVertex, TEdge>> CondensateEdges<TVertex, TEdge>(
@@ -797,6 +870,7 @@ public static IMutableBidirectionalGraph<TVertex, MergedEdge<TVertex, TEdge>> Co
         /// </summary>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>Enumerable of odd vertices.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         public static IEnumerable<TVertex> OddVertices<TVertex, TEdge>(
@@ -808,7 +882,9 @@ public static IEnumerable<TVertex> OddVertices<TVertex, TEdge>(
 
             var counts = new Dictionary<TVertex, int>(graph.VertexCount);
             foreach (TVertex vertex in graph.Vertices)
+            {
                 counts.Add(vertex, 0);
+            }
 
             foreach (TEdge edge in graph.Edges)
             {
@@ -832,6 +908,7 @@ public static IEnumerable<TVertex> OddVertices<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>True if the graph contains a cycle, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         public static bool IsDirectedAcyclicGraph<TVertex, TEdge>(
             [NotNull] this IVertexListGraph<TVertex, TEdge> graph)
@@ -881,6 +958,9 @@ private void DfsBackEdge([NotNull] TEdge edge)
         /// <param name="edgeCosts">Costs map.</param>
         /// <param name="target">Target vertex.</param>
         /// <returns>The predecessors cost.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="predecessors"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeCosts"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         [Pure]
         public static double ComputePredecessorCost<TVertex, TEdge>(
             [NotNull] IDictionary<TVertex, TEdge> predecessors,
@@ -913,6 +993,7 @@ public static double ComputePredecessorCost<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to visit.</param>
         /// <returns>Found disjoint sets.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static IDisjointSet<TVertex> ComputeDisjointSet<TVertex, TEdge>(
@@ -924,9 +1005,14 @@ public static IDisjointSet<TVertex> ComputeDisjointSet<TVertex, TEdge>(
 
             var sets = new ForestDisjointSet<TVertex>(graph.VertexCount);
             foreach (TVertex vertex in graph.Vertices)
+            {
                 sets.MakeSet(vertex);
+            }
+
             foreach (TEdge edge in graph.Edges)
+            {
                 sets.Union(edge.Source, edge.Target);
+            }
 
             return sets;
         }
@@ -940,6 +1026,8 @@ public static IDisjointSet<TVertex> ComputeDisjointSet<TVertex, TEdge>(
         /// <param name="graph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <returns>Edges part of the minimum spanning tree.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         public static IEnumerable<TEdge> MinimumSpanningTreePrim<TVertex, TEdge>(
@@ -959,7 +1047,9 @@ public static IEnumerable<TEdge> MinimumSpanningTreePrim<TVertex, TEdge>(
             var dijkstra = new UndirectedDijkstraShortestPathAlgorithm<TVertex, TEdge>(graph, edgeWeights, distanceRelaxer);
             var edgeRecorder = new UndirectedVertexPredecessorRecorderObserver<TVertex, TEdge>();
             using (edgeRecorder.Attach(dijkstra))
+            {
                 dijkstra.Compute();
+            }
 
             return edgeRecorder.VerticesPredecessors.Values;
         }
@@ -972,6 +1062,8 @@ public static IEnumerable<TEdge> MinimumSpanningTreePrim<TVertex, TEdge>(
         /// <param name="graph">Graph to visit.</param>
         /// <param name="edgeWeights">Function that computes the weight for a given edge.</param>
         /// <returns>Edges part of the minimum spanning tree.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeWeights"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         public static IEnumerable<TEdge> MinimumSpanningTreeKruskal<TVertex, TEdge>(
@@ -990,7 +1082,9 @@ public static IEnumerable<TEdge> MinimumSpanningTreeKruskal<TVertex, TEdge>(
             var kruskal = new KruskalMinimumSpanningTreeAlgorithm<TVertex, TEdge>(graph, edgeWeights);
             var edgeRecorder = new EdgeRecorderObserver<TVertex, TEdge>();
             using (edgeRecorder.Attach(kruskal))
+            {
                 kruskal.Compute();
+            }
 
             return edgeRecorder.Edges;
         }
@@ -1011,6 +1105,10 @@ public static IEnumerable<TEdge> MinimumSpanningTreeKruskal<TVertex, TEdge>(
         /// <param name="root">Starting vertex.</param>
         /// <param name="pairs">Vertices pairs.</param>
         /// <returns>A function that allow to get least common ancestor for a pair of vertices.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="pairs"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException">At least one of <paramref name="pairs"/> vertices is not part of <paramref name="graph"/>.</exception>
         [Pure]
         [NotNull]
         public static TryFunc<SEquatableEdge<TVertex>, TVertex> OfflineLeastCommonAncestor<TVertex, TEdge>(
@@ -1050,6 +1148,13 @@ public static TryFunc<SEquatableEdge<TVertex>, TVertex> OfflineLeastCommonAncest
         /// <param name="edgeFactory">Edge factory method.</param>
         /// <param name="reversedEdgeAugmentorAlgorithm">Algorithm that is in of charge of augmenting the graph (creating missing reversed edges).</param>
         /// <returns>The maximum flow.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeCapacities"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="sink"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="reversedEdgeAugmentorAlgorithm"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="source"/> and <paramref name="sink"/> are the same vertex.</exception>
         public static double MaximumFlow<TVertex, TEdge>(
             [NotNull] this IMutableVertexAndEdgeListGraph<TVertex, TEdge> graph,
             [NotNull] Func<TEdge, double> edgeCapacities,
@@ -1082,6 +1187,7 @@ public static double MaximumFlow<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to compute the reduction.</param>
         /// <returns>Transitive graph reduction.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static BidirectionalGraph<TVertex, TEdge> ComputeTransitiveReduction<TVertex, TEdge>(
@@ -1099,16 +1205,18 @@ public static BidirectionalGraph<TVertex, TEdge> ComputeTransitiveReduction<TVer
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to compute the closure.</param>
-        /// <param name="createEdge">Function that create an edge between the 2 given vertices.</param>
+        /// <param name="edgeFactory">Function that create an edge between the 2 given vertices.</param>
         /// <returns>Transitive graph closure.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static BidirectionalGraph<TVertex, TEdge> ComputeTransitiveClosure<TVertex, TEdge>(
             [NotNull] this BidirectionalGraph<TVertex, TEdge> graph,
-            [NotNull] Func<TVertex, TVertex, TEdge> createEdge)
+            [NotNull] Func<TVertex, TVertex, TEdge> edgeFactory)
             where TEdge : IEdge<TVertex>
         {
-            var algorithm = new TransitiveClosureAlgorithm<TVertex, TEdge>(graph, createEdge);
+            var algorithm = new TransitiveClosureAlgorithm<TVertex, TEdge>(graph, edgeFactory);
             algorithm.Compute();
             return algorithm.TransitiveClosure;
         }
@@ -1122,6 +1230,10 @@ public static BidirectionalGraph<TVertex, TEdge> ComputeTransitiveClosure<TVerte
         /// <param name="vertexCloner">Delegate to clone a vertex.</param>
         /// <param name="edgeCloner">Delegate to clone an edge.</param>
         /// <param name="clone">Cloned graph.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexCloner"/> is <see langword="null"/> or creates <see langword="null"/> vertex.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeCloner"/> is <see langword="null"/> or creates <see langword="null"/> edge.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="clone"/> is <see langword="null"/>.</exception>
         public static void Clone<TVertex, TEdge>(
             [NotNull] this IVertexAndEdgeListGraph<TVertex, TEdge> graph,
             [NotNull, InstantHandle] Func<TVertex, TVertex> vertexCloner,
diff --git a/src/QuikGraph/Extensions/EdgeExtensions.cs b/src/QuikGraph/Extensions/EdgeExtensions.cs
index 786a82373..97d09fbcd 100644
--- a/src/QuikGraph/Extensions/EdgeExtensions.cs
+++ b/src/QuikGraph/Extensions/EdgeExtensions.cs
@@ -20,6 +20,7 @@ public static class EdgeExtensions
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <param name="edge">Edge to check.</param>
         /// <returns>True if edge is a self one, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         [Pure]
         public static bool IsSelfEdge<TVertex>([NotNull] this IEdge<TVertex> edge)
         {
@@ -36,6 +37,8 @@ public static bool IsSelfEdge<TVertex>([NotNull] this IEdge<TVertex> edge)
         /// <param name="edge">The edge.</param>
         /// <param name="vertex">The source or target vertex of the <paramref name="edge"/>.</param>
         /// <returns>The other edge vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static TVertex GetOtherVertex<TVertex>([NotNull] this IEdge<TVertex> edge, [NotNull] TVertex vertex)
@@ -56,6 +59,8 @@ public static TVertex GetOtherVertex<TVertex>([NotNull] this IEdge<TVertex> edge
         /// <param name="edge">The edge.</param>
         /// <param name="vertex">Source or target <paramref name="edge"/> vertex.</param>
         /// <returns>True if the <paramref name="vertex"/> is adjacent to this <paramref name="edge"/>, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         public static bool IsAdjacent<TVertex>([NotNull] this IEdge<TVertex> edge, [NotNull] TVertex vertex)
         {
@@ -75,6 +80,7 @@ public static bool IsAdjacent<TVertex>([NotNull] this IEdge<TVertex> edge, [NotN
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="path">Sequence of edges.</param>
         /// <returns>True if the set makes a complete path, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="path"/> is <see langword="null"/>.</exception>
         [Pure]
         public static bool IsPath<TVertex, TEdge>([NotNull, ItemNotNull] this IEnumerable<TEdge> path)
             where TEdge : IEdge<TVertex>
@@ -83,7 +89,7 @@ public static bool IsPath<TVertex, TEdge>([NotNull, ItemNotNull] this IEnumerabl
                 throw new ArgumentNullException(nameof(path));
 
             bool first = true;
-            TVertex lastTarget = default(TVertex);
+            var lastTarget = default(TVertex);
             foreach (TEdge edge in path)
             {
                 if (first)
@@ -110,6 +116,7 @@ public static bool IsPath<TVertex, TEdge>([NotNull, ItemNotNull] this IEnumerabl
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="path">Sequence of edges.</param>
         /// <returns>True if the set makes a cycle, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="path"/> is <see langword="null"/>.</exception>
         [Pure]
         public static bool HasCycles<TVertex, TEdge>([NotNull, ItemNotNull] this IEnumerable<TEdge> path)
             where TEdge : IEdge<TVertex>
@@ -147,6 +154,7 @@ public static bool HasCycles<TVertex, TEdge>([NotNull, ItemNotNull] this IEnumer
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="path">Path of edges.</param>
         /// <returns>True if the path makes a cycle, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="path"/> is <see langword="null"/>.</exception>
         [Pure]
         public static bool IsPathWithoutCycles<TVertex, TEdge>([NotNull, ItemNotNull] this IEnumerable<TEdge> path)
             where TEdge : IEdge<TVertex>
@@ -156,7 +164,7 @@ public static bool IsPathWithoutCycles<TVertex, TEdge>([NotNull, ItemNotNull] th
 
             var vertices = new Dictionary<TVertex, int>();
             bool first = true;
-            TVertex lastTarget = default(TVertex);
+            var lastTarget = default(TVertex);
             foreach (TEdge edge in path)
             {
                 if (first)
@@ -189,6 +197,7 @@ public static bool IsPathWithoutCycles<TVertex, TEdge>([NotNull, ItemNotNull] th
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <param name="edge">The edge.</param>
         /// <returns>A <see cref="SEquatableEdge{TVertex}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         [Pure]
         public static SEquatableEdge<TVertex> ToVertexPair<TVertex>([NotNull] this IEdge<TVertex> edge)
         {
@@ -206,6 +215,9 @@ public static SEquatableEdge<TVertex> ToVertexPair<TVertex>([NotNull] this IEdge
         /// <param name="root">Root vertex.</param>
         /// <param name="vertex">Ending vertex.</param>
         /// <returns>True if the <paramref name="root"/> is a predecessor of the <paramref name="vertex"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="predecessors"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="root"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         public static bool IsPredecessor<TVertex, TEdge>(
             [NotNull] this IDictionary<TVertex, TEdge> predecessors,
@@ -246,6 +258,8 @@ public static bool IsPredecessor<TVertex, TEdge>(
         /// <param name="vertex">Path ending vertex.</param>
         /// <param name="path">Path to the ending vertex.</param>
         /// <returns>True if a path was found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="predecessors"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         [ContractAnnotation("=> true, path:notnull;=> false, path:null")]
         public static bool TryGetPath<TVertex, TEdge>(
@@ -315,6 +329,9 @@ public static EdgeEqualityComparer<TVertex> GetUndirectedVertexEquality<TVertex,
         /// <param name="target">Target vertex.</param>
         /// <returns>True if both <paramref name="source"/> and
         /// <paramref name="target"/> match edge vertices, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         [Pure]
         public static bool UndirectedVertexEquality<TVertex>(
             [NotNull] this IEdge<TVertex> edge,
@@ -357,6 +374,9 @@ internal static bool UndirectedVertexEqualityInternal<TVertex>(
         /// <param name="target">Target vertex.</param>
         /// <returns>True if both <paramref name="source"/> and
         /// <paramref name="target"/> match edge vertices, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         [Pure]
         public static bool SortedVertexEquality<TVertex>(
             [NotNull] this IEdge<TVertex> edge,
@@ -394,6 +414,7 @@ internal static bool SortedVertexEqualityInternal<TVertex>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="edges">Edges to reversed.</param>
         /// <returns>Reversed edges.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edges"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static IEnumerable<SReversedEdge<TVertex, TEdge>> ReverseEdges<TVertex, TEdge>(
diff --git a/src/QuikGraph/Extensions/GraphExtensions.cs b/src/QuikGraph/Extensions/GraphExtensions.cs
index 9928d0c91..8f8a50096 100644
--- a/src/QuikGraph/Extensions/GraphExtensions.cs
+++ b/src/QuikGraph/Extensions/GraphExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 using static QuikGraph.QuikGraphHelpers;
@@ -19,6 +19,7 @@ public static class GraphExtensions
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="tryGetOutEdges">Getter of out-edges.</param>
         /// <returns>A corresponding <see cref="DelegateIncidenceGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="tryGetOutEdges"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static DelegateIncidenceGraph<TVertex, TEdge> ToDelegateIncidenceGraph<TVertex, TEdge>(
@@ -35,6 +36,7 @@ public static DelegateIncidenceGraph<TVertex, TEdge> ToDelegateIncidenceGraph<TV
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="getOutEdges">Getter of out-edges.</param>
         /// <returns>A corresponding <see cref="DelegateIncidenceGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="getOutEdges"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static DelegateIncidenceGraph<TVertex, TEdge> ToDelegateIncidenceGraph<TVertex, TEdge>(
@@ -54,6 +56,7 @@ public static DelegateIncidenceGraph<TVertex, TEdge> ToDelegateIncidenceGraph<TV
         /// <typeparam name="TEdges">Type of the enumerable of out-edges.</typeparam>
         /// <param name="dictionary">Vertices and edges mapping.</param>
         /// <returns>A corresponding <see cref="DelegateVertexAndEdgeListGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="dictionary"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static DelegateVertexAndEdgeListGraph<TVertex, TEdge> ToDelegateVertexAndEdgeListGraph<TVertex, TEdge, TEdges>(
@@ -73,6 +76,8 @@ public static DelegateVertexAndEdgeListGraph<TVertex, TEdge> ToDelegateVertexAnd
         /// <param name="dictionary">Vertices and edges mapping.</param>
         /// <param name="keyValueToOutEdges">Converter of vertex/edge mapping to enumerable of edges.</param>
         /// <returns>A corresponding <see cref="DelegateVertexAndEdgeListGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="dictionary"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="keyValueToOutEdges"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static DelegateVertexAndEdgeListGraph<TVertex, TEdge> ToDelegateVertexAndEdgeListGraph<TVertex, TEdge, TValue>(
@@ -113,6 +118,8 @@ public static DelegateVertexAndEdgeListGraph<TVertex, TEdge> ToDelegateVertexAnd
         /// <param name="vertices">Enumerable of vertices.</param>
         /// <param name="tryGetOutEdges">Getter of out-edges.</param>
         /// <returns>A corresponding <see cref="DelegateVertexAndEdgeListGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertices"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="tryGetOutEdges"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static DelegateVertexAndEdgeListGraph<TVertex, TEdge> ToDelegateVertexAndEdgeListGraph<TVertex, TEdge>(
@@ -132,6 +139,8 @@ public static DelegateVertexAndEdgeListGraph<TVertex, TEdge> ToDelegateVertexAnd
         /// <param name="vertices">Enumerable of vertices.</param>
         /// <param name="getOutEdges">Getter of out-edges.</param>
         /// <returns>A corresponding <see cref="DelegateVertexAndEdgeListGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertices"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="getOutEdges"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static DelegateVertexAndEdgeListGraph<TVertex, TEdge> ToDelegateVertexAndEdgeListGraph<TVertex, TEdge>(
@@ -153,6 +162,8 @@ public static DelegateVertexAndEdgeListGraph<TVertex, TEdge> ToDelegateVertexAnd
         /// <param name="tryGetOutEdges">Getter of out-edges.</param>
         /// <param name="tryGetInEdges">Getter of in-edges.</param>
         /// <returns>A corresponding <see cref="DelegateBidirectionalIncidenceGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="tryGetOutEdges"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="tryGetInEdges"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static DelegateBidirectionalIncidenceGraph<TVertex, TEdge> ToDelegateBidirectionalIncidenceGraph<TVertex, TEdge>(
@@ -172,6 +183,8 @@ public static DelegateBidirectionalIncidenceGraph<TVertex, TEdge> ToDelegateBidi
         /// <param name="vertices">Enumerable of vertices.</param>
         /// <param name="tryGetAdjacentEdges">Getter of adjacent edges.</param>
         /// <returns>A corresponding <see cref="DelegateUndirectedGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertices"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="tryGetAdjacentEdges"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static DelegateUndirectedGraph<TVertex, TEdge> ToDelegateUndirectedGraph<TVertex, TEdge>(
@@ -191,6 +204,8 @@ public static DelegateUndirectedGraph<TVertex, TEdge> ToDelegateUndirectedGraph<
         /// <param name="vertices">Enumerable of vertices.</param>
         /// <param name="getAdjacentEdges">Getter of adjacent edges.</param>
         /// <returns>A corresponding <see cref="DelegateUndirectedGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertices"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="getAdjacentEdges"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static DelegateUndirectedGraph<TVertex, TEdge> ToDelegateUndirectedGraph<TVertex, TEdge>(
@@ -216,6 +231,11 @@ public static DelegateUndirectedGraph<TVertex, TEdge> ToDelegateUndirectedGraph<
         /// The first items of each column represents the number of vertices following.
         /// </param>
         /// <returns>A corresponding <see cref="AdjacencyGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="edges"/>, <paramref name="edges"/>[0] or <paramref name="edges"/>[1] is <see langword="null"/>.
+        /// </exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="edges"/> length is different from 2.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="edges"/>[0] length is different from <paramref name="edges"/>[1] length.</exception>
         [Pure]
         [NotNull]
         public static AdjacencyGraph<TVertex, SEquatableEdge<TVertex>> ToAdjacencyGraph<TVertex>(
@@ -237,7 +257,9 @@ public static AdjacencyGraph<TVertex, SEquatableEdge<TVertex>> ToAdjacencyGraph<
             int n = sources.Length;
             var edgePairs = new List<SEquatableEdge<TVertex>>(n);
             for (int i = 0; i < n; ++i)
+            {
                 edgePairs.Add(new SEquatableEdge<TVertex>(sources[i], targets[i]));
+            }
 
             return ToAdjacencyGraph(edgePairs);
         }
@@ -250,6 +272,9 @@ public static AdjacencyGraph<TVertex, SEquatableEdge<TVertex>> ToAdjacencyGraph<
         /// <param name="edges">Set of edges to convert.</param>
         /// <param name="allowParallelEdges">Indicates if parallel edges are allowed.</param>
         /// <returns>A corresponding <see cref="AdjacencyGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="edges"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
         [Pure]
         [NotNull]
         public static AdjacencyGraph<TVertex, TEdge> ToAdjacencyGraph<TVertex, TEdge>(
@@ -268,6 +293,9 @@ public static AdjacencyGraph<TVertex, TEdge> ToAdjacencyGraph<TVertex, TEdge>(
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <param name="vertexPairs">Set of vertex pairs to convert.</param>
         /// <returns>A corresponding <see cref="AdjacencyGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="vertexPairs"/> is <see langword="null"/> or at least one of vertex is <see langword="null"/>.
+        /// </exception>
         [Pure]
         [NotNull]
         public static AdjacencyGraph<TVertex, SEquatableEdge<TVertex>> ToAdjacencyGraph<TVertex>(
@@ -291,6 +319,12 @@ public static AdjacencyGraph<TVertex, SEquatableEdge<TVertex>> ToAdjacencyGraph<
         /// <param name="outEdgesFactory">The out edges factory.</param>
         /// <param name="allowParallelEdges">Indicates if parallel edges are allowed.</param>
         /// <returns>A corresponding <see cref="AdjacencyGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="vertices"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="outEdgesFactory"/> is <see langword="null"/> or creates <see langword="null"/> edge.
+        /// </exception>
         [Pure]
         [NotNull]
         public static AdjacencyGraph<TVertex, TEdge> ToAdjacencyGraph<TVertex, TEdge>(
@@ -306,7 +340,9 @@ public static AdjacencyGraph<TVertex, TEdge> ToAdjacencyGraph<TVertex, TEdge>(
             graph.AddVertexRange(vertices);
 
             foreach (TVertex vertex in graph.Vertices)
+            {
                 graph.AddEdgeRange(outEdgesFactory(vertex));
+            }
 
             return graph;
         }
@@ -318,6 +354,7 @@ public static AdjacencyGraph<TVertex, TEdge> ToAdjacencyGraph<TVertex, TEdge>(
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to convert.</param>
         /// <returns>A corresponding <see cref="ArrayAdjacencyGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static ArrayAdjacencyGraph<TVertex, TEdge> ToArrayAdjacencyGraph<TVertex, TEdge>(
@@ -335,6 +372,7 @@ public static ArrayAdjacencyGraph<TVertex, TEdge> ToArrayAdjacencyGraph<TVertex,
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to convert.</param>
         /// <returns>A corresponding <see cref="IBidirectionalGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static IBidirectionalGraph<TVertex, TEdge> ToBidirectionalGraph<TVertex, TEdge>(
@@ -358,6 +396,9 @@ public static IBidirectionalGraph<TVertex, TEdge> ToBidirectionalGraph<TVertex,
         /// <param name="edges">Set of edges to convert.</param>
         /// <param name="allowParallelEdges">Indicates if parallel edges are allowed.</param>
         /// <returns>A corresponding <see cref="BidirectionalGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="edges"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
         [Pure]
         [NotNull]
         public static BidirectionalGraph<TVertex, TEdge> ToBidirectionalGraph<TVertex, TEdge>(
@@ -376,6 +417,9 @@ public static BidirectionalGraph<TVertex, TEdge> ToBidirectionalGraph<TVertex, T
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <param name="vertexPairs">Set of vertex pairs to convert.</param>
         /// <returns>A corresponding <see cref="BidirectionalGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="vertexPairs"/> is <see langword="null"/> or at least one of vertex is <see langword="null"/>.
+        /// </exception>
         [Pure]
         [NotNull]
         public static BidirectionalGraph<TVertex, SEquatableEdge<TVertex>> ToBidirectionalGraph<TVertex>(
@@ -399,6 +443,12 @@ public static BidirectionalGraph<TVertex, SEquatableEdge<TVertex>> ToBidirection
         /// <param name="outEdgesFactory">The out edges factory.</param>
         /// <param name="allowParallelEdges">Indicates if parallel edges are allowed.</param>
         /// <returns>A corresponding <see cref="BidirectionalGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="vertices"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="outEdgesFactory"/> is <see langword="null"/> or creates <see langword="null"/> edge.
+        /// </exception>
         [Pure]
         [NotNull]
         public static BidirectionalGraph<TVertex, TEdge> ToBidirectionalGraph<TVertex, TEdge>(
@@ -414,7 +464,9 @@ public static BidirectionalGraph<TVertex, TEdge> ToBidirectionalGraph<TVertex, T
             graph.AddVertexRange(vertices);
 
             foreach (TVertex vertex in graph.Vertices)
+            {
                 graph.AddEdgeRange(outEdgesFactory(vertex));
+            }
 
             return graph;
         }
@@ -424,6 +476,7 @@ public static BidirectionalGraph<TVertex, TEdge> ToBidirectionalGraph<TVertex, T
         /// </summary>
         /// <param name="graph">Graph to convert.</param>
         /// <returns>A corresponding <see cref="BidirectionalGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [NotNull]
         public static BidirectionalGraph<TVertex, TEdge> ToBidirectionalGraph<TVertex, TEdge>(
             [NotNull] this IUndirectedGraph<TVertex, TEdge> graph)
@@ -447,6 +500,7 @@ public static BidirectionalGraph<TVertex, TEdge> ToBidirectionalGraph<TVertex, T
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to convert.</param>
         /// <returns>A corresponding <see cref="ArrayBidirectionalGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static ArrayBidirectionalGraph<TVertex, TEdge> ToArrayBidirectionalGraph<TVertex, TEdge>(
@@ -464,6 +518,9 @@ public static ArrayBidirectionalGraph<TVertex, TEdge> ToArrayBidirectionalGraph<
         /// <param name="edges">Set of edges to convert.</param>
         /// <param name="allowParallelEdges">Indicates if parallel edges are allowed.</param>
         /// <returns>A corresponding <see cref="UndirectedGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="edges"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
         [Pure]
         [NotNull]
         public static UndirectedGraph<TVertex, TEdge> ToUndirectedGraph<TVertex, TEdge>(
@@ -482,6 +539,7 @@ public static UndirectedGraph<TVertex, TEdge> ToUndirectedGraph<TVertex, TEdge>(
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <param name="vertexPairs">Set of vertex pairs to convert.</param>
         /// <returns>A corresponding <see cref="UndirectedGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexPairs"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static UndirectedGraph<TVertex, SEquatableEdge<TVertex>> ToUndirectedGraph<TVertex>(
@@ -502,6 +560,7 @@ public static UndirectedGraph<TVertex, SEquatableEdge<TVertex>> ToUndirectedGrap
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <param name="graph">Graph to convert.</param>
         /// <returns>A corresponding <see cref="ArrayUndirectedGraph{TVertex,TEdge}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static ArrayUndirectedGraph<TVertex, TEdge> ToArrayUndirectedGraph<TVertex, TEdge>(
@@ -512,19 +571,20 @@ public static ArrayUndirectedGraph<TVertex, TEdge> ToArrayUndirectedGraph<TVerte
         }
 
         /// <summary>
-        /// Creates an immutable compressed row graph representation of the <paramref name="visitedGraph"/>.
+        /// Creates an immutable compressed row graph representation of the <paramref name="graph"/>.
         /// </summary>
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <typeparam name="TEdge">Edge type.</typeparam>
-        /// <param name="visitedGraph">Graph to visit.</param>
+        /// <param name="graph">Graph to visit.</param>
         /// <returns>A corresponding <see cref="CompressedSparseRowGraph{TVertex}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         public static CompressedSparseRowGraph<TVertex> ToCompressedRowGraph<TVertex, TEdge>(
-            [NotNull] this IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph)
+            [NotNull] this IVertexAndEdgeListGraph<TVertex, TEdge> graph)
             where TEdge : IEdge<TVertex>
         {
-            return CompressedSparseRowGraph<TVertex>.FromGraph(visitedGraph);
+            return CompressedSparseRowGraph<TVertex>.FromGraph(graph);
         }
 
         #endregion
diff --git a/src/QuikGraph/Helpers/CryptoRandom.cs b/src/QuikGraph/Helpers/CryptoRandom.cs
index 1cc2f2da1..62274fa8e 100644
--- a/src/QuikGraph/Helpers/CryptoRandom.cs
+++ b/src/QuikGraph/Helpers/CryptoRandom.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_CRYPTO_RANDOM
+#if SUPPORTS_CRYPTO_RANDOM
 using System;
 using System.Security.Cryptography;
 using JetBrains.Annotations;
@@ -10,7 +10,7 @@ namespace QuikGraph.Utils
     /// </summary>
     /// <remarks>
     /// Note that because of security issue the seed is unused in this random number generator.
-    /// Note also that it is slower than classic <see cref="Random"/> but on purpose.
+    /// Note also that it is slower than classic <see cref="T:System.Random"/> but on purpose.
     /// </remarks>
     public class CryptoRandom : Random
     {
@@ -30,7 +30,7 @@ public CryptoRandom()
         /// <summary>
         /// Initializes a new instance of the <see cref="CryptoRandom"/> class.
         /// </summary>
-        /// <param name="ignoredSeed">Seed is ignored, just to keep same API as <see cref="Random"/>.</param>
+        /// <param name="ignoredSeed">Seed is ignored, just to keep same API as <see cref="T:System.Random"/>.</param>
         // ReSharper disable once UnusedParameter.Local
         public CryptoRandom(int ignoredSeed)
         {
diff --git a/src/QuikGraph/Helpers/GraphEqualityHelpers.cs b/src/QuikGraph/Helpers/GraphEqualityHelpers.cs
index 5bfa02c8e..3323005b8 100644
--- a/src/QuikGraph/Helpers/GraphEqualityHelpers.cs
+++ b/src/QuikGraph/Helpers/GraphEqualityHelpers.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -22,6 +22,8 @@ public static class EquateGraphs
         /// <param name="vertexEquality">Vertex equality comparer.</param>
         /// <param name="edgeEquality">Edge equality comparer.</param>
         /// <returns>True if both graphs are equal, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexEquality"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeEquality"/> is <see langword="null"/>.</exception>
         [Pure]
         public static bool Equate<TVertex, TEdge>(
             [CanBeNull] IEdgeListGraph<TVertex, TEdge> g,
diff --git a/src/QuikGraph/Interfaces/Algorithms/IDistancesCollection.cs b/src/QuikGraph/Interfaces/Algorithms/IDistancesCollection.cs
index d18a53a40..6e86d1d92 100644
--- a/src/QuikGraph/Interfaces/Algorithms/IDistancesCollection.cs
+++ b/src/QuikGraph/Interfaces/Algorithms/IDistancesCollection.cs
@@ -15,22 +15,24 @@ public interface IDistancesCollection<TVertex>
         /// <param name="vertex">The vertex.</param>
         /// <param name="distance">Associated distance.</param>
         /// <returns>True if the distance was found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         bool TryGetDistance([NotNull] TVertex vertex, out double distance);
 
         /// <summary>
         /// Gets the distance associated to the given <paramref name="vertex"/>.
-        /// Will throw a <see cref="KeyNotFoundException"/> if the vertex does not exist in the collection.
         /// </summary>
         /// <param name="vertex">The vertex to get the distance for.</param>
         /// <returns>The distance associated with the vertex.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> has no recorded distance.</exception>
         [Pure]
         double GetDistance([NotNull] TVertex vertex);
 
         /// <summary>
         /// Gets the distances for all vertices currently known.
         /// </summary>
-        /// <returns>The <see cref="KeyValuePair{Vertex,Distance}"/> for the known vertices.</returns>
+        /// <returns>The <see cref="T:System.Collections.Generic.KeyValuePair{Vertex,Distance}"/> for the known vertices.</returns>
         [Pure]
         [NotNull]
         IEnumerable<KeyValuePair<TVertex, double>> GetDistances();
diff --git a/src/QuikGraph/Interfaces/Algorithms/IVertexColorizerAlgorithm.cs b/src/QuikGraph/Interfaces/Algorithms/IVertexColorizerAlgorithm.cs
index a7eeba8e9..4391103c3 100644
--- a/src/QuikGraph/Interfaces/Algorithms/IVertexColorizerAlgorithm.cs
+++ b/src/QuikGraph/Interfaces/Algorithms/IVertexColorizerAlgorithm.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace QuikGraph.Algorithms
 {
@@ -13,6 +13,8 @@ public interface IVertexColorizerAlgorithm<in TVertex>
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>The vertex <see cref="GraphColor"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> has no associated color.</exception>
         [Pure]
         GraphColor GetVertexColor([NotNull] TVertex vertex);
     }
diff --git a/src/QuikGraph/Interfaces/Algorithms/Observers/IObserver.cs b/src/QuikGraph/Interfaces/Algorithms/Observers/IObserver.cs
index d1f47f635..30843cce4 100644
--- a/src/QuikGraph/Interfaces/Algorithms/Observers/IObserver.cs
+++ b/src/QuikGraph/Interfaces/Algorithms/Observers/IObserver.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Algorithms.Observers
@@ -11,11 +11,12 @@ namespace QuikGraph.Algorithms.Observers
     public interface IObserver<in TAlgorithm>
     {
         /// <summary>
-        /// Attaches to the algorithm events and returns a <see cref="IDisposable"/>
+        /// Attaches to the algorithm events and returns a <see cref="T:System.IDisposable"/>
         /// object that can be used to detach from the events.
         /// </summary>
         /// <param name="algorithm">Algorithm to observe.</param>
-        /// <returns><see cref="IDisposable"/> allowing to detach from registered events.</returns>
+        /// <returns><see cref="T:System.IDisposable"/> allowing to detach from registered events.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="algorithm"/> is <see langword="null"/>.</exception>
         [NotNull]
         IDisposable Attach([NotNull] TAlgorithm algorithm);
     }
diff --git a/src/QuikGraph/Interfaces/Collections/IDisjointSet.cs b/src/QuikGraph/Interfaces/Collections/IDisjointSet.cs
index 5ec560b0f..1ddae24bf 100644
--- a/src/QuikGraph/Interfaces/Collections/IDisjointSet.cs
+++ b/src/QuikGraph/Interfaces/Collections/IDisjointSet.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace QuikGraph.Collections
 {
@@ -22,6 +22,7 @@ public interface IDisjointSet<T>
         /// Creates a new set for the <paramref name="value"/>.
         /// </summary>
         /// <param name="value">The value.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="value"/> is <see langword="null"/>.</exception>
         void MakeSet([NotNull] T value);
 
         /// <summary>
@@ -29,6 +30,7 @@ public interface IDisjointSet<T>
         /// </summary>
         /// <param name="value">Value to search.</param>
         /// <returns>Root value of the set.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="value"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         T FindSet([NotNull] T value);
@@ -39,6 +41,8 @@ public interface IDisjointSet<T>
         /// <param name="left">Left value.</param>
         /// <param name="right">Right value.</param>
         /// <returns>True if both values are in the same set, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="left"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="right"/> is <see langword="null"/>.</exception>
         [Pure]
         bool AreInSameSet([NotNull] T left, [NotNull] T right);
 
@@ -49,6 +53,8 @@ public interface IDisjointSet<T>
         /// <param name="right">Right value.</param>
         /// <returns>True if <paramref name="left"/> and <paramref name="right"/> were unioned,
         /// false if they already belong to the same set.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="left"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="right"/> is <see langword="null"/>.</exception>
         bool Union([NotNull] T left, [NotNull] T right);
 
         /// <summary>
@@ -56,6 +62,7 @@ public interface IDisjointSet<T>
         /// </summary>
         /// <param name="value">The value.</param>
         /// <returns>True if the value is already in the set, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="value"/> is <see langword="null"/>.</exception>
         [Pure]
         bool Contains([NotNull] T value);
     }
diff --git a/src/QuikGraph/Interfaces/Collections/IQueue.cs b/src/QuikGraph/Interfaces/Collections/IQueue.cs
index 9ed868e8d..1199f573c 100644
--- a/src/QuikGraph/Interfaces/Collections/IQueue.cs
+++ b/src/QuikGraph/Interfaces/Collections/IQueue.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace QuikGraph.Collections
 {
@@ -31,12 +31,14 @@ public interface IQueue<T>
         /// Dequeues an element from the queue.
         /// </summary>
         /// <returns>Removed element.</returns>
+        /// <exception cref="T:System.InvalidOperationException">Queue is empty.</exception>
         T Dequeue();
 
         /// <summary>
         /// Returns the element at the beginning of the queue.
         /// </summary>
         /// <returns>The top queue element.</returns>
+        /// <exception cref="T:System.InvalidOperationException">Queue is empty.</exception>
         [Pure]
         T Peek();
 
diff --git a/src/QuikGraph/Interfaces/Edges/ICloneableEdge.cs b/src/QuikGraph/Interfaces/Edges/ICloneableEdge.cs
index e0b1babbf..8173fd483 100644
--- a/src/QuikGraph/Interfaces/Edges/ICloneableEdge.cs
+++ b/src/QuikGraph/Interfaces/Edges/ICloneableEdge.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace QuikGraph
 {
@@ -17,6 +17,8 @@ public interface ICloneableEdge<TVertex, out TEdge> : IEdge<TVertex>
         /// <param name="source">The source vertex of the new edge.</param>
         /// <param name="target">The target vertex of the new edge.</param>
         /// <returns>A clone of the edge with new source and target vertices.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
         TEdge Clone([NotNull] TVertex source, [NotNull] TVertex target);
diff --git a/src/QuikGraph/Interfaces/Edges/IEdgeSet.cs b/src/QuikGraph/Interfaces/Edges/IEdgeSet.cs
index 9baa860ab..08f9edde9 100644
--- a/src/QuikGraph/Interfaces/Edges/IEdgeSet.cs
+++ b/src/QuikGraph/Interfaces/Edges/IEdgeSet.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -33,6 +33,7 @@ public interface IEdgeSet<TVertex, TEdge>
         /// </summary>
         /// <param name="edge">Edge to check.</param>
         /// <returns>True if the specified <paramref name="edge"/> is contained in this set, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         [Pure]
         bool ContainsEdge([NotNull] TEdge edge);
     }
diff --git a/src/QuikGraph/Interfaces/Graphs/IBidirectionalIncidenceGraph.cs b/src/QuikGraph/Interfaces/Graphs/IBidirectionalIncidenceGraph.cs
index 81feb0c28..43d071b25 100644
--- a/src/QuikGraph/Interfaces/Graphs/IBidirectionalIncidenceGraph.cs
+++ b/src/QuikGraph/Interfaces/Graphs/IBidirectionalIncidenceGraph.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -18,6 +18,8 @@ public interface IBidirectionalIncidenceGraph<TVertex, TEdge> : IIncidenceGraph<
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>True if <paramref name="vertex"/> has no in-edges, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         bool IsInEdgesEmpty([NotNull] TVertex vertex);
 
@@ -26,6 +28,8 @@ public interface IBidirectionalIncidenceGraph<TVertex, TEdge> : IIncidenceGraph<
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>The number of in-edges pointing towards <paramref name="vertex"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         int InDegree([NotNull] TVertex vertex);
 
@@ -34,6 +38,8 @@ public interface IBidirectionalIncidenceGraph<TVertex, TEdge> : IIncidenceGraph<
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>The collection of in-edges of <paramref name="vertex"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         IEnumerable<TEdge> InEdges([NotNull] TVertex vertex);
@@ -44,6 +50,7 @@ public interface IBidirectionalIncidenceGraph<TVertex, TEdge> : IIncidenceGraph<
         /// <param name="vertex">The vertex.</param>
         /// <param name="edges">In-edges.</param>
         /// <returns>True if <paramref name="vertex"/> was found or/and in-edges were found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         [ContractAnnotation("=> true, edges:notnull;=> false, edges:null")]
         bool TryGetInEdges([NotNull] TVertex vertex, [ItemNotNull] out IEnumerable<TEdge> edges);
@@ -54,6 +61,9 @@ public interface IBidirectionalIncidenceGraph<TVertex, TEdge> : IIncidenceGraph<
         /// <param name="vertex">The vertex.</param>
         /// <param name="index">The index.</param>
         /// <returns>The in-edge at position <paramref name="index"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">No vertex at <paramref name="index"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         [NotNull]
         TEdge InEdge([NotNull] TVertex vertex, int index);
@@ -64,6 +74,8 @@ public interface IBidirectionalIncidenceGraph<TVertex, TEdge> : IIncidenceGraph<
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>The sum of OutDegree and InDegree of <paramref name="vertex"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         int Degree([NotNull] TVertex vertex);
     }
diff --git a/src/QuikGraph/Interfaces/Graphs/IClusteredGraph.cs b/src/QuikGraph/Interfaces/Graphs/IClusteredGraph.cs
index 62a34b8d3..4370a3612 100644
--- a/src/QuikGraph/Interfaces/Graphs/IClusteredGraph.cs
+++ b/src/QuikGraph/Interfaces/Graphs/IClusteredGraph.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -35,6 +35,7 @@ public interface IClusteredGraph
         /// Removes the given graph from this cluster.
         /// </summary>
         /// <param name="graph">The graph.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         void RemoveCluster([NotNull] IClusteredGraph graph);
     }
 }
\ No newline at end of file
diff --git a/src/QuikGraph/Interfaces/Graphs/IHierarchy.cs b/src/QuikGraph/Interfaces/Graphs/IHierarchy.cs
index 6b0df3639..2893039c5 100644
--- a/src/QuikGraph/Interfaces/Graphs/IHierarchy.cs
+++ b/src/QuikGraph/Interfaces/Graphs/IHierarchy.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -22,7 +22,8 @@ public interface IHierarchy<TVertex, TEdge> : IMutableVertexAndEdgeListGraph<TVe
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>The parent vertex if there is one, otherwise null.</returns>
-        /// <exception cref="System.ArgumentException">The given <paramref name="vertex"/> is the root of the graph.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException">The given <paramref name="vertex"/> is the root of the graph.</exception>
         [Pure]
         [CanBeNull]
         TVertex GetParent([NotNull] TVertex vertex);
@@ -32,7 +33,8 @@ public interface IHierarchy<TVertex, TEdge> : IMutableVertexAndEdgeListGraph<TVe
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>The parent vertex edge.</returns>
-        /// <exception cref="System.ArgumentException">The <paramref name="vertex"/> is the root of the graph.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException">The given <paramref name="vertex"/> is the root of the graph.</exception>
         [Pure]
         [CanBeNull]
         TEdge GetParentEdge([NotNull] TVertex vertex);
@@ -42,6 +44,7 @@ public interface IHierarchy<TVertex, TEdge> : IMutableVertexAndEdgeListGraph<TVe
         /// </summary>
         /// <param name="edge">The edge.</param>
         /// <returns>True if the edge is a cross edge, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         [Pure]
         bool IsCrossEdge([NotNull] TEdge edge);
 
@@ -51,6 +54,7 @@ public interface IHierarchy<TVertex, TEdge> : IMutableVertexAndEdgeListGraph<TVe
         /// </summary>
         /// <param name="edge">The edge.</param>
         /// <returns>True if it's a real edge, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         [Pure]
         bool IsRealEdge([NotNull] TEdge edge);
 
@@ -61,6 +65,8 @@ public interface IHierarchy<TVertex, TEdge> : IMutableVertexAndEdgeListGraph<TVe
         /// <param name="source">Source vertex.</param>
         /// <param name="target">Target vertex.</param>
         /// <returns>True if the <paramref name="source"/> is a predecessor of <paramref name="target"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         [Pure]
         bool IsPredecessorOf([NotNull] TVertex source, [NotNull] TVertex target);
 
@@ -70,8 +76,12 @@ public interface IHierarchy<TVertex, TEdge> : IMutableVertexAndEdgeListGraph<TVe
         /// <param name="source">Source vertex.</param>
         /// <param name="target">Target vertex.</param>
         /// <returns>The number of edge between <paramref name="source"/> and <paramref name="target"/>.</returns>
-        /// <exception cref="System.ArgumentException">The <paramref name="source"/> is a predecessor of
-        /// <paramref name="target"/> or the other-way round.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException">
+        /// The <paramref name="source"/> is a predecessor of
+        /// <paramref name="target"/> or the other-way round.
+        /// </exception>
         [Pure]
         int InducedEdgeCount([NotNull] TVertex source, [NotNull] TVertex target);
 
@@ -80,6 +90,7 @@ public interface IHierarchy<TVertex, TEdge> : IMutableVertexAndEdgeListGraph<TVe
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>True if the <paramref name="vertex"/> is not a leaf, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         bool IsInnerNode([NotNull] TVertex vertex);
 
@@ -88,6 +99,7 @@ public interface IHierarchy<TVertex, TEdge> : IMutableVertexAndEdgeListGraph<TVe
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>Children edges.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         IEnumerable<TEdge> ChildrenEdges([NotNull] TVertex vertex);
@@ -97,6 +109,7 @@ public interface IHierarchy<TVertex, TEdge> : IMutableVertexAndEdgeListGraph<TVe
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>Children vertices.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         IEnumerable<TVertex> ChildrenVertices([NotNull] TVertex vertex);
diff --git a/src/QuikGraph/Interfaces/Graphs/IImplicitGraph.cs b/src/QuikGraph/Interfaces/Graphs/IImplicitGraph.cs
index 695fe6556..ea548fdb9 100644
--- a/src/QuikGraph/Interfaces/Graphs/IImplicitGraph.cs
+++ b/src/QuikGraph/Interfaces/Graphs/IImplicitGraph.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -17,6 +17,8 @@ public interface IImplicitGraph<TVertex, TEdge> : IGraph<TVertex, TEdge>, IImpli
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>True if <paramref name="vertex"/> has no out-edges, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         bool IsOutEdgesEmpty([NotNull] TVertex vertex);
 
@@ -25,6 +27,8 @@ public interface IImplicitGraph<TVertex, TEdge> : IGraph<TVertex, TEdge>, IImpli
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>The count of out-edges of <paramref name="vertex"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         int OutDegree([NotNull] TVertex vertex);
 
@@ -33,6 +37,8 @@ public interface IImplicitGraph<TVertex, TEdge> : IGraph<TVertex, TEdge>, IImpli
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>An enumeration of the out-edges of <paramref name="vertex"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         IEnumerable<TEdge> OutEdges([NotNull] TVertex vertex);
@@ -43,6 +49,7 @@ public interface IImplicitGraph<TVertex, TEdge> : IGraph<TVertex, TEdge>, IImpli
         /// <param name="vertex">The vertex.</param>
         /// <param name="edges">Out-edges.</param>
         /// <returns>True if <paramref name="vertex"/> was found or/and out-edges were found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         [ContractAnnotation("=> true, edges:notnull;=> false, edges:null")]
         bool TryGetOutEdges([NotNull] TVertex vertex, [ItemNotNull] out IEnumerable<TEdge> edges);
@@ -53,6 +60,9 @@ public interface IImplicitGraph<TVertex, TEdge> : IGraph<TVertex, TEdge>, IImpli
         /// <param name="vertex">The vertex.</param>
         /// <param name="index">The index.</param>
         /// <returns>The out-edge at position <paramref name="index"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">No vertex at <paramref name="index"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         [NotNull]
         TEdge OutEdge([NotNull] TVertex vertex, int index);
diff --git a/src/QuikGraph/Interfaces/Graphs/IImplicitUndirectedGraph.cs b/src/QuikGraph/Interfaces/Graphs/IImplicitUndirectedGraph.cs
index 913586cec..9478a489d 100644
--- a/src/QuikGraph/Interfaces/Graphs/IImplicitUndirectedGraph.cs
+++ b/src/QuikGraph/Interfaces/Graphs/IImplicitUndirectedGraph.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -23,6 +23,8 @@ public interface IImplicitUndirectedGraph<TVertex, TEdge> : IImplicitVertexSet<T
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>Enumerable of adjacent edges.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         IEnumerable<TEdge> AdjacentEdges([NotNull] TVertex vertex);
@@ -32,6 +34,8 @@ public interface IImplicitUndirectedGraph<TVertex, TEdge> : IImplicitVertexSet<T
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>Vertex adjacent degree.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         int AdjacentDegree([NotNull] TVertex vertex);
 
@@ -40,6 +44,8 @@ public interface IImplicitUndirectedGraph<TVertex, TEdge> : IImplicitVertexSet<T
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>True if the vertex has at least one adjacent edge, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         bool IsAdjacentEdgesEmpty([NotNull] TVertex vertex);
 
@@ -49,6 +55,9 @@ public interface IImplicitUndirectedGraph<TVertex, TEdge> : IImplicitVertexSet<T
         /// <param name="vertex">The vertex.</param>
         /// <param name="index">Index of the adjacent edge requested.</param>
         /// <returns>The adjacent edge.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentOutOfRangeException">No vertex at <paramref name="index"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         [NotNull]
         TEdge AdjacentEdge([NotNull] TVertex vertex, int index);
@@ -61,6 +70,8 @@ public interface IImplicitUndirectedGraph<TVertex, TEdge> : IImplicitVertexSet<T
         /// <param name="target">Target vertex.</param>
         /// <param name="edge">Edge found, otherwise null.</param>
         /// <returns>True if an edge was found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         [Pure]
         [ContractAnnotation("=> true, edge:notnull;=> false, edge:null")]
         bool TryGetEdge([NotNull] TVertex source, [NotNull] TVertex target, out TEdge edge);
@@ -72,6 +83,8 @@ public interface IImplicitUndirectedGraph<TVertex, TEdge> : IImplicitVertexSet<T
         /// <param name="source">Source vertex.</param>
         /// <param name="target">Target vertex.</param>
         /// <returns>True if an edge exists, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         [Pure]
         bool ContainsEdge([NotNull] TVertex source, [NotNull] TVertex target);
     }
diff --git a/src/QuikGraph/Interfaces/Graphs/IIncidenceGraph.cs b/src/QuikGraph/Interfaces/Graphs/IIncidenceGraph.cs
index 4f309b317..a977fbf07 100644
--- a/src/QuikGraph/Interfaces/Graphs/IIncidenceGraph.cs
+++ b/src/QuikGraph/Interfaces/Graphs/IIncidenceGraph.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -19,6 +19,8 @@ public interface IIncidenceGraph<TVertex, TEdge> : IImplicitGraph<TVertex, TEdge
         /// <param name="source">Source vertex.</param>
         /// <param name="target">Target vertex.</param>
         /// <returns>True if an edge exists, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         [Pure]
         bool ContainsEdge([NotNull] TVertex source, [NotNull] TVertex target);
 
@@ -30,6 +32,8 @@ public interface IIncidenceGraph<TVertex, TEdge> : IImplicitGraph<TVertex, TEdge
         /// <param name="target">Target vertex.</param>
         /// <param name="edge">Edge found, otherwise null.</param>
         /// <returns>True if an edge was found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         [Pure]
         [ContractAnnotation("=> true, edge:notnull;=> false, edge:null")]
         bool TryGetEdge([NotNull] TVertex source, [NotNull] TVertex target, out TEdge edge);
@@ -42,6 +46,8 @@ public interface IIncidenceGraph<TVertex, TEdge> : IImplicitGraph<TVertex, TEdge
         /// <param name="target">Target vertex.</param>
         /// <param name="edges">Edges found, otherwise null.</param>
         /// <returns>True if at least an edge was found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         [Pure]
         [ContractAnnotation("=> true, edges:notnull;=> false, edges:null")]
         bool TryGetEdges([NotNull] TVertex source, [NotNull] TVertex target, [ItemNotNull] out IEnumerable<TEdge> edges);
diff --git a/src/QuikGraph/Interfaces/Graphs/IMutableBidirectionalGraph.cs b/src/QuikGraph/Interfaces/Graphs/IMutableBidirectionalGraph.cs
index 7527e021d..84b5a7c02 100644
--- a/src/QuikGraph/Interfaces/Graphs/IMutableBidirectionalGraph.cs
+++ b/src/QuikGraph/Interfaces/Graphs/IMutableBidirectionalGraph.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace QuikGraph
 {
@@ -20,18 +20,22 @@ public interface IMutableBidirectionalGraph<TVertex, TEdge>
         /// <param name="vertex">The vertex.</param>
         /// <param name="predicate">Edge predicate.</param>
         /// <returns>Number of edges removed.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="predicate"/> is <see langword="null"/>.</exception>
         int RemoveInEdgeIf([NotNull] TVertex vertex, [NotNull, InstantHandle] EdgePredicate<TVertex, TEdge> predicate);
 
         /// <summary>
         /// Clears in-edges of the given <paramref name="vertex"/>.
         /// </summary>
         /// <param name="vertex">The vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         void ClearInEdges([NotNull] TVertex vertex);
 
         /// <summary>
         /// Clears in-edges and out-edges of the given <paramref name="vertex"/>.
         /// </summary>
         /// <param name="vertex">The vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         void ClearEdges([NotNull] TVertex vertex);
     }
 }
\ No newline at end of file
diff --git a/src/QuikGraph/Interfaces/Graphs/IMutableEdgeListGraph.cs b/src/QuikGraph/Interfaces/Graphs/IMutableEdgeListGraph.cs
index d9a7a4ab5..0d55afbdb 100644
--- a/src/QuikGraph/Interfaces/Graphs/IMutableEdgeListGraph.cs
+++ b/src/QuikGraph/Interfaces/Graphs/IMutableEdgeListGraph.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -17,6 +17,7 @@ public interface IMutableEdgeListGraph<TVertex, TEdge> : IMutableGraph<TVertex,
         /// </summary>
         /// <param name="edge">An edge.</param>
         /// <returns>True if the edge was added, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         bool AddEdge([NotNull] TEdge edge);
 
         /// <summary>
@@ -29,6 +30,9 @@ public interface IMutableEdgeListGraph<TVertex, TEdge> : IMutableGraph<TVertex,
         /// </summary>
         /// <param name="edges">Edges to add.</param>
         /// <returns>The number of edges successfully added to this graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="edges"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
         int AddEdgeRange([NotNull, ItemNotNull] IEnumerable<TEdge> edges);
 
         /// <summary>
@@ -36,6 +40,7 @@ public interface IMutableEdgeListGraph<TVertex, TEdge> : IMutableGraph<TVertex,
         /// </summary>
         /// <param name="edge">Edge to remove.</param>
         /// <returns>True if the <paramref name="edge"/> was successfully removed, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         bool RemoveEdge([NotNull] TEdge edge);
 
         /// <summary>
@@ -48,6 +53,7 @@ public interface IMutableEdgeListGraph<TVertex, TEdge> : IMutableGraph<TVertex,
         /// </summary>
         /// <param name="predicate">Predicate to check if an edge should be removed.</param>
         /// <returns>The number of edges removed.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="predicate"/> is <see langword="null"/>.</exception>
         int RemoveEdgeIf([NotNull, InstantHandle] EdgePredicate<TVertex, TEdge> predicate);
     }
 }
\ No newline at end of file
diff --git a/src/QuikGraph/Interfaces/Graphs/IMutableIncidenceGraph.cs b/src/QuikGraph/Interfaces/Graphs/IMutableIncidenceGraph.cs
index c7238310c..f37a76e13 100644
--- a/src/QuikGraph/Interfaces/Graphs/IMutableIncidenceGraph.cs
+++ b/src/QuikGraph/Interfaces/Graphs/IMutableIncidenceGraph.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace QuikGraph
 {
@@ -18,12 +18,15 @@ public interface IMutableIncidenceGraph<TVertex, TEdge> : IMutableGraph<TVertex,
         /// <param name="vertex">The vertex.</param>
         /// <param name="predicate">Predicate to remove edges.</param>
         /// <returns>The number of removed edges.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="predicate"/> is <see langword="null"/>.</exception>
         int RemoveOutEdgeIf([NotNull] TVertex vertex, [NotNull, InstantHandle] EdgePredicate<TVertex, TEdge> predicate);
 
         /// <summary>
         /// Trims the out-edges of the given <paramref name="vertex"/>
         /// </summary>
         /// <param name="vertex">The vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         void ClearOutEdges([NotNull] TVertex vertex);
 
         /// <summary>
diff --git a/src/QuikGraph/Interfaces/Graphs/IMutableUndirectedGraph.cs b/src/QuikGraph/Interfaces/Graphs/IMutableUndirectedGraph.cs
index 6c9a46300..bf5847f58 100644
--- a/src/QuikGraph/Interfaces/Graphs/IMutableUndirectedGraph.cs
+++ b/src/QuikGraph/Interfaces/Graphs/IMutableUndirectedGraph.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace QuikGraph
 {
@@ -19,12 +19,15 @@ public interface IMutableUndirectedGraph<TVertex, TEdge>
         /// <param name="vertex">The vertex.</param>
         /// <param name="predicate">Predicate to match edges.</param>
         /// <returns>The number of removed edges.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="predicate"/> is <see langword="null"/>.</exception>
         int RemoveAdjacentEdgeIf([NotNull] TVertex vertex, [NotNull, InstantHandle] EdgePredicate<TVertex, TEdge> predicate);
 
         /// <summary>
         /// Clears adjacent edges of the given <paramref name="vertex"/>.
         /// </summary>
         /// <param name="vertex">The vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         void ClearAdjacentEdges([NotNull] TVertex vertex);
     }
 }
\ No newline at end of file
diff --git a/src/QuikGraph/Interfaces/Graphs/IMutableVertexAndEdgeSet.cs b/src/QuikGraph/Interfaces/Graphs/IMutableVertexAndEdgeSet.cs
index a8753e513..441f8ba5f 100644
--- a/src/QuikGraph/Interfaces/Graphs/IMutableVertexAndEdgeSet.cs
+++ b/src/QuikGraph/Interfaces/Graphs/IMutableVertexAndEdgeSet.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -18,6 +18,7 @@ public interface IMutableVertexAndEdgeSet<TVertex,TEdge>
         /// </summary>
         /// <param name="edge">The edge to add.</param>
         /// <returns>True if the edge was added, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         bool AddVerticesAndEdge([NotNull] TEdge edge);
 
         /// <summary>
@@ -25,6 +26,9 @@ public interface IMutableVertexAndEdgeSet<TVertex,TEdge>
         /// </summary>
         /// <param name="edges">Edges to add.</param>
         /// <returns>The number of edges added.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="edges"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
         int AddVerticesAndEdgeRange([NotNull, ItemNotNull] IEnumerable<TEdge> edges);
     }
 }
\ No newline at end of file
diff --git a/src/QuikGraph/Interfaces/Graphs/ITermBidirectionalGraph.cs b/src/QuikGraph/Interfaces/Graphs/ITermBidirectionalGraph.cs
index 1a42b6046..8ee723d88 100644
--- a/src/QuikGraph/Interfaces/Graphs/ITermBidirectionalGraph.cs
+++ b/src/QuikGraph/Interfaces/Graphs/ITermBidirectionalGraph.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -18,6 +18,8 @@ public interface ITermBidirectionalGraph<TVertex, TEdge> : IBidirectionalGraph<T
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>Number of out terminals.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         int OutTerminalCount([NotNull] TVertex vertex);
 
@@ -27,15 +29,19 @@ public interface ITermBidirectionalGraph<TVertex, TEdge> : IBidirectionalGraph<T
         /// <param name="vertex">The vertex.</param>
         /// <param name="terminal">Out terminal index.</param>
         /// <returns>True if the out terminal is empty, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         bool IsOutEdgesEmptyAt([NotNull] TVertex vertex, int terminal);
 
         /// <summary>
-        /// Gets the <paramref name="vertex"/> out degree for the requested terminal.
+        /// Gets the <paramref name="vertex"/> out-degree for the requested terminal.
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <param name="terminal">Out terminal index.</param>
-        /// <returns>The <paramref name="vertex"/> out degree on terminal <paramref name="terminal"/>.</returns>
+        /// <returns>The <paramref name="vertex"/> out-degree on terminal <paramref name="terminal"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         int OutDegreeAt([NotNull] TVertex vertex, int terminal);
 
@@ -45,6 +51,8 @@ public interface ITermBidirectionalGraph<TVertex, TEdge> : IBidirectionalGraph<T
         /// <param name="vertex">The vertex.</param>
         /// <param name="terminal">Out terminal index.</param>
         /// <returns>The <paramref name="vertex"/> out-edges on terminal <paramref name="terminal"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         IEnumerable<TEdge> OutEdgesAt([NotNull] TVertex vertex, int terminal);
@@ -56,6 +64,7 @@ public interface ITermBidirectionalGraph<TVertex, TEdge> : IBidirectionalGraph<T
         /// <param name="terminal">Out terminal index.</param>
         /// <param name="edges">Out-edges found, otherwise null.</param>
         /// <returns>True if <paramref name="vertex"/> was found or/and out-edges were found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         [ContractAnnotation("=> true, edges:notnull;=> false, edges:null")]
         bool TryGetOutEdgesAt([NotNull] TVertex vertex, int terminal, [ItemNotNull] out IEnumerable<TEdge> edges);
@@ -65,6 +74,8 @@ public interface ITermBidirectionalGraph<TVertex, TEdge> : IBidirectionalGraph<T
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <returns>Number of in terminals.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         int InTerminalCount([NotNull] TVertex vertex);
 
@@ -74,15 +85,19 @@ public interface ITermBidirectionalGraph<TVertex, TEdge> : IBidirectionalGraph<T
         /// <param name="vertex">The vertex.</param>
         /// <param name="terminal">In terminal index.</param>
         /// <returns>True if the in terminal is empty, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         bool IsInEdgesEmptyAt([NotNull] TVertex vertex, int terminal);
 
         /// <summary>
-        /// Gets the <paramref name="vertex"/> in degree for the requested terminal.
+        /// Gets the <paramref name="vertex"/> in-degree for the requested terminal.
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <param name="terminal">In terminal index.</param>
-        /// <returns>The <paramref name="vertex"/> in degree on terminal <paramref name="terminal"/>.</returns>
+        /// <returns>The <paramref name="vertex"/> in-degree on terminal <paramref name="terminal"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         int InDegreeAt([NotNull] TVertex vertex, int terminal);
 
@@ -92,6 +107,8 @@ public interface ITermBidirectionalGraph<TVertex, TEdge> : IBidirectionalGraph<T
         /// <param name="vertex">The vertex.</param>
         /// <param name="terminal">In terminal index.</param>
         /// <returns>The <paramref name="vertex"/> in-edges on terminal <paramref name="terminal"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         IEnumerable<TEdge> InEdgesAt([NotNull] TVertex vertex, int terminal);
@@ -103,6 +120,7 @@ public interface ITermBidirectionalGraph<TVertex, TEdge> : IBidirectionalGraph<T
         /// <param name="terminal">Out terminal index.</param>
         /// <param name="edges">In-edges found, otherwise null.</param>
         /// <returns>True if <paramref name="vertex"/> was found or/and in-edges were found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         [ContractAnnotation("=> true, edges:notnull;=> false, edges:null")]
         bool TryGetInEdgesAt([NotNull] TVertex vertex, int terminal, [ItemNotNull] out IEnumerable<TEdge> edges);
diff --git a/src/QuikGraph/Interfaces/Vertices/IImplicitVertexSet.cs b/src/QuikGraph/Interfaces/Vertices/IImplicitVertexSet.cs
index 193e62c48..57e3f007e 100644
--- a/src/QuikGraph/Interfaces/Vertices/IImplicitVertexSet.cs
+++ b/src/QuikGraph/Interfaces/Vertices/IImplicitVertexSet.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace QuikGraph
 {
@@ -13,6 +13,7 @@ public interface IImplicitVertexSet<in TVertex>
         /// </summary>
         /// <param name="vertex">Vertex to check.</param>
         /// <returns>True if the specified <paramref name="vertex"/> is contained in this set, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         bool ContainsVertex([NotNull] TVertex vertex);
     }
diff --git a/src/QuikGraph/Interfaces/Vertices/IMutableVertexSet.cs b/src/QuikGraph/Interfaces/Vertices/IMutableVertexSet.cs
index 37f46f8f9..b7bcb24c4 100644
--- a/src/QuikGraph/Interfaces/Vertices/IMutableVertexSet.cs
+++ b/src/QuikGraph/Interfaces/Vertices/IMutableVertexSet.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace QuikGraph
@@ -19,6 +19,7 @@ public interface IMutableVertexSet<TVertex> : IVertexSet<TVertex>
         /// </summary>
         /// <param name="vertex">Vertex to add.</param>
         /// <returns>True if the vertex was added, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         bool AddVertex([NotNull] TVertex vertex);
 
         /// <summary>
@@ -26,6 +27,9 @@ public interface IMutableVertexSet<TVertex> : IVertexSet<TVertex>
         /// </summary>
         /// <param name="vertices">Vertices to add.</param>
         /// <returns>The number of vertex added.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="vertices"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
         int AddVertexRange([NotNull, ItemNotNull] IEnumerable<TVertex> vertices);
 
         /// <summary>
@@ -38,6 +42,7 @@ public interface IMutableVertexSet<TVertex> : IVertexSet<TVertex>
         /// </summary>
         /// <param name="vertex">Vertex to remove.</param>
         /// <returns>True if the vertex was removed, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         bool RemoveVertex([NotNull] TVertex vertex);
 
         /// <summary>
@@ -45,6 +50,7 @@ public interface IMutableVertexSet<TVertex> : IVertexSet<TVertex>
         /// </summary>
         /// <param name="predicate">Predicate to check on each vertex.</param>
         /// <returns>The number of vertex removed.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="predicate"/> is <see langword="null"/>.</exception>
         int RemoveVertexIf([NotNull, InstantHandle] VertexPredicate<TVertex> predicate);
     }
 }
\ No newline at end of file
diff --git a/src/QuikGraph/Predicates/Graphs/FilteredBidirectionalGraph.cs b/src/QuikGraph/Predicates/Graphs/FilteredBidirectionalGraph.cs
index c1e4509b6..5811e61a1 100644
--- a/src/QuikGraph/Predicates/Graphs/FilteredBidirectionalGraph.cs
+++ b/src/QuikGraph/Predicates/Graphs/FilteredBidirectionalGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -24,6 +24,9 @@ public class FilteredBidirectionalGraph<TVertex, TEdge, TGraph>
         /// <param name="baseGraph">Graph in which applying predicates.</param>
         /// <param name="vertexPredicate">Predicate to match vertex that should be taken into account.</param>
         /// <param name="edgePredicate">Predicate to match edge that should be taken into account.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="baseGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexPredicate"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgePredicate"/> is <see langword="null"/>.</exception>
         public FilteredBidirectionalGraph(
             [NotNull] TGraph baseGraph,
             [NotNull] VertexPredicate<TVertex> vertexPredicate,
diff --git a/src/QuikGraph/Predicates/Graphs/FilteredEdgeListGraph.cs b/src/QuikGraph/Predicates/Graphs/FilteredEdgeListGraph.cs
index 30ff67627..8913fd3fb 100644
--- a/src/QuikGraph/Predicates/Graphs/FilteredEdgeListGraph.cs
+++ b/src/QuikGraph/Predicates/Graphs/FilteredEdgeListGraph.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 
@@ -23,6 +23,9 @@ public sealed class FilteredEdgeListGraph<TVertex, TEdge, TGraph>
         /// <param name="baseGraph">Graph in which applying predicates.</param>
         /// <param name="vertexPredicate">Predicate to match vertex that should be taken into account.</param>
         /// <param name="edgePredicate">Predicate to match edge that should be taken into account.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="baseGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexPredicate"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgePredicate"/> is <see langword="null"/>.</exception>
         public FilteredEdgeListGraph(
             [NotNull] TGraph baseGraph,
             [NotNull] VertexPredicate<TVertex> vertexPredicate,
diff --git a/src/QuikGraph/Predicates/Graphs/FilteredGraph.cs b/src/QuikGraph/Predicates/Graphs/FilteredGraph.cs
index 6b1f2b2a3..a97e57b7b 100644
--- a/src/QuikGraph/Predicates/Graphs/FilteredGraph.cs
+++ b/src/QuikGraph/Predicates/Graphs/FilteredGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Predicates
@@ -20,6 +20,9 @@ public class FilteredGraph<TVertex, TEdge, TGraph> : IGraph<TVertex, TEdge>
         /// <param name="baseGraph">Graph in which applying predicates.</param>
         /// <param name="vertexPredicate">Predicate to match vertex that should be taken into account.</param>
         /// <param name="edgePredicate">Predicate to match edge that should be taken into account.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="baseGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexPredicate"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgePredicate"/> is <see langword="null"/>.</exception>
         public FilteredGraph(
             [NotNull] TGraph baseGraph,
             [NotNull] VertexPredicate<TVertex> vertexPredicate,
@@ -68,6 +71,7 @@ public FilteredGraph(
         /// </summary>
         /// <param name="edge">Edge to check.</param>
         /// <returns>True if the <paramref name="edge"/> matches all predicates, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         [Pure]
         protected bool FilterEdge([NotNull] TEdge edge)
         {
diff --git a/src/QuikGraph/Predicates/Graphs/FilteredImplicitGraph.cs b/src/QuikGraph/Predicates/Graphs/FilteredImplicitGraph.cs
index a1427499f..c7a96a57b 100644
--- a/src/QuikGraph/Predicates/Graphs/FilteredImplicitGraph.cs
+++ b/src/QuikGraph/Predicates/Graphs/FilteredImplicitGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -24,6 +24,9 @@ public class FilteredImplicitGraph<TVertex, TEdge, TGraph>
         /// <param name="baseGraph">Graph in which applying predicates.</param>
         /// <param name="vertexPredicate">Predicate to match vertex that should be taken into account.</param>
         /// <param name="edgePredicate">Predicate to match edge that should be taken into account.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="baseGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexPredicate"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgePredicate"/> is <see langword="null"/>.</exception>
         public FilteredImplicitGraph(
             [NotNull] TGraph baseGraph,
             [NotNull] VertexPredicate<TVertex> vertexPredicate,
diff --git a/src/QuikGraph/Predicates/Graphs/FilteredImplicitVertexSetGraph.cs b/src/QuikGraph/Predicates/Graphs/FilteredImplicitVertexSetGraph.cs
index 7448580cf..94900fd5f 100644
--- a/src/QuikGraph/Predicates/Graphs/FilteredImplicitVertexSetGraph.cs
+++ b/src/QuikGraph/Predicates/Graphs/FilteredImplicitVertexSetGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Predicates
@@ -22,6 +22,9 @@ public class FilteredImplicitVertexSet<TVertex, TEdge, TGraph>
         /// <param name="baseGraph">Graph in which applying predicates.</param>
         /// <param name="vertexPredicate">Predicate to match vertex that should be taken into account.</param>
         /// <param name="edgePredicate">Predicate to match edge that should be taken into account.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="baseGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexPredicate"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgePredicate"/> is <see langword="null"/>.</exception>
         public FilteredImplicitVertexSet(
             [NotNull] TGraph baseGraph,
             [NotNull] VertexPredicate<TVertex> vertexPredicate,
diff --git a/src/QuikGraph/Predicates/Graphs/FilteredIncidenceGraph.cs b/src/QuikGraph/Predicates/Graphs/FilteredIncidenceGraph.cs
index e7f4c3225..fbf21d1a0 100644
--- a/src/QuikGraph/Predicates/Graphs/FilteredIncidenceGraph.cs
+++ b/src/QuikGraph/Predicates/Graphs/FilteredIncidenceGraph.cs
@@ -24,6 +24,9 @@ public class FilteredIncidenceGraph<TVertex, TEdge, TGraph>
         /// <param name="baseGraph">Graph in which applying predicates.</param>
         /// <param name="vertexPredicate">Predicate to match vertex that should be taken into account.</param>
         /// <param name="edgePredicate">Predicate to match edge that should be taken into account.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="baseGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexPredicate"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgePredicate"/> is <see langword="null"/>.</exception>
         public FilteredIncidenceGraph(
             [NotNull] TGraph baseGraph,
             [NotNull] VertexPredicate<TVertex> vertexPredicate,
diff --git a/src/QuikGraph/Predicates/Graphs/FilteredUndirectedGraph.cs b/src/QuikGraph/Predicates/Graphs/FilteredUndirectedGraph.cs
index f7aa6cd77..27e74ae10 100644
--- a/src/QuikGraph/Predicates/Graphs/FilteredUndirectedGraph.cs
+++ b/src/QuikGraph/Predicates/Graphs/FilteredUndirectedGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -24,6 +24,9 @@ public sealed class FilteredUndirectedGraph<TVertex, TEdge, TGraph>
         /// <param name="baseGraph">Graph in which applying predicates.</param>
         /// <param name="vertexPredicate">Predicate to match vertex that should be taken into account.</param>
         /// <param name="edgePredicate">Predicate to match edge that should be taken into account.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="baseGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexPredicate"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgePredicate"/> is <see langword="null"/>.</exception>
         public FilteredUndirectedGraph(
             [NotNull] TGraph baseGraph,
             [NotNull] VertexPredicate<TVertex> vertexPredicate,
diff --git a/src/QuikGraph/Predicates/Graphs/FilteredVertexAndEdgeListGraph.cs b/src/QuikGraph/Predicates/Graphs/FilteredVertexAndEdgeListGraph.cs
index f9645e79c..7aee83cbe 100644
--- a/src/QuikGraph/Predicates/Graphs/FilteredVertexAndEdgeListGraph.cs
+++ b/src/QuikGraph/Predicates/Graphs/FilteredVertexAndEdgeListGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -24,6 +24,9 @@ public class FilteredVertexAndEdgeListGraph<TVertex, TEdge, TGraph>
         /// <param name="baseGraph">Graph in which applying predicates.</param>
         /// <param name="vertexPredicate">Predicate to match vertex that should be taken into account.</param>
         /// <param name="edgePredicate">Predicate to match edge that should be taken into account.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="baseGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexPredicate"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgePredicate"/> is <see langword="null"/>.</exception>
         public FilteredVertexAndEdgeListGraph(
             [NotNull] TGraph baseGraph,
             [NotNull] VertexPredicate<TVertex> vertexPredicate,
diff --git a/src/QuikGraph/Predicates/Graphs/FilteredVertexListGraph.cs b/src/QuikGraph/Predicates/Graphs/FilteredVertexListGraph.cs
index 779a6c041..30bb4823d 100644
--- a/src/QuikGraph/Predicates/Graphs/FilteredVertexListGraph.cs
+++ b/src/QuikGraph/Predicates/Graphs/FilteredVertexListGraph.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 
@@ -23,6 +23,9 @@ public class FilteredVertexListGraph<TVertex, TEdge, TGraph>
         /// <param name="baseGraph">Graph in which applying predicates.</param>
         /// <param name="vertexPredicate">Predicate to match vertex that should be taken into account.</param>
         /// <param name="edgePredicate">Predicate to match edge that should be taken into account.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="baseGraph"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexPredicate"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgePredicate"/> is <see langword="null"/>.</exception>
         public FilteredVertexListGraph(
             [NotNull] TGraph baseGraph,
             [NotNull] VertexPredicate<TVertex> vertexPredicate,
diff --git a/src/QuikGraph/Predicates/InDictionaryVertexPredicate.cs b/src/QuikGraph/Predicates/InDictionaryVertexPredicate.cs
index 9a7c64899..81a283a3e 100644
--- a/src/QuikGraph/Predicates/InDictionaryVertexPredicate.cs
+++ b/src/QuikGraph/Predicates/InDictionaryVertexPredicate.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
@@ -18,6 +18,7 @@ public sealed class InDictionaryVertexPredicate<TVertex, TValue>
         /// Initializes a new instance of the <see cref="InDictionaryVertexPredicate{TVertex,TValue}"/> class.
         /// </summary>
         /// <param name="vertexMap">Vertex map.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexMap"/> is <see langword="null"/>.</exception>
         public InDictionaryVertexPredicate([NotNull] IDictionary<TVertex, TValue> vertexMap)
         {
             _vertexMap = vertexMap ?? throw new ArgumentNullException(nameof(vertexMap));
@@ -29,6 +30,7 @@ public InDictionaryVertexPredicate([NotNull] IDictionary<TVertex, TValue> vertex
         /// <remarks>Check if the implemented predicate is matched.</remarks>
         /// <param name="vertex">Vertex to use in predicate.</param>
         /// <returns>True if the vertex is in the vertex map, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         public bool Test([NotNull] TVertex vertex)
         {
diff --git a/src/QuikGraph/Predicates/IsolatedVertexPredicate.cs b/src/QuikGraph/Predicates/IsolatedVertexPredicate.cs
index d5f2af455..1220d2313 100644
--- a/src/QuikGraph/Predicates/IsolatedVertexPredicate.cs
+++ b/src/QuikGraph/Predicates/IsolatedVertexPredicate.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Predicates
@@ -18,6 +18,7 @@ public sealed class IsolatedVertexPredicate<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="IsolatedVertexPredicate{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to consider.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public IsolatedVertexPredicate([NotNull] IBidirectionalGraph<TVertex, TEdge> visitedGraph)
         {
             _visitedGraph = visitedGraph ?? throw new ArgumentNullException(nameof(visitedGraph));
@@ -29,6 +30,7 @@ public IsolatedVertexPredicate([NotNull] IBidirectionalGraph<TVertex, TEdge> vis
         /// <remarks>Check if the implemented predicate is matched.</remarks>
         /// <param name="vertex">Vertex to check.</param>
         /// <returns>True if the vertex is isolated, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         public bool Test([NotNull] TVertex vertex)
         {
diff --git a/src/QuikGraph/Predicates/ResidualEdgePrediate.cs b/src/QuikGraph/Predicates/ResidualEdgePrediate.cs
index 879fb0fa7..5b7f7a220 100644
--- a/src/QuikGraph/Predicates/ResidualEdgePrediate.cs
+++ b/src/QuikGraph/Predicates/ResidualEdgePrediate.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
@@ -16,6 +16,7 @@ public sealed class ResidualEdgePredicate<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="ResidualEdgePredicate{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="residualCapacities">Residual capacities per edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="residualCapacities"/> is <see langword="null"/>.</exception>
         public ResidualEdgePredicate([NotNull] IDictionary<TEdge, double> residualCapacities)
         {
             ResidualCapacities = residualCapacities ?? throw new ArgumentNullException(nameof(residualCapacities));
@@ -33,12 +34,12 @@ public ResidualEdgePredicate([NotNull] IDictionary<TEdge, double> residualCapaci
         /// <remarks>Check if the implemented predicate is matched.</remarks>
         /// <param name="edge">Edge to use in predicate.</param>
         /// <returns>True if the edge is residual, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         [Pure]
         public bool Test([NotNull] TEdge edge)
         {
             if (edge == null)
                 throw new ArgumentNullException(nameof(edge));
-
             return 0 < ResidualCapacities[edge];
         }
     }
diff --git a/src/QuikGraph/Predicates/ReversedResidualEdgePredicate.cs b/src/QuikGraph/Predicates/ReversedResidualEdgePredicate.cs
index b8b50051f..f5eef7cab 100644
--- a/src/QuikGraph/Predicates/ReversedResidualEdgePredicate.cs
+++ b/src/QuikGraph/Predicates/ReversedResidualEdgePredicate.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using JetBrains.Annotations;
 
@@ -17,6 +17,8 @@ public sealed class ReversedResidualEdgePredicate<TVertex, TEdge>
         /// </summary>
         /// <param name="residualCapacities">Residual capacities per edge.</param>
         /// <param name="reversedEdges">Map of edges and their reversed edges.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="residualCapacities"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="reversedEdges"/> is <see langword="null"/>.</exception>
         public ReversedResidualEdgePredicate(
             [NotNull] IDictionary<TEdge, double> residualCapacities,
             [NotNull] IDictionary<TEdge, TEdge> reversedEdges)
@@ -43,6 +45,7 @@ public ReversedResidualEdgePredicate(
         /// <remarks>Check if the implemented predicate is matched.</remarks>
         /// <param name="edge">Edge to use in predicate.</param>
         /// <returns>True if the reversed edge is residual, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         [Pure]
         public bool Test([NotNull] TEdge edge)
         {
diff --git a/src/QuikGraph/Predicates/SinkVertexPredicate.cs b/src/QuikGraph/Predicates/SinkVertexPredicate.cs
index fe418eba8..9d36a5edf 100644
--- a/src/QuikGraph/Predicates/SinkVertexPredicate.cs
+++ b/src/QuikGraph/Predicates/SinkVertexPredicate.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 
 namespace QuikGraph.Predicates
@@ -18,6 +18,7 @@ public sealed class SinkVertexPredicate<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="SinkVertexPredicate{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="visitedGraph">Graph to consider.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public SinkVertexPredicate([NotNull] IIncidenceGraph<TVertex, TEdge> visitedGraph)
         {
             _visitedGraph = visitedGraph ?? throw new ArgumentNullException(nameof(visitedGraph));
@@ -29,6 +30,7 @@ public SinkVertexPredicate([NotNull] IIncidenceGraph<TVertex, TEdge> visitedGrap
         /// <remarks>Check if the implemented predicate is matched.</remarks>
         /// <param name="vertex">Vertex to use in predicate.</param>
         /// <returns>True if the vertex is a sink, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         public bool Test([NotNull] TVertex vertex)
         {
diff --git a/src/QuikGraph/Structures/Edges/Edge.cs b/src/QuikGraph/Structures/Edges/Edge.cs
index 4d370ef67..c5cd56030 100644
--- a/src/QuikGraph/Structures/Edges/Edge.cs
+++ b/src/QuikGraph/Structures/Edges/Edge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using JetBrains.Annotations;
 using QuikGraph.Constants;
@@ -20,6 +20,8 @@ public class Edge<TVertex> : IEdge<TVertex>
         /// </summary>
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public Edge([NotNull] TVertex source, [NotNull] TVertex target)
         {
             if (source == null)
diff --git a/src/QuikGraph/Structures/Edges/EquatableEdge.cs b/src/QuikGraph/Structures/Edges/EquatableEdge.cs
index 522db0f3b..86246413f 100644
--- a/src/QuikGraph/Structures/Edges/EquatableEdge.cs
+++ b/src/QuikGraph/Structures/Edges/EquatableEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -20,6 +20,8 @@ public class EquatableEdge<TVertex> : Edge<TVertex>, IEquatable<EquatableEdge<TV
         /// </summary>
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public EquatableEdge([NotNull] TVertex source, [NotNull] TVertex target)
             : base(source, target)
         {
diff --git a/src/QuikGraph/Structures/Edges/EquatableTaggedEdge.cs b/src/QuikGraph/Structures/Edges/EquatableTaggedEdge.cs
index b80d9051c..57f59e4c9 100644
--- a/src/QuikGraph/Structures/Edges/EquatableTaggedEdge.cs
+++ b/src/QuikGraph/Structures/Edges/EquatableTaggedEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -23,6 +23,8 @@ public class EquatableTaggedEdge<TVertex, TTag> : EquatableEdge<TVertex>, ITagge
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
         /// <param name="tag">Edge tag.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public EquatableTaggedEdge([NotNull] TVertex source, [NotNull] TVertex target, [CanBeNull] TTag tag)
             : base(source, target)
         {
diff --git a/src/QuikGraph/Structures/Edges/EquatableTermEdge.cs b/src/QuikGraph/Structures/Edges/EquatableTermEdge.cs
index a89cc799f..951b4c163 100644
--- a/src/QuikGraph/Structures/Edges/EquatableTermEdge.cs
+++ b/src/QuikGraph/Structures/Edges/EquatableTermEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -21,6 +21,8 @@ public class EquatableTermEdge<TVertex> : TermEdge<TVertex>, IEquatable<Equatabl
         /// </summary>
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public EquatableTermEdge([NotNull] TVertex source, [NotNull] TVertex target)
             : base(source, target)
         {
@@ -34,6 +36,10 @@ public EquatableTermEdge([NotNull] TVertex source, [NotNull] TVertex target)
         /// <param name="target">The target vertex.</param>
         /// <param name="sourceTerminal">The source terminal.</param>
         /// <param name="targetTerminal">The target terminal.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="sourceTerminal"/> is negative.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="targetTerminal"/> is negative.</exception>
         public EquatableTermEdge([NotNull] TVertex source, [NotNull] TVertex target, int sourceTerminal, int targetTerminal)
             : base(source, target, sourceTerminal, targetTerminal)
         {
diff --git a/src/QuikGraph/Structures/Edges/EquatableUndirectedEdge.cs b/src/QuikGraph/Structures/Edges/EquatableUndirectedEdge.cs
index b269298bb..64d997896 100644
--- a/src/QuikGraph/Structures/Edges/EquatableUndirectedEdge.cs
+++ b/src/QuikGraph/Structures/Edges/EquatableUndirectedEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -20,6 +20,8 @@ public class EquatableUndirectedEdge<TVertex> : UndirectedEdge<TVertex>, IEquata
         /// </summary>
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public EquatableUndirectedEdge([NotNull] TVertex source, [NotNull] TVertex target)
             : base(source, target)
         {
diff --git a/src/QuikGraph/Structures/Edges/SEdge.cs b/src/QuikGraph/Structures/Edges/SEdge.cs
index 99c5cab95..caf31265a 100644
--- a/src/QuikGraph/Structures/Edges/SEdge.cs
+++ b/src/QuikGraph/Structures/Edges/SEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using JetBrains.Annotations;
@@ -22,6 +22,8 @@ public struct SEdge<TVertex> : IEdge<TVertex>
         /// </summary>
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public SEdge([NotNull] TVertex source, [NotNull] TVertex target)
         {
             if (source == null)
diff --git a/src/QuikGraph/Structures/Edges/SEquatableEdge.cs b/src/QuikGraph/Structures/Edges/SEquatableEdge.cs
index 85d8c5173..ccbfd4811 100644
--- a/src/QuikGraph/Structures/Edges/SEquatableEdge.cs
+++ b/src/QuikGraph/Structures/Edges/SEquatableEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
@@ -23,6 +23,8 @@ public struct SEquatableEdge<TVertex> : IEdge<TVertex>, IEquatable<SEquatableEdg
         /// </summary>
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public SEquatableEdge([NotNull] TVertex source, [NotNull] TVertex target)
         {
             if (source == null)
@@ -50,13 +52,8 @@ public override bool Equals(object obj)
         /// <inheritdoc />
         public bool Equals(SEquatableEdge<TVertex> other)
         {
-            // ReSharper disable ConstantConditionalAccessQualifier
-            // ReSharper disable ConstantNullCoalescingCondition
-            // Justification: Because of struct default constructor
             return EqualityComparer<TVertex>.Default.Equals(Source, other.Source)
                    && EqualityComparer<TVertex>.Default.Equals(Target, other.Target);
-            // ReSharper restore ConstantNullCoalescingCondition
-            // ReSharper restore ConstantConditionalAccessQualifier
         }
 
         /// <inheritdoc />
diff --git a/src/QuikGraph/Structures/Edges/SEquatableTaggedEdge.cs b/src/QuikGraph/Structures/Edges/SEquatableTaggedEdge.cs
index 446f58a3a..01c293bda 100644
--- a/src/QuikGraph/Structures/Edges/SEquatableTaggedEdge.cs
+++ b/src/QuikGraph/Structures/Edges/SEquatableTaggedEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -25,6 +25,8 @@ public struct SEquatableTaggedEdge<TVertex, TTag> : IEdge<TVertex>, ITagged<TTag
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
         /// <param name="tag">Edge tag.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public SEquatableTaggedEdge([NotNull] TVertex source, [NotNull] TVertex target, [CanBeNull] TTag tag)
         {
             if (source == null)
@@ -84,13 +86,8 @@ public override bool Equals(object obj)
         /// <inheritdoc />
         public bool Equals(SEquatableTaggedEdge<TVertex, TTag> other)
         {
-            // ReSharper disable ConstantConditionalAccessQualifier
-            // ReSharper disable ConstantNullCoalescingCondition
-            // Justification: Because of struct default constructor
             return EqualityComparer<TVertex>.Default.Equals(Source, other.Source)
                    && EqualityComparer<TVertex>.Default.Equals(Target, other.Target);
-            // ReSharper restore ConstantNullCoalescingCondition
-            // ReSharper restore ConstantConditionalAccessQualifier
         }
 
         /// <inheritdoc />
diff --git a/src/QuikGraph/Structures/Edges/SReversedEdge.cs b/src/QuikGraph/Structures/Edges/SReversedEdge.cs
index 3de0c23f0..19ae02f49 100644
--- a/src/QuikGraph/Structures/Edges/SReversedEdge.cs
+++ b/src/QuikGraph/Structures/Edges/SReversedEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
@@ -23,6 +23,7 @@ public struct SReversedEdge<TVertex, TEdge> : IEdge<TVertex>, IEquatable<SRevers
         /// Initializes a new instance of the <see cref="SReversedEdge{TVertex, TEdge}"/> struct.
         /// </summary>
         /// <param name="originalEdge">Original edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="originalEdge"/> is <see langword="null"/>.</exception>
         public SReversedEdge([NotNull] TEdge originalEdge)
         {
             if (originalEdge == null)
diff --git a/src/QuikGraph/Structures/Edges/STaggedEdge.cs b/src/QuikGraph/Structures/Edges/STaggedEdge.cs
index 3d2c267ab..b1eb9c009 100644
--- a/src/QuikGraph/Structures/Edges/STaggedEdge.cs
+++ b/src/QuikGraph/Structures/Edges/STaggedEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -25,6 +25,8 @@ public struct STaggedEdge<TVertex, TTag> : IEdge<TVertex>, ITagged<TTag>
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
         /// <param name="tag">Edge tag.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public STaggedEdge([NotNull] TVertex source, [NotNull] TVertex target, [CanBeNull] TTag tag)
         {
             if (source == null)
diff --git a/src/QuikGraph/Structures/Edges/STaggedUndirectedEdge.cs b/src/QuikGraph/Structures/Edges/STaggedUndirectedEdge.cs
index 18aa97229..25c146bab 100644
--- a/src/QuikGraph/Structures/Edges/STaggedUndirectedEdge.cs
+++ b/src/QuikGraph/Structures/Edges/STaggedUndirectedEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Diagnostics;
@@ -25,6 +25,11 @@ public struct STaggedUndirectedEdge<TVertex, TTag> : IUndirectedEdge<TVertex>, I
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
         /// <param name="tag">Edge tag.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException">
+        /// <paramref name="target"/> is not lower than <paramref name="source"/> when using <see cref="M:System.Collections.Generic.Comparer{T}.Default"/>.
+        /// </exception>
         public STaggedUndirectedEdge([NotNull] TVertex source, [NotNull] TVertex target, [CanBeNull] TTag tag)
         {
             if (source == null)
diff --git a/src/QuikGraph/Structures/Edges/SUndirectedEdge.cs b/src/QuikGraph/Structures/Edges/SUndirectedEdge.cs
index d3140a8a7..a36e396bc 100644
--- a/src/QuikGraph/Structures/Edges/SUndirectedEdge.cs
+++ b/src/QuikGraph/Structures/Edges/SUndirectedEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using JetBrains.Annotations;
@@ -22,6 +22,8 @@ public struct SUndirectedEdge<TVertex> : IUndirectedEdge<TVertex>
         /// </summary>
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public SUndirectedEdge([NotNull] TVertex source, [NotNull] TVertex target)
         {
             if (source == null)
diff --git a/src/QuikGraph/Structures/Edges/TaggedEdge.cs b/src/QuikGraph/Structures/Edges/TaggedEdge.cs
index 4a849036f..ac9c0a4f9 100644
--- a/src/QuikGraph/Structures/Edges/TaggedEdge.cs
+++ b/src/QuikGraph/Structures/Edges/TaggedEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -22,6 +22,8 @@ public class TaggedEdge<TVertex, TTag> : Edge<TVertex>, ITagged<TTag>
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
         /// <param name="tag">Edge tag.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public TaggedEdge([NotNull] TVertex source, [NotNull] TVertex target, [CanBeNull] TTag tag)
             : base(source, target)
         {
diff --git a/src/QuikGraph/Structures/Edges/TaggedUndirectedEdge.cs b/src/QuikGraph/Structures/Edges/TaggedUndirectedEdge.cs
index 99c735feb..1b6dea842 100644
--- a/src/QuikGraph/Structures/Edges/TaggedUndirectedEdge.cs
+++ b/src/QuikGraph/Structures/Edges/TaggedUndirectedEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -23,6 +23,8 @@ public class TaggedUndirectedEdge<TVertex, TTag> : UndirectedEdge<TVertex>, ITag
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
         /// <param name="tag">Edge tag.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public TaggedUndirectedEdge([NotNull] TVertex source, [NotNull] TVertex target, [CanBeNull] TTag tag)
             : base(source, target)
         {
diff --git a/src/QuikGraph/Structures/Edges/TermEdge.cs b/src/QuikGraph/Structures/Edges/TermEdge.cs
index 1d3369228..9b590b124 100644
--- a/src/QuikGraph/Structures/Edges/TermEdge.cs
+++ b/src/QuikGraph/Structures/Edges/TermEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using JetBrains.Annotations;
 using QuikGraph.Constants;
@@ -21,6 +21,8 @@ public class TermEdge<TVertex> : ITermEdge<TVertex>
         /// </summary>
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
         public TermEdge([NotNull] TVertex source, [NotNull] TVertex target)
             : this(source, target, 0, 0)
         {
@@ -34,6 +36,10 @@ public TermEdge([NotNull] TVertex source, [NotNull] TVertex target)
         /// <param name="target">The target vertex.</param>
         /// <param name="sourceTerminal">The source terminal.</param>
         /// <param name="targetTerminal">The target terminal.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="sourceTerminal"/> is negative.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="targetTerminal"/> is negative.</exception>
         public TermEdge([NotNull] TVertex source, [NotNull] TVertex target, int sourceTerminal, int targetTerminal)
         {
             if (source == null)
diff --git a/src/QuikGraph/Structures/Edges/UndirectedEdge.cs b/src/QuikGraph/Structures/Edges/UndirectedEdge.cs
index 25989fb4d..bfced45ea 100644
--- a/src/QuikGraph/Structures/Edges/UndirectedEdge.cs
+++ b/src/QuikGraph/Structures/Edges/UndirectedEdge.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JetBrains.Annotations;
@@ -21,6 +21,11 @@ public class UndirectedEdge<TVertex> : IUndirectedEdge<TVertex>
         /// </summary>
         /// <param name="source">The source vertex.</param>
         /// <param name="target">The target vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException">
+        /// <paramref name="target"/> is not lower than <paramref name="source"/> when using <see cref="M:System.Collections.Generic.Comparer{T}.Default"/>.
+        /// </exception>
         public UndirectedEdge([NotNull] TVertex source, [NotNull] TVertex target)
         {
             if (source == null)
diff --git a/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs b/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs
index 704ea7031..138738166 100644
--- a/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/AdjacencyGraph.cs
@@ -393,11 +393,7 @@ public virtual bool AddVerticesAndEdge(TEdge edge)
             return AddEdgeInternal(edge);
         }
 
-        /// <summary>
-        /// Adds a range of edges to the graph.
-        /// </summary>
-        /// <param name="edges">Edges to add.</param>
-        /// <returns>The number of edges that were added.</returns>
+        /// <inheritdoc />
         public int AddVerticesAndEdgeRange(IEnumerable<TEdge> edges)
         {
             if (edges is null)
@@ -627,6 +623,7 @@ public void ClearOutEdges(TVertex vertex)
         /// Clears edges of the given <paramref name="vertex"/>.
         /// </summary>
         /// <param name="vertex">The vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         public void ClearEdges([NotNull] TVertex vertex)
         {
             ClearOutEdges(vertex);
diff --git a/src/QuikGraph/Structures/Graphs/ArrayAdjacencyGraph.cs b/src/QuikGraph/Structures/Graphs/ArrayAdjacencyGraph.cs
index 2ddbc35fd..8010ebe28 100644
--- a/src/QuikGraph/Structures/Graphs/ArrayAdjacencyGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/ArrayAdjacencyGraph.cs
@@ -28,20 +28,21 @@ public sealed class ArrayAdjacencyGraph<TVertex, TEdge> : IVertexAndEdgeListGrap
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayAdjacencyGraph{TVertex,TEdge}"/> class.
         /// </summary>
-        /// <param name="visitedGraph">Graph to visit.</param>
-        public ArrayAdjacencyGraph([NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph)
+        /// <param name="baseGraph">Wrapped graph.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="baseGraph"/> is <see langword="null"/>.</exception>
+        public ArrayAdjacencyGraph([NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> baseGraph)
         {
-            if (visitedGraph is null)
-                throw new ArgumentNullException(nameof(visitedGraph));
+            if (baseGraph is null)
+                throw new ArgumentNullException(nameof(baseGraph));
 
-            AllowParallelEdges = visitedGraph.AllowParallelEdges;
-            _vertexOutEdges = new Dictionary<TVertex, TEdge[]>(visitedGraph.VertexCount);
-            EdgeCount = visitedGraph.EdgeCount;
-            foreach (TVertex vertex in visitedGraph.Vertices)
+            AllowParallelEdges = baseGraph.AllowParallelEdges;
+            _vertexOutEdges = new Dictionary<TVertex, TEdge[]>(baseGraph.VertexCount);
+            EdgeCount = baseGraph.EdgeCount;
+            foreach (TVertex vertex in baseGraph.Vertices)
             {
                 _vertexOutEdges.Add(
                     vertex,
-                    visitedGraph.OutEdges(vertex).ToArray());
+                    baseGraph.OutEdges(vertex).ToArray());
             }
         }
 
diff --git a/src/QuikGraph/Structures/Graphs/ArrayBidirectionalGraph.cs b/src/QuikGraph/Structures/Graphs/ArrayBidirectionalGraph.cs
index f1bba93c4..d03f842ff 100644
--- a/src/QuikGraph/Structures/Graphs/ArrayBidirectionalGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/ArrayBidirectionalGraph.cs
@@ -48,19 +48,20 @@ public InOutEdges(
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayBidirectionalGraph{TVertex,TEdge}"/> class.
         /// </summary>
-        /// <param name="visitedGraph">Graph to visit.</param>
-        public ArrayBidirectionalGraph([NotNull] IBidirectionalGraph<TVertex, TEdge> visitedGraph)
+        /// <param name="baseGraph">Wrapped graph.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="baseGraph"/> is <see langword="null"/>.</exception>
+        public ArrayBidirectionalGraph([NotNull] IBidirectionalGraph<TVertex, TEdge> baseGraph)
         {
-            if (visitedGraph is null)
-                throw new ArgumentNullException(nameof(visitedGraph));
+            if (baseGraph is null)
+                throw new ArgumentNullException(nameof(baseGraph));
 
-            AllowParallelEdges = visitedGraph.AllowParallelEdges;
-            _vertexEdges = new Dictionary<TVertex, InOutEdges>(visitedGraph.VertexCount);
-            EdgeCount = visitedGraph.EdgeCount;
-            foreach (TVertex vertex in visitedGraph.Vertices)
+            AllowParallelEdges = baseGraph.AllowParallelEdges;
+            _vertexEdges = new Dictionary<TVertex, InOutEdges>(baseGraph.VertexCount);
+            EdgeCount = baseGraph.EdgeCount;
+            foreach (TVertex vertex in baseGraph.Vertices)
             {
-                TEdge[] outEdges = visitedGraph.OutEdges(vertex).ToArray();
-                TEdge[] inEdges = visitedGraph.InEdges(vertex).ToArray();
+                TEdge[] outEdges = baseGraph.OutEdges(vertex).ToArray();
+                TEdge[] inEdges = baseGraph.InEdges(vertex).ToArray();
                 _vertexEdges.Add(vertex, new InOutEdges(outEdges, inEdges));
             }
         }
diff --git a/src/QuikGraph/Structures/Graphs/ArrayUndirectedGraph.cs b/src/QuikGraph/Structures/Graphs/ArrayUndirectedGraph.cs
index 560c04298..f0d1d8fb8 100644
--- a/src/QuikGraph/Structures/Graphs/ArrayUndirectedGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/ArrayUndirectedGraph.cs
@@ -31,24 +31,25 @@ public sealed class ArrayUndirectedGraph<TVertex, TEdge> : IUndirectedGraph<TVer
         /// <summary>
         /// Initializes a new instance of the <see cref="ArrayUndirectedGraph{TVertex,TEdge}"/> class.
         /// </summary>
-        /// <param name="visitedGraph">Graph to visit.</param>
-        public ArrayUndirectedGraph([NotNull] IUndirectedGraph<TVertex, TEdge> visitedGraph)
+        /// <param name="baseGraph">Wrapped graph.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="baseGraph"/> is <see langword="null"/>.</exception>
+        public ArrayUndirectedGraph([NotNull] IUndirectedGraph<TVertex, TEdge> baseGraph)
         {
-            if (visitedGraph is null)
-                throw new ArgumentNullException(nameof(visitedGraph));
-
-            AllowParallelEdges = visitedGraph.AllowParallelEdges;
-            EdgeEqualityComparer = visitedGraph.EdgeEqualityComparer;
-            EdgeCount = visitedGraph.EdgeCount;
-            _vertexEdges = new Dictionary<TVertex, TEdge[]>(visitedGraph.VertexCount);
-            foreach (TVertex vertex in visitedGraph.Vertices)
+            if (baseGraph is null)
+                throw new ArgumentNullException(nameof(baseGraph));
+
+            AllowParallelEdges = baseGraph.AllowParallelEdges;
+            EdgeEqualityComparer = baseGraph.EdgeEqualityComparer;
+            EdgeCount = baseGraph.EdgeCount;
+            _vertexEdges = new Dictionary<TVertex, TEdge[]>(baseGraph.VertexCount);
+            foreach (TVertex vertex in baseGraph.Vertices)
             {
                 _vertexEdges.Add(
                     vertex,
-                    visitedGraph.AdjacentEdges(vertex).ToArray());
+                    baseGraph.AdjacentEdges(vertex).ToArray());
             }
 
-            _edges = new List<TEdge>(visitedGraph.Edges);
+            _edges = new List<TEdge>(baseGraph.Edges);
         }
 
         /// <inheritdoc />
@@ -199,10 +200,7 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
 
 #if SUPPORTS_SERIALIZATION && NETSTANDARD2_0
         #region ISerializable
-        
-        /// <summary>
-        /// Constructor used during runtime serialization.
-        /// </summary>
+
         private ArrayUndirectedGraph(SerializationInfo info, StreamingContext context)
         {
             AllowParallelEdges = (bool)info.GetValue("AllowParallelEdges", typeof(bool));
diff --git a/src/QuikGraph/Structures/Graphs/BidirectionalAdapterGraph.cs b/src/QuikGraph/Structures/Graphs/BidirectionalAdapterGraph.cs
index e1438efe2..b59dc5bcb 100644
--- a/src/QuikGraph/Structures/Graphs/BidirectionalAdapterGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/BidirectionalAdapterGraph.cs
@@ -27,6 +27,7 @@ public class BidirectionalAdapterGraph<TVertex, TEdge> : IBidirectionalGraph<TVe
         /// Initializes a new instance of the <see cref="BidirectionalAdapterGraph{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="baseGraph">Wrapped graph.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="baseGraph"/> is <see langword="null"/>.</exception>
         public BidirectionalAdapterGraph([NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> baseGraph)
         {
             _baseGraph = baseGraph ?? throw new ArgumentNullException(nameof(baseGraph));
diff --git a/src/QuikGraph/Structures/Graphs/BidirectionalGraph.cs b/src/QuikGraph/Structures/Graphs/BidirectionalGraph.cs
index 026ff80ae..8cb978449 100644
--- a/src/QuikGraph/Structures/Graphs/BidirectionalGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/BidirectionalGraph.cs
@@ -765,6 +765,9 @@ public void ClearEdges(TVertex vertex)
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <param name="edgeFactory">Factory method to create an edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
+        /// <exception cref="VertexNotFoundException"><paramref name="vertex"/> is not part of the graph.</exception>
         public void MergeVertex(
             [NotNull] TVertex vertex,
             [NotNull, InstantHandle] EdgeFactory<TVertex, TEdge> edgeFactory)
@@ -804,6 +807,8 @@ public void MergeVertex(
         /// </summary>
         /// <param name="vertexPredicate">Predicate to match vertices.</param>
         /// <param name="edgeFactory">Factory method to create an edge.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertexPredicate"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
         public void MergeVerticesIf(
             [NotNull, InstantHandle] VertexPredicate<TVertex> vertexPredicate,
             [NotNull, InstantHandle] EdgeFactory<TVertex, TEdge> edgeFactory)
diff --git a/src/QuikGraph/Structures/Graphs/BidirectionalMatrixGraph.cs b/src/QuikGraph/Structures/Graphs/BidirectionalMatrixGraph.cs
index 073c5704b..fdeeb4de0 100644
--- a/src/QuikGraph/Structures/Graphs/BidirectionalMatrixGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/BidirectionalMatrixGraph.cs
@@ -27,6 +27,7 @@ public class BidirectionalMatrixGraph<TEdge> : IBidirectionalGraph<int, TEdge>,
         /// Initializes a new instance of the <see cref="BidirectionalMatrixGraph{TEdge}"/> class.
         /// </summary>
         /// <param name="vertexCount">Number of vertices.</param>
+        /// <exception cref="T:System.ArgumentException"><paramref name="vertexCount"/> is is negative or equal to 0.</exception>
         public BidirectionalMatrixGraph(int vertexCount)
         {
             if (vertexCount <= 0)
@@ -378,6 +379,7 @@ public void Clear()
         /// <param name="vertex">The vertex.</param>
         /// <param name="predicate">Edge predicate.</param>
         /// <returns>Number of edges removed.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="predicate"/> is <see langword="null"/>.</exception>
         public int RemoveInEdgeIf(int vertex, [NotNull, InstantHandle] EdgePredicate<int, TEdge> predicate)
         {
             if (predicate is null)
@@ -450,6 +452,7 @@ public void ClearEdges(int vertex)
         /// <param name="vertex">The vertex.</param>
         /// <param name="predicate">Predicate to remove edges.</param>
         /// <returns>The number of removed edges.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="predicate"/> is <see langword="null"/>.</exception>
         public int RemoveOutEdgeIf(int vertex, [NotNull, InstantHandle] EdgePredicate<int, TEdge> predicate)
         {
             if (predicate is null)
@@ -503,6 +506,7 @@ public void ClearOutEdges(int vertex)
         #region IMutableEdgeListGraph<int,TEdge>
 
         /// <inheritdoc />
+        /// <exception cref="ParallelEdgeNotAllowedException"><paramref name="edge"/> is already present in graph.</exception>
         public bool AddEdge(TEdge edge)
         {
             if (edge == null)
@@ -593,7 +597,7 @@ protected virtual void OnEdgeRemoved([NotNull] TEdge edge)
         /// <summary>
         /// <see cref="RemoveEdgeIf"/> is not implemented for this kind of graph.
         /// </summary>
-        /// <exception cref="NotSupportedException">This method is not supported.</exception>
+        /// <exception cref="T:System.NotSupportedException">This method is not supported.</exception>
         public int RemoveEdgeIf(EdgePredicate<int, TEdge> predicate)
         {
             throw new NotSupportedException();
diff --git a/src/QuikGraph/Structures/Graphs/ClusteredAdjacencyGraph.cs b/src/QuikGraph/Structures/Graphs/ClusteredAdjacencyGraph.cs
index 8ec3ae9db..5b59e6bac 100644
--- a/src/QuikGraph/Structures/Graphs/ClusteredAdjacencyGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/ClusteredAdjacencyGraph.cs
@@ -30,6 +30,7 @@ public class ClusteredAdjacencyGraph<TVertex, TEdge>
         /// Initializes a new instance of the <see cref="ClusteredAdjacencyGraph{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="wrappedGraph">Graph to wrap.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="wrappedGraph"/> is <see langword="null"/>.</exception>
         public ClusteredAdjacencyGraph([NotNull] AdjacencyGraph<TVertex, TEdge> wrappedGraph)
         {
             Parent = null;
@@ -41,6 +42,7 @@ public ClusteredAdjacencyGraph([NotNull] AdjacencyGraph<TVertex, TEdge> wrappedG
         /// Initializes a new instance of the <see cref="ClusteredAdjacencyGraph{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="parentGraph">Parent graph.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="parentGraph"/> is <see langword="null"/>.</exception>
         public ClusteredAdjacencyGraph([NotNull] ClusteredAdjacencyGraph<TVertex, TEdge> parentGraph)
         {
             Parent = parentGraph ?? throw new ArgumentNullException(nameof(parentGraph));
@@ -231,6 +233,7 @@ public TEdge OutEdge(TVertex vertex, int index)
         /// </summary>
         /// <param name="vertex">Vertex to add.</param>
         /// <returns>True if the vertex was added, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         public virtual bool AddVertex([NotNull] TVertex vertex)
         {
             if (vertex == null)
@@ -250,6 +253,9 @@ public virtual bool AddVertex([NotNull] TVertex vertex)
         /// </summary>
         /// <param name="vertices">Vertices to add.</param>
         /// <returns>The number of vertex added.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="vertices"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
         public virtual int AddVertexRange([NotNull, ItemNotNull] IEnumerable<TVertex> vertices)
         {
             if (vertices is null)
@@ -296,6 +302,7 @@ private void RemoveVertexInternal([NotNull] TVertex vertex)
         /// </summary>
         /// <param name="vertex">Vertex to remove.</param>
         /// <returns>True if the vertex was removed, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         public virtual bool RemoveVertex([NotNull] TVertex vertex)
         {
             if (vertex == null)
@@ -314,6 +321,7 @@ public virtual bool RemoveVertex([NotNull] TVertex vertex)
         /// </summary>
         /// <param name="predicate">Predicate to check on each vertex.</param>
         /// <returns>The number of vertex removed.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="predicate"/> is <see langword="null"/>.</exception>
         public int RemoveVertexIf([NotNull, InstantHandle] VertexPredicate<TVertex> predicate)
         {
             if (predicate is null)
@@ -335,6 +343,7 @@ public int RemoveVertexIf([NotNull, InstantHandle] VertexPredicate<TVertex> pred
         /// </summary>
         /// <param name="edge">The edge to add.</param>
         /// <returns>True if the edge was added, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         public virtual bool AddVerticesAndEdge([NotNull] TEdge edge)
         {
             if (edge == null)
@@ -350,6 +359,9 @@ public virtual bool AddVerticesAndEdge([NotNull] TEdge edge)
         /// </summary>
         /// <param name="edges">Edges to add.</param>
         /// <returns>The number of edges added.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="edges"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
         public int AddVerticesAndEdgeRange([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
         {
             if (edges is null)
@@ -366,6 +378,7 @@ public int AddVerticesAndEdgeRange([NotNull, ItemNotNull] IEnumerable<TEdge> edg
         /// </summary>
         /// <param name="edge">An edge.</param>
         /// <returns>True if the edge was added, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         public virtual bool AddEdge([NotNull] TEdge edge)
         {
             if (edge == null)
@@ -383,6 +396,9 @@ public virtual bool AddEdge([NotNull] TEdge edge)
         /// </summary>
         /// <param name="edges">Edges to add.</param>
         /// <returns>The number of edges successfully added to this graph.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="edges"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
         public int AddEdgeRange([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
         {
             if (edges is null)
@@ -425,6 +441,7 @@ private void RemoveEdgeInternal([NotNull] TEdge edge)
         /// </summary>
         /// <param name="edge">Edge to remove.</param>
         /// <returns>True if the <paramref name="edge"/> was successfully removed, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         public virtual bool RemoveEdge([NotNull] TEdge edge)
         {
             if (edge == null)
@@ -443,6 +460,7 @@ public virtual bool RemoveEdge([NotNull] TEdge edge)
         /// </summary>
         /// <param name="predicate">Predicate to check if an edge should be removed.</param>
         /// <returns>The number of edges removed.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="predicate"/> is <see langword="null"/>.</exception>
         public int RemoveEdgeIf([NotNull, InstantHandle] EdgePredicate<TVertex, TEdge> predicate)
         {
             if (predicate is null)
@@ -466,6 +484,8 @@ public int RemoveEdgeIf([NotNull, InstantHandle] EdgePredicate<TVertex, TEdge> p
         /// <param name="vertex">The vertex.</param>
         /// <param name="predicate">Predicate to remove edges.</param>
         /// <returns>The number of removed edges.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="predicate"/> is <see langword="null"/>.</exception>
         public int RemoveOutEdgeIf([NotNull] TVertex vertex, [NotNull, InstantHandle] EdgePredicate<TVertex, TEdge> predicate)
         {
             if (vertex == null)
@@ -483,6 +503,7 @@ public int RemoveOutEdgeIf([NotNull] TVertex vertex, [NotNull, InstantHandle] Ed
         /// Clears the out-edges of the given <paramref name="vertex"/>
         /// </summary>
         /// <param name="vertex">The vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         public void ClearOutEdges([NotNull] TVertex vertex)
         {
             if (vertex == null)
diff --git a/src/QuikGraph/Structures/Graphs/CompressedSparseRowGraph.cs b/src/QuikGraph/Structures/Graphs/CompressedSparseRowGraph.cs
index 2a8ed4203..9bc6a6738 100644
--- a/src/QuikGraph/Structures/Graphs/CompressedSparseRowGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/CompressedSparseRowGraph.cs
@@ -55,31 +55,32 @@ private CompressedSparseRowGraph(
         }
 
         /// <summary>
-        /// Converts the given <paramref name="visitedGraph"/> to a <see cref="CompressedSparseRowGraph{TVertex}"/>.
+        /// Converts the given <paramref name="graph"/> to a <see cref="CompressedSparseRowGraph{TVertex}"/>.
         /// </summary>
-        /// <param name="visitedGraph">Graph to convert.</param>
+        /// <param name="graph">Graph to convert.</param>
         /// <typeparam name="TEdge">Edge type.</typeparam>
         /// <returns>A corresponding <see cref="CompressedSparseRowGraph{TVertex}"/>.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [NotNull]
         public static CompressedSparseRowGraph<TVertex> FromGraph<TEdge>(
-            [NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> visitedGraph)
+            [NotNull] IVertexAndEdgeListGraph<TVertex, TEdge> graph)
             where TEdge : IEdge<TVertex>
         {
-            if (visitedGraph is null)
-                throw new ArgumentNullException(nameof(visitedGraph));
+            if (graph is null)
+                throw new ArgumentNullException(nameof(graph));
 
-            var outEdgeStartRanges = new Dictionary<TVertex, Range>(visitedGraph.VertexCount);
-            var outEdges = new TVertex[visitedGraph.EdgeCount];
+            var outEdgeStartRanges = new Dictionary<TVertex, Range>(graph.VertexCount);
+            var outEdges = new TVertex[graph.EdgeCount];
 
             int start = 0;
             int index = 0;
-            foreach (TVertex vertex in visitedGraph.Vertices)
+            foreach (TVertex vertex in graph.Vertices)
             {
-                int end = start + visitedGraph.OutDegree(vertex);
+                int end = start + graph.OutDegree(vertex);
                 var range = new Range(start, end);
                 outEdgeStartRanges.Add(vertex, range);
 
-                foreach (TEdge edge in visitedGraph.OutEdges(vertex))
+                foreach (TEdge edge in graph.OutEdges(vertex))
                 {
                     outEdges[index++] = edge.Target;
                 }
diff --git a/src/QuikGraph/Structures/Graphs/DelegateBidirectionalIncidenceGraph.cs b/src/QuikGraph/Structures/Graphs/DelegateBidirectionalIncidenceGraph.cs
index 93458cbff..1b1eefb85 100644
--- a/src/QuikGraph/Structures/Graphs/DelegateBidirectionalIncidenceGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/DelegateBidirectionalIncidenceGraph.cs
@@ -23,6 +23,8 @@ public class DelegateBidirectionalIncidenceGraph<TVertex, TEdge> : DelegateIncid
         /// Note that get of edges is delegated so you may have bugs related
         /// to parallel edges due to the delegated implementation.
         /// </param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="tryGetOutEdges"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="tryGetInEdges"/> is <see langword="null"/>.</exception>
         public DelegateBidirectionalIncidenceGraph(
             [NotNull] TryFunc<TVertex, IEnumerable<TEdge>> tryGetOutEdges,
             [NotNull] TryFunc<TVertex, IEnumerable<TEdge>> tryGetInEdges,
diff --git a/src/QuikGraph/Structures/Graphs/DelegateImplicitGraph.cs b/src/QuikGraph/Structures/Graphs/DelegateImplicitGraph.cs
index f1b5d437a..5be8af051 100644
--- a/src/QuikGraph/Structures/Graphs/DelegateImplicitGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/DelegateImplicitGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -22,6 +22,7 @@ public class DelegateImplicitGraph<TVertex, TEdge> : IImplicitGraph<TVertex, TEd
         /// Note that get of edges is delegated so you may have bugs related
         /// to parallel edges due to the delegated implementation.
         /// </param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="tryGetOutEdges"/> is <see langword="null"/>.</exception>
         public DelegateImplicitGraph(
             [NotNull] TryFunc<TVertex, IEnumerable<TEdge>> tryGetOutEdges,
             bool allowParallelEdges = true)
diff --git a/src/QuikGraph/Structures/Graphs/DelegateImplicitUndirectedGraph.cs b/src/QuikGraph/Structures/Graphs/DelegateImplicitUndirectedGraph.cs
index d3a5a021a..c02c2a055 100644
--- a/src/QuikGraph/Structures/Graphs/DelegateImplicitUndirectedGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/DelegateImplicitUndirectedGraph.cs
@@ -22,6 +22,7 @@ public class DelegateImplicitUndirectedGraph<TVertex, TEdge> : IImplicitUndirect
         /// Note that get of edges is delegated so you may have bugs related
         /// to parallel edges due to the delegated implementation.
         /// </param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="tryGetAdjacentEdges"/> is <see langword="null"/>.</exception>
         public DelegateImplicitUndirectedGraph(
             [NotNull] TryFunc<TVertex, IEnumerable<TEdge>> tryGetAdjacentEdges,
             bool allowParallelEdges = true)
@@ -141,7 +142,9 @@ internal virtual bool TryGetAdjacentEdgesInternal([NotNull] TVertex vertex, out
         /// <param name="vertex">The vertex.</param>
         /// <param name="edges">Edges found, otherwise null.</param>
         /// <returns>True if <paramref name="vertex"/> was found or/and edges were found, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
+        [ContractAnnotation("=> true, edges:notnull;=> false, edges:null")]
         public bool TryGetAdjacentEdges([NotNull] TVertex vertex, out IEnumerable<TEdge> edges)
         {
             return TryGetAdjacentEdgesInternal(vertex, out edges);
diff --git a/src/QuikGraph/Structures/Graphs/DelegateIncidenceGraph.cs b/src/QuikGraph/Structures/Graphs/DelegateIncidenceGraph.cs
index ff9ef1c98..bc24007cd 100644
--- a/src/QuikGraph/Structures/Graphs/DelegateIncidenceGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/DelegateIncidenceGraph.cs
@@ -22,6 +22,7 @@ public class DelegateIncidenceGraph<TVertex, TEdge> : DelegateImplicitGraph<TVer
         /// Note that get of edges is delegated so you may have bugs related
         /// to parallel edges due to the delegated implementation.
         /// </param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="tryGetOutEdges"/> is <see langword="null"/>.</exception>
         public DelegateIncidenceGraph(
             [NotNull] TryFunc<TVertex, IEnumerable<TEdge>> tryGetOutEdges,
             bool allowParallelEdges = true)
diff --git a/src/QuikGraph/Structures/Graphs/DelegateUndirectedGraph.cs b/src/QuikGraph/Structures/Graphs/DelegateUndirectedGraph.cs
index f65883638..fcd27be8b 100644
--- a/src/QuikGraph/Structures/Graphs/DelegateUndirectedGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/DelegateUndirectedGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -25,6 +25,8 @@ public class DelegateUndirectedGraph<TVertex, TEdge> : DelegateImplicitUndirecte
         /// Note that get of edges is delegated so you may have bugs related
         /// to parallel edges due to the delegated implementation.
         /// </param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertices"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="tryGetAdjacentEdges"/> is <see langword="null"/>.</exception>
         public DelegateUndirectedGraph(
             [NotNull, ItemNotNull] IEnumerable<TVertex> vertices,
             [NotNull] TryFunc<TVertex, IEnumerable<TEdge>> tryGetAdjacentEdges,
diff --git a/src/QuikGraph/Structures/Graphs/DelegateVertexAndEdgeListGraph.cs b/src/QuikGraph/Structures/Graphs/DelegateVertexAndEdgeListGraph.cs
index 0bcbdcb45..e36f6f62d 100644
--- a/src/QuikGraph/Structures/Graphs/DelegateVertexAndEdgeListGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/DelegateVertexAndEdgeListGraph.cs
@@ -25,6 +25,8 @@ public class DelegateVertexAndEdgeListGraph<TVertex, TEdge> : DelegateIncidenceG
         /// Note that get of edges is delegated so you may have bugs related
         /// to parallel edges due to the delegated implementation.
         /// </param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertices"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="tryGetOutEdges"/> is <see langword="null"/>.</exception>
         public DelegateVertexAndEdgeListGraph(
             [NotNull, ItemNotNull] IEnumerable<TVertex> vertices,
             [NotNull] TryFunc<TVertex, IEnumerable<TEdge>> tryGetOutEdges,
diff --git a/src/QuikGraph/Structures/Graphs/EdgeListGraph.cs b/src/QuikGraph/Structures/Graphs/EdgeListGraph.cs
index 0ff275fbd..5640164b7 100644
--- a/src/QuikGraph/Structures/Graphs/EdgeListGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/EdgeListGraph.cs
@@ -135,6 +135,7 @@ private bool ContainsEdge(TVertex source, TVertex target)
         /// </summary>
         /// <param name="edge">The edge to add.</param>
         /// <returns>True if the edge was added, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edge"/> is <see langword="null"/>.</exception>
         public bool AddVerticesAndEdge([NotNull] TEdge edge)
         {
             return AddEdge(edge);
@@ -145,6 +146,9 @@ public bool AddVerticesAndEdge([NotNull] TEdge edge)
         /// </summary>
         /// <param name="edges">Edges to add.</param>
         /// <returns>The number of edges added.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="edges"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
         public int AddVerticesAndEdgeRange([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
         {
             if (edges is null)
diff --git a/src/QuikGraph/Structures/Graphs/ReversedBidirectionalGraph.cs b/src/QuikGraph/Structures/Graphs/ReversedBidirectionalGraph.cs
index ed98960c3..df0cbfc55 100644
--- a/src/QuikGraph/Structures/Graphs/ReversedBidirectionalGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/ReversedBidirectionalGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -23,6 +23,7 @@ public sealed class ReversedBidirectionalGraph<TVertex, TEdge> : IBidirectionalG
         /// Initializes a new instance of the <see cref="ReversedBidirectionalGraph{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="originalGraph">Original graph to reverse.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="originalGraph"/> is <see langword="null"/>.</exception>
         public ReversedBidirectionalGraph([NotNull] IBidirectionalGraph<TVertex, TEdge> originalGraph)
         {
             OriginalGraph = originalGraph ?? throw new ArgumentNullException(nameof(originalGraph));
diff --git a/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs b/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs
index b6f02e74d..b84fc621a 100644
--- a/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/UndirectedBidirectionalGraph.cs
@@ -33,6 +33,7 @@ public sealed class UndirectedBidirectionalGraph<TVertex, TEdge> : IUndirectedGr
         /// Initializes a new instance of the <see cref="UndirectedBidirectionalGraph{TVertex,TEdge}"/> class.
         /// </summary>
         /// <param name="originalGraph">Bidirectional graph.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="originalGraph"/> is <see langword="null"/>.</exception>
         public UndirectedBidirectionalGraph([NotNull] IBidirectionalGraph<TVertex, TEdge> originalGraph)
         {
             OriginalGraph = originalGraph ?? throw new ArgumentNullException(nameof(originalGraph));
@@ -163,7 +164,7 @@ public bool IsAdjacentEdgesEmpty(TVertex vertex)
         /// <summary>
         /// <see cref="AdjacentEdge"/> is not supported for this kind of graph.
         /// </summary>
-        /// <exception cref="NotSupportedException">This operation is not supported.</exception>
+        /// <exception cref="T:System.NotSupportedException">This operation is not supported.</exception>
         public TEdge AdjacentEdge(TVertex vertex, int index)
         {
             throw new NotSupportedException();
@@ -194,10 +195,7 @@ public bool TryGetEdge(TVertex source, TVertex target, out TEdge edge)
 
 #if SUPPORTS_SERIALIZATION && NETSTANDARD2_0
         #region ISerializable
-        
-        /// <summary>
-        /// Constructor used during runtime serialization.
-        /// </summary>
+
         private UndirectedBidirectionalGraph(SerializationInfo info, StreamingContext context)
             : this((IBidirectionalGraph<TVertex, TEdge>)info.GetValue("OriginalGraph", typeof(IBidirectionalGraph<TVertex, TEdge>)))
         {
diff --git a/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs b/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs
index 8e54fcb50..72b8b0f35 100644
--- a/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/UndirectedGraph.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -64,6 +64,7 @@ public UndirectedGraph(bool allowParallelEdges)
         /// </summary>
         /// <param name="allowParallelEdges">Indicates if parallel edges are allowed.</param>
         /// <param name="edgeEqualityComparer">Equality comparer to use to compare edges.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeEqualityComparer"/> is <see langword="null"/>.</exception>
         public UndirectedGraph(bool allowParallelEdges, [NotNull] EdgeEqualityComparer<TVertex> edgeEqualityComparer)
         {
             AllowParallelEdges = allowParallelEdges;
@@ -116,6 +117,7 @@ private delegate void ReorderVertices(
         /// </summary>
         /// <param name="vertex">Vertex to get adjacent ones.</param>
         /// <returns>Set of adjacent vertices.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull, ItemNotNull]
         public IEnumerable<TVertex> AdjacentVertices([NotNull] TVertex vertex)
@@ -485,6 +487,7 @@ public void ClearAdjacentEdges(TVertex vertex)
         /// Clears edges of the given <paramref name="vertex"/>.
         /// </summary>
         /// <param name="vertex">The vertex.</param>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         public void ClearEdges([NotNull] TVertex vertex)
         {
             ClearAdjacentEdges(vertex);
@@ -680,6 +683,9 @@ private int RemoveEdgesInternal([NotNull, ItemNotNull] ICollection<TEdge> edgesT
         /// </summary>
         /// <param name="edges">Edges to remove.</param>
         /// <returns>The number of removed edges.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="edges"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
         public int RemoveEdges([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
         {
             if (edges is null)
diff --git a/tests/QuikGraph.Serialization.Tests/DirectedGraphMLExtensionsTests.cs b/tests/QuikGraph.Serialization.Tests/DirectedGraphMLExtensionsTests.cs
index 31fdf3bc3..65bde47cc 100644
--- a/tests/QuikGraph.Serialization.Tests/DirectedGraphMLExtensionsTests.cs
+++ b/tests/QuikGraph.Serialization.Tests/DirectedGraphMLExtensionsTests.cs
@@ -299,7 +299,7 @@ public void ToDirectedGraphML_WithColors()
             var random = new Random(123456);
             foreach (AdjacencyGraph<string, Edge<string>> graph in TestGraphFactory.GetAdjacencyGraphs_All())
             {
-                Dictionary<string, GraphColor> vertexColors = graph.Vertices.ToDictionary(
+                Dictionary<string, GraphColor> verticesColors = graph.Vertices.ToDictionary(
                     vertex => vertex,
                     _ => (GraphColor)random.Next(0, 3));
 
@@ -307,7 +307,7 @@ public void ToDirectedGraphML_WithColors()
                     vertex =>
                     {
                         Assert.IsNotNull(vertex);
-                        return vertexColors[vertex];
+                        return verticesColors[vertex];
                     });
                 Assert.IsNotNull(graph);
 
@@ -316,7 +316,7 @@ public void ToDirectedGraphML_WithColors()
                 foreach (DirectedGraphNode node in directedGraph.Nodes)
                 {
                     Assert.AreEqual(
-                        ColorToStringColor(vertexColors[node.Id]),
+                        ColorToStringColor(verticesColors[node.Id]),
                         node.Background);
                 }
             }
diff --git a/tests/QuikGraph.Serialization.Tests/GraphMLSerializerTests.cs b/tests/QuikGraph.Serialization.Tests/GraphMLSerializerTests.cs
index 1244dbff3..0d2fa0c7c 100644
--- a/tests/QuikGraph.Serialization.Tests/GraphMLSerializerTests.cs
+++ b/tests/QuikGraph.Serialization.Tests/GraphMLSerializerTests.cs
@@ -251,7 +251,7 @@ public void SerializeToGraphML_Throws()
         [Test]
         public void SerializeToGraphML_Throws_InvalidData()
         {
-            AssertSerializationFail<TestGraphArrayDefaultValue, NotImplementedException>(new TestGraphArrayDefaultValue());
+            AssertSerializationFail<TestGraphArrayDefaultValue, NotSupportedException>(new TestGraphArrayDefaultValue());
             AssertSerializationFail<TestGraphNoGetter, TypeInitializationException>(new TestGraphNoGetter());
             AssertSerializationFail<TestGraphNullDefaultValue, TypeInitializationException>(new TestGraphNullDefaultValue());
             AssertSerializationFail<TestGraphWrongDefaultValue, TypeInitializationException>(new TestGraphWrongDefaultValue());
diff --git a/tests/QuikGraph.Tests/Algorithms/RandomGraphFactoryTests.cs b/tests/QuikGraph.Tests/Algorithms/RandomGraphFactoryTests.cs
index 6d36632b2..c5bb8f54c 100644
--- a/tests/QuikGraph.Tests/Algorithms/RandomGraphFactoryTests.cs
+++ b/tests/QuikGraph.Tests/Algorithms/RandomGraphFactoryTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using NUnit.Framework;
 using QuikGraph.Algorithms;
@@ -126,8 +126,21 @@ public void Create()
         {
             var graph = new AdjacencyGraph<int , EquatableEdge<int>>();
 
-            // With self edge
+            // With isolated vertices only
             int v = 0;
+            RandomGraphFactory.Create(
+                graph,
+                () => ++v,
+                (source, target) => new EquatableEdge<int>(source, target),
+                new Random(123456),
+                2,
+                0,
+                true);
+            AssertHasVertices(graph, new[] { 1, 2 });
+            AssertNoEdge(graph);
+
+            // With self edge
+            v = 0;
             RandomGraphFactory.Create(
                 graph,
                 () => ++v,
@@ -374,13 +387,6 @@ public void Create_Throws()
                     (source, target) => new Edge<int>(source, target),
                     random,
                     1, -1, false));
-            Assert.Throws<ArgumentOutOfRangeException>(
-                () => RandomGraphFactory.Create(
-                    graph,
-                    () => 1,
-                    (source, target) => new Edge<int>(source, target),
-                    random,
-                    1, 0, false));
             Assert.Throws<ArgumentOutOfRangeException>(
                 () => RandomGraphFactory.Create(
                     graph,
@@ -402,8 +408,21 @@ public void Create_Undirected()
         {
             var graph = new UndirectedGraph<int, EquatableEdge<int>>();
 
-            // With self edge
+            // With isolated vertices only
             int v = 0;
+            RandomGraphFactory.Create(
+                graph,
+                () => ++v,
+                (source, target) => new EquatableEdge<int>(source, target),
+                new Random(123456),
+                2,
+                0,
+                true);
+            AssertHasVertices(graph, new[] { 1, 2 });
+            AssertNoEdge(graph);
+
+            // With self edge
+            v = 0;
             RandomGraphFactory.Create(
                 graph,
                 () => ++v,
@@ -650,13 +669,6 @@ public void Create_Undirected_Throws()
                     (source, target) => new Edge<int>(source, target),
                     random,
                     1, -1, false));
-            Assert.Throws<ArgumentOutOfRangeException>(
-                () => RandomGraphFactory.Create(
-                    graph,
-                    () => 1,
-                    (source, target) => new Edge<int>(source, target),
-                    random,
-                    1, 0, false));
             Assert.Throws<ArgumentOutOfRangeException>(
                 () => RandomGraphFactory.Create(
                     graph,
diff --git a/tests/QuikGraph.Tests/Algorithms/ShortestPath/YenShortestPathsAlgorithmTests.cs b/tests/QuikGraph.Tests/Algorithms/ShortestPath/YenShortestPathsAlgorithmTests.cs
index 54a2fc3c9..895df5296 100644
--- a/tests/QuikGraph.Tests/Algorithms/ShortestPath/YenShortestPathsAlgorithmTests.cs
+++ b/tests/QuikGraph.Tests/Algorithms/ShortestPath/YenShortestPathsAlgorithmTests.cs
@@ -17,6 +17,7 @@ public void Constructor()
             Func<EquatableTaggedEdge<int, double>, double> Weights = _ => 1.0;
 
             var graph = new AdjacencyGraph<int, EquatableTaggedEdge<int, double>>();
+            graph.AddVertexRange(new[] { 1, 2 });
             // ReSharper disable ObjectCreationAsStatement
             Assert.DoesNotThrow(() => new YenShortestPathsAlgorithm<int>(graph, 1, 2, int.MaxValue));
             Assert.DoesNotThrow(() => new YenShortestPathsAlgorithm<int>(graph, 1, 2, 10));
@@ -30,10 +31,26 @@ public void Constructor_Throws()
         {
             // ReSharper disable ObjectCreationAsStatement
             // ReSharper disable AssignNullToNotNullAttribute
-            var graph = new AdjacencyGraph<TestVertex, EquatableTaggedEdge<TestVertex, double>>();
             var vertex1 = new TestVertex("1");
             var vertex2 = new TestVertex("2");
 
+            var graph = new AdjacencyGraph<TestVertex, EquatableTaggedEdge<TestVertex, double>>();
+            Assert.Throws<ArgumentException>(
+                () => new YenShortestPathsAlgorithm<TestVertex>(graph, vertex1, vertex2, int.MaxValue));
+
+            graph = new AdjacencyGraph<TestVertex, EquatableTaggedEdge<TestVertex, double>>();
+            graph.AddVertex(vertex1);
+            Assert.Throws<ArgumentException>(
+                () => new YenShortestPathsAlgorithm<TestVertex>(graph, vertex1, vertex2, int.MaxValue));
+
+            graph = new AdjacencyGraph<TestVertex, EquatableTaggedEdge<TestVertex, double>>();
+            graph.AddVertex(vertex2);
+            Assert.Throws<ArgumentException>(
+                () => new YenShortestPathsAlgorithm<TestVertex>(graph, vertex1, vertex2, int.MaxValue));
+
+            graph = new AdjacencyGraph<TestVertex, EquatableTaggedEdge<TestVertex, double>>();
+            graph.AddVertexRange(new[] { vertex1, vertex2 });
+
             Assert.Throws<ArgumentNullException>(
                 () => new YenShortestPathsAlgorithm<TestVertex>(null, vertex1, vertex2, int.MaxValue));
             Assert.Throws<ArgumentNullException>(
@@ -58,32 +75,20 @@ public void Constructor_Throws()
         }
 
         /// <summary>
-        /// Attempt to use non existing vertices.
-        /// </summary>
-        [Test]
-        public void EmptyGraph()
-        {
-            var graph = new AdjacencyGraph<char, EquatableTaggedEdge<char, double>>(true);
-
-            var algorithm = new YenShortestPathsAlgorithm<char>(graph, '1', '5', 10);
-            // ReSharper disable once ReturnValueOfPureMethodIsNotUsed
-            Assert.Throws<NoPathFoundException>(() => algorithm.Execute());
-        }
-
-        /// <summary>
-        /// Attempt to use for graph that only have one vertex.
+        /// Attempt to use for simple graph.
         /// Expecting that Dijkstra’s algorithm couldn't find any ways.
         /// </summary>
         [Test]
-        public void OneVertexGraph()
+        public void SimpleNoPathGraph()
         {
             var graph = new AdjacencyGraph<char, EquatableTaggedEdge<char, double>>(true);
-            graph.AddVertexRange("1");
+            graph.AddVertex('1');
 
             // ReSharper disable ReturnValueOfPureMethodIsNotUsed
             var algorithm = new YenShortestPathsAlgorithm<char>(graph, '1', '1', 10);
             Assert.Throws<NoPathFoundException>(() => algorithm.Execute());
 
+            graph.AddVertex('2');
             algorithm = new YenShortestPathsAlgorithm<char>(graph, '1', '2', 10);
             Assert.Throws<NoPathFoundException>(() => algorithm.Execute());
             // ReSharper restore ReturnValueOfPureMethodIsNotUsed

From 0763f12260fddffb696d7b1a7bb7b48c73a603b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Mon, 18 Oct 2021 00:43:22 +0200
Subject: [PATCH 07/39] Remove misleading duplicated code.

---
 .../CyclePoppingRandomTreeAlgorithm.cs        | 131 ++++++++----------
 1 file changed, 61 insertions(+), 70 deletions(-)

diff --git a/src/QuikGraph/Algorithms/RandomWalks/CyclePoppingRandomTreeAlgorithm.cs b/src/QuikGraph/Algorithms/RandomWalks/CyclePoppingRandomTreeAlgorithm.cs
index 8e9a5eecf..d3b797578 100644
--- a/src/QuikGraph/Algorithms/RandomWalks/CyclePoppingRandomTreeAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/RandomWalks/CyclePoppingRandomTreeAlgorithm.cs
@@ -191,14 +191,14 @@ protected override void InternalCompute()
                 ThrowIfCancellationRequested();
 
                 // First pass: exploration
-                ExplorationPass(vertex);
+                Explore(vertex);
 
                 // Second pass: coloration
-                ColorizationPass(vertex);
+                Colorize(vertex);
             }
         }
 
-        private void ExplorationPass([NotNull] TVertex vertex)
+        private void Explore([NotNull] TVertex vertex)
         {
             Debug.Assert(vertex != null);
 
@@ -213,7 +213,39 @@ private void ExplorationPass([NotNull] TVertex vertex)
             }
         }
 
-        private void ColorizationPass([NotNull] TVertex vertex)
+        [Pure]
+        private bool Explore(double eps, [NotNull] TVertex vertex, ref int numRoots)
+        {
+            Debug.Assert(vertex != null);
+
+            var visited = new Dictionary<TEdge, int>();
+            TVertex current = vertex;
+            while (NotInTree(current))
+            {
+                if (Chance(eps))
+                {
+                    ClearTree(current);
+                    SetInTree(current);
+                    ++numRoots;
+                    if (numRoots > 1)
+                        return false;
+                }
+                else
+                {
+                    if (!TryGetSuccessor(visited, current, out TEdge successor))
+                        break;
+
+                    visited[successor] = 0;
+                    Tree(current, successor);
+                    if (!TryGetNextInTree(current, out current))
+                        break;
+                }
+            }
+
+            return true;
+        }
+
+        private void Colorize([NotNull] TVertex vertex)
         {
             Debug.Assert(vertex != null);
 
@@ -228,6 +260,7 @@ private void ColorizationPass([NotNull] TVertex vertex)
 
         #endregion
 
+        [Pure]
         private bool NotInTree([NotNull] TVertex vertex)
         {
             return VerticesColors[vertex] == GraphColor.White;
@@ -239,6 +272,7 @@ private void SetInTree([NotNull] TVertex vertex)
             OnFinishVertex(vertex);
         }
 
+        [Pure]
         private bool TryGetSuccessor([NotNull] IDictionary<TEdge, int> visited, [NotNull] TVertex vertex, out TEdge successor)
         {
             IEnumerable<TEdge> outEdges = VisitedGraph.OutEdges(vertex);
@@ -255,6 +289,7 @@ private void Tree([NotNull] TVertex vertex, [NotNull] TEdge next)
             OnTreeEdge(next);
         }
 
+        [Pure]
         private bool TryGetNextInTree([NotNull] TVertex vertex, out TVertex next)
         {
             if (Successors.TryGetValue(vertex, out TEdge nextEdge))
@@ -267,6 +302,7 @@ private bool TryGetNextInTree([NotNull] TVertex vertex, out TVertex next)
             return false;
         }
 
+        [Pure]
         private bool Chance(double eps)
         {
             return Rand.NextDouble() <= eps;
@@ -278,6 +314,27 @@ private void ClearTree([NotNull] TVertex vertex)
             OnClearTreeVertex(vertex);
         }
 
+        [Pure]
+        private bool Attempt(double epsilon)
+        {
+            Initialize();
+            int numRoots = 0;
+
+            foreach (TVertex vertex in VisitedGraph.Vertices)
+            {
+                ThrowIfCancellationRequested();
+
+                // First pass: exploration
+                if (!Explore(epsilon, vertex, ref numRoots))
+                    return false;
+
+                // Second pass: coloration
+                Colorize(vertex);
+            }
+
+            return true;
+        }
+
         /// <summary>
         /// Runs a random tree generation starting at <paramref name="root"/> vertex.
         /// </summary>
@@ -308,71 +365,5 @@ public void RandomTree()
                 success = Attempt(epsilon);
             } while (!success);
         }
-
-        [Pure]
-        private bool Attempt(double epsilon)
-        {
-            Initialize();
-            int numRoots = 0;
-
-            foreach (TVertex vertex in VisitedGraph.Vertices)
-            {
-                ThrowIfCancellationRequested();
-
-                // First pass: exploration
-                if (!Explore(epsilon, vertex, ref numRoots))
-                    return false;
-
-                // Second pass: coloration
-                Colorize(vertex);
-            }
-
-            return true;
-        }
-
-        [Pure]
-        private bool Explore(double eps, [NotNull] TVertex vertex, ref int numRoots)
-        {
-            Debug.Assert(vertex != null);
-
-            var visited = new Dictionary<TEdge, int>();
-            TVertex current = vertex;
-            while (NotInTree(current))
-            {
-                if (Chance(eps))
-                {
-                    ClearTree(current);
-                    SetInTree(current);
-                    ++numRoots;
-                    if (numRoots > 1)
-                        return false;
-                }
-                else
-                {
-                    if (!TryGetSuccessor(visited, current, out TEdge successor))
-                        break;
-
-                    visited[successor] = 0;
-                    Tree(current, successor);
-                    if (!TryGetNextInTree(current, out current))
-                        break;
-                }
-            }
-
-            return true;
-        }
-
-        private void Colorize([NotNull] TVertex vertex)
-        {
-            Debug.Assert(vertex != null);
-
-            TVertex current = vertex;
-            while (NotInTree(current))
-            {
-                SetInTree(current);
-                if (!TryGetNextInTree(current, out current))
-                    break;
-            }
-        }
     }
 }
\ No newline at end of file

From be43081e8e9afb22b0f6410e0e96460adb7e56de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Mon, 25 Oct 2021 00:37:08 +0200
Subject: [PATCH 08/39] Add Funding.yml file.

---
 .github/FUNDING.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..b4a246a7c
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [KeRNeLith]
\ No newline at end of file

From 4a32d16d4b579277a4eb14cc3018afd0ca2494ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sun, 24 Oct 2021 16:19:09 +0200
Subject: [PATCH 09/39] Move to langword null for some reference to nullity in
 documentation comments.

---
 src/QuikGraph.Graphviz/GraphvizAlgorithm.cs               | 2 +-
 src/QuikGraph.Serialization/XmlWriterExtensions.cs        | 2 +-
 .../Algorithms/MaximumFlow/GraphBalancingAlgorithm.cs     | 8 ++++----
 .../Algorithms/MaximumFlow/MaximumFlowAlgorithmBase.cs    | 6 +++---
 src/QuikGraph/Algorithms/RandomWalks/IEdgeChain.cs        | 4 ++--
 .../Algorithms/RandomWalks/WeightedMarkovEdgeChainBase.cs | 4 ++--
 .../HoffmanPavleyRankedShortestPathAlgorithm.cs           | 2 +-
 src/QuikGraph/Algorithms/RootedAlgorithmBase.cs           | 2 +-
 src/QuikGraph/Algorithms/RootedSearchAlgorithmBase.cs     | 2 +-
 .../ShortestPath/FloydWarshallAllShortestPathAlgorithm.cs | 2 +-
 src/QuikGraph/Algorithms/TSP/TSP.cs                       | 2 +-
 .../TopologicalSort/TopologicalSortAlgorithm.cs           | 2 +-
 src/QuikGraph/Collections/FibonacciQueue.cs               | 4 ++--
 .../Interfaces/Algorithms/Services/IAlgorithmComponent.cs | 4 ++--
 src/QuikGraph/Interfaces/Graphs/IHierarchy.cs             | 2 +-
 .../Interfaces/Graphs/IImplicitUndirectedGraph.cs         | 2 +-
 src/QuikGraph/Interfaces/Graphs/IIncidenceGraph.cs        | 4 ++--
 .../Interfaces/Graphs/ITermBidirectionalGraph.cs          | 4 ++--
 .../Structures/Graphs/DelegateImplicitUndirectedGraph.cs  | 2 +-
 19 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/QuikGraph.Graphviz/GraphvizAlgorithm.cs b/src/QuikGraph.Graphviz/GraphvizAlgorithm.cs
index a6aee85dc..84dd59b5a 100644
--- a/src/QuikGraph.Graphviz/GraphvizAlgorithm.cs
+++ b/src/QuikGraph.Graphviz/GraphvizAlgorithm.cs
@@ -81,7 +81,7 @@ public IEdgeListGraph<TVertex, TEdge> VisitedGraph
         /// <summary>
         /// Dot output stream.
         /// </summary>
-        /// <remarks>Not null after a run of <see cref="Generate()"/> or <see cref="Generate(IDotEngine,string)"/>.</remarks>
+        /// <remarks>Not <see langword="null"/> after a run of <see cref="Generate()"/> or <see cref="Generate(IDotEngine,string)"/>.</remarks>
         public StringWriter Output { get; private set; }
 
         /// <summary>
diff --git a/src/QuikGraph.Serialization/XmlWriterExtensions.cs b/src/QuikGraph.Serialization/XmlWriterExtensions.cs
index 2c7b1c365..02fa83da1 100644
--- a/src/QuikGraph.Serialization/XmlWriterExtensions.cs
+++ b/src/QuikGraph.Serialization/XmlWriterExtensions.cs
@@ -71,7 +71,7 @@ public static void WriteStringArray([NotNull] XmlWriter xmlWriter, [CanBeNull, I
 
         /// <summary>
         /// Writes an array as space separated values. There is a space after every value, even the last one.
-        /// If array is null, it writes "null".
+        /// If array is <see langword="null"/>, it writes "null".
         /// If array is empty, it writes empty string.
         /// If array is a string array with only one element "null", then it writes "null ".
         /// </summary>
diff --git a/src/QuikGraph/Algorithms/MaximumFlow/GraphBalancingAlgorithm.cs b/src/QuikGraph/Algorithms/MaximumFlow/GraphBalancingAlgorithm.cs
index b60d0c345..0104545bb 100644
--- a/src/QuikGraph/Algorithms/MaximumFlow/GraphBalancingAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/MaximumFlow/GraphBalancingAlgorithm.cs
@@ -153,25 +153,25 @@ public GraphBalancerAlgorithm(
         /// <summary>
         /// Balancing flow source vertex.
         /// </summary>
-        /// <remarks>Not null if the algorithm has been run (and not reverted).</remarks>
+        /// <remarks>Not <see langword="null"/> if the algorithm has been run (and not reverted).</remarks>
         public TVertex BalancingSource { get; private set; }
 
         /// <summary>
         /// Balancing source edge (between <see cref="BalancingSource"/> and <see cref="Source"/>).
         /// </summary>
-        /// <remarks>Not null if the algorithm has been run (and not reverted).</remarks>
+        /// <remarks>Not <see langword="null"/> if the algorithm has been run (and not reverted).</remarks>
         public TEdge BalancingSourceEdge { get; private set; }
 
         /// <summary>
         /// Balancing flow sink vertex.
         /// </summary>
-        /// <remarks>Not null if the algorithm has been run (and not reverted).</remarks>
+        /// <remarks>Not <see langword="null"/> if the algorithm has been run (and not reverted).</remarks>
         public TVertex BalancingSink { get; private set; }
 
         /// <summary>
         /// Balancing sink edge (between <see cref="Sink"/> and <see cref="BalancingSink"/>).
         /// </summary>
-        /// <remarks>Not null if the algorithm has been run (and not reverted).</remarks>
+        /// <remarks>Not <see langword="null"/> if the algorithm has been run (and not reverted).</remarks>
         public TEdge BalancingSinkEdge { get; private set; }
 
         [NotNull, ItemNotNull]
diff --git a/src/QuikGraph/Algorithms/MaximumFlow/MaximumFlowAlgorithmBase.cs b/src/QuikGraph/Algorithms/MaximumFlow/MaximumFlowAlgorithmBase.cs
index c123fbf70..6d4a6cfb6 100644
--- a/src/QuikGraph/Algorithms/MaximumFlow/MaximumFlowAlgorithmBase.cs
+++ b/src/QuikGraph/Algorithms/MaximumFlow/MaximumFlowAlgorithmBase.cs
@@ -65,19 +65,19 @@ protected MaximumFlowAlgorithm(
         /// <summary>
         /// Graph reversed edges.
         /// </summary>
-        /// <remarks>Should be not null but may be empty.</remarks>
+        /// <remarks>Should be not <see langword="null"/> but may be empty.</remarks>
         public IDictionary<TEdge, TEdge> ReversedEdges { get; protected set; }
 
         /// <summary>
         /// Flow source vertex.
         /// </summary>
-        /// <remarks>Must not be null to run the algorithm.</remarks>
+        /// <remarks>Must not be <see langword="null"/> to run the algorithm.</remarks>
         public TVertex Source { get; set; }
 
         /// <summary>
         /// Flow sink vertex.
         /// </summary>
-        /// <remarks>Must not be null to run the algorithm.</remarks>
+        /// <remarks>Must not be <see langword="null"/> to run the algorithm.</remarks>
         public TVertex Sink { get; set; }
 
         /// <summary>
diff --git a/src/QuikGraph/Algorithms/RandomWalks/IEdgeChain.cs b/src/QuikGraph/Algorithms/RandomWalks/IEdgeChain.cs
index 2185c03dd..4bd97fdad 100644
--- a/src/QuikGraph/Algorithms/RandomWalks/IEdgeChain.cs
+++ b/src/QuikGraph/Algorithms/RandomWalks/IEdgeChain.cs
@@ -16,7 +16,7 @@ public interface IEdgeChain<TVertex, TEdge>
         /// </summary>
         /// <param name="graph">The graph to search in.</param>
         /// <param name="vertex">The vertex.</param>
-        /// <param name="successor">Found successor, otherwise null.</param>
+        /// <param name="successor">Found successor, otherwise <see langword="null"/>.</param>
         /// <returns>True if a successor was found, false otherwise.</returns>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
@@ -29,7 +29,7 @@ public interface IEdgeChain<TVertex, TEdge>
         /// </summary>
         /// <param name="edges">Edge set in which searching.</param>
         /// <param name="vertex">The vertex.</param>
-        /// <param name="successor">Found successor, otherwise null.</param>
+        /// <param name="successor">Found successor, otherwise <see langword="null"/>.</param>
         /// <returns>True if a successor was found, false otherwise.</returns>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="edges"/> is <see langword="null"/>.</exception>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
diff --git a/src/QuikGraph/Algorithms/RandomWalks/WeightedMarkovEdgeChainBase.cs b/src/QuikGraph/Algorithms/RandomWalks/WeightedMarkovEdgeChainBase.cs
index 389ad984a..fba7df0b2 100644
--- a/src/QuikGraph/Algorithms/RandomWalks/WeightedMarkovEdgeChainBase.cs
+++ b/src/QuikGraph/Algorithms/RandomWalks/WeightedMarkovEdgeChainBase.cs
@@ -58,7 +58,7 @@ protected double GetWeights([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
         /// <param name="graph">The graph to search in.</param>
         /// <param name="vertex">The vertex.</param>
         /// <param name="position">The position.</param>
-        /// <param name="successor">Found successor, otherwise null.</param>
+        /// <param name="successor">Found successor, otherwise <see langword="null"/>.</param>
         /// <returns>True if a successor was found, false otherwise.</returns>
         protected bool TryGetSuccessor([NotNull] IImplicitGraph<TVertex, TEdge> graph, [NotNull] TVertex vertex, double position, out TEdge successor)
         {
@@ -74,7 +74,7 @@ protected bool TryGetSuccessor([NotNull] IImplicitGraph<TVertex, TEdge> graph, [
         /// </summary>
         /// <param name="edges">Edge set in which searching.</param>
         /// <param name="position">The position.</param>
-        /// <param name="successor">Found successor, otherwise null.</param>
+        /// <param name="successor">Found successor, otherwise <see langword="null"/>.</param>
         /// <returns>True if a successor was found, false otherwise.</returns>
         protected bool TryGetSuccessor([NotNull, ItemNotNull] IEnumerable<TEdge> edges, double position, out TEdge successor)
         {
diff --git a/src/QuikGraph/Algorithms/RankedShortestPath/HoffmanPavleyRankedShortestPathAlgorithm.cs b/src/QuikGraph/Algorithms/RankedShortestPath/HoffmanPavleyRankedShortestPathAlgorithm.cs
index bd1730d27..2187e8400 100644
--- a/src/QuikGraph/Algorithms/RankedShortestPath/HoffmanPavleyRankedShortestPathAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/RankedShortestPath/HoffmanPavleyRankedShortestPathAlgorithm.cs
@@ -98,7 +98,7 @@ public void SetTargetVertex([NotNull] TVertex target)
         /// <summary>
         /// Tries to get the target vertex if set.
         /// </summary>
-        /// <param name="target">Target vertex if set, otherwise null.</param>
+        /// <param name="target">Target vertex if set, otherwise <see langword="null"/>.</param>
         /// <returns>True if the target vertex was set, false otherwise.</returns>
         [Pure]
         [ContractAnnotation("=> true, target:notnull;=> false, target:null")]
diff --git a/src/QuikGraph/Algorithms/RootedAlgorithmBase.cs b/src/QuikGraph/Algorithms/RootedAlgorithmBase.cs
index 430692034..a7b0c8689 100644
--- a/src/QuikGraph/Algorithms/RootedAlgorithmBase.cs
+++ b/src/QuikGraph/Algorithms/RootedAlgorithmBase.cs
@@ -42,7 +42,7 @@ protected RootedAlgorithmBase(
         /// <summary>
         /// Tries to get the root vertex if set.
         /// </summary>
-        /// <param name="root">Root vertex if set, otherwise null.</param>
+        /// <param name="root">Root vertex if set, otherwise <see langword="null"/>.</param>
         /// <returns>True if the root vertex was set, false otherwise.</returns>
         [Pure]
         [ContractAnnotation("=> true, root:notnull;=> false, root:null")]
diff --git a/src/QuikGraph/Algorithms/RootedSearchAlgorithmBase.cs b/src/QuikGraph/Algorithms/RootedSearchAlgorithmBase.cs
index 0afc1d602..6bed50cb3 100644
--- a/src/QuikGraph/Algorithms/RootedSearchAlgorithmBase.cs
+++ b/src/QuikGraph/Algorithms/RootedSearchAlgorithmBase.cs
@@ -39,7 +39,7 @@ protected RootedSearchAlgorithmBase(
         /// <summary>
         /// Tries to get the target vertex if set.
         /// </summary>
-        /// <param name="target">Target vertex if set, otherwise null.</param>
+        /// <param name="target">Target vertex if set, otherwise <see langword="null"/>.</param>
         /// <returns>True if the target vertex was set, false otherwise.</returns>
         [Pure]
         [ContractAnnotation("=> true, target:notnull;=> false, target:null")]
diff --git a/src/QuikGraph/Algorithms/ShortestPath/FloydWarshallAllShortestPathAlgorithm.cs b/src/QuikGraph/Algorithms/ShortestPath/FloydWarshallAllShortestPathAlgorithm.cs
index 3d3f0357d..07dd52aa9 100644
--- a/src/QuikGraph/Algorithms/ShortestPath/FloydWarshallAllShortestPathAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/ShortestPath/FloydWarshallAllShortestPathAlgorithm.cs
@@ -162,7 +162,7 @@ public bool TryGetDistance([NotNull] TVertex source, [NotNull] TVertex target, o
         /// </summary>
         /// <param name="source">Source vertex.</param>
         /// <param name="target">Target vertex.</param>
-        /// <param name="path">The found path, otherwise null.</param>
+        /// <param name="path">The found path, otherwise <see langword="null"/>.</param>
         /// <returns>True if a path linking both vertices was found, false otherwise.</returns>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
diff --git a/src/QuikGraph/Algorithms/TSP/TSP.cs b/src/QuikGraph/Algorithms/TSP/TSP.cs
index 8bf39ed0a..d3417992c 100644
--- a/src/QuikGraph/Algorithms/TSP/TSP.cs
+++ b/src/QuikGraph/Algorithms/TSP/TSP.cs
@@ -21,7 +21,7 @@ public class TSP<TVertex, TEdge, TGraph> : ShortestPathAlgorithmBase<TVertex, TE
         private readonly TasksManager<TVertex, TEdge> _taskManager = new TasksManager<TVertex, TEdge>();
 
         /// <summary>
-        /// Shortest path found, otherwise null.
+        /// Shortest path found, otherwise <see langword="null"/>.
         /// </summary>
         [CanBeNull]
         public BidirectionalGraph<TVertex, TEdge> ResultPath { get; private set; }
diff --git a/src/QuikGraph/Algorithms/TopologicalSort/TopologicalSortAlgorithm.cs b/src/QuikGraph/Algorithms/TopologicalSort/TopologicalSortAlgorithm.cs
index 7a34a9448..be13533e5 100644
--- a/src/QuikGraph/Algorithms/TopologicalSort/TopologicalSortAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/TopologicalSort/TopologicalSortAlgorithm.cs
@@ -36,7 +36,7 @@ public TopologicalSortAlgorithm(
         /// <summary>
         /// Sorted vertices.
         /// </summary>
-        /// <remarks>It is null if the algorithm has not been run yet.</remarks>
+        /// <remarks>It is <see langword="null"/> if the algorithm has not been run yet.</remarks>
         [ItemNotNull]
         public TVertex[] SortedVertices { get; private set; }
 
diff --git a/src/QuikGraph/Collections/FibonacciQueue.cs b/src/QuikGraph/Collections/FibonacciQueue.cs
index 0a5fd93a5..014ee6ce2 100644
--- a/src/QuikGraph/Collections/FibonacciQueue.cs
+++ b/src/QuikGraph/Collections/FibonacciQueue.cs
@@ -41,7 +41,7 @@ public FibonacciQueue([NotNull] Func<TVertex, TDistance> distanceFunc)
         /// Initializes a new instance of the <see cref="FibonacciQueue{TVertex,TDistance}"/> class.
         /// </summary>
         /// <param name="capacity">Initial capacity.</param>
-        /// <param name="values">Set of vertices (null if <paramref name="capacity"/> is 0).</param>
+        /// <param name="values">Set of vertices (<see langword="null"/> if <paramref name="capacity"/> is 0).</param>
         /// <param name="distanceFunc">Function that compute the distance for a given vertex.</param>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceFunc"/> is <see langword="null"/>.</exception>
         /// <exception cref="T:System.ArgumentOutOfRangeException"><paramref name="capacity"/> is negative.</exception>
@@ -57,7 +57,7 @@ public FibonacciQueue(
         /// Initializes a new instance of the <see cref="FibonacciQueue{TVertex,TDistance}"/> class.
         /// </summary>
         /// <param name="capacity">Initial capacity.</param>
-        /// <param name="values">Set of vertices (null if <paramref name="capacity"/> is 0).</param>
+        /// <param name="values">Set of vertices (<see langword="null"/> if <paramref name="capacity"/> is 0).</param>
         /// <param name="distanceFunc">Function that compute the distance for a given vertex.</param>
         /// <param name="distanceComparison">Comparer of distances.</param>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="distanceFunc"/> is <see langword="null"/>.</exception>
diff --git a/src/QuikGraph/Interfaces/Algorithms/Services/IAlgorithmComponent.cs b/src/QuikGraph/Interfaces/Algorithms/Services/IAlgorithmComponent.cs
index 832aa18e6..7f27f0e18 100644
--- a/src/QuikGraph/Interfaces/Algorithms/Services/IAlgorithmComponent.cs
+++ b/src/QuikGraph/Interfaces/Algorithms/Services/IAlgorithmComponent.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace QuikGraph.Algorithms.Services
 {
@@ -17,7 +17,7 @@ public interface IAlgorithmComponent
         /// Gets the service with given <typeparamref name="T"/>.
         /// </summary>
         /// <typeparam name="T">Service type.</typeparam>
-        /// <returns>Found service, otherwise null.</returns>
+        /// <returns>Found service, otherwise <see langword="null"/>.</returns>
         [Pure]
         [CanBeNull]
         T GetService<T>();
diff --git a/src/QuikGraph/Interfaces/Graphs/IHierarchy.cs b/src/QuikGraph/Interfaces/Graphs/IHierarchy.cs
index 2893039c5..c5b98dfcc 100644
--- a/src/QuikGraph/Interfaces/Graphs/IHierarchy.cs
+++ b/src/QuikGraph/Interfaces/Graphs/IHierarchy.cs
@@ -21,7 +21,7 @@ public interface IHierarchy<TVertex, TEdge> : IMutableVertexAndEdgeListGraph<TVe
         /// Gets the parent vertex of the given <paramref name="vertex"/>.
         /// </summary>
         /// <param name="vertex">The vertex.</param>
-        /// <returns>The parent vertex if there is one, otherwise null.</returns>
+        /// <returns>The parent vertex if there is one, otherwise <see langword="null"/>.</returns>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         /// <exception cref="T:System.ArgumentException">The given <paramref name="vertex"/> is the root of the graph.</exception>
         [Pure]
diff --git a/src/QuikGraph/Interfaces/Graphs/IImplicitUndirectedGraph.cs b/src/QuikGraph/Interfaces/Graphs/IImplicitUndirectedGraph.cs
index 9478a489d..75cd35356 100644
--- a/src/QuikGraph/Interfaces/Graphs/IImplicitUndirectedGraph.cs
+++ b/src/QuikGraph/Interfaces/Graphs/IImplicitUndirectedGraph.cs
@@ -68,7 +68,7 @@ public interface IImplicitUndirectedGraph<TVertex, TEdge> : IImplicitVertexSet<T
         /// </summary>
         /// <param name="source">Source vertex.</param>
         /// <param name="target">Target vertex.</param>
-        /// <param name="edge">Edge found, otherwise null.</param>
+        /// <param name="edge">Edge found, otherwise <see langword="null"/>.</param>
         /// <returns>True if an edge was found, false otherwise.</returns>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
diff --git a/src/QuikGraph/Interfaces/Graphs/IIncidenceGraph.cs b/src/QuikGraph/Interfaces/Graphs/IIncidenceGraph.cs
index a977fbf07..264f3f062 100644
--- a/src/QuikGraph/Interfaces/Graphs/IIncidenceGraph.cs
+++ b/src/QuikGraph/Interfaces/Graphs/IIncidenceGraph.cs
@@ -30,7 +30,7 @@ public interface IIncidenceGraph<TVertex, TEdge> : IImplicitGraph<TVertex, TEdge
         /// </summary>
         /// <param name="source">Source vertex.</param>
         /// <param name="target">Target vertex.</param>
-        /// <param name="edge">Edge found, otherwise null.</param>
+        /// <param name="edge">Edge found, otherwise <see langword="null"/>.</param>
         /// <returns>True if an edge was found, false otherwise.</returns>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
@@ -44,7 +44,7 @@ public interface IIncidenceGraph<TVertex, TEdge> : IImplicitGraph<TVertex, TEdge
         /// </summary>
         /// <param name="source">Source vertex.</param>
         /// <param name="target">Target vertex.</param>
-        /// <param name="edges">Edges found, otherwise null.</param>
+        /// <param name="edges">Edges found, otherwise <see langword="null"/>.</param>
         /// <returns>True if at least an edge was found, false otherwise.</returns>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="source"/> is <see langword="null"/>.</exception>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="target"/> is <see langword="null"/>.</exception>
diff --git a/src/QuikGraph/Interfaces/Graphs/ITermBidirectionalGraph.cs b/src/QuikGraph/Interfaces/Graphs/ITermBidirectionalGraph.cs
index 8ee723d88..a0a0e2b69 100644
--- a/src/QuikGraph/Interfaces/Graphs/ITermBidirectionalGraph.cs
+++ b/src/QuikGraph/Interfaces/Graphs/ITermBidirectionalGraph.cs
@@ -62,7 +62,7 @@ public interface ITermBidirectionalGraph<TVertex, TEdge> : IBidirectionalGraph<T
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <param name="terminal">Out terminal index.</param>
-        /// <param name="edges">Out-edges found, otherwise null.</param>
+        /// <param name="edges">Out-edges found, otherwise <see langword="null"/>.</param>
         /// <returns>True if <paramref name="vertex"/> was found or/and out-edges were found, false otherwise.</returns>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
@@ -118,7 +118,7 @@ public interface ITermBidirectionalGraph<TVertex, TEdge> : IBidirectionalGraph<T
         /// </summary>
         /// <param name="vertex">The vertex.</param>
         /// <param name="terminal">Out terminal index.</param>
-        /// <param name="edges">In-edges found, otherwise null.</param>
+        /// <param name="edges">In-edges found, otherwise <see langword="null"/>.</param>
         /// <returns>True if <paramref name="vertex"/> was found or/and in-edges were found, false otherwise.</returns>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]
diff --git a/src/QuikGraph/Structures/Graphs/DelegateImplicitUndirectedGraph.cs b/src/QuikGraph/Structures/Graphs/DelegateImplicitUndirectedGraph.cs
index c02c2a055..96bd2f04e 100644
--- a/src/QuikGraph/Structures/Graphs/DelegateImplicitUndirectedGraph.cs
+++ b/src/QuikGraph/Structures/Graphs/DelegateImplicitUndirectedGraph.cs
@@ -140,7 +140,7 @@ internal virtual bool TryGetAdjacentEdgesInternal([NotNull] TVertex vertex, out
         /// Tries to get adjacent edges of the given <paramref name="vertex"/>.
         /// </summary>
         /// <param name="vertex">The vertex.</param>
-        /// <param name="edges">Edges found, otherwise null.</param>
+        /// <param name="edges">Edges found, otherwise <see langword="null"/>.</param>
         /// <returns>True if <paramref name="vertex"/> was found or/and edges were found, false otherwise.</returns>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="vertex"/> is <see langword="null"/>.</exception>
         [Pure]

From 59cf3a671ab0200c6e07570f91bff0fc401db9a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Mon, 25 Oct 2021 00:20:21 +0200
Subject: [PATCH 10/39] Rename tests files for consistency.

---
 ...{SystemSerializationTests.cs => BinarySerializationTests.cs} | 2 +-
 .../{GraphMLSerializerTests.cs => GraphMLSerializationTests.cs} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/QuikGraph.Serialization.Tests/{SystemSerializationTests.cs => BinarySerializationTests.cs} (99%)
 rename tests/QuikGraph.Serialization.Tests/{GraphMLSerializerTests.cs => GraphMLSerializationTests.cs} (100%)

diff --git a/tests/QuikGraph.Serialization.Tests/SystemSerializationTests.cs b/tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs
similarity index 99%
rename from tests/QuikGraph.Serialization.Tests/SystemSerializationTests.cs
rename to tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs
index ec57230f8..08cedd408 100644
--- a/tests/QuikGraph.Serialization.Tests/SystemSerializationTests.cs
+++ b/tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using JetBrains.Annotations;
diff --git a/tests/QuikGraph.Serialization.Tests/GraphMLSerializerTests.cs b/tests/QuikGraph.Serialization.Tests/GraphMLSerializationTests.cs
similarity index 100%
rename from tests/QuikGraph.Serialization.Tests/GraphMLSerializerTests.cs
rename to tests/QuikGraph.Serialization.Tests/GraphMLSerializationTests.cs

From 9b174aa9c596e7d60cecb6fe91c0d178b6569c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Mon, 25 Oct 2021 00:21:08 +0200
Subject: [PATCH 11/39] Add tests for Xml graph serialization.

---
 .../BinarySerializationTests.cs               | 200 +-----------
 .../Helpers/LambdaEqualityComparer.cs         |  47 +++
 .../SerializationTestCaseSources.cs           | 194 ++++++++++++
 .../XmlSerializationTests.cs                  | 297 +++++++++++++++---
 4 files changed, 501 insertions(+), 237 deletions(-)
 create mode 100644 tests/QuikGraph.Serialization.Tests/Helpers/LambdaEqualityComparer.cs
 create mode 100644 tests/QuikGraph.Serialization.Tests/SerializationTestCaseSources.cs

diff --git a/tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs b/tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs
index 08cedd408..89cf2e64a 100644
--- a/tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs
+++ b/tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs
@@ -1,8 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using JetBrains.Annotations;
 using NUnit.Framework;
+using static QuikGraph.Serialization.Tests.SerializationTestCaseSources;
 
 namespace QuikGraph.Serialization.Tests
 {
@@ -40,30 +40,7 @@ private static TGraph SerializeDeserialize<TVertex, TEdge, TGraph>([NotNull] TGr
 
         #endregion
 
-        [NotNull, ItemNotNull]
-        private static IEnumerable<TestCaseData> BinarySerializationAdjacencyGraphTestCases
-        {
-            [UsedImplicitly]
-            get
-            {
-                var emptyGraph = new AdjacencyGraph<int, EquatableEdge<int>>();
-                yield return new TestCaseData(emptyGraph);
-
-                var graph = new AdjacencyGraph<int, EquatableEdge<int>>();
-                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
-                graph.AddEdgeRange(new[]
-                {
-                    new EquatableEdge<int>(0, 1),
-                    new EquatableEdge<int>(1, 2),
-                    new EquatableEdge<int>(2, 0),
-                    new EquatableEdge<int>(2, 1),
-                    new EquatableEdge<int>(2, 2)
-                });
-                yield return new TestCaseData(graph);
-            }
-        }
-
-        [TestCaseSource(nameof(BinarySerializationAdjacencyGraphTestCases))]
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphTestCases))]
         public void BinarySerialization_AdjacencyGraph([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
         {
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph1 =
@@ -76,7 +53,7 @@ public void BinarySerialization_AdjacencyGraph([NotNull] AdjacencyGraph<int, Equ
             Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
         }
 
-        [TestCaseSource(nameof(BinarySerializationAdjacencyGraphTestCases))]
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphTestCases))]
         public void BinarySerialization_AdapterGraph([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
         {
             var bidirectionalAdapterGraph = new BidirectionalAdapterGraph<int, EquatableEdge<int>>(graph);
@@ -85,47 +62,7 @@ public void BinarySerialization_AdapterGraph([NotNull] AdjacencyGraph<int, Equat
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
-        [NotNull, ItemNotNull]
-        private static IEnumerable<TestCaseData> BinarySerializationClusteredAdjacencyGraphTestCases
-        {
-            [UsedImplicitly]
-            get
-            {
-                var emptyGraph = new AdjacencyGraph<int, EquatableEdge<int>>();
-                var clusterEmptyGraph = new ClusteredAdjacencyGraph<int, EquatableEdge<int>>(emptyGraph);
-                yield return new TestCaseData(clusterEmptyGraph);
-
-                var graph = new AdjacencyGraph<int, EquatableEdge<int>>();
-                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
-                graph.AddEdgeRange(new[]
-                {
-                    new EquatableEdge<int>(0, 1),
-                    new EquatableEdge<int>(1, 2),
-                    new EquatableEdge<int>(2, 0),
-                    new EquatableEdge<int>(2, 1),
-                    new EquatableEdge<int>(2, 2)
-                });
-                var clusterGraph = new ClusteredAdjacencyGraph<int, EquatableEdge<int>>(graph);
-                yield return new TestCaseData(clusterGraph);
-
-                graph = new AdjacencyGraph<int, EquatableEdge<int>>();
-                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
-                graph.AddEdgeRange(new[]
-                {
-                    new EquatableEdge<int>(0, 1),
-                    new EquatableEdge<int>(1, 2),
-                    new EquatableEdge<int>(2, 0),
-                    new EquatableEdge<int>(3, 2)
-                });
-                clusterGraph = new ClusteredAdjacencyGraph<int, EquatableEdge<int>>(graph);
-                ClusteredAdjacencyGraph<int, EquatableEdge<int>> subGraph = clusterGraph.AddCluster();
-                subGraph.AddVertexRange(new[] { 4, 5, 6 });
-                subGraph.AddEdge(new EquatableEdge<int>(4, 6));
-                yield return new TestCaseData(clusterGraph);
-            }
-        }
-
-        [TestCaseSource(nameof(BinarySerializationClusteredAdjacencyGraphTestCases))]
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationClusteredAdjacencyGraphTestCases))]
         public void BinarySerialization_ClusteredGraph([NotNull] ClusteredAdjacencyGraph<int, EquatableEdge<int>> graph)
         {
             ClusteredAdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
@@ -133,32 +70,7 @@ public void BinarySerialization_ClusteredGraph([NotNull] ClusteredAdjacencyGraph
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
-        [NotNull, ItemNotNull]
-        private static IEnumerable<TestCaseData> BinarySerializationCompressedGraphTestCases
-        {
-            [UsedImplicitly]
-            get
-            {
-                var emptyGraph = new AdjacencyGraph<int, Edge<int>>();
-                var emptyCompressedGraph = CompressedSparseRowGraph<int>.FromGraph(emptyGraph);
-                yield return new TestCaseData(emptyCompressedGraph);
-
-                var graph = new AdjacencyGraph<int, EquatableEdge<int>>();
-                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
-                graph.AddEdgeRange(new[]
-                {
-                    new EquatableEdge<int>(0, 1),
-                    new EquatableEdge<int>(1, 2),
-                    new EquatableEdge<int>(2, 0),
-                    new EquatableEdge<int>(2, 1),
-                    new EquatableEdge<int>(2, 2)
-                });
-                var compressedGraph = CompressedSparseRowGraph<int>.FromGraph(emptyGraph);
-                yield return new TestCaseData(compressedGraph);
-            }
-        }
-
-        [TestCaseSource(nameof(BinarySerializationCompressedGraphTestCases))]
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationCompressedGraphTestCases))]
         public void BinarySerialization_CompressedGraph([NotNull] CompressedSparseRowGraph<int> graph)
         {
             CompressedSparseRowGraph<int> deserializedGraph =
@@ -166,31 +78,7 @@ public void BinarySerialization_CompressedGraph([NotNull] CompressedSparseRowGra
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
-        [NotNull, ItemNotNull]
-        private static IEnumerable<TestCaseData> BinarySerializationBidirectionalGraphTestCases
-        {
-            [UsedImplicitly]
-            get
-            {
-                var emptyGraph = new BidirectionalGraph<int, EquatableEdge<int>>();
-                yield return new TestCaseData(emptyGraph);
-
-                var graph = new BidirectionalGraph<int, EquatableEdge<int>>();
-                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
-                graph.AddEdgeRange(new[]
-                {
-                    new EquatableEdge<int>(0, 1),
-                    new EquatableEdge<int>(1, 2),
-                    new EquatableEdge<int>(2, 0),
-                    new EquatableEdge<int>(2, 1),
-                    new EquatableEdge<int>(2, 2)
-                });
-
-                yield return new TestCaseData(graph);
-            }
-        }
-
-        [TestCaseSource(nameof(BinarySerializationBidirectionalGraphTestCases))]
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationBidirectionalGraphTestCases))]
         public void BinarySerialization_BidirectionalGraph([NotNull] BidirectionalGraph<int, EquatableEdge<int>> graph)
         {
             BidirectionalGraph<int, EquatableEdge<int>> deserializedGraph =
@@ -213,30 +101,7 @@ public void BinarySerialization_BidirectionalGraph([NotNull] BidirectionalGraph<
             Assert.IsTrue(EquateGraphs.Equate(undirectedBidirectionalGraph, deserializedGraph4));
         }
 
-        [NotNull, ItemNotNull]
-        private static IEnumerable<TestCaseData> BinarySerializationBidirectionalMatrixGraphTestCases
-        {
-            [UsedImplicitly]
-            get
-            {
-                var emptyGraph = new BidirectionalMatrixGraph<EquatableEdge<int>>(10);
-                yield return new TestCaseData(emptyGraph);
-
-                var graph = new BidirectionalMatrixGraph<EquatableEdge<int>>(4);
-                graph.AddEdgeRange(new[]
-                {
-                    new EquatableEdge<int>(0, 1),
-                    new EquatableEdge<int>(1, 2),
-                    new EquatableEdge<int>(2, 0),
-                    new EquatableEdge<int>(2, 1),
-                    new EquatableEdge<int>(2, 2)
-                });
-
-                yield return new TestCaseData(graph);
-            }
-        }
-
-        [TestCaseSource(nameof(BinarySerializationBidirectionalMatrixGraphTestCases))]
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationBidirectionalMatrixGraphTestCases))]
         public void BinarySerialization_BidirectionalMatrixGraph([NotNull] BidirectionalMatrixGraph<EquatableEdge<int>> graph)
         {
             BidirectionalMatrixGraph<EquatableEdge<int>> deserializedGraph =
@@ -244,31 +109,7 @@ public void BinarySerialization_BidirectionalMatrixGraph([NotNull] Bidirectional
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
-        [NotNull, ItemNotNull]
-        private static IEnumerable<TestCaseData> BinarySerializationUndirectedGraphTestCases
-        {
-            [UsedImplicitly]
-            get
-            {
-                var emptyGraph = new UndirectedGraph<int, EquatableEdge<int>>();
-                yield return new TestCaseData(emptyGraph);
-
-                var graph = new UndirectedGraph<int, EquatableEdge<int>>();
-                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
-                graph.AddEdgeRange(new[]
-                {
-                    new EquatableEdge<int>(0, 1),
-                    new EquatableEdge<int>(1, 2),
-                    new EquatableEdge<int>(2, 0),
-                    new EquatableEdge<int>(2, 1),
-                    new EquatableEdge<int>(2, 2)
-                });
-
-                yield return new TestCaseData(graph);
-            }
-        }
-
-        [TestCaseSource(nameof(BinarySerializationUndirectedGraphTestCases))]
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationUndirectedGraphTestCases))]
         public void BinarySerialization_UndirectedGraph([NotNull] UndirectedGraph<int, EquatableEdge<int>> graph)
         {
             UndirectedGraph<int, EquatableEdge<int>> deserializedGraph1 =
@@ -281,30 +122,7 @@ public void BinarySerialization_UndirectedGraph([NotNull] UndirectedGraph<int, E
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph2));
         }
 
-        [NotNull, ItemNotNull]
-        private static IEnumerable<TestCaseData> BinarySerializationEdgeListGraphTestCases
-        {
-            [UsedImplicitly]
-            get
-            {
-                var emptyGraph = new EdgeListGraph<int, EquatableEdge<int>>();
-                yield return new TestCaseData(emptyGraph);
-
-                var graph = new EdgeListGraph<int, EquatableEdge<int>>();
-                graph.AddEdgeRange(new[]
-                {
-                    new EquatableEdge<int>(0, 1),
-                    new EquatableEdge<int>(1, 2),
-                    new EquatableEdge<int>(2, 0),
-                    new EquatableEdge<int>(2, 1),
-                    new EquatableEdge<int>(2, 2)
-                });
-
-                yield return new TestCaseData(graph);
-            }
-        }
-
-        [TestCaseSource(nameof(BinarySerializationEdgeListGraphTestCases))]
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationEdgeListGraphTestCases))]
         public void BinarySerialization_EdgeListGraph([NotNull] EdgeListGraph<int, EquatableEdge<int>> graph)
         {
             EdgeListGraph<int, EquatableEdge<int>> deserializedGraph =
diff --git a/tests/QuikGraph.Serialization.Tests/Helpers/LambdaEqualityComparer.cs b/tests/QuikGraph.Serialization.Tests/Helpers/LambdaEqualityComparer.cs
new file mode 100644
index 000000000..8148d9eda
--- /dev/null
+++ b/tests/QuikGraph.Serialization.Tests/Helpers/LambdaEqualityComparer.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace QuikGraph.Serialization.Tests
+{
+    /// <summary>
+    /// <see cref="IEqualityComparer{T}"/> that can be constructed from lambdas.
+    /// </summary>
+    /// <typeparam name="T">Element to compare type.</typeparam>
+    internal sealed class LambdaEqualityComparer<T> : IEqualityComparer<T>
+    {
+        [NotNull]
+        private readonly Func<T, T, bool> _comparer;
+
+        [NotNull]
+        private readonly Func<T, int> _hashGenerator;
+
+        private LambdaEqualityComparer([NotNull] Func<T, T, bool> comparer, [NotNull] Func<T, int> hash)
+        {
+            _comparer = comparer;
+            _hashGenerator = hash;
+        }
+
+        /// <inheritdoc />
+        public bool Equals(T x, T y)
+        {
+            return _comparer(x, y);
+        }
+
+        /// <inheritdoc />
+        public int GetHashCode(T value)
+        {
+            return _hashGenerator(value);
+        }
+
+        /// <summary>
+        /// Creates <see cref="IEqualityComparer{T}"/> from given <paramref name="comparer"/> and <paramref name="hash"/> lambdas.
+        /// </summary>
+        [Pure]
+        [NotNull]
+        public static IEqualityComparer<T> Create([NotNull] Func<T, T, bool> comparer, [NotNull] Func<T, int> hash)
+        {
+            return new LambdaEqualityComparer<T>(comparer, hash);
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/QuikGraph.Serialization.Tests/SerializationTestCaseSources.cs b/tests/QuikGraph.Serialization.Tests/SerializationTestCaseSources.cs
new file mode 100644
index 000000000..553fe222a
--- /dev/null
+++ b/tests/QuikGraph.Serialization.Tests/SerializationTestCaseSources.cs
@@ -0,0 +1,194 @@
+using System.Collections.Generic;
+using JetBrains.Annotations;
+using NUnit.Framework;
+
+namespace QuikGraph.Serialization.Tests
+{
+    /// <summary>
+    /// Test case sources for serialization tests.
+    /// </summary>
+    internal static class SerializationTestCaseSources
+    {
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationAdjacencyGraphTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new AdjacencyGraph<int, EquatableEdge<int>>();
+                yield return new TestCaseData(emptyGraph);
+
+                var graph = new AdjacencyGraph<int, EquatableEdge<int>>();
+                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableEdge<int>(0, 1),
+                    new EquatableEdge<int>(1, 2),
+                    new EquatableEdge<int>(2, 0),
+                    new EquatableEdge<int>(2, 1),
+                    new EquatableEdge<int>(2, 2)
+                });
+                yield return new TestCaseData(graph);
+            }
+        }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationClusteredAdjacencyGraphTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new AdjacencyGraph<int, EquatableEdge<int>>();
+                var clusterEmptyGraph = new ClusteredAdjacencyGraph<int, EquatableEdge<int>>(emptyGraph);
+                yield return new TestCaseData(clusterEmptyGraph);
+
+                var graph = new AdjacencyGraph<int, EquatableEdge<int>>();
+                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableEdge<int>(0, 1),
+                    new EquatableEdge<int>(1, 2),
+                    new EquatableEdge<int>(2, 0),
+                    new EquatableEdge<int>(2, 1),
+                    new EquatableEdge<int>(2, 2)
+                });
+                var clusterGraph = new ClusteredAdjacencyGraph<int, EquatableEdge<int>>(graph);
+                yield return new TestCaseData(clusterGraph);
+
+                graph = new AdjacencyGraph<int, EquatableEdge<int>>();
+                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableEdge<int>(0, 1),
+                    new EquatableEdge<int>(1, 2),
+                    new EquatableEdge<int>(2, 0),
+                    new EquatableEdge<int>(3, 2)
+                });
+                clusterGraph = new ClusteredAdjacencyGraph<int, EquatableEdge<int>>(graph);
+                ClusteredAdjacencyGraph<int, EquatableEdge<int>> subGraph = clusterGraph.AddCluster();
+                subGraph.AddVertexRange(new[] { 4, 5, 6 });
+                subGraph.AddEdge(new EquatableEdge<int>(4, 6));
+                yield return new TestCaseData(clusterGraph);
+            }
+        }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationCompressedGraphTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new AdjacencyGraph<int, Edge<int>>();
+                var emptyCompressedGraph = CompressedSparseRowGraph<int>.FromGraph(emptyGraph);
+                yield return new TestCaseData(emptyCompressedGraph);
+
+                var graph = new AdjacencyGraph<int, EquatableEdge<int>>();
+                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableEdge<int>(0, 1),
+                    new EquatableEdge<int>(1, 2),
+                    new EquatableEdge<int>(2, 0),
+                    new EquatableEdge<int>(2, 1),
+                    new EquatableEdge<int>(2, 2)
+                });
+                var compressedGraph = CompressedSparseRowGraph<int>.FromGraph(emptyGraph);
+                yield return new TestCaseData(compressedGraph);
+            }
+        }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationBidirectionalGraphTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new BidirectionalGraph<int, EquatableEdge<int>>();
+                yield return new TestCaseData(emptyGraph);
+
+                var graph = new BidirectionalGraph<int, EquatableEdge<int>>();
+                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableEdge<int>(0, 1),
+                    new EquatableEdge<int>(1, 2),
+                    new EquatableEdge<int>(2, 0),
+                    new EquatableEdge<int>(2, 1),
+                    new EquatableEdge<int>(2, 2)
+                });
+
+                yield return new TestCaseData(graph);
+            }
+        }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationBidirectionalMatrixGraphTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new BidirectionalMatrixGraph<EquatableEdge<int>>(10);
+                yield return new TestCaseData(emptyGraph);
+
+                var graph = new BidirectionalMatrixGraph<EquatableEdge<int>>(4);
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableEdge<int>(0, 1),
+                    new EquatableEdge<int>(1, 2),
+                    new EquatableEdge<int>(2, 0),
+                    new EquatableEdge<int>(2, 1),
+                    new EquatableEdge<int>(2, 2)
+                });
+
+                yield return new TestCaseData(graph);
+            }
+        }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationUndirectedGraphTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new UndirectedGraph<int, EquatableEdge<int>>();
+                yield return new TestCaseData(emptyGraph);
+
+                var graph = new UndirectedGraph<int, EquatableEdge<int>>();
+                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableEdge<int>(0, 1),
+                    new EquatableEdge<int>(1, 2),
+                    new EquatableEdge<int>(2, 0),
+                    new EquatableEdge<int>(2, 1),
+                    new EquatableEdge<int>(2, 2)
+                });
+
+                yield return new TestCaseData(graph);
+            }
+        }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationEdgeListGraphTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new EdgeListGraph<int, EquatableEdge<int>>();
+                yield return new TestCaseData(emptyGraph);
+
+                var graph = new EdgeListGraph<int, EquatableEdge<int>>();
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableEdge<int>(0, 1),
+                    new EquatableEdge<int>(1, 2),
+                    new EquatableEdge<int>(2, 0),
+                    new EquatableEdge<int>(2, 1),
+                    new EquatableEdge<int>(2, 2)
+                });
+
+                yield return new TestCaseData(graph);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/QuikGraph.Serialization.Tests/XmlSerializationTests.cs b/tests/QuikGraph.Serialization.Tests/XmlSerializationTests.cs
index bee5329ba..576e74fb0 100644
--- a/tests/QuikGraph.Serialization.Tests/XmlSerializationTests.cs
+++ b/tests/QuikGraph.Serialization.Tests/XmlSerializationTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Xml;
 using System.Xml.XPath;
@@ -9,6 +10,7 @@
 using QuikGraph.Algorithms;
 using static QuikGraph.Tests.GraphTestHelpers;
 using static QuikGraph.Tests.QuikGraphUnitTestsHelpers;
+using static QuikGraph.Serialization.Tests.SerializationTestCaseSources;
 
 namespace QuikGraph.Serialization.Tests
 {
@@ -43,25 +45,18 @@ private static void SerializeAndRead(
         {
             var settings = new XmlWriterSettings { Indent = true, IndentChars = Indent };
             using (var memory = new MemoryStream())
+            using (var writer = new StreamWriter(memory))
             {
-                var writer = new StreamWriter(memory);
-                try
+                using (XmlWriter xmlWriter = XmlWriter.Create(writer, settings))
                 {
-                    using (XmlWriter xmlWriter = XmlWriter.Create(writer, settings))
-                    {
-                        onSerialize(xmlWriter);
-                    }
+                    onSerialize(xmlWriter);
+                }
 
-                    memory.Position = 0;
+                memory.Position = 0;
 
-                    using (var reader = new StreamReader(memory))
-                    {
-                        checkSerializedContent(reader.ReadToEnd());
-                    }
-                }
-                finally
+                using (var reader = new StreamReader(memory))
                 {
-                    writer.Dispose();
+                    checkSerializedContent(reader.ReadToEnd());
                 }
             }
         }
@@ -106,7 +101,6 @@ private static IEnumerable<TestCaseData> XmlSerializationGraphTestCases
         public void SerializeToXml<TGraph>([NotNull] TGraph graph)
             where TGraph: IMutableVertexAndEdgeSet<Person, TaggedEdge<Person, string>>
         {
-            var persons = new List<Person>();
             var jacob = new Person("Jacob", "Hochstetler")
             {
                 BirthDate = new DateTime(1712, 01, 01),
@@ -115,7 +109,6 @@ public void SerializeToXml<TGraph>([NotNull] TGraph graph)
                 DeathPlace = "Pennsylvania, USA",
                 Gender = Gender.Male
             };
-            persons.Add(jacob);
 
             var john = new Person("John", "Hochstetler")
             {
@@ -125,7 +118,6 @@ public void SerializeToXml<TGraph>([NotNull] TGraph graph)
                 DeathPlace = "Summit Mills, PA",
                 Gender = Gender.Male
             };
-            persons.Add(john);
 
             var jonathon = new Person("Jonathon", "Hochstetler")
             {
@@ -133,7 +125,6 @@ public void SerializeToXml<TGraph>([NotNull] TGraph graph)
                 DeathDate = new DateTime(1823, 05, 08),
                 Gender = Gender.Male
             };
-            persons.Add(jonathon);
 
             var emanuel = new Person("Emanuel", "Hochstedler")
             {
@@ -141,19 +132,14 @@ public void SerializeToXml<TGraph>([NotNull] TGraph graph)
                 DeathDate = new DateTime(1900, 01, 01),
                 Gender = Gender.Male
             };
-            persons.Add(emanuel);
 
-            var relations = new List<TaggedEdge<Person, string>>
-            {
-                new TaggedEdge<Person, string>(jacob, john, jacob.ChildRelationshipText),
-                new TaggedEdge<Person, string>(john, jonathon, john.ChildRelationshipText),
-                new TaggedEdge<Person, string>(jonathon, emanuel, jonathon.ChildRelationshipText)
-            };
-
-            foreach (TaggedEdge<Person, string> relation in relations)
-            {
-                graph.AddVerticesAndEdge(relation);
-            }
+            graph.AddVerticesAndEdgeRange(
+                new TaggedEdge<Person, string>[]
+                {
+                    new(jacob, john, jacob.ChildRelationshipText),
+                    new(john, jonathon, john.ChildRelationshipText),
+                    new(jonathon, emanuel, jonathon.ChildRelationshipText)
+                });
 
             SerializeAndRead(
                 writer => graph.SerializeToXml(
@@ -164,27 +150,36 @@ public void SerializeToXml<TGraph>([NotNull] TGraph graph)
                     VertexNodeName,
                     EdgeNodeName,
                     ""),
-                content =>
+                content => CheckXmlGraphSerialization(graph, content));
+
+            #region Local function
+
+            static void CheckXmlGraphSerialization(
+                [NotNull] IEdgeListGraph<Person, TaggedEdge<Person, string>> graph,
+                [NotNull] string xmlGraph)
+            {
+                var expectedSerializedGraph = new StringBuilder($"{XmlHeader}{Environment.NewLine}");
+                expectedSerializedGraph.AppendLine($"<{GraphNodeName}>");
+
+                foreach (Person person in graph.Vertices)
                 {
-                    var expectedSerializedGraph = new StringBuilder($"{XmlHeader}{Environment.NewLine}");
-                    expectedSerializedGraph.AppendLine($"<{GraphNodeName}>");
+                    expectedSerializedGraph.AppendLine($"{Indent}<{VertexNodeName} id=\"{person.Id}\" />");
+                }
 
-                    foreach (Person person in persons)
-                    {
-                        expectedSerializedGraph.AppendLine($"{Indent}<{VertexNodeName} id=\"{person.Id}\" />");
-                    }
+                TaggedEdge<Person, string>[] relations = graph.Edges.ToArray();
+                for (int i = 0; i < relations.Length; ++i)
+                {
+                    expectedSerializedGraph.AppendLine($"{Indent}<{EdgeNodeName} id=\"{i}\" source=\"{relations[i].Source.Id}\" target=\"{relations[i].Target.Id}\" />");
+                }
 
-                    for (int i = 0 ; i < relations.Count ; ++i)
-                    {
-                        expectedSerializedGraph.AppendLine($"{Indent}<{EdgeNodeName} id=\"{i}\" source=\"{relations[i].Source.Id}\" target=\"{relations[i].Target.Id}\" />");
-                    }
+                expectedSerializedGraph.Append($"</{GraphNodeName}>");
 
-                    expectedSerializedGraph.Append($"</{GraphNodeName}>");
+                StringAssert.AreEqualIgnoringCase(
+                    expectedSerializedGraph.ToString(),
+                    xmlGraph);
+            }
 
-                    StringAssert.AreEqualIgnoringCase(
-                        expectedSerializedGraph.ToString(),
-                        content);
-                });
+            #endregion
         }
 
         [Test]
@@ -874,5 +869,215 @@ public void DeserializeFromXml_Reader_Throws()
         }
 
         #endregion
+
+        #region Serialization/Deserialization
+
+        #region Test Helpers
+
+        [Pure]
+        private static int DeserializeVertex([NotNull] XmlReader reader)
+        {
+            return int.Parse(reader.GetAttribute("id", "") ?? throw new AssertionException("Unable to deserialize vertex."));
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize<TInEdge, TOutEdge, TInGraph, TOutGraph>(
+            [NotNull] TInGraph graph,
+            [NotNull, InstantHandle] Func<XmlReader, TOutGraph> deserialize)
+            where TInEdge : IEdge<int>, IEquatable<TInEdge>
+            where TOutEdge : IEdge<int>, IEquatable<TOutEdge>
+            where TInGraph : IEdgeListGraph<int, TInEdge>
+            where TOutGraph : IEdgeListGraph<int, TOutEdge>
+        {
+            Assert.IsNotNull(graph);
+
+            var settings = new XmlWriterSettings { Indent = true, IndentChars = Indent };
+            using (var memory = new MemoryStream())
+            using (var writer = new StreamWriter(memory))
+            {
+                // Serialize
+                using (XmlWriter xmlWriter = XmlWriter.Create(writer, settings))
+                {
+                    graph.SerializeToXml(
+                        xmlWriter,
+                        vertex => vertex.ToString(),
+                        graph.GetEdgeIdentity(),
+                        "graph",
+                        "node",
+                        "edge",
+                        "");
+                }
+
+                memory.Position = 0;
+
+                // Deserialize
+                using (XmlReader xmlReader = XmlReader.Create(memory))
+                {
+                    TOutGraph deserializedGraph = deserialize(xmlReader);
+                    Assert.IsNotNull(deserializedGraph);
+                    Assert.AreNotSame(graph, deserializedGraph);
+                    return deserializedGraph;
+                }
+            }
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+            where TInGraph : IEdgeListGraph<int, EquatableEdge<int>>
+            where TOutGraph : class, IMutableVertexAndEdgeSet<int, EquatableEdge<int>>, new()
+        {
+            return SerializeDeserialize<EquatableEdge<int>, EquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
+                reader.DeserializeFromXml(
+                    "graph",
+                    "node",
+                    "edge",
+                    "",
+                    _ => new TOutGraph(),
+                    DeserializeVertex,
+                    nav => new EquatableEdge<int>(
+                        int.Parse(nav.GetAttribute("source", "") ?? throw new AssertionException("Unable to deserialize edge source.")),
+                        int.Parse(nav.GetAttribute("target", "") ?? throw new AssertionException("Unable to deserialize edge target.")))));
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize_SEdge<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+            where TInGraph : IEdgeListGraph<int, SEquatableEdge<int>>
+            where TOutGraph : class, IMutableVertexAndEdgeSet<int, SEquatableEdge<int>>, new()
+        {
+            return SerializeDeserialize<SEquatableEdge<int>, SEquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
+                reader.DeserializeFromXml(
+                    "graph",
+                    "node",
+                    "edge",
+                    "",
+                    _ => new TOutGraph(),
+                    DeserializeVertex,
+                    nav => new SEquatableEdge<int>(
+                        int.Parse(nav.GetAttribute("source", "") ?? throw new AssertionException("Unable to deserialize edge source.")),
+                        int.Parse(nav.GetAttribute("target", "") ?? throw new AssertionException("Unable to deserialize edge target.")))));
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize_Reversed<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+            where TInGraph : IEdgeListGraph<int, SReversedEdge<int, EquatableEdge<int>>>
+            where TOutGraph : class, IMutableVertexAndEdgeSet<int, EquatableEdge<int>>, new()
+        {
+            return SerializeDeserialize<SReversedEdge<int, EquatableEdge<int>>, EquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
+                reader.DeserializeFromXml(
+                    "graph",
+                    "node",
+                    "edge",
+                    "",
+                    _ => new TOutGraph(),
+                    DeserializeVertex,
+                    nav => new EquatableEdge<int>(
+                        int.Parse(nav.GetAttribute("source", "") ?? throw new AssertionException("Unable to deserialize edge source.")),
+                        int.Parse(nav.GetAttribute("target", "") ?? throw new AssertionException("Unable to deserialize edge target.")))));
+        }
+
+        #endregion
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphTestCases))]
+        public void XmlSerialization_AdjacencyGraph([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
+        {
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph1 =
+                SerializeDeserialize<AdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph1));
+
+            var arrayGraph = new ArrayAdjacencyGraph<int, EquatableEdge<int>>(graph);
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph2 =
+                SerializeDeserialize<ArrayAdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphTestCases))]
+        public void XmlSerialization_AdapterGraph([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
+        {
+            var bidirectionalAdapterGraph = new BidirectionalAdapterGraph<int, EquatableEdge<int>>(graph);
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
+                SerializeDeserialize<BidirectionalAdapterGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(bidirectionalAdapterGraph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationClusteredAdjacencyGraphTestCases))]
+        public void XmlSerialization_ClusteredGraph([NotNull] ClusteredAdjacencyGraph<int, EquatableEdge<int>> graph)
+        {
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
+                SerializeDeserialize<ClusteredAdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationCompressedGraphTestCases))]
+        public void XmlSerialization_CompressedGraph([NotNull] CompressedSparseRowGraph<int> graph)
+        {
+            AdjacencyGraph<int, SEquatableEdge<int>> deserializedGraph =
+                SerializeDeserialize_SEdge<CompressedSparseRowGraph<int>, AdjacencyGraph<int, SEquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationBidirectionalGraphTestCases))]
+        public void XmlSerialization_BidirectionalGraph([NotNull] BidirectionalGraph<int, EquatableEdge<int>> graph)
+        {
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
+                SerializeDeserialize<BidirectionalGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+
+            var arrayGraph = new ArrayBidirectionalGraph<int, EquatableEdge<int>>(graph);
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph2 =
+                SerializeDeserialize<ArrayBidirectionalGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
+
+            var reversedGraph = new ReversedBidirectionalGraph<int, EquatableEdge<int>>(graph);
+            BidirectionalGraph<int, EquatableEdge<int>> deserializedGraph3 =
+                SerializeDeserialize_Reversed<ReversedBidirectionalGraph<int, EquatableEdge<int>>, BidirectionalGraph<int, EquatableEdge<int>>>(reversedGraph);
+            Assert.IsTrue(
+                EquateGraphs.Equate(
+                    graph,
+                    deserializedGraph3,
+                    EqualityComparer<int>.Default,
+                    LambdaEqualityComparer<EquatableEdge<int>>.Create(
+                        (edge1, edge2) => Equals(edge1.Source, edge2.Target) && Equals(edge1.Target, edge2.Source),
+                        edge => edge.GetHashCode())));
+
+            var undirectedBidirectionalGraph = new UndirectedBidirectionalGraph<int, EquatableEdge<int>>(graph);
+            UndirectedGraph<int, EquatableEdge<int>> deserializedGraph4 =
+                SerializeDeserialize<UndirectedBidirectionalGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(undirectedBidirectionalGraph);
+            Assert.IsTrue(EquateGraphs.Equate(undirectedBidirectionalGraph, deserializedGraph4));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationBidirectionalMatrixGraphTestCases))]
+        public void XmlSerialization_BidirectionalMatrixGraph([NotNull] BidirectionalMatrixGraph<EquatableEdge<int>> graph)
+        {
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
+                SerializeDeserialize<BidirectionalMatrixGraph<EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationUndirectedGraphTestCases))]
+        public void XmlSerialization_UndirectedGraph([NotNull] UndirectedGraph<int, EquatableEdge<int>> graph)
+        {
+            UndirectedGraph<int, EquatableEdge<int>> deserializedGraph1 =
+                SerializeDeserialize<UndirectedGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph1));
+
+            var arrayGraph = new ArrayUndirectedGraph<int, EquatableEdge<int>>(graph);
+            UndirectedGraph<int, EquatableEdge<int>> deserializedGraph2 =
+                SerializeDeserialize<ArrayUndirectedGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph2));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationEdgeListGraphTestCases))]
+        public void XmlSerialization_EdgeListGraph([NotNull] EdgeListGraph<int, EquatableEdge<int>> graph)
+        {
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
+                SerializeDeserialize<EdgeListGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        #endregion
     }
 }
\ No newline at end of file

From 24a34bc15b28eddf24dcd073f6dc17953a0b82c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Wed, 27 Oct 2021 00:44:25 +0200
Subject: [PATCH 12/39] Documentation use library logo.

---
 docs/docfx.json         |   5 +
 docs/images/favicon.ico | Bin 0 -> 146181 bytes
 docs/images/logo.svg    | 312 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 317 insertions(+)
 create mode 100644 docs/images/favicon.ico
 create mode 100644 docs/images/logo.svg

diff --git a/docs/docfx.json b/docs/docfx.json
index 50ca85df8..7af7d5925 100644
--- a/docs/docfx.json
+++ b/docs/docfx.json
@@ -69,6 +69,11 @@
       }
     ],
     "dest": "_site",
+    "globalMetadata": {
+      "_appFaviconPath": "images/favicon.ico",
+      "_appLogoPath": "images/logo.svg",
+      "_appFooter": "QuikGraph"
+    },
     "globalMetadataFiles": [],
     "fileMetadataFiles": [],
     "template": [ "default", "templates/material" ],
diff --git a/docs/images/favicon.ico b/docs/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7eea722404e022e9397152a4f418eeb80df48da9
GIT binary patch
literal 146181
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
Kzn8D!YyS_{#n_qv

literal 0
HcmV?d00001

diff --git a/docs/images/logo.svg b/docs/images/logo.svg
new file mode 100644
index 000000000..9898c5f5a
--- /dev/null
+++ b/docs/images/logo.svg
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="45px" height="45px" viewBox="0 0 45 45" enable-background="new 0 0 45 45" xml:space="preserve">  <image id="image0" width="45" height="45" x="0" y="0"
+    href="data:image/png;base64,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
+LicgIiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIy
+MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAQABAAMBIgACEQED
+EQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0B
+AgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpD
+REVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmq
+srO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEB
+AQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFR
+B2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVW
+V1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrC
+w8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APf6KKKAIZLy
+1icpJcwo46qzgEU3+0LL/n7t/wDv4P8AGvkj42/8le13/t3/APSeOvP6APvf+0LL/n7t/wDv4P8A
+Gj+0LL/n7t/+/g/xr4IooA+9/wC0LL/n7t/+/g/xo/tCy/5+7f8A7+D/ABr4IooA+9/7Qsv+fu3/
+AO/g/wAaP7Qsv+fu3/7+D/GvgiigD73/ALQsv+fu3/7+D/Gj+0LL/n7t/wDv4P8AGvgiigD73/tC
+y/5+7f8A7+D/ABo/tCy/5+7f/v4P8a+Co43lkWONGd2OAqjJJ+ldZpfw/wBRuwsl862kZ52kbnP4
+dB/nitKdKdR2ijKrWp0lebsfZP8AaFl/z92//fwf40f2hZf8/dv/AN/B/jXy7a+CtGswC0DXDj+K
+Zs/oMCr66Vp8AxFY2yf7sSj+ldkcvm93Y8+ea018MWz6T/tCy/5+7f8A7+D/ABo/tCy/5+7f/v4P
+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" />
+</svg>

From 684919bb1de7112919873d83b184813803f5f19c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sun, 31 Oct 2021 01:15:37 +0200
Subject: [PATCH 13/39] GraphML deserialization use IMutableVertexAndEdgeSet
 rather than IMutableVertexAndEdgeListGraph.

This allow to use GraphML serialization extensions on undirected graphs.
---
 src/QuikGraph.Serialization/GraphMLExtensions.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/QuikGraph.Serialization/GraphMLExtensions.cs b/src/QuikGraph.Serialization/GraphMLExtensions.cs
index 3b943205b..e912e3345 100644
--- a/src/QuikGraph.Serialization/GraphMLExtensions.cs
+++ b/src/QuikGraph.Serialization/GraphMLExtensions.cs
@@ -168,7 +168,7 @@ public static void DeserializeFromGraphML<TVertex, TEdge, TGraph>(
             [NotNull] IdentifiableVertexFactory<TVertex> vertexFactory,
             [NotNull] IdentifiableEdgeFactory<TVertex, TEdge> edgeFactory)
             where TEdge : IEdge<TVertex>
-            where TGraph : IMutableVertexAndEdgeListGraph<TVertex, TEdge>
+            where TGraph : IMutableVertexAndEdgeSet<TVertex, TEdge>
         {
             var serializer = new GraphMLDeserializer<TVertex, TEdge, TGraph>();
             serializer.Deserialize(reader, graph, vertexFactory, edgeFactory);
@@ -198,7 +198,7 @@ public static void DeserializeFromGraphML<TVertex, TEdge, TGraph>(
             [NotNull] IdentifiableVertexFactory<TVertex> vertexFactory,
             [NotNull] IdentifiableEdgeFactory<TVertex, TEdge> edgeFactory)
             where TEdge : IEdge<TVertex>
-            where TGraph : IMutableVertexAndEdgeListGraph<TVertex, TEdge>
+            where TGraph : IMutableVertexAndEdgeSet<TVertex, TEdge>
         {
             if (reader is null)
                 throw new ArgumentNullException(nameof(reader));
@@ -247,7 +247,7 @@ public static void DeserializeFromGraphML<TVertex, TEdge, TGraph>(
             [NotNull] IdentifiableVertexFactory<TVertex> vertexFactory,
             [NotNull] IdentifiableEdgeFactory<TVertex, TEdge> edgeFactory)
             where TEdge : IEdge<TVertex>
-            where TGraph : IMutableVertexAndEdgeListGraph<TVertex, TEdge>
+            where TGraph : IMutableVertexAndEdgeSet<TVertex, TEdge>
         {
             if (string.IsNullOrEmpty(filePath))
                 throw new ArgumentException("Must provide a file path.", nameof(filePath));
@@ -284,7 +284,7 @@ public static void DeserializeAndValidateFromGraphML<TVertex, TEdge, TGraph>(
             [NotNull] IdentifiableVertexFactory<TVertex> vertexFactory,
             [NotNull] IdentifiableEdgeFactory<TVertex, TEdge> edgeFactory)
             where TEdge : IEdge<TVertex>
-            where TGraph : IMutableVertexAndEdgeListGraph<TVertex, TEdge>
+            where TGraph : IMutableVertexAndEdgeSet<TVertex, TEdge>
         {
             if (reader is null)
                 throw new ArgumentNullException(nameof(reader));

From 3d367fc678fa03cd579827b5f4036647eee97009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sun, 31 Oct 2021 01:09:08 +0200
Subject: [PATCH 14/39] Add tests for GraphML serialization.

---
 .../GraphMLSerializationTests.cs              | 209 +++++++++++++++++-
 1 file changed, 200 insertions(+), 9 deletions(-)

diff --git a/tests/QuikGraph.Serialization.Tests/GraphMLSerializationTests.cs b/tests/QuikGraph.Serialization.Tests/GraphMLSerializationTests.cs
index 0d2fa0c7c..91ca0d183 100644
--- a/tests/QuikGraph.Serialization.Tests/GraphMLSerializationTests.cs
+++ b/tests/QuikGraph.Serialization.Tests/GraphMLSerializationTests.cs
@@ -10,7 +10,9 @@
 using System.Xml.XPath;
 using JetBrains.Annotations;
 using NUnit.Framework;
+using QuikGraph.Algorithms;
 using QuikGraph.Tests;
+using static QuikGraph.Serialization.Tests.SerializationTestCaseSources;
 using static QuikGraph.Tests.QuikGraphUnitTestsHelpers;
 
 namespace QuikGraph.Serialization.Tests
@@ -30,17 +32,17 @@ private static TGraph VerifySerialization<TGraph>(
             [NotNull, InstantHandle] Func<TGraph, string> serializeGraph,
             [NotNull, InstantHandle] Func<string, TGraph> deserializeGraph)
         {
-            // Serialize the graph to XML
-            string xml = serializeGraph(graph);
+            // Serialize the graph to GraphML
+            string graphml = serializeGraph(graph);
 
             // Deserialize a graph from previous serialization
-            TGraph serializedGraph = deserializeGraph(xml);
+            TGraph serializedGraph = deserializeGraph(graphml);
 
             // Serialize the deserialized graph
-            string newXml = serializeGraph(serializedGraph);
+            string newGraphml = serializeGraph(serializedGraph);
 
             // => Serialization should produce the same result
-            Assert.AreEqual(xml, newXml);
+            Assert.AreEqual(graphml, newGraphml);
 
             Assert.AreNotSame(graph, serializeGraph);
 
@@ -122,9 +124,9 @@ public void GraphMLSerialization_HeaderCheck(bool emitDeclarationOnSerialize, bo
                         return writer.ToString();
                     }
                 },
-                xml =>
+                graphml =>
                 {
-                    using (var reader = new StringReader(xml))
+                    using (var reader = new StringReader(graphml))
                     {
                         var serializer = new GraphMLDeserializer<EquatableTestVertex, EquatableTestEdge, EquatableTestGraph>
                         {
@@ -616,9 +618,9 @@ private static string SerializeGraph4([NotNull] TestGraph graph)
 
         [Pure]
         [NotNull]
-        private static TestGraph DeserializeGraph([NotNull] string xml)
+        private static TestGraph DeserializeGraph([NotNull] string graphml)
         {
-            using (var reader = new StringReader(xml))
+            using (var reader = new StringReader(graphml))
             {
                 var serializedGraph = new TestGraph();
                 serializedGraph.DeserializeAndValidateFromGraphML(
@@ -842,5 +844,194 @@ public void DeserializeAndValidateFromGraphML_Throws()
 #endif
 
         #endregion
+
+        #region Serialization/Deserialization
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize<TInEdge, TOutEdge, TInGraph, TOutGraph>(
+            [NotNull] TInGraph graph,
+            [NotNull, InstantHandle] Func<XmlReader, TOutGraph> deserialize)
+            where TInEdge : IEdge<int>, IEquatable<TInEdge>
+            where TOutEdge : IEdge<int>, IEquatable<TOutEdge>
+            where TInGraph : IEdgeListGraph<int, TInEdge>
+            where TOutGraph : IEdgeListGraph<int, TOutEdge>
+        {
+            Assert.IsNotNull(graph);
+
+            using (var stream = new MemoryStream())
+            {
+                // Serialize
+                using (XmlWriter writer = XmlWriter.Create(stream))
+                {
+                    graph.SerializeToGraphML(
+                        writer,
+                        vertex => vertex.ToString(),
+                        graph.GetEdgeIdentity());
+                }
+
+                // Deserialize
+                stream.Position = 0;
+
+                // Deserialize
+                using (XmlReader reader = XmlReader.Create(stream))
+                {
+                    TOutGraph deserializedGraph = deserialize(reader);
+                    Assert.IsNotNull(deserializedGraph);
+                    Assert.AreNotSame(graph, deserializedGraph);
+                    return deserializedGraph;
+                }
+            }
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+            where TInGraph : IEdgeListGraph<int, EquatableEdge<int>>
+            where TOutGraph : class, IMutableVertexAndEdgeSet<int, EquatableEdge<int>>, new()
+        {
+            return SerializeDeserialize<EquatableEdge<int>, EquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
+            {
+                var deserializedGraph = new TOutGraph();
+                deserializedGraph.DeserializeFromGraphML(
+                    reader,
+                    int.Parse,
+                    (source, target, _) => new EquatableEdge<int>(source, target));
+                return deserializedGraph;
+            });
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize_SEdge<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+            where TInGraph : IEdgeListGraph<int, SEquatableEdge<int>>
+            where TOutGraph : class, IMutableVertexAndEdgeSet<int, SEquatableEdge<int>>, new()
+        {
+            return SerializeDeserialize<SEquatableEdge<int>, SEquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
+            {
+                var deserializedGraph = new TOutGraph();
+                deserializedGraph.DeserializeFromGraphML(
+                    reader,
+                    int.Parse,
+                    (source, target, _) => new SEquatableEdge<int>(source, target));
+                return deserializedGraph;
+            });
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize_Reversed<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+            where TInGraph : IEdgeListGraph<int, SReversedEdge<int, EquatableEdge<int>>>
+            where TOutGraph : class, IMutableVertexAndEdgeSet<int, EquatableEdge<int>>, new()
+        {
+            return SerializeDeserialize<SReversedEdge<int, EquatableEdge<int>>, EquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
+            {
+                var deserializedGraph = new TOutGraph();
+                deserializedGraph.DeserializeFromGraphML(
+                    reader,
+                    int.Parse,
+                    (source, target, _) => new EquatableEdge<int>(source, target));
+                return deserializedGraph;
+            });
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphTestCases))]
+        public void GraphMLSerialization_AdjacencyGraph([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
+        {
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph1 =
+                SerializeDeserialize<AdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph1));
+
+            var arrayGraph = new ArrayAdjacencyGraph<int, EquatableEdge<int>>(graph);
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph2 =
+                SerializeDeserialize<ArrayAdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphTestCases))]
+        public void GraphMLSerialization_AdapterGraph([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
+        {
+            var bidirectionalAdapterGraph = new BidirectionalAdapterGraph<int, EquatableEdge<int>>(graph);
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
+                SerializeDeserialize<BidirectionalAdapterGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(bidirectionalAdapterGraph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationClusteredAdjacencyGraphTestCases))]
+        public void GraphMLSerialization_ClusteredGraph([NotNull] ClusteredAdjacencyGraph<int, EquatableEdge<int>> graph)
+        {
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
+                SerializeDeserialize<ClusteredAdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationCompressedGraphTestCases))]
+        public void GraphMLSerialization_CompressedGraph([NotNull] CompressedSparseRowGraph<int> graph)
+        {
+            AdjacencyGraph<int, SEquatableEdge<int>> deserializedGraph =
+                SerializeDeserialize_SEdge<CompressedSparseRowGraph<int>, AdjacencyGraph<int, SEquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationBidirectionalGraphTestCases))]
+        public void GraphMLSerialization_BidirectionalGraph([NotNull] BidirectionalGraph<int, EquatableEdge<int>> graph)
+        {
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
+                SerializeDeserialize<BidirectionalGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+
+            var arrayGraph = new ArrayBidirectionalGraph<int, EquatableEdge<int>>(graph);
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph2 =
+                SerializeDeserialize<ArrayBidirectionalGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
+
+            var reversedGraph = new ReversedBidirectionalGraph<int, EquatableEdge<int>>(graph);
+            BidirectionalGraph<int, EquatableEdge<int>> deserializedGraph3 =
+                SerializeDeserialize_Reversed<ReversedBidirectionalGraph<int, EquatableEdge<int>>, BidirectionalGraph<int, EquatableEdge<int>>>(reversedGraph);
+            Assert.IsTrue(
+                EquateGraphs.Equate(
+                    graph,
+                    deserializedGraph3,
+                    EqualityComparer<int>.Default,
+                    LambdaEqualityComparer<EquatableEdge<int>>.Create(
+                        (edge1, edge2) => Equals(edge1.Source, edge2.Target) && Equals(edge1.Target, edge2.Source),
+                        edge => edge.GetHashCode())));
+
+            var undirectedBidirectionalGraph = new UndirectedBidirectionalGraph<int, EquatableEdge<int>>(graph);
+            UndirectedGraph<int, EquatableEdge<int>> deserializedGraph4 =
+                SerializeDeserialize<UndirectedBidirectionalGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(undirectedBidirectionalGraph);
+            Assert.IsTrue(EquateGraphs.Equate(undirectedBidirectionalGraph, deserializedGraph4));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationBidirectionalMatrixGraphTestCases))]
+        public void GraphMLSerialization_BidirectionalMatrixGraph([NotNull] BidirectionalMatrixGraph<EquatableEdge<int>> graph)
+        {
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
+                SerializeDeserialize<BidirectionalMatrixGraph<EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationUndirectedGraphTestCases))]
+        public void GraphMLSerialization_UndirectedGraph([NotNull] UndirectedGraph<int, EquatableEdge<int>> graph)
+        {
+            UndirectedGraph<int, EquatableEdge<int>> deserializedGraph1 =
+                SerializeDeserialize<UndirectedGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph1));
+
+            var arrayGraph = new ArrayUndirectedGraph<int, EquatableEdge<int>>(graph);
+            UndirectedGraph<int, EquatableEdge<int>> deserializedGraph2 =
+                SerializeDeserialize<ArrayUndirectedGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph2));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationEdgeListGraphTestCases))]
+        public void GraphMLSerialization_EdgeListGraph([NotNull] EdgeListGraph<int, EquatableEdge<int>> graph)
+        {
+            AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
+                SerializeDeserialize<EdgeListGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        #endregion
     }
 }
\ No newline at end of file

From 36702b7254238eacd45cd91a078ffc483e23bb9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sun, 31 Oct 2021 13:27:00 +0100
Subject: [PATCH 15/39] Add missing define for QuikGraph.Graphviz.

Add .NET 4.5 target as a consequence.
---
 src/QuikGraph.Graphviz/QuikGraph.Graphviz.csproj | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/QuikGraph.Graphviz/QuikGraph.Graphviz.csproj b/src/QuikGraph.Graphviz/QuikGraph.Graphviz.csproj
index 80339f406..9376eeb63 100644
--- a/src/QuikGraph.Graphviz/QuikGraph.Graphviz.csproj
+++ b/src/QuikGraph.Graphviz/QuikGraph.Graphviz.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net35;net40;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
 
     <GeneratePackageOnBuild>$(Generate_QuikGraph_Graphviz)</GeneratePackageOnBuild>
 
@@ -49,13 +49,17 @@ New:
     <AssemblyTitle>QuikGraph.Graphviz .NET 4.0</AssemblyTitle>
     <DefineConstants>$(DefineConstants);NET40;SUPPORTS_SERIALIZATION;SUPPORTS_DESCRIPTION;SUPPORTS_SVG_CONVERSION;SUPPORTS_STREAM_FULL_FEATURES;SUPPORTS_BASIC_EXTENSIONS;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)'=='net45'">
+    <AssemblyTitle>QuikGraph.Graphviz .NET 4.5</AssemblyTitle>
+    <DefineConstants>$(DefineConstants);NET45;SUPPORTS_SERIALIZATION;SUPPORTS_DESCRIPTION;SUPPORTS_AGGRESSIVE_INLINING;SUPPORTS_SVG_CONVERSION;SUPPORTS_STREAM_FULL_FEATURES;SUPPORTS_BASIC_EXTENSIONS;$(AdditionalConstants)</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
     <AssemblyTitle>QuikGraph.Graphviz .NET Standard 1.3</AssemblyTitle>
-    <DefineConstants>$(DefineConstants);NETSTANDARD1_3;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETSTANDARD1_3;SUPPORTS_AGGRESSIVE_INLINING;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
     <AssemblyTitle>QuikGraph.Graphviz .NET Standard 2.0</AssemblyTitle>
-    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;SUPPORTS_SERIALIZATION;SUPPORTS_DESCRIPTION;SUPPORTS_SVG_CONVERSION;SUPPORTS_STREAM_FULL_FEATURES;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;SUPPORTS_SERIALIZATION;SUPPORTS_DESCRIPTION;SUPPORTS_AGGRESSIVE_INLINING;SUPPORTS_SVG_CONVERSION;SUPPORTS_STREAM_FULL_FEATURES;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
 
   <!-- Dependencies -->

From 53620e91b390989c6e691e42b26be64e431ed65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Mon, 1 Nov 2021 19:08:03 +0100
Subject: [PATCH 16/39] Improve the implementation of the Graphviz algorithm to
 better work with delegate graph implementations.

Fix #41
---
 src/QuikGraph.Graphviz/GraphvizAlgorithm.cs   | 117 +++++++++++-------
 .../Extensions/GraphvizExtensionsTests.cs     |  91 ++++++++++++++
 2 files changed, 164 insertions(+), 44 deletions(-)

diff --git a/src/QuikGraph.Graphviz/GraphvizAlgorithm.cs b/src/QuikGraph.Graphviz/GraphvizAlgorithm.cs
index 84dd59b5a..16f691d5e 100644
--- a/src/QuikGraph.Graphviz/GraphvizAlgorithm.cs
+++ b/src/QuikGraph.Graphviz/GraphvizAlgorithm.cs
@@ -2,6 +2,10 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
+#if SUPPORTS_AGGRESSIVE_INLINING
+using System.Runtime.CompilerServices;
+#endif
 using JetBrains.Annotations;
 using QuikGraph.Graphviz.Dot;
 
@@ -175,11 +179,14 @@ public string Generate()
             Output = new StringWriter();
             // Build vertex id map
             int i = 0;
+            var vertices = new HashSet<TVertex>(VisitedGraph.Vertices);
             foreach (TVertex vertex in VisitedGraph.Vertices)
             {
                 _verticesIds.Add(vertex, i++);
             }
 
+            var edges = new HashSet<TEdge>(VisitedGraph.Edges);
+
             Output.Write(VisitedGraph.IsDirected ? "digraph " : "graph ");
             Output.Write(GraphFormat.Name);
             Output.WriteLine(" {");
@@ -200,26 +207,13 @@ public string Generate()
                 Output.WriteLine($"edge [{edgeFormat}];");
             }
 
-            // Initialize vertices map
-            var verticesColors = new Dictionary<TVertex, GraphColor>();
-            foreach (TVertex vertex in VisitedGraph.Vertices)
-            {
-                verticesColors[vertex] = GraphColor.White;
-            }
-
-            var edgeColors = new Dictionary<TEdge, GraphColor>();
-            foreach (TEdge edge in VisitedGraph.Edges)
-            {
-                edgeColors[edge] = GraphColor.White;
-            }
-
             if (VisitedGraph is IClusteredGraph clusteredGraph)
             {
-                WriteClusters(verticesColors, edgeColors, clusteredGraph);
+                WriteClusters(vertices, edges, clusteredGraph);
             }
 
-            WriteVertices(verticesColors, VisitedGraph.Vertices);
-            WriteEdges(edgeColors, VisitedGraph.Edges);
+            WriteVertices(vertices);
+            WriteEdges(edges);
 
             Output.Write("}");
             return Output.ToString();
@@ -244,12 +238,12 @@ public string Generate([NotNull] IDotEngine dot, [NotNull] string outputFilePath
         }
 
         private void WriteClusters(
-            [NotNull] IDictionary<TVertex, GraphColor> verticesColors, 
-            [NotNull] IDictionary<TEdge, GraphColor> edgeColors, 
+            [NotNull, ItemNotNull] ICollection<TVertex> remainingVertices, 
+            [NotNull, ItemNotNull] ICollection<TEdge> remainingEdges, 
             [NotNull] IClusteredGraph parent)
         {
-            Debug.Assert(verticesColors != null);
-            Debug.Assert(edgeColors != null);
+            Debug.Assert(remainingVertices != null);
+            Debug.Assert(remainingEdges != null);
             Debug.Assert(parent != null);
 
             ++ClusterCount;
@@ -260,65 +254,100 @@ private void WriteClusters(
                 OnFormatCluster(subGraph);
                 if (subGraph is IClusteredGraph clusteredGraph)
                 {
-                    WriteClusters(verticesColors, edgeColors, clusteredGraph);
+                    WriteClusters(remainingVertices, remainingEdges, clusteredGraph);
                 }
 
                 if (parent.Collapsed)
                 {
                     foreach (TVertex vertex in subGraph.Vertices)
                     {
-                        verticesColors[vertex] = GraphColor.Black;
+                        remainingVertices.Remove(vertex);
                     }
 
                     foreach (TEdge edge in subGraph.Edges)
                     {
-                        edgeColors[edge] = GraphColor.Black;
+                        remainingEdges.Remove(edge);
                     }
                 }
                 else
                 {
-                    WriteVertices(verticesColors, subGraph.Vertices);
-                    WriteEdges(edgeColors, subGraph.Edges);
+                    WriteVertices(remainingVertices, subGraph.Vertices);
+                    WriteEdges(remainingEdges, subGraph.Edges);
                 }
                 Output.WriteLine("}");
             }
         }
 
-        private void WriteVertices(
-            [NotNull] IDictionary<TVertex, GraphColor> verticesColors,
-            [NotNull, ItemNotNull] IEnumerable<TVertex> vertices)
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void WriteVertex([NotNull] TVertex vertex)
+        {
+            Debug.Assert(vertex != null);
+
+            OnFormatVertex(vertex);
+        }
+
+        private void WriteVertices([NotNull, ItemNotNull] IEnumerable<TVertex> vertices)
         {
-            Debug.Assert(verticesColors != null);
             Debug.Assert(vertices != null);
 
             foreach (TVertex vertex in vertices)
             {
-                if (verticesColors[vertex] != GraphColor.White)
-                    continue;
+                WriteVertex(vertex);
+            }
+        }
 
-                OnFormatVertex(vertex);
-                verticesColors[vertex] = GraphColor.Black;
+        private void WriteVertices(
+            [NotNull, ItemNotNull] ICollection<TVertex> remainingVertices,
+            [NotNull, ItemNotNull] IEnumerable<TVertex> vertices)
+        {
+            Debug.Assert(remainingVertices != null);
+            Debug.Assert(vertices != null);
+
+            foreach (TVertex vertex in vertices.Where(remainingVertices.Contains))
+            {
+                WriteVertex(vertex);
+                remainingVertices.Remove(vertex);
             }
         }
 
-        private void WriteEdges(
-            [NotNull] IDictionary<TEdge, GraphColor> edgesColors,
-            [NotNull, ItemNotNull] IEnumerable<TEdge> edges)
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private void WriteEdge([NotNull] TEdge edge)
+        {
+            Debug.Assert(edge != null);
+
+            Output.Write(VisitedGraph.IsDirected
+                ? $"{_verticesIds[edge.Source]} -> {_verticesIds[edge.Target]}"
+                : $"{_verticesIds[edge.Source]} -- {_verticesIds[edge.Target]}");
+
+            OnFormatEdge(edge);
+        }
+
+        private void WriteEdges([NotNull, ItemNotNull] IEnumerable<TEdge> edges)
         {
-            Debug.Assert(edgesColors != null);
             Debug.Assert(edges != null);
 
             foreach (TEdge edge in edges)
             {
-                if (edgesColors[edge] != GraphColor.White)
-                    continue;
+                WriteEdge(edge);
+            }
+        }
 
-                Output.Write(VisitedGraph.IsDirected
-                    ? $"{_verticesIds[edge.Source]} -> {_verticesIds[edge.Target]}"
-                    : $"{_verticesIds[edge.Source]} -- {_verticesIds[edge.Target]}");
 
-                OnFormatEdge(edge);
-                edgesColors[edge] = GraphColor.Black;
+        private void WriteEdges(
+            [NotNull, ItemNotNull] ICollection<TEdge> remainingEdges,
+            [NotNull, ItemNotNull] IEnumerable<TEdge> edges)
+        {
+            Debug.Assert(remainingEdges != null);
+            Debug.Assert(edges != null);
+
+            foreach (TEdge edge in edges.Where(remainingEdges.Contains))
+            {
+                WriteEdge(edge);
+                remainingEdges.Remove(edge);
             }
         }
     }
diff --git a/tests/QuikGraph.Graphviz.Tests/Extensions/GraphvizExtensionsTests.cs b/tests/QuikGraph.Graphviz.Tests/Extensions/GraphvizExtensionsTests.cs
index 67d0da1c9..4541acdf7 100644
--- a/tests/QuikGraph.Graphviz.Tests/Extensions/GraphvizExtensionsTests.cs
+++ b/tests/QuikGraph.Graphviz.Tests/Extensions/GraphvizExtensionsTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Text;
@@ -41,6 +42,96 @@ public void ToGraphviz()
             Assert.AreEqual(expectedDot, dotGraph);
         }
 
+        [Test]
+        public void ToGraphviz_DelegateGraph()
+        {
+            int[] vertices = { 1, 2, 3, 4, 5 };
+            var graph = new DelegateVertexAndEdgeListGraph<int, Edge<int>>(
+                vertices,
+                (int vertex, out IEnumerable<Edge<int>> outEdges) =>
+                {
+                    if (vertex == 1)
+                    {
+                        outEdges = new[] { new Edge<int>(1, 2), new Edge<int>(1, 3) };
+                        return true;
+                    }
+
+                    if (vertex == 2)
+                    {
+                        outEdges = new[] { new Edge<int>(2, 4) };
+                        return true;
+                    }
+
+                    if (vertex is 3 or 4 or 5)
+                    {
+                        outEdges = new Edge<int>[] { };
+                        return true;
+                    }
+
+                    outEdges = null;
+                    return false;
+                });
+
+            string expectedDot =
+                @"digraph G {" + Environment.NewLine
+                + @"0;" + Environment.NewLine
+                + @"1;" + Environment.NewLine
+                + @"2;" + Environment.NewLine
+                + @"3;" + Environment.NewLine
+                + @"4;" + Environment.NewLine
+                + @"0 -> 1;" + Environment.NewLine
+                + @"0 -> 2;" + Environment.NewLine
+                + @"1 -> 3;" + Environment.NewLine
+                + @"}";
+            string dotGraph = graph.ToGraphviz();
+            Assert.AreEqual(expectedDot, dotGraph);
+        }
+
+        [Test]
+        public void ToGraphviz_EquatableEdgeDelegateGraph()
+        {
+            int[] vertices = { 1, 2, 3, 4, 5 };
+            var graph = new DelegateVertexAndEdgeListGraph<int, EquatableEdge<int>>(
+                vertices,
+                (int vertex, out IEnumerable<EquatableEdge<int>> outEdges) =>
+                {
+                    if (vertex == 1)
+                    {
+                        outEdges = new[] { new EquatableEdge<int>(1, 2), new EquatableEdge<int>(1, 3) };
+                        return true;
+                    }
+
+                    if (vertex == 2)
+                    {
+                        outEdges = new[] { new EquatableEdge<int>(2, 4) };
+                        return true;
+                    }
+
+                    if (vertex is 3 or 4 or 5)
+                    {
+                        outEdges = new EquatableEdge<int>[] { };
+                        return true;
+                    }
+
+                    outEdges = null;
+                    return false;
+                });
+
+            string expectedDot =
+                @"digraph G {" + Environment.NewLine
+                + @"0;" + Environment.NewLine
+                + @"1;" + Environment.NewLine
+                + @"2;" + Environment.NewLine
+                + @"3;" + Environment.NewLine
+                + @"4;" + Environment.NewLine
+                + @"0 -> 1;" + Environment.NewLine
+                + @"0 -> 2;" + Environment.NewLine
+                + @"1 -> 3;" + Environment.NewLine
+                + @"}";
+            string dotGraph = graph.ToGraphviz();
+            Assert.AreEqual(expectedDot, dotGraph);
+        }
+
         [Test]
         public void ToGraphvizWithEmptyInit()
         {

From b733c1cdb0f24368af7200adac799ee1dd800744 Mon Sep 17 00:00:00 2001
From: Maxime Laudrin <maxime.laudrin@protonmail.com>
Date: Wed, 9 Feb 2022 11:48:46 +0100
Subject: [PATCH 17/39] Fix input type of transitive reduction/closure
 algorithms.

---
 src/QuikGraph/Algorithms/TransitiveClosureAlgorithm.cs   | 4 ++--
 src/QuikGraph/Algorithms/TransitiveReductionAlgorithm.cs | 4 ++--
 src/QuikGraph/Extensions/AlgorithmExtensions.cs          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/QuikGraph/Algorithms/TransitiveClosureAlgorithm.cs b/src/QuikGraph/Algorithms/TransitiveClosureAlgorithm.cs
index 79de5e3bf..7dbed14c7 100644
--- a/src/QuikGraph/Algorithms/TransitiveClosureAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/TransitiveClosureAlgorithm.cs
@@ -9,7 +9,7 @@ namespace QuikGraph.Algorithms
     /// </summary>
     /// <typeparam name="TVertex">Vertex type.</typeparam>
     /// <typeparam name="TEdge">Edge type.</typeparam>
-    public class TransitiveClosureAlgorithm<TVertex, TEdge> : AlgorithmBase<BidirectionalGraph<TVertex, TEdge>>
+    public class TransitiveClosureAlgorithm<TVertex, TEdge> : AlgorithmBase<IEdgeListGraph<TVertex, TEdge>>
         where TEdge : IEdge<TVertex>
     {
         /// <summary>
@@ -20,7 +20,7 @@ public class TransitiveClosureAlgorithm<TVertex, TEdge> : AlgorithmBase<Bidirect
         /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="edgeFactory"/> is <see langword="null"/>.</exception>
         public TransitiveClosureAlgorithm(
-            [NotNull] BidirectionalGraph<TVertex, TEdge> visitedGraph,
+            [NotNull] IEdgeListGraph<TVertex, TEdge> visitedGraph,
             [NotNull] Func<TVertex, TVertex, TEdge> edgeFactory)
             : base(visitedGraph)
         {
diff --git a/src/QuikGraph/Algorithms/TransitiveReductionAlgorithm.cs b/src/QuikGraph/Algorithms/TransitiveReductionAlgorithm.cs
index 5cb043be8..3d6da9e58 100644
--- a/src/QuikGraph/Algorithms/TransitiveReductionAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/TransitiveReductionAlgorithm.cs
@@ -8,7 +8,7 @@ namespace QuikGraph.Algorithms
     /// </summary>
     /// <typeparam name="TVertex">Vertex type.</typeparam>
     /// <typeparam name="TEdge">Edge type.</typeparam>
-    public class TransitiveReductionAlgorithm<TVertex, TEdge> : AlgorithmBase<BidirectionalGraph<TVertex, TEdge>>
+    public class TransitiveReductionAlgorithm<TVertex, TEdge> : AlgorithmBase<IEdgeListGraph<TVertex, TEdge>>
         where TEdge : IEdge<TVertex>
     {
         /// <summary>
@@ -17,7 +17,7 @@ public class TransitiveReductionAlgorithm<TVertex, TEdge> : AlgorithmBase<Bidire
         /// <param name="visitedGraph">Graph to visit.</param>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="visitedGraph"/> is <see langword="null"/>.</exception>
         public TransitiveReductionAlgorithm(
-            [NotNull] BidirectionalGraph<TVertex, TEdge> visitedGraph)
+            [NotNull] IEdgeListGraph<TVertex, TEdge> visitedGraph)
             : base(visitedGraph)
         {
             TransitiveReduction = new BidirectionalGraph<TVertex, TEdge>();
diff --git a/src/QuikGraph/Extensions/AlgorithmExtensions.cs b/src/QuikGraph/Extensions/AlgorithmExtensions.cs
index 33169f02d..b0d85a714 100644
--- a/src/QuikGraph/Extensions/AlgorithmExtensions.cs
+++ b/src/QuikGraph/Extensions/AlgorithmExtensions.cs
@@ -1191,7 +1191,7 @@ public static double MaximumFlow<TVertex, TEdge>(
         [Pure]
         [NotNull]
         public static BidirectionalGraph<TVertex, TEdge> ComputeTransitiveReduction<TVertex, TEdge>(
-            [NotNull] this BidirectionalGraph<TVertex, TEdge> graph)
+            [NotNull] this IEdgeListGraph<TVertex, TEdge> graph)
             where TEdge : IEdge<TVertex>
         {
             var algorithm = new TransitiveReductionAlgorithm<TVertex, TEdge>(graph);
@@ -1212,7 +1212,7 @@ public static BidirectionalGraph<TVertex, TEdge> ComputeTransitiveReduction<TVer
         [Pure]
         [NotNull]
         public static BidirectionalGraph<TVertex, TEdge> ComputeTransitiveClosure<TVertex, TEdge>(
-            [NotNull] this BidirectionalGraph<TVertex, TEdge> graph,
+            [NotNull] this IEdgeListGraph<TVertex, TEdge> graph,
             [NotNull] Func<TVertex, TVertex, TEdge> edgeFactory)
             where TEdge : IEdge<TVertex>
         {

From e1bb3b4167b742610928ba737a35a8f4dc8fc104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sun, 13 Feb 2022 19:51:36 +0100
Subject: [PATCH 18/39] Also relax type of graph used in tests (will allow to
 make sure we keep a wide API compliance).

---
 .../TransitiveClosureAlgorithmTests.cs           | 16 ++++++++--------
 .../TransitiveReductionAlgorithmTests.cs         | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/QuikGraph.Tests/Algorithms/TransitiveClosureAlgorithmTests.cs b/tests/QuikGraph.Tests/Algorithms/TransitiveClosureAlgorithmTests.cs
index f28d82e36..433b49485 100644
--- a/tests/QuikGraph.Tests/Algorithms/TransitiveClosureAlgorithmTests.cs
+++ b/tests/QuikGraph.Tests/Algorithms/TransitiveClosureAlgorithmTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 using QuikGraph.Algorithms;
 using static QuikGraph.Tests.Algorithms.AlgorithmTestHelpers;
@@ -15,7 +15,7 @@ internal sealed class TransitiveClosureAlgorithmTests
         [Test]
         public void Constructor()
         {
-            var graph = new BidirectionalGraph<int, Edge<int>>();
+            var graph = new AdjacencyGraph<int, Edge<int>>();
             var algorithm = new TransitiveClosureAlgorithm<int, Edge<int>>(graph, (v1, v2) => new Edge<int>(v1, v2));
             AssertAlgorithmState(algorithm, graph);
             Assert.IsNotNull(algorithm.TransitiveClosure);
@@ -24,7 +24,7 @@ public void Constructor()
         [Test]
         public void Constructor_Throws()
         {
-            var graph = new BidirectionalGraph<int, Edge<int>>();
+            var graph = new AdjacencyGraph<int, Edge<int>>();
             // ReSharper disable ObjectCreationAsStatement
             // ReSharper disable AssignNullToNotNullAttribute
             Assert.Throws<ArgumentNullException>(
@@ -41,7 +41,7 @@ public void Constructor_Throws()
         public void TransitiveClosure_ValueType()
         {
             // Test 1
-            var graph = new BidirectionalGraph<int, SEquatableEdge<int>>();
+            var graph = new AdjacencyGraph<int, SEquatableEdge<int>>();
             graph.AddVerticesAndEdgeRange(new[]
             {
                 new SEquatableEdge<int>(1, 2),
@@ -60,7 +60,7 @@ public void TransitiveClosure_ValueType()
                 });
 
             // Test 2
-            graph = new BidirectionalGraph<int, SEquatableEdge<int>>();
+            graph = new AdjacencyGraph<int, SEquatableEdge<int>>();
             graph.AddVerticesAndEdgeRange(new[]
             {
                 new SEquatableEdge<int>(1, 2),
@@ -91,7 +91,7 @@ public void TransitiveClosure_ValueType()
         public void TransitiveClosure_ReferenceType()
         {
             // Test 1
-            var graph = new BidirectionalGraph<int, EquatableEdge<int>>();
+            var graph = new AdjacencyGraph<int, EquatableEdge<int>>();
             graph.AddVerticesAndEdgeRange(new[]
             {
                 new EquatableEdge<int>(1, 2),
@@ -110,7 +110,7 @@ public void TransitiveClosure_ReferenceType()
                 });
 
             // Test 2
-            graph = new BidirectionalGraph<int, EquatableEdge<int>>();
+            graph = new AdjacencyGraph<int, EquatableEdge<int>>();
             graph.AddVerticesAndEdgeRange(new[]
             {
                 new EquatableEdge<int>(1, 2),
@@ -147,7 +147,7 @@ public void TransitiveClosure_IsolatedVertices()
             var edge12 = new EquatableEdge<string>(vertex1, vertex2);
             var edge23 = new EquatableEdge<string>(vertex2, vertex3);
 
-            var graph = new BidirectionalGraph<string, EquatableEdge<string>>();
+            var graph = new AdjacencyGraph<string, EquatableEdge<string>>();
             graph.AddVertexRange(new[] { vertex1, vertex2, vertex3, vertex4 });
             graph.AddEdgeRange(new[] { edge12, edge23 });
 
diff --git a/tests/QuikGraph.Tests/Algorithms/TransitiveReductionAlgorithmTests.cs b/tests/QuikGraph.Tests/Algorithms/TransitiveReductionAlgorithmTests.cs
index 1ff295022..93b58ada2 100644
--- a/tests/QuikGraph.Tests/Algorithms/TransitiveReductionAlgorithmTests.cs
+++ b/tests/QuikGraph.Tests/Algorithms/TransitiveReductionAlgorithmTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 using QuikGraph.Algorithms;
 using static QuikGraph.Tests.Algorithms.AlgorithmTestHelpers;
@@ -15,7 +15,7 @@ internal sealed class TransitiveReductionAlgorithmTests
         [Test]
         public void Constructor()
         {
-            var graph = new BidirectionalGraph<int, Edge<int>>();
+            var graph = new AdjacencyGraph<int, Edge<int>>();
             var algorithm = new TransitiveReductionAlgorithm<int, Edge<int>>(graph);
             AssertAlgorithmState(algorithm, graph);
             Assert.IsNotNull(algorithm.TransitiveReduction);
@@ -42,7 +42,7 @@ public void TransitiveReduction_ValueType()
             var edge34 = new SEdge<int>(3, 4);
             var edge35 = new SEdge<int>(3, 5);
             var edge45 = new SEdge<int>(4, 5);
-            var graph = new BidirectionalGraph<int, SEdge<int>>();
+            var graph = new AdjacencyGraph<int, SEdge<int>>();
             graph.AddVerticesAndEdgeRange(new[]
             {
                 edge12, edge13, edge14, edge15,
@@ -65,7 +65,7 @@ public void TransitiveReduction_ValueType()
             var edge65 = new SEdge<int>(6, 5);
             var edge67 = new SEdge<int>(6, 7);
             var edge74 = new SEdge<int>(7, 4);
-            graph = new BidirectionalGraph<int, SEdge<int>>();
+            graph = new AdjacencyGraph<int, SEdge<int>>();
             graph.AddVerticesAndEdgeRange(new[]
             {
                 edge01, edge02, edge03, edge23,
@@ -92,7 +92,7 @@ public void TransitiveReduction_ReferenceType()
             var edge34 = new Edge<int>(3, 4);
             var edge35 = new Edge<int>(3, 5);
             var edge45 = new Edge<int>(4, 5);
-            var graph = new BidirectionalGraph<int, Edge<int>>();
+            var graph = new AdjacencyGraph<int, Edge<int>>();
             graph.AddVerticesAndEdgeRange(new[]
             {
                 edge12, edge13, edge14, edge15,
@@ -114,7 +114,7 @@ public void TransitiveReduction_ReferenceType()
             var edge65 = new Edge<int>(6, 5);
             var edge67 = new Edge<int>(6, 7);
             var edge74 = new Edge<int>(7, 4);
-            graph = new BidirectionalGraph<int, Edge<int>>();
+            graph = new AdjacencyGraph<int, Edge<int>>();
             graph.AddVerticesAndEdgeRange(new[]
             {
                 edge01, edge02, edge03, edge23,
@@ -137,7 +137,7 @@ public void TransitiveReduction_IsolatedVertices()
             const string vertex3 = "/test/notlinked";
             var edge12 = new Edge<string>(vertex1, vertex2);
 
-            var graph = new BidirectionalGraph<string, Edge<string>>();
+            var graph = new AdjacencyGraph<string, Edge<string>>();
             graph.AddVertexRange(new[] { vertex1, vertex2, vertex3 });
             graph.AddEdge(edge12);
 

From 0bac9027635cc3f7ec2b6bffbeab0b3c1b9477da Mon Sep 17 00:00:00 2001
From: Yannick <yannicks20@gmail.com>
Date: Mon, 14 Feb 2022 06:44:40 +0800
Subject: [PATCH 19/39] Make QuikGraph projects CLS compliant (#52)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make QuikGraph projects CLS compliant so that its interfaces can be exposed in CLS compliant projects.

Fix #52

Co-authored-by: Yannick Morin-Rivest <ymorinrivest@rpmglobal.com>
Co-authored-by: Alexandre Rabérin <kernelith@live.fr>
---
 src/QuikGraph.Data/Properties/AssemblyInfo.cs |   3 +
 .../Properties/AssemblyInfo.cs                |   3 +
 .../Properties/AssemblyInfo.cs                |   2 +
 .../DirectedGraphML/Dgml.cs                   | 181 ++++++++++--------
 .../DirectedGraphMLAlgorithm.cs               |   1 +
 .../DirectedGraphMLExtensions.cs              |   1 +
 .../Properties/AssemblyInfo.cs                |   2 +
 src/QuikGraph/Properties/AssemblyInfo.cs      |   2 +
 8 files changed, 113 insertions(+), 82 deletions(-)
 create mode 100644 src/QuikGraph.Data/Properties/AssemblyInfo.cs
 create mode 100644 src/QuikGraph.Graphviz/Properties/AssemblyInfo.cs

diff --git a/src/QuikGraph.Data/Properties/AssemblyInfo.cs b/src/QuikGraph.Data/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..a46fb3bed
--- /dev/null
+++ b/src/QuikGraph.Data/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System;
+
+[assembly: CLSCompliant(true)]
\ No newline at end of file
diff --git a/src/QuikGraph.Graphviz/Properties/AssemblyInfo.cs b/src/QuikGraph.Graphviz/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..a46fb3bed
--- /dev/null
+++ b/src/QuikGraph.Graphviz/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System;
+
+[assembly: CLSCompliant(true)]
\ No newline at end of file
diff --git a/src/QuikGraph.Petri/Properties/AssemblyInfo.cs b/src/QuikGraph.Petri/Properties/AssemblyInfo.cs
index 4e3f9f725..c06a51187 100644
--- a/src/QuikGraph.Petri/Properties/AssemblyInfo.cs
+++ b/src/QuikGraph.Petri/Properties/AssemblyInfo.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Runtime.CompilerServices;
 using QuikGraph;
 
+[assembly: CLSCompliant(true)]
 [assembly: InternalsVisibleTo("QuikGraph.Petri.Tests" + PublicKey.Key)]
\ No newline at end of file
diff --git a/src/QuikGraph.Serialization/DirectedGraphML/Dgml.cs b/src/QuikGraph.Serialization/DirectedGraphML/Dgml.cs
index b6bb1420e..d0fb99372 100644
--- a/src/QuikGraph.Serialization/DirectedGraphML/Dgml.cs
+++ b/src/QuikGraph.Serialization/DirectedGraphML/Dgml.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.21006.1
@@ -11,21 +11,25 @@
 // 
 // This source code was auto-generated by xsd, Version=4.0.21006.1.
 // 
+
+using System;
+using System.CodeDom.Compiler;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Xml.Serialization;
+
 namespace QuikGraph.Serialization.DirectedGraphML
 {
-#if SUPPORTS_SERIALIZATION
-    using System;
-#endif
-
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [CLSCompliant(false)]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
-    [System.Xml.Serialization.XmlRootAttribute(Namespace = "http://schemas.microsoft.com/vs/2009/dgml", IsNullable = false)]
+    [DebuggerStepThrough]
+    [DesignerCategory("code")]
+    [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [XmlRoot(Namespace = "http://schemas.microsoft.com/vs/2009/dgml", IsNullable = false)]
     public partial class DirectedGraph
     {
 
@@ -335,13 +339,14 @@ public string ZoomLevel
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [CLSCompliant(false)]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [DebuggerStepThrough]
+    [DesignerCategoryAttribute("code")]
+    [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public partial class DirectedGraphNode
     {
 
@@ -2635,13 +2640,14 @@ public string CodeSchemaProperty_StatementType
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [CLSCompliant(false)]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [DebuggerStepThrough]
+    [DesignerCategoryAttribute("code")]
+    [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public partial class DirectedGraphNodeCategory
     {
 
@@ -2663,11 +2669,11 @@ public string Ref
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [XmlType(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public enum HorizontalAlignmentEnum
     {
 
@@ -2682,11 +2688,11 @@ public enum HorizontalAlignmentEnum
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [XmlType(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public enum VerticalAlignmentEnum
     {
 
@@ -2701,11 +2707,11 @@ public enum VerticalAlignmentEnum
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [XmlType(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public enum GroupEnum
     {
 
@@ -2717,11 +2723,12 @@ public enum GroupEnum
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [CLSCompliant(false)]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [XmlType(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public enum ClrBoolean
     {
 
@@ -2739,11 +2746,11 @@ public enum ClrBoolean
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [XmlType(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public enum VisibilityEnum
     {
 
@@ -2758,11 +2765,11 @@ public enum VisibilityEnum
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [XmlType(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public enum FontStyleEnum
     {
 
@@ -2777,11 +2784,11 @@ public enum FontStyleEnum
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [XmlType(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public enum FontWeightEnum
     {
 
@@ -2835,11 +2842,11 @@ public enum FontWeightEnum
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [XmlType(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public enum FrameKindEnum
     {
 
@@ -2857,13 +2864,14 @@ public enum FrameKindEnum
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [CLSCompliant(false)]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [DebuggerStepThrough]
+    [DesignerCategoryAttribute("code")]
+    [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public partial class DirectedGraphLink
     {
 
@@ -3205,13 +3213,14 @@ public bool AttractConsumersSpecified
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [CLSCompliant(false)]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [DebuggerStepThrough]
+    [DesignerCategoryAttribute("code")]
+    [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public partial class DirectedGraphLinkCategory
     {
 
@@ -3233,13 +3242,14 @@ public string Ref
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [CLSCompliant(false)]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [DebuggerStepThrough]
+    [DesignerCategoryAttribute("code")]
+    [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public partial class DirectedGraphCategory
     {
 
@@ -3869,13 +3879,14 @@ public string OutboundName
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [CLSCompliant(false)]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [DebuggerStepThrough]
+    [DesignerCategoryAttribute("code")]
+    [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public partial class DirectedGraphProperty
     {
 
@@ -4009,13 +4020,14 @@ public string ReferenceTemplate
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [CLSCompliant(false)]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [DebuggerStepThrough]
+    [DesignerCategoryAttribute("code")]
+    [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public partial class DirectedGraphName
     {
 
@@ -4085,13 +4097,14 @@ public string Formatter
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [CLSCompliant(false)]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [DebuggerStepThrough]
+    [DesignerCategoryAttribute("code")]
+    [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public partial class DirectedGraphAlias
     {
 
@@ -4145,13 +4158,14 @@ public string Id
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [CLSCompliant(false)]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [DebuggerStepThrough]
+    [DesignerCategoryAttribute("code")]
+    [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public partial class DirectedGraphStyle
     {
 
@@ -4284,13 +4298,14 @@ public string ToolTip
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [CLSCompliant(false)]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [DebuggerStepThrough]
+    [DesignerCategoryAttribute("code")]
+    [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public partial class DirectedGraphStyleCondition
     {
 
@@ -4312,13 +4327,14 @@ public string Expression
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [CLSCompliant(false)]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [DebuggerStepThrough]
+    [DesignerCategoryAttribute("code")]
+    [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public partial class DirectedGraphStyleSetter
     {
 
@@ -4372,11 +4388,11 @@ public string Expression
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [XmlType(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public enum PropertyType
     {
 
@@ -4436,11 +4452,11 @@ public enum PropertyType
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [XmlType(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public enum TargetTypeEnum
     {
 
@@ -4452,13 +4468,14 @@ public enum TargetTypeEnum
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [CLSCompliant(false)]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [DebuggerStepThrough]
+    [DesignerCategoryAttribute("code")]
+    [XmlType(AnonymousType = true, Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public partial class DirectedGraphPath
     {
 
@@ -4496,11 +4513,11 @@ public string Value
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [XmlType(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public enum GraphDirectionEnum
     {
 
@@ -4518,11 +4535,11 @@ public enum GraphDirectionEnum
     }
 
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.0.21006.1")]
+    [GeneratedCode("xsd", "4.0.21006.1")]
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
+    [XmlType(Namespace = "http://schemas.microsoft.com/vs/2009/dgml")]
     public enum LayoutEnum
     {
 
diff --git a/src/QuikGraph.Serialization/DirectedGraphMLAlgorithm.cs b/src/QuikGraph.Serialization/DirectedGraphMLAlgorithm.cs
index a32fa5237..6d564ea3a 100644
--- a/src/QuikGraph.Serialization/DirectedGraphMLAlgorithm.cs
+++ b/src/QuikGraph.Serialization/DirectedGraphMLAlgorithm.cs
@@ -13,6 +13,7 @@ namespace QuikGraph.Serialization
     /// </summary>
     /// <typeparam name="TVertex">Vertex type.</typeparam>
     /// <typeparam name="TEdge">Edge type.</typeparam>
+    [CLSCompliant(false)]
     public sealed class DirectedGraphMLAlgorithm<TVertex, TEdge> : AlgorithmBase<IVertexAndEdgeListGraph<TVertex, TEdge>>
         where TEdge : IEdge<TVertex>
     {
diff --git a/src/QuikGraph.Serialization/DirectedGraphMLExtensions.cs b/src/QuikGraph.Serialization/DirectedGraphMLExtensions.cs
index 3b586c5fd..10a0403af 100644
--- a/src/QuikGraph.Serialization/DirectedGraphMLExtensions.cs
+++ b/src/QuikGraph.Serialization/DirectedGraphMLExtensions.cs
@@ -12,6 +12,7 @@ namespace QuikGraph.Serialization
     /// <summary>
     /// Directed graph Markup Language extensions.
     /// </summary>
+    [CLSCompliant(false)]
     public static class DirectedGraphMLExtensions
     {
         [CanBeNull]
diff --git a/src/QuikGraph.Serialization/Properties/AssemblyInfo.cs b/src/QuikGraph.Serialization/Properties/AssemblyInfo.cs
index a8cfb2858..add46e056 100644
--- a/src/QuikGraph.Serialization/Properties/AssemblyInfo.cs
+++ b/src/QuikGraph.Serialization/Properties/AssemblyInfo.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Runtime.CompilerServices;
 using QuikGraph;
 
+[assembly: CLSCompliant(true)]
 [assembly: InternalsVisibleTo("QuikGraph.Serialization.Tests" + PublicKey.Key)]
\ No newline at end of file
diff --git a/src/QuikGraph/Properties/AssemblyInfo.cs b/src/QuikGraph/Properties/AssemblyInfo.cs
index 977af4c3d..68271599f 100644
--- a/src/QuikGraph/Properties/AssemblyInfo.cs
+++ b/src/QuikGraph/Properties/AssemblyInfo.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Runtime.CompilerServices;
 using QuikGraph;
 
+[assembly: CLSCompliant(true)]
 [assembly: InternalsVisibleTo("QuikGraph.Tests" + PublicKey.Key)]
\ No newline at end of file

From 44a88b95de15c265e59e25f611992bf19d9a5a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sun, 13 Feb 2022 23:47:45 +0100
Subject: [PATCH 20/39] Add contributors to readme.

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index eec9f4b30..2db4c51e0 100644
--- a/README.md
+++ b/README.md
@@ -91,8 +91,10 @@ QuikGraph is available on [NuGet](https://www.nuget.org) in several modules.
 
 This project exists thanks to all the people who have contributed to the code base.
 
-[![](https://github.com/jnyrup.png?size=50)](https://github.com/jnyrup)
-[![](https://github.com/SimonTC.png?size=50)](https://github.com/SimonTC)
-[![](https://github.com/tuwuhs.png?size=50)](https://github.com/tuwuhs)
+[<img src="https://github.com/jnyrup.png?size=50" width="50px;" alt=""/>](https://github.com/jnyrup)
+[<img src="https://github.com/SimonTC.png?size=50" width="50px;" alt=""/>](https://github.com/SimonTC)
+[<img src="https://github.com/tuwuhs.png?size=50" width="50px;" alt=""/>](https://github.com/tuwuhs)
+[<img src="https://github.com/gropax.png?size=50" width="50px;" alt=""/>](https://github.com/gropax)
+[<img src="https://github.com/Yannike.png?size=50" width="50px;" alt=""/>](https://github.com/Yannike)
 
 ---
\ No newline at end of file

From 2f9dc5ef6dbfa5b141c3e68bd68b906b13491dcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Thu, 24 Mar 2022 00:39:17 +0100
Subject: [PATCH 21/39] Fix typos and minor doc adjustements.

---
 docs/documentation/history.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/documentation/history.md b/docs/documentation/history.md
index 5fed75fec..ab6922a74 100644
--- a/docs/documentation/history.md
+++ b/docs/documentation/history.md
@@ -1,16 +1,22 @@
 # Library history
 
+## Overview
+
 Below is some summarized information about the history of this library in order to have a better idea of where it comes from.
 
+- [QuickGraph](#QuickGraph)
+- [YC.QuickGraph](#YC.QuickGraph)
+- [QuikGraph](#QuikGraph) <= Here we are
+
 ## QuickGraph
 
 ### General information
 
 This is the original library supporting .NET Framework 4.0, Silverlight 4.0, Windows Phone 7, Windows 8 Metro Apps, XBox 360.
 
-QuikGraph was originally created by Jonathan "Peli" de Halleux in 2003.
+QuickGraph was originally created by Jonathan "Peli" de Halleux in 2003.
 
-Intially the library was providing generic directed/undirected graph datastructures and algorithms for .NET.
+Initially the library was providing generic directed/undirected graph data structures and algorithms for .NET.
 QuickGraph was coming with algorithms such as depth first seach, breath first search, A* search, shortest path, k-shortest path, maximum flow, minimum spanning tree, least common ancestors, etc...
 QuickGraph was supporting [MSAGL](https://www.microsoft.com/en-us/research/project/microsoft-automatic-graph-layout), [GLEE](https://en.wikipedia.org/wiki/Microsoft_Automatic_Graph_Layout), and [Graphviz](https://www.graphviz.org) to render the graphs, serialization to [GraphML](http://graphml.graphdrawing.org), etc...
 

From a8dd78bfc09cfc2e69dc2cf4b8ae4436dfbc69b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Thu, 24 Mar 2022 00:44:39 +0100
Subject: [PATCH 22/39] Minor projects update.

---
 .gitignore                                    | 22 -------------------
 ...ialization.Tests.CommonInternals.projitems |  2 +-
 .../QuikGraph.Tests.CommonInternals.projitems | 10 +--------
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index da77057f0..94c45d53c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -217,23 +217,6 @@ $RECYCLE.BIN/
 
 # Mac desktop service store files
 .DS_Store
-DotParserProject/DotParserProject/DotGrammar.yrd.orig
-DotParserProject/DotParserProject/DotParser.fs.orig
-DotParserProject/DotParserProject/Program.fs.orig
-DotParserProject/packages/QuickGraph.3.6.61119.7/QuickGraph.3.6.61119.7.nupkg
-DotParserProject/packages/QuickGraph.3.6.61119.7/QuickGraph.3.6.61119.7.nuspec
-DotParserProject/packages/QuickGraph.3.6.61119.7/lib/net4/CodeContracts/QuickGraph.Contracts.dll
-DotParserProject/packages/QuickGraph.3.6.61119.7/lib/net4/CodeContracts/QuickGraph.Data.Contracts.dll
-DotParserProject/packages/QuickGraph.3.6.61119.7/lib/net4/CodeContracts/QuickGraph.Graphviz.Contracts.dll
-DotParserProject/packages/QuickGraph.3.6.61119.7/lib/net4/CodeContracts/QuickGraph.Serialization.Contracts.dll
-DotParserProject/packages/QuickGraph.3.6.61119.7/lib/net4/QuickGraph.Data.XML
-DotParserProject/packages/QuickGraph.3.6.61119.7/lib/net4/QuickGraph.Data.dll
-DotParserProject/packages/QuickGraph.3.6.61119.7/lib/net4/QuickGraph.Graphviz.XML
-DotParserProject/packages/QuickGraph.3.6.61119.7/lib/net4/QuickGraph.Graphviz.dll
-DotParserProject/packages/QuickGraph.3.6.61119.7/lib/net4/QuickGraph.Serialization.XML
-DotParserProject/packages/QuickGraph.3.6.61119.7/lib/net4/QuickGraph.Serialization.dll
-DotParserProject/packages/QuickGraph.3.6.61119.7/lib/net4/QuickGraph.XML
-DotParserProject/packages/QuickGraph.3.6.61119.7/lib/net4/QuickGraph.dll
 
 
 # ===================================================
@@ -265,14 +248,9 @@ docs/content/release-notes.md
 .fake
 TestResults/
 *.bak
-QuickGraph.5.1.TeamCity.user
-QuickGraph.sln.docstates
 
 User_*/Out/*
 *.trx
-
-tests/QuickGraph.FST.Tests/DOTfst/*
-tests/QuickGraph.FSA.Tests/DOTfsa/*
 *.orig
 
 .paket/
diff --git a/tests/QuikGraph.Serialization.Tests.CommonInternals/QuikGraph.Serialization.Tests.CommonInternals.projitems b/tests/QuikGraph.Serialization.Tests.CommonInternals/QuikGraph.Serialization.Tests.CommonInternals.projitems
index 50f47e9f4..28afcc052 100644
--- a/tests/QuikGraph.Serialization.Tests.CommonInternals/QuikGraph.Serialization.Tests.CommonInternals.projitems
+++ b/tests/QuikGraph.Serialization.Tests.CommonInternals/QuikGraph.Serialization.Tests.CommonInternals.projitems
@@ -9,6 +9,6 @@
     <Import_RootNamespace>QuikGraph.Serialization.Tests.CommonInternals</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)TestGraphFactory.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)**/*.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/QuikGraph.Tests.CommonInternals/QuikGraph.Tests.CommonInternals.projitems b/tests/QuikGraph.Tests.CommonInternals/QuikGraph.Tests.CommonInternals.projitems
index d3ede33b9..68674b348 100644
--- a/tests/QuikGraph.Tests.CommonInternals/QuikGraph.Tests.CommonInternals.projitems
+++ b/tests/QuikGraph.Tests.CommonInternals/QuikGraph.Tests.CommonInternals.projitems
@@ -9,14 +9,6 @@
     <Import_RootNamespace>QuikGraph.Tests.CommonInternals</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\AlgorithmTestHelpers.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\AssertHelpers.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\GraphTestHelpers.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Helpers\SerializationTestHelpers.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)QuikGraphAssert.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)QuikGraphUnitTestsHelpers.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)QuikGraphUnitTestsSetupBase.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)TestCategories.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Testvertex.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)**/*.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From 0dadad97beb79799c7b64e5a1b6afa55c576886a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Thu, 24 Mar 2022 00:45:20 +0100
Subject: [PATCH 23/39] Soft deprecate ToSvg API no more working.

Target web service is down.
---
 .../Extensions/GraphvizExtensions.cs                 |  3 +++
 .../Extensions/GraphvizExtensionsTests.cs            | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/QuikGraph.Graphviz/Extensions/GraphvizExtensions.cs b/src/QuikGraph.Graphviz/Extensions/GraphvizExtensions.cs
index a4c83a27c..8380ab8de 100644
--- a/src/QuikGraph.Graphviz/Extensions/GraphvizExtensions.cs
+++ b/src/QuikGraph.Graphviz/Extensions/GraphvizExtensions.cs
@@ -73,6 +73,7 @@ public static string ToGraphviz<TVertex, TEdge>(
         /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
+        [Obsolete("Conversion is using an external web service that is no longer available.")]
         public static string ToSvg<TVertex, TEdge>([NotNull] this IEdgeListGraph<TVertex, TEdge> graph)
             where TEdge : IEdge<TVertex>
         {
@@ -93,6 +94,7 @@ public static string ToSvg<TVertex, TEdge>([NotNull] this IEdgeListGraph<TVertex
         /// <exception cref="T:System.ArgumentNullException"><paramref name="initAlgorithm"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
+        [Obsolete("Conversion is using an external web service that is no longer available.")]
         public static string ToSvg<TVertex, TEdge>(
             [NotNull] this IEdgeListGraph<TVertex, TEdge> graph,
             [NotNull, InstantHandle] Action<GraphvizAlgorithm<TVertex, TEdge>> initAlgorithm)
@@ -110,6 +112,7 @@ public static string ToSvg<TVertex, TEdge>(
         /// <exception cref="T:System.ArgumentNullException"><paramref name="dot"/> is <see langword="null"/>.</exception>
         [Pure]
         [NotNull]
+        [Obsolete("Conversion is using an external web service that is no longer available.")]
         public static string ToSvg([NotNull] string dot)
         {
             if (dot is null)
diff --git a/tests/QuikGraph.Graphviz.Tests/Extensions/GraphvizExtensionsTests.cs b/tests/QuikGraph.Graphviz.Tests/Extensions/GraphvizExtensionsTests.cs
index 4541acdf7..b7a0367d8 100644
--- a/tests/QuikGraph.Graphviz.Tests/Extensions/GraphvizExtensionsTests.cs
+++ b/tests/QuikGraph.Graphviz.Tests/Extensions/GraphvizExtensionsTests.cs
@@ -524,7 +524,9 @@ public void ToSvg()
 
             AdjacencyGraph<int, Edge<int>> graph = CreateTestGraph();
 
+#pragma warning disable CS0618
             Assert.AreEqual(expectedSvg, graph.ToSvg());
+#pragma warning restore CS0618
         }
 
         [Test]
@@ -537,7 +539,9 @@ public void ToSvg_Failure()
 
             AdjacencyGraph<int, Edge<int>> graph = CreateTestGraph();
 
+#pragma warning disable CS0618
             Assert.IsEmpty(graph.ToSvg());
+#pragma warning restore CS0618
         }
 
         [Test]
@@ -551,12 +555,14 @@ public void ToSvgWithInit()
 
             AdjacencyGraph<int, Edge<int>> graph = CreateTestGraph();
 
+#pragma warning disable CS0618
             Assert.AreEqual(
                 expectedSvg,
                 graph.ToSvg(algorithm =>
                 {
                     algorithm.CommonVertexFormat.ToolTip = "Test vertex";
                 }));
+#pragma warning restore CS0618
         }
 
         [Test]
@@ -564,9 +570,11 @@ public void ToSvgWithInit_Throws()
         {
             var graph = new AdjacencyGraph<int, Edge<int>>();
 
+#pragma warning disable CS0618
             // ReSharper disable once ReturnValueOfPureMethodIsNotUsed
             // ReSharper disable once AssignNullToNotNullAttribute
             Assert.Throws<ArgumentNullException>(() => graph.ToSvg(null));
+#pragma warning restore CS0618
         }
 
         [Test]
@@ -579,20 +587,24 @@ public void ToSvgWithInit_Failure()
 
             AdjacencyGraph<int, Edge<int>> graph = CreateTestGraph();
 
+#pragma warning disable CS0618
             Assert.IsEmpty(
                 graph.ToSvg(
                     algorithm =>
                     {
                         algorithm.CommonVertexFormat.ToolTip = "Test vertex";
                     }));
+#pragma warning restore CS0618
         }
 
         [Test]
         public void DotToSvg_Throws()
         {
+#pragma warning disable CS0618
             // ReSharper disable once ReturnValueOfPureMethodIsNotUsed
             // ReSharper disable once AssignNullToNotNullAttribute
             Assert.Throws<ArgumentNullException>(() => GraphvizExtensions.ToSvg(null));
+#pragma warning restore CS0618
         }
     }
 }
\ No newline at end of file

From 2b1187b6489d1512bc9ef0513eac27a2e09671f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Thu, 24 Mar 2022 00:46:04 +0100
Subject: [PATCH 24/39] Replace deprecated random API by new one.

---
 src/QuikGraph/Helpers/CryptoRandom.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/QuikGraph/Helpers/CryptoRandom.cs b/src/QuikGraph/Helpers/CryptoRandom.cs
index 62274fa8e..5e7e6cdc6 100644
--- a/src/QuikGraph/Helpers/CryptoRandom.cs
+++ b/src/QuikGraph/Helpers/CryptoRandom.cs
@@ -15,7 +15,7 @@ namespace QuikGraph.Utils
     public class CryptoRandom : Random
     {
         [NotNull]
-        private readonly RNGCryptoServiceProvider _rng = new RNGCryptoServiceProvider();
+        private readonly RandomNumberGenerator _rng = RandomNumberGenerator.Create();
 
         [NotNull]
         private readonly byte[] _uint32Buffer = new byte[4];

From f69866abf12099e78eacf0507ea4f1c2d2320b75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sat, 26 Mar 2022 17:32:01 +0100
Subject: [PATCH 25/39] Simplify and remove useless defines.

---
 .../CyclePoppingRandomTreeAlgorithm.cs        |  9 +------
 .../RandomWalks/MarkovEdgeChainBase.cs        |  9 +------
 ...inimumVertexCoverApproximationAlgorithm.cs | 15 ------------
 src/QuikGraph/Helpers/CryptoRandom.cs         |  6 ++---
 src/QuikGraph/QuikGraph.csproj                |  8 +++----
 .../QuikGraph.Tests/Misc/CryptoRandomTests.cs |  6 ++---
 tests/QuikGraph.Tests/QuikGraph.Tests.csproj  | 24 +++++++++----------
 7 files changed, 22 insertions(+), 55 deletions(-)

diff --git a/src/QuikGraph/Algorithms/RandomWalks/CyclePoppingRandomTreeAlgorithm.cs b/src/QuikGraph/Algorithms/RandomWalks/CyclePoppingRandomTreeAlgorithm.cs
index d3b797578..991507511 100644
--- a/src/QuikGraph/Algorithms/RandomWalks/CyclePoppingRandomTreeAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/RandomWalks/CyclePoppingRandomTreeAlgorithm.cs
@@ -4,9 +4,7 @@
 using System.Linq;
 using JetBrains.Annotations;
 using QuikGraph.Algorithms.Services;
-#if SUPPORTS_CRYPTO_RANDOM
 using QuikGraph.Utils;
-#endif
 
 namespace QuikGraph.Algorithms.RandomWalks
 {
@@ -87,12 +85,7 @@ public GraphColor GetVertexColor(TVertex vertex)
         public IMarkovEdgeChain<TVertex, TEdge> EdgeChain { get; }
 
         [NotNull]
-        private Random _rand =
-#if SUPPORTS_CRYPTO_RANDOM
-            new CryptoRandom((int)DateTime.Now.Ticks);
-#else
-            new Random((int)DateTime.Now.Ticks);
-#endif
+        private Random _rand = new CryptoRandom((int)DateTime.Now.Ticks);
 
         /// <summary>
         /// Gets or sets the random number generator used in <see cref="RandomTree"/>.
diff --git a/src/QuikGraph/Algorithms/RandomWalks/MarkovEdgeChainBase.cs b/src/QuikGraph/Algorithms/RandomWalks/MarkovEdgeChainBase.cs
index 6b06ba224..05202b3e3 100644
--- a/src/QuikGraph/Algorithms/RandomWalks/MarkovEdgeChainBase.cs
+++ b/src/QuikGraph/Algorithms/RandomWalks/MarkovEdgeChainBase.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-#if SUPPORTS_CRYPTO_RANDOM
 using QuikGraph.Utils;
-#endif
 
 namespace QuikGraph.Algorithms.RandomWalks
 {
@@ -18,12 +16,7 @@ public abstract class MarkovEdgeChainBase<TVertex, TEdge> : IMarkovEdgeChain<TVe
         where TEdge : IEdge<TVertex>
     {
         /// <inheritdoc />
-        public Random Rand { get; set; } =
-#if SUPPORTS_CRYPTO_RANDOM
-            new CryptoRandom();
-#else
-            new Random();
-#endif
+        public Random Rand { get; set; } = new CryptoRandom();
 
         /// <inheritdoc />
         public abstract bool TryGetSuccessor(IImplicitGraph<TVertex, TEdge> graph, TVertex vertex, out TEdge successor);
diff --git a/src/QuikGraph/Algorithms/VertexCover/MinimumVertexCoverApproximationAlgorithm.cs b/src/QuikGraph/Algorithms/VertexCover/MinimumVertexCoverApproximationAlgorithm.cs
index 496ab5627..376ca0938 100644
--- a/src/QuikGraph/Algorithms/VertexCover/MinimumVertexCoverApproximationAlgorithm.cs
+++ b/src/QuikGraph/Algorithms/VertexCover/MinimumVertexCoverApproximationAlgorithm.cs
@@ -2,9 +2,7 @@
 using System.Linq;
 using JetBrains.Annotations;
 using QuikGraph.Collections;
-#if SUPPORTS_CRYPTO_RANDOM
 using QuikGraph.Utils;
-#endif
 
 namespace QuikGraph.Algorithms.VertexCover
 {
@@ -24,7 +22,6 @@ public sealed class MinimumVertexCoverApproximationAlgorithm<TVertex, TEdge> : A
         [NotNull]
         private readonly Random _rng;
 
-#if SUPPORTS_CRYPTO_RANDOM
         /// <summary>
         /// Initializes a new instance of the <see cref="MinimumVertexCoverApproximationAlgorithm{TVertex,TEdge}"/> class.
         /// </summary>
@@ -36,18 +33,6 @@ public MinimumVertexCoverApproximationAlgorithm(
             : this(graph, new CryptoRandom())
         {
         }
-#else
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MinimumVertexCoverApproximationAlgorithm{TVertex,TEdge}"/> class.
-        /// </summary>
-        /// <param name="graph">Graph to compute the cover.</param>
-        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
-        public MinimumVertexCoverApproximationAlgorithm(
-            [NotNull] IUndirectedGraph<TVertex, TEdge> graph)
-            : this(graph, new Random())
-        {
-        }
-#endif
 
         /// <summary>
         /// Initializes a new instance of the <see cref="MinimumVertexCoverApproximationAlgorithm{TVertex,TEdge}"/> class.
diff --git a/src/QuikGraph/Helpers/CryptoRandom.cs b/src/QuikGraph/Helpers/CryptoRandom.cs
index 5e7e6cdc6..c4c46b5bc 100644
--- a/src/QuikGraph/Helpers/CryptoRandom.cs
+++ b/src/QuikGraph/Helpers/CryptoRandom.cs
@@ -1,5 +1,4 @@
-#if SUPPORTS_CRYPTO_RANDOM
-using System;
+using System;
 using System.Security.Cryptography;
 using JetBrains.Annotations;
 
@@ -89,5 +88,4 @@ public override void NextBytes(byte[] buffer)
             _rng.GetBytes(buffer);
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/QuikGraph/QuikGraph.csproj b/src/QuikGraph/QuikGraph.csproj
index 028bab8b9..ba0952f08 100644
--- a/src/QuikGraph/QuikGraph.csproj
+++ b/src/QuikGraph/QuikGraph.csproj
@@ -57,16 +57,16 @@ Misc:
   <!-- Targets defines -->
   <PropertyGroup Condition="'$(TargetFramework)'=='net35'">
     <AssemblyTitle>QuikGraph .NET 3.5</AssemblyTitle>
-    <DefineConstants>$(DefineConstants);NET35;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_CRYPTO_RANDOM;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET35;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;$(AdditionalConstants)</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net40'">
     <AssemblyTitle>QuikGraph .NET 4.0</AssemblyTitle>
-    <DefineConstants>$(DefineConstants);NET40;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_SORTEDSET;SUPPORTS_CRYPTO_RANDOM;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET40;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_SORTEDSET;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net45'">
     <AssemblyTitle>QuikGraph .NET 4.5</AssemblyTitle>
-    <DefineConstants>$(DefineConstants);NET45;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_SORTEDSET;SUPPORTS_AGGRESSIVE_INLINING;SUPPORTS_CRYPTO_RANDOM;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET45;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_SORTEDSET;SUPPORTS_AGGRESSIVE_INLINING;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
     <AssemblyTitle>QuikGraph .NET Standard 1.3</AssemblyTitle>
@@ -74,6 +74,6 @@ Misc:
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
     <AssemblyTitle>QuikGraph .NET Standard 2.0</AssemblyTitle>
-    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_SORTEDSET;SUPPORTS_AGGRESSIVE_INLINING;SUPPORTS_CRYPTO_RANDOM;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_SORTEDSET;SUPPORTS_AGGRESSIVE_INLINING;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/QuikGraph.Tests/Misc/CryptoRandomTests.cs b/tests/QuikGraph.Tests/Misc/CryptoRandomTests.cs
index 81c9a2328..38ff5f312 100644
--- a/tests/QuikGraph.Tests/Misc/CryptoRandomTests.cs
+++ b/tests/QuikGraph.Tests/Misc/CryptoRandomTests.cs
@@ -1,5 +1,4 @@
-#if SUPPORTS_CRYPTO_RANDOM
-using System;
+using System;
 using NUnit.Framework;
 using QuikGraph.Utils;
 
@@ -113,5 +112,4 @@ public void NextBytes_Throws()
             Assert.Throws<ArgumentNullException>(() => rng.NextBytes(null));
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/tests/QuikGraph.Tests/QuikGraph.Tests.csproj b/tests/QuikGraph.Tests/QuikGraph.Tests.csproj
index 059ef0ddb..d209a13c9 100644
--- a/tests/QuikGraph.Tests/QuikGraph.Tests.csproj
+++ b/tests/QuikGraph.Tests/QuikGraph.Tests.csproj
@@ -20,40 +20,40 @@
 
   <!-- Targets defines -->
   <PropertyGroup Condition="'$(TargetFramework)'=='net35'">
-    <DefineConstants>$(DefineConstants);NET35;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_CRYPTO_RANDOM;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET35;SUPPORTS_SERIALIZATION;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net40'">
-    <DefineConstants>$(DefineConstants);NET40;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_XML_DTD_PROCESSING;SUPPORTS_CRYPTO_RANDOM;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET40;SUPPORTS_SERIALIZATION;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net45'">
-    <DefineConstants>$(DefineConstants);NET45;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_XML_DTD_PROCESSING;SUPPORTS_CRYPTO_RANDOM;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET45;SUPPORTS_SERIALIZATION;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net451'">
-    <DefineConstants>$(DefineConstants);NET451;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_XML_DTD_PROCESSING;SUPPORTS_CRYPTO_RANDOM;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET451;SUPPORTS_SERIALIZATION;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net452'">
-    <DefineConstants>$(DefineConstants);NET452;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_XML_DTD_PROCESSING;SUPPORTS_CRYPTO_RANDOM;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET452;SUPPORTS_SERIALIZATION;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net46'">
-    <DefineConstants>$(DefineConstants);NET46;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_XML_DTD_PROCESSING;SUPPORTS_CRYPTO_RANDOM;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET46;SUPPORTS_SERIALIZATION;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net461'">
-    <DefineConstants>$(DefineConstants);NET461;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_XML_DTD_PROCESSING;SUPPORTS_CRYPTO_RANDOM;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET461;SUPPORTS_SERIALIZATION;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net462'">
-    <DefineConstants>$(DefineConstants);NET462;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_XML_DTD_PROCESSING;SUPPORTS_CRYPTO_RANDOM;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET462;SUPPORTS_SERIALIZATION;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net47'">
-    <DefineConstants>$(DefineConstants);NET47;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_XML_DTD_PROCESSING;SUPPORTS_CRYPTO_RANDOM;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET47;SUPPORTS_SERIALIZATION;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net471'">
-    <DefineConstants>$(DefineConstants);NET471;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_XML_DTD_PROCESSING;SUPPORTS_CRYPTO_RANDOM;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET471;SUPPORTS_SERIALIZATION;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net472'">
-    <DefineConstants>$(DefineConstants);NET472;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_XML_DTD_PROCESSING;SUPPORTS_CRYPTO_RANDOM;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET472;SUPPORTS_SERIALIZATION;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
-    <DefineConstants>$(DefineConstants);NETCOREAPP2_1;SUPPORTS_SERIALIZATION;SUPPORTS_CLONEABLE;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_CONVERTER;SUPPORTS_TYPE_FULL_FEATURES;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_XML_DTD_PROCESSING;SUPPORTS_CRYPTO_RANDOM;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETCOREAPP2_1;SUPPORTS_SERIALIZATION;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

From 6519d40b52740cf85a1ad0dfa0d7d74e965bfc96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sun, 27 Mar 2022 23:03:36 +0200
Subject: [PATCH 26/39] Add cycle checking for edge set and undirected graphs.

Fix #58
---
 .../Extensions/AlgorithmExtensions.cs         | 138 +++++++++++-
 src/QuikGraph/Extensions/EdgeExtensions.cs    |   2 +-
 .../Extensions/AlgorithmExtensionsTests.cs    | 199 +++++++++++++++++-
 3 files changed, 321 insertions(+), 18 deletions(-)

diff --git a/src/QuikGraph/Extensions/AlgorithmExtensions.cs b/src/QuikGraph/Extensions/AlgorithmExtensions.cs
index b0d85a714..e446e1ba8 100644
--- a/src/QuikGraph/Extensions/AlgorithmExtensions.cs
+++ b/src/QuikGraph/Extensions/AlgorithmExtensions.cs
@@ -7,6 +7,9 @@
 #else
 using QuikGraph.Utils;
 #endif
+#if SUPPORTS_AGGRESSIVE_INLINING
+using System.Runtime.CompilerServices;
+#endif
 using JetBrains.Annotations;
 using QuikGraph.Algorithms.Condensation;
 using QuikGraph.Algorithms.ConnectedComponents;
@@ -898,10 +901,75 @@ public static IEnumerable<TVertex> OddVertices<TVertex, TEdge>(
                 .Select(pair => pair.Key);
         }
 
+        private sealed class DirectedCycleTester<TVertex, TEdge>
+            where TEdge : IEdge<TVertex>
+        {
+            private bool _isDag = true;
+
+            [Pure]
+            public bool IsDag([NotNull] IVertexListGraph<TVertex, TEdge> graph)
+            {
+                Debug.Assert(graph != null);
+
+                var dfs = new DepthFirstSearchAlgorithm<TVertex, TEdge>(graph);
+                try
+                {
+                    dfs.BackEdge += DfsBackEdge;
+                    _isDag = true;
+                    dfs.Compute();
+                    return _isDag;
+                }
+                finally
+                {
+                    dfs.BackEdge -= DfsBackEdge;
+                }
+            }
+
+            private void DfsBackEdge([NotNull] TEdge edge)
+            {
+                _isDag = false;
+            }
+        }
+
+        [Pure]
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private static bool IsDirectedAcyclicGraphInternal<TVertex, TEdge>(
+            [NotNull] this IVertexListGraph<TVertex, TEdge> graph)
+            where TEdge : IEdge<TVertex>
+        {
+            return new DirectedCycleTester<TVertex, TEdge>().IsDag(graph);
+        }
+
         /// <summary>
         /// Checks whether the graph is acyclic or not.
         /// </summary>
         /// <remarks>
+        /// Builds an <see cref="AdjacencyGraph{TVertex,TEdge}"/> from <paramref name="edges"/>
+        /// and performs a depth first search to look for cycles.
+        /// </remarks>
+        /// <typeparam name="TVertex">Vertex type.</typeparam>
+        /// <typeparam name="TEdge">Edge type.</typeparam>
+        /// <param name="edges">Edges of forming the graph to visit.</param>
+        /// <returns>True if the graph contains a cycle, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="edges"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
+        [Pure]
+        public static bool IsDirectedAcyclicGraph<TVertex, TEdge>(
+            [NotNull, ItemNotNull] this IEnumerable<TEdge> edges)
+            where TEdge : IEdge<TVertex>
+        {
+            var graph = new AdjacencyGraph<TVertex, TEdge>();
+            graph.AddVerticesAndEdgeRange(edges);
+            return IsDirectedAcyclicGraphInternal(graph);
+        }
+
+        /// <summary>
+        /// Checks whether the <paramref name="graph"/> is acyclic or not.
+        /// </summary>
+        /// <remarks>
         /// Performs a depth first search to look for cycles.
         /// </remarks>
         /// <typeparam name="TVertex">Vertex type.</typeparam>
@@ -916,26 +984,25 @@ public static bool IsDirectedAcyclicGraph<TVertex, TEdge>(
         {
             if (graph is null)
                 throw new ArgumentNullException(nameof(graph));
-            return new DagTester<TVertex, TEdge>().IsDag(graph);
+            return IsDirectedAcyclicGraphInternal(graph);
         }
 
-        private sealed class DagTester<TVertex, TEdge>
+        private sealed class UndirectedCycleTester<TVertex, TEdge>
             where TEdge : IEdge<TVertex>
         {
-            private bool _isDag = true;
+            private bool _hasCycle;
 
             [Pure]
-            public bool IsDag([NotNull] IVertexListGraph<TVertex, TEdge> graph)
+            public bool HasCycle([NotNull] IUndirectedGraph<TVertex, TEdge> graph)
             {
                 Debug.Assert(graph != null);
 
-                var dfs = new DepthFirstSearchAlgorithm<TVertex, TEdge>(graph);
+                var dfs = new UndirectedDepthFirstSearchAlgorithm<TVertex, TEdge>(graph);
                 try
                 {
                     dfs.BackEdge += DfsBackEdge;
-                    _isDag = true;
                     dfs.Compute();
-                    return _isDag;
+                    return _hasCycle;
                 }
                 finally
                 {
@@ -943,12 +1010,65 @@ public bool IsDag([NotNull] IVertexListGraph<TVertex, TEdge> graph)
                 }
             }
 
-            private void DfsBackEdge([NotNull] TEdge edge)
+            private void DfsBackEdge([NotNull] object sender, [NotNull] UndirectedEdgeEventArgs<TVertex, TEdge> args)
             {
-                _isDag = false;
+                _hasCycle = true;
             }
         }
 
+        [Pure]
+#if SUPPORTS_AGGRESSIVE_INLINING
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
+        private static bool IsUndirectedAcyclicGraphInternal<TVertex, TEdge>(
+            [NotNull] this IUndirectedGraph<TVertex, TEdge> graph)
+            where TEdge : IEdge<TVertex>
+        {
+            return !new UndirectedCycleTester<TVertex, TEdge>().HasCycle(graph);
+        }
+
+        /// <summary>
+        /// Checks whether the graph is acyclic or not.
+        /// </summary>
+        /// <remarks>
+        /// Builds an <see cref="UndirectedGraph{TVertex,TEdge}"/> from <paramref name="edges"/>
+        /// and performs a depth first search to look for cycles.
+        /// </remarks>
+        /// <typeparam name="TVertex">Vertex type.</typeparam>
+        /// <typeparam name="TEdge">Edge type.</typeparam>
+        /// <param name="edges">Edges of forming the graph to visit.</param>
+        /// <returns>True if the graph contains a cycle, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException">
+        /// <paramref name="edges"/> is <see langword="null"/> or at least one of them is <see langword="null"/>.
+        /// </exception>
+        [Pure]
+        public static bool IsUndirectedAcyclicGraph<TVertex, TEdge>(
+            [NotNull, ItemNotNull] this IEnumerable<TEdge> edges)
+            where TEdge : IEdge<TVertex>
+        {
+            var graph = new UndirectedGraph<TVertex, TEdge>();
+            graph.AddVerticesAndEdgeRange(edges);
+            return IsUndirectedAcyclicGraphInternal(graph);
+        }
+
+        /// <summary>
+        /// Checks whether the <paramref name="graph"/> is acyclic or not.
+        /// </summary>
+        /// <typeparam name="TVertex">Vertex type.</typeparam>
+        /// <typeparam name="TEdge">Edge type.</typeparam>
+        /// <param name="graph">Graph to visit.</param>
+        /// <returns>True if the graph contains a cycle, false otherwise.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
+        [Pure]
+        public static bool IsUndirectedAcyclicGraph<TVertex, TEdge>(
+            [NotNull] this IUndirectedGraph<TVertex, TEdge> graph)
+            where TEdge : IEdge<TVertex>
+        {
+            if (graph is null)
+                throw new ArgumentNullException(nameof(graph));
+            return IsUndirectedAcyclicGraphInternal(graph);
+        }
+
         /// <summary>
         /// Given a edge cost map, computes the corresponding predecessor costs.
         /// </summary>
diff --git a/src/QuikGraph/Extensions/EdgeExtensions.cs b/src/QuikGraph/Extensions/EdgeExtensions.cs
index 97d09fbcd..38b99ce15 100644
--- a/src/QuikGraph/Extensions/EdgeExtensions.cs
+++ b/src/QuikGraph/Extensions/EdgeExtensions.cs
@@ -114,7 +114,7 @@ public static bool IsPath<TVertex, TEdge>([NotNull, ItemNotNull] this IEnumerabl
         /// <remarks>Note that this function only work when given a path.</remarks>
         /// <typeparam name="TVertex">Vertex type.</typeparam>
         /// <typeparam name="TEdge">Edge type.</typeparam>
-        /// <param name="path">Sequence of edges.</param>
+        /// <param name="path">Sequence of edges that forms a path.</param>
         /// <returns>True if the set makes a cycle, false otherwise.</returns>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="path"/> is <see langword="null"/>.</exception>
         [Pure]
diff --git a/tests/QuikGraph.Tests/Extensions/AlgorithmExtensionsTests.cs b/tests/QuikGraph.Tests/Extensions/AlgorithmExtensionsTests.cs
index 593d45bdb..e89780826 100644
--- a/tests/QuikGraph.Tests/Extensions/AlgorithmExtensionsTests.cs
+++ b/tests/QuikGraph.Tests/Extensions/AlgorithmExtensionsTests.cs
@@ -1457,23 +1457,51 @@ private static IEnumerable<TestCaseData> CreateIsDirectedAcyclicGraphTestCases(
             };
 
             var edge12 = new Edge<int>(1, 2);
+            var edge13 = new Edge<int>(1, 3);
             var edge14 = new Edge<int>(1, 4);
+            var edge16 = new Edge<int>(1, 6);
+            var edge22 = new Edge<int>(2, 2);
             var edge23 = new Edge<int>(2, 3);
             var edge24 = new Edge<int>(2, 4);
+            var edge25 = new Edge<int>(2, 5);
+            var edge31 = new Edge<int>(3, 1);
+            var edge34 = new Edge<int>(3, 4);
+            var edge35 = new Edge<int>(3, 5);
+            var edge41 = new Edge<int>(4, 1);
+            var edge44 = new Edge<int>(4, 4);
+            var edge52 = new Edge<int>(5, 2);
+            var edge56 = new Edge<int>(5, 6);
 
             // Not empty acyclic
-            var adjacencyGraph = createGraph();
-            adjacencyGraph.AddVerticesAndEdgeRange(new[]
+            var adjacencyGraph1 = createGraph();
+            adjacencyGraph1.AddVertexRange(new[] { 1, 2, 3 });
+            yield return new TestCaseData(adjacencyGraph1)
+            {
+                ExpectedResult = true
+            };
+
+            var adjacencyGraph2 = createGraph();
+            adjacencyGraph2.AddVerticesAndEdgeRange(new[]
             {
                 edge12, edge14, edge23, edge24
             });
-            yield return new TestCaseData(adjacencyGraph)
+            yield return new TestCaseData(adjacencyGraph2)
+            {
+                ExpectedResult = true
+            };
+
+            var adjacencyGraph3 = createGraph();
+            adjacencyGraph3.AddVertex(0);
+            adjacencyGraph3.AddVerticesAndEdgeRange(new[]
+            {
+                edge12, edge14, edge23, edge56
+            });
+            yield return new TestCaseData(adjacencyGraph3)
             {
                 ExpectedResult = true
             };
 
             // Not acyclic
-            var edge22 = new Edge<int>(2, 2);
             var cyclicGraph1 = createGraph();
             cyclicGraph1.AddVerticesAndEdge(edge22);
             yield return new TestCaseData(cyclicGraph1)
@@ -1491,7 +1519,6 @@ private static IEnumerable<TestCaseData> CreateIsDirectedAcyclicGraphTestCases(
                 ExpectedResult = false
             };
 
-            var edge41 = new Edge<int>(4, 1);
             var cyclicGraph3 = createGraph();
             cyclicGraph3.AddVerticesAndEdgeRange(new[]
             {
@@ -1501,6 +1528,27 @@ private static IEnumerable<TestCaseData> CreateIsDirectedAcyclicGraphTestCases(
             {
                 ExpectedResult = false
             };
+
+            var cyclicGraph4 = createGraph();
+            cyclicGraph4.AddVerticesAndEdgeRange(new[]
+            {
+                edge12, edge13, edge23, edge31, edge34, edge44
+            });
+            yield return new TestCaseData(cyclicGraph4)
+            {
+                ExpectedResult = false
+            };
+
+            var cyclicGraph5 = createGraph();
+            cyclicGraph5.AddVertex(0);
+            cyclicGraph5.AddVerticesAndEdgeRange(new[]
+            {
+                edge16, edge23, edge25, edge34, edge35, edge52
+            });
+            yield return new TestCaseData(cyclicGraph5)
+            {
+                ExpectedResult = false
+            };
         }
 
         [NotNull, ItemNotNull]
@@ -1519,18 +1567,153 @@ private static IEnumerable<TestCaseData> IsDirectedAcyclicGraphTestCases
         }
 
         [TestCaseSource(nameof(IsDirectedAcyclicGraphTestCases))]
-        public bool IsDirectedAcyclicGraph([NotNull] IVertexListGraph<int, Edge<int>> graph)
+        public bool IsDirectedAcyclicGraph([NotNull] IVertexAndEdgeListGraph<int, Edge<int>> graph)
         {
             return graph.IsDirectedAcyclicGraph();
         }
 
+        [TestCaseSource(nameof(IsDirectedAcyclicGraphTestCases))]
+        public bool IsDirectedAcyclicGraph_FromEdges([NotNull] IVertexAndEdgeListGraph<int, Edge<int>> graph)
+        {
+            return graph.Edges.IsDirectedAcyclicGraph<int, Edge<int>>();
+        }
+
         [Test]
         public void IsDirectedAcyclicGraph_Throws()
         {
-            // ReSharper disable once ReturnValueOfPureMethodIsNotUsed
-            // ReSharper disable once AssignNullToNotNullAttribute
+            // ReSharper disable ReturnValueOfPureMethodIsNotUsed
+            // ReSharper disable AssignNullToNotNullAttribute
             Assert.Throws<ArgumentNullException>(
                 () => ((AdjacencyGraph<int, Edge<int>>)null).IsDirectedAcyclicGraph());
+
+            Assert.Throws<ArgumentNullException>(
+                () => ((IEnumerable<Edge<int>>)null).IsDirectedAcyclicGraph<int, Edge<int>>());
+            var edges = new[] { new Edge<int>(1, 2), null, new Edge<int>(1, 3) };
+            Assert.Throws<ArgumentNullException>(
+                () => edges.IsDirectedAcyclicGraph<int, Edge<int>>());
+            // ReSharper restore AssignNullToNotNullAttribute
+            // ReSharper restore ReturnValueOfPureMethodIsNotUsed
+        }
+
+        [NotNull, ItemNotNull]
+        private static IEnumerable<TestCaseData> IsUndirectedAcyclicGraphTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                // Empty graph
+                yield return new TestCaseData(new UndirectedGraph<int, Edge<int>>())
+                {
+                    ExpectedResult = true
+                };
+
+                var edge12 = new Edge<int>(1, 2);
+                var edge14 = new Edge<int>(1, 4);
+                var edge16 = new Edge<int>(1, 6);
+                var edge22 = new Edge<int>(2, 2);
+                var edge23 = new Edge<int>(2, 3);
+                var edge24 = new Edge<int>(2, 4);
+                var edge25 = new Edge<int>(2, 5);
+                var edge35 = new Edge<int>(3, 5);
+                var edge56 = new Edge<int>(5, 6);
+
+                // Not empty acyclic
+                var undirectedGraph1 = new UndirectedGraph<int, Edge<int>>();
+                undirectedGraph1.AddVertexRange(new[] { 1, 2, 3 });
+                yield return new TestCaseData(undirectedGraph1)
+                {
+                    ExpectedResult = true
+                };
+
+                var undirectedGraph2 = new UndirectedGraph<int, Edge<int>>();
+                undirectedGraph2.AddVerticesAndEdgeRange(new[]
+                {
+                    edge12, edge23, edge24
+                });
+                yield return new TestCaseData(undirectedGraph2)
+                {
+                    ExpectedResult = true
+                };
+
+                var undirectedGraph3 = new UndirectedGraph<int, Edge<int>>();
+                undirectedGraph3.AddVertex(0);
+                undirectedGraph3.AddVerticesAndEdgeRange(new[]
+                {
+                    edge12, edge14, edge23, edge56
+                });
+                yield return new TestCaseData(undirectedGraph3)
+                {
+                    ExpectedResult = true
+                };
+
+                // Not acyclic
+                var cyclicGraph1 = new UndirectedGraph<int, Edge<int>>();
+                cyclicGraph1.AddVerticesAndEdge(edge22);
+                yield return new TestCaseData(cyclicGraph1)
+                {
+                    ExpectedResult = false
+                };
+
+                var cyclicGraph2 = new UndirectedGraph<int, Edge<int>>();
+                cyclicGraph2.AddVerticesAndEdgeRange(new[]
+                {
+                    edge12, edge14, edge22, edge23, edge24
+                });
+                yield return new TestCaseData(cyclicGraph2)
+                {
+                    ExpectedResult = false
+                };
+
+                var cyclicGraph3 = new UndirectedGraph<int, Edge<int>>();
+                cyclicGraph3.AddVerticesAndEdgeRange(new[]
+                {
+                    edge12, edge14, edge23, edge24
+                });
+                yield return new TestCaseData(cyclicGraph3)
+                {
+                    ExpectedResult = false
+                };
+
+                var cyclicGraph4 = new UndirectedGraph<int, Edge<int>>();
+                cyclicGraph4.AddVertex(0);
+                cyclicGraph4.AddVerticesAndEdgeRange(new[]
+                {
+                    edge16, edge23, edge25, edge35
+                });
+                yield return new TestCaseData(cyclicGraph4)
+                {
+                    ExpectedResult = false
+                };
+            }
+        }
+
+        [TestCaseSource(nameof(IsUndirectedAcyclicGraphTestCases))]
+        public bool IsUndirectedAcyclicGraph([NotNull] IUndirectedGraph<int, Edge<int>> graph)
+        {
+            return graph.IsUndirectedAcyclicGraph();
+        }
+
+        [TestCaseSource(nameof(IsUndirectedAcyclicGraphTestCases))]
+        public bool IsUndirectedAcyclicGraph_FromEdges([NotNull] IUndirectedGraph<int, Edge<int>> graph)
+        {
+            return graph.Edges.IsUndirectedAcyclicGraph<int, Edge<int>>();
+        }
+
+        [Test]
+        public void IsUndirectedAcyclicGraph_Throws()
+        {
+            // ReSharper disable ReturnValueOfPureMethodIsNotUsed
+            // ReSharper disable AssignNullToNotNullAttribute
+            Assert.Throws<ArgumentNullException>(
+                () => ((UndirectedGraph<int, Edge<int>>)null).IsUndirectedAcyclicGraph());
+
+            Assert.Throws<ArgumentNullException>(
+                () => ((IEnumerable<Edge<int>>)null).IsUndirectedAcyclicGraph<int, Edge<int>>());
+            var edges = new[] { new Edge<int>(1, 2), null, new Edge<int>(1, 3) };
+            Assert.Throws<ArgumentNullException>(
+                () => edges.IsUndirectedAcyclicGraph<int, Edge<int>>());
+            // ReSharper restore AssignNullToNotNullAttribute
+            // ReSharper restore ReturnValueOfPureMethodIsNotUsed
         }
 
         [Test]

From f28a9d3087947427ed4323ae20c08bbc5eb2253d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Mon, 28 Mar 2022 21:08:38 +0200
Subject: [PATCH 27/39] Upgrade tests to netcoreapp3.1 (supported framework).

---
 tests/QuikGraph.Data.Tests/QuikGraph.Data.Tests.csproj      | 6 +++---
 tests/QuikGraph.Graphviz.Tests/GraphvizAlgorithmTests.cs    | 1 +
 .../QuikGraph.Graphviz.Tests.csproj                         | 6 +++---
 tests/QuikGraph.MSAGL.Tests/MsaglGraphPopulatorTestsBase.cs | 1 +
 tests/QuikGraph.MSAGL.Tests/QuikGraph.MSAGL.Tests.csproj    | 6 +++---
 tests/QuikGraph.Petri.Tests/QuikGraph.Petri.Tests.csproj    | 6 +++---
 .../QuikGraph.Serialization.Tests.csproj                    | 6 +++---
 .../TestClasses/SerializationTestEdgeClasses.cs             | 2 +-
 .../TestClasses/SerializationTestVertexClasses.cs           | 2 +-
 tests/QuikGraph.Tests.CommonInternals/QuikGraphAssert.cs    | 3 ++-
 tests/QuikGraph.Tests/QuikGraph.Tests.csproj                | 6 +++---
 11 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/tests/QuikGraph.Data.Tests/QuikGraph.Data.Tests.csproj b/tests/QuikGraph.Data.Tests/QuikGraph.Data.Tests.csproj
index 4a2068e4e..e581b0ba5 100644
--- a/tests/QuikGraph.Data.Tests/QuikGraph.Data.Tests.csproj
+++ b/tests/QuikGraph.Data.Tests/QuikGraph.Data.Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net35;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;netcoreapp3.1</TargetFrameworks>
 
     <Title>QuikGraph.Data.Tests</Title>
 
@@ -47,8 +47,8 @@
   <PropertyGroup Condition="'$(TargetFramework)'=='net472'">
     <DefineConstants>$(DefineConstants);NET472;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
-    <DefineConstants>$(DefineConstants);NETCOREAPP2_1;$(AdditionalConstants)</DefineConstants>
+  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
+    <DefineConstants>$(DefineConstants);NETCOREAPP3_1;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
 
   <!-- Dependencies -->
diff --git a/tests/QuikGraph.Graphviz.Tests/GraphvizAlgorithmTests.cs b/tests/QuikGraph.Graphviz.Tests/GraphvizAlgorithmTests.cs
index 9a1312c46..02a8efc73 100644
--- a/tests/QuikGraph.Graphviz.Tests/GraphvizAlgorithmTests.cs
+++ b/tests/QuikGraph.Graphviz.Tests/GraphvizAlgorithmTests.cs
@@ -4,6 +4,7 @@
 using JetBrains.Annotations;
 using NUnit.Framework;
 using QuikGraph.Graphviz.Dot;
+using NotNullAttribute = JetBrains.Annotations.NotNullAttribute;
 
 namespace QuikGraph.Graphviz.Tests
 {
diff --git a/tests/QuikGraph.Graphviz.Tests/QuikGraph.Graphviz.Tests.csproj b/tests/QuikGraph.Graphviz.Tests/QuikGraph.Graphviz.Tests.csproj
index 71171bc2c..83b8fb018 100644
--- a/tests/QuikGraph.Graphviz.Tests/QuikGraph.Graphviz.Tests.csproj
+++ b/tests/QuikGraph.Graphviz.Tests/QuikGraph.Graphviz.Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net35;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;netcoreapp3.1</TargetFrameworks>
 
     <Title>QuikGraph.Graphviz.Tests</Title>
 
@@ -47,8 +47,8 @@
   <PropertyGroup Condition="'$(TargetFramework)'=='net472'">
     <DefineConstants>$(DefineConstants);NET472;SUPPORTS_FONT;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
-    <DefineConstants>$(DefineConstants);NETCOREAPP2_1;$(AdditionalConstants)</DefineConstants>
+  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
+    <DefineConstants>$(DefineConstants);NETCOREAPP3_1;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
 
   <!-- Dependencies -->
diff --git a/tests/QuikGraph.MSAGL.Tests/MsaglGraphPopulatorTestsBase.cs b/tests/QuikGraph.MSAGL.Tests/MsaglGraphPopulatorTestsBase.cs
index bf98bc1c2..12f58ccde 100644
--- a/tests/QuikGraph.MSAGL.Tests/MsaglGraphPopulatorTestsBase.cs
+++ b/tests/QuikGraph.MSAGL.Tests/MsaglGraphPopulatorTestsBase.cs
@@ -4,6 +4,7 @@
 using JetBrains.Annotations;
 using NUnit.Framework;
 using static QuikGraph.MSAGL.Tests.MsaglGraphTestHelpers;
+using NotNullAttribute = JetBrains.Annotations.NotNullAttribute;
 
 namespace QuikGraph.MSAGL.Tests
 {
diff --git a/tests/QuikGraph.MSAGL.Tests/QuikGraph.MSAGL.Tests.csproj b/tests/QuikGraph.MSAGL.Tests/QuikGraph.MSAGL.Tests.csproj
index 185453dee..6ff93c854 100644
--- a/tests/QuikGraph.MSAGL.Tests/QuikGraph.MSAGL.Tests.csproj
+++ b/tests/QuikGraph.MSAGL.Tests/QuikGraph.MSAGL.Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;net462;net47;net471;net472;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net461;net462;net47;net471;net472;netcoreapp3.1</TargetFrameworks>
 
     <Title>QuikGraph.MSAGL.Tests</Title>
 
@@ -29,8 +29,8 @@
   <PropertyGroup Condition="'$(TargetFramework)'=='net472'">
     <DefineConstants>$(DefineConstants);NET472;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
-    <DefineConstants>$(DefineConstants);NETCOREAPP2_1;$(AdditionalConstants)</DefineConstants>
+  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
+    <DefineConstants>$(DefineConstants);NETCOREAPP3_1;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
 
   <!-- Dependencies -->
diff --git a/tests/QuikGraph.Petri.Tests/QuikGraph.Petri.Tests.csproj b/tests/QuikGraph.Petri.Tests/QuikGraph.Petri.Tests.csproj
index 8baf53284..0b6d5a3d3 100644
--- a/tests/QuikGraph.Petri.Tests/QuikGraph.Petri.Tests.csproj
+++ b/tests/QuikGraph.Petri.Tests/QuikGraph.Petri.Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net35;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;netcoreapp3.1</TargetFrameworks>
 
     <Title>QuikGraph.Petri.Tests</Title>
 
@@ -52,8 +52,8 @@
   <PropertyGroup Condition="'$(TargetFramework)'=='net472'">
     <DefineConstants>$(DefineConstants);NET472;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
-    <DefineConstants>$(DefineConstants);NETCOREAPP2_1;$(AdditionalConstants)</DefineConstants>
+  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
+    <DefineConstants>$(DefineConstants);NETCOREAPP3_1;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
 
   <!-- Dependencies -->
diff --git a/tests/QuikGraph.Serialization.Tests/QuikGraph.Serialization.Tests.csproj b/tests/QuikGraph.Serialization.Tests/QuikGraph.Serialization.Tests.csproj
index 8b2cd09f5..82c1c0bc9 100644
--- a/tests/QuikGraph.Serialization.Tests/QuikGraph.Serialization.Tests.csproj
+++ b/tests/QuikGraph.Serialization.Tests/QuikGraph.Serialization.Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net35;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;netcoreapp3.1</TargetFrameworks>
 
     <Title>QuikGraph.Serialization.Tests</Title>
 
@@ -52,8 +52,8 @@
   <PropertyGroup Condition="'$(TargetFramework)'=='net472'">
     <DefineConstants>$(DefineConstants);NET472;SUPPORTS_SERIALIZATION;SUPPORTS_XML_DTD_PROCESSING;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
-    <DefineConstants>$(DefineConstants);NETCOREAPP2_1;SUPPORTS_SERIALIZATION;SUPPORTS_XML_DTD_PROCESSING;$(AdditionalConstants)</DefineConstants>
+  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
+    <DefineConstants>$(DefineConstants);NETCOREAPP3_1;SUPPORTS_SERIALIZATION;SUPPORTS_XML_DTD_PROCESSING;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestEdgeClasses.cs b/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestEdgeClasses.cs
index df645b851..9517ce1a6 100644
--- a/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestEdgeClasses.cs
+++ b/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestEdgeClasses.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Xml.Serialization;
-using JetBrains.Annotations;
+using NotNullAttribute = JetBrains.Annotations.NotNullAttribute;
 
 namespace QuikGraph.Serialization.Tests
 {
diff --git a/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestVertexClasses.cs b/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestVertexClasses.cs
index 82ff7d798..57d6b950f 100644
--- a/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestVertexClasses.cs
+++ b/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestVertexClasses.cs
@@ -3,7 +3,7 @@
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Xml.Serialization;
-using JetBrains.Annotations;
+using NotNullAttribute = JetBrains.Annotations.NotNullAttribute;
 
 namespace QuikGraph.Serialization.Tests
 {
diff --git a/tests/QuikGraph.Tests.CommonInternals/QuikGraphAssert.cs b/tests/QuikGraph.Tests.CommonInternals/QuikGraphAssert.cs
index fc448ec52..a85322cbb 100644
--- a/tests/QuikGraph.Tests.CommonInternals/QuikGraphAssert.cs
+++ b/tests/QuikGraph.Tests.CommonInternals/QuikGraphAssert.cs
@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 using NUnit.Framework;
+using NotNullAttribute = JetBrains.Annotations.NotNullAttribute;
 
 namespace QuikGraph.Tests
 {
diff --git a/tests/QuikGraph.Tests/QuikGraph.Tests.csproj b/tests/QuikGraph.Tests/QuikGraph.Tests.csproj
index d209a13c9..73e70dd4a 100644
--- a/tests/QuikGraph.Tests/QuikGraph.Tests.csproj
+++ b/tests/QuikGraph.Tests/QuikGraph.Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net35;net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;netcoreapp3.1</TargetFrameworks>
 
     <Title>QuikGraph.Tests</Title>
 
@@ -52,8 +52,8 @@
   <PropertyGroup Condition="'$(TargetFramework)'=='net472'">
     <DefineConstants>$(DefineConstants);NET472;SUPPORTS_SERIALIZATION;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;SUPPORTS_TASKS;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
-    <DefineConstants>$(DefineConstants);NETCOREAPP2_1;SUPPORTS_SERIALIZATION;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;$(AdditionalConstants)</DefineConstants>
+  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
+    <DefineConstants>$(DefineConstants);NETCOREAPP3_1;SUPPORTS_SERIALIZATION;SUPPORTS_SORTEDSET;SUPPORTS_ENUMERABLE_COVARIANT;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

From 3f3f0432930b3b426945dab5a7c8bb17d64c63fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Thu, 23 Jun 2022 23:07:19 +0200
Subject: [PATCH 28/39] Move files to a dedicated folder by kind of
 serialization.

---
 .../DirectedGraphMLAlgorithm.cs               |  0
 .../DirectedGraphMLExtensions.cs              |  0
 .../{ => GraphML}/GraphMLDeserializer.cs      |  0
 .../{ => GraphML}/GraphMLExtensions.cs        |  5 +---
 .../GraphML/GraphMLResourceResolver.cs        | 29 +++++++++++++++++++
 .../{ => GraphML}/GraphMLSerializer.cs        |  0
 .../{ => GraphML}/GraphMLXmlResolver.cs       | 20 ++-----------
 .../{ => GraphML}/SerializerBase.cs           |  0
 .../{ => GraphML}/XmlReaderExtensions.cs      |  0
 .../{ => GraphML}/XmlWriterExtensions.cs      |  0
 .../{ => GraphML}/graphml-attributes.xsd      |  0
 .../{ => GraphML}/graphml-parseinfo.xsd       |  0
 .../{ => GraphML}/graphml-structure.xsd       |  0
 .../{ => GraphML}/graphml.dtd                 |  0
 .../{ => GraphML}/graphml.xsd                 |  0
 .../{ => GraphML}/xlink.xsd                   |  0
 .../QuikGraph.Serialization.csproj            |  8 ++---
 .../{ => XML}/XmlConstants.cs                 |  0
 .../{ => XML}/XmlSerializableEdge.cs          |  0
 .../{ => XML}/XmlSerializableGraph.cs         |  0
 20 files changed, 34 insertions(+), 28 deletions(-)
 rename src/QuikGraph.Serialization/{ => DirectedGraphML}/DirectedGraphMLAlgorithm.cs (100%)
 rename src/QuikGraph.Serialization/{ => DirectedGraphML}/DirectedGraphMLExtensions.cs (100%)
 rename src/QuikGraph.Serialization/{ => GraphML}/GraphMLDeserializer.cs (100%)
 rename src/QuikGraph.Serialization/{ => GraphML}/GraphMLExtensions.cs (98%)
 create mode 100644 src/QuikGraph.Serialization/GraphML/GraphMLResourceResolver.cs
 rename src/QuikGraph.Serialization/{ => GraphML}/GraphMLSerializer.cs (100%)
 rename src/QuikGraph.Serialization/{ => GraphML}/GraphMLXmlResolver.cs (83%)
 rename src/QuikGraph.Serialization/{ => GraphML}/SerializerBase.cs (100%)
 rename src/QuikGraph.Serialization/{ => GraphML}/XmlReaderExtensions.cs (100%)
 rename src/QuikGraph.Serialization/{ => GraphML}/XmlWriterExtensions.cs (100%)
 rename src/QuikGraph.Serialization/{ => GraphML}/graphml-attributes.xsd (100%)
 rename src/QuikGraph.Serialization/{ => GraphML}/graphml-parseinfo.xsd (100%)
 rename src/QuikGraph.Serialization/{ => GraphML}/graphml-structure.xsd (100%)
 rename src/QuikGraph.Serialization/{ => GraphML}/graphml.dtd (100%)
 rename src/QuikGraph.Serialization/{ => GraphML}/graphml.xsd (100%)
 rename src/QuikGraph.Serialization/{ => GraphML}/xlink.xsd (100%)
 rename src/QuikGraph.Serialization/{ => XML}/XmlConstants.cs (100%)
 rename src/QuikGraph.Serialization/{ => XML}/XmlSerializableEdge.cs (100%)
 rename src/QuikGraph.Serialization/{ => XML}/XmlSerializableGraph.cs (100%)

diff --git a/src/QuikGraph.Serialization/DirectedGraphMLAlgorithm.cs b/src/QuikGraph.Serialization/DirectedGraphML/DirectedGraphMLAlgorithm.cs
similarity index 100%
rename from src/QuikGraph.Serialization/DirectedGraphMLAlgorithm.cs
rename to src/QuikGraph.Serialization/DirectedGraphML/DirectedGraphMLAlgorithm.cs
diff --git a/src/QuikGraph.Serialization/DirectedGraphMLExtensions.cs b/src/QuikGraph.Serialization/DirectedGraphML/DirectedGraphMLExtensions.cs
similarity index 100%
rename from src/QuikGraph.Serialization/DirectedGraphMLExtensions.cs
rename to src/QuikGraph.Serialization/DirectedGraphML/DirectedGraphMLExtensions.cs
diff --git a/src/QuikGraph.Serialization/GraphMLDeserializer.cs b/src/QuikGraph.Serialization/GraphML/GraphMLDeserializer.cs
similarity index 100%
rename from src/QuikGraph.Serialization/GraphMLDeserializer.cs
rename to src/QuikGraph.Serialization/GraphML/GraphMLDeserializer.cs
diff --git a/src/QuikGraph.Serialization/GraphMLExtensions.cs b/src/QuikGraph.Serialization/GraphML/GraphMLExtensions.cs
similarity index 98%
rename from src/QuikGraph.Serialization/GraphMLExtensions.cs
rename to src/QuikGraph.Serialization/GraphML/GraphMLExtensions.cs
index e912e3345..a7f238904 100644
--- a/src/QuikGraph.Serialization/GraphMLExtensions.cs
+++ b/src/QuikGraph.Serialization/GraphML/GraphMLExtensions.cs
@@ -1,7 +1,6 @@
 #if SUPPORTS_GRAPHS_SERIALIZATION
 using System;
 #if SUPPORTS_XML_DTD_PROCESSING
-using System.Diagnostics;
 using System.Xml.Schema;
 #endif
 using System.IO;
@@ -324,10 +323,8 @@ public static void DeserializeAndValidateFromGraphML<TVertex, TEdge, TGraph>(
 
         private static void AddGraphMLSchema([NotNull] XmlReaderSettings settings, [NotNull] XmlResolver resolver)
         {
-            using (Stream xsdStream = typeof(GraphMLExtensions).Assembly.GetManifestResourceStream(typeof(GraphMLExtensions), "graphml.xsd"))
+            using (Stream xsdStream = GraphMLResourceResolver.GetResource("graphml.xsd"))
             {
-                Debug.Assert(xsdStream != null, "GraphML schema resource not found.");
-
                 settings.Schemas.XmlResolver = resolver;
                 // ReSharper disable once AssignNullToNotNullAttribute, Justification: assert above
                 using (XmlReader xsdReader = XmlReader.Create(xsdStream, settings))
diff --git a/src/QuikGraph.Serialization/GraphML/GraphMLResourceResolver.cs b/src/QuikGraph.Serialization/GraphML/GraphMLResourceResolver.cs
new file mode 100644
index 000000000..c2f22970a
--- /dev/null
+++ b/src/QuikGraph.Serialization/GraphML/GraphMLResourceResolver.cs
@@ -0,0 +1,29 @@
+#if SUPPORTS_GRAPHS_SERIALIZATION
+using System.Diagnostics;
+using System.IO;
+using JetBrains.Annotations;
+
+namespace QuikGraph.Serialization
+{
+    internal static class GraphMLResourceResolver
+    {
+        /// <summary>
+        /// Gets the GraphML resource with given <paramref name="resourceName"/>.
+        /// </summary>
+        /// <param name="resourceName">Resource name.</param>
+        /// <returns>Resource stream.</returns>
+        [Pure]
+        [NotNull]
+        public static Stream GetResource([NotNull] string resourceName)
+        {
+            Stream resourceStream = typeof(GraphMLResourceResolver).Assembly
+                .GetManifestResourceStream(
+                    typeof(GraphMLResourceResolver),
+                    $@"GraphML.{resourceName}");
+
+            Debug.Assert(resourceStream != null);
+            return resourceStream;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/QuikGraph.Serialization/GraphMLSerializer.cs b/src/QuikGraph.Serialization/GraphML/GraphMLSerializer.cs
similarity index 100%
rename from src/QuikGraph.Serialization/GraphMLSerializer.cs
rename to src/QuikGraph.Serialization/GraphML/GraphMLSerializer.cs
diff --git a/src/QuikGraph.Serialization/GraphMLXmlResolver.cs b/src/QuikGraph.Serialization/GraphML/GraphMLXmlResolver.cs
similarity index 83%
rename from src/QuikGraph.Serialization/GraphMLXmlResolver.cs
rename to src/QuikGraph.Serialization/GraphML/GraphMLXmlResolver.cs
index 4f40f3337..dd391db80 100644
--- a/src/QuikGraph.Serialization/GraphMLXmlResolver.cs
+++ b/src/QuikGraph.Serialization/GraphML/GraphMLXmlResolver.cs
@@ -1,10 +1,9 @@
 #if SUPPORTS_GRAPHS_SERIALIZATION
 using System;
-using System.Diagnostics;
-using System.IO;
 using System.Net;
 using System.Xml;
 using JetBrains.Annotations;
+using static QuikGraph.Serialization.GraphMLResourceResolver;
 
 namespace QuikGraph.Serialization
 {
@@ -71,23 +70,8 @@ public override object GetEntity(Uri absoluteUri, string role, Type ofObjectToRe
 
             if (absoluteUri.AbsoluteUri.EndsWith("xlink.xsd"))
                 return GetResource("xlink.xsd");
-            
-            return _baseResolver.GetEntity(absoluteUri, role, ofObjectToReturn);
 
-            #region Local function
-
-            Stream GetResource(string resourceName)
-            {
-                Stream resourceStream = typeof(GraphMLExtensions).Assembly
-                    .GetManifestResourceStream(
-                        typeof(GraphMLExtensions),
-                        resourceName);
-                
-                Debug.Assert(resourceStream != null);
-                return resourceStream;
-            }
-
-            #endregion
+            return _baseResolver.GetEntity(absoluteUri, role, ofObjectToReturn);
         }
     }
 }
diff --git a/src/QuikGraph.Serialization/SerializerBase.cs b/src/QuikGraph.Serialization/GraphML/SerializerBase.cs
similarity index 100%
rename from src/QuikGraph.Serialization/SerializerBase.cs
rename to src/QuikGraph.Serialization/GraphML/SerializerBase.cs
diff --git a/src/QuikGraph.Serialization/XmlReaderExtensions.cs b/src/QuikGraph.Serialization/GraphML/XmlReaderExtensions.cs
similarity index 100%
rename from src/QuikGraph.Serialization/XmlReaderExtensions.cs
rename to src/QuikGraph.Serialization/GraphML/XmlReaderExtensions.cs
diff --git a/src/QuikGraph.Serialization/XmlWriterExtensions.cs b/src/QuikGraph.Serialization/GraphML/XmlWriterExtensions.cs
similarity index 100%
rename from src/QuikGraph.Serialization/XmlWriterExtensions.cs
rename to src/QuikGraph.Serialization/GraphML/XmlWriterExtensions.cs
diff --git a/src/QuikGraph.Serialization/graphml-attributes.xsd b/src/QuikGraph.Serialization/GraphML/graphml-attributes.xsd
similarity index 100%
rename from src/QuikGraph.Serialization/graphml-attributes.xsd
rename to src/QuikGraph.Serialization/GraphML/graphml-attributes.xsd
diff --git a/src/QuikGraph.Serialization/graphml-parseinfo.xsd b/src/QuikGraph.Serialization/GraphML/graphml-parseinfo.xsd
similarity index 100%
rename from src/QuikGraph.Serialization/graphml-parseinfo.xsd
rename to src/QuikGraph.Serialization/GraphML/graphml-parseinfo.xsd
diff --git a/src/QuikGraph.Serialization/graphml-structure.xsd b/src/QuikGraph.Serialization/GraphML/graphml-structure.xsd
similarity index 100%
rename from src/QuikGraph.Serialization/graphml-structure.xsd
rename to src/QuikGraph.Serialization/GraphML/graphml-structure.xsd
diff --git a/src/QuikGraph.Serialization/graphml.dtd b/src/QuikGraph.Serialization/GraphML/graphml.dtd
similarity index 100%
rename from src/QuikGraph.Serialization/graphml.dtd
rename to src/QuikGraph.Serialization/GraphML/graphml.dtd
diff --git a/src/QuikGraph.Serialization/graphml.xsd b/src/QuikGraph.Serialization/GraphML/graphml.xsd
similarity index 100%
rename from src/QuikGraph.Serialization/graphml.xsd
rename to src/QuikGraph.Serialization/GraphML/graphml.xsd
diff --git a/src/QuikGraph.Serialization/xlink.xsd b/src/QuikGraph.Serialization/GraphML/xlink.xsd
similarity index 100%
rename from src/QuikGraph.Serialization/xlink.xsd
rename to src/QuikGraph.Serialization/GraphML/xlink.xsd
diff --git a/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj b/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj
index 58f6e2572..663bd2f8d 100644
--- a/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj
+++ b/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj
@@ -35,12 +35,8 @@ Updates:
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3'">
-    <EmbeddedResource Include="graphml.dtd" />
-    <EmbeddedResource Include="graphml.xsd" />
-    <EmbeddedResource Include="graphml-structure.xsd" />
-    <EmbeddedResource Include="graphml-attributes.xsd" />
-    <EmbeddedResource Include="graphml-parseinfo.xsd" />
-    <EmbeddedResource Include="xlink.xsd" />
+    <EmbeddedResource Include="**\*.dtd" />
+    <EmbeddedResource Include="**\*.xsd" />
   </ItemGroup>
 
   <!-- Targets defines -->
diff --git a/src/QuikGraph.Serialization/XmlConstants.cs b/src/QuikGraph.Serialization/XML/XmlConstants.cs
similarity index 100%
rename from src/QuikGraph.Serialization/XmlConstants.cs
rename to src/QuikGraph.Serialization/XML/XmlConstants.cs
diff --git a/src/QuikGraph.Serialization/XmlSerializableEdge.cs b/src/QuikGraph.Serialization/XML/XmlSerializableEdge.cs
similarity index 100%
rename from src/QuikGraph.Serialization/XmlSerializableEdge.cs
rename to src/QuikGraph.Serialization/XML/XmlSerializableEdge.cs
diff --git a/src/QuikGraph.Serialization/XmlSerializableGraph.cs b/src/QuikGraph.Serialization/XML/XmlSerializableGraph.cs
similarity index 100%
rename from src/QuikGraph.Serialization/XmlSerializableGraph.cs
rename to src/QuikGraph.Serialization/XML/XmlSerializableGraph.cs

From 0353ab196597e97762c02f002bdcd75d59263a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sat, 25 Jun 2022 15:51:54 +0200
Subject: [PATCH 29/39] Fix fields being written several type for type with
 multiple inheritance layers.

---
 src/QuikGraph.Serialization/Helpers/SerializationHelpers.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/QuikGraph.Serialization/Helpers/SerializationHelpers.cs b/src/QuikGraph.Serialization/Helpers/SerializationHelpers.cs
index 27233df8d..9ff89d276 100644
--- a/src/QuikGraph.Serialization/Helpers/SerializationHelpers.cs
+++ b/src/QuikGraph.Serialization/Helpers/SerializationHelpers.cs
@@ -50,7 +50,7 @@ public static IEnumerable<PropertySerializationInfo> GetAttributeProperties([Can
             {
                 // Iterate through properties that must have a get, and are not indexed property
                 IEnumerable<PropertyInfo> properties = currentType
-                    .GetProperties(BindingFlags.Public | BindingFlags.Instance)
+                    .GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)
                     .Where(ValidProperty);
                 foreach (PropertyInfo property in properties)
                 {

From a61a06f8d3e1f8bc65cd77add615edd0a42a24c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sat, 25 Jun 2022 16:06:59 +0200
Subject: [PATCH 30/39] Optimize a bit methods calls in generated code for
 GraphML serialization.

---
 .../GraphML/GraphMLDeserializer.cs            | 18 ++++----------
 .../GraphML/GraphMLSerializer.cs              | 24 +++++--------------
 .../Helpers/ILHelpers.cs                      | 14 +++++------
 3 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/src/QuikGraph.Serialization/GraphML/GraphMLDeserializer.cs b/src/QuikGraph.Serialization/GraphML/GraphMLDeserializer.cs
index 5ba033d36..61bb7e5ed 100644
--- a/src/QuikGraph.Serialization/GraphML/GraphMLDeserializer.cs
+++ b/src/QuikGraph.Serialization/GraphML/GraphMLDeserializer.cs
@@ -177,7 +177,7 @@ private static Delegate CreateReadDelegate(
 
                 generator.Emit(OpCodes.Ldarg_0);
                 generator.Emit(OpCodes.Ldstr, "key");
-                generator.EmitCall(OpCodes.Callvirt, Metadata.GetAttributeMethod, null);
+                EmitCall(generator, Metadata.GetAttributeMethod);
                 generator.Emit(OpCodes.Stloc_0);
 
                 // We need to create the switch for each property
@@ -196,7 +196,7 @@ private static Delegate CreateReadDelegate(
 
                     generator.Emit(OpCodes.Ldloc_0);
                     generator.Emit(OpCodes.Ldstr, info.Name);
-                    generator.EmitCall(OpCodes.Call, Metadata.StringEqualsMethod, null);
+                    EmitCall(generator, Metadata.StringEqualsMethod);
 
                     // If false jump to next
                     generator.Emit(OpCodes.Brfalse, next);
@@ -210,21 +210,13 @@ private static Delegate CreateReadDelegate(
                     if (setMethod is null)
                         throw new InvalidOperationException($"Property {property.DeclaringType}.{property.Name} has no setter.");
 
-                    // reader.ReadXXX
+                    // reader.ReadXXX + SetField
                     generator.Emit(OpCodes.Ldarg_2); // element
                     generator.Emit(OpCodes.Ldarg_0); // reader
                     generator.Emit(OpCodes.Ldstr, "data");
                     generator.Emit(OpCodes.Ldarg_1); // namespace URI
-
-                    // When writing scalar values we call member methods of XmlReader, while for array values 
-                    // we call our own static methods. These two types of methods seem to need different OpCode.
-                    generator.EmitCall(
-                        readMethod.DeclaringType == typeof(XmlReaderExtensions)
-                            ? OpCodes.Call
-                            : OpCodes.Callvirt,
-                        readMethod,
-                        null);
-                    generator.EmitCall(OpCodes.Callvirt, setMethod, null);
+                    EmitCall(generator, readMethod);
+                    EmitCall(generator, setMethod);
 
                     // Jump to do while
                     generator.Emit(OpCodes.Br, @return);
diff --git a/src/QuikGraph.Serialization/GraphML/GraphMLSerializer.cs b/src/QuikGraph.Serialization/GraphML/GraphMLSerializer.cs
index 0a55adbe3..3a84387b9 100644
--- a/src/QuikGraph.Serialization/GraphML/GraphMLSerializer.cs
+++ b/src/QuikGraph.Serialization/GraphML/GraphMLSerializer.cs
@@ -81,18 +81,6 @@ static WriteDelegateCompiler()
                         typeof(WriteGraphAttributesDelegate));
             }
 
-            private static void EmitCallWriter([NotNull] ILGenerator generator, [NotNull] MethodInfo writer)
-            {
-                // When reading scalar values we call member methods of XmlReader, while for array values 
-                // we call our own static methods.  These two types of methods seem to need different OpCode.
-                generator.EmitCall(
-                    writer.DeclaringType == typeof(XmlWriterExtensions)
-                        ? OpCodes.Call
-                        : OpCodes.Callvirt,
-                    writer,
-                    null);
-            }
-
             private static void EmitWriteProperty(PropertySerializationInfo info, [NotNull] ILGenerator generator)
             {
                 var @default = default(Label);
@@ -117,7 +105,7 @@ private static void EmitWriteProperty(PropertySerializationInfo info, [NotNull]
 
                     EmitValue(generator, property, value);
                     generator.Emit(OpCodes.Ldarg_1);
-                    generator.EmitCall(OpCodes.Callvirt, getMethod, null);
+                    EmitCall(generator, getMethod);
                     generator.Emit(OpCodes.Ceq);
                     generator.Emit(OpCodes.Brtrue, @default);
                 }
@@ -128,23 +116,23 @@ private static void EmitWriteProperty(PropertySerializationInfo info, [NotNull]
                 generator.Emit(OpCodes.Ldarg_0);
                 generator.Emit(OpCodes.Ldstr, "data");
                 generator.Emit(OpCodes.Ldstr, GraphMLXmlResolver.GraphMLNamespace);
-                generator.EmitCall(OpCodes.Callvirt, Metadata.WriteStartElementMethod, null);
+                EmitCall(generator, Metadata.WriteStartElementMethod);
 
                 // writer.WriteStartAttribute("key");
                 generator.Emit(OpCodes.Ldarg_0);
                 generator.Emit(OpCodes.Ldstr, "key");
                 generator.Emit(OpCodes.Ldstr, info.Name);
-                generator.EmitCall(OpCodes.Callvirt, Metadata.WriteAttributeStringMethod, null);
+                EmitCall(generator, Metadata.WriteAttributeStringMethod);
 
                 // writer.WriteValue(v.xxx);
                 generator.Emit(OpCodes.Ldarg_0);
                 generator.Emit(OpCodes.Ldarg_1);
-                generator.EmitCall(OpCodes.Callvirt, getMethod, null);
-                EmitCallWriter(generator, writeMethod);
+                EmitCall(generator, getMethod);
+                EmitCall(generator, writeMethod);
 
                 // writer.WriteEndElement()
                 generator.Emit(OpCodes.Ldarg_0);
-                generator.EmitCall(OpCodes.Callvirt, Metadata.WriteEndElementMethod, null);
+                EmitCall(generator, Metadata.WriteEndElementMethod);
 
                 if (defaultValueAttribute != null)
                 {
diff --git a/src/QuikGraph.Serialization/Helpers/ILHelpers.cs b/src/QuikGraph.Serialization/Helpers/ILHelpers.cs
index 9615d2090..3ae9d72c5 100644
--- a/src/QuikGraph.Serialization/Helpers/ILHelpers.cs
+++ b/src/QuikGraph.Serialization/Helpers/ILHelpers.cs
@@ -1,4 +1,4 @@
-#if SUPPORTS_GRAPHS_SERIALIZATION
+#if SUPPORTS_GRAPHS_SERIALIZATION
 using System;
 using System.Diagnostics;
 using System.Reflection;
@@ -44,12 +44,12 @@ public static void EmitValue([NotNull] ILGenerator generator, [NotNull] Property
 
         public static void EmitCall([NotNull] ILGenerator generator, [NotNull] MethodInfo method)
         {
-            generator.EmitCall(
-                method.IsVirtual
-                    ? OpCodes.Callvirt
-                    : OpCodes.Call,
-                method,
-                null);
+            // Call the method passing the object on the stack (only virtual if needed)
+            generator.Emit(
+                method.IsFinal || !method.IsVirtual
+                    ? OpCodes.Call
+                    : OpCodes.Callvirt,
+                method);
         }
     }
 }

From 131f73aebddb505650da6eb6bf73cbc115055cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Mon, 13 Jun 2022 00:14:47 +0200
Subject: [PATCH 31/39] Fix location of some graph interfaces.

---
 .../Interfaces/{Edges => Graphs}/IEdgeListAndIncidenceGraph.cs    | 0
 src/QuikGraph/Interfaces/{Edges => Graphs}/IEdgeSet.cs            | 0
 .../Interfaces/{Vertices => Graphs}/IImplicitVertexSet.cs         | 0
 .../Interfaces/{Vertices => Graphs}/IMutableVertexSet.cs          | 0
 src/QuikGraph/Interfaces/{Vertices => Graphs}/IVertexSet.cs       | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename src/QuikGraph/Interfaces/{Edges => Graphs}/IEdgeListAndIncidenceGraph.cs (100%)
 rename src/QuikGraph/Interfaces/{Edges => Graphs}/IEdgeSet.cs (100%)
 rename src/QuikGraph/Interfaces/{Vertices => Graphs}/IImplicitVertexSet.cs (100%)
 rename src/QuikGraph/Interfaces/{Vertices => Graphs}/IMutableVertexSet.cs (100%)
 rename src/QuikGraph/Interfaces/{Vertices => Graphs}/IVertexSet.cs (100%)

diff --git a/src/QuikGraph/Interfaces/Edges/IEdgeListAndIncidenceGraph.cs b/src/QuikGraph/Interfaces/Graphs/IEdgeListAndIncidenceGraph.cs
similarity index 100%
rename from src/QuikGraph/Interfaces/Edges/IEdgeListAndIncidenceGraph.cs
rename to src/QuikGraph/Interfaces/Graphs/IEdgeListAndIncidenceGraph.cs
diff --git a/src/QuikGraph/Interfaces/Edges/IEdgeSet.cs b/src/QuikGraph/Interfaces/Graphs/IEdgeSet.cs
similarity index 100%
rename from src/QuikGraph/Interfaces/Edges/IEdgeSet.cs
rename to src/QuikGraph/Interfaces/Graphs/IEdgeSet.cs
diff --git a/src/QuikGraph/Interfaces/Vertices/IImplicitVertexSet.cs b/src/QuikGraph/Interfaces/Graphs/IImplicitVertexSet.cs
similarity index 100%
rename from src/QuikGraph/Interfaces/Vertices/IImplicitVertexSet.cs
rename to src/QuikGraph/Interfaces/Graphs/IImplicitVertexSet.cs
diff --git a/src/QuikGraph/Interfaces/Vertices/IMutableVertexSet.cs b/src/QuikGraph/Interfaces/Graphs/IMutableVertexSet.cs
similarity index 100%
rename from src/QuikGraph/Interfaces/Vertices/IMutableVertexSet.cs
rename to src/QuikGraph/Interfaces/Graphs/IMutableVertexSet.cs
diff --git a/src/QuikGraph/Interfaces/Vertices/IVertexSet.cs b/src/QuikGraph/Interfaces/Graphs/IVertexSet.cs
similarity index 100%
rename from src/QuikGraph/Interfaces/Vertices/IVertexSet.cs
rename to src/QuikGraph/Interfaces/Graphs/IVertexSet.cs

From 9fb2035609d479e4b445829d79448b0ec53fd280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sat, 25 Jun 2022 23:14:17 +0200
Subject: [PATCH 32/39] Clean GraphML format definitions.

---
 .../GraphML/graphml-attributes.xsd            |  160 +-
 .../GraphML/graphml-parseinfo.xsd             |  444 ++--
 .../GraphML/graphml-structure.xsd             | 1870 +++++++++--------
 .../GraphML/graphml.dtd                       |   18 +-
 .../GraphML/graphml.xsd                       |  494 ++---
 src/QuikGraph.Serialization/GraphML/xlink.xsd |  108 +-
 6 files changed, 1566 insertions(+), 1528 deletions(-)

diff --git a/src/QuikGraph.Serialization/GraphML/graphml-attributes.xsd b/src/QuikGraph.Serialization/GraphML/graphml-attributes.xsd
index 361d68208..fdedb5c14 100644
--- a/src/QuikGraph.Serialization/GraphML/graphml-attributes.xsd
+++ b/src/QuikGraph.Serialization/GraphML/graphml-attributes.xsd
@@ -1,110 +1,104 @@
 <?xml version="1.0"?>
+<xs:schema
+  targetNamespace="http://graphml.graphdrawing.org/xmlns"
+  xmlns="http://graphml.graphdrawing.org/xmlns"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified">
 
-<xs:schema   
-    targetNamespace="http://graphml.graphdrawing.org/xmlns"
-
-    xmlns="http://graphml.graphdrawing.org/xmlns"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
->
   <xs:annotation>
     <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
-     This document defines the attributes extension of the GraphML language.
-     It redefines the attribut list of &lt;key> by adding two new 
-     attributes:
-     - attr.name (gives a name for the data function) and
-     - attr.type (declares the range of values for the data function).
-     The data values are defined in #PCDATA children of the corresponding
-     &lt;data> element.
+      source="http://graphml.graphdrawing.org/"
+      xml:lang="en">
+      This document defines the attributes extension of the GraphML language.
+      It redefines the attribute list of &lt;key&gt; by adding two new 
+      attributes:
+          - attr.name (gives a name for the data function) and
+          - attr.type (declares the range of values for the data function).
+      The data values are defined in #PCDATA children of the corresponding
+      &lt;data&gt; element.
     </xs:documentation>
   </xs:annotation>
 
+  <xs:redefine schemaLocation="http://graphml.graphdrawing.org/xmlns/1.1/graphml-structure.xsd">
 
-<xs:redefine schemaLocation="http://graphml.graphdrawing.org/xmlns/1.1/graphml-structure.xsd">
-
-  <xs:annotation>
-    <xs:documentation 
+    <xs:annotation>
+      <xs:documentation
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-     Redefinition of file graphml-structure.xsd.
-     Extends the attribute group key.extra.attrib (which takes
-     part in the attribute list of &lt;key>) by adding the
-     attribute group key.attributes.attrib which is defined below.
-    </xs:documentation>
-  </xs:annotation>
+        Redefinition of file graphml-structure.xsd.
+        Extends the attribute group key.extra.attrib (which takes
+        part in the attribute list of &lt;key&gt;) by adding the
+        attribute group key.attributes.attrib which is defined below.
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:attributeGroup name="key.extra.attrib">
-    <xs:attributeGroup ref="key.extra.attrib"/>
-    <xs:attributeGroup ref="key.attributes.attrib"/>
-  </xs:attributeGroup>
+    <xs:attributeGroup name="key.extra.attrib">
+      <xs:attributeGroup ref="key.extra.attrib"/>
+      <xs:attributeGroup ref="key.attributes.attrib"/>
+    </xs:attributeGroup>
 
-</xs:redefine>
+  </xs:redefine>
 
-<xs:simpleType name="key.name.type" final="#all">
+  <xs:simpleType name="key.name.type" final="#all">
 
-  <xs:annotation>
-    <xs:documentation 
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/(Dokumentation der Attributes Erweiterung; entsprechende Stelle.html)"
         xml:lang="en">
-      Simple type for the attr.name attribute of &lt;key>.
-      key.name.type is final, that is, it may not be extended
-                          or restricted.
-      key.name.type is a restriction of xs:NMTOKEN
-      Allowed values: (no restriction)
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:restriction base="xs:NMTOKEN"/>
-
-</xs:simpleType>
+        Simple type for the attr.name attribute of &lt;key&gt;.
+        key.name.type is final, that is, it may not be extended
+        or restricted.
+        key.name.type is a restriction of xs:NMTOKEN
+        Allowed values: (no restriction)
+      </xs:documentation>
+    </xs:annotation>
 
+    <xs:restriction base="xs:NMTOKEN"/>
 
+  </xs:simpleType>
 
-<xs:simpleType name="key.type.type" final="#all">
+  <xs:simpleType name="key.type.type" final="#all">
 
-  <xs:annotation>
-    <xs:documentation 
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/(Dokumentation der Attributes Erweiterung; entsprechende Stelle.html)"
         xml:lang="en">
-      Simple type for the attr.type attribute of &lt;key>.
-      key.type.type is final, that is, it may not be extended
-                          or restricted.
-      key.type.type is a restriction of xs:NMTOKEN
-      Allowed values: boolean, int, long, float, double, string.
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:restriction base="xs:NMTOKEN">  
-    <xs:enumeration value="boolean"/>
-    <xs:enumeration value="int"/>
-    <xs:enumeration value="long"/>
-    <xs:enumeration value="float"/>
-    <xs:enumeration value="double"/>
-    <xs:enumeration value="string"/>
-  </xs:restriction>
-
-</xs:simpleType>
-
-
-<xs:attributeGroup name="key.attributes.attrib">
-
-  <xs:annotation>
-    <xs:documentation 
+        Simple type for the attr.type attribute of &lt;key&gt;.
+        key.type.type is final, that is, it may not be extended
+        or restricted.
+        key.type.type is a restriction of xs:NMTOKEN
+        Allowed values: boolean, int, long, float, double, string.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:restriction base="xs:NMTOKEN">  
+      <xs:enumeration value="boolean"/>
+      <xs:enumeration value="int"/>
+      <xs:enumeration value="long"/>
+      <xs:enumeration value="float"/>
+      <xs:enumeration value="double"/>
+      <xs:enumeration value="string"/>
+    </xs:restriction>
+
+  </xs:simpleType>
+
+  <xs:attributeGroup name="key.attributes.attrib">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-     Definition of the attribute group key.attributes.attrib.
-     This group consists of the two optional attributes
-         - attr.name (gives the name for the data function)
-         - attr.type ((declares the range of values for the data function)
-    </xs:documentation>
-  </xs:annotation>
+        Definition of the attribute group key.attributes.attrib.
+        This group consists of the two optional attributes
+            - attr.name (gives the name for the data function)
+            - attr.type ((declares the range of values for the data function)
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:attribute name="attr.name" type="key.name.type" use="optional"/>
+    <xs:attribute name="attr.type" type="key.type.type" use="optional"/>
 
-  <xs:attribute name="attr.name" type="key.name.type" use="optional"/>
-  <xs:attribute name="attr.type" type="key.type.type" use="optional"/>
-</xs:attributeGroup>
+  </xs:attributeGroup>
 
 </xs:schema>
\ No newline at end of file
diff --git a/src/QuikGraph.Serialization/GraphML/graphml-parseinfo.xsd b/src/QuikGraph.Serialization/GraphML/graphml-parseinfo.xsd
index ad90e040c..ac7164498 100644
--- a/src/QuikGraph.Serialization/GraphML/graphml-parseinfo.xsd
+++ b/src/QuikGraph.Serialization/GraphML/graphml-parseinfo.xsd
@@ -1,295 +1,297 @@
 <?xml version="1.0"?>
-
-<xs:schema   
-    targetNamespace="http://graphml.graphdrawing.org/xmlns"
-
-    xmlns="http://graphml.graphdrawing.org/xmlns"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
->
+<xs:schema
+  targetNamespace="http://graphml.graphdrawing.org/xmlns"
+  xmlns="http://graphml.graphdrawing.org/xmlns"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified">
 
   <xs:annotation>
     <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
-     This document defines the parseinfo extension of the GraphML language.
-     It redefines the attribut list of &lt;graph> by adding 7 new 
-     attributes:
-     - parse.nodeids (fixed to 'canonical' meaning that the id attribute
-                      of &lt;node> follows the pattern 'n[number]),
-     - parse.edgeids (fixed to 'canonical' meaning that the id attribute
-                      of &lt;edge> follows the pattern 'e[number]),
-     - parse.order (required; one of the values 'nodesfirst', 
-                    'adjacencylist' or 'free'),
-     - parse.nodes (required; number of nodes in this graph), 
-     - parse.edges (required; number of edges in this graph), 
-     - parse.maxindegree (optional; maximal indegree of a node in this graph),
-     - parse.maxoutdegree (optional; maximal outdegree of a node in this graph).
-     and it redefines the attribute list of node by adding 2 new attributes:
-     - parse.indegree (optional; indegree of this node),
-     - parse.outdegree (optional; outdegree of this node).
-
+      source="http://graphml.graphdrawing.org/"
+      xml:lang="en">
+      This document defines the parseinfo extension of the GraphML language.
+      It redefines the attribut list of &lt;graph&gt; by adding 7 new
+      attributes:
+        - parse.nodeids (fixed to 'canonical' meaning that the id attribute
+          of &lt;node> follows the pattern 'n[number]),
+        - parse.edgeids (fixed to 'canonical' meaning that the id attribute
+          of &lt;edge> follows the pattern 'e[number]),
+        - parse.order (required; one of the values 'nodesfirst',
+          'adjacencylist' or 'free'),
+        - parse.nodes (required; number of nodes in this graph),
+        - parse.edges (required; number of edges in this graph),
+        - parse.maxindegree (optional; maximal indegree of a node in this graph),
+        - parse.maxoutdegree (optional; maximal outdegree of a node in this graph).
+          and it redefines the attribute list of node by adding 2 new attributes:
+        - parse.indegree (optional; indegree of this node),
+        - parse.outdegree (optional; outdegree of this node).
     </xs:documentation>
   </xs:annotation>
 
+  <xs:redefine schemaLocation="http://graphml.graphdrawing.org/xmlns/1.1/graphml-structure.xsd">
 
-<xs:redefine schemaLocation="http://graphml.graphdrawing.org/xmlns/1.1/graphml-structure.xsd">
-
-  <xs:annotation>
-    <xs:documentation 
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-     Redefinition of file graphml-structure.xsd.
-     Extends the attribute group graph.extra.attrib (which takes
-     part in the attribute list of &lt;graph>) by adding the
-     attribute group graph.parseinfo.attrib which is defined below.
-     Extends the attribute group node.extra.attrib (which takes
-     part in the attribute list of &lt;node>) by adding the
-     attribute group node.parseinfo.attrib which is defined below.
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:attributeGroup name="graph.extra.attrib">
-    <xs:attributeGroup ref="graph.extra.attrib"/>
-    <xs:attributeGroup ref="graph.parseinfo.attrib"/>
-  </xs:attributeGroup>
-
-  <xs:attributeGroup name="node.extra.attrib">
-    <xs:attributeGroup ref="node.extra.attrib"/>
-    <xs:attributeGroup ref="node.parseinfo.attrib"/>
-  </xs:attributeGroup>
-
-</xs:redefine>
-
+        Redefinition of file graphml-structure.xsd.
+        Extends the attribute group graph.extra.attrib (which takes
+        part in the attribute list of &lt;graph&gt;) by adding the
+        attribute group graph.parseinfo.attrib which is defined below.
+        Extends the attribute group node.extra.attrib (which takes
+        part in the attribute list of &lt;node&gt;) by adding the
+        attribute group node.parseinfo.attrib which is defined below.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:attributeGroup name="graph.extra.attrib">
+      <xs:attributeGroup ref="graph.extra.attrib"/>
+      <xs:attributeGroup ref="graph.parseinfo.attrib"/>
+    </xs:attributeGroup>
+
+    <xs:attributeGroup name="node.extra.attrib">
+      <xs:attributeGroup ref="node.extra.attrib"/>
+      <xs:attributeGroup ref="node.parseinfo.attrib"/>
+    </xs:attributeGroup>
+
+  </xs:redefine>
 
   <xs:annotation>
     <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
-       Simple type definitions for the new graph attributes.
+      source="http://graphml.graphdrawing.org/"
+      xml:lang="en">
+      Simple type definitions for the new graph attributes.
     </xs:documentation>
   </xs:annotation>
 
-<xs:simpleType name="graph.order.type"  final="#all">
+  <xs:simpleType name="graph.order.type" final="#all">
 
-  <xs:annotation>
-    <xs:documentation 
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.order attribute of &lt;graph>.
-      graph.order.type is final, that is, it may not be extended
-                          or restricted.
-      graph.order.type is a restriction of xs:NMTOKEN
-      Allowed values: free, nodesfirst, adjacencylist.
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:restriction base="xs:NMTOKEN">
-    <xs:enumeration value="free"/>
-    <xs:enumeration value="nodesfirst"/>
-    <xs:enumeration value="adjacencylist"/>
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="graph.nodes.type"  final="#all">
-
-  <xs:annotation>
-    <xs:documentation 
+        Simple type for the parse.order attribute of &lt;graph&gt;.
+        graph.order.type is final, that is, it may not be extended
+        or restricted.
+        graph.order.type is a restriction of xs:NMTOKEN
+        Allowed values: free, nodesfirst, adjacencylist.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:restriction base="xs:NMTOKEN">
+      <xs:enumeration value="free"/>
+      <xs:enumeration value="nodesfirst"/>
+      <xs:enumeration value="adjacencylist"/>
+    </xs:restriction>
+
+  </xs:simpleType>
+
+  <xs:simpleType name="graph.nodes.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.nodes attribute of &lt;graph>.
-      graph.nodes.type is final, that is, it may not be extended
-                          or restricted.
-      graph.nodes.type is a restriction of xs:nonNegativeInteger
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.nodes attribute of &lt;graph&gt;.
+        graph.nodes.type is final, that is, it may not be extended
+        or restricted.
+        graph.nodes.type is a restriction of xs:nonNegativeInteger
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:nonNegativeInteger"/>  
-</xs:simpleType>
+    <xs:restriction base="xs:nonNegativeInteger"/>
 
-<xs:simpleType name="graph.edges.type" final="#all">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:simpleType name="graph.edges.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.edges attribute of &lt;graph>.
-      graph.edges.type is final, that is, it may not be extended
-                          or restricted.
-      graph.edges.type is a restriction of xs:nonNegativeInteger
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.edges attribute of &lt;graph&gt;.
+        graph.edges.type is final, that is, it may not be extended
+        or restricted.
+        graph.edges.type is a restriction of xs:nonNegativeInteger
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:nonNegativeInteger"/>  
-</xs:simpleType>
+    <xs:restriction base="xs:nonNegativeInteger"/>
 
-<xs:simpleType name="graph.maxindegree.type" final="#all">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:simpleType name="graph.maxindegree.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.maxindegree attribute of &lt;graph>.
-      graph.maxindegree.type is final, that is, it may not be extended
-                          or restricted.
-      graph.maxindegree.type is a restriction of xs:nonNegativeInteger
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.maxindegree attribute of &lt;graph&gt;.
+        graph.maxindegree.type is final, that is, it may not be extended
+        or restricted.
+        graph.maxindegree.type is a restriction of xs:nonNegativeInteger
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:nonNegativeInteger"/>  
-</xs:simpleType>
+    <xs:restriction base="xs:nonNegativeInteger"/>
 
-<xs:simpleType name="graph.maxoutdegree.type" final="#all">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:simpleType name="graph.maxoutdegree.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.maxoutdegree attribute of &lt;graph>.
-      graph.maxoutdegree.type is final, that is, it may not be extended
-                          or restricted.
-      graph.maxoutdegree.type is a restriction of xs:nonNegativeInteger
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.maxoutdegree attribute of &lt;graph&gt;.
+        graph.maxoutdegree.type is final, that is, it may not be extended
+        or restricted.
+        graph.maxoutdegree.type is a restriction of xs:nonNegativeInteger
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:nonNegativeInteger"/>  
-</xs:simpleType>
+    <xs:restriction base="xs:nonNegativeInteger"/>
 
-<xs:simpleType name="graph.nodeids.type"  final="#all">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:simpleType name="graph.nodeids.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.nodeids attribute of &lt;graph>.
-      graph.nodeids.type is final, that is, it may not be extended
-                          or restricted.
-      graph.nodeids.type is a restriction of xs:string
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.nodeids attribute of &lt;graph&gt;.
+        graph.nodeids.type is final, that is, it may not be extended
+        or restricted.
+        graph.nodeids.type is a restriction of xs:string
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:NMTOKEN">
-    <xs:enumeration value="canonical"/>
-    <xs:enumeration value="free"/>
-  </xs:restriction>  
-</xs:simpleType>
+    <xs:restriction base="xs:NMTOKEN">
+      <xs:enumeration value="canonical"/>
+      <xs:enumeration value="free"/>
+    </xs:restriction>
 
-<xs:simpleType name="graph.edgeids.type"  final="#all">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:simpleType name="graph.edgeids.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.edgeids attribute of &lt;graph>.
-      graph.edgeids.type is final, that is, it may not be extended
-                          or restricted.
-      graph.edgeids.type is a restriction of xs:string
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.edgeids attribute of &lt;graph&gt;.
+        graph.edgeids.type is final, that is, it may not be extended
+        or restricted.
+        graph.edgeids.type is a restriction of xs:string
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:NMTOKEN">
-    <xs:enumeration value="canonical"/>
-    <xs:enumeration value="free"/>
-  </xs:restriction>  
-</xs:simpleType>
+    <xs:restriction base="xs:NMTOKEN">
+      <xs:enumeration value="canonical"/>
+      <xs:enumeration value="free"/>
+    </xs:restriction>
 
-<xs:attributeGroup name="graph.parseinfo.attrib">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:attributeGroup name="graph.parseinfo.attrib">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-     Definition of the attribute group graph.parseinfo.attrib.
-     This group consists of the seven attributes
-     - parse.nodeids (fixed to 'canonical' meaning that the id attribute
-                      of &lt;node> follows the pattern 'n[number]),
-     - parse.edgeids (fixed to 'canonical' meaning that the id attribute
-                      of &lt;edge> follows the pattern 'e[number]),
-     - parse.order (required; one of the values 'nodesfirst', 
-                    'adjacencylist' or 'free'),
-     - parse.nodes (required; number of nodes in this graph), 
-     - parse.edges (required; number of edges in this graph), 
-     - parse.maxindegree (optional; maximal indegree of a node in this graph),
-     - parse.maxoutdegree (optional; maximal outdegree of a node in this graph)
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:attribute name="parse.nodeids" type="graph.nodeids.type"/>
-  <xs:attribute name="parse.edgeids" type="graph.edgeids.type"/>
-  <xs:attribute name="parse.order" type="graph.order.type"/>
-  <xs:attribute name="parse.nodes" type="graph.nodes.type"/>
-  <xs:attribute name="parse.edges" type="graph.edges.type"/>
-  <xs:attribute name="parse.maxindegree" type="graph.maxindegree.type" use="optional"/>
-  <xs:attribute name="parse.maxoutdegree" type="graph.maxoutdegree.type" use="optional"/>
-</xs:attributeGroup>
-
+        Definition of the attribute group graph.parseinfo.attrib.
+        This group consists of the seven attributes
+            - parse.nodeids (fixed to 'canonical' meaning that the id attribute
+              of &lt;node&gt; follows the pattern 'n[number]),
+            - parse.edgeids (fixed to 'canonical' meaning that the id attribute
+              of &lt;edge&gt; follows the pattern 'e[number]),
+            - parse.order (required; one of the values 'nodesfirst',
+              'adjacencylist' or 'free'),
+            - parse.nodes (required; number of nodes in this graph),
+            - parse.edges (required; number of edges in this graph),
+            - parse.maxindegree (optional; maximal indegree of a node in this graph),
+            - parse.maxoutdegree (optional; maximal outdegree of a node in this graph)
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:attribute name="parse.nodeids" type="graph.nodeids.type"/>
+    <xs:attribute name="parse.edgeids" type="graph.edgeids.type"/>
+    <xs:attribute name="parse.order" type="graph.order.type"/>
+    <xs:attribute name="parse.nodes" type="graph.nodes.type"/>
+    <xs:attribute name="parse.edges" type="graph.edges.type"/>
+    <xs:attribute name="parse.maxindegree" type="graph.maxindegree.type" use="optional"/>
+    <xs:attribute name="parse.maxoutdegree" type="graph.maxoutdegree.type" use="optional"/>
 
+  </xs:attributeGroup>
 
   <xs:annotation>
     <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
-       Simple type definitions for the new node attributes.
+      source="http://graphml.graphdrawing.org/"
+      xml:lang="en">
+      Simple type definitions for the new node attributes.
     </xs:documentation>
   </xs:annotation>
 
-<xs:simpleType name="node.indegree.type" final="#all">
+  <xs:simpleType name="node.indegree.type" final="#all">
 
-  <xs:annotation>
-    <xs:documentation 
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.indegree attribute of &lt;node>.
-      node.indegree.type is final, that is, it may not be extended
-                          or restricted.
-      node.indegree.type is a restriction of xs:nonNegativeInteger
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.indegree attribute of &lt;node&gt;.
+        node.indegree.type is final, that is, it may not be extended
+        or restricted.
+        node.indegree.type is a restriction of xs:nonNegativeInteger
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:nonNegativeInteger"/>  
-</xs:simpleType>
+    <xs:restriction base="xs:nonNegativeInteger"/>
 
-<xs:simpleType name="node.outdegree.type" final="#all">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:simpleType name="node.outdegree.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.outdegree attribute of &lt;node>.
-      node.outdegree.type is final, that is, it may not be extended
-                          or restricted.
-      node.outdegree.type is a restriction of xs:nonNegativeInteger
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.outdegree attribute of &lt;node&gt;.
+        node.outdegree.type is final, that is, it may not be extended
+        or restricted.
+        node.outdegree.type is a restriction of xs:nonNegativeInteger
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:nonNegativeInteger"/>  
-</xs:simpleType>
+    <xs:restriction base="xs:nonNegativeInteger"/>
 
-<xs:attributeGroup name="node.parseinfo.attrib">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:attributeGroup name="node.parseinfo.attrib">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-     Definition of the attribute group node.parseinfo.attrib.
-     This group consists of two attributes
-     - parse.indegree (optional; indegree of this node),
-     - parse.outdegree (optional; outdegree of this node).
-    </xs:documentation>
-  </xs:annotation>
+        Definition of the attribute group node.parseinfo.attrib.
+        This group consists of two attributes
+            - parse.indegree (optional; indegree of this node),
+            - parse.outdegree (optional; outdegree of this node).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:attribute name="parse.indegree" type="node.indegree.type" use="optional"/>
-  <xs:attribute name="parse.outdegree" type="node.outdegree.type" use="optional"/>
-</xs:attributeGroup>
+    <xs:attribute name="parse.indegree" type="node.indegree.type" use="optional"/>
+    <xs:attribute name="parse.outdegree" type="node.outdegree.type" use="optional"/>
+
+  </xs:attributeGroup>
 
 </xs:schema>
\ No newline at end of file
diff --git a/src/QuikGraph.Serialization/GraphML/graphml-structure.xsd b/src/QuikGraph.Serialization/GraphML/graphml-structure.xsd
index adca0ac57..0f1515ff8 100644
--- a/src/QuikGraph.Serialization/GraphML/graphml-structure.xsd
+++ b/src/QuikGraph.Serialization/GraphML/graphml-structure.xsd
@@ -1,1134 +1,1176 @@
 <?xml version="1.0"?>
+<xs:schema
+  targetNamespace="http://graphml.graphdrawing.org/xmlns"
+  xmlns="http://graphml.graphdrawing.org/xmlns"
+  xmlns:g="http://graphml.graphdrawing.org/xmlns"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified">
 
-<xs:schema   
-             targetNamespace="http://graphml.graphdrawing.org/xmlns"
-
-             xmlns="http://graphml.graphdrawing.org/xmlns"
-             xmlns:g="http://graphml.graphdrawing.org/xmlns"
-             xmlns:xs="http://www.w3.org/2001/XMLSchema"
-             xmlns:xlink="http://www.w3.org/1999/xlink" 
-
-             elementFormDefault="qualified"
-             attributeFormDefault="unqualified"
->
   <xs:annotation>
-    <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
-     The schema corresponding to this document defines the structural
-     layer of the Graph Markup Language (GraphML).
-     Although a DTD is provided, this schema is, together with its extensions
-     http://graphml.graphdrawing.org/xmlns/1.1/graphml-attributes.xsd
-     and
-     http://graphml.graphdrawing.org/xmlns/1.1/graphml-parseinfo.xsd,
-     the only normative reference.
+    <xs:documentation
+      source="http://graphml.graphdrawing.org/"
+      xml:lang="en">
+      The schema corresponding to this document defines the structural
+      layer of the Graph Markup Language (GraphML).
+      Although a DTD is provided, this schema is, together with its extensions
+      http://graphml.graphdrawing.org/xmlns/1.1/graphml-attributes.xsd
+      and
+      http://graphml.graphdrawing.org/xmlns/1.1/graphml-parseinfo.xsd,
+      the only normative reference.
     </xs:documentation>
   </xs:annotation>
 
-<xs:import namespace="http://www.w3.org/1999/xlink" 
-           schemaLocation="http://graphml.graphdrawing.org/xmlns/1.1/xlink.xsd">
-  <xs:annotation>
-    <xs:documentation 
+  <xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://graphml.graphdrawing.org/xmlns/1.1/xlink.xsd">
+    <xs:annotation>
+      <xs:documentation
         source="???"
         xml:lang="en">
-       Get access to the xlink attribute groups for the attributes
-       xlink:href and xlink:type of locator.type.
-    </xs:documentation>
-  </xs:annotation>
-</xs:import>
+        Get access to the xlink attribute groups for the attributes
+        xlink:href and xlink:type of locator.type.
+      </xs:documentation>
+    </xs:annotation>
+  </xs:import>
 
   <xs:annotation>
-    <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
-      The attribute groups &lt;element_name>.extra.attrib may be used
+    <xs:documentation
+      source="http://graphml.graphdrawing.org/"
+      xml:lang="en">
+      The attribute groups &lt;element_name&gt;.extra.attrib may be used
       for adding user defined attributes to the elements
-      &lt;element_name>.
+      &lt;element_name&gt;.
       The attribute group common.extra.attrib may be used for adding
       user defined attributes to all elements.
     </xs:documentation>
   </xs:annotation>
 
+  <xs:attributeGroup name="common.extra.attrib"/>
 
-<xs:attributeGroup name="common.extra.attrib"/>
-
-
-<xs:attributeGroup name="graphml.extra.attrib">
-  <xs:attributeGroup ref="common.extra.attrib"/>
-</xs:attributeGroup>
-
-<xs:attributeGroup name="data.extra.attrib">
-  <xs:attributeGroup ref="common.extra.attrib"/>
-</xs:attributeGroup>
-
-<xs:attributeGroup name="key.extra.attrib">
-  <xs:attributeGroup ref="common.extra.attrib"/>
-</xs:attributeGroup>
-
-<xs:attributeGroup name="default.extra.attrib">
-  <xs:attributeGroup ref="common.extra.attrib"/>
-</xs:attributeGroup>
+  <xs:attributeGroup name="graphml.extra.attrib">
+    <xs:attributeGroup ref="common.extra.attrib"/>
+  </xs:attributeGroup>
 
-<xs:attributeGroup name="graph.extra.attrib">
-  <xs:attributeGroup ref="common.extra.attrib"/>
-</xs:attributeGroup>
+  <xs:attributeGroup name="data.extra.attrib">
+    <xs:attributeGroup ref="common.extra.attrib"/>
+  </xs:attributeGroup>
 
-<xs:attributeGroup name="node.extra.attrib">
-  <xs:attributeGroup ref="common.extra.attrib"/>
-</xs:attributeGroup>
+  <xs:attributeGroup name="key.extra.attrib">
+    <xs:attributeGroup ref="common.extra.attrib"/>
+  </xs:attributeGroup>
 
-<xs:attributeGroup name="edge.extra.attrib">
-  <xs:attributeGroup ref="common.extra.attrib"/>
-</xs:attributeGroup>
+  <xs:attributeGroup name="default.extra.attrib">
+    <xs:attributeGroup ref="common.extra.attrib"/>
+  </xs:attributeGroup>
 
-<xs:attributeGroup name="port.extra.attrib">
-  <xs:attributeGroup ref="common.extra.attrib"/>
-</xs:attributeGroup>
+  <xs:attributeGroup name="graph.extra.attrib">
+    <xs:attributeGroup ref="common.extra.attrib"/>
+  </xs:attributeGroup>
 
-<xs:attributeGroup name="hyperedge.extra.attrib">
-  <xs:attributeGroup ref="common.extra.attrib"/>
-</xs:attributeGroup>
+  <xs:attributeGroup name="node.extra.attrib">
+    <xs:attributeGroup ref="common.extra.attrib"/>
+  </xs:attributeGroup>
 
-<xs:attributeGroup name="endpoint.extra.attrib">
-  <xs:attributeGroup ref="common.extra.attrib"/>
-</xs:attributeGroup>
+  <xs:attributeGroup name="edge.extra.attrib">
+    <xs:attributeGroup ref="common.extra.attrib"/>
+  </xs:attributeGroup>
 
-<xs:attributeGroup name="locator.extra.attrib">
-  <xs:attributeGroup ref="common.extra.attrib"/>
-</xs:attributeGroup>
+  <xs:attributeGroup name="port.extra.attrib">
+    <xs:attributeGroup ref="common.extra.attrib"/>
+  </xs:attributeGroup>
 
+  <xs:attributeGroup name="hyperedge.extra.attrib">
+    <xs:attributeGroup ref="common.extra.attrib"/>
+  </xs:attributeGroup>
 
+  <xs:attributeGroup name="endpoint.extra.attrib">
+    <xs:attributeGroup ref="common.extra.attrib"/>
+  </xs:attributeGroup>
 
+  <xs:attributeGroup name="locator.extra.attrib">
+    <xs:attributeGroup ref="common.extra.attrib"/>
+  </xs:attributeGroup>
 
   <xs:annotation>
-    <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
+    <xs:documentation
+      source="http://graphml.graphdrawing.org/"
+      xml:lang="en">
       Complex type definitions for the GraphML structural layer elements:
-      &lt;data>, &lt;default>, &lt;key>, &lt;graphml>, &lt;graph>, 
-      &lt;node>, &lt;port>, 
-      &lt;edge>, &lt;hyperedge>, &lt;endpoint> and &lt;locator>.
+      &lt;data&gt;, &lt;default&gt;, &lt;key&gt;, &lt;graphml&gt;, &lt;graph&gt;,
+      &lt;node&gt;, &lt;port&gt;,
+      &lt;edge&gt;, &lt;hyperedge&gt;, &lt;endpoint&gt; and &lt;locator&gt;.
       The names of the complex types are constructed corresponding
       to the pattern element_name.type.
       (The only remaining GraphML structural layer element
-      &lt;desc> is of simple type xs:string.)
+      &lt;desc&gt; is of simple type xs:string.)
     </xs:documentation>
   </xs:annotation>
 
-
-<xs:complexType name="data-extension.type" mixed="true">
-  <xs:annotation>
-    <xs:documentation 
+  <xs:complexType name="data-extension.type" mixed="true">
+    <xs:annotation>
+      <xs:documentation
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Extension mechanism for the content of &lt;data> and &lt;default>.
-      The complex type data-extension.type is empty per default.
-      Users may redefine this type in order to add content to 
-      the complex types data.type and default.type which are 
-      extensions of data-extension.type.
-    </xs:documentation>
-  </xs:annotation>
-</xs:complexType>
+        Extension mechanism for the content of &lt;data&gt; and &lt;default&gt;.
+        The complex type data-extension.type is empty per default.
+        Users may redefine this type in order to add content to
+        the complex types data.type and default.type which are
+        extensions of data-extension.type.
+      </xs:documentation>
+    </xs:annotation>
+  </xs:complexType>
 
+  <xs:complexType name="data.type" final="#all">
 
-<xs:complexType name="data.type" final="#all">
-  <xs:annotation>
-    <xs:documentation 
+    <xs:annotation>
+      <xs:documentation
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Complex type for the &lt;data> element.
-      data.type is mixed, that is, &lt;data> may contain #PCDATA.
-      Content type: extension of data-extension.type which is empty
-                    per default.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:complexContent mixed="true">
-    <xs:extension base="data-extension.type">
-      <xs:attribute name="key" type="xs:NMTOKEN" use="required">
-        <xs:annotation>
-          <xs:documentation 
+        Complex type for the &lt;data&gt; element.
+        data.type is mixed, that is, &lt;data&gt; may contain #PCDATA.
+        Content type: extension of data-extension.type which is empty
+        per default.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexContent mixed="true">
+      <xs:extension base="data-extension.type">
+        <xs:attribute name="key" type="xs:NMTOKEN" use="required">
+          <xs:annotation>
+            <xs:documentation
               source="http://graphml.graphdrawing.org/"
-              xml:lang="en">refers to the id attribute of a &lt;key>.
-          </xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="time" type="xs:long" default="0">
-        <xs:annotation>
-          <xs:documentation 
+              xml:lang="en">refers to the id attribute of a &lt;key&gt;.
+            </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="time" type="xs:long" default="0">
+          <xs:annotation>
+            <xs:documentation
               source="http://graphml.graphdrawing.org/"
               xml:lang="en">
-          </xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="id" type="xs:NMTOKEN" use="optional">
-        <xs:annotation>
-          <xs:documentation 
+            </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="id" type="xs:NMTOKEN" use="optional">
+          <xs:annotation>
+            <xs:documentation
               source="http://graphml.graphdrawing.org/"
-              xml:lang="en">identifies this &lt;data>.
-          </xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attributeGroup ref="data.extra.attrib">
-        <xs:annotation>
-          <xs:documentation 
+              xml:lang="en">identifies this &lt;data&gt;.
+            </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attributeGroup ref="data.extra.attrib">
+          <xs:annotation>
+            <xs:documentation
               source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                 user defined extra attributes for &lt;data> elements
-          </xs:documentation>
-        </xs:annotation>
-      </xs:attributeGroup>
-    </xs:extension>
-  </xs:complexContent>
-</xs:complexType>
+              xml:lang="en">user defined extra attributes for &lt;data&gt; elements.
+            </xs:documentation>
+          </xs:annotation>
+        </xs:attributeGroup>
+      </xs:extension>
+    </xs:complexContent>
 
+  </xs:complexType>
 
-<xs:complexType name="default.type" final="#all">
-  <xs:annotation>
-    <xs:documentation 
+  <xs:complexType name="default.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Complex type for the &lt;default> element.
-      default.type is mixed, that is, data may contain #PCDATA.
-      Content type: extension of data-extension.type which is empty
-                    per default.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:complexContent mixed="true">
-    <xs:extension base="data-extension.type">
-      <xs:attributeGroup ref="default.extra.attrib">
-        <xs:annotation>
-          <xs:documentation 
+        Complex type for the &lt;default&gt; element.
+        default.type is mixed, that is, data may contain #PCDATA.
+        Content type: extension of data-extension.type which is empty
+        per default.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexContent mixed="true">
+      <xs:extension base="data-extension.type">
+        <xs:attributeGroup ref="default.extra.attrib">
+          <xs:annotation>
+            <xs:documentation
               source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                 user defined extra attributes for &lt;default> elements
-          </xs:documentation>
-        </xs:annotation>
-      </xs:attributeGroup>
-    </xs:extension>
-  </xs:complexContent>
-</xs:complexType>
+              xml:lang="en">user defined extra attributes for &lt;default&gt; elements.
+            </xs:documentation>
+          </xs:annotation>
+        </xs:attributeGroup>
+      </xs:extension>
+    </xs:complexContent>
 
+  </xs:complexType>
 
+  <xs:simpleType name="key.for.type" final="#all">
 
-<xs:simpleType name="key.for.type" final="#all">
-  <xs:annotation>
-    <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
-      Simple type for the for attribute of &lt;key>.
-      key.for.type is a restriction of xs:NMTOKEN
-      Allowed values: all, graphml, graph, node, edge, hyperedge, port and endpoint.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:NMTOKEN">
-    <xs:enumeration value="all"/>
-    <xs:enumeration value="graphml"/>
-     <xs:enumeration value="graph"/>
-    <xs:enumeration value="node"/>
-    <xs:enumeration value="edge"/>
-    <xs:enumeration value="hyperedge"/>
-    <xs:enumeration value="port"/>
-    <xs:enumeration value="endpoint"/>
-  </xs:restriction>
-</xs:simpleType>
-
-
-<xs:complexType name="key.type" final="#all">
-  <xs:annotation>
-    <xs:documentation 
+    <xs:annotation>
+      <xs:documentation
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Complex type for the &lt;key> element.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:sequence>
-    <xs:element ref="desc" minOccurs="0"/>    
-    <xs:element ref="default" minOccurs="0"/>
-  </xs:sequence>
-  <xs:attribute name="id" type="xs:NMTOKEN" use="required">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">identifies this &lt;key>.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="dynamic" type="xs:boolean" default="false">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="for" type="key.for.type" default="all">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                 describes the domain of definition for 
-                 the corresponding graph attribute. 
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-  <xs:attributeGroup ref="key.extra.attrib">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                  user defined extra attributes for &lt;key> elements.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attributeGroup>
-</xs:complexType>
+        Simple type for the for attribute of &lt;key&gt;.
+        key.for.type is a restriction of xs:NMTOKEN
+        Allowed values: all, graphml, graph, node, edge, hyperedge, port and endpoint.
+      </xs:documentation>
+    </xs:annotation>
 
+    <xs:restriction base="xs:NMTOKEN">
+      <xs:enumeration value="all"/>
+      <xs:enumeration value="graphml"/>
+      <xs:enumeration value="graph"/>
+      <xs:enumeration value="node"/>
+      <xs:enumeration value="edge"/>
+      <xs:enumeration value="hyperedge"/>
+      <xs:enumeration value="port"/>
+      <xs:enumeration value="endpoint"/>
+    </xs:restriction>
 
-<xs:complexType name="graphml.type" final="#all">
-  <xs:annotation>
-    <xs:documentation 
+  </xs:simpleType>
+
+  <xs:complexType name="key.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Complex type for the &lt;graphml> element.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:sequence>
-    <xs:element ref="desc" minOccurs="0"/>    
-    <xs:element ref="key" minOccurs="0" maxOccurs="unbounded"/>
+        Complex type for the &lt;key&gt; element.
+      </xs:documentation>
+    </xs:annotation>
+
     <xs:sequence>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element ref="graph"/>
-        <xs:element ref="data"/>
-      </xs:choice>
+      <xs:element ref="desc" minOccurs="0"/>
+      <xs:element ref="default" minOccurs="0"/>
     </xs:sequence>
-  </xs:sequence>
-  <xs:attributeGroup ref="graphml.extra.attrib">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                user defined extra attributes for &lt;graphml> elements.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attributeGroup>
-</xs:complexType>
 
+    <xs:attribute name="id" type="xs:NMTOKEN" use="required">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">identifies this &lt;key&gt;.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="dynamic" type="xs:boolean" default="false">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
 
-<xs:simpleType name="graph.edgedefault.type" final="#all">
-  <xs:annotation>
-    <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
-      Simple type for the edgedefault attribute of &lt;graph>.
-      graph.edgedefault.type is a restriction of xs:NMTOKEN
-      Allowed values: directed, undirected.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:NMTOKEN">
-    <xs:enumeration value="directed"/>
-    <xs:enumeration value="undirected"/>
-  </xs:restriction>
-</xs:simpleType>
+    <xs:attribute name="for" type="key.for.type" default="all">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          Describes the domain of definition for
+          the corresponding graph attribute.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attributeGroup ref="key.extra.attrib">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          user defined extra attributes for &lt;key&gt; elements.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attributeGroup>
 
+  </xs:complexType>
 
-<xs:complexType name="graph.type" final="#all">
-  <xs:annotation>
-    <xs:documentation 
+  <xs:complexType name="graphml.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Complex type for the &lt;graph> element.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:sequence>
-    <xs:element ref="desc" minOccurs="0"/>
-    <xs:choice>
+        Complex type for the &lt;graphml&gt; element.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:sequence>
+      <xs:element ref="desc" minOccurs="0"/>
+      <xs:element ref="key" minOccurs="0" maxOccurs="unbounded"/>
       <xs:sequence>
         <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="graph"/>
           <xs:element ref="data"/>
-          <xs:element ref="node"/>
-          <xs:element ref="edge"/>
-          <xs:element ref="hyperedge"/>
         </xs:choice>
       </xs:sequence>
-      <xs:element ref="locator"/>
-    </xs:choice>
-  </xs:sequence>
-  <xs:attributeGroup ref="graph.extra.attrib">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                user defined extra attributes for &lt;graph> elements.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attributeGroup>
-  <xs:attribute name="id" type="xs:NMTOKEN"  >
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                  identifies this graph .
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="edgedefault" 
-                type="graph.edgedefault.type" use="required">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                        describes whether edges of this graph are considered
-                        as directed or undirected per default (unless 
-                        specified by the attribute directed of &lt;edge>).
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-</xs:complexType>
+    </xs:sequence>
 
+    <xs:attributeGroup ref="graphml.extra.attrib">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          user defined extra attributes for &lt;graphml&gt; elements.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attributeGroup>
 
+  </xs:complexType>
 
-<xs:complexType name="node.type" final="#all">
-  <xs:annotation>
-    <xs:documentation 
+  <xs:simpleType name="graph.edgedefault.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Complex type for the &lt;node> element.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:sequence>
-    <xs:element ref="desc" minOccurs="0"/>
-    <xs:choice>
-      <xs:sequence>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="data"/>
-          <xs:element ref="port"/>
-        </xs:choice>
-        <xs:element ref="graph" minOccurs="0"/>
-      </xs:sequence>
-      <xs:element ref="locator"/>
-    </xs:choice>
-  </xs:sequence>
-  <xs:attributeGroup ref="node.extra.attrib">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                user defined extra attributes for &lt;node elements.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attributeGroup>
-  <xs:attribute name="id" type="xs:NMTOKEN" use="required">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                 identifies this node.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-</xs:complexType>
-
+        Simple type for the edgedefault attribute of &lt;graph&gt;.
+        graph.edgedefault.type is a restriction of xs:NMTOKEN
+        Allowed values: directed, undirected.
+      </xs:documentation>
+    </xs:annotation>
 
+    <xs:restriction base="xs:NMTOKEN">
+      <xs:enumeration value="directed"/>
+      <xs:enumeration value="undirected"/>
+    </xs:restriction>
 
-<xs:complexType name="port.type" final="#all">
-  <xs:annotation>
-    <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
-      Complex type for the &lt;port> element.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:sequence>
-    <xs:element ref="desc" minOccurs="0" />
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element ref="data" />
-      <xs:element ref="port" />
-    </xs:choice>
-  </xs:sequence>
-  <xs:attributeGroup ref="port.extra.attrib"> 
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                 user defined extra attributes for &lt;port> elements.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attributeGroup>
-  <xs:attribute name="name" type="xs:NMTOKEN" use="required">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                   identifies this port, within the node it is contained in.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-</xs:complexType>
-  
+  </xs:simpleType>
 
+  <xs:complexType name="graph.type" final="#all">
 
-<xs:complexType name="edge.type" final="#all">
-  <xs:annotation>
-    <xs:documentation 
+    <xs:annotation>
+      <xs:documentation
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Complex type for the &lt;edge> element.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:sequence>
-    <xs:element ref="desc" minOccurs="0"/>
-    <xs:element ref="data" minOccurs="0" maxOccurs="unbounded"/>
-    <xs:element ref="graph" minOccurs="0"/>
-  </xs:sequence>
-  <xs:attributeGroup ref="edge.extra.attrib">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                 user defined extra attributes for &lt;edge> elements.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attributeGroup>
-  <xs:attribute name="id" type="xs:NMTOKEN" >
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                identifies this edge .
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="directed" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                overwrites the edgedefault attribute of &lt;graph> .
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="source" type="xs:NMTOKEN" use="required">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                  points to the id attribute of the source &lt;node>.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="target" type="xs:NMTOKEN" use="required">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                   points to the id attribute of the target &lt;node>.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="sourceport" type="xs:NMTOKEN">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                 points to the name attribute of the source &lt;port>.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="targetport" type="xs:NMTOKEN">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                    points to the name attribute of the target &lt;port>.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-</xs:complexType>
+        Complex type for the &lt;graph&gt; element.
+      </xs:documentation>
+    </xs:annotation>
 
+    <xs:sequence>
+      <xs:element ref="desc" minOccurs="0"/>
+      <xs:choice>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="data"/>
+            <xs:element ref="node"/>
+            <xs:element ref="edge"/>
+            <xs:element ref="hyperedge"/>
+          </xs:choice>
+        </xs:sequence>
+        <xs:element ref="locator"/>
+      </xs:choice>
+    </xs:sequence>
 
-<xs:complexType name="hyperedge.type" final="#all">
-  <xs:annotation>
-    <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
-      Complex type for the &lt;hyperedge> element.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:sequence>
-    <xs:element ref="desc" minOccurs="0" />
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element ref="data" />
-      <xs:element ref="endpoint" />
-    </xs:choice>
-    <xs:element ref="graph" minOccurs="0" />
-  </xs:sequence>
-  <xs:attributeGroup ref="hyperedge.extra.attrib"> 
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-               user defined extra attributes for &lt;hyperedge> elements.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attributeGroup>
-  <xs:attribute name="id" type="xs:NMTOKEN" >
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                  identifies this &lt;hyperedge> .
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-</xs:complexType>
-  
-
-<xs:simpleType name="endpoint.type.type" final="#all">
-  <xs:annotation>
-    <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
-      Simple type for the type attribute of &lt;endpoint>.
-      endpoint.type.type is a restriction of xs:NMTOKEN
-      Allowed values: in, out, undir.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:NMTOKEN">
-    <xs:enumeration value="in"/>
-    <xs:enumeration value="out"/>
-    <xs:enumeration value="undir"/>
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:complexType name="endpoint.type" final="#all">
-  <xs:annotation>
-    <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
-      Complex type for the &lt;endpoint> element.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:sequence>
-    <xs:element ref="desc" minOccurs="0" />
-  </xs:sequence>
-  <xs:attributeGroup ref="endpoint.extra.attrib"> 
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                 user defined extra attributes for &lt;endpoint> elements.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attributeGroup>
-  <xs:attribute name="id" type="xs:NMTOKEN">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                  identifies this &lt;endpoint> .
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="port" type="xs:NMTOKEN" >
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                points to the name of the port, to which this endpoint is 
-                 connected .
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="node" type="xs:NMTOKEN" use="required">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en"> 
-            points to the id of the node, to which this endpoint is connected. 
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-  <xs:attribute name="type" type="endpoint.type.type" default="undir">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-               defines the direction on this endpoint (undirected per default).
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-</xs:complexType>
+    <xs:attributeGroup ref="graph.extra.attrib">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          user defined extra attributes for &lt;graph&gt; elements.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attributeGroup>
+
+    <xs:attribute name="id" type="xs:NMTOKEN" >
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          identifies this graph.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="edgedefault" type="graph.edgedefault.type" use="required">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          describes whether edges of this graph are considered
+          as directed or undirected per default (unless
+          specified by the attribute directed of &lt;edge&gt;).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
 
+  </xs:complexType>
 
-<xs:complexType name="locator.type" final="#all">
-  <xs:annotation>
-    <xs:documentation 
+  <xs:complexType name="node.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Complex type for the &lt;locator> element.
-      Content type: (empty)
-    </xs:documentation>
-  </xs:annotation>
-  <xs:attributeGroup ref="locator.extra.attrib">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-               user defined extra attributes for &lt;locator> elements.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attributeGroup>
-  <xs:attribute ref="xlink:href" use="required">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-                points to the resource of this locator.
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-  <!-- xs:attribute ref="xlink:type" fixed="simple"-->
-  <xs:attribute ref="xlink:type">
-        <xs:annotation>
-          <xs:documentation 
-              source="http://graphml.graphdrawing.org/"
-              xml:lang="en">
-               type of the hyperlink (fixed as simple).
-          </xs:documentation>
-        </xs:annotation>
-  </xs:attribute>
-</xs:complexType>
+        Complex type for the &lt;node&gt; element.
+      </xs:documentation>
+    </xs:annotation>
 
-<!--========================================================-->
+    <xs:sequence>
+      <xs:element ref="desc" minOccurs="0"/>
+      <xs:choice>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="data"/>
+            <xs:element ref="port"/>
+          </xs:choice>
+          <xs:element ref="graph" minOccurs="0"/>
+        </xs:sequence>
+        <xs:element ref="locator"/>
+      </xs:choice>
+    </xs:sequence>
 
-<xs:element name="desc" type="xs:string" block="#all">
-    <xs:annotation>
-      <xs:documentation 
+    <xs:attributeGroup ref="node.extra.attrib">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          user defined extra attributes for &lt;node&gt; elements.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attributeGroup>
+
+    <xs:attribute name="id" type="xs:NMTOKEN" use="required">
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-           Description: Provides human-readable descriptions for the GraphML
-                        element containing this &lt;desc> as its first child.
-           Occurence:   &lt;key>, &lt;graphml>, &lt;graph>, 
-                        &lt;node>, &lt;port>, &lt;edge>, &lt;hyperedge>, and
-                        &lt;endpoint>. 
+          identifies this node.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:complexType>
+
+  <xs:complexType name="port.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Complex type for the &lt;port&gt; element.
       </xs:documentation>
     </xs:annotation>
-</xs:element>
 
+    <xs:sequence>
+      <xs:element ref="desc" minOccurs="0" />
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="data" />
+        <xs:element ref="port" />
+      </xs:choice>
+    </xs:sequence>
 
-<xs:element name="locator" type="locator.type" block="#all">
-    <xs:annotation>
-      <xs:documentation 
+    <xs:attributeGroup ref="port.extra.attrib"> 
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-           Description: Graphs and nodes are declared by the elements
-                        &lt;graph> and &lt;node>, respectively. The optional
-                        &lt;locator>-child of these elements point to 
-                        their definition. (If there is no &lt;locator>-child
-                        the graphs/nodes are defined by their content).
-           Occurence:   &lt;graph>, and &lt;node>. 
-      </xs:documentation>
-    </xs:annotation>
-</xs:element>
+          user defined extra attributes for &lt;port&gt; elements.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attributeGroup>
+
+    <xs:attribute name="name" type="xs:NMTOKEN" use="required">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          identifies this port, within the node it is contained in.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:complexType>
 
-<xs:element name="data" type="data.type" block="#all">
+  <xs:complexType name="edge.type" final="#all">
     <xs:annotation>
-      <xs:documentation 
+      <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-           Description: In GraphML there may be data-functions attached
-                        to graphs, nodes, ports, edges, hyperedges and
-                        endpoint and to the whole collection of 
-                        graphs described by the content of &lt;graphml>. 
-                        These functions are declared by &lt;key> elements
-                        (children of &lt;graphml>) and defined by &lt;data>
-                        elements.
-           Occurence: &lt;graphml>, &lt;graph>, &lt;node>, &lt;port>, 
-                      &lt;edge>, &lt;hyperedge>, and &lt;endpoint>. 
+        Complex type for the &lt;edge> element.
       </xs:documentation>
     </xs:annotation>
 
-  <xs:unique name="data_data_key_unique">
-    <xs:annotation>
-      <xs:documentation 
+    <xs:sequence>
+      <xs:element ref="desc" minOccurs="0"/>
+      <xs:element ref="data" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="graph" minOccurs="0"/>
+    </xs:sequence>
+
+    <xs:attributeGroup ref="edge.extra.attrib">
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
-          xml:lang="en">        
-        Ensures: uniqueness of the key attributes of &lt;data> children
-                 of this &lt;data> element.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:selector xpath="./g:data"/>
-    <xs:field xpath="@key"/>
-    <xs:field xpath="@time"/>
-  </xs:unique>
+          xml:lang="en">
+          user defined extra attributes for &lt;edge&gt; elements.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attributeGroup>
+
+    <xs:attribute name="id" type="xs:NMTOKEN" >
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          identifies this edge.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="directed" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          overwrites the edgedefault attribute of &lt;graph&gt;.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="source" type="xs:NMTOKEN" use="required">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          points to the id attribute of the source &lt;node&gt;.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="target" type="xs:NMTOKEN" use="required">
+      <xs:annotation>
+        <xs:documentation
+           source="http://graphml.graphdrawing.org/"
+           xml:lang="en">
+           points to the id attribute of the target &lt;node&gt;.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="sourceport" type="xs:NMTOKEN">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          points to the name attribute of the source &lt;port&gt;.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="targetport" type="xs:NMTOKEN">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          points to the name attribute of the target &lt;port&gt;.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
 
-</xs:element>
+  </xs:complexType>
 
+  <xs:complexType name="hyperedge.type" final="#all">
 
-<xs:element name="key" type="key.type" block="#all">
     <xs:annotation>
-      <xs:documentation 
-          source="http://graphml.graphdrawing.org/"
-          xml:lang="en">
-           Description: In GraphML there may be data-functions attached
-                        to graphs, nodes, ports, edges, hyperedges and
-                        endpoint and to the whole collection of 
-                        graphs described by the content of &lt;graphml>. 
-                        These functions are declared by &lt;key> elements
-                        (children of &lt;graphml>) and defined by &lt;data>
-                        elements.
-           Occurence: &lt;graphml>. 
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Complex type for the &lt;hyperedge&gt; element.
       </xs:documentation>
     </xs:annotation>
-</xs:element>
 
-<xs:element name="default" type="default.type" block="#all">
-    <xs:annotation>
-      <xs:documentation 
+    <xs:sequence>
+      <xs:element ref="desc" minOccurs="0" />
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="data" />
+        <xs:element ref="endpoint" />
+      </xs:choice>
+      <xs:element ref="graph" minOccurs="0" />
+    </xs:sequence>
+
+    <xs:attributeGroup ref="hyperedge.extra.attrib"> 
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-           Description: In GraphML there may be data-functions attached
-                        to graphs, nodes, ports, edges, hyperedges and
-                        endpoint and to the whole collection of 
-                        graphs described by the content of &lt;graphml>. 
-                        These functions are declared by &lt;key> elements
-                        (children of &lt;graphml>) and defined by &lt;data>
-                        elements.
-                        The (optional) &lt;default> child of &lt;key> gives 
-                        the default value for the corresponding function. 
-           Occurence: &lt;key>. 
-      </xs:documentation>
-    </xs:annotation>
-</xs:element>
-
-<xs:element name="graphml" type="graphml.type" block="#all">
-    <xs:annotation>
-      <xs:documentation 
+          user defined extra attributes for &lt;hyperedge&gt; elements.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attributeGroup>
+
+    <xs:attribute name="id" type="xs:NMTOKEN" >
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-           Description: &lt;graphml> is the root element of each GraphML 
-                      document.
-           Occurence: root. 
-      </xs:documentation>
-    </xs:annotation>
+          identifies this &lt;hyperedge&gt;.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:complexType>
+
+  <xs:simpleType name="endpoint.type.type" final="#all">
 
-  <xs:unique name="graphml_data_key_unique">
     <xs:annotation>
-      <xs:documentation 
-          source="http://graphml.graphdrawing.org/"
-          xml:lang="en">
-        Ensures: uniqueness of the key attributes of &lt;data> children
-                 of this &lt;graphml> element.
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Simple type for the type attribute of &lt;endpoint&gt;.
+        endpoint.type.type is a restriction of xs:NMTOKEN
+        Allowed values: in, out, undir.
       </xs:documentation>
     </xs:annotation>
-    <xs:selector xpath="./g:data"/>
-    <xs:field xpath="@key"/>
-    <xs:field xpath="@time"/>
-  </xs:unique>
 
-  <xs:key name="key_id_key"> 
+    <xs:restriction base="xs:NMTOKEN">
+      <xs:enumeration value="in"/>
+      <xs:enumeration value="out"/>
+      <xs:enumeration value="undir"/>
+    </xs:restriction>
+
+  </xs:simpleType>
+
+  <xs:complexType name="endpoint.type" final="#all">
+
     <xs:annotation>
-      <xs:documentation 
-          source="http://graphml.graphdrawing.org/"
-          xml:lang="en">
-        Ensures: existence and uniqueness of the id attributes of 
-                 each &lt;key> element in this document.
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Complex type for the &lt;endpoint&gt; element.
       </xs:documentation>
     </xs:annotation>
-    <xs:selector xpath=".//g:key"/>
-    <xs:field xpath="@id"/>
-  </xs:key>
 
+    <xs:sequence>
+      <xs:element ref="desc" minOccurs="0" />
+    </xs:sequence>
 
-  <xs:unique name="graph_id_unique"> 
-    <xs:annotation>
-      <xs:documentation 
+    <xs:attributeGroup ref="endpoint.extra.attrib"> 
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-        Ensures: uniqueness of the id attributes of 
-                 each &lt;graph> element in this document.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:selector xpath=".//g:graph"/>
-    <xs:field xpath="@id"/>
-  </xs:unique>
-
-  <xs:keyref name="data_key_ref" refer="key_id_key">
-    <xs:annotation>
-      <xs:documentation 
+          user defined extra attributes for &lt;endpoint&gt; elements.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attributeGroup>
+
+    <xs:attribute name="id" type="xs:NMTOKEN">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          identifies this &lt;endpoint&gt;.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="port" type="xs:NMTOKEN">
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-        Ensures: for the key attribute of each &lt;data> in this document, 
-                 the existence of an id attribute of 
-                 &lt;key> which matches the value of it. 
+          points to the name of the port, to which this endpoint is connected.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="node" type="xs:NMTOKEN" use="required">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en"> 
+          points to the id of the node, to which this endpoint is connected.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="type" type="endpoint.type.type" default="undir">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          defines the direction on this endpoint (undirected per default).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:complexType>
+
+  <xs:complexType name="locator.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Complex type for the &lt;locator&gt; element.
+        Content type: (empty)
       </xs:documentation>
     </xs:annotation>
-    <xs:selector xpath=".//g:data"/>
-    <xs:field xpath="@key"/>
-  </xs:keyref> 
 
-</xs:element>
+    <xs:attributeGroup ref="locator.extra.attrib">
+       <xs:annotation>
+         <xs:documentation
+           source="http://graphml.graphdrawing.org/"
+           xml:lang="en">
+           user defined extra attributes for &lt;locator&gt; elements.
+         </xs:documentation>
+       </xs:annotation>
+    </xs:attributeGroup>
+
+    <xs:attribute ref="xlink:href" use="required">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          points to the resource of this locator.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <!-- xs:attribute ref="xlink:type" fixed="simple"-->
+    <xs:attribute ref="xlink:type">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          type of the hyperlink (fixed as simple).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
 
+  </xs:complexType>
 
+<!-- ======================================================== -->
 
-<xs:element name="graph" type="graph.type" block="#all">
+  <xs:element name="desc" type="xs:string" block="#all">
 
     <xs:annotation>
-      <xs:documentation 
-          source="http://graphml.graphdrawing.org/"
-          xml:lang="en">
-          Description: Describes one graph in this document.
-          Occurence: &lt;graphml>, &lt;node>, &lt;edge>, &lt;hyperedge>.
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Description: Provides human-readable descriptions for the GraphML
+        element containing this &lt;desc&gt; as its first child.
+        Occurrence: &lt;key&gt;, &lt;graphml&gt;, &lt;graph&gt;,
+        &lt;node&gt;, &lt;port&gt;, &lt;edge&gt;, &lt;hyperedge&gt;, and
+        &lt;endpoint&gt;.
       </xs:documentation>
     </xs:annotation>
 
-  <xs:unique name="graph_data_key_unique">
+  </xs:element>
+
+  <xs:element name="locator" type="locator.type" block="#all">
     <xs:annotation>
-      <xs:documentation 
-          source="http://graphml.graphdrawing.org/"
-          xml:lang="en">
-        Ensures: uniqueness of the key attributes of &lt;data> children
-                 of this &lt;graph> element.
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Description: Graphs and nodes are declared by the elements
+        &lt;graph&gt; and &lt;node&gt;, respectively. The optional
+        &lt;locator&gt;-child of these elements point to
+        their definition. (If there is no &lt;locator&gt;-child
+        the graphs/nodes are defined by their content).
+        Occurrence: &lt;graph&gt;, and &lt;node&gt;.
       </xs:documentation>
     </xs:annotation>
-    <xs:selector xpath="./g:data"/>
-    <xs:field xpath="@key"/>
-    <xs:field xpath="@time"/>
-  </xs:unique>
+  </xs:element>
+
+  <xs:element name="data" type="data.type" block="#all">
 
-  <xs:key name="node_id_key"> 
     <xs:annotation>
-      <xs:documentation 
-          source="http://graphml.graphdrawing.org/"
-          xml:lang="en">
-        Ensures: existence and uniqueness of the id attributes of 
-                 each &lt;node> element in this graph.
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Description: In GraphML there may be data-functions attached
+        to graphs, nodes, ports, edges, hyperedges and
+        endpoint and to the whole collection of
+        graphs described by the content of &lt;graphml&gt;.
+        These functions are declared by &lt;key> elements
+        (children of &lt;graphml&gt;) and defined by &lt;data&gt;
+        elements.
+        Occurrence: &lt;graphml&gt;, &lt;graph&gt;, &lt;node&gt;, &lt;port&gt;,
+        &lt;edge&gt;, &lt;hyperedge&gt;, and &lt;endpoint&gt;.
       </xs:documentation>
     </xs:annotation>
-    <xs:selector xpath=".//g:node"/>
-    <xs:field xpath="@id"/>
-  </xs:key>
 
-  <xs:unique name="edge_id_unique"> 
-    <xs:annotation>
-      <xs:documentation 
+    <xs:unique name="data_data_key_unique">
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-        Ensures: uniqueness of the id attributes of 
-                 each &lt;edge> element in this graph.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:selector xpath=".//g:edge"/>
-    <xs:field xpath="@id"/>
-  </xs:unique>
+          Ensures: uniqueness of the key attributes of &lt;data&gt; children
+          of this &lt;data&gt; element.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath="./g:data"/>
+      <xs:field xpath="@key"/>
+      <xs:field xpath="@time"/>
+    </xs:unique>
+
+  </xs:element>
+
+  <xs:element name="key" type="key.type" block="#all">
 
-  <xs:unique name="hyperedge_id_unique"> 
     <xs:annotation>
-      <xs:documentation 
-          source="http://graphml.graphdrawing.org/"
-          xml:lang="en">
-        Ensures: uniqueness of the id attributes of 
-                 each &lt;hyperedge> element in this graph.
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Description: In GraphML there may be data-functions attached
+        to graphs, nodes, ports, edges, hyperedges and
+        endpoint and to the whole collection of 
+        graphs described by the content of &lt;graphml&gt;.
+        These functions are declared by &lt;key&gt; elements
+        (children of &lt;graphml&gt;) and defined by &lt;data&gt;
+        elements.
+        Occurrence: &lt;graphml&gt;.
       </xs:documentation>
     </xs:annotation>
-    <xs:selector xpath=".//g:hyperedge"/>
-    <xs:field xpath="@id"/>
-  </xs:unique>
 
-  <xs:unique name="endpoint_id_unique"> 
+  </xs:element>
+
+  <xs:element name="default" type="default.type" block="#all">
+
     <xs:annotation>
-      <xs:documentation 
-          source="http://graphml.graphdrawing.org/"
-          xml:lang="en">
-        Ensures: uniqueness of the id attributes of 
-                 each &lt;endpoint> element in this graph.
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Description: In GraphML there may be data-functions attached
+        to graphs, nodes, ports, edges, hyperedges and
+        endpoint and to the whole collection of
+        graphs described by the content of &lt;graphml&gt;.
+        These functions are declared by &lt;key&gt; elements
+        (children of &lt;graphml&gt;) and defined by &lt;data&gt;
+        elements.
+        The (optional) &lt;default&gt; child of &lt;key&gt; gives
+        the default value for the corresponding function.
+        Occurrence: &lt;key&gt;.
       </xs:documentation>
     </xs:annotation>
-    <xs:selector xpath=".//g:endpoint"/>
-    <xs:field xpath="@id"/>
-  </xs:unique>
 
-  <xs:keyref name="edge_source_ref" refer="node_id_key">
+  </xs:element>
+
+  <xs:element name="graphml" type="graphml.type" block="#all">
+
     <xs:annotation>
-      <xs:documentation 
-          source="http://graphml.graphdrawing.org/"
-          xml:lang="en">
-        Ensures: for the source attribute of each &lt;edge> in this graph, 
-                 the existence of an id attribute of 
-                 &lt;node> which matches the value of it. 
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Description: &lt;graphml&gt; is the root element of each GraphML
+        document.
+        Occurrence: root.
       </xs:documentation>
     </xs:annotation>
-    <xs:selector xpath=".//g:edge"/>
-    <xs:field xpath="@source"/>
-  </xs:keyref> 
 
-  <xs:keyref name="edge_target_ref" refer="node_id_key">
-    <xs:annotation>
-      <xs:documentation 
+    <xs:unique name="graphml_data_key_unique">
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-        Ensures: for the target attribute of each &lt;edge> in this graph, 
-                 the existence of an id attribute of 
-                 &lt;node> which matches the value of it. 
-      </xs:documentation>
-    </xs:annotation>
-    <xs:selector xpath=".//g:edge"/>
-    <xs:field xpath="@target"/>
-  </xs:keyref>
-
-  <xs:keyref name="endpoint_node_ref" refer="node_id_key">
-    <xs:annotation>
-      <xs:documentation 
+          Ensures: uniqueness of the key attributes of &lt;data&gt; children
+          of this &lt;graphml&gt; element.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath="./g:data"/>
+      <xs:field xpath="@key"/>
+      <xs:field xpath="@time"/>
+    </xs:unique>
+
+    <xs:key name="key_id_key">
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-        Ensures: for the node attribute of each &lt;endpoint> in this graph,
-                 the existence of an id attribute of 
-                 &lt;node> which matches the value of it. 
-      </xs:documentation>
-    </xs:annotation>
-    <xs:selector xpath=".//g:endpoint"/>
-    <xs:field xpath="@node"/>
-  </xs:keyref>
+          Ensures: existence and uniqueness of the id attributes of 
+          each &lt;key&gt; element in this document.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath=".//g:key"/>
+      <xs:field xpath="@id"/>
+    </xs:key>
+
+    <xs:unique name="graph_id_unique">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          Ensures: uniqueness of the id attributes of
+          each &lt;graph&gt; element in this document.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath=".//g:graph"/>
+      <xs:field xpath="@id"/>
+    </xs:unique>
+
+    <xs:keyref name="data_key_ref" refer="key_id_key">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          Ensures: for the key attribute of each &lt;data&gt; in this document,
+          the existence of an id attribute of
+          &lt;key&gt; which matches the value of it.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath="./g:data"/>
+      <xs:field xpath="@key"/>
+    </xs:keyref>
 
-</xs:element>
+  </xs:element>
 
+  <xs:element name="graph" type="graph.type" block="#all">
 
-<xs:element name="node" type="node.type" block="#all">
     <xs:annotation>
-      <xs:documentation 
-          source="http://graphml.graphdrawing.org/"
-          xml:lang="en">
-           Description: Describes one node in the &lt;graph>
-                        containing this &lt;node>.
-           Occurence: &lt;graph>. 
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Description: Describes one graph in this document.
+        Occurrence: &lt;graphml&gt;, &lt;node&gt;, &lt;edge&gt;, &lt;hyperedge&gt;.
       </xs:documentation>
     </xs:annotation>
 
-  <xs:key name="port_name_key"> 
-    <xs:annotation>
-      <xs:documentation 
+    <xs:unique name="graph_data_key_unique">
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-        Ensures: existence and uniqueness of the name attributes of 
-                 each &lt;port> element within this &lt;node>.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:selector xpath=".//g:port"/>
-    <xs:field xpath="@name"/>
-  </xs:key>
-
-  <xs:unique name="node_data_key_unique">
-    <xs:annotation>
-      <xs:documentation 
+          Ensures: uniqueness of the key attributes of &lt;data&gt; children
+          of this &lt;graph&gt; element.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath="./g:data"/>
+      <xs:field xpath="@key"/>
+      <xs:field xpath="@time"/>
+    </xs:unique>
+
+    <xs:key name="node_id_key">
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-        Ensures: uniqueness of the key attributes of &lt;data> children
-                 of this &lt;node> element.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:selector xpath="./g:data"/>
-    <xs:field xpath="@key"/>
-    <xs:field xpath="@time"/>
-  </xs:unique>
+          Ensures: existence and uniqueness of the id attributes of
+          each &lt;node&gt; element in this graph.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath=".//g:node"/>
+      <xs:field xpath="@id"/>
+    </xs:key>
+
+    <xs:unique name="edge_id_unique">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          Ensures: uniqueness of the id attributes of
+          each &lt;edge&gt; element in this graph.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath=".//g:edge"/>
+      <xs:field xpath="@id"/>
+    </xs:unique>
+
+    <xs:unique name="hyperedge_id_unique">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          Ensures: uniqueness of the id attributes of
+          each &lt;hyperedge&gt; element in this graph.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath=".//g:hyperedge"/>
+      <xs:field xpath="@id"/>
+    </xs:unique>
+
+    <xs:unique name="endpoint_id_unique">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          Ensures: uniqueness of the id attributes of
+          each &lt;endpoint&gt; element in this graph.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath=".//g:endpoint"/>
+      <xs:field xpath="@id"/>
+    </xs:unique>
+
+    <xs:keyref name="edge_source_ref" refer="node_id_key">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          Ensures: for the source attribute of each &lt;edge&gt; in this graph,
+          the existence of an id attribute of
+          &lt;node&gt; which matches the value of it.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath=".//g:edge"/>
+      <xs:field xpath="@source"/>
+    </xs:keyref> 
+
+    <xs:keyref name="edge_target_ref" refer="node_id_key">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          Ensures: for the target attribute of each &lt;edge&gt; in this graph,
+          the existence of an id attribute of
+          &lt;node&gt; which matches the value of it.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath=".//g:edge"/>
+      <xs:field xpath="@target"/>
+    </xs:keyref>
+
+    <xs:keyref name="endpoint_node_ref" refer="node_id_key">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          Ensures: for the node attribute of each &lt;endpoint&gt; in this graph,
+          the existence of an id attribute of
+          &lt;node&gt; which matches the value of it.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath=".//g:endpoint"/>
+      <xs:field xpath="@node"/>
+    </xs:keyref>
 
-</xs:element>
+  </xs:element>
 
+  <xs:element name="node" type="node.type" block="#all">
 
-<xs:element name="port" type="port.type" block="#all">
     <xs:annotation>
-      <xs:documentation 
-          source="http://graphml.graphdrawing.org/"
-          xml:lang="en">
-           Description: Nodes may be structured by ports; thus edges
-                        are not only attached to a node but to a certain
-                        port in this node.
-           Occurence: &lt;node>, &lt;port>. 
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Description: Describes one node in the &lt;graph&gt;
+        containing this &lt;node&gt;.
+        Occurrence: &lt;graph&gt;.
       </xs:documentation>
     </xs:annotation>
 
-  <xs:unique name="port_data_key_unique">
-    <xs:annotation>
-      <xs:documentation 
+    <xs:key name="port_name_key">
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-        Ensures: uniqueness of the key attributes of &lt;data> children
-                 of this &lt;port> element.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:selector xpath="./g:data"/>
-    <xs:field xpath="@key"/>
-    <xs:field xpath="@time"/>
-  </xs:unique>
+          Ensures: existence and uniqueness of the name attributes of
+          each &lt;port&gt; element within this &lt;node&gt;.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath=".//g:port"/>
+      <xs:field xpath="@name"/>
+    </xs:key>
+
+    <xs:unique name="node_data_key_unique">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          Ensures: uniqueness of the key attributes of &lt;data&gt; children
+          of this &lt;node&gt; element.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath=".//g:data"/>
+      <xs:field xpath="@key"/>
+      <xs:field xpath="@time"/>
+    </xs:unique>
 
-</xs:element>
+  </xs:element>
 
+  <xs:element name="port" type="port.type" block="#all">
 
-<xs:element name="edge" type="edge.type" block="#all">
     <xs:annotation>
-      <xs:documentation 
-          source="http://graphml.graphdrawing.org/"
-          xml:lang="en">
-           Description: Describes an edge in the &lt;graph> which contains this
-                        &lt;edge>.
-           Occurence: &lt;graph>. 
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Description: Nodes may be structured by ports; thus edges
+        are not only attached to a node but to a certain
+        port in this node.
+        Occurrence: &lt;node&gt;, &lt;port&gt;.
       </xs:documentation>
     </xs:annotation>
 
-  <xs:unique name="edge_data_key_unique">
-    <xs:annotation>
-      <xs:documentation 
+    <xs:unique name="port_data_key_unique">
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-        Ensures: uniqueness of the key attributes of &lt;data> children
-                 of this &lt;edge> element.
+          Ensures: uniqueness of the key attributes of &lt;data&gt; children
+          of this &lt;port&gt; element.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath="./g:data"/>
+      <xs:field xpath="@key"/>
+      <xs:field xpath="@time"/>
+    </xs:unique>
+
+  </xs:element>
+
+  <xs:element name="edge" type="edge.type" block="#all">
+ 
+    <xs:annotation>
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Description: Describes an edge in the &lt;graph&gt; which contains this
+        &lt;edge&gt;.
+        Occurrence: &lt;graph&gt;.
       </xs:documentation>
     </xs:annotation>
-    <xs:selector xpath="./g:data"/>
-    <xs:field xpath="@key"/>
-    <xs:field xpath="@time"/>
-  </xs:unique>
 
-</xs:element>
+    <xs:unique name="edge_data_key_unique">
+      <xs:annotation>
+        <xs:documentation
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          Ensures: uniqueness of the key attributes of &lt;data&gt; children
+          of this &lt;edge&gt; element.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath="./g:data"/>
+      <xs:field xpath="@key"/>
+      <xs:field xpath="@time"/>
+    </xs:unique>
+
+  </xs:element>
 
+  <xs:element name="hyperedge" type="hyperedge.type" block="#all">
 
-<xs:element name="hyperedge" type="hyperedge.type" block="#all">
     <xs:annotation>
-      <xs:documentation 
-          source="http://graphml.graphdrawing.org/"
-          xml:lang="en">
-           Description: While edges describe relations between two nodes, 
-                        a hyperedge describes a relation between an arbitrary
-                        number of nodes.
-           Occurence: &lt;graph>. 
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Description: While edges describe relations between two nodes,
+        a hyperedge describes a relation between an arbitrary
+        number of nodes.
+        Occurrence: &lt;graph&gt;.
       </xs:documentation>
     </xs:annotation>
 
-  <xs:unique name="hyperedge_data_key_unique">
-    <xs:annotation>
-      <xs:documentation 
+    <xs:unique name="hyperedge_data_key_unique">
+      <xs:annotation>
+        <xs:documentation
           source="http://graphml.graphdrawing.org/"
           xml:lang="en">
-        Ensures: uniqueness of the key attributes of &lt;data> children
-                 of this &lt;hyperedge> element.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:selector xpath="./g:data"/>
-    <xs:field xpath="@key"/>
-    <xs:field xpath="@time"/>
-  </xs:unique>
+          Ensures: uniqueness of the key attributes of &lt;data&gt; children
+          of this &lt;hyperedge&gt; element.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:selector xpath="./g:data"/>
+      <xs:field xpath="@key"/>
+      <xs:field xpath="@time"/>
+    </xs:unique>
 
-</xs:element>
+  </xs:element>
 
+  <xs:element name="endpoint" type="endpoint.type" block="#all">
 
-<xs:element name="endpoint" type="endpoint.type" block="#all">
     <xs:annotation>
-      <xs:documentation 
-          source="http://graphml.graphdrawing.org/"
-          xml:lang="en">
-           Description: The list of &lt;endpoints> within a hyperedge
-                        points to the nodes contained in this hyperedge.
-           Occurence: &lt;hyperedge>. 
+      <xs:documentation
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+        Description: The list of &lt;endpoints&gt; within a hyperedge
+        points to the nodes contained in this hyperedge.
+        Occurrence: &lt;hyperedge>.
       </xs:documentation>
     </xs:annotation>
-</xs:element>
+
+  </xs:element>
 
 </xs:schema>
\ No newline at end of file
diff --git a/src/QuikGraph.Serialization/GraphML/graphml.dtd b/src/QuikGraph.Serialization/GraphML/graphml.dtd
index d378688eb..85f6c3811 100644
--- a/src/QuikGraph.Serialization/GraphML/graphml.dtd
+++ b/src/QuikGraph.Serialization/GraphML/graphml.dtd
@@ -3,18 +3,17 @@
 <!-- file: graphml.dtd 
 
             SYSTEM "http://graphml.graphdrawing.org/dtds/graphml.dtd"
- 
+
             xmlns="http://graphml.graphdrawing.org/xmlns/graphml"
             (consider these urls as examples)
 
-    ====================================================================== -->
+     ====================================================================== -->
 
 
 <!--============================================================-->
-<!--elements of GRAPHML-->
+<!-- elements of GRAPHML -->
 <!--============================================================-->
 
-
 <!ELEMENT graphml  ((desc)?,(key)*,((data)|(graph))*)>
 
 
@@ -25,6 +24,7 @@
           xlink:type    (simple) #FIXED    "simple"
 >
 
+
 <!ELEMENT desc (#PCDATA)>
 
 
@@ -32,13 +32,15 @@
 <!ATTLIST graph    
           id          ID                    #IMPLIED
           edgedefault (directed|undirected) #REQUIRED
->   
+>
+
 
 <!ELEMENT node   (desc?,(((data|port)*,graph?)|locator))>
 <!ATTLIST node   
           id        ID      #REQUIRED
 >
-  
+
+
 <!ELEMENT port ((desc)?,((data)|(port))*)>
 <!ATTLIST port
           name    NMTOKEN  #REQUIRED
@@ -61,6 +63,7 @@
           id     ID      #IMPLIED
 >
 
+
 <!ELEMENT endpoint ((desc)?)>
 <!ATTLIST endpoint 
           id    ID             #IMPLIED
@@ -74,7 +77,8 @@
 <!ATTLIST key 
           id  ID                                            #REQUIRED
           for (graphml|graph|node|edge|hyperedge|port|endpoint|all) "all"
->   
+>
+
 
 <!ELEMENT data  (#PCDATA)>
 <!ATTLIST data 
diff --git a/src/QuikGraph.Serialization/GraphML/graphml.xsd b/src/QuikGraph.Serialization/GraphML/graphml.xsd
index 53e21de97..147d083c9 100644
--- a/src/QuikGraph.Serialization/GraphML/graphml.xsd
+++ b/src/QuikGraph.Serialization/GraphML/graphml.xsd
@@ -1,338 +1,338 @@
 <?xml version="1.0"?>
-
-<xs:schema   
-    targetNamespace="http://graphml.graphdrawing.org/xmlns"
-
-    xmlns="http://graphml.graphdrawing.org/xmlns"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
->
+<xs:schema
+  targetNamespace="http://graphml.graphdrawing.org/xmlns"
+  xmlns="http://graphml.graphdrawing.org/xmlns"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified">
 
   <xs:annotation>
     <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
-     This document defines the GraphML language including GraphML attributes and GraphML parseinfo.
+      source="http://graphml.graphdrawing.org/"
+      xml:lang="en">
+      This document defines the GraphML language including GraphML attributes and GraphML parseinfo.
     </xs:documentation>
   </xs:annotation>
 
+  <xs:redefine schemaLocation="http://graphml.graphdrawing.org/xmlns/1.1/graphml-structure.xsd">
 
-<xs:redefine schemaLocation="http://graphml.graphdrawing.org/xmlns/1.1/graphml-structure.xsd">
-
-  <!-- redefinition as in graphml-attributes.xsd -->
-  <xs:attributeGroup name="key.extra.attrib">
-    <xs:attributeGroup ref="key.extra.attrib"/>
-    <xs:attributeGroup ref="key.attributes.attrib"/>
-  </xs:attributeGroup>
-
-  <!-- redefinition as in graphml-parseinfo.xsd -->
-  <xs:attributeGroup name="graph.extra.attrib">
-    <xs:attributeGroup ref="graph.extra.attrib"/>
-    <xs:attributeGroup ref="graph.parseinfo.attrib"/>
-  </xs:attributeGroup>
+    <!-- redefinition as in graphml-attributes.xsd -->
+    <xs:attributeGroup name="key.extra.attrib">
+      <xs:attributeGroup ref="key.extra.attrib"/>
+      <xs:attributeGroup ref="key.attributes.attrib"/>
+    </xs:attributeGroup>
 
-  <xs:attributeGroup name="node.extra.attrib">
-    <xs:attributeGroup ref="node.extra.attrib"/>
-    <xs:attributeGroup ref="node.parseinfo.attrib"/>
-  </xs:attributeGroup>
+    <!-- redefinition as in graphml-parseinfo.xsd -->
+    <xs:attributeGroup name="graph.extra.attrib">
+      <xs:attributeGroup ref="graph.extra.attrib"/>
+      <xs:attributeGroup ref="graph.parseinfo.attrib"/>
+    </xs:attributeGroup>
 
-</xs:redefine>
+    <xs:attributeGroup name="node.extra.attrib">
+      <xs:attributeGroup ref="node.extra.attrib"/>
+      <xs:attributeGroup ref="node.parseinfo.attrib"/>
+    </xs:attributeGroup>
 
+  </xs:redefine>
 
-<!-- types as in graphml-attributes.xsd -->
-<xs:simpleType name="key.name.type" final="#all">
+  <!-- types as in graphml-attributes.xsd -->
+  <xs:simpleType name="key.name.type" final="#all">
 
-  <xs:annotation>
-    <xs:documentation 
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/(Dokumentation der Attributes Erweiterung; entsprechende Stelle.html)"
         xml:lang="en">
-      Simple type for the attr.name attribute of &lt;key>.
-      key.name.type is final, that is, it may not be extended
-                          or restricted.
-      key.name.type is a restriction of xs:NMTOKEN
-      Allowed values: (no restriction)
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:restriction base="xs:NMTOKEN"/>
+        Simple type for the attr.name attribute of &lt;key&gt;.
+        key.name.type is final, that is, it may not be extended
+        or restricted.
+        key.name.type is a restriction of xs:NMTOKEN
+        Allowed values: (no restriction)
+      </xs:documentation>
+    </xs:annotation>
 
-</xs:simpleType>
+    <xs:restriction base="xs:NMTOKEN"/>
 
+  </xs:simpleType>
 
+  <xs:simpleType name="key.type.type" final="#all">
 
-<xs:simpleType name="key.type.type" final="#all">
-
-  <xs:annotation>
-    <xs:documentation 
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/(Dokumentation der Attributes Erweiterung; entsprechende Stelle.html)"
         xml:lang="en">
-      Simple type for the attr.type attribute of &lt;key>.
-      key.type.type is final, that is, it may not be extended
-                          or restricted.
-      key.type.type is a restriction of xs:NMTOKEN
-      Allowed values: boolean, int, long, float, double, string.
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:restriction base="xs:NMTOKEN">  
-    <xs:enumeration value="boolean"/>
-    <xs:enumeration value="int"/>
-    <xs:enumeration value="long"/>
-    <xs:enumeration value="float"/>
-    <xs:enumeration value="double"/>
-    <xs:enumeration value="string"/>
-  </xs:restriction>
-
-</xs:simpleType>
-
-
-<xs:attributeGroup name="key.attributes.attrib">
-
-  <xs:annotation>
-    <xs:documentation 
+        Simple type for the attr.type attribute of &lt;key&gt;.
+        key.type.type is final, that is, it may not be extended
+        or restricted.
+        key.type.type is a restriction of xs:NMTOKEN
+        Allowed values: boolean, int, long, float, double, string.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:restriction base="xs:NMTOKEN">  
+      <xs:enumeration value="boolean"/>
+      <xs:enumeration value="int"/>
+      <xs:enumeration value="long"/>
+      <xs:enumeration value="float"/>
+      <xs:enumeration value="double"/>
+      <xs:enumeration value="string"/>
+    </xs:restriction>
+
+  </xs:simpleType>
+
+  <xs:attributeGroup name="key.attributes.attrib">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-     Definition of the attribute group key.attributes.attrib.
-     This group consists of the two optional attributes
-         - attr.name (gives the name for the data function)
-         - attr.type ((declares the range of values for the data function)
-    </xs:documentation>
-  </xs:annotation>
+        Definition of the attribute group key.attributes.attrib.
+        This group consists of the two optional attributes
+            - attr.name (gives the name for the data function)
+            - attr.type ((declares the range of values for the data function)
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:attribute name="attr.name" type="key.name.type" use="optional"/>
-  <xs:attribute name="attr.type" type="key.type.type" use="optional"/>
-</xs:attributeGroup>
+    <xs:attribute name="attr.name" type="key.name.type" use="optional"/>
+    <xs:attribute name="attr.type" type="key.type.type" use="optional"/>
 
-  <!-- types as in graphml-parseinfo.xsd -->
+  </xs:attributeGroup>
 
+  <!-- types as in graphml-parseinfo.xsd -->
   <xs:annotation>
     <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-       Simple type definitions for the new graph attributes.
+        Simple type definitions for the new graph attributes.
     </xs:documentation>
   </xs:annotation>
 
-<xs:simpleType name="graph.order.type"  final="#all">
+  <xs:simpleType name="graph.order.type"  final="#all">
 
-  <xs:annotation>
-    <xs:documentation 
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.order attribute of &lt;graph>.
-      graph.order.type is final, that is, it may not be extended
-                          or restricted.
-      graph.order.type is a restriction of xs:NMTOKEN
-      Allowed values: free, nodesfirst, adjacencylist.
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:restriction base="xs:NMTOKEN">
-    <xs:enumeration value="free"/>
-    <xs:enumeration value="nodesfirst"/>
-    <xs:enumeration value="adjacencylist"/>
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="graph.nodes.type"  final="#all">
-
-  <xs:annotation>
-    <xs:documentation 
+        Simple type for the parse.order attribute of &lt;graph&gt;.
+        graph.order.type is final, that is, it may not be extended
+        or restricted.
+        graph.order.type is a restriction of xs:NMTOKEN
+        Allowed values: free, nodesfirst, adjacencylist.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:restriction base="xs:NMTOKEN">
+      <xs:enumeration value="free"/>
+      <xs:enumeration value="nodesfirst"/>
+      <xs:enumeration value="adjacencylist"/>
+    </xs:restriction>
+
+  </xs:simpleType>
+
+  <xs:simpleType name="graph.nodes.type"  final="#all">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.nodes attribute of &lt;graph>.
-      graph.nodes.type is final, that is, it may not be extended
-                          or restricted.
-      graph.nodes.type is a restriction of xs:nonNegativeInteger
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.nodes attribute of &lt;graph&gt;.
+        graph.nodes.type is final, that is, it may not be extended
+        or restricted.
+        graph.nodes.type is a restriction of xs:nonNegativeInteger
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:nonNegativeInteger"/>  
-</xs:simpleType>
+    <xs:restriction base="xs:nonNegativeInteger"/>  
 
-<xs:simpleType name="graph.edges.type" final="#all">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:simpleType name="graph.edges.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.edges attribute of &lt;graph>.
-      graph.edges.type is final, that is, it may not be extended
-                          or restricted.
-      graph.edges.type is a restriction of xs:nonNegativeInteger
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.edges attribute of &lt;graph&gt;.
+        graph.edges.type is final, that is, it may not be extended
+        or restricted.
+        graph.edges.type is a restriction of xs:nonNegativeInteger
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:nonNegativeInteger"/>  
-</xs:simpleType>
+    <xs:restriction base="xs:nonNegativeInteger"/>  
 
-<xs:simpleType name="graph.maxindegree.type" final="#all">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:simpleType name="graph.maxindegree.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.maxindegree attribute of &lt;graph>.
-      graph.maxindegree.type is final, that is, it may not be extended
-                          or restricted.
-      graph.maxindegree.type is a restriction of xs:nonNegativeInteger
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.maxindegree attribute of &lt;graph&gt;.
+        graph.maxindegree.type is final, that is, it may not be extended
+        or restricted.
+        graph.maxindegree.type is a restriction of xs:nonNegativeInteger
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:nonNegativeInteger"/>  
-</xs:simpleType>
+    <xs:restriction base="xs:nonNegativeInteger"/>
 
-<xs:simpleType name="graph.maxoutdegree.type" final="#all">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:simpleType name="graph.maxoutdegree.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.maxoutdegree attribute of &lt;graph>.
-      graph.maxoutdegree.type is final, that is, it may not be extended
-                          or restricted.
-      graph.maxoutdegree.type is a restriction of xs:nonNegativeInteger
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.maxoutdegree attribute of &lt;graph&gt;.
+        graph.maxoutdegree.type is final, that is, it may not be extended
+        or restricted.
+        graph.maxoutdegree.type is a restriction of xs:nonNegativeInteger
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:nonNegativeInteger"/>  
-</xs:simpleType>
+    <xs:restriction base="xs:nonNegativeInteger"/>
 
-<xs:simpleType name="graph.nodeids.type"  final="#all">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:simpleType name="graph.nodeids.type"  final="#all">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.nodeids attribute of &lt;graph>.
-      graph.nodeids.type is final, that is, it may not be extended
-                          or restricted.
-      graph.nodeids.type is a restriction of xs:string
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.nodeids attribute of &lt;graph&gt;.
+        graph.nodeids.type is final, that is, it may not be extended
+        or restricted.
+        graph.nodeids.type is a restriction of xs:string
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:NMTOKEN">
-    <xs:enumeration value="canonical"/>
-    <xs:enumeration value="free"/>
-  </xs:restriction>  
-</xs:simpleType>
+    <xs:restriction base="xs:NMTOKEN">
+      <xs:enumeration value="canonical"/>
+      <xs:enumeration value="free"/>
+    </xs:restriction>
 
-<xs:simpleType name="graph.edgeids.type"  final="#all">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:simpleType name="graph.edgeids.type"  final="#all">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.edgeids attribute of &lt;graph>.
-      graph.edgeids.type is final, that is, it may not be extended
-                          or restricted.
-      graph.edgeids.type is a restriction of xs:string
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.edgeids attribute of &lt;graph&gt;.
+        graph.edgeids.type is final, that is, it may not be extended
+        or restricted.
+        graph.edgeids.type is a restriction of xs:string
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:NMTOKEN">
-    <xs:enumeration value="canonical"/>
-    <xs:enumeration value="free"/>
-  </xs:restriction>  
-</xs:simpleType>
+    <xs:restriction base="xs:NMTOKEN">
+      <xs:enumeration value="canonical"/>
+      <xs:enumeration value="free"/>
+    </xs:restriction>
 
-<xs:attributeGroup name="graph.parseinfo.attrib">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:attributeGroup name="graph.parseinfo.attrib">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-     Definition of the attribute group graph.parseinfo.attrib.
-     This group consists of the seven attributes
-     - parse.nodeids (fixed to 'canonical' meaning that the id attribute
-                      of &lt;node> follows the pattern 'n[number]),
-     - parse.edgeids (fixed to 'canonical' meaning that the id attribute
-                      of &lt;edge> follows the pattern 'e[number]),
-     - parse.order (required; one of the values 'nodesfirst', 
-                    'adjacencylist' or 'free'),
-     - parse.nodes (required; number of nodes in this graph), 
-     - parse.edges (required; number of edges in this graph), 
-     - parse.maxindegree (optional; maximal indegree of a node in this graph),
-     - parse.maxoutdegree (optional; maximal outdegree of a node in this graph)
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:attribute name="parse.nodeids" type="graph.nodeids.type"/>
-  <xs:attribute name="parse.edgeids" type="graph.edgeids.type"/>
-  <xs:attribute name="parse.order" type="graph.order.type"/>
-  <xs:attribute name="parse.nodes" type="graph.nodes.type"/>
-  <xs:attribute name="parse.edges" type="graph.edges.type"/>
-  <xs:attribute name="parse.maxindegree" type="graph.maxindegree.type" use="optional"/>
-  <xs:attribute name="parse.maxoutdegree" type="graph.maxoutdegree.type" use="optional"/>
-</xs:attributeGroup>
-
+        Definition of the attribute group graph.parseinfo.attrib.
+        This group consists of the seven attributes
+            - parse.nodeids (fixed to 'canonical' meaning that the id attribute
+              of &lt;node&gt; follows the pattern 'n[number]),
+            - parse.edgeids (fixed to 'canonical' meaning that the id attribute
+              of &lt;edge&gt; follows the pattern 'e[number]),
+            - parse.order (required; one of the values 'nodesfirst',
+              'adjacencylist' or 'free'),
+            - parse.nodes (required; number of nodes in this graph),
+            - parse.edges (required; number of edges in this graph),
+            - parse.maxindegree (optional; maximal indegree of a node in this graph),
+            - parse.maxoutdegree (optional; maximal outdegree of a node in this graph)
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:attribute name="parse.nodeids" type="graph.nodeids.type"/>
+    <xs:attribute name="parse.edgeids" type="graph.edgeids.type"/>
+    <xs:attribute name="parse.order" type="graph.order.type"/>
+    <xs:attribute name="parse.nodes" type="graph.nodes.type"/>
+    <xs:attribute name="parse.edges" type="graph.edges.type"/>
+    <xs:attribute name="parse.maxindegree" type="graph.maxindegree.type" use="optional"/>
+    <xs:attribute name="parse.maxoutdegree" type="graph.maxoutdegree.type" use="optional"/>
 
+  </xs:attributeGroup>
 
   <xs:annotation>
     <xs:documentation 
-        source="http://graphml.graphdrawing.org/"
-        xml:lang="en">
-       Simple type definitions for the new node attributes.
+      source="http://graphml.graphdrawing.org/"
+      xml:lang="en">
+      Simple type definitions for the new node attributes.
     </xs:documentation>
   </xs:annotation>
 
-<xs:simpleType name="node.indegree.type" final="#all">
+  <xs:simpleType name="node.indegree.type" final="#all">
 
-  <xs:annotation>
-    <xs:documentation 
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.indegree attribute of &lt;node>.
-      node.indegree.type is final, that is, it may not be extended
-                          or restricted.
-      node.indegree.type is a restriction of xs:nonNegativeInteger
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.indegree attribute of &lt;node&gt;.
+        node.indegree.type is final, that is, it may not be extended
+        or restricted.
+        node.indegree.type is a restriction of xs:nonNegativeInteger
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:nonNegativeInteger"/>  
-</xs:simpleType>
+    <xs:restriction base="xs:nonNegativeInteger"/>  
 
-<xs:simpleType name="node.outdegree.type" final="#all">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:simpleType name="node.outdegree.type" final="#all">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-      Simple type for the parse.outdegree attribute of &lt;node>.
-      node.outdegree.type is final, that is, it may not be extended
-                          or restricted.
-      node.outdegree.type is a restriction of xs:nonNegativeInteger
-      Allowed values: (no restriction).
-    </xs:documentation>
-  </xs:annotation>
+        Simple type for the parse.outdegree attribute of &lt;node&gt;.
+        node.outdegree.type is final, that is, it may not be extended
+        or restricted.
+        node.outdegree.type is a restriction of xs:nonNegativeInteger
+        Allowed values: (no restriction).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:restriction base="xs:nonNegativeInteger"/>  
-</xs:simpleType>
+    <xs:restriction base="xs:nonNegativeInteger"/>  
 
-<xs:attributeGroup name="node.parseinfo.attrib">
+  </xs:simpleType>
 
-  <xs:annotation>
-    <xs:documentation 
+  <xs:attributeGroup name="node.parseinfo.attrib">
+
+    <xs:annotation>
+      <xs:documentation 
         source="http://graphml.graphdrawing.org/"
         xml:lang="en">
-     Definition of the attribute group node.parseinfo.attrib.
-     This group consists of two attributes
-     - parse.indegree (optional; indegree of this node),
-     - parse.outdegree (optional; outdegree of this node).
-    </xs:documentation>
-  </xs:annotation>
+        Definition of the attribute group node.parseinfo.attrib.
+        This group consists of two attributes
+            - parse.indegree (optional; indegree of this node),
+            - parse.outdegree (optional; outdegree of this node).
+      </xs:documentation>
+    </xs:annotation>
 
-  <xs:attribute name="parse.indegree" type="node.indegree.type" use="optional"/>
-  <xs:attribute name="parse.outdegree" type="node.outdegree.type" use="optional"/>
-</xs:attributeGroup>
+    <xs:attribute name="parse.indegree" type="node.indegree.type" use="optional"/>
+    <xs:attribute name="parse.outdegree" type="node.outdegree.type" use="optional"/>
+
+  </xs:attributeGroup>
 
 </xs:schema>
\ No newline at end of file
diff --git a/src/QuikGraph.Serialization/GraphML/xlink.xsd b/src/QuikGraph.Serialization/GraphML/xlink.xsd
index 9dd85b206..734069803 100644
--- a/src/QuikGraph.Serialization/GraphML/xlink.xsd
+++ b/src/QuikGraph.Serialization/GraphML/xlink.xsd
@@ -1,59 +1,55 @@
 <?xml version="1.0"?>
-
-<xs:schema 
-    targetNamespace="http://www.w3.org/1999/xlink" 
-
-    xmlns:xlink="http://www.w3.org/1999/xlink" 
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
->
-
-<xs:attribute name="type" default="simple">
-  <xs:simpleType>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="simple"/>
-      <xs:enumeration value="extended"/>
-      <xs:enumeration value="locator"/>
-      <xs:enumeration value="arc"/>
-    </xs:restriction>
-  </xs:simpleType>
-</xs:attribute>
-
-<xs:attribute name="href" type="xs:anyURI" />
-
-<xs:attribute name="role" type="xs:string" />
-
-<xs:attribute name="arcrole" type="xs:string" />
-
-<xs:attribute name="title" type="xs:string" />
-
-<xs:attribute name="show" default="embed">
-  <xs:simpleType>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="new"/>
-      <xs:enumeration value="replace"/>
-      <xs:enumeration value="embed"/>
-      <xs:enumeration value="other"/>
-      <xs:enumeration value="none"/>
-    </xs:restriction>
-  </xs:simpleType>
-</xs:attribute>
-
-<xs:attribute name="actuate" default="onLoad">
-  <xs:simpleType>
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="onLoad"/>
-      <xs:enumeration value="onRequest"/>
-      <xs:enumeration value="other"/>
-      <xs:enumeration value="none"/>
-    </xs:restriction>
-  </xs:simpleType>
-</xs:attribute>
-
-<xs:attribute name="from" type="xs:string" />
-
-<xs:attribute name="to" type="xs:string" />
+<xs:schema
+  targetNamespace="http://www.w3.org/1999/xlink"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified">
+
+  <xs:attribute name="type" default="simple">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:enumeration value="simple"/>
+        <xs:enumeration value="extended"/>
+        <xs:enumeration value="locator"/>
+        <xs:enumeration value="arc"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+
+  <xs:attribute name="href" type="xs:anyURI" />
+
+  <xs:attribute name="role" type="xs:string" />
+
+  <xs:attribute name="arcrole" type="xs:string" />
+
+  <xs:attribute name="title" type="xs:string" />
+
+  <xs:attribute name="show" default="embed">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:enumeration value="new"/>
+        <xs:enumeration value="replace"/>
+        <xs:enumeration value="embed"/>
+        <xs:enumeration value="other"/>
+        <xs:enumeration value="none"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+
+  <xs:attribute name="actuate" default="onLoad">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:enumeration value="onLoad"/>
+        <xs:enumeration value="onRequest"/>
+        <xs:enumeration value="other"/>
+        <xs:enumeration value="none"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+
+  <xs:attribute name="from" type="xs:string" />
+
+  <xs:attribute name="to" type="xs:string" />
 
 </xs:schema>
\ No newline at end of file

From 23c9ee02f5b706954aaada49a23e9fcd49e57d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sun, 26 Jun 2022 12:34:38 +0200
Subject: [PATCH 33/39] Fix GraphML deserialization where some data were
 skipped.

---
 .../GraphML/GraphMLDeserializer.cs                  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/QuikGraph.Serialization/GraphML/GraphMLDeserializer.cs b/src/QuikGraph.Serialization/GraphML/GraphMLDeserializer.cs
index 61bb7e5ed..cf3c1919b 100644
--- a/src/QuikGraph.Serialization/GraphML/GraphMLDeserializer.cs
+++ b/src/QuikGraph.Serialization/GraphML/GraphMLDeserializer.cs
@@ -394,9 +394,9 @@ private void ReadEdge([NotNull] IDictionary<string, TVertex> vertices)
                     // Read data
                     while (subReader.Read())
                     {
-                        if (_reader.NodeType == XmlNodeType.Element
-                            && _reader.Name == DataTag
-                            && _reader.NamespaceURI == _graphMLNamespace)
+                        while (subReader.NodeType == XmlNodeType.Element
+                            && subReader.Name == DataTag
+                            && subReader.NamespaceURI == _graphMLNamespace)
                         {
                             ReadDelegateCompiler.EdgeAttributesReader(subReader, _graphMLNamespace, edge);
                         }
@@ -423,12 +423,13 @@ private void ReadVertex([NotNull] IDictionary<string, TVertex> vertices)
                     TVertex vertex = _vertexFactory(id);
                     // Apply defaults
                     ReadDelegateCompiler.SetVertexDefault(vertex);
+
                     // Read data
                     while (subReader.Read())
                     {
-                        if (_reader.NodeType == XmlNodeType.Element
-                            && _reader.Name == DataTag
-                            && _reader.NamespaceURI == _graphMLNamespace)
+                        while (subReader.NodeType == XmlNodeType.Element
+                            && subReader.Name == DataTag
+                            && subReader.NamespaceURI == _graphMLNamespace)
                         {
                             ReadDelegateCompiler.VertexAttributesReader(subReader, _graphMLNamespace, vertex);
                         }

From 74c396b182fcda9a6e8933ce9a5c49dd43a05895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sun, 26 Jun 2022 12:35:27 +0200
Subject: [PATCH 34/39] Better handle null string value through GraphML
 serialization.

---
 .../GraphML/GraphMLDeserializer.cs            | 70 +++++++++++--------
 .../GraphML/GraphMLSerializer.cs              | 40 ++++++++---
 .../GraphML/XmlReaderExtensions.cs            | 26 +++++++
 3 files changed, 98 insertions(+), 38 deletions(-)

diff --git a/src/QuikGraph.Serialization/GraphML/GraphMLDeserializer.cs b/src/QuikGraph.Serialization/GraphML/GraphMLDeserializer.cs
index cf3c1919b..9d0103e81 100644
--- a/src/QuikGraph.Serialization/GraphML/GraphMLDeserializer.cs
+++ b/src/QuikGraph.Serialization/GraphML/GraphMLDeserializer.cs
@@ -168,16 +168,17 @@ private static Delegate CreateReadDelegate(
                 var method = new DynamicMethod(
                     $"{DynamicMethodPrefix}Read{elementType.Name}",
                     typeof(void),
-                    // reader, namespaceUri
                     new[] { typeof(XmlReader), typeof(string), elementType },
                     elementType.Module);
                 ILGenerator generator = method.GetILGenerator();
 
+                // Ldarg_0 = reader
+                // Ldarg_1 = namespace URI
+                // Ldarg_2 = element
+
                 generator.DeclareLocal(typeof(string));
 
-                generator.Emit(OpCodes.Ldarg_0);
-                generator.Emit(OpCodes.Ldstr, "key");
-                EmitCall(generator, Metadata.GetAttributeMethod);
+                GetXmlAttribute("key");
                 generator.Emit(OpCodes.Stloc_0);
 
                 // We need to create the switch for each property
@@ -210,7 +211,7 @@ private static Delegate CreateReadDelegate(
                     if (setMethod is null)
                         throw new InvalidOperationException($"Property {property.DeclaringType}.{property.Name} has no setter.");
 
-                    // reader.ReadXXX + SetField
+                    // element.xxx = reader.ReadXXX
                     generator.Emit(OpCodes.Ldarg_2); // element
                     generator.Emit(OpCodes.Ldarg_0); // reader
                     generator.Emit(OpCodes.Ldstr, "data");
@@ -233,6 +234,17 @@ private static Delegate CreateReadDelegate(
 
                 // Let's bake the method
                 return method.CreateDelegate(delegateType);
+
+                #region Local function
+
+                void GetXmlAttribute(string attributeName)
+                {
+                    generator.Emit(OpCodes.Ldarg_0);
+                    generator.Emit(OpCodes.Ldstr, attributeName);
+                    EmitCall(generator, Metadata.GetAttributeMethod);
+                }
+
+                #endregion
             }
         }
 
@@ -368,12 +380,12 @@ private void ReadElements()
                 }
             }
 
-            private void ReadEdge([NotNull] IDictionary<string, TVertex> vertices)
+            private void ReadVertex([NotNull] IDictionary<string, TVertex> vertices)
             {
                 Debug.Assert(vertices != null);
                 Debug.Assert(
                     _reader.NodeType == XmlNodeType.Element
-                    && _reader.Name == EdgeTag
+                    && _reader.Name == NodeTag
                     && _reader.NamespaceURI == _graphMLNamespace);
 
                 // Get subtree
@@ -381,15 +393,10 @@ private void ReadEdge([NotNull] IDictionary<string, TVertex> vertices)
                 {
                     // Read id
                     string id = ReadAttributeValue(_reader, IdAttribute);
-                    string sourceId = ReadAttributeValue(_reader, SourceAttribute);
-                    if (!vertices.TryGetValue(sourceId, out TVertex source))
-                        throw new ArgumentException($"Could not find vertex {sourceId}.");
-                    string targetId = ReadAttributeValue(_reader, TargetAttribute);
-                    if (!vertices.TryGetValue(targetId, out TVertex target))
-                        throw new ArgumentException($"Could not find vertex {targetId}.");
-
-                    TEdge edge = _edgeFactory(source, target, id);
-                    ReadDelegateCompiler.SetEdgeDefault(edge);
+                    // Create new vertex
+                    TVertex vertex = _vertexFactory(id);
+                    // Apply defaults
+                    ReadDelegateCompiler.SetVertexDefault(vertex);
 
                     // Read data
                     while (subReader.Read())
@@ -398,20 +405,22 @@ private void ReadEdge([NotNull] IDictionary<string, TVertex> vertices)
                             && subReader.Name == DataTag
                             && subReader.NamespaceURI == _graphMLNamespace)
                         {
-                            ReadDelegateCompiler.EdgeAttributesReader(subReader, _graphMLNamespace, edge);
+                            ReadDelegateCompiler.VertexAttributesReader(subReader, _graphMLNamespace, vertex);
                         }
                     }
 
-                    _graph.AddEdge(edge);
+                    // Add to graph
+                    _graph.AddVertex(vertex);
+                    vertices.Add(id, vertex);
                 }
             }
 
-            private void ReadVertex([NotNull] IDictionary<string, TVertex> vertices)
+            private void ReadEdge([NotNull] IDictionary<string, TVertex> vertices)
             {
                 Debug.Assert(vertices != null);
                 Debug.Assert(
                     _reader.NodeType == XmlNodeType.Element
-                    && _reader.Name == NodeTag
+                    && _reader.Name == EdgeTag
                     && _reader.NamespaceURI == _graphMLNamespace);
 
                 // Get subtree
@@ -419,10 +428,15 @@ private void ReadVertex([NotNull] IDictionary<string, TVertex> vertices)
                 {
                     // Read id
                     string id = ReadAttributeValue(_reader, IdAttribute);
-                    // Create new vertex
-                    TVertex vertex = _vertexFactory(id);
-                    // Apply defaults
-                    ReadDelegateCompiler.SetVertexDefault(vertex);
+                    string sourceId = ReadAttributeValue(_reader, SourceAttribute);
+                    if (!vertices.TryGetValue(sourceId, out TVertex source))
+                        throw new ArgumentException($"Could not find vertex {sourceId}.");
+                    string targetId = ReadAttributeValue(_reader, TargetAttribute);
+                    if (!vertices.TryGetValue(targetId, out TVertex target))
+                        throw new ArgumentException($"Could not find vertex {targetId}.");
+
+                    TEdge edge = _edgeFactory(source, target, id);
+                    ReadDelegateCompiler.SetEdgeDefault(edge);
 
                     // Read data
                     while (subReader.Read())
@@ -431,13 +445,11 @@ private void ReadVertex([NotNull] IDictionary<string, TVertex> vertices)
                             && subReader.Name == DataTag
                             && subReader.NamespaceURI == _graphMLNamespace)
                         {
-                            ReadDelegateCompiler.VertexAttributesReader(subReader, _graphMLNamespace, vertex);
+                            ReadDelegateCompiler.EdgeAttributesReader(subReader, _graphMLNamespace, edge);
                         }
                     }
 
-                    // Add to graph
-                    _graph.AddVertex(vertex);
-                    vertices.Add(id, vertex);
+                    _graph.AddEdge(edge);
                 }
             }
 
@@ -495,7 +507,7 @@ private static Dictionary<Type, MethodInfo> InitializeReadMethods()
                 [typeof(long)] = readerType.GetMethod(nameof(XmlReader.ReadElementContentAsLong), new[] { typeof(string), typeof(string) }),
                 [typeof(float)] = readerType.GetMethod(nameof(XmlReader.ReadElementContentAsFloat), new[] { typeof(string), typeof(string) }),
                 [typeof(double)] = readerType.GetMethod(nameof(XmlReader.ReadElementContentAsDouble), new[] { typeof(string), typeof(string) }),
-                [typeof(string)] = readerType.GetMethod(nameof(XmlReader.ReadElementContentAsString), new[] { typeof(string), typeof(string) }),
+                [typeof(string)] = readerExtensionsType.GetMethod(nameof(XmlReaderExtensions.ReadElementAsNullableString)),
 
                 // Extensions
                 [typeof(bool[])] = readerExtensionsType.GetMethod(nameof(XmlReaderExtensions.ReadElementContentAsBooleanArray)),
diff --git a/src/QuikGraph.Serialization/GraphML/GraphMLSerializer.cs b/src/QuikGraph.Serialization/GraphML/GraphMLSerializer.cs
index 3a84387b9..6158388d9 100644
--- a/src/QuikGraph.Serialization/GraphML/GraphMLSerializer.cs
+++ b/src/QuikGraph.Serialization/GraphML/GraphMLSerializer.cs
@@ -92,8 +92,12 @@ private static void EmitWriteProperty(PropertySerializationInfo info, [NotNull]
                 if (!Metadata.TryGetWriteValueMethod(property.PropertyType, out MethodInfo writeMethod))
                     throw new NotSupportedException($"Property {property.DeclaringType}.{property.Name} type is not supported.");
 
-                var defaultValueAttribute =
-                    Attribute.GetCustomAttribute(property, typeof(DefaultValueAttribute)) as DefaultValueAttribute;
+                // Ldarg_0 = writer
+                // Ldarg_1 = element
+
+                var defaultValueAttribute = Attribute.GetCustomAttribute(
+                    property,
+                    typeof(DefaultValueAttribute)) as DefaultValueAttribute;
                 if (defaultValueAttribute != null)
                 {
                     @default = generator.DefineLabel();
@@ -119,15 +123,11 @@ private static void EmitWriteProperty(PropertySerializationInfo info, [NotNull]
                 EmitCall(generator, Metadata.WriteStartElementMethod);
 
                 // writer.WriteStartAttribute("key");
-                generator.Emit(OpCodes.Ldarg_0);
-                generator.Emit(OpCodes.Ldstr, "key");
-                generator.Emit(OpCodes.Ldstr, info.Name);
-                EmitCall(generator, Metadata.WriteAttributeStringMethod);
+                WriteXmlAttribute("key", info.Name);
 
-                // writer.WriteValue(v.xxx);
+                // writer.WriteValue(element.xxx);
                 generator.Emit(OpCodes.Ldarg_0);
-                generator.Emit(OpCodes.Ldarg_1);
-                EmitCall(generator, getMethod);
+                GetFieldValue();
                 EmitCall(generator, writeMethod);
 
                 // writer.WriteEndElement()
@@ -138,6 +138,28 @@ private static void EmitWriteProperty(PropertySerializationInfo info, [NotNull]
                 {
                     generator.MarkLabel(@default);
                 }
+
+                #region Local functions
+
+                void GetFieldValue()
+                {
+                    generator.Emit(OpCodes.Ldarg_1);
+                    EmitCall(generator, getMethod);
+                }
+
+                void WriteXmlAttribute(string attributeName, string attributeValue)
+                {
+                    Debug.Assert(generator != null);
+                    Debug.Assert(attributeName != null);
+                    Debug.Assert(attributeValue != null);
+
+                    generator.Emit(OpCodes.Ldarg_0);
+                    generator.Emit(OpCodes.Ldstr, attributeName);
+                    generator.Emit(OpCodes.Ldstr, attributeValue);
+                    EmitCall(generator, Metadata.WriteAttributeStringMethod);
+                }
+
+                #endregion
             }
 
             [NotNull]
diff --git a/src/QuikGraph.Serialization/GraphML/XmlReaderExtensions.cs b/src/QuikGraph.Serialization/GraphML/XmlReaderExtensions.cs
index 39d7111e6..8114662bc 100644
--- a/src/QuikGraph.Serialization/GraphML/XmlReaderExtensions.cs
+++ b/src/QuikGraph.Serialization/GraphML/XmlReaderExtensions.cs
@@ -9,6 +9,32 @@ namespace QuikGraph.Serialization
     /// </summary>
     public static class XmlReaderExtensions
     {
+        /// <summary>
+        /// Reads a named element as a string.
+        /// </summary>
+        /// <param name="xmlReader">XML reader.</param>
+        /// <param name="localName">Node name.</param>
+        /// <param name="namespaceURI">XML namespace.</param>
+        /// <returns>Boolean array.</returns>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="localName"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentNullException"><paramref name="namespaceURI"/> is <see langword="null"/>.</exception>
+        /// <exception cref="T:System.ArgumentException"><paramref name="localName"/> is empty.</exception>
+        [Pure]
+        [CanBeNull]
+        public static string ReadElementAsNullableString(
+            [NotNull] XmlReader xmlReader,
+            [NotNull] string localName,
+            [NotNull] string namespaceURI)
+        {
+            bool isNull = xmlReader.IsEmptyElement;
+            string str = xmlReader.ReadElementContentAsString(localName, namespaceURI);
+            if (isNull)
+            {
+                str = null;
+            }
+            return str;
+        }
+
         /// <summary>
         /// Reads the content of a named element as an array of booleans.
         /// </summary>

From c62bdcc083b61f5be0f759c99e3f8f23e6924399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Thu, 23 Jun 2022 22:57:37 +0200
Subject: [PATCH 35/39] Add tests for serialization of complex heterogenous
 structures.

---
 .../BinarySerializationTests.cs               |   96 +-
 .../GraphMLSerializationTests.cs              |  401 +++++-
 .../Helpers/TestHelpers.cs                    |   35 +
 .../SerializationTestCaseSources.cs           |  429 +++++-
 .../TestClasses/SerializationTestClasses.cs   |    8 +-
 .../SerializationTestEdgeClasses.cs           |   66 +-
 .../SerializationTestVertexClasses.cs         |   47 +-
 .../XmlSerializationTests.cs                  | 1176 ++++++++++++-----
 8 files changed, 1822 insertions(+), 436 deletions(-)
 create mode 100644 tests/QuikGraph.Serialization.Tests/Helpers/TestHelpers.cs

diff --git a/tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs b/tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs
index 89cf2e64a..e7c49a3ad 100644
--- a/tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs
+++ b/tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs
@@ -41,7 +41,7 @@ private static TGraph SerializeDeserialize<TVertex, TEdge, TGraph>([NotNull] TGr
         #endregion
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphTestCases))]
-        public void BinarySerialization_AdjacencyGraph([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
+        public void BinarySerialization_AdjacencyGraph_Simple([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
         {
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph1 =
                 SerializeDeserialize<int, EquatableEdge<int>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
@@ -53,8 +53,21 @@ public void BinarySerialization_AdjacencyGraph([NotNull] AdjacencyGraph<int, Equ
             Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
         }
 
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphComplexTestCases))]
+        public void BinarySerialization_AdjacencyGraph_Complex([NotNull] AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph1 =
+                SerializeDeserialize<EquatableTestVertex, EquatableTestEdge, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph1));
+
+            var arrayGraph = new ArrayAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            ArrayAdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph2 =
+                SerializeDeserialize<EquatableTestVertex, EquatableTestEdge, ArrayAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
+        }
+
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphTestCases))]
-        public void BinarySerialization_AdapterGraph([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
+        public void BinarySerialization_AdapterGraph_Simple([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
         {
             var bidirectionalAdapterGraph = new BidirectionalAdapterGraph<int, EquatableEdge<int>>(graph);
             BidirectionalAdapterGraph<int, EquatableEdge<int>> deserializedGraph =
@@ -62,24 +75,49 @@ public void BinarySerialization_AdapterGraph([NotNull] AdjacencyGraph<int, Equat
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphComplexTestCases))]
+        public void BinarySerialization_AdapterGraph_Complex([NotNull] AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            var bidirectionalAdapterGraph = new BidirectionalAdapterGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            BidirectionalAdapterGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph =
+                SerializeDeserialize<EquatableTestVertex, EquatableTestEdge, BidirectionalAdapterGraph<EquatableTestVertex, EquatableTestEdge>>(bidirectionalAdapterGraph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationClusteredAdjacencyGraphTestCases))]
-        public void BinarySerialization_ClusteredGraph([NotNull] ClusteredAdjacencyGraph<int, EquatableEdge<int>> graph)
+        public void BinarySerialization_ClusteredGraph_Simple([NotNull] ClusteredAdjacencyGraph<int, EquatableEdge<int>> graph)
         {
             ClusteredAdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
                 SerializeDeserialize<int, EquatableEdge<int>, ClusteredAdjacencyGraph<int, EquatableEdge<int>>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationClusteredAdjacencyGraphComplexTestCases))]
+        public void BinarySerialization_ClusteredGraph_Complex([NotNull] ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph =
+                SerializeDeserialize<EquatableTestVertex, EquatableTestEdge, ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationCompressedGraphTestCases))]
-        public void BinarySerialization_CompressedGraph([NotNull] CompressedSparseRowGraph<int> graph)
+        public void BinarySerialization_CompressedGraph_Simple([NotNull] CompressedSparseRowGraph<int> graph)
         {
             CompressedSparseRowGraph<int> deserializedGraph =
                 SerializeDeserialize<int, SEquatableEdge<int>, CompressedSparseRowGraph<int>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationCompressedGraphComplexTestCases))]
+        public void BinarySerialization_CompressedGraph_Complex([NotNull] CompressedSparseRowGraph<EquatableTestVertex> graph)
+        {
+            CompressedSparseRowGraph<EquatableTestVertex> deserializedGraph =
+                SerializeDeserialize<EquatableTestVertex, SEquatableEdge<EquatableTestVertex>, CompressedSparseRowGraph<EquatableTestVertex>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationBidirectionalGraphTestCases))]
-        public void BinarySerialization_BidirectionalGraph([NotNull] BidirectionalGraph<int, EquatableEdge<int>> graph)
+        public void BinarySerialization_BidirectionalGraph_Simple([NotNull] BidirectionalGraph<int, EquatableEdge<int>> graph)
         {
             BidirectionalGraph<int, EquatableEdge<int>> deserializedGraph =
                 SerializeDeserialize<int, EquatableEdge<int>, BidirectionalGraph<int, EquatableEdge<int>>>(graph);
@@ -101,6 +139,29 @@ public void BinarySerialization_BidirectionalGraph([NotNull] BidirectionalGraph<
             Assert.IsTrue(EquateGraphs.Equate(undirectedBidirectionalGraph, deserializedGraph4));
         }
 
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationBidirectionalGraphComplexTestCases))]
+        public void BinarySerialization_BidirectionalGraph_Complex([NotNull] BidirectionalGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            BidirectionalGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph =
+                SerializeDeserialize<EquatableTestVertex, EquatableTestEdge, BidirectionalGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+
+            var arrayGraph = new ArrayBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            ArrayBidirectionalGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph2 =
+                SerializeDeserialize<EquatableTestVertex, EquatableTestEdge, ArrayBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
+
+            var reversedGraph = new ReversedBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            ReversedBidirectionalGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph3 =
+                SerializeDeserialize<EquatableTestVertex, SReversedEdge<EquatableTestVertex, EquatableTestEdge>, ReversedBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>>(reversedGraph);
+            Assert.IsTrue(EquateGraphs.Equate(reversedGraph, deserializedGraph3));
+
+            var undirectedBidirectionalGraph = new UndirectedBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            UndirectedBidirectionalGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph4 =
+                SerializeDeserialize<EquatableTestVertex, EquatableTestEdge, UndirectedBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>>(undirectedBidirectionalGraph);
+            Assert.IsTrue(EquateGraphs.Equate(undirectedBidirectionalGraph, deserializedGraph4));
+        }
+
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationBidirectionalMatrixGraphTestCases))]
         public void BinarySerialization_BidirectionalMatrixGraph([NotNull] BidirectionalMatrixGraph<EquatableEdge<int>> graph)
         {
@@ -110,7 +171,7 @@ public void BinarySerialization_BidirectionalMatrixGraph([NotNull] Bidirectional
         }
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationUndirectedGraphTestCases))]
-        public void BinarySerialization_UndirectedGraph([NotNull] UndirectedGraph<int, EquatableEdge<int>> graph)
+        public void BinarySerialization_UndirectedGraph_Simple([NotNull] UndirectedGraph<int, EquatableEdge<int>> graph)
         {
             UndirectedGraph<int, EquatableEdge<int>> deserializedGraph1 =
                 SerializeDeserialize<int, EquatableEdge<int>, UndirectedGraph<int, EquatableEdge<int>>>(graph);
@@ -122,14 +183,35 @@ public void BinarySerialization_UndirectedGraph([NotNull] UndirectedGraph<int, E
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph2));
         }
 
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationUndirectedGraphComplexTestCases))]
+        public void BinarySerialization_UndirectedGraph_Complex([NotNull] UndirectedGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            UndirectedGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph1 =
+                SerializeDeserialize<EquatableTestVertex, EquatableTestEdge, UndirectedGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph1));
+
+            var arrayGraph = new ArrayUndirectedGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            ArrayUndirectedGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph2 =
+                SerializeDeserialize<EquatableTestVertex, EquatableTestEdge, ArrayUndirectedGraph<EquatableTestVertex, EquatableTestEdge>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph2));
+        }
+
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationEdgeListGraphTestCases))]
-        public void BinarySerialization_EdgeListGraph([NotNull] EdgeListGraph<int, EquatableEdge<int>> graph)
+        public void BinarySerialization_EdgeListGraph_Simple([NotNull] EdgeListGraph<int, EquatableEdge<int>> graph)
         {
             EdgeListGraph<int, EquatableEdge<int>> deserializedGraph =
                 SerializeDeserialize<int, EquatableEdge<int>, EdgeListGraph<int, EquatableEdge<int>>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationEdgeListGraphComplexTestCases))]
+        public void BinarySerialization_EdgeListGraph_Complex([NotNull] EdgeListGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            EdgeListGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph =
+                SerializeDeserialize<EquatableTestVertex, EquatableTestEdge, EdgeListGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
         #region Test classes
 
         public class TestStream : Stream
diff --git a/tests/QuikGraph.Serialization.Tests/GraphMLSerializationTests.cs b/tests/QuikGraph.Serialization.Tests/GraphMLSerializationTests.cs
index 91ca0d183..ad85debf4 100644
--- a/tests/QuikGraph.Serialization.Tests/GraphMLSerializationTests.cs
+++ b/tests/QuikGraph.Serialization.Tests/GraphMLSerializationTests.cs
@@ -14,6 +14,7 @@
 using QuikGraph.Tests;
 using static QuikGraph.Serialization.Tests.SerializationTestCaseSources;
 using static QuikGraph.Tests.QuikGraphUnitTestsHelpers;
+using static QuikGraph.Serialization.Tests.TestHelpers;
 
 namespace QuikGraph.Serialization.Tests
 {
@@ -182,7 +183,7 @@ public void SerializeToGraphML_Throws()
 
             var graph = new AdjacencyGraph<TestVertex, TestEdge>();
             Assert.Throws<ArgumentException>(
-                () =>  graph.SerializeToGraphML<TestVertex, TestEdge, AdjacencyGraph<TestVertex, TestEdge>>((string)null));
+                () => graph.SerializeToGraphML<TestVertex, TestEdge, AdjacencyGraph<TestVertex, TestEdge>>((string)null));
             Assert.Throws<ArgumentException>(
                 () => graph.SerializeToGraphML<TestVertex, TestEdge, AdjacencyGraph<TestVertex, TestEdge>>(""));
 
@@ -227,10 +228,10 @@ public void SerializeToGraphML_Throws()
             using (XmlWriter writer = XmlWriter.Create(WriteThrowsTestFilePath))
             {
                 Assert.Throws<ArgumentNullException>(
-                    () => ((AdjacencyGraph<TestVertex, TestEdge>) null).SerializeToGraphML<TestVertex, TestEdge, AdjacencyGraph<TestVertex, TestEdge>>(writer));
+                    () => ((AdjacencyGraph<TestVertex, TestEdge>)null).SerializeToGraphML<TestVertex, TestEdge, AdjacencyGraph<TestVertex, TestEdge>>(writer));
 
                 Assert.Throws<ArgumentNullException>(
-                    () => ((AdjacencyGraph<TestVertex, TestEdge>) null).SerializeToGraphML<TestVertex, TestEdge, AdjacencyGraph<TestVertex, TestEdge>>(
+                    () => ((AdjacencyGraph<TestVertex, TestEdge>)null).SerializeToGraphML<TestVertex, TestEdge, AdjacencyGraph<TestVertex, TestEdge>>(
                         writer,
                         vertex => vertex.ID,
                         edge => edge.ID));
@@ -365,7 +366,7 @@ public void DeserializeFromGraphML_Throws()
             // ReSharper disable AssignNullToNotNullAttribute
             // Filepath
             Assert.Throws<ArgumentNullException>(
-                () => ((AdjacencyGraph<string, Edge<string>>) null).DeserializeFromGraphML(
+                () => ((AdjacencyGraph<string, Edge<string>>)null).DeserializeFromGraphML(
                     GetGraphFilePath(TestGraphFileName),
                     id => id,
                     (source, target, _) => new Edge<string>(source, target)));
@@ -433,7 +434,7 @@ public void DeserializeFromGraphML_Throws()
             using (var reader = XmlReader.Create(GetGraphFilePath(TestGraphFileName)))
             {
                 Assert.Throws<ArgumentNullException>(
-                    () => ((AdjacencyGraph<string, Edge<string>>) null).DeserializeFromGraphML(
+                    () => ((AdjacencyGraph<string, Edge<string>>)null).DeserializeFromGraphML(
                         reader,
                         id => id,
                         (source, target, _) => new Edge<string>(source, target)));
@@ -558,7 +559,7 @@ private static string SerializeGraph1([NotNull] TestGraph graph)
         {
             string filePath = Path.Combine(
                 GetTemporaryTestDirectory(),
-                $"serialization_to_graphml_test_{Guid.NewGuid().ToString()}.graphml");
+                $"serialization_to_graphml_test_{Guid.NewGuid()}.graphml");
 
             graph.SerializeToGraphML<TestVertex, TestEdge, TestGraph>(filePath);
             Assert.IsTrue(File.Exists(filePath));
@@ -571,7 +572,7 @@ private static string SerializeGraph2([NotNull] TestGraph graph)
         {
             string filePath = Path.Combine(
                 GetTemporaryTestDirectory(),
-                $"serialization_to_graphml_test_{Guid.NewGuid().ToString()}.graphml");
+                $"serialization_to_graphml_test_{Guid.NewGuid()}.graphml");
 
             graph.SerializeToGraphML<TestVertex, TestEdge, TestGraph>(
                 filePath,
@@ -693,11 +694,10 @@ public void GraphMLSerializationWithValidation_WriteVertex(
                 StringIList = StringsList
             };
 
-            var vertex = new TestVertex("v1")
+            var vertex1 = new TestVertex("v1")
             {
                 StringDefault = "bar",
                 String = "string",
-                Int = 10,
                 Long = 20,
                 Float = 25.0F,
                 Double = 30.0,
@@ -706,7 +706,16 @@ public void GraphMLSerializationWithValidation_WriteVertex(
                 IntIList = new[] { 4, 5, 6, 7 }
             };
 
-            graph.AddVertex(vertex);
+            var vertex2 = new TestVertex("v2")
+            {
+                StringDefault = null,
+                String = "",
+                Int = 42,
+                IntArray = null
+            };
+
+            graph.AddVertex(vertex1);
+            graph.AddVertex(vertex2);
 
             TestGraph serializedGraph = VerifySerialization(graph, serializeGraph);
 
@@ -729,16 +738,27 @@ public void GraphMLSerializationWithValidation_WriteVertex(
             CollectionAssert.AreEqual(graph.FloatIList, serializedGraph.FloatIList, new FloatComparer(0.001F));
             CollectionAssert.AreEqual(graph.DoubleIList, serializedGraph.DoubleIList, new DoubleComparer(0.0001));
 
-            TestVertex serializedVertex = serializedGraph.Vertices.First();
-            Assert.AreEqual("bar", serializedVertex.StringDefault);
-            Assert.AreEqual(vertex.String, serializedVertex.String);
-            Assert.AreEqual(vertex.Int, serializedVertex.Int);
-            Assert.AreEqual(vertex.Long, serializedVertex.Long);
-            Assert.AreEqual(vertex.Float, serializedVertex.Float);
-            Assert.AreEqual(vertex.Double, serializedVertex.Double);
-            Assert.AreEqual(vertex.Bool, serializedVertex.Bool);
-            CollectionAssert.AreEqual(vertex.IntArray, serializedVertex.IntArray);
-            CollectionAssert.AreEqual(vertex.IntIList, serializedVertex.IntIList);
+            TestVertex serializedVertex1 = serializedGraph.Vertices.First();
+            Assert.AreEqual(vertex1.StringDefault, serializedVertex1.StringDefault);
+            Assert.AreEqual(vertex1.String, serializedVertex1.String);
+            Assert.AreEqual(vertex1.Int, serializedVertex1.Int);
+            Assert.AreEqual(vertex1.Long, serializedVertex1.Long);
+            Assert.AreEqual(vertex1.Float, serializedVertex1.Float);
+            Assert.AreEqual(vertex1.Double, serializedVertex1.Double);
+            Assert.AreEqual(vertex1.Bool, serializedVertex1.Bool);
+            CollectionAssert.AreEqual(vertex1.IntArray, serializedVertex1.IntArray);
+            CollectionAssert.AreEqual(vertex1.IntIList, serializedVertex1.IntIList);
+
+            TestVertex serializedVertex2 = serializedGraph.Vertices.Last();
+            Assert.AreEqual(vertex2.StringDefault, serializedVertex2.StringDefault);
+            Assert.AreEqual(vertex2.String, serializedVertex2.String);
+            Assert.AreEqual(vertex2.Int, serializedVertex2.Int);
+            Assert.AreEqual(vertex2.Long, serializedVertex2.Long);
+            Assert.AreEqual(vertex2.Float, serializedVertex2.Float);
+            Assert.AreEqual(vertex2.Double, serializedVertex2.Double);
+            Assert.AreEqual(vertex2.Bool, serializedVertex2.Bool);
+            CollectionAssert.AreEqual(vertex2.IntArray, serializedVertex2.IntArray);
+            CollectionAssert.AreEqual(vertex2.IntIList, serializedVertex2.IntIList);
         }
 
         [TestCaseSource(nameof(GraphSerializationTestCases))]
@@ -781,7 +801,7 @@ public void GraphMLSerializationWithValidation_WriteEdge(
             graph.AddVertex(vertex1);
             graph.AddVertex(vertex2);
 
-            var edge = new TestEdge(
+            var edge1 = new TestEdge(
                 vertex1, vertex2,
                 "e1",
                 "edge",
@@ -791,19 +811,40 @@ public void GraphMLSerializationWithValidation_WriteEdge(
                 110.0,
                 true);
 
-            graph.AddEdge(edge);
+            var edge2 = new TestEdge(vertex1, vertex2, "e2")
+            {
+                Float = 13.4f,
+                Long = 42L
+            };
+
+            graph.AddEdge(edge1);
+            graph.AddEdge(edge2);
 
             TestGraph serializedGraph = VerifySerialization(graph, serializeGraph);
 
-            TestEdge serializedEdge = serializedGraph.Edges.First();
+            TestEdge serializedEdge1 = serializedGraph.Edges.First();
             if (keepIds)
-                Assert.AreEqual(edge.ID, serializedEdge.ID);
-            Assert.AreEqual(edge.String, serializedEdge.String);
-            Assert.AreEqual(edge.Int, serializedEdge.Int);
-            Assert.AreEqual(edge.Long, serializedEdge.Long);
-            Assert.AreEqual(edge.Float, serializedEdge.Float);
-            Assert.AreEqual(edge.Double, serializedEdge.Double);
-            Assert.AreEqual(edge.Bool, serializedEdge.Bool);
+            {
+                Assert.AreEqual(edge1.ID, serializedEdge1.ID);
+            }
+            Assert.AreEqual(edge1.String, serializedEdge1.String);
+            Assert.AreEqual(edge1.Int, serializedEdge1.Int);
+            Assert.AreEqual(edge1.Long, serializedEdge1.Long);
+            Assert.AreEqual(edge1.Float, serializedEdge1.Float);
+            Assert.AreEqual(edge1.Double, serializedEdge1.Double);
+            Assert.AreEqual(edge1.Bool, serializedEdge1.Bool);
+
+            TestEdge serializedEdge2 = serializedGraph.Edges.Last();
+            if (keepIds)
+            {
+                Assert.AreEqual(edge2.ID, serializedEdge2.ID);
+            }
+            Assert.AreEqual(edge2.String, serializedEdge2.String);
+            Assert.AreEqual(edge2.Int, serializedEdge2.Int);
+            Assert.AreEqual(edge2.Long, serializedEdge2.Long);
+            Assert.AreEqual(edge2.Float, serializedEdge2.Float);
+            Assert.AreEqual(edge2.Double, serializedEdge2.Double);
+            Assert.AreEqual(edge2.Bool, serializedEdge2.Bool);
         }
 
         [Test]
@@ -847,15 +888,57 @@ public void DeserializeAndValidateFromGraphML_Throws()
 
         #region Serialization/Deserialization
 
+        #region Test Helpers
+
+        [Pure]
+        private static int DeserializeVertex_Simple([NotNull] string id)
+        {
+            return int.Parse(id);
+        }
+
         [Pure]
         [NotNull]
-        private static TOutGraph SerializeDeserialize<TInEdge, TOutEdge, TInGraph, TOutGraph>(
+        private static EquatableEdge<int> DeserializeEdge_Simple(int source, int target, [NotNull] string id)
+        {
+            return new EquatableEdge<int>(source, target);
+        }
+
+        [Pure]
+        private static SEquatableEdge<int> DeserializeSEdge_Simple(int source, int target, [NotNull] string id)
+        {
+            return new SEquatableEdge<int>(source, target);
+        }
+
+        [Pure]
+        [NotNull]
+        private static EquatableTestVertex DeserializeVertex_Complex([NotNull] string id)
+        {
+            return new EquatableTestVertex(id);
+        }
+
+        [Pure]
+        [NotNull]
+        private static EquatableTestEdge DeserializeEdge_Complex([NotNull] EquatableTestVertex source, [NotNull] EquatableTestVertex target, [NotNull] string id)
+        {
+            return new EquatableTestEdge(source, target, id);
+        }
+
+        [Pure]
+        private static SEquatableEdge<EquatableTestVertex> DeserializeSEdge_Complex([NotNull] EquatableTestVertex source, [NotNull] EquatableTestVertex target, [NotNull] string id)
+        {
+            return new SEquatableEdge<EquatableTestVertex>(source, target);
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize<TVertex, TInEdge, TOutEdge, TInGraph, TOutGraph>(
             [NotNull] TInGraph graph,
+            [NotNull, InstantHandle] VertexIdentity<TVertex> vertexIdentity,
             [NotNull, InstantHandle] Func<XmlReader, TOutGraph> deserialize)
-            where TInEdge : IEdge<int>, IEquatable<TInEdge>
-            where TOutEdge : IEdge<int>, IEquatable<TOutEdge>
-            where TInGraph : IEdgeListGraph<int, TInEdge>
-            where TOutGraph : IEdgeListGraph<int, TOutEdge>
+            where TInEdge : IEdge<TVertex>, IEquatable<TInEdge>
+            where TOutEdge : IEdge<TVertex>, IEquatable<TOutEdge>
+            where TInGraph : IEdgeListGraph<TVertex, TInEdge>
+            where TOutGraph : IEdgeListGraph<TVertex, TOutEdge>
         {
             Assert.IsNotNull(graph);
 
@@ -866,11 +949,10 @@ private static TOutGraph SerializeDeserialize<TInEdge, TOutEdge, TInGraph, TOutG
                 {
                     graph.SerializeToGraphML(
                         writer,
-                        vertex => vertex.ToString(),
+                        vertexIdentity,
                         graph.GetEdgeIdentity());
                 }
 
-                // Deserialize
                 stream.Position = 0;
 
                 // Deserialize
@@ -886,120 +968,278 @@ private static TOutGraph SerializeDeserialize<TInEdge, TOutEdge, TInGraph, TOutG
 
         [Pure]
         [NotNull]
-        private static TOutGraph SerializeDeserialize<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+        private static TOutGraph SerializeDeserialize_Simple<TInEdge, TOutEdge, TInGraph, TOutGraph>(
+            [NotNull] TInGraph graph,
+            [NotNull, InstantHandle] Func<XmlReader, TOutGraph> deserialize)
+            where TInEdge : IEdge<int>, IEquatable<TInEdge>
+            where TOutEdge : IEdge<int>, IEquatable<TOutEdge>
+            where TInGraph : IEdgeListGraph<int, TInEdge>
+            where TOutGraph : IEdgeListGraph<int, TOutEdge>
+        {
+            return SerializeDeserialize<int, TInEdge, TOutEdge, TInGraph, TOutGraph>(
+                graph,
+                VertexIdentity_Simple,
+                deserialize);
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize_Complex<TInEdge, TOutEdge, TInGraph, TOutGraph>(
+            [NotNull] TInGraph graph,
+            [NotNull, InstantHandle] Func<XmlReader, TOutGraph> deserialize)
+            where TInEdge : IEdge<EquatableTestVertex>, IEquatable<TInEdge>
+            where TOutEdge : IEdge<EquatableTestVertex>, IEquatable<TOutEdge>
+            where TInGraph : IEdgeListGraph<EquatableTestVertex, TInEdge>
+            where TOutGraph : IEdgeListGraph<EquatableTestVertex, TOutEdge>
+        {
+            return SerializeDeserialize<EquatableTestVertex, TInEdge, TOutEdge, TInGraph, TOutGraph>(
+                graph,
+                VertexIdentity_Complex,
+                deserialize);
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize_Simple<TInGraph, TOutGraph>([NotNull] TInGraph graph)
             where TInGraph : IEdgeListGraph<int, EquatableEdge<int>>
             where TOutGraph : class, IMutableVertexAndEdgeSet<int, EquatableEdge<int>>, new()
         {
-            return SerializeDeserialize<EquatableEdge<int>, EquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
+            return SerializeDeserialize_Simple<EquatableEdge<int>, EquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
             {
                 var deserializedGraph = new TOutGraph();
                 deserializedGraph.DeserializeFromGraphML(
                     reader,
-                    int.Parse,
-                    (source, target, _) => new EquatableEdge<int>(source, target));
+                    DeserializeVertex_Simple,
+                    DeserializeEdge_Simple);
                 return deserializedGraph;
             });
         }
 
         [Pure]
         [NotNull]
-        private static TOutGraph SerializeDeserialize_SEdge<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+        private static TOutGraph SerializeDeserialize_Complex<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+            where TInGraph : IEdgeListGraph<EquatableTestVertex, EquatableTestEdge>
+            where TOutGraph : class, IMutableVertexAndEdgeSet<EquatableTestVertex, EquatableTestEdge>, new()
+        {
+            return SerializeDeserialize_Complex<EquatableTestEdge, EquatableTestEdge, TInGraph, TOutGraph>(graph, reader =>
+            {
+                var deserializedGraph = new TOutGraph();
+                deserializedGraph.DeserializeFromGraphML(
+                    reader,
+                    DeserializeVertex_Complex,
+                    DeserializeEdge_Complex);
+                return deserializedGraph;
+            });
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize_SEdge_Simple<TInGraph, TOutGraph>([NotNull] TInGraph graph)
             where TInGraph : IEdgeListGraph<int, SEquatableEdge<int>>
             where TOutGraph : class, IMutableVertexAndEdgeSet<int, SEquatableEdge<int>>, new()
         {
-            return SerializeDeserialize<SEquatableEdge<int>, SEquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
+            return SerializeDeserialize_Simple<SEquatableEdge<int>, SEquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
             {
                 var deserializedGraph = new TOutGraph();
                 deserializedGraph.DeserializeFromGraphML(
                     reader,
-                    int.Parse,
-                    (source, target, _) => new SEquatableEdge<int>(source, target));
+                    DeserializeVertex_Simple,
+                    DeserializeSEdge_Simple);
                 return deserializedGraph;
             });
         }
 
         [Pure]
         [NotNull]
-        private static TOutGraph SerializeDeserialize_Reversed<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+        private static TOutGraph SerializeDeserialize_SEdge_Complex<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+            where TInGraph : IEdgeListGraph<EquatableTestVertex, SEquatableEdge<EquatableTestVertex>>
+            where TOutGraph : class, IMutableVertexAndEdgeSet<EquatableTestVertex, SEquatableEdge<EquatableTestVertex>>, new()
+        {
+            return SerializeDeserialize_Complex<SEquatableEdge<EquatableTestVertex>, SEquatableEdge<EquatableTestVertex>, TInGraph, TOutGraph>(graph, reader =>
+            {
+                var deserializedGraph = new TOutGraph();
+                deserializedGraph.DeserializeFromGraphML(
+                    reader,
+                    DeserializeVertex_Complex,
+                    DeserializeSEdge_Complex);
+                return deserializedGraph;
+            });
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize_Reversed_Simple<TInGraph, TOutGraph>([NotNull] TInGraph graph)
             where TInGraph : IEdgeListGraph<int, SReversedEdge<int, EquatableEdge<int>>>
             where TOutGraph : class, IMutableVertexAndEdgeSet<int, EquatableEdge<int>>, new()
         {
-            return SerializeDeserialize<SReversedEdge<int, EquatableEdge<int>>, EquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
+            return SerializeDeserialize_Simple<SReversedEdge<int, EquatableEdge<int>>, EquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
             {
                 var deserializedGraph = new TOutGraph();
                 deserializedGraph.DeserializeFromGraphML(
                     reader,
-                    int.Parse,
-                    (source, target, _) => new EquatableEdge<int>(source, target));
+                    DeserializeVertex_Simple,
+                    DeserializeEdge_Simple);
                 return deserializedGraph;
             });
         }
 
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize_Reversed_Complex<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+            where TInGraph : IEdgeListGraph<EquatableTestVertex, SReversedEdge<EquatableTestVertex, EquatableTestEdge>>
+            where TOutGraph : class, IMutableVertexAndEdgeSet<EquatableTestVertex, EquatableTestEdge>, new()
+        {
+            return SerializeDeserialize_Complex<SReversedEdge<EquatableTestVertex, EquatableTestEdge>, EquatableTestEdge, TInGraph, TOutGraph>(graph, reader =>
+            {
+                var deserializedGraph = new TOutGraph();
+                deserializedGraph.DeserializeFromGraphML(
+                    reader,
+                    DeserializeVertex_Complex,
+                    DeserializeEdge_Complex);
+                return deserializedGraph;
+            });
+        }
+
+        #endregion
+
+        // TODO Support heterogeneous types for vertices and edges
+
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphTestCases))]
-        public void GraphMLSerialization_AdjacencyGraph([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
+        public void GraphMLSerialization_AdjacencyGraph_Simple([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
         {
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph1 =
-                SerializeDeserialize<AdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+                SerializeDeserialize_Simple<AdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph1));
 
             var arrayGraph = new ArrayAdjacencyGraph<int, EquatableEdge<int>>(graph);
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph2 =
-                SerializeDeserialize<ArrayAdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(arrayGraph);
+                SerializeDeserialize_Simple<ArrayAdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphComplexNotHeterogeneousTestCases))]
+        public void GraphMLSerialization_AdjacencyGraph_Complex([NotNull] AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph1 =
+                SerializeDeserialize_Complex<AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph1));
+
+            var arrayGraph = new ArrayAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph2 =
+                SerializeDeserialize_Complex<ArrayAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(arrayGraph);
             Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
         }
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphTestCases))]
-        public void GraphMLSerialization_AdapterGraph([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
+        public void GraphMLSerialization_AdapterGraph_Simple([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
         {
             var bidirectionalAdapterGraph = new BidirectionalAdapterGraph<int, EquatableEdge<int>>(graph);
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
-                SerializeDeserialize<BidirectionalAdapterGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(bidirectionalAdapterGraph);
+                SerializeDeserialize_Simple<BidirectionalAdapterGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(bidirectionalAdapterGraph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphComplexNotHeterogeneousTestCases))]
+        public void GraphMLSerialization_AdapterGraph_Complex([NotNull] AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            var bidirectionalAdapterGraph = new BidirectionalAdapterGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph =
+                SerializeDeserialize_Complex<BidirectionalAdapterGraph<EquatableTestVertex, EquatableTestEdge>, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(bidirectionalAdapterGraph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationClusteredAdjacencyGraphTestCases))]
-        public void GraphMLSerialization_ClusteredGraph([NotNull] ClusteredAdjacencyGraph<int, EquatableEdge<int>> graph)
+        public void GraphMLSerialization_ClusteredGraph_Simple([NotNull] ClusteredAdjacencyGraph<int, EquatableEdge<int>> graph)
         {
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
-                SerializeDeserialize<ClusteredAdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+                SerializeDeserialize_Simple<ClusteredAdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationClusteredAdjacencyGraphComplexNotHeterogeneousTestCases))]
+        public void GraphMLSerialization_ClusteredGraph_Complex([NotNull] ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph =
+                SerializeDeserialize_Complex<ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationCompressedGraphTestCases))]
-        public void GraphMLSerialization_CompressedGraph([NotNull] CompressedSparseRowGraph<int> graph)
+        public void GraphMLSerialization_CompressedGraph_Simple([NotNull] CompressedSparseRowGraph<int> graph)
         {
             AdjacencyGraph<int, SEquatableEdge<int>> deserializedGraph =
-                SerializeDeserialize_SEdge<CompressedSparseRowGraph<int>, AdjacencyGraph<int, SEquatableEdge<int>>>(graph);
+                SerializeDeserialize_SEdge_Simple<CompressedSparseRowGraph<int>, AdjacencyGraph<int, SEquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationCompressedGraphComplexNotHeterogeneousTestCases))]
+        public void GraphMLSerialization_CompressedGraph_Complex([NotNull] CompressedSparseRowGraph<EquatableTestVertex> graph)
+        {
+            AdjacencyGraph<EquatableTestVertex, SEquatableEdge<EquatableTestVertex>> deserializedGraph =
+                SerializeDeserialize_SEdge_Complex<CompressedSparseRowGraph<EquatableTestVertex>, AdjacencyGraph<EquatableTestVertex, SEquatableEdge<EquatableTestVertex>>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationBidirectionalGraphTestCases))]
-        public void GraphMLSerialization_BidirectionalGraph([NotNull] BidirectionalGraph<int, EquatableEdge<int>> graph)
+        public void GraphMLSerialization_BidirectionalGraph_Simple([NotNull] BidirectionalGraph<int, EquatableEdge<int>> graph)
         {
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
-                SerializeDeserialize<BidirectionalGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+                SerializeDeserialize_Simple<BidirectionalGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
 
             var arrayGraph = new ArrayBidirectionalGraph<int, EquatableEdge<int>>(graph);
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph2 =
-                SerializeDeserialize<ArrayBidirectionalGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(arrayGraph);
+                SerializeDeserialize_Simple<ArrayBidirectionalGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(arrayGraph);
             Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
 
             var reversedGraph = new ReversedBidirectionalGraph<int, EquatableEdge<int>>(graph);
             BidirectionalGraph<int, EquatableEdge<int>> deserializedGraph3 =
-                SerializeDeserialize_Reversed<ReversedBidirectionalGraph<int, EquatableEdge<int>>, BidirectionalGraph<int, EquatableEdge<int>>>(reversedGraph);
+                SerializeDeserialize_Reversed_Simple<ReversedBidirectionalGraph<int, EquatableEdge<int>>, BidirectionalGraph<int, EquatableEdge<int>>>(reversedGraph);
             Assert.IsTrue(
                 EquateGraphs.Equate(
                     graph,
                     deserializedGraph3,
                     EqualityComparer<int>.Default,
                     LambdaEqualityComparer<EquatableEdge<int>>.Create(
-                        (edge1, edge2) => Equals(edge1.Source, edge2.Target) && Equals(edge1.Target, edge2.Source),
+                        (edge1, edge2) => Equals(edge1.Source, edge2.Target)
+                                          && Equals(edge1.Target, edge2.Source)
+                                          && edge1.GetType() == edge2.GetType(),
                         edge => edge.GetHashCode())));
 
             var undirectedBidirectionalGraph = new UndirectedBidirectionalGraph<int, EquatableEdge<int>>(graph);
             UndirectedGraph<int, EquatableEdge<int>> deserializedGraph4 =
-                SerializeDeserialize<UndirectedBidirectionalGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(undirectedBidirectionalGraph);
+                SerializeDeserialize_Simple<UndirectedBidirectionalGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(undirectedBidirectionalGraph);
+            Assert.IsTrue(EquateGraphs.Equate(undirectedBidirectionalGraph, deserializedGraph4));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationBidirectionalGraphComplexNotHeterogeneousTestCases))]
+        public void GraphMLSerialization_BidirectionalGraph_Complex([NotNull] BidirectionalGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph =
+                SerializeDeserialize_Complex<BidirectionalGraph<EquatableTestVertex, EquatableTestEdge>, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+
+            var arrayGraph = new ArrayBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph2 =
+                SerializeDeserialize_Complex<ArrayBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
+
+            var reversedGraph = new ReversedBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            BidirectionalGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph3 =
+                SerializeDeserialize_Reversed_Complex<ReversedBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>, BidirectionalGraph<EquatableTestVertex, EquatableTestEdge>>(reversedGraph);
+            Assert.IsTrue(
+                EquateGraphs.Equate(
+                    graph,
+                    deserializedGraph3,
+                    EqualityComparer<EquatableTestVertex>.Default,
+                    LambdaEqualityComparer<EquatableTestEdge>.Create(
+                        // TODO SReversedEdge<T> original edge is not parsed by the serializer so data are not serialized
+                        (edge1, edge2) => Equals(edge1.Source, edge2.Target) && Equals(edge1.Target, edge2.Source)/* && edge1.DataContentEquals(edge2)*/,
+                        edge => edge.GetHashCode())));
+
+            var undirectedBidirectionalGraph = new UndirectedBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            UndirectedGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph4 =
+                SerializeDeserialize_Complex<UndirectedBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>, UndirectedGraph<EquatableTestVertex, EquatableTestEdge>>(undirectedBidirectionalGraph);
             Assert.IsTrue(EquateGraphs.Equate(undirectedBidirectionalGraph, deserializedGraph4));
         }
 
@@ -1007,28 +1247,49 @@ public void GraphMLSerialization_BidirectionalGraph([NotNull] BidirectionalGraph
         public void GraphMLSerialization_BidirectionalMatrixGraph([NotNull] BidirectionalMatrixGraph<EquatableEdge<int>> graph)
         {
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
-                SerializeDeserialize<BidirectionalMatrixGraph<EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+                SerializeDeserialize_Simple<BidirectionalMatrixGraph<EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationUndirectedGraphTestCases))]
-        public void GraphMLSerialization_UndirectedGraph([NotNull] UndirectedGraph<int, EquatableEdge<int>> graph)
+        public void GraphMLSerialization_UndirectedGraph_Simple([NotNull] UndirectedGraph<int, EquatableEdge<int>> graph)
         {
             UndirectedGraph<int, EquatableEdge<int>> deserializedGraph1 =
-                SerializeDeserialize<UndirectedGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(graph);
+                SerializeDeserialize_Simple<UndirectedGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph1));
 
             var arrayGraph = new ArrayUndirectedGraph<int, EquatableEdge<int>>(graph);
             UndirectedGraph<int, EquatableEdge<int>> deserializedGraph2 =
-                SerializeDeserialize<ArrayUndirectedGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(arrayGraph);
+                SerializeDeserialize_Simple<ArrayUndirectedGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph2));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationUndirectedGraphComplexNotHeterogeneousTestCases))]
+        public void GraphMLSerialization_UndirectedGraph_Complex([NotNull] UndirectedGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            UndirectedGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph1 =
+                SerializeDeserialize_Complex<UndirectedGraph<EquatableTestVertex, EquatableTestEdge>, UndirectedGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph1));
+
+            var arrayGraph = new ArrayUndirectedGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            UndirectedGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph2 =
+                SerializeDeserialize_Complex<ArrayUndirectedGraph<EquatableTestVertex, EquatableTestEdge>, UndirectedGraph<EquatableTestVertex, EquatableTestEdge>>(arrayGraph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph2));
         }
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationEdgeListGraphTestCases))]
-        public void GraphMLSerialization_EdgeListGraph([NotNull] EdgeListGraph<int, EquatableEdge<int>> graph)
+        public void GraphMLSerialization_EdgeListGraph_Simple([NotNull] EdgeListGraph<int, EquatableEdge<int>> graph)
         {
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
-                SerializeDeserialize<EdgeListGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+                SerializeDeserialize_Simple<EdgeListGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationEdgeListGraphComplexNotHeterogeneousTestCases))]
+        public void GraphMLSerialization_EdgeListGraph_Complex([NotNull] EdgeListGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph =
+                SerializeDeserialize_Complex<EdgeListGraph<EquatableTestVertex, EquatableTestEdge>, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
diff --git a/tests/QuikGraph.Serialization.Tests/Helpers/TestHelpers.cs b/tests/QuikGraph.Serialization.Tests/Helpers/TestHelpers.cs
new file mode 100644
index 000000000..a32d50262
--- /dev/null
+++ b/tests/QuikGraph.Serialization.Tests/Helpers/TestHelpers.cs
@@ -0,0 +1,35 @@
+using System;
+using JetBrains.Annotations;
+
+namespace QuikGraph.Serialization.Tests
+{
+    /// <summary>
+    /// Various helpers for Serialization tests.
+    /// </summary>
+    internal static class TestHelpers
+    {
+        /// <summary>
+        /// Converts a <see cref="Type"/> into a string representation for easy serialization.
+        /// </summary>
+        [Pure]
+        [NotNull]
+        public static string TypeToSerializableType([NotNull] Type type)
+        {
+            return $"{type.FullName}, {type.Assembly.GetName().Name}";
+        }
+
+        [Pure]
+        [NotNull]
+        public static string VertexIdentity_Simple(int vertex)
+        {
+            return vertex.ToString();
+        }
+
+        [Pure]
+        [NotNull]
+        public static string VertexIdentity_Complex([NotNull] EquatableTestVertex vertex)
+        {
+            return vertex.ID;
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/QuikGraph.Serialization.Tests/SerializationTestCaseSources.cs b/tests/QuikGraph.Serialization.Tests/SerializationTestCaseSources.cs
index 553fe222a..a3da56ec8 100644
--- a/tests/QuikGraph.Serialization.Tests/SerializationTestCaseSources.cs
+++ b/tests/QuikGraph.Serialization.Tests/SerializationTestCaseSources.cs
@@ -19,14 +19,43 @@ public static IEnumerable<TestCaseData> SerializationAdjacencyGraphTestCases
                 yield return new TestCaseData(emptyGraph);
 
                 var graph = new AdjacencyGraph<int, EquatableEdge<int>>();
-                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
+                graph.AddVertexRange(new[] { 0, 1, 2, 3, 4 });
                 graph.AddEdgeRange(new[]
                 {
                     new EquatableEdge<int>(0, 1),
                     new EquatableEdge<int>(1, 2),
                     new EquatableEdge<int>(2, 0),
                     new EquatableEdge<int>(2, 1),
-                    new EquatableEdge<int>(2, 2)
+                    new EquatableEdge<int>(2, 2),
+                    new EquatableEdge<int>(4, 2)
+                });
+                yield return new TestCaseData(graph);
+            }
+        }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationAdjacencyGraphComplexTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>();
+                yield return new TestCaseData(emptyGraph);
+
+                var graph = new AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>();
+                var vertex0 = new EquatableTestVertex("0") { String = "", StringDefault = null };
+                var vertex1 = new EquatableTestVertex("1") { Float = 1.3f, String = "test" };
+                var vertex2 = new EquatableAdditionalDataTestVertex("2", 25.0) { Double = 12.5, Bool = true };
+                var vertex3 = new EquatableTestVertex("3") { Int = 45, Long = 51L };
+                var vertex4 = new EquatableAdditionalDataTestVertex("4", 42.0);
+                graph.AddVertexRange(new[] { vertex0, vertex1, vertex2, vertex3, vertex4 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTestEdge(vertex1, vertex2, "0") { Bool = true, Int = 77 },
+                    new EquatableAdditionalDataTestEdge(vertex1, vertex3, "1", 12.0) { Long = 99L },
+                    new EquatableTestEdge(vertex1, vertex4, "2") { String = "test" },
+                    new EquatableTestEdge(vertex2, vertex2, "3"),
+                    new EquatableAdditionalDataTestEdge(vertex3, vertex4, "4", 45.5)
                 });
                 yield return new TestCaseData(graph);
             }
@@ -43,14 +72,15 @@ public static IEnumerable<TestCaseData> SerializationClusteredAdjacencyGraphTest
                 yield return new TestCaseData(clusterEmptyGraph);
 
                 var graph = new AdjacencyGraph<int, EquatableEdge<int>>();
-                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
+                graph.AddVertexRange(new[] { 0, 1, 2, 3, 4 });
                 graph.AddEdgeRange(new[]
                 {
                     new EquatableEdge<int>(0, 1),
                     new EquatableEdge<int>(1, 2),
                     new EquatableEdge<int>(2, 0),
                     new EquatableEdge<int>(2, 1),
-                    new EquatableEdge<int>(2, 2)
+                    new EquatableEdge<int>(2, 2),
+                    new EquatableEdge<int>(4, 2)
                 });
                 var clusterGraph = new ClusteredAdjacencyGraph<int, EquatableEdge<int>>(graph);
                 yield return new TestCaseData(clusterGraph);
@@ -72,6 +102,53 @@ public static IEnumerable<TestCaseData> SerializationClusteredAdjacencyGraphTest
             }
         }
 
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationClusteredAdjacencyGraphComplexTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>();
+                var clusterEmptyGraph = new ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>(emptyGraph);
+                yield return new TestCaseData(clusterEmptyGraph);
+
+                var graph = new AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>();
+                var vertex0 = new EquatableTestVertex("0") { String = "", StringDefault = null };
+                var vertex1 = new EquatableTestVertex("1") { Float = 1.3f, String = "test" };
+                var vertex2 = new EquatableAdditionalDataTestVertex("2", 25.0) { Double = 12.5, Bool = true };
+                var vertex3 = new EquatableTestVertex("3") { Int = 45, Long = 51L };
+                var vertex4 = new EquatableAdditionalDataTestVertex("4", 42.0);
+                graph.AddVertexRange(new[] { vertex0, vertex1, vertex2, vertex3, vertex4 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTestEdge(vertex1, vertex2, "0") { Bool = true, Int = 77 },
+                    new EquatableAdditionalDataTestEdge(vertex1, vertex3, "1", 12.0) { Long = 99L },
+                    new EquatableTestEdge(vertex1, vertex4, "2") { String = "test" },
+                    new EquatableTestEdge(vertex2, vertex2, "3"),
+                    new EquatableAdditionalDataTestEdge(vertex3, vertex4, "4", 45.5)
+                });
+                var clusterGraph = new ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+                yield return new TestCaseData(clusterGraph);
+
+                graph = new AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>();
+                graph.AddVertexRange(new[] { vertex0, vertex1, vertex2, vertex3 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTestEdge(vertex0, vertex1, "0"),
+                    new EquatableTestEdge(vertex1, vertex2, "1") { Long = 66L },
+                    new EquatableTestEdge(vertex2, vertex0, "2"),
+                    new EquatableTestEdge(vertex3, vertex2, "3")
+                });
+                clusterGraph = new ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+                ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge> subGraph = clusterGraph.AddCluster();
+                var vertex5 = new EquatableTestVertex("5");
+                var vertex6 = new EquatableAdditionalDataTestVertex("6", 45.0) { Double = 22.9 };
+                subGraph.AddVertexRange(new[] { vertex4, vertex5, vertex6 });
+                subGraph.AddEdge(new EquatableTestEdge(vertex4, vertex6, "4"));
+                yield return new TestCaseData(clusterGraph);
+            }
+        }
+
         [NotNull, ItemNotNull]
         public static IEnumerable<TestCaseData> SerializationCompressedGraphTestCases
         {
@@ -83,20 +160,51 @@ public static IEnumerable<TestCaseData> SerializationCompressedGraphTestCases
                 yield return new TestCaseData(emptyCompressedGraph);
 
                 var graph = new AdjacencyGraph<int, EquatableEdge<int>>();
-                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
+                graph.AddVertexRange(new[] { 0, 1, 2, 3, 4 });
                 graph.AddEdgeRange(new[]
                 {
                     new EquatableEdge<int>(0, 1),
                     new EquatableEdge<int>(1, 2),
                     new EquatableEdge<int>(2, 0),
                     new EquatableEdge<int>(2, 1),
-                    new EquatableEdge<int>(2, 2)
+                    new EquatableEdge<int>(2, 2),
+                    new EquatableEdge<int>(4, 2)
                 });
                 var compressedGraph = CompressedSparseRowGraph<int>.FromGraph(emptyGraph);
                 yield return new TestCaseData(compressedGraph);
             }
         }
 
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationCompressedGraphComplexTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>();
+                var emptyCompressedGraph = CompressedSparseRowGraph<EquatableTestVertex>.FromGraph(emptyGraph);
+                yield return new TestCaseData(emptyCompressedGraph);
+
+                var graph = new AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>();
+                var vertex0 = new EquatableTestVertex("0") { String = "", StringDefault = null };
+                var vertex1 = new EquatableTestVertex("1") { Float = 1.3f, String = "test" };
+                var vertex2 = new EquatableAdditionalDataTestVertex("2", 25.0) { Double = 12.5, Bool = true };
+                var vertex3 = new EquatableTestVertex("3") { Int = 45, Long = 51L };
+                var vertex4 = new EquatableAdditionalDataTestVertex("4", 42.0);
+                graph.AddVertexRange(new[] { vertex0, vertex1, vertex2, vertex3, vertex4 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTestEdge(vertex1, vertex2, "0") { Bool = true, Int = 77 },
+                    new EquatableAdditionalDataTestEdge(vertex1, vertex3, "1", 12.0) { Long = 99L },
+                    new EquatableTestEdge(vertex1, vertex4, "2") { String = "test" },
+                    new EquatableTestEdge(vertex2, vertex2, "3"),
+                    new EquatableAdditionalDataTestEdge(vertex3, vertex4, "4", 45.5)
+                });
+                var compressedGraph = CompressedSparseRowGraph<EquatableTestVertex>.FromGraph(graph);
+                yield return new TestCaseData(compressedGraph);
+            }
+        }
+
         [NotNull, ItemNotNull]
         public static IEnumerable<TestCaseData> SerializationBidirectionalGraphTestCases
         {
@@ -107,14 +215,44 @@ public static IEnumerable<TestCaseData> SerializationBidirectionalGraphTestCases
                 yield return new TestCaseData(emptyGraph);
 
                 var graph = new BidirectionalGraph<int, EquatableEdge<int>>();
-                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
+                graph.AddVertexRange(new[] { 0, 1, 2, 3, 4 });
                 graph.AddEdgeRange(new[]
                 {
                     new EquatableEdge<int>(0, 1),
                     new EquatableEdge<int>(1, 2),
                     new EquatableEdge<int>(2, 0),
                     new EquatableEdge<int>(2, 1),
-                    new EquatableEdge<int>(2, 2)
+                    new EquatableEdge<int>(2, 2),
+                    new EquatableEdge<int>(4, 2)
+                });
+
+                yield return new TestCaseData(graph);
+            }
+        }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationBidirectionalGraphComplexTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new BidirectionalGraph<EquatableTestVertex, EquatableTestEdge>();
+                yield return new TestCaseData(emptyGraph);
+
+                var graph = new BidirectionalGraph<EquatableTestVertex, EquatableTestEdge>();
+                var vertex0 = new EquatableTestVertex("0") { String = "", StringDefault = null };
+                var vertex1 = new EquatableTestVertex("1") { Float = 1.3f, String = "test" };
+                var vertex2 = new EquatableAdditionalDataTestVertex("2", 25.0) { Double = 12.5, Bool = true };
+                var vertex3 = new EquatableTestVertex("3") { Int = 45, Long = 51L };
+                var vertex4 = new EquatableAdditionalDataTestVertex("4", 42.0);
+                graph.AddVertexRange(new[] { vertex0, vertex1, vertex2, vertex3, vertex4 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTestEdge(vertex1, vertex2, "0") { Bool = true, Int = 77 },
+                    new EquatableAdditionalDataTestEdge(vertex1, vertex3, "1", 12.0) { Long = 99L },
+                    new EquatableTestEdge(vertex1, vertex4, "2") { String = "test" },
+                    new EquatableTestEdge(vertex2, vertex2, "3"),
+                    new EquatableAdditionalDataTestEdge(vertex3, vertex4, "4", 45.5)
                 });
 
                 yield return new TestCaseData(graph);
@@ -130,14 +268,27 @@ public static IEnumerable<TestCaseData> SerializationBidirectionalMatrixGraphTes
                 var emptyGraph = new BidirectionalMatrixGraph<EquatableEdge<int>>(10);
                 yield return new TestCaseData(emptyGraph);
 
-                var graph = new BidirectionalMatrixGraph<EquatableEdge<int>>(4);
+                var graph = new BidirectionalMatrixGraph<EquatableEdge<int>>(5);
                 graph.AddEdgeRange(new[]
                 {
                     new EquatableEdge<int>(0, 1),
                     new EquatableEdge<int>(1, 2),
                     new EquatableEdge<int>(2, 0),
                     new EquatableEdge<int>(2, 1),
-                    new EquatableEdge<int>(2, 2)
+                    new EquatableEdge<int>(2, 2),
+                    new EquatableEdge<int>(4, 2)
+                });
+
+                yield return new TestCaseData(graph);
+
+                graph = new BidirectionalMatrixGraph<EquatableEdge<int>>(5);
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTaggedEdge<int, string>(1, 2, "test"),
+                    new EquatableEdge<int>(1, 3),
+                    new EquatableTaggedEdge<int, double>(1, 4, 42.0),
+                    new EquatableEdge<int>(2, 2),
+                    new EquatableEdge<int>(3, 4)
                 });
 
                 yield return new TestCaseData(graph);
@@ -154,14 +305,44 @@ public static IEnumerable<TestCaseData> SerializationUndirectedGraphTestCases
                 yield return new TestCaseData(emptyGraph);
 
                 var graph = new UndirectedGraph<int, EquatableEdge<int>>();
-                graph.AddVertexRange(new[] { 0, 1, 2, 3 });
+                graph.AddVertexRange(new[] { 0, 1, 2, 3, 4 });
                 graph.AddEdgeRange(new[]
                 {
                     new EquatableEdge<int>(0, 1),
                     new EquatableEdge<int>(1, 2),
                     new EquatableEdge<int>(2, 0),
                     new EquatableEdge<int>(2, 1),
-                    new EquatableEdge<int>(2, 2)
+                    new EquatableEdge<int>(2, 2),
+                    new EquatableEdge<int>(4, 2)
+                });
+
+                yield return new TestCaseData(graph);
+            }
+        }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationUndirectedGraphComplexTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new UndirectedGraph<EquatableTestVertex, EquatableTestEdge>();
+                yield return new TestCaseData(emptyGraph);
+
+                var graph = new UndirectedGraph<EquatableTestVertex, EquatableTestEdge>();
+                var vertex0 = new EquatableTestVertex("0") { String = "", StringDefault = null };
+                var vertex1 = new EquatableTestVertex("1") { Float = 1.3f, String = "test" };
+                var vertex2 = new EquatableAdditionalDataTestVertex("2", 25.0) { Double = 12.5, Bool = true };
+                var vertex3 = new EquatableTestVertex("3") { Int = 45, Long = 51L };
+                var vertex4 = new EquatableAdditionalDataTestVertex("4", 42.0);
+                graph.AddVertexRange(new[] { vertex0, vertex1, vertex2, vertex3, vertex4 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTestEdge(vertex1, vertex2, "0") { Bool = true, Int = 77 },
+                    new EquatableAdditionalDataTestEdge(vertex1, vertex3, "1", 12.0) { Long = 99L },
+                    new EquatableTestEdge(vertex1, vertex4, "2") { String = "test" },
+                    new EquatableTestEdge(vertex2, vertex2, "3"),
+                    new EquatableAdditionalDataTestEdge(vertex3, vertex4, "4", 45.5)
                 });
 
                 yield return new TestCaseData(graph);
@@ -184,11 +365,233 @@ public static IEnumerable<TestCaseData> SerializationEdgeListGraphTestCases
                     new EquatableEdge<int>(1, 2),
                     new EquatableEdge<int>(2, 0),
                     new EquatableEdge<int>(2, 1),
-                    new EquatableEdge<int>(2, 2)
+                    new EquatableEdge<int>(2, 2),
+                    new EquatableEdge<int>(4, 2)
                 });
 
                 yield return new TestCaseData(graph);
             }
         }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationEdgeListGraphComplexTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new EdgeListGraph<EquatableTestVertex, EquatableTestEdge>();
+                yield return new TestCaseData(emptyGraph);
+
+                var graph = new EdgeListGraph<EquatableTestVertex, EquatableTestEdge>();
+                var vertex1 = new EquatableTestVertex("1") { Float = 1.3f, String = "test" };
+                var vertex2 = new EquatableAdditionalDataTestVertex("2", 25.0) { Double = 12.5, Bool = true };
+                var vertex3 = new EquatableTestVertex("3") { Int = 45, Long = 51L };
+                var vertex4 = new EquatableAdditionalDataTestVertex("4", 42.0) { String = "", StringDefault = null };
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTestEdge(vertex1, vertex2, "0") { Bool = true, Int = 77 },
+                    new EquatableAdditionalDataTestEdge(vertex1, vertex3, "1", 12.0) { Long = 99L },
+                    new EquatableTestEdge(vertex1, vertex4, "2") { String = "test" },
+                    new EquatableTestEdge(vertex2, vertex2, "3"),
+                    new EquatableAdditionalDataTestEdge(vertex3, vertex4, "4", 45.5)
+                });
+
+                yield return new TestCaseData(graph);
+            }
+        }
+
+        #region GraphML Test cases
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationAdjacencyGraphComplexNotHeterogeneousTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>();
+                yield return new TestCaseData(emptyGraph);
+
+                var graph = new AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>();
+                var vertex0 = new EquatableTestVertex("0") { String = "", StringDefault = null };
+                var vertex1 = new EquatableTestVertex("1") { Float = 1.3f, String = "test" };
+                var vertex2 = new EquatableTestVertex("2") { Double = 12.5, Bool = true };
+                var vertex3 = new EquatableTestVertex("3") { Int = 45, Long = 51L };
+                var vertex4 = new EquatableTestVertex("4");
+                graph.AddVertexRange(new[] { vertex0, vertex1, vertex2, vertex3, vertex4 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTestEdge(vertex1, vertex2, "0") { Bool = true, Int = 77 },
+                    new EquatableTestEdge(vertex1, vertex3, "1") { Long = 99L },
+                    new EquatableTestEdge(vertex1, vertex4, "2") { String = "test" },
+                    new EquatableTestEdge(vertex2, vertex2, "3"),
+                    new EquatableTestEdge(vertex3, vertex4, "4")
+                });
+                yield return new TestCaseData(graph);
+            }
+        }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationClusteredAdjacencyGraphComplexNotHeterogeneousTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>();
+                var clusterEmptyGraph = new ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>(emptyGraph);
+                yield return new TestCaseData(clusterEmptyGraph);
+
+                var graph = new AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>();
+                var vertex0 = new EquatableTestVertex("0") { String = "", StringDefault = null };
+                var vertex1 = new EquatableTestVertex("1") { Float = 1.3f, String = "test" };
+                var vertex2 = new EquatableTestVertex("2") { Double = 12.5, Bool = true };
+                var vertex3 = new EquatableTestVertex("3") { Int = 45, Long = 51L };
+                var vertex4 = new EquatableTestVertex("4");
+                graph.AddVertexRange(new[] { vertex0, vertex1, vertex2, vertex3, vertex4 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTestEdge(vertex1, vertex2, "0") { Bool = true, Int = 77 },
+                    new EquatableTestEdge(vertex1, vertex3, "1") { Long = 99L },
+                    new EquatableTestEdge(vertex1, vertex4, "2") { String = "test" },
+                    new EquatableTestEdge(vertex2, vertex2, "3"),
+                    new EquatableTestEdge(vertex3, vertex4, "4")
+                });
+                var clusterGraph = new ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+                yield return new TestCaseData(clusterGraph);
+
+                graph = new AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>();
+                graph.AddVertexRange(new[] { vertex0, vertex1, vertex2, vertex3 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTestEdge(vertex0, vertex1, "0"),
+                    new EquatableTestEdge(vertex1, vertex2, "1") { Long = 66L },
+                    new EquatableTestEdge(vertex2, vertex0, "2"),
+                    new EquatableTestEdge(vertex3, vertex2, "3")
+                });
+                clusterGraph = new ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+                ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge> subGraph = clusterGraph.AddCluster();
+                var vertex5 = new EquatableTestVertex("5");
+                var vertex6 = new EquatableTestVertex("6") { Double = 22.9 };
+                subGraph.AddVertexRange(new[] { vertex4, vertex5, vertex6 });
+                subGraph.AddEdge(new EquatableTestEdge(vertex4, vertex6, "4"));
+                yield return new TestCaseData(clusterGraph);
+            }
+        }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationCompressedGraphComplexNotHeterogeneousTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>();
+                var emptyCompressedGraph = CompressedSparseRowGraph<EquatableTestVertex>.FromGraph(emptyGraph);
+                yield return new TestCaseData(emptyCompressedGraph);
+
+                var graph = new AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>();
+                var vertex0 = new EquatableTestVertex("0") { String = "", StringDefault = null };
+                var vertex1 = new EquatableTestVertex("1") { Float = 1.3f, String = "test" };
+                var vertex2 = new EquatableTestVertex("2") { Double = 12.5, Bool = true };
+                var vertex3 = new EquatableTestVertex("3") { Int = 45, Long = 51L };
+                var vertex4 = new EquatableTestVertex("4");
+                graph.AddVertexRange(new[] { vertex0, vertex1, vertex2, vertex3, vertex4 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTestEdge(vertex1, vertex2, "0") { Bool = true, Int = 77 },
+                    new EquatableTestEdge(vertex1, vertex3, "1") { Long = 99L },
+                    new EquatableTestEdge(vertex1, vertex4, "2") { String = "test" },
+                    new EquatableTestEdge(vertex2, vertex2, "3"),
+                    new EquatableTestEdge(vertex3, vertex4, "4")
+                });
+                var compressedGraph = CompressedSparseRowGraph<EquatableTestVertex>.FromGraph(graph);
+                yield return new TestCaseData(compressedGraph);
+            }
+        }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationBidirectionalGraphComplexNotHeterogeneousTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new BidirectionalGraph<EquatableTestVertex, EquatableTestEdge>();
+                yield return new TestCaseData(emptyGraph);
+
+                var graph = new BidirectionalGraph<EquatableTestVertex, EquatableTestEdge>();
+                var vertex0 = new EquatableTestVertex("0") { String = "", StringDefault = null };
+                var vertex1 = new EquatableTestVertex("1") { Float = 1.3f, String = "test" };
+                var vertex2 = new EquatableTestVertex("2") { Double = 12.5, Bool = true };
+                var vertex3 = new EquatableTestVertex("3") { Int = 45, Long = 51L };
+                var vertex4 = new EquatableTestVertex("4");
+                graph.AddVertexRange(new[] { vertex0, vertex1, vertex2, vertex3, vertex4 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTestEdge(vertex1, vertex2, "0") { Bool = true, Int = 77 },
+                    new EquatableTestEdge(vertex1, vertex3, "1") { Long = 99L },
+                    new EquatableTestEdge(vertex1, vertex4, "2") { String = "test" },
+                    new EquatableTestEdge(vertex2, vertex2, "3"),
+                    new EquatableTestEdge(vertex3, vertex4, "4")
+                });
+
+                yield return new TestCaseData(graph);
+            }
+        }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationUndirectedGraphComplexNotHeterogeneousTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new UndirectedGraph<EquatableTestVertex, EquatableTestEdge>();
+                yield return new TestCaseData(emptyGraph);
+
+                var graph = new UndirectedGraph<EquatableTestVertex, EquatableTestEdge>();
+                var vertex0 = new EquatableTestVertex("0") { String = "", StringDefault = null };
+                var vertex1 = new EquatableTestVertex("1") { Float = 1.3f, String = "test" };
+                var vertex2 = new EquatableTestVertex("2") { Double = 12.5, Bool = true };
+                var vertex3 = new EquatableTestVertex("3") { Int = 45, Long = 51L };
+                var vertex4 = new EquatableTestVertex("4");
+                graph.AddVertexRange(new[] { vertex0, vertex1, vertex2, vertex3, vertex4 });
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTestEdge(vertex1, vertex2, "0") { Bool = true, Int = 77 },
+                    new EquatableTestEdge(vertex1, vertex3, "1") { Long = 99L },
+                    new EquatableTestEdge(vertex1, vertex4, "2") { String = "test" },
+                    new EquatableTestEdge(vertex2, vertex2, "3"),
+                    new EquatableTestEdge(vertex3, vertex4, "4")
+                });
+
+                yield return new TestCaseData(graph);
+            }
+        }
+
+        [NotNull, ItemNotNull]
+        public static IEnumerable<TestCaseData> SerializationEdgeListGraphComplexNotHeterogeneousTestCases
+        {
+            [UsedImplicitly]
+            get
+            {
+                var emptyGraph = new EdgeListGraph<EquatableTestVertex, EquatableTestEdge>();
+                yield return new TestCaseData(emptyGraph);
+
+                var graph = new EdgeListGraph<EquatableTestVertex, EquatableTestEdge>();
+                var vertex1 = new EquatableTestVertex("1") { Float = 1.3f, String = "test" };
+                var vertex2 = new EquatableTestVertex("2") { Double = 12.5, Bool = true };
+                var vertex3 = new EquatableTestVertex("3") { Int = 45, Long = 51L };
+                var vertex4 = new EquatableTestVertex("4") { String = "", StringDefault = null };
+                graph.AddEdgeRange(new[]
+                {
+                    new EquatableTestEdge(vertex1, vertex2, "0") { Bool = true, Int = 77 },
+                    new EquatableTestEdge(vertex1, vertex3, "1") { Long = 99L },
+                    new EquatableTestEdge(vertex1, vertex4, "2") { String = "test" },
+                    new EquatableTestEdge(vertex2, vertex2, "3"),
+                    new EquatableTestEdge(vertex3, vertex4, "4")
+                });
+
+                yield return new TestCaseData(graph);
+            }
+        }
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestClasses.cs b/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestClasses.cs
index 1123365e5..0d66d1b32 100644
--- a/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestClasses.cs
+++ b/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestClasses.cs
@@ -68,7 +68,7 @@ public enum AgeGroup
 #if SUPPORTS_SERIALIZATION
     [Serializable]
 #endif
-    public class Person : INotifyPropertyChanged, IEquatable<Person>, IDataErrorInfo
+    public sealed class Person : INotifyPropertyChanged, IEquatable<Person>, IDataErrorInfo
     {
         #region Fields and Constants
 
@@ -519,7 +519,7 @@ public string BirthPlace
         [XmlIgnore]
         public string BirthMonthAndDay =>
             _birthDate?.ToString(
-                DateTimeFormatInfo.CurrentInfo?.MonthDayPattern,
+                DateTimeFormatInfo.CurrentInfo.MonthDayPattern,
                 CultureInfo.CurrentCulture);
 
         /// <summary>
@@ -538,7 +538,7 @@ public string BirthDateAndPlace
                 returnValue.Append("Born ");
                 returnValue.Append(
                     _birthDate.Value.ToString(
-                        DateTimeFormatInfo.CurrentInfo?.ShortDatePattern,
+                        DateTimeFormatInfo.CurrentInfo.ShortDatePattern,
                         CultureInfo.CurrentCulture));
 
                 if (!string.IsNullOrEmpty(_birthPlace))
@@ -649,7 +649,7 @@ public bool IsLiving
         /// Fires the event for the property when it changes.
         /// </summary>
         /// <param name="propertyName">Property name.</param>
-        protected virtual void OnPropertyChanged([NotNull] string propertyName)
+        private void OnPropertyChanged([NotNull] string propertyName)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
diff --git a/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestEdgeClasses.cs b/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestEdgeClasses.cs
index 9517ce1a6..6fac951f4 100644
--- a/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestEdgeClasses.cs
+++ b/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestEdgeClasses.cs
@@ -64,7 +64,10 @@ public TestEdge(
         public float Float { get; set; }
     }
 
-    public sealed class EquatableTestEdge : Edge<EquatableTestVertex>, IEquatable<EquatableTestEdge>
+#if SUPPORTS_SERIALIZATION
+    [Serializable]
+#endif
+    public class EquatableTestEdge : EquatableEdge<EquatableTestVertex>, IEquatable<EquatableTestEdge>
     {
         public EquatableTestEdge(
             [NotNull] EquatableTestVertex source,
@@ -99,13 +102,10 @@ public EquatableTestEdge(
         [XmlAttribute("e_float")]
         public float Float { get; set; }
 
-        public bool Equals(EquatableTestEdge other)
+        public virtual bool DataContentEquals([NotNull] EquatableTestEdge other)
         {
-            if (other is null)
-                return false;
-            if (ReferenceEquals(this, other))
-                return true;
-            return string.Equals(ID, other.ID)
+            return GetType() == other.GetType()
+                   && string.Equals(ID, other.ID)
                    && string.Equals(String, other.String)
                    && Int == other.Int
                    && Long == other.Long
@@ -114,6 +114,15 @@ public bool Equals(EquatableTestEdge other)
                    && Float.Equals(other.Float);
         }
 
+        public bool Equals(EquatableTestEdge other)
+        {
+            if (other is null)
+                return false;
+            if (ReferenceEquals(this, other))
+                return true;
+            return base.Equals(other) && DataContentEquals(other);
+        }
+
         public override bool Equals(object obj)
         {
             return Equals(obj as EquatableTestEdge);
@@ -136,6 +145,49 @@ public override int GetHashCode()
         }
     }
 
+#if SUPPORTS_SERIALIZATION
+    [Serializable]
+#endif
+    public sealed class EquatableAdditionalDataTestEdge : EquatableTestEdge, IEquatable<EquatableAdditionalDataTestEdge>
+    {
+        public EquatableAdditionalDataTestEdge(
+            [NotNull] EquatableTestVertex source,
+            [NotNull] EquatableTestVertex target,
+            [NotNull] string id,
+            double data)
+            : base(source, target, id)
+        {
+            Data = data;
+        }
+
+        public double Data { get; }
+
+        public override bool DataContentEquals(EquatableTestEdge other)
+        {
+            return base.DataContentEquals(other) && Data.Equals(((EquatableAdditionalDataTestEdge)other).Data);
+        }
+
+        public bool Equals(EquatableAdditionalDataTestEdge other)
+        {
+            return base.Equals(other);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as EquatableAdditionalDataTestEdge);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = ID.GetHashCode();
+                hashCode = (hashCode * 397) ^ (Data.GetHashCode());
+                return hashCode;
+            }
+        }
+    }
+
     public sealed class TestEdgeNoSetter : Edge<TestVertex>
     {
         public TestEdgeNoSetter(
diff --git a/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestVertexClasses.cs b/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestVertexClasses.cs
index 57d6b950f..375949749 100644
--- a/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestVertexClasses.cs
+++ b/tests/QuikGraph.Serialization.Tests/TestClasses/SerializationTestVertexClasses.cs
@@ -9,6 +9,9 @@ namespace QuikGraph.Serialization.Tests
 {
     #region Test classes
 
+#if SUPPORTS_SERIALIZATION
+    [Serializable]
+#endif
     public class TestVertex
     {
         public TestVertex([NotNull] string id)
@@ -21,7 +24,7 @@ public TestVertex([NotNull] string id)
 
         [XmlAttribute("v_stringDefault")]
         [DefaultValue("defaultDefaultString")]
-        public string StringDefault { get; set; }
+        public string StringDefault { get; set; } = string.Empty;
 
         [XmlAttribute("v_string")]
         [DefaultValue("defaultString")]
@@ -51,7 +54,10 @@ public TestVertex([NotNull] string id)
         public IList<int> IntIList { get; set; }
     }
 
-    public sealed class EquatableTestVertex : TestVertex, IEquatable<EquatableTestVertex>
+#if SUPPORTS_SERIALIZATION
+    [Serializable]
+#endif
+    public class EquatableTestVertex : TestVertex, IEquatable<EquatableTestVertex>
     {
         public EquatableTestVertex([NotNull] string id)
             : base(id)
@@ -64,6 +70,8 @@ public bool Equals(EquatableTestVertex other)
                 return false;
             if (ReferenceEquals(this, other))
                 return true;
+            if (GetType() != other.GetType())
+                return false;
             return string.Equals(ID, other.ID)
                    && string.Equals(StringDefault, other.StringDefault)
                    && string.Equals(String, other.String)
@@ -101,5 +109,40 @@ public override int GetHashCode()
         }
     }
 
+#if SUPPORTS_SERIALIZATION
+    [Serializable]
+#endif
+    public sealed class EquatableAdditionalDataTestVertex : EquatableTestVertex, IEquatable<EquatableAdditionalDataTestVertex>
+    {
+        public EquatableAdditionalDataTestVertex([NotNull] string id, double data)
+            : base(id)
+        {
+            Data = data;
+        }
+
+        public double Data { get; }
+
+        public bool Equals(EquatableAdditionalDataTestVertex other)
+        {
+            // ReSharper disable once PossibleNullReferenceException
+            return base.Equals(other) && Data.Equals(other.Data);
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as EquatableAdditionalDataTestVertex);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = ID.GetHashCode();
+                hashCode = (hashCode * 397) ^ (Data.GetHashCode());
+                return hashCode;
+            }
+        }
+    }
+
     #endregion
 }
\ No newline at end of file
diff --git a/tests/QuikGraph.Serialization.Tests/XmlSerializationTests.cs b/tests/QuikGraph.Serialization.Tests/XmlSerializationTests.cs
index 576e74fb0..bda04688b 100644
--- a/tests/QuikGraph.Serialization.Tests/XmlSerializationTests.cs
+++ b/tests/QuikGraph.Serialization.Tests/XmlSerializationTests.cs
@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -11,6 +12,7 @@
 using static QuikGraph.Tests.GraphTestHelpers;
 using static QuikGraph.Tests.QuikGraphUnitTestsHelpers;
 using static QuikGraph.Serialization.Tests.SerializationTestCaseSources;
+using static QuikGraph.Serialization.Tests.TestHelpers;
 
 namespace QuikGraph.Serialization.Tests
 {
@@ -20,23 +22,100 @@ namespace QuikGraph.Serialization.Tests
     [TestFixture]
     internal sealed class XmlSerializationTests
     {
-        #region Serialization
+        #region Constants
+
+        [NotNull]
+        private static readonly string TestNamespace = string.Empty;
+
+
+        [NotNull]
+        private const string IdTag = "id";
+
+        [NotNull]
+        private const string GraphTag = "graph";
+
+        [NotNull]
+        private const string NodeTag = "node";
+
+        [NotNull]
+        private const string EdgeTag = "edge";
+
+        [NotNull]
+        private const string SourceTag = "source";
+
+        [NotNull]
+        private const string TargetTag = "target";
+
+
+        #region Custom data constants
+
+        [NotNull]
+        private const string WeightTag = "weight";
+
+        [NotNull]
+        private const string TypeTag = "type";
+
+        [NotNull]
+        private const string StringDefaultTag = "strDefault";
+
+        [NotNull]
+        private const string StringTag = "str";
+
+        [NotNull]
+        private const string BoolTag = "bool";
+
+        [NotNull]
+        private const string IntTag = "i32";
+
+        [NotNull]
+        private const string LongTag = "i64";
+
+        [NotNull]
+        private const string FloatTag = "f32";
 
         [NotNull]
-        private const string GraphNodeName = "family";
+        private const string DoubleTag = "f64";
 
         [NotNull]
-        private const string VertexNodeName = "person";
+        private const string AdditionalDataTag = "additional_data";
 
         [NotNull]
-        private const string EdgeNodeName = "relationship";
+        private const string IsTaggedTag = "has_tag";
+
+        [NotNull]
+        private const string DoubleValueTag = "double_tag";
+
+        [NotNull]
+        private const string StringValueTag = "string_tag";
+
+        #endregion
+
+
+        [NotNull]
+        private const string FamilyGraphTag = "family";
+
+        [NotNull]
+        private const string PersonNodeTag = "person";
+
+        [NotNull]
+        private const string RelationEdgeTag = "relationship";
+
 
         [NotNull]
         private const string XmlHeader = "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
 
+
         [NotNull]
         private const string Indent = "    ";
 
+
+        [NotNull]
+        private const string NullString = "<null>";
+
+        #endregion
+
+        #region Serialization
+
         #region Test helpers
 
         private static void SerializeAndRead(
@@ -73,14 +152,14 @@ public void SerializeToXml_Empty()
                     writer,
                     person => person.Id,
                     emptyGraph.GetEdgeIdentity(),
-                    GraphNodeName,
-                    VertexNodeName,
-                    EdgeNodeName,
-                    ""),
+                    FamilyGraphTag,
+                    PersonNodeTag,
+                    RelationEdgeTag,
+                    TestNamespace),
                 content =>
                 {
                     StringAssert.AreEqualIgnoringCase(
-                        $"{XmlHeader}{Environment.NewLine}<{GraphNodeName} />",
+                        $"{XmlHeader}{Environment.NewLine}<{FamilyGraphTag} />",
                         content);
                 });
             }
@@ -146,10 +225,10 @@ public void SerializeToXml<TGraph>([NotNull] TGraph graph)
                     writer,
                     person => person.Id,
                     graph.GetEdgeIdentity(),
-                    GraphNodeName,
-                    VertexNodeName,
-                    EdgeNodeName,
-                    ""),
+                    FamilyGraphTag,
+                    PersonNodeTag,
+                    RelationEdgeTag,
+                    TestNamespace),
                 content => CheckXmlGraphSerialization(graph, content));
 
             #region Local function
@@ -159,20 +238,20 @@ static void CheckXmlGraphSerialization(
                 [NotNull] string xmlGraph)
             {
                 var expectedSerializedGraph = new StringBuilder($"{XmlHeader}{Environment.NewLine}");
-                expectedSerializedGraph.AppendLine($"<{GraphNodeName}>");
+                expectedSerializedGraph.AppendLine($"<{FamilyGraphTag}>");
 
                 foreach (Person person in graph.Vertices)
                 {
-                    expectedSerializedGraph.AppendLine($"{Indent}<{VertexNodeName} id=\"{person.Id}\" />");
+                    expectedSerializedGraph.AppendLine($"{Indent}<{PersonNodeTag} id=\"{person.Id}\" />");
                 }
 
                 TaggedEdge<Person, string>[] relations = graph.Edges.ToArray();
                 for (int i = 0; i < relations.Length; ++i)
                 {
-                    expectedSerializedGraph.AppendLine($"{Indent}<{EdgeNodeName} id=\"{i}\" source=\"{relations[i].Source.Id}\" target=\"{relations[i].Target.Id}\" />");
+                    expectedSerializedGraph.AppendLine($"{Indent}<{RelationEdgeTag} id=\"{i}\" source=\"{relations[i].Source.Id}\" target=\"{relations[i].Target.Id}\" />");
                 }
 
-                expectedSerializedGraph.Append($"</{GraphNodeName}>");
+                expectedSerializedGraph.Append($"</{FamilyGraphTag}>");
 
                 StringAssert.AreEqualIgnoringCase(
                     expectedSerializedGraph.ToString(),
@@ -192,10 +271,10 @@ public void SerializationToXml_Throws()
                     null,
                     vertex => vertex.ToString(),
                     graph.GetEdgeIdentity(),
-                    GraphNodeName,
-                    VertexNodeName,
-                    EdgeNodeName,
-                    ""));
+                    FamilyGraphTag,
+                    PersonNodeTag,
+                    RelationEdgeTag,
+                    TestNamespace));
 
             using (var memory = new MemoryStream())
             using (var writer = new StreamWriter(memory))
@@ -206,30 +285,30 @@ public void SerializationToXml_Throws()
                         xmlWriter,
                         vertex => vertex.ToString(),
                         graph.GetEdgeIdentity(),
-                        GraphNodeName,
-                        VertexNodeName,
-                        EdgeNodeName,
-                        ""));
+                        FamilyGraphTag,
+                        PersonNodeTag,
+                        RelationEdgeTag,
+                        TestNamespace));
 
                 Assert.Throws<ArgumentNullException>(
                     () => graph.SerializeToXml(
                         xmlWriter,
                         null,
                         graph.GetEdgeIdentity(),
-                        GraphNodeName,
-                        VertexNodeName,
-                        EdgeNodeName,
-                        ""));
+                        FamilyGraphTag,
+                        PersonNodeTag,
+                        RelationEdgeTag,
+                        TestNamespace));
 
                 Assert.Throws<ArgumentNullException>(
                     () => graph.SerializeToXml<int, Edge<int>, AdjacencyGraph<int, Edge<int>>>(
                         xmlWriter,
                         vertex => vertex.ToString(),
                         null,
-                        GraphNodeName,
-                        VertexNodeName,
-                        EdgeNodeName,
-                        ""));
+                        FamilyGraphTag,
+                        PersonNodeTag,
+                        RelationEdgeTag,
+                        TestNamespace));
 
                 Assert.Throws<ArgumentException>(
                     () => graph.SerializeToXml(
@@ -237,9 +316,9 @@ public void SerializationToXml_Throws()
                         vertex => vertex.ToString(),
                         graph.GetEdgeIdentity(),
                         null,
-                        VertexNodeName,
-                        EdgeNodeName,
-                        ""));
+                        PersonNodeTag,
+                        RelationEdgeTag,
+                        TestNamespace));
 
                 Assert.Throws<ArgumentException>(
                     () => graph.SerializeToXml(
@@ -247,47 +326,47 @@ public void SerializationToXml_Throws()
                         vertex => vertex.ToString(),
                         graph.GetEdgeIdentity(),
                         "",
-                        VertexNodeName,
-                        EdgeNodeName,
-                        ""));
+                        PersonNodeTag,
+                        RelationEdgeTag,
+                        TestNamespace));
 
                 Assert.Throws<ArgumentException>(
                     () => graph.SerializeToXml(
                         xmlWriter,
                         vertex => vertex.ToString(),
                         graph.GetEdgeIdentity(),
-                        GraphNodeName,
+                        FamilyGraphTag,
                         null,
-                        EdgeNodeName,
-                        ""));
+                        RelationEdgeTag,
+                        TestNamespace));
 
                 Assert.Throws<ArgumentException>(
                     () => graph.SerializeToXml(
                         xmlWriter,
                         vertex => vertex.ToString(),
                         graph.GetEdgeIdentity(),
-                        GraphNodeName,
+                        FamilyGraphTag,
                         "",
-                        EdgeNodeName,
-                        ""));
+                        RelationEdgeTag,
+                        TestNamespace));
 
                 Assert.Throws<ArgumentException>(
                     () => graph.SerializeToXml(
                         xmlWriter,
                         vertex => vertex.ToString(),
                         graph.GetEdgeIdentity(),
-                        GraphNodeName,
-                        VertexNodeName,
+                        FamilyGraphTag,
+                        PersonNodeTag,
                         null,
-                        ""));
+                        TestNamespace));
 
                 Assert.Throws<ArgumentException>(
                     () => graph.SerializeToXml(
                         xmlWriter,
                         vertex => vertex.ToString(),
                         graph.GetEdgeIdentity(),
-                        GraphNodeName,
-                        VertexNodeName,
+                        FamilyGraphTag,
+                        PersonNodeTag,
                         "",
                         ""));
 
@@ -296,9 +375,9 @@ public void SerializationToXml_Throws()
                         xmlWriter,
                         vertex => vertex.ToString(),
                         graph.GetEdgeIdentity(),
-                        GraphNodeName,
-                        VertexNodeName,
-                        EdgeNodeName,
+                        FamilyGraphTag,
+                        PersonNodeTag,
+                        RelationEdgeTag,
                         null));
             }
             // ReSharper restore AssignNullToNotNullAttribute
@@ -366,39 +445,39 @@ public void DeserializeFromXml_Document_Empty()
 
             // Directed graph
             AdjacencyGraph<string, Edge<string>> adjacencyGraph = document.DeserializeFromXml(
-                "graph",
-                "node",
-                "edge",
+                GraphTag,
+                NodeTag,
+                EdgeTag,
                 _ => new AdjacencyGraph<string, Edge<string>>(),
-                nav => nav.GetAttribute("id", ""),
+                nav => nav.GetAttribute(IdTag, TestNamespace),
                 nav => new Edge<string>(
-                    nav.GetAttribute("source", ""),
-                    nav.GetAttribute("target", "")));
+                    nav.GetAttribute(SourceTag, TestNamespace),
+                    nav.GetAttribute(TargetTag, TestNamespace)));
             AssertEmptyGraph(adjacencyGraph);
 
             // Directed bidirectional graph
             BidirectionalGraph<string, Edge<string>> bidirectionalGraph = document.DeserializeFromXml(
-                "graph",
-                "node",
-                "edge",
+                GraphTag,
+                NodeTag,
+                EdgeTag,
                 _ => new BidirectionalGraph<string, Edge<string>>(),
-                nav => nav.GetAttribute("id", ""),
+                nav => nav.GetAttribute(IdTag, TestNamespace),
                 nav => new Edge<string>(
-                    nav.GetAttribute("source", ""),
-                    nav.GetAttribute("target", "")));
+                    nav.GetAttribute(SourceTag, TestNamespace),
+                    nav.GetAttribute(TargetTag, TestNamespace)));
             AssertEmptyGraph(bidirectionalGraph);
 
             // Undirected graph
             UndirectedGraph<string, TaggedEdge<string, double>> undirectedGraph = document.DeserializeFromXml(
-                "graph",
-                "node",
-                "edge",
+                GraphTag,
+                NodeTag,
+                EdgeTag,
                 _ => new UndirectedGraph<string, TaggedEdge<string, double>>(),
-                nav => nav.GetAttribute("id", ""),
+                nav => nav.GetAttribute(IdTag, TestNamespace),
                 nav => new TaggedEdge<string, double>(
-                    nav.GetAttribute("source", ""),
-                    nav.GetAttribute("target", ""),
-                    int.Parse(nav.GetAttribute("weight", ""))));
+                    nav.GetAttribute(SourceTag, TestNamespace),
+                    nav.GetAttribute(TargetTag, TestNamespace),
+                    int.Parse(nav.GetAttribute(WeightTag, TestNamespace))));
             AssertEmptyGraph(undirectedGraph);
         }
 
@@ -409,43 +488,43 @@ public void DeserializeFromXml_Document()
 
             // Directed graph
             AdjacencyGraph<string, EquatableEdge<string>> adjacencyGraph = document.DeserializeFromXml(
-                "graph",
-                "node",
-                "edge",
+                GraphTag,
+                NodeTag,
+                EdgeTag,
                 _ => new AdjacencyGraph<string, EquatableEdge<string>>(),
-                nav => nav.GetAttribute("id", ""),
+                nav => nav.GetAttribute(IdTag, TestNamespace),
                 nav => new EquatableEdge<string>(
-                    nav.GetAttribute("source", ""),
-                    nav.GetAttribute("target", "")));
+                    nav.GetAttribute(SourceTag, TestNamespace),
+                    nav.GetAttribute(TargetTag, TestNamespace)));
             AssetTestGraphContent(
                 adjacencyGraph,
                 (v1, v2, _) => new EquatableEdge<string>(v1, v2));
 
             // Directed bidirectional graph
             BidirectionalGraph<string, EquatableEdge<string>> bidirectionalGraph = document.DeserializeFromXml(
-                "graph",
-                "node",
-                "edge",
+                GraphTag,
+                NodeTag,
+                EdgeTag,
                 _ => new BidirectionalGraph<string, EquatableEdge<string>>(),
-                nav => nav.GetAttribute("id", ""),
+                nav => nav.GetAttribute(IdTag, TestNamespace),
                 nav => new EquatableEdge<string>(
-                    nav.GetAttribute("source", ""),
-                    nav.GetAttribute("target", "")));
+                    nav.GetAttribute(SourceTag, TestNamespace),
+                    nav.GetAttribute(TargetTag, TestNamespace)));
             AssetTestGraphContent(
                 bidirectionalGraph,
                 (v1, v2, _) => new EquatableEdge<string>(v1, v2));
 
             // Undirected graph
             UndirectedGraph<string, EquatableTaggedEdge<string, double>> undirectedGraph = document.DeserializeFromXml(
-                "graph",
-                "node",
-                "edge",
+                GraphTag,
+                NodeTag,
+                EdgeTag,
                 _ => new UndirectedGraph<string, EquatableTaggedEdge<string, double>>(),
-                nav => nav.GetAttribute("id", ""),
+                nav => nav.GetAttribute(IdTag, TestNamespace),
                 nav => new EquatableTaggedEdge<string, double>(
-                    nav.GetAttribute("source", ""),
-                    nav.GetAttribute("target", ""),
-                    int.Parse(nav.GetAttribute("weight", ""))));
+                    nav.GetAttribute(SourceTag, TestNamespace),
+                    nav.GetAttribute(TargetTag, TestNamespace),
+                    int.Parse(nav.GetAttribute(WeightTag, TestNamespace))));
             AssetTestGraphContent(
                 undirectedGraph,
                 (v1, v2, weight) => new EquatableTaggedEdge<string, double>(v1, v2, weight));
@@ -458,125 +537,125 @@ public void DeserializeFromXml_Document_Throws()
             // ReSharper disable AssignNullToNotNullAttribute
             Assert.Throws<ArgumentNullException>(
                 () => ((XPathDocument) null).DeserializeFromXml(
-                    "graph",
-                    "node",
-                    "edge",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
                     _ => new AdjacencyGraph<string, EquatableEdge<string>>(),
-                    nav => nav.GetAttribute("id", ""),
+                    nav => nav.GetAttribute(IdTag, ""),
                     nav => new EquatableEdge<string>(
-                        nav.GetAttribute("source", ""),
-                        nav.GetAttribute("target", ""))));
+                        nav.GetAttribute(SourceTag, ""),
+                        nav.GetAttribute(TargetTag, ""))));
 
             var document = new XPathDocument(GetGraphFilePath(TestGraphFileName));
 
             Assert.Throws<ArgumentException>(
                 () => document.DeserializeFromXml(
                 null,
-                "node",
-                "edge",
+                NodeTag,
+                EdgeTag,
                 _ => new AdjacencyGraph<string, Edge<string>>(),
-                nav => nav.GetAttribute("id", ""),
+                nav => nav.GetAttribute(IdTag, ""),
                 nav => new Edge<string>(
-                    nav.GetAttribute("source", ""),
-                    nav.GetAttribute("target", ""))));
+                    nav.GetAttribute(SourceTag, ""),
+                    nav.GetAttribute(TargetTag, ""))));
 
             Assert.Throws<ArgumentException>(
                 () => document.DeserializeFromXml(
                     "",
-                    "node",
-                    "edge",
+                    NodeTag,
+                    EdgeTag,
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    nav => nav.GetAttribute("id", ""),
+                    nav => nav.GetAttribute(IdTag, ""),
                     nav => new Edge<string>(
-                        nav.GetAttribute("source", ""),
-                        nav.GetAttribute("target", ""))));
+                        nav.GetAttribute(SourceTag, ""),
+                        nav.GetAttribute(TargetTag, ""))));
 
             Assert.Throws<ArgumentException>(
                 () => document.DeserializeFromXml(
-                    "graph",
+                    GraphTag,
                     null,
-                    "edge",
+                    EdgeTag,
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    nav => nav.GetAttribute("id", ""),
+                    nav => nav.GetAttribute(IdTag, ""),
                     nav => new Edge<string>(
-                        nav.GetAttribute("source", ""),
-                        nav.GetAttribute("target", ""))));
+                        nav.GetAttribute(SourceTag, ""),
+                        nav.GetAttribute(TargetTag, ""))));
 
             Assert.Throws<ArgumentException>(
                 () => document.DeserializeFromXml(
-                    "graph",
+                    GraphTag,
                     "",
-                    "edge",
+                    EdgeTag,
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    nav => nav.GetAttribute("id", ""),
+                    nav => nav.GetAttribute(IdTag, ""),
                     nav => new Edge<string>(
-                        nav.GetAttribute("source", ""),
-                        nav.GetAttribute("target", ""))));
+                        nav.GetAttribute(SourceTag, ""),
+                        nav.GetAttribute(TargetTag, ""))));
 
             Assert.Throws<ArgumentException>(
                 () => document.DeserializeFromXml(
-                    "graph",
-                    "node",
+                    GraphTag,
+                    NodeTag,
                     null,
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    nav => nav.GetAttribute("id", ""),
+                    nav => nav.GetAttribute(IdTag, ""),
                     nav => new Edge<string>(
-                        nav.GetAttribute("source", ""),
-                        nav.GetAttribute("target", ""))));
+                        nav.GetAttribute(SourceTag, ""),
+                        nav.GetAttribute(TargetTag, ""))));
 
             Assert.Throws<ArgumentException>(
                 () => document.DeserializeFromXml(
-                    "graph",
-                    "node",
+                    GraphTag,
+                    NodeTag,
                     "",
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    nav => nav.GetAttribute("id", ""),
+                    nav => nav.GetAttribute(IdTag, ""),
                     nav => new Edge<string>(
-                        nav.GetAttribute("source", ""),
-                        nav.GetAttribute("target", ""))));
+                        nav.GetAttribute(SourceTag, ""),
+                        nav.GetAttribute(TargetTag, ""))));
 
             Assert.Throws<ArgumentNullException>(
                 () => document.DeserializeFromXml<string, Edge<string>, AdjacencyGraph<string, Edge<string>>>(
-                    "graph",
-                    "node",
-                    "edge",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
                     null,
-                    nav => nav.GetAttribute("id", ""),
+                    nav => nav.GetAttribute(IdTag, ""),
                     nav => new Edge<string>(
-                        nav.GetAttribute("source", ""),
-                        nav.GetAttribute("target", ""))));
+                        nav.GetAttribute(SourceTag, ""),
+                        nav.GetAttribute(TargetTag, ""))));
 
             Assert.Throws<ArgumentNullException>(
                 () => document.DeserializeFromXml<string, Edge<string>, AdjacencyGraph<string, Edge<string>>>(
-                    "graph",
-                    "node",
-                    "edge",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
                     _ => new AdjacencyGraph<string, Edge<string>>(),
                     null,
                     nav => new Edge<string>(
-                        nav.GetAttribute("source", ""),
-                        nav.GetAttribute("target", ""))));
+                        nav.GetAttribute(SourceTag, ""),
+                        nav.GetAttribute(TargetTag, ""))));
 
             Assert.Throws<ArgumentNullException>(
                 () => document.DeserializeFromXml<string, Edge<string>, AdjacencyGraph<string, Edge<string>>>(
-                    "graph",
-                    "node",
-                    "edge",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    nav => nav.GetAttribute("id", ""),
+                    nav => nav.GetAttribute(IdTag, ""),
                     null));
 
             // No graph node found
             Assert.Throws<InvalidOperationException>(
                 () => document.DeserializeFromXml(
                     "g",    // No node named "g" for the graph
-                    "node",
-                    "edge",
+                    NodeTag,
+                    EdgeTag,
                     _ => new AdjacencyGraph<string, EquatableEdge<string>>(),
-                    nav => nav.GetAttribute("id", ""),
+                    nav => nav.GetAttribute(IdTag, ""),
                     nav => new EquatableEdge<string>(
-                        nav.GetAttribute("source", ""),
-                        nav.GetAttribute("target", ""))));
+                        nav.GetAttribute(SourceTag, ""),
+                        nav.GetAttribute(TargetTag, ""))));
             // ReSharper restore AssignNullToNotNullAttribute
             // ReSharper restore ReturnValueOfPureMethodIsNotUsed
         }
@@ -587,47 +666,46 @@ public void DeserializeFromXml_Reader_Empty()
             using (var reader = XmlReader.Create(GetGraphFilePath(EmptyGraphFileName)))
             {
                 AdjacencyGraph<string, Edge<string>> adjacencyGraph = reader.DeserializeFromXml(
-                    "graph",
-                    "node",
-                    "edge",
-                    "",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
+                    TestNamespace,
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new Edge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute")));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute")));
                 AssertEmptyGraph(adjacencyGraph);
             }
 
             using (var reader = XmlReader.Create(GetGraphFilePath(EmptyGraphFileName)))
             {
                 BidirectionalGraph<string, Edge<string>> bidirectionalGraph = reader.DeserializeFromXml(
-                    "graph",
-                    "node",
-                    "edge",
-                    "",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
+                    TestNamespace,
                     _ => new BidirectionalGraph<string, Edge<string>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new Edge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute")));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute")));
                 AssertEmptyGraph(bidirectionalGraph);
             }
 
             using (var reader = XmlReader.Create(GetGraphFilePath(EmptyGraphFileName)))
             {
                 UndirectedGraph<string, TaggedEdge<string, double>> undirectedGraph = reader.DeserializeFromXml(
-                    "graph",
-                    "node",
-                    "edge",
-                    "",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
+                    TestNamespace,
                     _ => new UndirectedGraph<string, TaggedEdge<string, double>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new TaggedEdge<string, double>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"),
-                        int.Parse(
-                            r.GetAttribute("weight") ?? throw new AssertionException("Must have weight attribute"))));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"),
+                        int.Parse(r.GetAttribute(WeightTag) ?? throw new AssertionException("Must have weight attribute"))));
                 AssertEmptyGraph(undirectedGraph);
             }
         }
@@ -638,15 +716,15 @@ public void DeserializeFromXml_Reader()
             using (var reader = XmlReader.Create(GetGraphFilePath(TestGraphFileName)))
             {
                 AdjacencyGraph<string, EquatableEdge<string>> adjacencyGraph = reader.DeserializeFromXml(
-                    "graph",
-                    "node",
-                    "edge",
-                    "",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
+                    TestNamespace,
                     _ => new AdjacencyGraph<string, EquatableEdge<string>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new EquatableEdge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute")));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute")));
                 AssetTestGraphContent(
                     adjacencyGraph,
                     (v1, v2, _) => new EquatableEdge<string>(v1, v2));
@@ -655,15 +733,15 @@ public void DeserializeFromXml_Reader()
             using (var reader = XmlReader.Create(GetGraphFilePath(TestGraphFileName)))
             {
                 BidirectionalGraph<string, EquatableEdge<string>> bidirectionalGraph = reader.DeserializeFromXml(
-                    "graph",
-                    "node",
-                    "edge",
-                    "",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
+                    TestNamespace,
                     _ => new BidirectionalGraph<string, EquatableEdge<string>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new EquatableEdge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute")));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute")));
                 AssetTestGraphContent(
                     bidirectionalGraph,
                     (v1, v2, _) => new EquatableEdge<string>(v1, v2));
@@ -672,17 +750,16 @@ public void DeserializeFromXml_Reader()
             using (var reader = XmlReader.Create(GetGraphFilePath(TestGraphFileName)))
             {
                 UndirectedGraph<string, EquatableTaggedEdge<string, double>> undirectedGraph = reader.DeserializeFromXml(
-                    "graph",
-                    "node",
-                    "edge",
-                    "",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
+                    TestNamespace,
                     _ => new UndirectedGraph<string, EquatableTaggedEdge<string, double>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new EquatableTaggedEdge<string, double>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"),
-                        int.Parse(
-                            r.GetAttribute("weight") ?? throw new AssertionException("Must have weight attribute"))));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"),
+                        int.Parse(r.GetAttribute(WeightTag) ?? throw new AssertionException("Must have weight attribute"))));
                 AssetTestGraphContent(
                     undirectedGraph,
                     (v1, v2, weight) => new EquatableTaggedEdge<string, double>(v1, v2, weight));
@@ -696,47 +773,47 @@ public void DeserializeFromXml_Reader_Throws()
             // ReSharper disable AssignNullToNotNullAttribute
             Assert.Throws<ArgumentNullException>(
                 () => ((XmlReader)null).DeserializeFromXml(
-                    "graph",
-                    "node",
-                    "edge",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
                     "",
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new Edge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"))));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"))));
 
             using (var reader = XmlReader.Create(GetGraphFilePath(TestGraphFileName)))
             {
                 Assert.Throws<ArgumentNullException>(() => reader.DeserializeFromXml<string, Edge<string>, AdjacencyGraph<string, Edge<string>>>(
-                    "graph",
-                    "node",
-                    "edge",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
                     "",
                     null,
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new Edge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"))));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"))));
 
                 Assert.Throws<ArgumentNullException>(() => reader.DeserializeFromXml<string, Edge<string>, AdjacencyGraph<string, Edge<string>>>(
-                    "graph",
-                    "node",
-                    "edge",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
                     "",
                     _ => new AdjacencyGraph<string, Edge<string>>(),
                     null,
                     r => new Edge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"))));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"))));
 
                 Assert.Throws<ArgumentNullException>(() => reader.DeserializeFromXml<string, Edge<string>, AdjacencyGraph<string, Edge<string>>>(
-                    "graph",
-                    "node",
-                    "edge",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
                     "",
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     null));
 
 
@@ -744,125 +821,125 @@ public void DeserializeFromXml_Reader_Throws()
                     () => reader.DeserializeFromXml(
                         null,
                         r => r.Name == "vertex",
-                        r => r.Name == "edge",
+                        r => r.Name == EdgeTag,
                         _ => new AdjacencyGraph<string, Edge<string>>(),
-                        r => r.GetAttribute("id"),
+                        r => r.GetAttribute(IdTag),
                         r => new Edge<string>(
-                            r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                            r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"))));
+                            r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                            r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"))));
 
                 Assert.Throws<ArgumentNullException>(
                     () => reader.DeserializeFromXml(
-                        r => r.Name == "graph",
+                        r => r.Name == GraphTag,
                         null,
-                        r => r.Name == "edge",
+                        r => r.Name == EdgeTag,
                         _ => new AdjacencyGraph<string, Edge<string>>(),
-                        r => r.GetAttribute("id"),
+                        r => r.GetAttribute(IdTag),
                         r => new Edge<string>(
-                            r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                            r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"))));
+                            r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                            r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"))));
 
                 Assert.Throws<ArgumentNullException>(
                     () => reader.DeserializeFromXml(
-                        r => r.Name == "graph",
+                        r => r.Name == GraphTag,
                         r => r.Name == "vertex",
                         null,
                         _ => new AdjacencyGraph<string, Edge<string>>(),
-                        r => r.GetAttribute("id"),
+                        r => r.GetAttribute(IdTag),
                         r => new Edge<string>(
-                            r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                            r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"))));
+                            r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                            r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"))));
 
 
                 Assert.Throws<ArgumentException>(() => reader.DeserializeFromXml(
                     null,
-                    "node",
-                    "edge",
+                    NodeTag,
+                    EdgeTag,
                     "",
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new Edge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"))));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"))));
 
                 Assert.Throws<ArgumentException>(() => reader.DeserializeFromXml(
                     "",
-                    "node",
-                    "edge",
+                    NodeTag,
+                    EdgeTag,
                     "",
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new Edge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"))));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"))));
 
                 Assert.Throws<ArgumentException>(() => reader.DeserializeFromXml(
-                    "graph",
+                    GraphTag,
                     null,
-                    "edge",
+                    EdgeTag,
                     "",
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new Edge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"))));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"))));
 
                 Assert.Throws<ArgumentException>(() => reader.DeserializeFromXml(
-                    "graph",
+                    GraphTag,
                     "",
-                    "edge",
+                    EdgeTag,
                     "",
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new Edge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"))));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"))));
 
                 Assert.Throws<ArgumentException>(() => reader.DeserializeFromXml(
-                    "graph",
-                    "node",
+                    GraphTag,
+                    NodeTag,
                     null,
                     "",
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new Edge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"))));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"))));
 
                 Assert.Throws<ArgumentException>(() => reader.DeserializeFromXml(
-                    "graph",
-                    "node",
+                    GraphTag,
+                    NodeTag,
                     "",
                     "",
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new Edge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"))));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"))));
 
                 Assert.Throws<ArgumentNullException>(() => reader.DeserializeFromXml(
-                    "graph",
-                    "node",
-                    "edge",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
                     null,
                     _ => new AdjacencyGraph<string, Edge<string>>(),
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new Edge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"))));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"))));
 
 
                 // No graph node found
                 Assert.Throws<InvalidOperationException>(() => reader.DeserializeFromXml(
                     "g",    // No node named "g" for the graph
-                    "node",
-                    "edge",
+                    NodeTag,
+                    EdgeTag,
                     "",
                     _ => new AdjacencyGraph<string, Edge<string>>(), 
-                    r => r.GetAttribute("id"),
+                    r => r.GetAttribute(IdTag),
                     r => new Edge<string>(
-                        r.GetAttribute("source") ?? throw new AssertionException("Must have source attribute"),
-                        r.GetAttribute("target") ?? throw new AssertionException("Must have target attribute"))));
+                        r.GetAttribute(SourceTag) ?? throw new AssertionException("Must have source attribute"),
+                        r.GetAttribute(TargetTag) ?? throw new AssertionException("Must have target attribute"))));
             }
             // ReSharper restore AssignNullToNotNullAttribute
             // ReSharper restore ReturnValueOfPureMethodIsNotUsed
@@ -875,20 +952,268 @@ public void DeserializeFromXml_Reader_Throws()
         #region Test Helpers
 
         [Pure]
-        private static int DeserializeVertex([NotNull] XmlReader reader)
+        [NotNull]
+        private static string GetSerializableString([CanBeNull] string str)
+        {
+            return str ?? NullString;
+        }
+
+        private static void SerializeEdge_Simple<TInEdge>([NotNull] XmlWriter writer, [NotNull] TInEdge edge)
+            where TInEdge : IEdge<int>, IEquatable<TInEdge>
+        {
+            // Serialize only relevant stuff for the test
+            switch (edge)
+            {
+                case EquatableTaggedEdge<int, double> edgeDoubleTag:
+                    writer.WriteAttributeString(IsTaggedTag, TestNamespace, bool.TrueString);
+                    writer.WriteAttributeString(DoubleValueTag, TestNamespace, edgeDoubleTag.Tag.ToString(CultureInfo.InvariantCulture));
+                    break;
+
+                case EquatableTaggedEdge<int, string> edgeStringTag:
+                    writer.WriteAttributeString(IsTaggedTag, TestNamespace, bool.TrueString);
+                    writer.WriteAttributeString(StringValueTag, TestNamespace, GetSerializableString(edgeStringTag.Tag));
+                    break;
+
+                default:
+                    writer.WriteAttributeString(IsTaggedTag, TestNamespace, bool.FalseString);
+                    break;
+            }
+        }
+
+        [Pure]
+        private static int DeserializeVertex_Simple([NotNull] XmlReader reader)
+        {
+            return int.Parse(reader.GetAttribute(IdTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize vertex."));
+        }
+
+        [Pure]
+        [NotNull]
+        private static EquatableEdge<int> DeserializeEdge_Simple([NotNull] XmlReader reader)
+        {
+            int source = int.Parse(reader.GetAttribute(SourceTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize edge source."));
+            int target = int.Parse(reader.GetAttribute(TargetTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize edge target."));
+
+            bool hasTag = bool.Parse(reader.GetAttribute(IsTaggedTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize edge tag info."));
+            if (hasTag)
+            {
+                string attribute = reader.GetAttribute(DoubleValueTag, TestNamespace);
+                if (attribute is null)
+                {
+                    attribute = reader.GetAttribute(StringValueTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize vertex tag.");
+                    return new EquatableTaggedEdge<int, string>(source, target, GetString(attribute));
+                }
+
+                return new EquatableTaggedEdge<int, double>(
+                    source,
+                    target,
+                    double.Parse(attribute, CultureInfo.InvariantCulture));
+            }
+
+            return new EquatableEdge<int>(source, target);
+
+
+            #region Local function
+
+            string GetString(string readStr)
+            {
+                return NullString.Equals(readStr, StringComparison.Ordinal) ? null : readStr;
+            }
+
+            #endregion
+        }
+
+        [Pure]
+        private static SEquatableEdge<int> DeserializeSEdge_Simple([NotNull] XmlReader reader)
+        {
+            return new SEquatableEdge<int>(
+                int.Parse(reader.GetAttribute(SourceTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize edge source.")),
+                int.Parse(reader.GetAttribute(TargetTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize edge target.")));
+        }
+
+        private static void SerializeVertex_Complex([NotNull] XmlWriter writer, [NotNull] EquatableTestVertex vertex)
+        {
+            // Serialize only relevant stuff for the test
+            Type vertexType = vertex.GetType();
+            writer.WriteAttributeString(TypeTag, TestNamespace, TypeToSerializableType(vertexType));
+
+            writer.WriteAttributeString(StringDefaultTag, TestNamespace, GetSerializableString(vertex.StringDefault));
+            writer.WriteAttributeString(StringTag, TestNamespace, GetSerializableString(vertex.String));
+            writer.WriteAttributeString(BoolTag, TestNamespace, vertex.Bool.ToString());
+            writer.WriteAttributeString(IntTag, TestNamespace, vertex.Int.ToString());
+            writer.WriteAttributeString(LongTag, TestNamespace, vertex.Long.ToString());
+            writer.WriteAttributeString(FloatTag, TestNamespace, vertex.Float.ToString(CultureInfo.InvariantCulture));
+            writer.WriteAttributeString(DoubleTag, TestNamespace, vertex.Double.ToString(CultureInfo.InvariantCulture));
+
+            if (vertex is EquatableAdditionalDataTestVertex vertexWithData)
+            {
+                writer.WriteAttributeString(AdditionalDataTag, TestNamespace, vertexWithData.Data.ToString(CultureInfo.InvariantCulture));
+            }
+        }
+
+        private static void SerializeEdge_Complex<TInEdge>([NotNull] XmlWriter writer, [NotNull] TInEdge edge)
+            where TInEdge : IEdge<EquatableTestVertex>, IEquatable<TInEdge>
+        {
+            // Serialize only relevant stuff for the test
+            IEdge<EquatableTestVertex> edgeToCheck = edge;
+            if (edge is SReversedEdge<EquatableTestVertex, EquatableTestEdge> reversedEdge)
+            {
+                edgeToCheck = reversedEdge.OriginalEdge;
+            }
+
+            Type edgeType = edgeToCheck.GetType();
+            writer.WriteAttributeString(TypeTag, TestNamespace, TypeToSerializableType(edgeType));
+
+            if (edgeToCheck is EquatableTestEdge edgeToSerialize)
+            {
+                writer.WriteAttributeString(StringTag, TestNamespace, GetSerializableString(edgeToSerialize.String));
+                writer.WriteAttributeString(BoolTag, TestNamespace, edgeToSerialize.Bool.ToString());
+                writer.WriteAttributeString(IntTag, TestNamespace, edgeToSerialize.Int.ToString());
+                writer.WriteAttributeString(LongTag, TestNamespace, edgeToSerialize.Long.ToString());
+                writer.WriteAttributeString(FloatTag, TestNamespace, edgeToSerialize.Float.ToString(CultureInfo.InvariantCulture));
+                writer.WriteAttributeString(DoubleTag, TestNamespace, edgeToSerialize.Double.ToString(CultureInfo.InvariantCulture));
+            }
+
+            if (edgeToCheck is EquatableAdditionalDataTestEdge edgeToSerializeWithData)
+            {
+                writer.WriteAttributeString(AdditionalDataTag, TestNamespace, edgeToSerializeWithData.Data.ToString(CultureInfo.InvariantCulture));
+            }
+        }
+
+        [Pure]
+        [NotNull]
+        private static EquatableTestVertex DeserializeVertex_Complex([NotNull] XmlReader reader)
+        {
+            string id = reader.GetAttribute(IdTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize vertex id.");
+            var type = Type.GetType(reader.GetAttribute(TypeTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize vertex type."));
+
+            EquatableTestVertex vertex = type == typeof(EquatableAdditionalDataTestVertex)
+                ? new EquatableAdditionalDataTestVertex(
+                    id,
+                    double.Parse(reader.GetAttribute(AdditionalDataTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize vertex data.")))
+                : new EquatableTestVertex(id);
+
+            return AssignData(vertex);
+
+            #region Local function
+
+            EquatableTestVertex AssignData(EquatableTestVertex v)
+            {
+                v.StringDefault = GetString(StringDefaultTag);
+                v.String = GetString(StringTag);
+                v.Bool = bool.Parse(reader.GetAttribute(BoolTag, TestNamespace) ?? throw new AssertionException($"Unable to deserialize vertex \"{BoolTag}\" tag."));
+                v.Int = int.Parse(reader.GetAttribute(IntTag, TestNamespace) ?? throw new AssertionException($"Unable to deserialize vertex \"{IntTag}\" tag."));
+                v.Long = long.Parse(reader.GetAttribute(LongTag, TestNamespace) ?? throw new AssertionException($"Unable to deserialize vertex \"{LongTag}\" tag."));
+                v.Float = float.Parse(
+                    reader.GetAttribute(FloatTag, TestNamespace) ?? throw new AssertionException($"Unable to deserialize vertex \"{FloatTag}\" tag."),
+                    CultureInfo.InvariantCulture);
+                v.Double = double.Parse(
+                    reader.GetAttribute(DoubleTag, TestNamespace) ?? throw new AssertionException($"Unable to deserialize vertex \"{DoubleTag}\" tag."),
+                    CultureInfo.InvariantCulture);
+
+                return v;
+
+                #region Local function
+
+                string GetString(string tag)
+                {
+                    string readStr = reader.GetAttribute(tag, TestNamespace)
+                                     ?? throw new AssertionException($"Unable to deserialize vertex \"{tag}\" tag.");
+                    return NullString.Equals(readStr, StringComparison.Ordinal) ? null : readStr;
+                }
+
+                #endregion
+            }
+
+            #endregion
+        }
+
+        [Pure]
+        [NotNull]
+        private static EquatableTestVertex DeserializeVertex_Complex([NotNull] XmlReader reader, [NotNull] IDictionary<string, EquatableTestVertex> verticesCache)
+        {
+            EquatableTestVertex vertex = DeserializeVertex_Complex(reader);
+            verticesCache[VertexIdentity_Complex(vertex)] = vertex;
+            return vertex;
+        }
+
+        [Pure]
+        [NotNull]
+        private static EquatableTestEdge DeserializeEdge_Complex([NotNull] XmlReader reader, [NotNull] IDictionary<string, EquatableTestVertex> verticesCache)
+        {
+            string id = reader.GetAttribute(IdTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize edge id.");
+
+            string sourceId = reader.GetAttribute(SourceTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize edge source id.");
+            string targetId = reader.GetAttribute(TargetTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize edge target id.");
+            EquatableTestVertex source = verticesCache[sourceId];
+            EquatableTestVertex target = verticesCache[targetId];
+
+            var type = Type.GetType(reader.GetAttribute(TypeTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize edge type."));
+
+            EquatableTestEdge edge = type == typeof(EquatableAdditionalDataTestEdge)
+                ? new EquatableAdditionalDataTestEdge(
+                    source,
+                    target,
+                    id,
+                    double.Parse(reader.GetAttribute(AdditionalDataTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize edge data."), CultureInfo.InvariantCulture))
+                : new EquatableTestEdge(source, target, id);
+
+            return AssignData(edge);
+
+            #region Local function
+
+            EquatableTestEdge AssignData(EquatableTestEdge e)
+            {
+                e.String = GetString(StringTag);
+                e.Bool = bool.Parse(reader.GetAttribute(BoolTag, TestNamespace) ?? throw new AssertionException($"Unable to deserialize edge \"{BoolTag}\" tag."));
+                e.Int = int.Parse(reader.GetAttribute(IntTag, TestNamespace) ?? throw new AssertionException($"Unable to deserialize edge \"{IntTag}\" tag."));
+                e.Long = long.Parse(reader.GetAttribute(LongTag, TestNamespace) ?? throw new AssertionException($"Unable to deserialize edge \"{LongTag}\" tag."));
+                e.Float = float.Parse(
+                    reader.GetAttribute(FloatTag, TestNamespace) ?? throw new AssertionException($"Unable to deserialize edge \"{FloatTag}\" tag."),
+                    CultureInfo.InvariantCulture);
+                e.Double = double.Parse(
+                    reader.GetAttribute(DoubleTag, TestNamespace) ?? throw new AssertionException($"Unable to deserialize edge \"{DoubleTag}\" tag."),
+                    CultureInfo.InvariantCulture);
+
+                return e;
+
+                #region Local function
+
+                string GetString(string tag)
+                {
+                    string readStr = reader.GetAttribute(tag, TestNamespace)
+                                     ?? throw new AssertionException($"Unable to deserialize edge \"{tag}\" tag.");
+                    return NullString.Equals(readStr, StringComparison.Ordinal) ? null : readStr;
+                }
+
+                #endregion
+            }
+
+            #endregion
+        }
+
+        [Pure]
+        private static SEquatableEdge<EquatableTestVertex> DeserializeSEdge_Complex([NotNull] XmlReader reader, [NotNull] IDictionary<string, EquatableTestVertex> verticesCache)
         {
-            return int.Parse(reader.GetAttribute("id", "") ?? throw new AssertionException("Unable to deserialize vertex."));
+            string sourceId = reader.GetAttribute(SourceTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize edge source id.");
+            string targetId = reader.GetAttribute(TargetTag, TestNamespace) ?? throw new AssertionException("Unable to deserialize edge target id.");
+            EquatableTestVertex source = verticesCache[sourceId];
+            EquatableTestVertex target = verticesCache[targetId];
+
+            return new SEquatableEdge<EquatableTestVertex>(source, target);
         }
 
         [Pure]
         [NotNull]
-        private static TOutGraph SerializeDeserialize<TInEdge, TOutEdge, TInGraph, TOutGraph>(
+        private static TOutGraph SerializeDeserialize<TVertex, TInEdge, TOutEdge, TInGraph, TOutGraph>(
             [NotNull] TInGraph graph,
+            [NotNull, InstantHandle] VertexIdentity<TVertex> vertexIdentity,
+            [CanBeNull, InstantHandle] Action<XmlWriter, TVertex> vertexAttributes,
+            [CanBeNull, InstantHandle] Action<XmlWriter, TInEdge> edgeAttributes,
             [NotNull, InstantHandle] Func<XmlReader, TOutGraph> deserialize)
-            where TInEdge : IEdge<int>, IEquatable<TInEdge>
-            where TOutEdge : IEdge<int>, IEquatable<TOutEdge>
-            where TInGraph : IEdgeListGraph<int, TInEdge>
-            where TOutGraph : IEdgeListGraph<int, TOutEdge>
+            where TInEdge : IEdge<TVertex>, IEquatable<TInEdge>
+            where TOutEdge : IEdge<TVertex>, IEquatable<TOutEdge>
+            where TInGraph : IEdgeListGraph<TVertex, TInEdge>
+            where TOutGraph : IEdgeListGraph<TVertex, TOutEdge>
         {
             Assert.IsNotNull(graph);
 
@@ -901,12 +1226,15 @@ private static TOutGraph SerializeDeserialize<TInEdge, TOutEdge, TInGraph, TOutG
                 {
                     graph.SerializeToXml(
                         xmlWriter,
-                        vertex => vertex.ToString(),
+                        vertexIdentity,
                         graph.GetEdgeIdentity(),
-                        "graph",
-                        "node",
-                        "edge",
-                        "");
+                        GraphTag,
+                        NodeTag,
+                        EdgeTag,
+                        TestNamespace,
+                        null,
+                        vertexAttributes,
+                        edgeAttributes);
                 }
 
                 memory.Position = 0;
@@ -924,128 +1252,282 @@ private static TOutGraph SerializeDeserialize<TInEdge, TOutEdge, TInGraph, TOutG
 
         [Pure]
         [NotNull]
-        private static TOutGraph SerializeDeserialize<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+        private static TOutGraph SerializeDeserialize_Simple<TInEdge, TOutEdge, TInGraph, TOutGraph>(
+            [NotNull] TInGraph graph,
+            [NotNull, InstantHandle] Func<XmlReader, TOutGraph> deserialize)
+            where TInEdge : IEdge<int>, IEquatable<TInEdge>
+            where TOutEdge : IEdge<int>, IEquatable<TOutEdge>
+            where TInGraph : IEdgeListGraph<int, TInEdge>
+            where TOutGraph : IEdgeListGraph<int, TOutEdge>
+        {
+            return SerializeDeserialize<int, TInEdge, TOutEdge, TInGraph, TOutGraph>(
+                graph,
+                VertexIdentity_Simple,
+                null,
+                SerializeEdge_Simple,
+                deserialize);
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize_Complex<TInEdge, TOutEdge, TInGraph, TOutGraph>(
+            [NotNull] TInGraph graph,
+            [NotNull, InstantHandle] Func<XmlReader, TOutGraph> deserialize)
+            where TInEdge : IEdge<EquatableTestVertex>, IEquatable<TInEdge>
+            where TOutEdge : IEdge<EquatableTestVertex>, IEquatable<TOutEdge>
+            where TInGraph : IEdgeListGraph<EquatableTestVertex, TInEdge>
+            where TOutGraph : IEdgeListGraph<EquatableTestVertex, TOutEdge>
+        {
+            return SerializeDeserialize<EquatableTestVertex, TInEdge, TOutEdge, TInGraph, TOutGraph>(
+                graph,
+                VertexIdentity_Complex,
+                SerializeVertex_Complex,
+                SerializeEdge_Complex,
+                deserialize);
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize_Simple<TInGraph, TOutGraph>([NotNull] TInGraph graph)
             where TInGraph : IEdgeListGraph<int, EquatableEdge<int>>
             where TOutGraph : class, IMutableVertexAndEdgeSet<int, EquatableEdge<int>>, new()
         {
-            return SerializeDeserialize<EquatableEdge<int>, EquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
+            return SerializeDeserialize_Simple<EquatableEdge<int>, EquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
                 reader.DeserializeFromXml(
-                    "graph",
-                    "node",
-                    "edge",
-                    "",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
+                    TestNamespace,
+                    _ => new TOutGraph(),
+                    DeserializeVertex_Simple,
+                    DeserializeEdge_Simple));
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize_Complex<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+            where TInGraph : IEdgeListGraph<EquatableTestVertex, EquatableTestEdge>
+            where TOutGraph : class, IMutableVertexAndEdgeSet<EquatableTestVertex, EquatableTestEdge>, new()
+        {
+            var verticesCache = new Dictionary<string, EquatableTestVertex>();
+            return SerializeDeserialize_Complex<EquatableTestEdge, EquatableTestEdge, TInGraph, TOutGraph>(graph, reader =>
+                reader.DeserializeFromXml(
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
+                    TestNamespace,
                     _ => new TOutGraph(),
-                    DeserializeVertex,
-                    nav => new EquatableEdge<int>(
-                        int.Parse(nav.GetAttribute("source", "") ?? throw new AssertionException("Unable to deserialize edge source.")),
-                        int.Parse(nav.GetAttribute("target", "") ?? throw new AssertionException("Unable to deserialize edge target.")))));
+                    r => DeserializeVertex_Complex(r, verticesCache),
+                    r => DeserializeEdge_Complex(r, verticesCache)));
         }
 
         [Pure]
         [NotNull]
-        private static TOutGraph SerializeDeserialize_SEdge<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+        private static TOutGraph SerializeDeserialize_SEdge_Simple<TInGraph, TOutGraph>([NotNull] TInGraph graph)
             where TInGraph : IEdgeListGraph<int, SEquatableEdge<int>>
             where TOutGraph : class, IMutableVertexAndEdgeSet<int, SEquatableEdge<int>>, new()
         {
-            return SerializeDeserialize<SEquatableEdge<int>, SEquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
+            return SerializeDeserialize_Simple<SEquatableEdge<int>, SEquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
                 reader.DeserializeFromXml(
-                    "graph",
-                    "node",
-                    "edge",
-                    "",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
+                    TestNamespace,
                     _ => new TOutGraph(),
-                    DeserializeVertex,
-                    nav => new SEquatableEdge<int>(
-                        int.Parse(nav.GetAttribute("source", "") ?? throw new AssertionException("Unable to deserialize edge source.")),
-                        int.Parse(nav.GetAttribute("target", "") ?? throw new AssertionException("Unable to deserialize edge target.")))));
+                    DeserializeVertex_Simple,
+                    DeserializeSEdge_Simple));
         }
 
         [Pure]
         [NotNull]
-        private static TOutGraph SerializeDeserialize_Reversed<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+        private static TOutGraph SerializeDeserialize_SEdge_Complex<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+            where TInGraph : IEdgeListGraph<EquatableTestVertex, SEquatableEdge<EquatableTestVertex>>
+            where TOutGraph : class, IMutableVertexAndEdgeSet<EquatableTestVertex, SEquatableEdge<EquatableTestVertex>>, new()
+        {
+            var verticesCache = new Dictionary<string, EquatableTestVertex>();
+            return SerializeDeserialize_Complex<SEquatableEdge<EquatableTestVertex>, SEquatableEdge<EquatableTestVertex>, TInGraph, TOutGraph>(graph, reader =>
+                reader.DeserializeFromXml(
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
+                    TestNamespace,
+                    _ => new TOutGraph(),
+                    r => DeserializeVertex_Complex(r, verticesCache),
+                    r => DeserializeSEdge_Complex(r, verticesCache)));
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize_Reversed_Simple<TInGraph, TOutGraph>([NotNull] TInGraph graph)
             where TInGraph : IEdgeListGraph<int, SReversedEdge<int, EquatableEdge<int>>>
             where TOutGraph : class, IMutableVertexAndEdgeSet<int, EquatableEdge<int>>, new()
         {
-            return SerializeDeserialize<SReversedEdge<int, EquatableEdge<int>>, EquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
+            return SerializeDeserialize_Simple<SReversedEdge<int, EquatableEdge<int>>, EquatableEdge<int>, TInGraph, TOutGraph>(graph, reader =>
                 reader.DeserializeFromXml(
-                    "graph",
-                    "node",
-                    "edge",
-                    "",
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
+                    TestNamespace,
+                    _ => new TOutGraph(),
+                    DeserializeVertex_Simple,
+                    DeserializeEdge_Simple));
+        }
+
+        [Pure]
+        [NotNull]
+        private static TOutGraph SerializeDeserialize_Reversed_Complex<TInGraph, TOutGraph>([NotNull] TInGraph graph)
+            where TInGraph : IEdgeListGraph<EquatableTestVertex, SReversedEdge<EquatableTestVertex, EquatableTestEdge>>
+            where TOutGraph : class, IMutableVertexAndEdgeSet<EquatableTestVertex, EquatableTestEdge>, new()
+        {
+            var verticesCache = new Dictionary<string, EquatableTestVertex>();
+            return SerializeDeserialize_Complex<SReversedEdge<EquatableTestVertex, EquatableTestEdge>, EquatableTestEdge, TInGraph, TOutGraph>(graph, reader =>
+                reader.DeserializeFromXml(
+                    GraphTag,
+                    NodeTag,
+                    EdgeTag,
+                    TestNamespace,
                     _ => new TOutGraph(),
-                    DeserializeVertex,
-                    nav => new EquatableEdge<int>(
-                        int.Parse(nav.GetAttribute("source", "") ?? throw new AssertionException("Unable to deserialize edge source.")),
-                        int.Parse(nav.GetAttribute("target", "") ?? throw new AssertionException("Unable to deserialize edge target.")))));
+                    r => DeserializeVertex_Complex(r, verticesCache),
+                    r => DeserializeEdge_Complex(r, verticesCache)));
         }
 
         #endregion
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphTestCases))]
-        public void XmlSerialization_AdjacencyGraph([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
+        public void XmlSerialization_AdjacencyGraph_Simple([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
         {
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph1 =
-                SerializeDeserialize<AdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+                SerializeDeserialize_Simple<AdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph1));
 
             var arrayGraph = new ArrayAdjacencyGraph<int, EquatableEdge<int>>(graph);
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph2 =
-                SerializeDeserialize<ArrayAdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(arrayGraph);
+                SerializeDeserialize_Simple<ArrayAdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphComplexTestCases))]
+        public void XmlSerialization_AdjacencyGraph_Complex([NotNull] AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph1 =
+                SerializeDeserialize_Complex<AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph1));
+
+            var arrayGraph = new ArrayAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph2 =
+                SerializeDeserialize_Complex<ArrayAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(arrayGraph);
             Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
         }
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphTestCases))]
-        public void XmlSerialization_AdapterGraph([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
+        public void XmlSerialization_AdapterGraph_Simple([NotNull] AdjacencyGraph<int, EquatableEdge<int>> graph)
         {
             var bidirectionalAdapterGraph = new BidirectionalAdapterGraph<int, EquatableEdge<int>>(graph);
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
-                SerializeDeserialize<BidirectionalAdapterGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(bidirectionalAdapterGraph);
+                SerializeDeserialize_Simple<BidirectionalAdapterGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(bidirectionalAdapterGraph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationAdjacencyGraphComplexTestCases))]
+        public void XmlSerialization_AdapterGraph_Complex([NotNull] AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            var bidirectionalAdapterGraph = new BidirectionalAdapterGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph =
+                SerializeDeserialize_Complex<BidirectionalAdapterGraph<EquatableTestVertex, EquatableTestEdge>, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(bidirectionalAdapterGraph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationClusteredAdjacencyGraphTestCases))]
-        public void XmlSerialization_ClusteredGraph([NotNull] ClusteredAdjacencyGraph<int, EquatableEdge<int>> graph)
+        public void XmlSerialization_ClusteredGraph_Simple([NotNull] ClusteredAdjacencyGraph<int, EquatableEdge<int>> graph)
         {
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
-                SerializeDeserialize<ClusteredAdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+                SerializeDeserialize_Simple<ClusteredAdjacencyGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationClusteredAdjacencyGraphComplexTestCases))]
+        public void XmlSerialization_ClusteredGraph_Complex([NotNull] ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph =
+                SerializeDeserialize_Complex<ClusteredAdjacencyGraph<EquatableTestVertex, EquatableTestEdge>, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationCompressedGraphTestCases))]
-        public void XmlSerialization_CompressedGraph([NotNull] CompressedSparseRowGraph<int> graph)
+        public void XmlSerialization_CompressedGraph_Simple([NotNull] CompressedSparseRowGraph<int> graph)
         {
             AdjacencyGraph<int, SEquatableEdge<int>> deserializedGraph =
-                SerializeDeserialize_SEdge<CompressedSparseRowGraph<int>, AdjacencyGraph<int, SEquatableEdge<int>>>(graph);
+                SerializeDeserialize_SEdge_Simple<CompressedSparseRowGraph<int>, AdjacencyGraph<int, SEquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationCompressedGraphComplexTestCases))]
+        public void XmlSerialization_CompressedGraph_Complex([NotNull] CompressedSparseRowGraph<EquatableTestVertex> graph)
+        {
+            AdjacencyGraph<EquatableTestVertex, SEquatableEdge<EquatableTestVertex>> deserializedGraph =
+                SerializeDeserialize_SEdge_Complex<CompressedSparseRowGraph<EquatableTestVertex>, AdjacencyGraph<EquatableTestVertex, SEquatableEdge<EquatableTestVertex>>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationBidirectionalGraphTestCases))]
-        public void XmlSerialization_BidirectionalGraph([NotNull] BidirectionalGraph<int, EquatableEdge<int>> graph)
+        public void XmlSerialization_BidirectionalGraph_Simple([NotNull] BidirectionalGraph<int, EquatableEdge<int>> graph)
         {
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
-                SerializeDeserialize<BidirectionalGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+                SerializeDeserialize_Simple<BidirectionalGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
 
             var arrayGraph = new ArrayBidirectionalGraph<int, EquatableEdge<int>>(graph);
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph2 =
-                SerializeDeserialize<ArrayBidirectionalGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(arrayGraph);
+                SerializeDeserialize_Simple<ArrayBidirectionalGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(arrayGraph);
             Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
 
             var reversedGraph = new ReversedBidirectionalGraph<int, EquatableEdge<int>>(graph);
             BidirectionalGraph<int, EquatableEdge<int>> deserializedGraph3 =
-                SerializeDeserialize_Reversed<ReversedBidirectionalGraph<int, EquatableEdge<int>>, BidirectionalGraph<int, EquatableEdge<int>>>(reversedGraph);
+                SerializeDeserialize_Reversed_Simple<ReversedBidirectionalGraph<int, EquatableEdge<int>>, BidirectionalGraph<int, EquatableEdge<int>>>(reversedGraph);
             Assert.IsTrue(
                 EquateGraphs.Equate(
                     graph,
                     deserializedGraph3,
                     EqualityComparer<int>.Default,
                     LambdaEqualityComparer<EquatableEdge<int>>.Create(
-                        (edge1, edge2) => Equals(edge1.Source, edge2.Target) && Equals(edge1.Target, edge2.Source),
+                        (edge1, edge2) => Equals(edge1.Source, edge2.Target)
+                                          && Equals(edge1.Target, edge2.Source)
+                                          && edge1.GetType() == edge2.GetType(),
                         edge => edge.GetHashCode())));
 
             var undirectedBidirectionalGraph = new UndirectedBidirectionalGraph<int, EquatableEdge<int>>(graph);
             UndirectedGraph<int, EquatableEdge<int>> deserializedGraph4 =
-                SerializeDeserialize<UndirectedBidirectionalGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(undirectedBidirectionalGraph);
+                SerializeDeserialize_Simple<UndirectedBidirectionalGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(undirectedBidirectionalGraph);
+            Assert.IsTrue(EquateGraphs.Equate(undirectedBidirectionalGraph, deserializedGraph4));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationBidirectionalGraphComplexTestCases))]
+        public void XmlSerialization_BidirectionalGraph_Complex([NotNull] BidirectionalGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph =
+                SerializeDeserialize_Complex<BidirectionalGraph<EquatableTestVertex, EquatableTestEdge>, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+
+            var arrayGraph = new ArrayBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph2 =
+                SerializeDeserialize_Complex<ArrayBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(arrayGraph, deserializedGraph2));
+
+            var reversedGraph = new ReversedBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            BidirectionalGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph3 =
+                SerializeDeserialize_Reversed_Complex<ReversedBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>, BidirectionalGraph<EquatableTestVertex, EquatableTestEdge>>(reversedGraph);
+            Assert.IsTrue(
+                EquateGraphs.Equate(
+                    graph,
+                    deserializedGraph3,
+                    EqualityComparer<EquatableTestVertex>.Default,
+                    LambdaEqualityComparer<EquatableTestEdge>.Create(
+                        (edge1, edge2) => Equals(edge1.Source, edge2.Target) && Equals(edge1.Target, edge2.Source) && edge1.DataContentEquals(edge2),
+                        edge => edge.GetHashCode())));
+
+            var undirectedBidirectionalGraph = new UndirectedBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            UndirectedGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph4 =
+                SerializeDeserialize_Complex<UndirectedBidirectionalGraph<EquatableTestVertex, EquatableTestEdge>, UndirectedGraph<EquatableTestVertex, EquatableTestEdge>>(undirectedBidirectionalGraph);
             Assert.IsTrue(EquateGraphs.Equate(undirectedBidirectionalGraph, deserializedGraph4));
         }
 
@@ -1053,28 +1535,56 @@ public void XmlSerialization_BidirectionalGraph([NotNull] BidirectionalGraph<int
         public void XmlSerialization_BidirectionalMatrixGraph([NotNull] BidirectionalMatrixGraph<EquatableEdge<int>> graph)
         {
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
-                SerializeDeserialize<BidirectionalMatrixGraph<EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
-            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+                SerializeDeserialize_Simple<BidirectionalMatrixGraph<EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(
+                EquateGraphs.Equate(
+                    graph,
+                    deserializedGraph,
+                    EqualityComparer<int>.Default,
+                    LambdaEqualityComparer<EquatableEdge<int>>.Create(
+                        (edge1, edge2) => EqualityComparer<EquatableEdge<int>>.Default.Equals(edge1, edge2) && edge1.GetType() == edge2.GetType(),
+                        edge => edge.GetHashCode())));
         }
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationUndirectedGraphTestCases))]
-        public void XmlSerialization_UndirectedGraph([NotNull] UndirectedGraph<int, EquatableEdge<int>> graph)
+        public void XmlSerialization_UndirectedGraph_Simple([NotNull] UndirectedGraph<int, EquatableEdge<int>> graph)
         {
             UndirectedGraph<int, EquatableEdge<int>> deserializedGraph1 =
-                SerializeDeserialize<UndirectedGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(graph);
+                SerializeDeserialize_Simple<UndirectedGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph1));
 
             var arrayGraph = new ArrayUndirectedGraph<int, EquatableEdge<int>>(graph);
             UndirectedGraph<int, EquatableEdge<int>> deserializedGraph2 =
-                SerializeDeserialize<ArrayUndirectedGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(arrayGraph);
+                SerializeDeserialize_Simple<ArrayUndirectedGraph<int, EquatableEdge<int>>, UndirectedGraph<int, EquatableEdge<int>>>(arrayGraph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph2));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationUndirectedGraphComplexTestCases))]
+        public void XmlSerialization_UndirectedGraph_Complex([NotNull] UndirectedGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            UndirectedGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph1 =
+                SerializeDeserialize_Complex<UndirectedGraph<EquatableTestVertex, EquatableTestEdge>, UndirectedGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph1));
+
+            var arrayGraph = new ArrayUndirectedGraph<EquatableTestVertex, EquatableTestEdge>(graph);
+            UndirectedGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph2 =
+                SerializeDeserialize_Complex<ArrayUndirectedGraph<EquatableTestVertex, EquatableTestEdge>, UndirectedGraph<EquatableTestVertex, EquatableTestEdge>>(arrayGraph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph2));
         }
 
         [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationEdgeListGraphTestCases))]
-        public void XmlSerialization_EdgeListGraph([NotNull] EdgeListGraph<int, EquatableEdge<int>> graph)
+        public void XmlSerialization_EdgeListGraph_Simple([NotNull] EdgeListGraph<int, EquatableEdge<int>> graph)
         {
             AdjacencyGraph<int, EquatableEdge<int>> deserializedGraph =
-                SerializeDeserialize<EdgeListGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+                SerializeDeserialize_Simple<EdgeListGraph<int, EquatableEdge<int>>, AdjacencyGraph<int, EquatableEdge<int>>>(graph);
+            Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
+        }
+
+        [TestCaseSource(typeof(SerializationTestCaseSources), nameof(SerializationEdgeListGraphComplexTestCases))]
+        public void XmlSerialization_EdgeListGraph_Complex([NotNull] EdgeListGraph<EquatableTestVertex, EquatableTestEdge> graph)
+        {
+            AdjacencyGraph<EquatableTestVertex, EquatableTestEdge> deserializedGraph =
+                SerializeDeserialize_Complex<EdgeListGraph<EquatableTestVertex, EquatableTestEdge>, AdjacencyGraph<EquatableTestVertex, EquatableTestEdge>>(graph);
             Assert.IsTrue(EquateGraphs.Equate(graph, deserializedGraph));
         }
 

From 14f91dc44fca11043912a929497998c29aba1758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Tue, 28 Jun 2022 00:17:25 +0200
Subject: [PATCH 36/39] Minor issues fixes in tests.

---
 tests/QuikGraph.Data.Tests/DataRelationEdgeTests.cs           | 2 +-
 tests/QuikGraph.Graphviz.Tests/Dot/GraphvizColorTests.cs      | 4 +++-
 .../Algorithms/Condensation/CondensededEdgeTests.cs           | 4 ++--
 .../Algorithms/Condensation/MergedEdgeTests.cs                | 4 ++--
 tests/QuikGraph.Tests/Algorithms/TSP/TaskPriorityTests.cs     | 4 ++--
 tests/QuikGraph.Tests/Structures/Edges/EdgeTests.cs           | 4 ++--
 tests/QuikGraph.Tests/Structures/Edges/EquatableEdgeTests.cs  | 4 ++--
 .../Structures/Edges/EquatableTaggedEdgeTests.cs              | 2 +-
 .../Structures/Edges/EquatableTermEdgeTests.cs                | 4 ++--
 .../Structures/Edges/EquatableUndirectedEdgeTests.cs          | 4 ++--
 tests/QuikGraph.Tests/Structures/Edges/SEdgeTests.cs          | 4 ++--
 tests/QuikGraph.Tests/Structures/Edges/SEquatableEdgeTests.cs | 4 ++--
 .../Structures/Edges/SEquatableTaggedEdgeTests.cs             | 2 +-
 tests/QuikGraph.Tests/Structures/Edges/SReversedEdgeTests.cs  | 4 ++--
 tests/QuikGraph.Tests/Structures/Edges/STaggedEdgeTests.cs    | 2 +-
 .../Structures/Edges/STaggedUndirectedEdgeTests.cs            | 2 +-
 .../QuikGraph.Tests/Structures/Edges/SUndirectedEdgeTests.cs  | 4 ++--
 tests/QuikGraph.Tests/Structures/Edges/TaggedEdgeTests.cs     | 2 +-
 .../Structures/Edges/TaggedUndirectedEdgeTests.cs             | 2 +-
 tests/QuikGraph.Tests/Structures/Edges/TermEdgeTests.cs       | 4 ++--
 tests/QuikGraph.Tests/Structures/Edges/UndirectedEdgeTests.cs | 4 ++--
 21 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/tests/QuikGraph.Data.Tests/DataRelationEdgeTests.cs b/tests/QuikGraph.Data.Tests/DataRelationEdgeTests.cs
index 9e3ecc1e0..5831be359 100644
--- a/tests/QuikGraph.Data.Tests/DataRelationEdgeTests.cs
+++ b/tests/QuikGraph.Data.Tests/DataRelationEdgeTests.cs
@@ -79,7 +79,7 @@ public void Equals()
             Assert.IsFalse(relation1.Equals(relation3));
             Assert.IsFalse(relation3.Equals(relation1));
 
-            Assert.AreNotEqual(relation1, null);
+            Assert.AreNotEqual(null, relation1);
             Assert.IsFalse(relation1.Equals(null));
 
             #region Local function
diff --git a/tests/QuikGraph.Graphviz.Tests/Dot/GraphvizColorTests.cs b/tests/QuikGraph.Graphviz.Tests/Dot/GraphvizColorTests.cs
index d21b7560b..9a788266d 100644
--- a/tests/QuikGraph.Graphviz.Tests/Dot/GraphvizColorTests.cs
+++ b/tests/QuikGraph.Graphviz.Tests/Dot/GraphvizColorTests.cs
@@ -85,7 +85,9 @@ public void Equals()
             Assert.IsTrue(color1 != color6);
             Assert.AreNotEqual(color1, color6);
 
-            Assert.AreNotEqual(color1, null);
+            Assert.AreNotEqual(null, color1);
+            Assert.IsFalse(color1.Equals(null));
+            Assert.AreNotEqual(new TestClass(), color1);
             Assert.AreNotEqual(color1, new TestClass());
         }
 
diff --git a/tests/QuikGraph.Tests/Algorithms/Condensation/CondensededEdgeTests.cs b/tests/QuikGraph.Tests/Algorithms/Condensation/CondensededEdgeTests.cs
index d824b8e3b..79a8b458c 100644
--- a/tests/QuikGraph.Tests/Algorithms/Condensation/CondensededEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Algorithms/Condensation/CondensededEdgeTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 using QuikGraph.Algorithms.Condensation;
 using QuikGraph.Tests.Structures;
@@ -99,7 +99,7 @@ public void Equals()
             Assert.AreNotEqual(edge1, edge3);
             Assert.AreNotEqual(edge1, edge4);
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
         }
     }
 }
\ No newline at end of file
diff --git a/tests/QuikGraph.Tests/Algorithms/Condensation/MergedEdgeTests.cs b/tests/QuikGraph.Tests/Algorithms/Condensation/MergedEdgeTests.cs
index 8608e0a7e..096a27a5b 100644
--- a/tests/QuikGraph.Tests/Algorithms/Condensation/MergedEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Algorithms/Condensation/MergedEdgeTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 using QuikGraph.Algorithms.Condensation;
 using QuikGraph.Tests.Structures;
@@ -119,7 +119,7 @@ public void Equals()
             Assert.AreNotEqual(edge1, edge3);
             Assert.AreNotEqual(edge1, edge4);
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
         }
 
         [Test]
diff --git a/tests/QuikGraph.Tests/Algorithms/TSP/TaskPriorityTests.cs b/tests/QuikGraph.Tests/Algorithms/TSP/TaskPriorityTests.cs
index aac47b712..fd575bdd4 100644
--- a/tests/QuikGraph.Tests/Algorithms/TSP/TaskPriorityTests.cs
+++ b/tests/QuikGraph.Tests/Algorithms/TSP/TaskPriorityTests.cs
@@ -1,4 +1,4 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using QuikGraph.Algorithms.TSP;
 
 namespace QuikGraph.Tests.Algorithms.TSP
@@ -50,7 +50,7 @@ public void Equals()
             Assert.IsTrue(priority1 != priority5);
             Assert.IsTrue(priority5 != priority1);
 
-            Assert.AreNotEqual(priority1, null);
+            Assert.AreNotEqual(null, priority1);
             Assert.IsFalse(priority1.Equals(null));
             Assert.IsFalse(priority1 == null);
             Assert.IsFalse(null == priority1);
diff --git a/tests/QuikGraph.Tests/Structures/Edges/EdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/EdgeTests.cs
index 8c63f7ca7..f0ae29fc2 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/EdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/EdgeTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 
 namespace QuikGraph.Tests.Structures
@@ -56,7 +56,7 @@ public void Equals()
             Assert.IsFalse(edge1.Equals(edge2));
             Assert.IsFalse(edge2.Equals(edge1));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
diff --git a/tests/QuikGraph.Tests/Structures/Edges/EquatableEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/EquatableEdgeTests.cs
index c89dfcded..e417bbb82 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/EquatableEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/EquatableEdgeTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 
 namespace QuikGraph.Tests.Structures
@@ -58,7 +58,7 @@ public void Equals()
             Assert.IsFalse(edge1.Equals(edge3));
             Assert.IsFalse(edge3.Equals(edge1));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
diff --git a/tests/QuikGraph.Tests/Structures/Edges/EquatableTaggedEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/EquatableTaggedEdgeTests.cs
index 0bf77f39c..8fd15a60d 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/EquatableTaggedEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/EquatableTaggedEdgeTests.cs
@@ -73,7 +73,7 @@ public void Equals()
             Assert.IsFalse(edge4.Equals(edge6));
             Assert.IsFalse(edge6.Equals(edge4));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
diff --git a/tests/QuikGraph.Tests/Structures/Edges/EquatableTermEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/EquatableTermEdgeTests.cs
index 31d4d7033..732154d8c 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/EquatableTermEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/EquatableTermEdgeTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 
 namespace QuikGraph.Tests.Structures
@@ -99,7 +99,7 @@ public void Equals()
             Assert.IsTrue(edge5.Equals(edge6));
             Assert.IsTrue(edge6.Equals(edge5));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
diff --git a/tests/QuikGraph.Tests/Structures/Edges/EquatableUndirectedEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/EquatableUndirectedEdgeTests.cs
index 80310df8b..53a01dc56 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/EquatableUndirectedEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/EquatableUndirectedEdgeTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 
 namespace QuikGraph.Tests.Structures
@@ -60,7 +60,7 @@ public void Equals()
             Assert.IsTrue(edge1.Equals(edge2));
             Assert.IsTrue(edge2.Equals(edge1));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
diff --git a/tests/QuikGraph.Tests/Structures/Edges/SEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/SEdgeTests.cs
index 92bd2d5a3..82d54f6de 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/SEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/SEdgeTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 
 namespace QuikGraph.Tests.Structures
@@ -77,7 +77,7 @@ public void Equals()
             Assert.IsFalse(edge3.Equals(edge5));
             Assert.IsFalse(edge5.Equals(edge3));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
diff --git a/tests/QuikGraph.Tests/Structures/Edges/SEquatableEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/SEquatableEdgeTests.cs
index 5e891165b..7ed62d2ca 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/SEquatableEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/SEquatableEdgeTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 
 namespace QuikGraph.Tests.Structures
@@ -58,7 +58,7 @@ public void Equals()
             Assert.IsFalse(edge1.Equals(edge3));
             Assert.IsFalse(edge3.Equals(edge1));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
diff --git a/tests/QuikGraph.Tests/Structures/Edges/SEquatableTaggedEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/SEquatableTaggedEdgeTests.cs
index a90611e4f..21b892ea2 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/SEquatableTaggedEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/SEquatableTaggedEdgeTests.cs
@@ -109,7 +109,7 @@ public void Equals()
             Assert.IsTrue(edge6.Equals(edge8));  // Tag is not taken into account for equality
             Assert.IsTrue(edge8.Equals(edge6));  // Tag is not taken into account for equality
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
diff --git a/tests/QuikGraph.Tests/Structures/Edges/SReversedEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/SReversedEdgeTests.cs
index ec17d8454..6e05b8df6 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/SReversedEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/SReversedEdgeTests.cs
@@ -82,7 +82,7 @@ public void Equals()
             Assert.IsFalse(edge1.Equals(edge4));
             Assert.IsFalse(edge4.Equals(edge1));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
@@ -110,8 +110,8 @@ public void Equals2()
             Assert.IsTrue(edge1.Equals((object)edge2));
             Assert.AreNotEqual(edge1, edge3);
 
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
-            Assert.AreNotEqual(edge1, null);
         }
 
         [Test]
diff --git a/tests/QuikGraph.Tests/Structures/Edges/STaggedEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/STaggedEdgeTests.cs
index 34ddf24a7..91d52547f 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/STaggedEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/STaggedEdgeTests.cs
@@ -102,7 +102,7 @@ public void Equals()
             Assert.IsFalse(edge6.Equals(edge8));
             Assert.IsFalse(edge8.Equals(edge6));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
diff --git a/tests/QuikGraph.Tests/Structures/Edges/STaggedUndirectedEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/STaggedUndirectedEdgeTests.cs
index b6f40ea23..80e85a1fb 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/STaggedUndirectedEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/STaggedUndirectedEdgeTests.cs
@@ -105,7 +105,7 @@ public void Equals()
             Assert.IsFalse(edge6.Equals(edge8));
             Assert.IsFalse(edge8.Equals(edge6));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
diff --git a/tests/QuikGraph.Tests/Structures/Edges/SUndirectedEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/SUndirectedEdgeTests.cs
index fd230e15d..85484af86 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/SUndirectedEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/SUndirectedEdgeTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 
 namespace QuikGraph.Tests.Structures
@@ -77,7 +77,7 @@ public void Equals()
             Assert.IsFalse(edge3.Equals(edge5));
             Assert.IsFalse(edge5.Equals(edge3));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
diff --git a/tests/QuikGraph.Tests/Structures/Edges/TaggedEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/TaggedEdgeTests.cs
index 2ee46a0da..905bce409 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/TaggedEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/TaggedEdgeTests.cs
@@ -68,7 +68,7 @@ public void Equals()
             Assert.IsFalse(edge1.Equals(edge4));
             Assert.IsFalse(edge4.Equals(edge1));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
diff --git a/tests/QuikGraph.Tests/Structures/Edges/TaggedUndirectedEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/TaggedUndirectedEdgeTests.cs
index b446f3331..5ababf8d7 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/TaggedUndirectedEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/TaggedUndirectedEdgeTests.cs
@@ -77,7 +77,7 @@ public void Equals()
             Assert.IsFalse(edge1.Equals(edge4));
             Assert.IsFalse(edge4.Equals(edge1));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
diff --git a/tests/QuikGraph.Tests/Structures/Edges/TermEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/TermEdgeTests.cs
index 157dc81a4..c251536a9 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/TermEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/TermEdgeTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 
 namespace QuikGraph.Tests.Structures
@@ -94,7 +94,7 @@ public void Equals()
             Assert.IsFalse(edge5.Equals(edge6));
             Assert.IsFalse(edge6.Equals(edge5));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 
diff --git a/tests/QuikGraph.Tests/Structures/Edges/UndirectedEdgeTests.cs b/tests/QuikGraph.Tests/Structures/Edges/UndirectedEdgeTests.cs
index be6175792..cef15d3b1 100644
--- a/tests/QuikGraph.Tests/Structures/Edges/UndirectedEdgeTests.cs
+++ b/tests/QuikGraph.Tests/Structures/Edges/UndirectedEdgeTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 
 namespace QuikGraph.Tests.Structures
@@ -59,7 +59,7 @@ public void Equals()
             Assert.IsFalse(edge1.Equals(edge2));
             Assert.IsFalse(edge2.Equals(edge1));
 
-            Assert.AreNotEqual(edge1, null);
+            Assert.AreNotEqual(null, edge1);
             Assert.IsFalse(edge1.Equals(null));
         }
 

From 10b4ceaac5604799a433aff36ad2a85ac6379499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Sun, 3 Jul 2022 21:01:07 +0200
Subject: [PATCH 37/39] Comment fix.

---
 src/QuikGraph.Graphviz/Extensions/GraphvizExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/QuikGraph.Graphviz/Extensions/GraphvizExtensions.cs b/src/QuikGraph.Graphviz/Extensions/GraphvizExtensions.cs
index 8380ab8de..d0d08a75e 100644
--- a/src/QuikGraph.Graphviz/Extensions/GraphvizExtensions.cs
+++ b/src/QuikGraph.Graphviz/Extensions/GraphvizExtensions.cs
@@ -104,7 +104,7 @@ public static string ToSvg<TVertex, TEdge>(
         }
 
         /// <summary>
-        /// Performs a layout from DOT to  an SVG (Scalable Vector Graphics) file
+        /// Performs a layout from DOT to a SVG (Scalable Vector Graphics) file
         /// by calling Agl through the https://rise4fun.com/ REST services.
         /// </summary>
         /// <param name="dot">The dot graph</param>

From 19a63f057db49a2b179df22f0e61d347cd8da822 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Tue, 12 Oct 2021 00:37:16 +0200
Subject: [PATCH 38/39] Add .NET 4.6.1 target that will be the minimal version
 for binary serialization.

---
 .../QuikGraph.Serialization.csproj                     | 10 +++++++---
 src/QuikGraph.Serialization/SerializationExtensions.cs | 10 ++++++++++
 .../BinarySerializationTests.cs                        |  2 ++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj b/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj
index 663bd2f8d..d4b0812f7 100644
--- a/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj
+++ b/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net35;net40;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net35;net40;net461;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
 
     <GeneratePackageOnBuild>$(Generate_QuikGraph_Serialization)</GeneratePackageOnBuild>
 
@@ -42,12 +42,16 @@ Updates:
   <!-- Targets defines -->
   <PropertyGroup Condition="'$(TargetFramework)'=='net35'">
     <AssemblyTitle>QuikGraph.Serialization .NET 3.5</AssemblyTitle>
-    <DefineConstants>$(DefineConstants);NET35;SUPPORTS_SERIALIZATION;SUPPORTS_GRAPHS_SERIALIZATION;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET35;SUPPORTS_SERIALIZATION;SUPPORTS_GRAPHS_SERIALIZATION;DEPRECATE_BINARY_SERIALIZATION;$(AdditionalConstants)</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='net40'">
     <AssemblyTitle>QuikGraph.Serialization .NET 4.0</AssemblyTitle>
-    <DefineConstants>$(DefineConstants);NET40;SUPPORTS_SERIALIZATION;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_XML_DTD_PROCESSING;$(AdditionalConstants)</DefineConstants>
+    <DefineConstants>$(DefineConstants);NET40;SUPPORTS_SERIALIZATION;SUPPORTS_GRAPHS_SERIALIZATION;DEPRECATE_BINARY_SERIALIZATION;SUPPORTS_XML_DTD_PROCESSING;$(AdditionalConstants)</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)'=='net461'">
+    <AssemblyTitle>QuikGraph.Serialization .NET 4.6.1</AssemblyTitle>
+    <DefineConstants>$(DefineConstants);NET461;SUPPORTS_SERIALIZATION;SUPPORTS_GRAPHS_SERIALIZATION;SUPPORTS_XML_DTD_PROCESSING;$(AdditionalConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
     <AssemblyTitle>QuikGraph.Serialization .NET Standard 1.3</AssemblyTitle>
diff --git a/src/QuikGraph.Serialization/SerializationExtensions.cs b/src/QuikGraph.Serialization/SerializationExtensions.cs
index 71c1cf496..6f3dff698 100644
--- a/src/QuikGraph.Serialization/SerializationExtensions.cs
+++ b/src/QuikGraph.Serialization/SerializationExtensions.cs
@@ -26,6 +26,11 @@ public static class SerializationExtensions
         /// <exception cref="T:System.ArgumentNullException"><paramref name="graph"/> is <see langword="null"/>.</exception>
         /// <exception cref="T:System.ArgumentNullException"><paramref name="stream"/> is <see langword="null"/>.</exception>
         /// <exception cref="T:System.ArgumentException"><paramref name="stream"/> is not writable.</exception>
+#if DEPRECATE_BINARY_SERIALIZATION
+        [Obsolete(
+            "Binary serialization on old .NET targets is deprecated.\n" +
+            "Consider using another kind of serialization or updating to at least .NET Framework 4.6.1+, .NET Standard 2.0+ or .NET 5.0+.")]
+#endif
         public static void SerializeToBinary<TVertex, TEdge>(
             [NotNull] this IGraph<TVertex, TEdge> graph,
             [NotNull] Stream stream)
@@ -61,6 +66,11 @@ public static void SerializeToBinary<TVertex, TEdge>(
         /// <exception cref="T:System.ArgumentNullException"><paramref name="stream"/> is <see langword="null"/>.</exception>
         /// <exception cref="T:System.ArgumentException"><paramref name="stream"/> is not readable.</exception>
         [Pure]
+#if DEPRECATE_BINARY_SERIALIZATION
+        [Obsolete(
+            "Binary deserialization on old .NET targets is deprecated.\n" +
+            "Consider using another kind of serialization or updating to at least .NET Framework 4.6.1+, .NET Standard 2.0+ or .NET 5.0+.")]
+#endif
         public static TGraph DeserializeFromBinary<TVertex, TEdge, TGraph>(
             [NotNull] this Stream stream,
             [CanBeNull] SerializationBinder binder = null)
diff --git a/tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs b/tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs
index e7c49a3ad..d659145e5 100644
--- a/tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs
+++ b/tests/QuikGraph.Serialization.Tests/BinarySerializationTests.cs
@@ -4,6 +4,8 @@
 using NUnit.Framework;
 using static QuikGraph.Serialization.Tests.SerializationTestCaseSources;
 
+#pragma warning disable 618 // Obsolete API usage
+
 namespace QuikGraph.Serialization.Tests
 {
     /// <summary>

From 352b29367f8f3440b1514b664abb8bf6327b91cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Rab=C3=A9rin?= <kernelith@live.fr>
Date: Mon, 4 Jul 2022 00:10:50 +0200
Subject: [PATCH 39/39] Write release notes for QuikGraph modules.

---
 RELEASE_NOTES.md                              | 124 ++++++++++++++++++
 src/QuikGraph.Data/QuikGraph.Data.csproj      |   7 +-
 .../QuikGraph.Graphviz.csproj                 |  12 +-
 src/QuikGraph.MSAGL/QuikGraph.MSAGL.csproj    |  10 +-
 src/QuikGraph.Petri/QuikGraph.Petri.csproj    |   7 +-
 .../QuikGraph.Serialization.csproj            |  17 ++-
 src/QuikGraph/QuikGraph.csproj                |  18 +--
 7 files changed, 165 insertions(+), 30 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 66f1f0e39..a5269f5a6 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,127 @@
 # Release notes
 
+## What's new in 2.5.0 July 4 2022
+
+### QuikGraph
+
+#### Updates:
+* Input type for transitive closure/reduction algorithms is more open (IEdgeListGraph rather than BidirectionalGraph).
+* CryptoRandom no more use deprecate random number generator.
+* Extends algorithms using CrytoRandom by default (CyclePoppingRandomTreeAlgorithm, MarkovEdgeChainBase, MinimumVertexCoverApproximationAlgorithm).
+
+#### New:
+* Add cycle checking for edge set and undirected graphs (DAG - Directed Acyclic Graph check).
+
+#### Misc:
+* Assembly is CLS compliant (Common Language Specification).
+
+### QuikGraph.Serialization
+
+#### Fixes:
+* Fix fields being written several times during GraphML serialization for types with multiple inheritance layers.
+* Fix user data that may be skipped during GraphML deserialization.
+* Better handle null strings being serialized through GraphML serialization.
+
+#### Updates:
+* Deprecate binary serialization for targets lower than .NET Framework 4.6.1.
+* Update package dependencies.
+
+#### Optims:
+* Optimize generated method calls for GraphML serialization.
+
+#### Misc:
+* Add target .NET Framework 4.6.1.
+* Assembly is CLS compliant (Common Language Specification).
+
+### QuikGraph.Graphviz
+
+#### Updates:
+* Deprecate ToSvg API (underlying web service is down).
+* Update package dependencies.
+
+#### Misc:
+* Assembly is CLS compliant (Common Language Specification).
+
+### QuikGraph.Data
+
+#### Updates:
+* Update package dependencies.
+
+#### Misc:
+* Assembly is CLS compliant (Common Language Specification).
+
+### QuikGraph.MSAGL
+
+#### Updates:
+* Update package dependencies.
+
+#### Misc:
+* Assembly is CLS compliant (Common Language Specification).
+
+### QuikGraph.Petri
+
+#### Updates:
+* Update package dependencies.
+
+#### Misc:
+* Assembly is CLS compliant (Common Language Specification).
+
+---
+
+## What's new in 2.4.0 July 3 2022
+
+### QuikGraph
+
+#### Updates:
+* Vertices and edges removal notifications from AdjacencyGraph, EdgeListGraph, BidirectionalGraph and UndirectedGraph are more consistent.
+
+#### Optims:
+* Optimize vertices and/or edges removal operations on AdjacencyGraph, BidirectionalGraph, BidirectionalMatrixGraph, ClusteredAdjacencyGraph and UndirectedGraph.
+
+#### New:
+* Expose a Prim relaxer.
+
+#### Misc:
+* Improve library documentation related to raisable exceptions.
+* Remove the dependency to System.Reflection.TypeExtensions for .NET Standard 1.3 target.
+
+### QuikGraph.Serialization
+
+#### Updates:
+* GraphML deserialization extensions now work on IMutableVertexAndEdgeSet rather than IMutableVertexAndEdgeListGraph (allow deserialization on undirected graph).
+* Update package dependencies.
+
+#### Misc:
+* Add target to reduce dependencies in some cases.
+
+### QuikGraph.Graphviz
+
+#### Fixes:
+* Fix the conversion to Graphviz from delegate graph implementations.
+
+#### Optims:
+* Slight optimizations.
+
+#### Updates:
+* Update package dependencies.
+
+### QuikGraph.Data
+
+#### Updates:
+* Update package dependencies.
+
+### QuikGraph.MSAGL
+
+#### Updates:
+* Update package dependencies.
+
+### QuikGraph.Petri
+
+#### Updates:
+* Update package dependencies.
+
+---
+
 ## What's new in 2.3.1 August 30 2021
 
 ### QuikGraph.Graphviz
@@ -13,6 +135,8 @@
 #### New:
 * Add support of HTML labels.
 
+---
+
 ## What's new in 2.3.0 February 4 2021
 
 ### QuikGraph
diff --git a/src/QuikGraph.Data/QuikGraph.Data.csproj b/src/QuikGraph.Data/QuikGraph.Data.csproj
index a358f4d50..8fe765507 100644
--- a/src/QuikGraph.Data/QuikGraph.Data.csproj
+++ b/src/QuikGraph.Data/QuikGraph.Data.csproj
@@ -28,9 +28,12 @@ Supports Source Link</Description>
 
     <IsPackable>true</IsPackable>
     <PackageId>QuikGraph.Data</PackageId>
-    <PackageReleaseNotes>➟ Release 2.3.0
+    <PackageReleaseNotes>➟ Release 2.5.0
 Updates:
-- Update package dependencies.</PackageReleaseNotes>
+- Update package dependencies.
+
+Misc:
+- Assembly is CLS compliant (Common Language Specification).</PackageReleaseNotes>
     <PackageTags>QuickGraph QuikGraph Graph Structure Algorithm C# .NET Serialization Data</PackageTags>
   </PropertyGroup>
 
diff --git a/src/QuikGraph.Graphviz/QuikGraph.Graphviz.csproj b/src/QuikGraph.Graphviz/QuikGraph.Graphviz.csproj
index 9376eeb63..1fc988bd1 100644
--- a/src/QuikGraph.Graphviz/QuikGraph.Graphviz.csproj
+++ b/src/QuikGraph.Graphviz/QuikGraph.Graphviz.csproj
@@ -28,15 +28,13 @@ Supports Source Link</Description>
 
     <IsPackable>true</IsPackable>
     <PackageId>QuikGraph.Graphviz</PackageId>
-    <PackageReleaseNotes>➟ Release 2.3.1
-Fixes:
-- Properly treat common vertex format when converting a graph to Graphviz.
-
+    <PackageReleaseNotes>➟ Release 2.5.0
 Updates:
-- Label has priority if set over Record on GraphvizVertex.
+- Deprecate ToSvg API (underlying web service is down).
+- Update package dependencies.
 
-New:
-- Add support of HTML labels.</PackageReleaseNotes>
+Misc:
+- Assembly is CLS compliant (Common Language Specification).</PackageReleaseNotes>
     <PackageTags>QuickGraph QuikGraph Graph Structure Algorithm C# .NET Serialization Graphviz</PackageTags>
   </PropertyGroup>
 
diff --git a/src/QuikGraph.MSAGL/QuikGraph.MSAGL.csproj b/src/QuikGraph.MSAGL/QuikGraph.MSAGL.csproj
index 116f1e420..85da331d6 100644
--- a/src/QuikGraph.MSAGL/QuikGraph.MSAGL.csproj
+++ b/src/QuikGraph.MSAGL/QuikGraph.MSAGL.csproj
@@ -28,12 +28,12 @@ Supports Source Link</Description>
 
     <IsPackable>true</IsPackable>
     <PackageId>QuikGraph.MSAGL</PackageId>
-    <PackageReleaseNotes>➟ Release 2.3.0
-Fixes:
-- Update reference to AutomaticGraphLayout packages in order to fix assembly strong naming issues.
-
+    <PackageReleaseNotes>➟ Release 2.5.0
 Updates:
-- Update package dependencies.</PackageReleaseNotes>
+- Update package dependencies.
+
+Misc:
+- Assembly is CLS compliant (Common Language Specification).</PackageReleaseNotes>
     <PackageTags>QuickGraph QuikGraph Graph Structure Algorithm C# .NET MSAGL</PackageTags>
   </PropertyGroup>
 
diff --git a/src/QuikGraph.Petri/QuikGraph.Petri.csproj b/src/QuikGraph.Petri/QuikGraph.Petri.csproj
index b8426e8bd..44185bb93 100644
--- a/src/QuikGraph.Petri/QuikGraph.Petri.csproj
+++ b/src/QuikGraph.Petri/QuikGraph.Petri.csproj
@@ -28,9 +28,12 @@ Supports Source Link</Description>
 
     <IsPackable>true</IsPackable>
     <PackageId>QuikGraph.Petri</PackageId>
-    <PackageReleaseNotes>➟ Release 2.3.0
+    <PackageReleaseNotes>➟ Release 2.5.0
 Updates:
-- Update package dependencies.</PackageReleaseNotes>
+- Update package dependencies.
+
+Misc:
+- Assembly is CLS compliant (Common Language Specification).</PackageReleaseNotes>
     <PackageTags>QuickGraph QuikGraph Graph Structure Algorithm C# .NET Petri</PackageTags>
   </PropertyGroup>
 
diff --git a/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj b/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj
index d4b0812f7..fd7aa7d1f 100644
--- a/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj
+++ b/src/QuikGraph.Serialization/QuikGraph.Serialization.csproj
@@ -28,9 +28,22 @@ Supports Source Link</Description>
 
     <IsPackable>true</IsPackable>
     <PackageId>QuikGraph.Serialization</PackageId>
-    <PackageReleaseNotes>➟ Release 2.3.0
+    <PackageReleaseNotes>➟ Release 2.5.0
+Fixes:
+- Fix fields being written several times during GraphML serialization for types with multiple inheritance layers.
+- Fix user data that may be skipped during GraphML deserialization.
+- Better handle null strings being serialized through GraphML serialization.
+
 Updates:
-- Update package dependencies.</PackageReleaseNotes>
+- Deprecate binary serialization for targets lower than .NET Framework 4.6.1.
+- Update package dependencies.
+
+Optims:
+- Optimize generated method calls for GraphML serialization.
+
+Misc:
+- Add target .NET Framework 4.6.1.
+- Assembly is CLS compliant (Common Language Specification).</PackageReleaseNotes>
     <PackageTags>QuickGraph QuikGraph Graph Structure Algorithm C# .NET Serialization</PackageTags>
   </PropertyGroup>
 
diff --git a/src/QuikGraph/QuikGraph.csproj b/src/QuikGraph/QuikGraph.csproj
index ba0952f08..f72df7124 100644
--- a/src/QuikGraph/QuikGraph.csproj
+++ b/src/QuikGraph/QuikGraph.csproj
@@ -34,23 +34,17 @@ Supports Source Link</Description>
 
     <IsPackable>true</IsPackable>
     <PackageId>QuikGraph</PackageId>
-    <PackageReleaseNotes>➟ Release 2.3.0
-Fixes:
-- Fix the serialization implementation of UndirectedGraph, ArrayUndirectedGraph and UndirectedBidirectionalGraph.
-- Fix A* implementation to also compute cost on tree edge.
-
+    <PackageReleaseNotes>➟ Release 2.5.0
 Updates:
-- Remove some serializable attributes from algorithms and predicates classes (homognization).
-- Remove serializable attributes from delegate graphs implementations.
-- All QuikGraph exceptions can be constructed with a custom message and an eventual inner exception.
-- CompressedSparseRowGraph also implements IEdgeListGraph interface.
-- EquateGraphs.Equate helpers now supports a wider range of graph comparisons.
+- Input type for transitive closure/reduction algorithms is more open (IEdgeListGraph rather than BidirectionalGraph).
+- CryptoRandom no more use deprecate random number generator.
+- Extends algorithms using CrytoRandom by default (CyclePoppingRandomTreeAlgorithm, MarkovEdgeChainBase, MinimumVertexCoverApproximationAlgorithm).
 
 New:
-- Add the IDistancesCollection to interface the distance information retrieval from shortest path algorithms. Legacy accesses to distances are marked as obsolete.
+- Add cycle checking for edge set and undirected graphs (DAG - Directed Acyclic Graph check).
 
 Misc:
-- Remove the dependency to System.Collections.NonGeneric for .NET Standard 1.3 target.</PackageReleaseNotes>
+- Assembly is CLS compliant (Common Language Specification).</PackageReleaseNotes>
     <PackageTags>QuickGraph QuikGraph Graph Structure Algorithm C# .NET</PackageTags>
   </PropertyGroup>