Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix paths and libs #30

Merged
merged 2 commits into from
Aug 26, 2024
Merged

Fix paths and libs #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fc43c0
Fix paths and libs
bilalkah Aug 26, 2024
28ad17e
🎨 apply clang-format changes
bilalkah Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ endif()
add_subdirectory(${PROJECT_SOURCE_DIR}/third-party/yaml-cpp)
add_subdirectory(${PROJECT_SOURCE_DIR}/third-party/SDL)
add_subdirectory(${PROJECT_SOURCE_DIR}/planning)
add_subdirectory(${PROJECT_SOURCE_DIR}/tools)
add_subdirectory(${PROJECT_SOURCE_DIR}/tools/visualizer)

include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
Expand All @@ -59,5 +59,5 @@ add_executable(
main.cpp
)

target_link_libraries(main a_star bfs dfs rrt rrt_star visualizer yaml-cpp)
target_link_libraries(main astar bfs dfs rrt rrt_star visualizer yaml-cpp)
target_compile_features(main PRIVATE cxx_std_17)
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ path-planning/
│ ├── CmakeLists.txt
│ ├── grid_base
│ │ ├── CmakeLists.txt
│ │ ├── a_star/..
│ │ ├── /..
│ │ ├── bfs/..
│ │ └── dfs/..
│ └── tree_base
Expand Down
18 changes: 9 additions & 9 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
*
*/

#include "planning/grid_base/a_star/a_star.h"
#include "planning/grid_base/bfs/bfs.h"
#include "planning/grid_base/dfs/dfs.h"
#include "planning/grid_base/include/common_grid_base.h"

#include "planning/include/i_planning.h"
#include "planning/tree_base/rrt/rrt.h"
#include "planning/tree_base/rrt_star/rrt_star.h"
#include "tools/include/visualizer.h"
#include "grid_base/astar/astar.h"
#include "grid_base/bfs/bfs.h"
#include "grid_base/dfs/dfs.h"
#include "utility/common_grid_base.h"

#include "tools/visualizer/visualizer.h"
#include "tree_base/rrt/rrt.h"
#include "tree_base/rrt_star/rrt_star.h"
#include "utility/i_planning.h"
#include "yaml-cpp/yaml.h"

#include <cstdlib>
Expand Down
10 changes: 6 additions & 4 deletions planning/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 3.22)

include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/include
Expand All @@ -17,5 +15,9 @@ set(
${CMAKE_CURRENT_SOURCE_DIR}/src/common_planning.cpp
)

add_subdirectory(grid_base)
add_subdirectory(tree_base)
add_subdirectory(grid_base/astar)
add_subdirectory(grid_base/bfs)
add_subdirectory(grid_base/dfs)
add_subdirectory(tree_base/rrt)
add_subdirectory(tree_base/rrt_star)
add_subdirectory(utility)
28 changes: 0 additions & 28 deletions planning/grid_base/CMakeLists.txt
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions planning/grid_base/a_star/CMakeLists.txt
View file
Open in desktop

This file was deleted.

18 changes: 18 additions & 0 deletions planning/grid_base/astar/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
add_library(
astar
SHARED
${CMAKE_CURRENT_SOURCE_DIR}/astar.cpp
)

target_include_directories(
astar
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}/planning/utility
)

target_link_libraries(
astar
PUBLIC
common_grid_base
)
2 changes: 1 addition & 1 deletion planning/grid_base/a_star/a_star.cpp → planning/grid_base/astar/astar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
*/

#include "a_star.h"
#include "astar.h"

#include <chrono>
#include <cmath>
Expand Down
4 changes: 2 additions & 2 deletions planning/grid_base/a_star/a_star.h → planning/grid_base/astar/astar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#ifndef PLANNING_GRID_BASE_A_STAR_A_STAR_H_
#define PLANNING_GRID_BASE_A_STAR_A_STAR_H_

#include "planning/grid_base/include/common_grid_base.h"
#include "planning/include/i_planning.h"
#include "utility/common_grid_base.h"
#include "utility/i_planning.h"

#include <memory>
#include <mutex>
Expand Down
24 changes: 7 additions & 17 deletions planning/grid_base/bfs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
cmake_minimum_required(VERSION 3.22)

include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}
)

link_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}
)

set(
BFS_FILES
add_library(
bfs
SHARED
${CMAKE_CURRENT_SOURCE_DIR}/bfs.cpp
)

add_library(
bfs SHARED
${BFS_FILES}
target_include_directories(
bfs
PUBLIC
${PROJECT_SOURCE_DIR}/planning/utility
)

target_link_libraries(
Expand Down
4 changes: 2 additions & 2 deletions planning/grid_base/bfs/bfs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#ifndef PLANNING_GRID_BASE_BFS_BFS_H_
#define PLANNING_GRID_BASE_BFS_BFS_H_

#include "planning/grid_base/include/common_grid_base.h"
#include "planning/include/i_planning.h"
#include "utility/common_grid_base.h"
#include "utility/i_planning.h"
#include <cstdint>
#include <mutex>
#include <string>
Expand Down
24 changes: 7 additions & 17 deletions planning/grid_base/dfs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
cmake_minimum_required(VERSION 3.22)

include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}
)

link_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}
)

set(
DFS_FILES
add_library(
dfs
SHARED
${CMAKE_CURRENT_SOURCE_DIR}/dfs.cpp
)

add_library(
dfs SHARED
${DFS_FILES}
target_include_directories(
dfs
PUBLIC
${PROJECT_SOURCE_DIR}/planning/utility
)

target_link_libraries(
Expand Down
4 changes: 2 additions & 2 deletions planning/grid_base/dfs/dfs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#ifndef PLANNING_GRID_BASE_DFS_DFS_H_
#define PLANNING_GRID_BASE_DFS_DFS_H_

#include "planning/grid_base/include/common_grid_base.h"
#include "planning/include/i_planning.h"
#include "utility/common_grid_base.h"
#include "utility/i_planning.h"
#include <mutex>
#include <stack>
#include <string>
Expand Down
29 changes: 0 additions & 29 deletions planning/tree_base/CMakeLists.txt
View file
Open in desktop

This file was deleted.

29 changes: 12 additions & 17 deletions planning/tree_base/rrt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
cmake_minimum_required(VERSION 3.22)

include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}
)

link_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}
add_library(
rrt
SHARED
${CMAKE_CURRENT_SOURCE_DIR}/rrt.cpp
)

set(
RRT_FILES
${CMAKE_CURRENT_SOURCE_DIR}/rrt.cpp
target_include_directories(
rrt
PUBLIC
${PROJECT_SOURCE_DIR}/planning/utility
)

add_library(
rrt
SHARED
${RRT_FILES}
target_link_directories(
rrt
PUBLIC
${PROJECT_SOURCE_DIR}/planning/utility
)

target_link_libraries(
Expand Down
2 changes: 1 addition & 1 deletion planning/tree_base/rrt/rrt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
*/

#include "planning/tree_base/rrt/rrt.h"
#include "rrt.h"
#include <chrono>
#include <cstddef>
#include <iostream>
Expand Down
4 changes: 2 additions & 2 deletions planning/tree_base/rrt/rrt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#ifndef PLANNING_TREE_BASE_RRT_STAR_RRT_STAR_H_
#define PLANNING_TREE_BASE_RRT_STAR_RRT_STAR_H_

#include "planning/include/i_planning.h"
#include "planning/tree_base/include/common_tree_base.h"
#include "utility/common_tree_base.h"
#include "utility/i_planning.h"

#include <cmath>
#include <iostream>
Expand Down
27 changes: 8 additions & 19 deletions planning/tree_base/rrt_star/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,17 @@
cmake_minimum_required(VERSION 3.22)

include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}
)

link_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}
)

set(
RRT_STAR_FILES
add_library(
rrt_star
SHARED
${CMAKE_CURRENT_SOURCE_DIR}/rrt_star.cpp
)

add_library(
rrt_star
SHARED
${RRT_STAR_FILES}
target_include_directories(
rrt_star
PUBLIC
${PROJECT_SOURCE_DIR}/planning/utility
)

target_link_libraries(
rrt_star
PUBLIC
common_tree_base
)
)
2 changes: 1 addition & 1 deletion planning/tree_base/rrt_star/rrt_star.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
*/

#include "planning/tree_base/rrt_star/rrt_star.h"
#include "rrt_star.h"
#include "common_tree_base.h"
#include "node_parent.h"

Expand Down
4 changes: 2 additions & 2 deletions planning/tree_base/rrt_star/rrt_star.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#ifndef PLANNING_TREE_BASE_RRT_RRT_H_
#define PLANNING_TREE_BASE_RRT_RRT_H_

#include "planning/include/i_planning.h"
#include "planning/tree_base/include/common_tree_base.h"
#include "utility/common_tree_base.h"
#include "utility/i_planning.h"
#include <memory>
#include <mutex>
#include <unordered_map>
Expand Down
Loading
Loading