Restructuring

querying/CMakeLists.txt

@@ -3,16 +3,17 @@ project(Querying)
 set(CMAKE_CXX_STANDARD 17)
-SET(CMAKE_CXX_FLAGS "-g -Wall -pedantic -Wextra")
+set(CMAKE_CXX_FLAGS "-g -Wall -pedantic -Wextra")
 add_executable(main
         src/main.cpp
-        src/inverted_index/InvertedIndex.cpp src/inverted_index/InvertedIndex.h
-        src/inverted_index/InvertedIndexJSONParser.cpp src/inverted_index/InvertedIndexJSONParser.h
-        src/space/Space.cpp src/space/Space.h
-        src/query/Query.cpp src/query/Query.h
-        src/Computor.cpp src/Computor.h
-        src/Document.cpp src/Document.h
-        src/exceptions/Exceptions.h src/query/QueryJSONParser.cpp src/query/QueryJSONParser.h src/argument_parser/argument_parser.cpp)
+        src/calculation/InvertedIndex.cpp src/calculation/InvertedIndex.h
+        src/util/InvertedIndexJSONParser.cpp src/util/InvertedIndexJSONParser.h
+        src/calculation/Space.cpp src/calculation/Space.h
+        src/calculation/Query.cpp src/calculation/Query.h
+        src/calculation/Computor.cpp src/calculation/Computor.h
+        src/calculation/Document.cpp src/calculation/Document.h
+        src/util/QueryJSONParser.cpp src/util/QueryJSONParser.h
+        src/exceptions/Exceptions.h)
 target_link_libraries(main)

querying/src/Computor.cpp → querying/src/calculation/Computor.cpp

@@ -2,7 +2,7 @@
 #include <climits>
 #include <utility>
 #include "Computor.h"
-#include "exceptions/Exceptions.h"
+#include "../exceptions/Exceptions.h"
 using namespace std;

querying/src/Computor.h → querying/src/calculation/Computor.h

@@ -6,8 +6,8 @@
 #define QUERYING_COMPUTOR_H
 #include <map>
-#include "space/Space.h"
-#include "query/Query.h"
+#include "Space.h"
+#include "Query.h"
 /**
  * @brief A class that encompasses the calculation of a document's relevancy to the query

querying/src/inverted_index/InvertedIndex.h → querying/src/calculation/InvertedIndex.h

@@ -4,7 +4,7 @@
 #include <string>
 #include <deque>
-#include "../Document.h"
+#include "Document.h"
 /**
  * @brief A data class of a term's inverted index list

querying/src/query/Query.h → querying/src/calculation/Query.h

@@ -6,7 +6,7 @@
 #include <set>
 #include <vector>
 #include <string>
-#include "../space/Space.h"
+#include "Space.h"
 /**
  * @brief A data class representing user query against the collection

querying/src/space/Space.h → querying/src/calculation/Space.h

@@ -6,8 +6,8 @@
 #include <set>
 #include <map>
-#include "../inverted_index/InvertedIndex.h"
-#include "../query/Query.h"
+#include "InvertedIndex.h"
+#include "Query.h"
 /**
  * @brief A class representing the vector space of the collection

querying/src/main.cpp

 #include <iostream>
-#include "inverted_index/InvertedIndexJSONParser.h"
-#include "query/Query.h"
-#include "space/Space.h"
-#include "Computor.h"
+#include "calculation/Query.h"
+#include "calculation/Space.h"
+#include "calculation/Computor.h"
 #include "../lib/cxxopts.hpp"
-#include "query/QueryJSONParser.h"
+#include "util/QueryJSONParser.h"
+#include "util/InvertedIndexJSONParser.h"
 using namespace std;
 using namespace cxxopts;

querying/src/inverted_index/InvertedIndexJSONParser.h → querying/src/util/InvertedIndexJSONParser.h

@@ -5,8 +5,8 @@
 #include <fstream>
 #include <map>
 #include "../../lib/json.hpp"
-#include "InvertedIndex.h"
+#include "../calculation/InvertedIndex.h"
 /**
  * @brief A class that loads a JSON file of inverted indices and parses it