Skip to content

Commit

Permalink
build(probabilistic_occupancy_grid_map): move header files to the pro…
Browse files Browse the repository at this point in the history
…babilistic_occupancy_grid_map folder to avoid conflicts

Signed-off-by: Esteve Fernandez <[email protected]>
  • Loading branch information
esteve committed Dec 11, 2023
1 parent 91290a3 commit 1b21e2c
Show file tree
Hide file tree
Showing 19 changed files with 33 additions and 33 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
#ifndef LASERSCAN_BASED_OCCUPANCY_GRID_MAP__LASERSCAN_BASED_OCCUPANCY_GRID_MAP_NODE_HPP_
#define LASERSCAN_BASED_OCCUPANCY_GRID_MAP__LASERSCAN_BASED_OCCUPANCY_GRID_MAP_NODE_HPP_

#include "laserscan_based_occupancy_grid_map/occupancy_grid_map.hpp"
#include "updater/occupancy_grid_map_binary_bayes_filter_updater.hpp"
#include "updater/occupancy_grid_map_updater_interface.hpp"
#include "probabilistic_occupancy_grid_map/laserscan_based_occupancy_grid_map/occupancy_grid_map.hpp"
#include "probabilistic_occupancy_grid_map/updater/occupancy_grid_map_binary_bayes_filter_updater.hpp"
#include "probabilistic_occupancy_grid_map/updater/occupancy_grid_map_updater_interface.hpp"

#include <builtin_interfaces/msg/time.hpp>
#include <laser_geometry/laser_geometry.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_FIXED_HPP_
#define POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_FIXED_HPP_

#include "pointcloud_based_occupancy_grid_map/occupancy_grid_map_base.hpp"
#include "probabilistic_occupancy_grid_map/pointcloud_based_occupancy_grid_map/occupancy_grid_map_base.hpp"

namespace costmap_2d
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_PROJECTIVE_HPP_
#define POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_PROJECTIVE_HPP_

#include "pointcloud_based_occupancy_grid_map/occupancy_grid_map_base.hpp"
#include "probabilistic_occupancy_grid_map/pointcloud_based_occupancy_grid_map/occupancy_grid_map_base.hpp"

#include <grid_map_core/GridMap.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
#ifndef POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__POINTCLOUD_BASED_OCCUPANCY_GRID_MAP_NODE_HPP_
#define POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__POINTCLOUD_BASED_OCCUPANCY_GRID_MAP_NODE_HPP_

#include "pointcloud_based_occupancy_grid_map/occupancy_grid_map_base.hpp"
#include "updater/occupancy_grid_map_binary_bayes_filter_updater.hpp"
#include "updater/occupancy_grid_map_updater_interface.hpp"
#include "probabilistic_occupancy_grid_map/pointcloud_based_occupancy_grid_map/occupancy_grid_map_base.hpp"
#include "probabilistic_occupancy_grid_map/updater/occupancy_grid_map_binary_bayes_filter_updater.hpp"
#include "probabilistic_occupancy_grid_map/updater/occupancy_grid_map_updater_interface.hpp"

#include <builtin_interfaces/msg/time.hpp>
#include <laser_geometry/laser_geometry.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef UPDATER__OCCUPANCY_GRID_MAP_BINARY_BAYES_FILTER_UPDATER_HPP_
#define UPDATER__OCCUPANCY_GRID_MAP_BINARY_BAYES_FILTER_UPDATER_HPP_

#include "updater/occupancy_grid_map_updater_interface.hpp"
#include "probabilistic_occupancy_grid_map/updater/occupancy_grid_map_updater_interface.hpp"

#include <Eigen/Core>
#include <Eigen/Geometry>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef UPDATER__OCCUPANCY_GRID_MAP_UPDATER_INTERFACE_HPP_
#define UPDATER__OCCUPANCY_GRID_MAP_UPDATER_INTERFACE_HPP_

#include "cost_value.hpp"
#include "probabilistic_occupancy_grid_map/cost_value.hpp"

#include <nav2_costmap_2d/costmap_2d.hpp>
#include <rclcpp/node.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "laserscan_based_occupancy_grid_map/laserscan_based_occupancy_grid_map_node.hpp"
#include "probabilistic_occupancy_grid_map/laserscan_based_occupancy_grid_map/laserscan_based_occupancy_grid_map_node.hpp"

#include "cost_value.hpp"
#include "utils/utils.hpp"
#include "probabilistic_occupancy_grid_map/cost_value.hpp"
#include "probabilistic_occupancy_grid_map/utils/utils.hpp"

#include <pcl_ros/transforms.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
* David V. Lu!!
*********************************************************************/

#include "laserscan_based_occupancy_grid_map/occupancy_grid_map.hpp"
#include "probabilistic_occupancy_grid_map/laserscan_based_occupancy_grid_map/occupancy_grid_map.hpp"

#include "cost_value.hpp"
#include "probabilistic_occupancy_grid_map/cost_value.hpp"

#include <sensor_msgs/point_cloud2_iterator.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
* David V. Lu!!
*********************************************************************/

#include "pointcloud_based_occupancy_grid_map/occupancy_grid_map_base.hpp"
#include "probabilistic_occupancy_grid_map/pointcloud_based_occupancy_grid_map/occupancy_grid_map_base.hpp"

#include "cost_value.hpp"
#include "utils/utils.hpp"
#include "probabilistic_occupancy_grid_map/cost_value.hpp"
#include "probabilistic_occupancy_grid_map/utils/utils.hpp"

#include <grid_map_costmap_2d/grid_map_costmap_2d.hpp>
#include <pcl_ros/transforms.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "pointcloud_based_occupancy_grid_map/occupancy_grid_map_fixed.hpp"
#include "probabilistic_occupancy_grid_map/pointcloud_based_occupancy_grid_map/occupancy_grid_map_fixed.hpp"

#include "cost_value.hpp"
#include "utils/utils.hpp"
#include "probabilistic_occupancy_grid_map/cost_value.hpp"
#include "probabilistic_occupancy_grid_map/utils/utils.hpp"

#include <grid_map_costmap_2d/grid_map_costmap_2d.hpp>
#include <pcl_ros/transforms.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "pointcloud_based_occupancy_grid_map/occupancy_grid_map_projective.hpp"
#include "probabilistic_occupancy_grid_map/pointcloud_based_occupancy_grid_map/occupancy_grid_map_projective.hpp"

#include "cost_value.hpp"
#include "utils/utils.hpp"
#include "probabilistic_occupancy_grid_map/cost_value.hpp"
#include "probabilistic_occupancy_grid_map/utils/utils.hpp"

#include <grid_map_costmap_2d/grid_map_costmap_2d.hpp>
#include <grid_map_ros/grid_map_ros.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "pointcloud_based_occupancy_grid_map/pointcloud_based_occupancy_grid_map_node.hpp"
#include "probabilistic_occupancy_grid_map/pointcloud_based_occupancy_grid_map/pointcloud_based_occupancy_grid_map_node.hpp"

#include "cost_value.hpp"
#include "pointcloud_based_occupancy_grid_map/occupancy_grid_map_fixed.hpp"
#include "pointcloud_based_occupancy_grid_map/occupancy_grid_map_projective.hpp"
#include "utils/utils.hpp"
#include "probabilistic_occupancy_grid_map/cost_value.hpp"
#include "probabilistic_occupancy_grid_map/pointcloud_based_occupancy_grid_map/occupancy_grid_map_fixed.hpp"
#include "probabilistic_occupancy_grid_map/pointcloud_based_occupancy_grid_map/occupancy_grid_map_projective.hpp"
#include "probabilistic_occupancy_grid_map/utils/utils.hpp"

#include <pcl_ros/transforms.hpp>
#include <tier4_autoware_utils/ros/debug_publisher.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "updater/occupancy_grid_map_binary_bayes_filter_updater.hpp"
#include "probabilistic_occupancy_grid_map/updater/occupancy_grid_map_binary_bayes_filter_updater.hpp"

#include "cost_value.hpp"
#include "probabilistic_occupancy_grid_map/cost_value.hpp"

#include <algorithm>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "utils/utils.hpp"
#include "probabilistic_occupancy_grid_map/utils/utils.hpp"

#include <tier4_autoware_utils/geometry/geometry.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <pcl_conversions/pcl_conversions.h>

// autoware
#include "utils/utils.hpp"
#include "probabilistic_occupancy_grid_map/utils/utils.hpp"

// create pointcloud function
pcl::PointCloud<pcl::PointXYZ> createPCLPointCloudWithIteratedHeight(const size_t width)
Expand Down

0 comments on commit 1b21e2c

Please sign in to comment.