Merge pull request #26 from wwxiao09/Enhancement/dalpy_to_string-for-vertices-24

Enhancement/dalpy to string for vertices 24

Author: EitanJoseph

docs/graphs.html

@@ -190,18 +190,18 @@ <h2 id="raises">Raises</h2>
 </dd>
 <dt id="dalpy.graphs.GraphEdgeError"><code class="flex name class">
 <span>class <span class="ident">GraphEdgeError</span></span>
-<span>(</span><span>source_name, dest_name)</span>
+<span>(</span><span>source, dest)</span>
 </code></dt>
 <dd>
 <div class="desc"><p>This class is used by <code><a title="dalpy.graphs.Graph" href="#dalpy.graphs.Graph">Graph</a></code> to raise errors regarding invalid edges.</p>
 <p>Initializes a <code><a title="dalpy.graphs.GraphEdgeError" href="#dalpy.graphs.GraphEdgeError">GraphEdgeError</a></code> that will be raised associated with a particular <code><a title="dalpy.graphs.Vertex" href="#dalpy.graphs.Vertex">Vertex</a></code>.</p>
 <h2 id="args">Args</h2>
 <dl>
-<dt><strong><code>source_name</code></strong></dt>
-<dd>The string name of the source <code><a title="dalpy.graphs.Vertex" href="#dalpy.graphs.Vertex">Vertex</a></code> of the edge this <code><a title="dalpy.graphs.GraphVertexError" href="#dalpy.graphs.GraphVertexError">GraphVertexError</a></code> is being raised in
+<dt><strong><code>source</code></strong></dt>
+<dd>The source <code><a title="dalpy.graphs.Vertex" href="#dalpy.graphs.Vertex">Vertex</a></code> of the edge this <code><a title="dalpy.graphs.GraphVertexError" href="#dalpy.graphs.GraphVertexError">GraphVertexError</a></code> is being raised in
 association with.</dd>
-<dt><strong><code>dest_name</code></strong></dt>
-<dd>The string name of the destination <code><a title="dalpy.graphs.Vertex" href="#dalpy.graphs.Vertex">Vertex</a></code> of the edge this <code><a title="dalpy.graphs.GraphVertexError" href="#dalpy.graphs.GraphVertexError">GraphVertexError</a></code> is being raised
+<dt><strong><code>dest</code></strong></dt>
+<dd>The destination <code><a title="dalpy.graphs.Vertex" href="#dalpy.graphs.Vertex">Vertex</a></code> of the edge this <code><a title="dalpy.graphs.GraphVertexError" href="#dalpy.graphs.GraphVertexError">GraphVertexError</a></code> is being raised
 in association with.</dd>
 </dl></div>
 <h3>Ancestors</h3>

src/dalpy/graphs.py

@@ -119,23 +119,23 @@ def __init__(self, vertex_name):
         Args:
             vertex_name: The string name of the `Vertex` this `GraphVertexError` is being raised in association with.
         """
-        super().__init__(f'graph does not have vertex with name {vertex_name}')
+        super().__init__(f'graph does not have vertex with name "{vertex_name}"')
 
 
 class GraphEdgeError(Exception):
     """This class is used by `Graph` to raise errors regarding invalid edges."""
 
-    def __init__(self, source_name, dest_name):
+    def __init__(self, source, dest):
         """Initializes a `GraphEdgeError` that will be raised associated with a particular `Vertex`.
 
         Args:
-            source_name: The string name of the source `Vertex` of the edge this `GraphVertexError` is being raised in
+            source: The source `Vertex` of the edge this `GraphVertexError` is being raised in
                          association with.
-            dest_name: The string name of the destination `Vertex` of the edge this `GraphVertexError` is being raised
+            dest: The destination `Vertex` of the edge this `GraphVertexError` is being raised
                        in association with.
         """
         super().__init__(
-            f'graph does not have an edge from a vertex with name {source_name} to a vertex with name {dest_name}')
+            f'graph does not have an edge from a vertex with name "{source.get_name()}" to a vertex with name "{dest.get_name()}"')
 
 
 class Graph:

tests/graph_tests.py

@@ -131,6 +131,18 @@ def test_unweighted_edge(self):
         g.add_edge(a, b)
         self.assertIsNone(g.weight(a, b))
 
+    def test_GraphEdgeError(self):
+        g = Graph()
+        a = Vertex('a')
+        b = Vertex('b')
+        g.add_vertex(a)
+        g.add_vertex(b)
+        try:
+            g.weight(b, a)
+        except GraphEdgeError as e:
+            self.assertEqual(e.args[0], "graph does not have an edge from a vertex with name \"b\" to a vertex with name \"a\"")
+
+
 
 if __name__ == '__main__':
     unittest.main()