Add default param constructors, create bool query for bfs and tests

algorithm/breadth_first_search.h

@@ -1,8 +1,8 @@
 #ifndef BREADTH_FIRST_SEARCH_H_
 #define BREADTH_FIRST_SEARCH_H_
 
-#include "graph/digraph.h"
-
+#include <map>
+#include <set>
 #include <queue>
 
 using namespace graph;
@@ -14,49 +14,73 @@ class BreadthFirstSearch {
 public:
   BreadthFirstSearch() = default;
 
-  BreadthFirstSearch(Digraph<T> G) : G(G) {}
+  BreadthFirstSearch(std::map<T, std::set<T>> adjMatrix)
+    : adjMatrix(adjMatrix) {}
 
+  // Traverse whole graph using the BFS search, and save the tree graph
+  // which is created when visiting new vertices (Breadth First Tree)
   std::map<T, std::set<T>> execute(const T& root);
 
-  // Initialize LU table that show which vertices have been traversed 
-  std::map<T, bool> initExplore();
-private:
-  Graph<T> G;
-}; 
+  // Search if target vertex exists in graph
+  bool query(const T& root, const T& target);
 
-template<typename T>
-std::map<T, bool> BreadthFirstSearch<T>::initExplore() {
-  std::map<T, bool> graphExplore;
-  for (const auto& v : G.adjMatrix) {
-    graphExplore[v.first] = false;
-  }
-  return graphExplore;
-}
+  void setGraph(std::map<T, std::set<T>> adjMatrix);
+private:
+  // Represents the graph on which the algorithm will be executed
+  std::map<T, std::set<T>> adjMatrix;
+}; 
 
 template<typename T>
 std::map<T, std::set<T>> BreadthFirstSearch<T>::execute(const T& root) {
   std::map<T, std::set<T>> tree;
-  std::map<T, bool> graphExplore = initExplore();
+  std::map<T, bool> visited;
   std::queue<T> Q;
   Q.push(root);
-  graphExplore[root] = true;
+  visited[root] = true;
 
   while (!Q.empty()) {
     const auto v = Q.front();
     Q.pop();
 
-    for (const auto& u : G.adjMatrix[v]) {
-      if (!graphExplore[u]) {
-        graphExplore[u] = true;
+    for (const auto& u : adjMatrix[v]) {
+      if (!visited[u]) {
+        visited[u] = true;
         tree[v].insert(u);
         Q.push(u);
       }
     }
   }
-
   return tree;
 }
 
+template<typename T>
+bool BreadthFirstSearch<T>::query(const T& root, const T& target) {
+  std::map<T, bool> visited;
+  std::queue<T> Q;
+  Q.push(root);
+  visited[root] = true;
+
+  while (!Q.empty()) {
+    const auto v = Q.front();
+    Q.pop();
+
+    if (v == target) return true;
+
+    for (const auto& u : adjMatrix[v]) {
+      if (!visited[u]) {
+        visited[u] = true;
+        Q.push(u);
+      }
+    }
+  }
+  return false;
+}
+
+template<typename T>
+void BreadthFirstSearch<T>::setGraph(std::map<T, std::set<T>> adjMatrix) {
+  this->adjMatrix = adjMatrix;
+}
+
 } // namespace algo
 
 #endif