refactored graph class to module

Author: crizstian

11-chapter-Graphs/graph.module.js

@@ -1,4 +1,6 @@
 (function (exports) {
+  const {graphSearch} = require('./graph.search')
+
   const graphFactory = () => {
     let graph = {}
     let graphProto = {}
@@ -59,19 +61,15 @@
 
     graphProto.showVertex = (node) => console.log(graphProto.getVertex(node))
 
-    graphProto.showVertexs = () => {
-      const vertexs = Object.keys(graph)
-      console.log('Vertexs of the graph')
-      vertexs.forEach(node => console.log(node))
-    }
+    graphProto.showVertexs = () => console.log(Object.keys(graph))
 
     graphProto.getGraph = () => graph
 
     graphProto.getVertex = (node) => (graphProto.contains(node)) ? graph[node] : false
 
     graphProto.getNumVertices = () => vertices
 
-    return graphProto
+    return Object.assign(graphProto, {search: graphSearch.bind(graphProto)})
   }
 
   Object.assign(exports, {graph: graphFactory})

11-chapter-Graphs/graph.search.js

@@ -1,37 +1,67 @@
 (function (exports) {
   const {stack} = require('../04-chapter-Stack/')
+  const {queue} = require('../05-chapter-Queue/')
   let graph
-  let listOfVertices
   let keys
-  let graphStack
+  let graphProto
+
+  const displayVertex = (node) => console.log(node)
 
   const getUnvistedVertex = (vertex) => {
-    for (let i = 0; i < listOfVertices.length; i++) {
-      if (listOfVertices[i] === false) {
-        return
+    for (let node in graph[vertex].edges) {
+      if (graph[node].visited === false) {
+        return node
       }
     }
+    return false
   }
 
   const dfs = () => {
-    graph.showVertex(keys[0])
-    listOfVertices[0] = true
+    let graphStack = stack()
+    graphProto.getVertex(keys[0]).visited = true
+    displayVertex(keys[0])
     graphStack.push(keys[0])
 
     while (!graphStack.isEmpty()) {
       let unvistedVertex = getUnvistedVertex(graphStack.peek())
+
+      if (unvistedVertex === false) {
+        graphStack.pop()
+      } else {
+        graph[unvistedVertex].visited = true
+        displayVertex(unvistedVertex)
+        graphStack.push(unvistedVertex)
+      }
     }
   }
 
-  const searchFactory = (g) => {
-    graph = Object.create(g)
-    listOfVertices = new Array(graph.getNumVertices())
-    keys = Object.keys(graph)
-    graphStack = stack()
-    return {
-      dfs
+  const bfs = () => {
+    let unvistedVertex
+    let graphQueue = queue()
+    graphProto.getVertex(keys[0]).visited = true
+    displayVertex(keys[0])
+    graphQueue.enqueue(keys[0])
+
+    while (!graphQueue.isEmpty()) {
+      let tempVertex = graphQueue.dequeue()
+      unvistedVertex = getUnvistedVertex(tempVertex)
+
+      while (unvistedVertex !== false) {
+        graphProto.getVertex(unvistedVertex).visited = true
+        displayVertex(unvistedVertex)
+        graphQueue.enqueue(unvistedVertex)
+        unvistedVertex = getUnvistedVertex(tempVertex)
+      }
     }
   }
 
-  Object.assign(exports, {search: searchFactory})
+  function searchFactory (g) {
+    graphProto = this
+    graph = g
+    keys = Object.keys(graph)
+
+    return Object.assign({}, {dfs, bfs})
+  }
+
+  Object.assign(exports, {graphSearch: searchFactory})
 }((typeof module.exports !== undefined) ? module.exports : window))

11-chapter-Graphs/test.js

@@ -2,39 +2,62 @@ const {graph} = require('./graph.module')
 
 test('Graph Data Structure', assert => {
   const devBook = Object.create(graph())
+  const devBook2 = Object.create(graph())
 
-  devBook.addVertex('James Gosling')
-  devBook.addVertex('Guido Rossum')
-  devBook.addVertex('Linus Torvalds')
-  devBook.addVertex('Cristian Ramirez')
+  devBook.addVertex('S')
+  devBook.addVertex('A')
+  devBook.addVertex('B')
+  devBook.addVertex('C')
+  devBook.addVertex('D')
+  devBook.addVertex('E')
 
-  assert.equal(!!devBook.getVertex('Linus Torvalds'), true, 'adds vertex')
+  assert.equal(!!devBook.getVertex('A'), true, 'adds vertex')
 
-  devBook.addEdge('James Gosling', 'Guido Rossum')
-  devBook.addEdge('James Gosling', 'Cristian Ramirez')
-  devBook.addEdge('Linus Torvalds', 'Cristian Ramirez')
+  devBook.addEdge('S', 'A')
+  devBook.addEdge('S', 'B')
+  devBook.addEdge('S', 'C')
+  devBook.addEdge('A', 'D')
+  devBook.addEdge('B', 'D')
+  devBook.addEdge('C', 'D')
+  devBook.addEdge('A', 'E')
 
-  assert.equal(devBook.getVertex('Linus Torvalds').edges['Cristian Ramirez'], true, 'adds edges')
+  const vertex = devBook.getVertex('A')
 
-  devBook.removeEdge('Linus Torvalds', 'Cristian Ramirez')
+  assert.equal(vertex, devBook.getVertex('A'), 'get vertex object')
 
-  assert.equal(!!devBook.getVertex('Linus Torvalds').edges['Cristian Ramirez'], false, 'removes an edge')
+  assert.equal(devBook.getVertex('C').edges['D'], true, 'adds edges')
 
-  devBook.removeVertex('Linus Torvalds')
+  devBook.removeEdge('A', 'E')
 
-  assert.equal(devBook.getVertex('Linus Torvalds'), false, 'removes a vertex')
+  assert.equal(!!devBook.getVertex('A').edges['E'], false, 'removes an edge')
 
-  assert.ok(devBook.hasEdge('James Gosling', 'Guido Rossum'), 'verify has edge')
+  devBook.removeVertex('E')
 
-  devBook.showGraph()
+  assert.equal(devBook.getVertex('E'), false, 'removes a vertex')
+
+  assert.ok(devBook.hasEdge('B', 'D'), 'verify has edge')
 
-  console.log(JSON.stringify(devBook.getGraph(), null, 2))
+  devBook.showGraph()
 
   devBook.showVertexs()
 
-  // devBook.showVertex('James Gosling')
+  console.log('DFS() search...')
+
+  devBook.search(devBook.getGraph()).dfs()
+
+  devBook2.addVertex('S')
+  devBook2.addVertex('A')
+  devBook2.addVertex('B')
+  devBook2.addVertex('C')
+  devBook2.addVertex('D')
+  devBook2.addEdge('S', 'A')
+  devBook2.addEdge('S', 'B')
+  devBook2.addEdge('S', 'C')
+  devBook2.addEdge('A', 'D')
+  devBook2.addEdge('B', 'D')
+  devBook2.addEdge('C', 'D')
 
-  const vertex = devBook.getVertex('Cristian Ramirez')
+  console.log('BFS() search...')
 
-  assert.equal(vertex, devBook.getVertex('Cristian Ramirez'), 'get vertex object')
+  devBook2.search(devBook2.getGraph()).bfs()
 })