Feedback

.gitignore

@@ -1,4 +1,14 @@
-data/
+data/articles
+data/*
 cmake-build-debug/
 cmake-build-release/
-.idea/
+.idea/
+!data/small_articles
+tree-cache.txt
+cmake-build-*
+/art-cache.txt
+/author-cache.txt
+/org-cache.txt
+/article-cache.txt
+/build
+build

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "external/tbb"]
+	path = external/tbb
+	url = git@github.com:wjakob/tbb.git

CMakeLists.txt

@@ -1,6 +1,37 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.12)
 project(22s_final_proj)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -pthread")
+link_libraries(stdc++fs)
 
-add_executable(22s_final_proj main.cpp catch_setup.cpp)
+#TBB
+set(EXTERNAL_INSTALL_DIR ${CMAKE_BINARY_DIR}/external)
+link_directories(${EXTERNAL_INSTALL_DIR}/lib)
+include_directories(${EXTERNAL_INSTALL_DIR}/include)
+
+#TBB
+link_libraries(tbb)
+
+add_executable(22s_final_proj main.cpp CatchTestUtils/catch_setup.cpp hash_table/hash_table.h hash_table/hash_ordered_map_tests.cpp SearchEngine/SearchEngine.cpp SearchEngine/SearchEngine.h Processor/Processor.cpp utilities/StopWords.h utilities/Article.h utilities/Pipelines.h avl_tree/avl_tests.cpp external/porter2_stemmer/porter2_stemmer.cpp external/porter2_stemmer/porter2_stemmer.h external/porter2_stemmer/util/hash.h external/porter2_stemmer/util/string_view.h utilities/typedefs.h QueryBuilder/QueryBuilder.cpp QueryBuilder/QueryBuilder.h utilities/Pipelines.cpp utilities/ProgressBar.h avl_tree/avl_friends.cpp)
+
+######################################################################
+# Build rules for tbb
+######################################################################
+
+include(ExternalProject)
+ExternalProject_Add(
+        tbb
+        GIT_REPOSITORY ${CMAKE_SOURCE_DIR}/external/tbb
+        GIT_TAG master
+        INSTALL_DIR ${EXTERNAL_INSTALL_DIR}
+        CMAKE_ARGS
+        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+        -DTBB_BUILD_SHARED=ON
+        -DTBB_BUILD_STATIC=OFF
+        -DTBB_BUILD_TBBMALLOC=OFF
+        -DTBB_BUILD_TBBMALLOC_PROXY=OFF
+        -DTBB_BUILD_TESTS=OFF
+        -DTBB_CI_BUILD=OFF
+)
+add_dependencies(22s_final_proj tbb)