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.

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

WRONG BRANCH #27

Closed
wants to merge 34 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
15e7370
Add motion plan cache
methylDragon Sep 21, 2023
c715b29
Switch to snake case for function names
methylDragon Sep 26, 2023
16784bb
Print cache fetch time and key plans on planned execution time
methylDragon Sep 27, 2023
8889982
Add overwrite_worse_plans param
methylDragon Sep 27, 2023
32659fd
Fix plan fetching printout and don't recache fetched plans
methylDragon Sep 27, 2023
b683eab
Update only use cached plans parameter name
methylDragon Sep 27, 2023
5c94f49
Add copyright headers and motion_planner namespace
methylDragon Oct 17, 2023
856c009
Make motion_plan_cache a unique_ptr instead of shared_ptr
methylDragon Oct 17, 2023
dd323a5
Set numerical precision
methylDragon Oct 17, 2023
52db5b5
Use enum for planner database mode
methylDragon Oct 17, 2023
e0d4cbc
Rename cache methods to prepare for cartesian caching
methylDragon Oct 17, 2023
d7bd142
Add very important warning to cache class
methylDragon Oct 17, 2023
f161f45
Fix access after move bug
methylDragon Oct 18, 2023
ca0f123
Remove internal cache node
methylDragon Oct 24, 2023
e4ec917
Add cartesian plan caching interfaces
methylDragon Oct 17, 2023
caada7e
Add construct_get_cartesian_plan_request
methylDragon Oct 17, 2023
019dbfb
Add goal query and metadata
methylDragon Oct 17, 2023
3b70b6e
Add start query and metadata
methylDragon Oct 18, 2023
87fda73
Implement top level cache ops
methylDragon Oct 18, 2023
7d70524
Use motion plan cache for cartesian plans
methylDragon Oct 18, 2023
188215b
Allow mismatched plan frames since we coerce anyway
methylDragon Oct 18, 2023
b2cda90
Fix move bug
methylDragon Oct 18, 2023
6ad592e
Remove query appending macro
methylDragon Nov 20, 2023
5563f3c
Default to warehouse_ros plugin if warehouse plugin isn't set
methylDragon Nov 20, 2023
03afb8e
Return and use init result
methylDragon Nov 20, 2023
0e84dd4
Add todo for catching exceptions
methylDragon Nov 20, 2023
6004f96
Implement plan fetching with configurable key
methylDragon Nov 20, 2023
ccbf91c
Add comments for exact match tolerance
methylDragon Nov 20, 2023
06cdcf9
Slightly refactor put plan
methylDragon Nov 20, 2023
d1847ba
Rename overwrite to delete_worse_plans
methylDragon Nov 20, 2023
6e5b963
Split out motion plan cache into its own library
methylDragon Nov 20, 2023
636b4d5
Sort constraints for reduced cardinality
methylDragon Nov 21, 2023
5ea5ad5
Rename util function
methylDragon Nov 21, 2023
bbc07ce
Add todo for is_diff
methylDragon Nov 21, 2023
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
9 changes: 8 additions & 1 deletion nexus_motion_planner/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ find_package(tf2 REQUIRED)
find_package(tf2_ros REQUIRED)
find_package(trajectory_msgs REQUIRED)
find_package(warehouse_ros REQUIRED)
find_package(warehouse_ros_sqlite REQUIRED)

include_directories(include)

Expand All @@ -28,6 +29,7 @@ set (motion_planner_server_dependencies
rclcpp_action
rclcpp_lifecycle
warehouse_ros
warehouse_ros_sqlite
tf2
tf2_ros
)
Expand All @@ -41,12 +43,17 @@ set (test_request_dependencies
)

#===============================================================================
set(LIBRARY_NAME motion_planner_server_core)
set(MOTION_PLAN_CACHE_LIBRARY_NAME motion_planner_server_core)
set(EXECUTABLE_NAME motion_planner_server)

# Motion plan cache library
add_library(${MOTION_PLAN_CACHE_LIBRARY_NAME} src/motion_plan_cache.cpp)
ament_target_dependencies(${MOTION_PLAN_CACHE_LIBRARY_NAME} ${motion_planner_server_dependencies})

# Server executable
add_executable(${EXECUTABLE_NAME} src/main.cpp src/motion_planner_server.cpp)
ament_target_dependencies(${EXECUTABLE_NAME} ${motion_planner_server_dependencies})
target_link_libraries(${EXECUTABLE_NAME} ${MOTION_PLAN_CACHE_LIBRARY_NAME})

# Test executable
add_executable(test_request src/test_request.cpp)
Expand Down
2 changes: 1 addition & 1 deletion nexus_motion_planner/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ int main(int argc, char** argv)
setvbuf(stdout, NULL, _IONBF, BUFSIZ);

rclcpp::init(argc, argv);
auto node = std::make_shared<MotionPlannerServer>();
auto node = std::make_shared<nexus::motion_planner::MotionPlannerServer>();
rclcpp::spin(node->get_node_base_interface());
rclcpp::shutdown();
return 0;
Expand Down
Loading
Loading