Merge pull request #11 from SimonTC/support_xml_serialization_of_undirected_graphs

KeRNeLith · KeRNeLith · commit 4b3312454680 · 2020-07-16T09:14:37.000+02:00
Add support for xml serialization of undirected graphs. Fixes #10
diff --git a/src/QuikGraph.Serialization/SerializationExtensions.cs b/src/QuikGraph.Serialization/SerializationExtensions.cs
@@ -325,7 +325,7 @@ public static void SerializeToXml<TVertex, TEdge, TGraph>(
             [NotNull] string vertexElementName,
             [NotNull] string edgeElementName,
             [NotNull] string namespaceUri)
-            where TGraph : IVertexAndEdgeListGraph<TVertex, TEdge>
+            where TGraph : IEdgeListGraph<TVertex, TEdge>
             where TEdge : IEdge<TVertex>
         {
             SerializeToXml(
@@ -371,7 +371,7 @@ public static void SerializeToXml<TVertex, TEdge, TGraph>(
             [CanBeNull, InstantHandle] Action<XmlWriter, TGraph> writeGraphAttributes,
             [CanBeNull, InstantHandle] Action<XmlWriter, TVertex> writeVertexAttributes,
             [CanBeNull, InstantHandle] Action<XmlWriter, TEdge> writeEdgeAttributes)
-            where TGraph : IVertexAndEdgeListGraph<TVertex, TEdge>
+            where TGraph : IEdgeListGraph<TVertex, TEdge>
             where TEdge : IEdge<TVertex>
         {
             if (graph == null)
diff --git a/tests/QuikGraph.Serialization.Tests/XmlSerializationTests.cs b/tests/QuikGraph.Serialization.Tests/XmlSerializationTests.cs
@@ -98,14 +98,13 @@ private static IEnumerable<TestCaseData> XmlSerializationGraphTestCases
             {
                 yield return new TestCaseData(new AdjacencyGraph<Person, TaggedEdge<Person, string>>());
                 yield return new TestCaseData(new BidirectionalGraph<Person, TaggedEdge<Person, string>>());
+                yield return new TestCaseData(new UndirectedGraph<Person, TaggedEdge<Person, string>>());
             }
         }
 
         [TestCaseSource(nameof(XmlSerializationGraphTestCases))]
         public void SerializeToXml<TGraph>([NotNull] TGraph graph)
-            where TGraph 
-            : IVertexAndEdgeListGraph<Person, TaggedEdge<Person, string>>
-            , IMutableVertexAndEdgeSet<Person, TaggedEdge<Person, string>>
+            where TGraph: IMutableVertexAndEdgeSet<Person, TaggedEdge<Person, string>>
         {
             var persons = new List<Person>();
             var jacob = new Person("Jacob", "Hochstetler")

Original file line number	Diff line number	Diff line change
`@@ -98,14 +98,13 @@ private static IEnumerable<TestCaseData> XmlSerializationGraphTestCases`
`98`	`98`	`{`
`99`	`99`	`yield return new TestCaseData(new AdjacencyGraph<Person, TaggedEdge<Person, string>>());`
`100`	`100`	`yield return new TestCaseData(new BidirectionalGraph<Person, TaggedEdge<Person, string>>());`
	`101`	`+ yield return new TestCaseData(new UndirectedGraph<Person, TaggedEdge<Person, string>>());`
`101`	`102`	`}`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`[TestCaseSource(nameof(XmlSerializationGraphTestCases))]`
`105`	`106`	`public void SerializeToXml<TGraph>([NotNull] TGraph graph)`
`106`		`- where TGraph`
`107`		`- : IVertexAndEdgeListGraph<Person, TaggedEdge<Person, string>>`
`108`		`- , IMutableVertexAndEdgeSet<Person, TaggedEdge<Person, string>>`
	`107`	`+ where TGraph: IMutableVertexAndEdgeSet<Person, TaggedEdge<Person, string>>`
`109`	`108`	`{`
`110`	`109`	`var persons = new List<Person>();`
`111`	`110`	`var jacob = new Person("Jacob", "Hochstetler")`