Major refactor

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 project(kth-aa)
 
 set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # -Wall -Wextra # -Werror
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") # -Werror
 
 include_directories(include)
 include_directories(src)

src/CMakeLists.txt

@@ -1,14 +1,5 @@
 set(BINARY ${CMAKE_PROJECT_NAME})
-#file(GLOB_RECURSE BLOSSOM5 "blossom5-v2.05.src/.cpp" "blossom5-v2.05.src/.h")
-#add_executable(${BINARY}_kattis main_kattis.cpp TSP.h TSP.cpp utility.h utility.cpp ${BLOSSOM5})
-#add_executable(${BINARY}_test main.cpp TSP.h TSP.cpp utility.h utility.cpp ${BLOSSOM5})
-add_executable(${BINARY}_kattis main_kattis.cpp TSP.h utility.h utility.cpp blossom.h)
-add_executable(${BINARY}_test main.cpp TSP.h utility.h utility.cpp blossom.h)
-
-
-# For adding all recursively into one executable
-#set(BINARY ${CMAKE_PROJECT_NAME})
-#file(GLOB_RECURSE SOURCES LIST_DIRECTORIES true *.h *.cpp)
-#set(SOURCES ${SOURCES})
-#add_executable(${BINARY}_run ${SOURCES})
-#add_library(${BINARY}_lib STATIC ${SOURCES})
+add_executable(${BINARY}_kattis main_kattis.cpp TSP.h utility.h blossom5_all_in_one_file.h chokolino.h christofides.h
+        local2opt.h clarke_wright.h greedy.h bruteforce.h local2opt_no_knn.h local3opt_no_knn_sequential.h)
+add_executable(${BINARY}_test main.cpp TSP.h utility.h blossom5_all_in_one_file.h chokolino.h christofides.h
+        local2opt.h clarke_wright.h greedy.h bruteforce.h local2opt_no_knn.h local3opt_no_knn_sequential.h)