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

build(probabilistic_occupancy_grid_map): move header files to the probabilistic_occupancy_grid_map folder to avoid conflicts #5839

Merged
merged 2 commits into from
Jan 12, 2024
Merged

build(probabilistic_occupancy_grid_map): move header files to the probabilistic_occupancy_grid_map folder to avoid conflicts #5839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd3c864
build(probabilistic_occupancy_grid_map): move header files to the pro…
esteve Dec 11, 2023
94f6fdf
style(pre-commit): autofix
pre-commit-ci[bot] Jan 11, 2024
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
6 changes: 3 additions & 3 deletions ...occupancy_grid_map/include/cost_value.hpp → ...ilistic_occupancy_grid_map/cost_value.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
* Author: Eitan Marder-Eppstein
*********************************************************************/

#ifndef COST_VALUE_HPP_
#define COST_VALUE_HPP_
#ifndef PROBABILISTIC_OCCUPANCY_GRID_MAP__COST_VALUE_HPP_
#define PROBABILISTIC_OCCUPANCY_GRID_MAP__COST_VALUE_HPP_

#include <algorithm>

Expand Down Expand Up @@ -103,4 +103,4 @@ static const CostTranslationTable cost_translation_table;
static const InverseCostTranslationTable inverse_cost_translation_table;
} // namespace occupancy_cost_value

#endif // COST_VALUE_HPP_
#endif // PROBABILISTIC_OCCUPANCY_GRID_MAP__COST_VALUE_HPP_
8 changes: 4 additions & 4 deletions ...ude/fusion/single_frame_fusion_policy.hpp → ...map/fusion/single_frame_fusion_policy.hpp
View file
Open in desktop
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.

#ifndef FUSION__SINGLE_FRAME_FUSION_POLICY_HPP_
#define FUSION__SINGLE_FRAME_FUSION_POLICY_HPP_
#ifndef PROBABILISTIC_OCCUPANCY_GRID_MAP__FUSION__SINGLE_FRAME_FUSION_POLICY_HPP_
#define PROBABILISTIC_OCCUPANCY_GRID_MAP__FUSION__SINGLE_FRAME_FUSION_POLICY_HPP_

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

#include <cmath>
#include <iostream>
Expand All @@ -27,7 +27,7 @@

namespace fusion_policy
{
enum class FusionMethod { OVERWRITE, LOG_ODDS, DEMPSTER_SHAFER };

Check warning on line 30 in perception/probabilistic_occupancy_grid_map/include/probabilistic_occupancy_grid_map/fusion/single_frame_fusion_policy.hpp

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (SHAFER)

unsigned char convertProbabilityToChar(const double & probability);
double convertCharToProbability(const unsigned char & occupancy);
Expand All @@ -48,13 +48,13 @@
const std::vector<double> & probabilities, const std::vector<double> & weights);
} // namespace log_odds_fusion

namespace dempster_shafer_fusion

Check warning on line 51 in perception/probabilistic_occupancy_grid_map/include/probabilistic_occupancy_grid_map/fusion/single_frame_fusion_policy.hpp

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (shafer)
{
struct dempsterShaferOccupancy;

Check warning on line 53 in perception/probabilistic_occupancy_grid_map/include/probabilistic_occupancy_grid_map/fusion/single_frame_fusion_policy.hpp

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (Shafer)
double dempsterShaferFusion(const std::vector<double> & probability);

Check warning on line 54 in perception/probabilistic_occupancy_grid_map/include/probabilistic_occupancy_grid_map/fusion/single_frame_fusion_policy.hpp

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (Shafer)
double dempsterShaferFusion(

Check warning on line 55 in perception/probabilistic_occupancy_grid_map/include/probabilistic_occupancy_grid_map/fusion/single_frame_fusion_policy.hpp

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (Shafer)
const std::vector<double> & probability, const std::vector<double> & reliability);
} // namespace dempster_shafer_fusion

Check warning on line 57 in perception/probabilistic_occupancy_grid_map/include/probabilistic_occupancy_grid_map/fusion/single_frame_fusion_policy.hpp

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (shafer)

unsigned char singleFrameOccupancyFusion(
const std::vector<unsigned char> & occupancy, FusionMethod method);
Expand All @@ -63,4 +63,4 @@
const std::vector<double> & reliability);
} // namespace fusion_policy

#endif // FUSION__SINGLE_FRAME_FUSION_POLICY_HPP_
#endif // PROBABILISTIC_OCCUPANCY_GRID_MAP__FUSION__SINGLE_FRAME_FUSION_POLICY_HPP_
14 changes: 7 additions & 7 deletions ...ion/synchronized_grid_map_fusion_node.hpp → ...ion/synchronized_grid_map_fusion_node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef FUSION__SYNCHRONIZED_GRID_MAP_FUSION_NODE_HPP_
#define FUSION__SYNCHRONIZED_GRID_MAP_FUSION_NODE_HPP_
#ifndef PROBABILISTIC_OCCUPANCY_GRID_MAP__FUSION__SYNCHRONIZED_GRID_MAP_FUSION_NODE_HPP_
#define PROBABILISTIC_OCCUPANCY_GRID_MAP__FUSION__SYNCHRONIZED_GRID_MAP_FUSION_NODE_HPP_

#include "fusion/single_frame_fusion_policy.hpp"
#include "pointcloud_based_occupancy_grid_map/occupancy_grid_map_fixed.hpp"
#include "updater/occupancy_grid_map_log_odds_bayes_filter_updater.hpp"
#include "updater/occupancy_grid_map_updater_interface.hpp"
#include "probabilistic_occupancy_grid_map/fusion/single_frame_fusion_policy.hpp"
#include "probabilistic_occupancy_grid_map/pointcloud_based_occupancy_grid_map/occupancy_grid_map_fixed.hpp"
#include "probabilistic_occupancy_grid_map/updater/occupancy_grid_map_log_odds_bayes_filter_updater.hpp"
#include "probabilistic_occupancy_grid_map/updater/occupancy_grid_map_updater_interface.hpp"

#include <builtin_interfaces/msg/time.hpp>
#include <rclcpp/rclcpp.hpp>
Expand Down Expand Up @@ -47,7 +47,7 @@
{

using costmap_2d::OccupancyGridMapFixedBlindSpot;
using costmap_2d::OccupancyGridMapLOBFUpdater;

Check warning on line 50 in perception/probabilistic_occupancy_grid_map/include/probabilistic_occupancy_grid_map/fusion/synchronized_grid_map_fusion_node.hpp

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (LOBF)
using costmap_2d::OccupancyGridMapUpdaterInterface;
using geometry_msgs::msg::Pose;

Expand Down Expand Up @@ -124,4 +124,4 @@

} // namespace synchronized_grid_map_fusion

#endif // FUSION__SYNCHRONIZED_GRID_MAP_FUSION_NODE_HPP_
#endif // PROBABILISTIC_OCCUPANCY_GRID_MAP__FUSION__SYNCHRONIZED_GRID_MAP_FUSION_NODE_HPP_
12 changes: 6 additions & 6 deletions ...serscan_based_occupancy_grid_map_node.hpp → ...serscan_based_occupancy_grid_map_node.hpp
View file
Open in desktop
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.

#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_
#ifndef PROBABILISTIC_OCCUPANCY_GRID_MAP__LASERSCAN_BASED_OCCUPANCY_GRID_MAP__LASERSCAN_BASED_OCCUPANCY_GRID_MAP_NODE_HPP_
#define PROBABILISTIC_OCCUPANCY_GRID_MAP__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 Expand Up @@ -102,4 +102,4 @@ class LaserscanBasedOccupancyGridMapNode : public rclcpp::Node

} // namespace occupancy_grid_map

#endif // LASERSCAN_BASED_OCCUPANCY_GRID_MAP__LASERSCAN_BASED_OCCUPANCY_GRID_MAP_NODE_HPP_
#endif // PROBABILISTIC_OCCUPANCY_GRID_MAP__LASERSCAN_BASED_OCCUPANCY_GRID_MAP__LASERSCAN_BASED_OCCUPANCY_GRID_MAP_NODE_HPP_
6 changes: 3 additions & 3 deletions ...occupancy_grid_map/occupancy_grid_map.hpp → ...occupancy_grid_map/occupancy_grid_map.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
* David V. Lu!!
*********************************************************************/

#ifndef LASERSCAN_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_HPP_
#define LASERSCAN_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_HPP_
#ifndef PROBABILISTIC_OCCUPANCY_GRID_MAP__LASERSCAN_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_HPP_
#define PROBABILISTIC_OCCUPANCY_GRID_MAP__LASERSCAN_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_HPP_

#include <nav2_costmap_2d/costmap_2d.hpp>
#include <rclcpp/rclcpp.hpp>
Expand Down Expand Up @@ -91,4 +91,4 @@ class OccupancyGridMap : public nav2_costmap_2d::Costmap2D

} // namespace costmap_2d

#endif // LASERSCAN_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_HPP_
#endif // PROBABILISTIC_OCCUPANCY_GRID_MAP__LASERSCAN_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_HPP_
6 changes: 3 additions & 3 deletions ...ancy_grid_map/occupancy_grid_map_base.hpp → ...ancy_grid_map/occupancy_grid_map_base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
* David V. Lu!!
*********************************************************************/

#ifndef POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_BASE_HPP_
#define POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_BASE_HPP_
#ifndef PROBABILISTIC_OCCUPANCY_GRID_MAP__POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_BASE_HPP_
#define PROBABILISTIC_OCCUPANCY_GRID_MAP__POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_BASE_HPP_

#include <nav2_costmap_2d/costmap_2d.hpp>
#include <rclcpp/rclcpp.hpp>
Expand Down Expand Up @@ -92,4 +92,4 @@ class OccupancyGridMapInterface : public nav2_costmap_2d::Costmap2D

} // namespace costmap_2d

#endif // POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_BASE_HPP_
#endif // PROBABILISTIC_OCCUPANCY_GRID_MAP__POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_BASE_HPP_
8 changes: 4 additions & 4 deletions ...ncy_grid_map/occupancy_grid_map_fixed.hpp → ...ncy_grid_map/occupancy_grid_map_fixed.hpp
View file
Open in desktop
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.

#ifndef POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_FIXED_HPP_
#define POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_FIXED_HPP_
#ifndef PROBABILISTIC_OCCUPANCY_GRID_MAP__POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_FIXED_HPP_
#define PROBABILISTIC_OCCUPANCY_GRID_MAP__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 Expand Up @@ -44,4 +44,4 @@ class OccupancyGridMapFixedBlindSpot : public OccupancyGridMapInterface

} // namespace costmap_2d

#endif // POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_FIXED_HPP_
#endif // PROBABILISTIC_OCCUPANCY_GRID_MAP__POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_FIXED_HPP_
8 changes: 4 additions & 4 deletions ...rid_map/occupancy_grid_map_projective.hpp → ...rid_map/occupancy_grid_map_projective.hpp
View file
Open in desktop
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.

#ifndef POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_PROJECTIVE_HPP_
#define POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_PROJECTIVE_HPP_
#ifndef PROBABILISTIC_OCCUPANCY_GRID_MAP__POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_PROJECTIVE_HPP_
#define PROBABILISTIC_OCCUPANCY_GRID_MAP__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 Expand Up @@ -52,4 +52,4 @@ class OccupancyGridMapProjectiveBlindSpot : public OccupancyGridMapInterface

} // namespace costmap_2d

#endif // POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_PROJECTIVE_HPP_
#endif // PROBABILISTIC_OCCUPANCY_GRID_MAP__POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__OCCUPANCY_GRID_MAP_PROJECTIVE_HPP_
12 changes: 6 additions & 6 deletions ...ntcloud_based_occupancy_grid_map_node.hpp → ...ntcloud_based_occupancy_grid_map_node.hpp
View file
Open in desktop
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.

#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_
#ifndef PROBABILISTIC_OCCUPANCY_GRID_MAP__POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__POINTCLOUD_BASED_OCCUPANCY_GRID_MAP_NODE_HPP_
#define PROBABILISTIC_OCCUPANCY_GRID_MAP__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 Expand Up @@ -95,4 +95,4 @@ class PointcloudBasedOccupancyGridMapNode : public rclcpp::Node

} // namespace occupancy_grid_map

#endif // POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__POINTCLOUD_BASED_OCCUPANCY_GRID_MAP_NODE_HPP_
#endif // PROBABILISTIC_OCCUPANCY_GRID_MAP__POINTCLOUD_BASED_OCCUPANCY_GRID_MAP__POINTCLOUD_BASED_OCCUPANCY_GRID_MAP_NODE_HPP_
8 changes: 4 additions & 4 deletions ..._grid_map_binary_bayes_filter_updater.hpp → ..._grid_map_binary_bayes_filter_updater.hpp
View file
Open in desktop
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.

#ifndef UPDATER__OCCUPANCY_GRID_MAP_BINARY_BAYES_FILTER_UPDATER_HPP_
#define UPDATER__OCCUPANCY_GRID_MAP_BINARY_BAYES_FILTER_UPDATER_HPP_
#ifndef PROBABILISTIC_OCCUPANCY_GRID_MAP__UPDATER__OCCUPANCY_GRID_MAP_BINARY_BAYES_FILTER_UPDATER_HPP_
#define PROBABILISTIC_OCCUPANCY_GRID_MAP__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 All @@ -39,4 +39,4 @@ class OccupancyGridMapBBFUpdater : public OccupancyGridMapUpdaterInterface

} // namespace costmap_2d

#endif // UPDATER__OCCUPANCY_GRID_MAP_BINARY_BAYES_FILTER_UPDATER_HPP_
#endif // PROBABILISTIC_OCCUPANCY_GRID_MAP__UPDATER__OCCUPANCY_GRID_MAP_BINARY_BAYES_FILTER_UPDATER_HPP_
12 changes: 6 additions & 6 deletions ...rid_map_log_odds_bayes_filter_updater.hpp → ...rid_map_log_odds_bayes_filter_updater.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef UPDATER__OCCUPANCY_GRID_MAP_LOG_ODDS_BAYES_FILTER_UPDATER_HPP_
#define UPDATER__OCCUPANCY_GRID_MAP_LOG_ODDS_BAYES_FILTER_UPDATER_HPP_
#ifndef PROBABILISTIC_OCCUPANCY_GRID_MAP__UPDATER__OCCUPANCY_GRID_MAP_LOG_ODDS_BAYES_FILTER_UPDATER_HPP_
#define PROBABILISTIC_OCCUPANCY_GRID_MAP__UPDATER__OCCUPANCY_GRID_MAP_LOG_ODDS_BAYES_FILTER_UPDATER_HPP_

#include "fusion/single_frame_fusion_policy.hpp"
#include "updater/occupancy_grid_map_updater_interface.hpp"
#include "utils/utils.hpp"
#include "probabilistic_occupancy_grid_map/fusion/single_frame_fusion_policy.hpp"
#include "probabilistic_occupancy_grid_map/updater/occupancy_grid_map_updater_interface.hpp"
#include "probabilistic_occupancy_grid_map/utils/utils.hpp"

#include <eigen3/Eigen/Core>
#include <eigen3/Eigen/Geometry>

// LOBF means: Log Odds Bayes Filter

Check warning on line 25 in perception/probabilistic_occupancy_grid_map/include/probabilistic_occupancy_grid_map/updater/occupancy_grid_map_log_odds_bayes_filter_updater.hpp

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (LOBF)

namespace costmap_2d
{
class OccupancyGridMapLOBFUpdater : public OccupancyGridMapUpdaterInterface

Check warning on line 29 in perception/probabilistic_occupancy_grid_map/include/probabilistic_occupancy_grid_map/updater/occupancy_grid_map_log_odds_bayes_filter_updater.hpp

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (LOBF)
{
public:
enum Index : size_t { OCCUPIED = 0U, FREE = 1U };
OccupancyGridMapLOBFUpdater(

Check warning on line 33 in perception/probabilistic_occupancy_grid_map/include/probabilistic_occupancy_grid_map/updater/occupancy_grid_map_log_odds_bayes_filter_updater.hpp

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (LOBF)
const unsigned int cells_size_x, const unsigned int cells_size_y, const float resolution)
: OccupancyGridMapUpdaterInterface(cells_size_x, cells_size_y, resolution)
{
Expand All @@ -45,4 +45,4 @@

} // namespace costmap_2d

#endif // UPDATER__OCCUPANCY_GRID_MAP_LOG_ODDS_BAYES_FILTER_UPDATER_HPP_
#endif // PROBABILISTIC_OCCUPANCY_GRID_MAP__UPDATER__OCCUPANCY_GRID_MAP_LOG_ODDS_BAYES_FILTER_UPDATER_HPP_
8 changes: 4 additions & 4 deletions .../occupancy_grid_map_updater_interface.hpp → .../occupancy_grid_map_updater_interface.hpp
View file
Open in desktop
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.

#ifndef UPDATER__OCCUPANCY_GRID_MAP_UPDATER_INTERFACE_HPP_
#define UPDATER__OCCUPANCY_GRID_MAP_UPDATER_INTERFACE_HPP_
#ifndef PROBABILISTIC_OCCUPANCY_GRID_MAP__UPDATER__OCCUPANCY_GRID_MAP_UPDATER_INTERFACE_HPP_
#define PROBABILISTIC_OCCUPANCY_GRID_MAP__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 All @@ -38,4 +38,4 @@ class OccupancyGridMapUpdaterInterface : public nav2_costmap_2d::Costmap2D

} // namespace costmap_2d

#endif // UPDATER__OCCUPANCY_GRID_MAP_UPDATER_INTERFACE_HPP_
#endif // PROBABILISTIC_OCCUPANCY_GRID_MAP__UPDATER__OCCUPANCY_GRID_MAP_UPDATER_INTERFACE_HPP_
8 changes: 4 additions & 4 deletions ...ccupancy_grid_map/include/utils/utils.hpp → ...listic_occupancy_grid_map/utils/utils.hpp
View file
Open in desktop
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.

#ifndef UTILS__UTILS_HPP_
#define UTILS__UTILS_HPP_
#ifndef PROBABILISTIC_OCCUPANCY_GRID_MAP__UTILS__UTILS_HPP_
#define PROBABILISTIC_OCCUPANCY_GRID_MAP__UTILS__UTILS_HPP_

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

#include <builtin_interfaces/msg/time.hpp>
#include <pcl_ros/transforms.hpp>
Expand Down Expand Up @@ -119,4 +119,4 @@ bool extractCommonPointCloud(
unsigned char getApproximateOccupancyState(const unsigned char & value);
} // namespace utils

#endif // UTILS__UTILS_HPP_
#endif // PROBABILISTIC_OCCUPANCY_GRID_MAP__UTILS__UTILS_HPP_
2 changes: 1 addition & 1 deletion perception/probabilistic_occupancy_grid_map/src/fusion/single_frame_fusion_policy.cpp
View file
Open in desktop
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 "fusion/single_frame_fusion_policy.hpp"
#include "probabilistic_occupancy_grid_map/fusion/single_frame_fusion_policy.hpp"

namespace fusion_policy
{
Expand Down
6 changes: 3 additions & 3 deletions perception/probabilistic_occupancy_grid_map/src/fusion/synchronized_grid_map_fusion_node.cpp
View file
Open in desktop
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 "fusion/synchronized_grid_map_fusion_node.hpp"
#include "probabilistic_occupancy_grid_map/fusion/synchronized_grid_map_fusion_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"

namespace synchronized_grid_map_fusion
{
Expand Down
6 changes: 3 additions & 3 deletions ...id_map/src/laserscan_based_occupancy_grid_map/laserscan_based_occupancy_grid_map_node.cpp
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ...bilistic_occupancy_grid_map/src/laserscan_based_occupancy_grid_map/occupancy_grid_map.cpp
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions ...ic_occupancy_grid_map/src/pointcloud_based_occupancy_grid_map/occupancy_grid_map_base.cpp
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions ...c_occupancy_grid_map/src/pointcloud_based_occupancy_grid_map/occupancy_grid_map_fixed.cpp
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions ...upancy_grid_map/src/pointcloud_based_occupancy_grid_map/occupancy_grid_map_projective.cpp
View file
Open in desktop
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
10 changes: 5 additions & 5 deletions ..._map/src/pointcloud_based_occupancy_grid_map/pointcloud_based_occupancy_grid_map_node.cpp
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions ...ilistic_occupancy_grid_map/src/updater/occupancy_grid_map_binary_bayes_filter_updater.cpp
View file
Open in desktop
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
Loading
Loading