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: make costmap layer structure configurable #106

Merged
merged 15 commits into from
Jan 24, 2018

Conversation

at-wat
Copy link
Owner

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

No description provided.

@at-wat at-wat self-assigned this Jan 23, 2018
@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
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


costmap_cspace::Costmap3dLayerBase::Ptr layer;

if (type == "Costmap3dLayerFootprint")
Copy link
Owner Author

Choose a reason for hiding this comment

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

Add getName to Costmap3dLayer classes and make class loader. (or use ROS pluginlib)

if (layer_xml.second["layer_linear_expand"].getType() == XmlRpc::XmlRpcValue::TypeDouble)
layer_linear_expand = static_cast<double>(layer_xml.second["layer_linear_expand"]);
if (layer_xml.second["layer_linear_spread"].getType() == XmlRpc::XmlRpcValue::TypeDouble)
layer_linear_spread = static_cast<double>(layer_xml.second["layer_linear_spread"]);
Copy link
Owner Author

Choose a reason for hiding this comment

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

Read layer type specific parameters in each class.

layer->setFootprint(footprint);
}

sub_map_overlay_.push_back(nh_.subscribe<nav_msgs::OccupancyGrid>(
Copy link
Owner Author

Choose a reason for hiding this comment

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

Subscribe data in each class to support non-OccupancyGrid message type.

Copy link
Owner Author

Choose a reason for hiding this comment

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

it'll be next PR

@at-wat
Copy link
Owner Author

at-wat commented Jan 24, 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 24, 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/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, 1 errors, 0 failures, 0 skipped
build/test_results/planner_cspace/rosunit-test_navigate.xml: 1 tests, 0 errors, 1 failures, 0 skipped
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, 1 errors, 1 failures, 0 skipped

@@ -20,12 +20,9 @@

<arg name="goal_topic" default="/move_base_simple/goal" />

<node pkg="costmap_cspace" type="costmap_3d" name="costmap_3d" output="$(arg output_info)">
<!--rosparam param="footprint" if="$(arg simulate)">[[0.12, -0.2], [0.12, 0.2], [-0.35, 0.2], [-0.35, -0.2]]</rosparam-->
<rosparam command="load" file="$(find neonavigation_launch)/config/navigate.yaml"/>
Copy link
Owner Author

Choose a reason for hiding this comment

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

Fix indent

@at-wat
Copy link
Owner Author

at-wat commented Jan 24, 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

1 similar comment
@at-wat
Copy link
Owner Author

at-wat commented Jan 24, 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 24, 2018

It has been tested also on an actual robot.
Merging

@at-wat at-wat merged commit d5baf92 into master Jan 24, 2018
@at-wat at-wat deleted the costmap_cspace/configurable-costmap-layers branch January 24, 2018 10:48
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.

1 participant