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

Jump to bottom

costmap_cspace: refactor costmap layer classes #100

Merged
merged 8 commits into from
Jan 22, 2018
Merged

costmap_cspace: refactor costmap layer classes #100

merged 8 commits into from
Jan 22, 2018

Conversation

at-wat
Copy link
Owner

@at-wat at-wat commented Jan 19, 2018 •
edited
Loading

splitted from #99
fixes #97

@at-wat at-wat added the WIP label Jan 19, 2018
@at-wat at-wat self-assigned this Jan 19, 2018
@at-wat
Copy link
Owner Author

at-wat commented Jan 19, 2018

PASSED

All tests passed

Skipping "src/neonavigation/neonavigation_launch/package.xml": 'tests'
Skipping "src/neonavigation/map_organizer/package.xml": 'tests'
Skipping "src/neonavigation/safety_limiter/package.xml": 'tests'
Skipping "src/neonavigation/track_odometry/package.xml": 'tests'
Skipping "src/neonavigation/costmap_cspace/package.xml": 'tests'
Skipping "src/neonavigation/trajectory_tracker/package.xml": 'tests'
Skipping "src/neonavigation/obj_to_pointcloud/package.xml": 'tests'
Skipping "src/neonavigation/neonavigation/package.xml": 'tests'
Skipping "src/neonavigation/planner_cspace/package.xml": 'tests'
build/test_results/costmap_cspace/gtest-test_costmap_3d.xml: 6 tests
build/test_results/costmap_cspace/roslint-costmap_cspace.xml: 1 tests
build/test_results/map_organizer/roslint-map_organizer.xml: 1 tests
build/test_results/obj_to_pointcloud/roslint-obj_to_pointcloud.xml: 1 tests
build/test_results/planner_cspace/gtest-test_blockmem_gridmap.xml: 2 tests
build/test_results/planner_cspace/gtest-test_blockmem_gridmap_performance.xml: 1 tests
build/test_results/planner_cspace/gtest-test_cyclic_vec.xml: 7 tests
build/test_results/planner_cspace/roslint-planner_cspace.xml: 1 tests
build/test_results/planner_cspace/rostest-test_test_navigation_rostest.xml: 1 tests
build/test_results/planner_cspace/rosunit-test_navigate.xml: 1 tests
build/test_results/safety_limiter/roslint-safety_limiter.xml: 1 tests
build/test_results/track_odometry/gtest-tf_projection_test.xml: 1 tests
build/test_results/track_odometry/roslint-track_odometry.xml: 1 tests
build/test_results/trajectory_tracker/roslint-trajectory_tracker.xml: 1 tests
Summary: 26 tests, 0 errors, 0 failures, 0 skipped

@at-wat
Add layer type flag
857ad88
@at-wat
Add layer type check
804001e 
also replace assert with ROS_ASSERT
@at-wat
Copy link
Owner Author

at-wat commented Jan 22, 2018

cherry-pick 857ad88 and 804001e into next PR

@at-wat at-wat removed the WIP label Jan 22, 2018
@at-wat
Copy link
Owner Author

at-wat commented Jan 22, 2018

PASSED

All tests passed

Skipping "src/neonavigation/neonavigation_launch/package.xml": 'tests'
Skipping "src/neonavigation/map_organizer/package.xml": 'tests'
Skipping "src/neonavigation/safety_limiter/package.xml": 'tests'
Skipping "src/neonavigation/track_odometry/package.xml": 'tests'
Skipping "src/neonavigation/costmap_cspace/package.xml": 'tests'
Skipping "src/neonavigation/trajectory_tracker/package.xml": 'tests'
Skipping "src/neonavigation/obj_to_pointcloud/package.xml": 'tests'
Skipping "src/neonavigation/neonavigation/package.xml": 'tests'
Skipping "src/neonavigation/planner_cspace/package.xml": 'tests'
build/test_results/costmap_cspace/gtest-test_costmap_3d.xml: 6 tests
build/test_results/costmap_cspace/roslint-costmap_cspace.xml: 1 tests
build/test_results/map_organizer/roslint-map_organizer.xml: 1 tests
build/test_results/obj_to_pointcloud/roslint-obj_to_pointcloud.xml: 1 tests
build/test_results/planner_cspace/gtest-test_blockmem_gridmap.xml: 2 tests
build/test_results/planner_cspace/gtest-test_blockmem_gridmap_performance.xml: 1 tests
build/test_results/planner_cspace/gtest-test_cyclic_vec.xml: 7 tests
build/test_results/planner_cspace/roslint-planner_cspace.xml: 1 tests
build/test_results/planner_cspace/rostest-test_test_navigation_rostest.xml: 1 tests
build/test_results/planner_cspace/rosunit-test_navigate.xml: 1 tests
build/test_results/safety_limiter/roslint-safety_limiter.xml: 1 tests
build/test_results/track_odometry/gtest-tf_projection_test.xml: 1 tests
build/test_results/track_odometry/roslint-track_odometry.xml: 1 tests
build/test_results/trajectory_tracker/roslint-trajectory_tracker.xml: 1 tests
Summary: 26 tests, 0 errors, 0 failures, 0 skipped

@at-wat
Copy link
Owner Author

at-wat commented Jan 22, 2018

PASSED

All tests passed

Skipping "src/neonavigation/neonavigation_launch/package.xml": 'tests'
Skipping "src/neonavigation/map_organizer/package.xml": 'tests'
Skipping "src/neonavigation/safety_limiter/package.xml": 'tests'
Skipping "src/neonavigation/track_odometry/package.xml": 'tests'
Skipping "src/neonavigation/costmap_cspace/package.xml": 'tests'
Skipping "src/neonavigation/trajectory_tracker/package.xml": 'tests'
Skipping "src/neonavigation/obj_to_pointcloud/package.xml": 'tests'
Skipping "src/neonavigation/neonavigation/package.xml": 'tests'
Skipping "src/neonavigation/planner_cspace/package.xml": 'tests'
build/test_results/costmap_cspace/gtest-test_costmap_3d.xml: 6 tests
build/test_results/costmap_cspace/roslint-costmap_cspace.xml: 1 tests
build/test_results/map_organizer/roslint-map_organizer.xml: 1 tests
build/test_results/obj_to_pointcloud/roslint-obj_to_pointcloud.xml: 1 tests
build/test_results/planner_cspace/gtest-test_blockmem_gridmap.xml: 2 tests
build/test_results/planner_cspace/gtest-test_blockmem_gridmap_performance.xml: 1 tests
build/test_results/planner_cspace/gtest-test_cyclic_vec.xml: 7 tests
build/test_results/planner_cspace/roslint-planner_cspace.xml: 1 tests
build/test_results/planner_cspace/rostest-test_test_navigation_rostest.xml: 1 tests
build/test_results/planner_cspace/rosunit-test_navigate.xml: 1 tests
build/test_results/safety_limiter/roslint-safety_limiter.xml: 1 tests
build/test_results/track_odometry/gtest-tf_projection_test.xml: 1 tests
build/test_results/track_odometry/roslint-track_odometry.xml: 1 tests
build/test_results/trajectory_tracker/roslint-trajectory_tracker.xml: 1 tests
Summary: 26 tests, 0 errors, 0 failures, 0 skipped

at-wat
at-wat commented Jan 22, 2018
View reviewed changes
costmap_cspace/src/costmap_3d.cpp Outdated
pub_costmap_update_.publish(update);
}
void publishDebug(costmap_cspace::CSpace3D::Ptr map)
void publishDebug(costmap_cspace::CSpace3D map)
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ref

@at-wat
Copy link
Owner Author

at-wat commented Jan 22, 2018

PASSED

All tests passed

Skipping "src/neonavigation/neonavigation_launch/package.xml": 'tests'
Skipping "src/neonavigation/map_organizer/package.xml": 'tests'
Skipping "src/neonavigation/safety_limiter/package.xml": 'tests'
Skipping "src/neonavigation/track_odometry/package.xml": 'tests'
Skipping "src/neonavigation/costmap_cspace/package.xml": 'tests'
Skipping "src/neonavigation/trajectory_tracker/package.xml": 'tests'
Skipping "src/neonavigation/obj_to_pointcloud/package.xml": 'tests'
Skipping "src/neonavigation/neonavigation/package.xml": 'tests'
Skipping "src/neonavigation/planner_cspace/package.xml": 'tests'
build/test_results/costmap_cspace/gtest-test_costmap_3d.xml: 6 tests
build/test_results/costmap_cspace/roslint-costmap_cspace.xml: 1 tests
build/test_results/map_organizer/roslint-map_organizer.xml: 1 tests
build/test_results/obj_to_pointcloud/roslint-obj_to_pointcloud.xml: 1 tests
build/test_results/planner_cspace/gtest-test_blockmem_gridmap.xml: 2 tests
build/test_results/planner_cspace/gtest-test_blockmem_gridmap_performance.xml: 1 tests
build/test_results/planner_cspace/gtest-test_cyclic_vec.xml: 7 tests
build/test_results/planner_cspace/roslint-planner_cspace.xml: 1 tests
build/test_results/planner_cspace/rostest-test_test_navigation_rostest.xml: 1 tests
build/test_results/planner_cspace/rosunit-test_navigate.xml: 1 tests
build/test_results/safety_limiter/roslint-safety_limiter.xml: 1 tests
build/test_results/track_odometry/gtest-tf_projection_test.xml: 1 tests
build/test_results/track_odometry/roslint-track_odometry.xml: 1 tests
build/test_results/trajectory_tracker/roslint-trajectory_tracker.xml: 1 tests
Summary: 26 tests, 0 errors, 0 failures, 0 skipped

@at-wat at-wat merged commit bae0158 into master Jan 22, 2018
@at-wat at-wat deleted the costmap_cspace/refactor branch January 22, 2018 04:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@at-wat at-wat

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Use ROS_ASSERT instead of assert
1 participant
@at-wat