Updated examples for directed graph

YogenRaii · YogenRaii · commit a45e80a87a3a · 2019-06-02T14:20:48.000-05:00
diff --git a/src/main/java/com/eprogrammerz/examples/algorithm/graphs/DirectedGraph.java b/src/main/java/com/eprogrammerz/examples/algorithm/graphs/DirectedGraph.java
@@ -11,14 +11,22 @@
  * Route Between Nodes: Given a directed graph, design an algorithm to find out whether there is a route between two nodes.
  */
 public class DirectedGraph {
-    private List<Node> nodes = new ArrayList<>();
+    private List<Node> nodes;
+
+    public DirectedGraph(List<Node> nodes) {
+        this.nodes = nodes;
+    }
 
     // using BFS
     public boolean isRouteBetween(Node start, Node end) {
         Queue<Node> neighbors = new LinkedList<>();
 
         if (start.id == end.id) return true;
 
+        for (Node node: nodes) {
+            node.visited = false;
+        }
+
         neighbors.add(start);
 
         while (!neighbors.isEmpty()) {
diff --git a/src/main/java/com/eprogrammerz/examples/algorithm/graphs/TestDirectedGraph.java b/src/main/java/com/eprogrammerz/examples/algorithm/graphs/TestDirectedGraph.java
@@ -12,7 +12,7 @@
  * @author Yogen Rai
  */
 public class TestDirectedGraph {
-    DirectedGraph graph;
+
 
     @Before
     public void setUp() {
@@ -24,11 +24,9 @@ public void setUp() {
          *            1    2    3
          *
          */
-        graph = new DirectedGraph();
     }
     @Test
     public void testRouteBetweenNodes() {
-
         Node a = new Node(1);
         Node b = new Node(2);
         Node c = new Node(3);
@@ -39,11 +37,14 @@ public void testRouteBetweenNodes() {
         Node f = new Node(6);
         f.connections = Arrays.asList(d,e);
 
-//        assertTrue(graph.isRouteBetween(f, a)); // OK
-//        assertFalse(graph.isRouteBetween(a, c)); // OK
-//        assertFalse(graph.isRouteBetween(a,f));
-        assertTrue(graph.isRouteBetween(e,a));
+        DirectedGraph graph = new DirectedGraph(Arrays.asList(a,b,c,d,e,f));
+
 
+        assertTrue(graph.isRouteBetween(f, a)); // OK
+        assertFalse(graph.isRouteBetween(a, c)); // OK
+        assertFalse(graph.isRouteBetween(a,f));
+        assertFalse(graph.isRouteBetween(a, e));
+        assertTrue(graph.isRouteBetween(e, a));
     }
 
     @Test
@@ -58,7 +59,8 @@ public void testFindRouteBetweenNodes() {
         Node f = new Node(6);
         f.connections = Arrays.asList(d,e);
 
-        assertThat(Arrays.asList(f, d ,a), is(graph.findRoute(f,a)));
+        DirectedGraph graph = new DirectedGraph(Arrays.asList(a,b,c,d,e,f));
 
+        assertThat(Arrays.asList(f, d ,a), is(graph.findRoute(f,a)));
     }
 }
