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

costmap_cspace: add stacked costmap class #104

Merged
merged 4 commits into from
Jan 23, 2018

Conversation

at-wat
Copy link
Owner

@at-wat at-wat commented Jan 22, 2018

No description provided.

@at-wat at-wat self-assigned this 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

FAILED

Test failed

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/MISSING-gtest-test_costmap_3d.xml: 1 tests, 0 errors, 1 failures, 0 skipped
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: 21 tests, 0 errors, 1 failures, 0 skipped

@at-wat at-wat force-pushed the costmap_cspace/stacked-costmap branch from 648e979 to 32208d2 Compare January 22, 2018 14:47
@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

virtual bool updateChain() = 0;
bool updateChainEntry(const UpdatedRegion &region)
{
region_.merge(region);
Copy link
Owner Author

Choose a reason for hiding this comment

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

move impl of processMapOverlay to here

Copy link
Owner Author

Choose a reason for hiding this comment

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

only if non-empty region is stored

{
ROS_ASSERT(!root_);
ROS_ASSERT(ang_grid_ > 0);
const int ox = lroundf((msg.info.origin.position.x - map_->info.origin.position.x) / map_->info.linear_resolution);
const int oy = lroundf((msg.info.origin.position.y - map_->info.origin.position.y) / map_->info.linear_resolution);
*map_overlay_ = *map_;
gemerateCSpace(map_overlay_, msg, true);
Copy link
Owner Author

Choose a reason for hiding this comment

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

store msg and region, then trigger updateChainEntry

@at-wat
Copy link
Owner Author

at-wat commented Jan 23, 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 23, 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 1551c57 into master Jan 23, 2018
@at-wat at-wat deleted the costmap_cspace/stacked-costmap branch January 23, 2018 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant