Skip to content

Commit 9e4316a

Browse files
committed
Merge branch 'develop'
2 parents be97973 + a88a52d commit 9e4316a

File tree

113 files changed

+70
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+70
-70
lines changed
File renamed without changes.

README.md

+41-41

README_ko-KR.md

+1-1

cpp-algorithm/src/CMakeLists.txt

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
add_subdirectory(array)
22
add_subdirectory(array/test)
33
add_subdirectory(array/benchmark)
4-
add_subdirectory(dynamic_programming)
5-
add_subdirectory(dynamic_programming/test)
6-
add_subdirectory(dynamic_programming/benchmark)
4+
add_subdirectory(dp)
5+
add_subdirectory(dp/test)
6+
add_subdirectory(dp/benchmark)
77
if(MSVC)
88
add_subdirectory(graph)
99
add_subdirectory(graph/test)
1010
endif()
1111
add_subdirectory(greedy)
1212
add_subdirectory(greedy/test)
13-
add_subdirectory(hash_table)
14-
add_subdirectory(hash_table/test)
13+
add_subdirectory(hashtable)
14+
add_subdirectory(hashtable/test)
1515
add_subdirectory(heap)
1616
add_subdirectory(heap/test)
1717
add_subdirectory(heap/benchmark)
1818
add_subdirectory(include)
19-
add_subdirectory(linked_list)
20-
add_subdirectory(linked_list/test)
21-
add_subdirectory(linked_list/benchmark)
19+
add_subdirectory(linkedlist)
20+
add_subdirectory(linkedlist/test)
21+
add_subdirectory(linkedlist/benchmark)
2222
add_subdirectory(math)
2323
add_subdirectory(math/test)
24-
add_subdirectory(primitive_type)
25-
add_subdirectory(primitive_type/test)
26-
add_subdirectory(primitive_type/benchmark)
24+
add_subdirectory(primitive)
25+
add_subdirectory(primitive/test)
26+
add_subdirectory(primitive/benchmark)
2727
add_subdirectory(queue)
2828
add_subdirectory(queue/test)
2929
add_subdirectory(search)

cpp-algorithm/src/dynamic_programming/benchmark/CMakeLists.txt renamed to cpp-algorithm/src/dp/benchmark/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ find_package(GSL REQUIRED)
22
find_package(benchmark REQUIRED)
33

44
include_directories(${CMAKE_SOURCE_DIR}/src/include)
5-
include_directories(${CMAKE_SOURCE_DIR}/src/dynamic_programming)
5+
include_directories(${CMAKE_SOURCE_DIR}/src/dp)
66

77
macro(add_target_benchmark target)
88
string(REPLACE "_benchmark" "" target_name ${target})
9-
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/dynamic_programming/${target_name}.cpp")
9+
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/dp/${target_name}.cpp")
1010
target_link_libraries(${target} PRIVATE benchmark::benchmark_main ${ARGN})
1111
target_compile_definitions(${target} PUBLIC -DBENCHMARK_STATIC_DEFINE)
1212
if(MSVC)

cpp-algorithm/src/dynamic_programming/test/CMakeLists.txt renamed to cpp-algorithm/src/dp/test/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ if(WIN32)
66
endif(WIN32)
77

88
include_directories(${CMAKE_SOURCE_DIR}/src/include)
9-
include_directories(${CMAKE_SOURCE_DIR}/src/dynamic_programming)
9+
include_directories(${CMAKE_SOURCE_DIR}/src/dp)
1010

1111
macro(add_target_test target)
1212
string(REPLACE "_test" "" target_name ${target})
13-
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/dynamic_programming/${target_name}.cpp")
13+
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/dp/${target_name}.cpp")
1414
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
1515
if(MSVC)
1616
### Edit and Continue for CMake projects

cpp-algorithm/src/hash_table/CMakeLists.txt renamed to cpp-algorithm/src/hashtable/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
include_directories(${CMAKE_SOURCE_DIR}/src/include)
2-
include_directories(${CMAKE_SOURCE_DIR}/src/hash_table)
2+
include_directories(${CMAKE_SOURCE_DIR}/src/hashtable)
33
include_directories(${CMAKE_SOURCE_DIR}/src/tree)
44

55
macro(add_library_target target)

cpp-algorithm/src/hash_table/test/CMakeLists.txt renamed to cpp-algorithm/src/hashtable/test/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ if(WIN32)
55
endif(WIN32)
66

77
include_directories(${CMAKE_SOURCE_DIR}/src/include)
8-
include_directories(${CMAKE_SOURCE_DIR}/src/hash_table)
8+
include_directories(${CMAKE_SOURCE_DIR}/src/hashtable)
99
include_directories(${CMAKE_SOURCE_DIR}/src/tree)
1010

1111
macro(add_target_test target)
1212
string(REPLACE "_test" "" target_name ${target})
13-
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/hash_table/${target_name}.cpp")
13+
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/hashtable/${target_name}.cpp")
1414
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
1515
if(MSVC)
1616
### Edit and Continue for CMake projects

cpp-algorithm/src/linked_list/CMakeLists.txt renamed to cpp-algorithm/src/linkedlist/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
include_directories(${CMAKE_SOURCE_DIR}/src/include)
2-
include_directories(${CMAKE_SOURCE_DIR}/src/linked_list)
2+
include_directories(${CMAKE_SOURCE_DIR}/src/linkedlist)
33

44
macro(add_library_target target)
55
add_library(${target} STATIC "${target}.cpp")

cpp-algorithm/src/linked_list/benchmark/CMakeLists.txt renamed to cpp-algorithm/src/linkedlist/benchmark/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
find_package(benchmark REQUIRED)
22

33
include_directories(${CMAKE_SOURCE_DIR}/src/include)
4-
include_directories(${CMAKE_SOURCE_DIR}/src/linked_list)
4+
include_directories(${CMAKE_SOURCE_DIR}/src/linkedlist)
55

66
macro(add_target_benchmark target)
77
string(REPLACE "_benchmark" "" target_name ${target})
8-
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/linked_list/${target_name}.cpp")
8+
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/linkedlist/${target_name}.cpp")
99
target_link_libraries(${target} PRIVATE benchmark::benchmark_main ${ARGN})
1010
target_compile_definitions(${target} PUBLIC -DBENCHMARK_STATIC_DEFINE)
1111
if(MSVC)

cpp-algorithm/src/linked_list/test/CMakeLists.txt renamed to cpp-algorithm/src/linkedlist/test/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ if(WIN32)
55
endif(WIN32)
66

77
include_directories(${CMAKE_SOURCE_DIR}/src/include)
8-
include_directories(${CMAKE_SOURCE_DIR}/src/linked_list)
8+
include_directories(${CMAKE_SOURCE_DIR}/src/linkedlist)
99

1010
macro(add_target_test target)
1111
string(REPLACE "_test" "" target_name ${target})
12-
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/linked_list/${target_name}.cpp")
12+
add_executable(${target} "${target}.cpp" "${CMAKE_SOURCE_DIR}/src/linkedlist/${target_name}.cpp")
1313
target_link_libraries(${target} PRIVATE GTest::gtest_main ${ARGN})
1414
if(MSVC)
1515
### Edit and Continue for CMake projects

0 commit comments

Comments
 (0)