Skip to content

Commit 757a5a5

Browse files
refactor(ndt_scan_marcher): add namespace "autoware::ndt_scan_matcher::" (autowarefoundation#8691)
* Added namespace "autoware::ndt_scan_matcher::" Signed-off-by: Shintaro Sakoda <shintaro.sakoda@tier4.jp> * Added namespace "autoware::ndt_scan_matcher::" Signed-off-by: Shintaro Sakoda <shintaro.sakoda@tier4.jp> --------- Signed-off-by: Shintaro Sakoda <shintaro.sakoda@tier4.jp>
1 parent 58297a0 commit 757a5a5

9 files changed

+38
-4
lines changed

localization/ndt_scan_matcher/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ link_directories(${PCL_LIBRARY_DIRS})
3535
target_link_libraries(ndt_scan_matcher ${PCL_LIBRARIES})
3636

3737
rclcpp_components_register_node(${PROJECT_NAME}
38-
PLUGIN "NDTScanMatcher"
38+
PLUGIN "autoware::ndt_scan_matcher::NDTScanMatcher"
3939
EXECUTABLE ${PROJECT_NAME}_node
4040
EXECUTOR MultiThreadedExecutor
4141
)

localization/ndt_scan_matcher/include/ndt_scan_matcher/hyper_parameters.hpp

+5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
#include <string>
2525
#include <vector>
2626

27+
namespace autoware::ndt_scan_matcher
28+
{
29+
2730
enum class ConvergedParamType {
2831
TRANSFORM_PROBABILITY = 0,
2932
NEAREST_VOXEL_TRANSFORMATION_LIKELIHOOD = 1
@@ -191,4 +194,6 @@ struct HyperParameters
191194
}
192195
};
193196

197+
} // namespace autoware::ndt_scan_matcher
198+
194199
#endif // NDT_SCAN_MATCHER__HYPER_PARAMETERS_HPP_

localization/ndt_scan_matcher/include/ndt_scan_matcher/map_update_module.hpp

+5
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
#include <thread>
4141
#include <vector>
4242

43+
namespace autoware::ndt_scan_matcher
44+
{
45+
4346
class MapUpdateModule
4447
{
4548
using PointSource = pcl::PointXYZ;
@@ -95,4 +98,6 @@ class MapUpdateModule
9598
std::mutex last_update_position_mtx_;
9699
};
97100

101+
} // namespace autoware::ndt_scan_matcher
102+
98103
#endif // NDT_SCAN_MATCHER__MAP_UPDATE_MODULE_HPP_

localization/ndt_scan_matcher/include/ndt_scan_matcher/ndt_scan_matcher_core.hpp

+5
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@
6969
#include <tuple>
7070
#include <vector>
7171

72+
namespace autoware::ndt_scan_matcher
73+
{
74+
7275
class NDTScanMatcher : public rclcpp::Node
7376
{
7477
using PointSource = pcl::PointXYZ;
@@ -209,4 +212,6 @@ class NDTScanMatcher : public rclcpp::Node
209212
HyperParameters param_;
210213
};
211214

215+
} // namespace autoware::ndt_scan_matcher
216+
212217
#endif // NDT_SCAN_MATCHER__NDT_SCAN_MATCHER_CORE_HPP_

localization/ndt_scan_matcher/include/ndt_scan_matcher/particle.hpp

+5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
#include <string>
2222

23+
namespace autoware::ndt_scan_matcher
24+
{
25+
2326
struct Particle
2427
{
2528
Particle(
@@ -38,4 +41,6 @@ void push_debug_markers(
3841
visualization_msgs::msg::MarkerArray & marker_array, const builtin_interfaces::msg::Time & stamp,
3942
const std::string & map_frame_, const Particle & particle, const size_t i);
4043

44+
} // namespace autoware::ndt_scan_matcher
45+
4146
#endif // NDT_SCAN_MATCHER__PARTICLE_HPP_

localization/ndt_scan_matcher/src/map_update_module.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
#include "ndt_scan_matcher/map_update_module.hpp"
1616

17+
namespace autoware::ndt_scan_matcher
18+
{
19+
1720
MapUpdateModule::MapUpdateModule(
1821
rclcpp::Node * node, std::mutex * ndt_ptr_mutex, NdtPtrType & ndt_ptr,
1922
HyperParameters::DynamicMapLoading param)
@@ -312,3 +315,5 @@ void MapUpdateModule::publish_partial_pcd_map()
312315

313316
loaded_pcd_pub_->publish(map_msg);
314317
}
318+
319+
} // namespace autoware::ndt_scan_matcher

localization/ndt_scan_matcher/src/ndt_scan_matcher_core.cpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
#include <iomanip>
3838
#include <thread>
3939

40+
namespace autoware::ndt_scan_matcher
41+
{
42+
4043
tier4_debug_msgs::msg::Float32Stamped make_float32_stamped(
4144
const builtin_interfaces::msg::Time & stamp, const float data)
4245
{
@@ -1111,5 +1114,7 @@ std::tuple<geometry_msgs::msg::PoseWithCovarianceStamped, double> NDTScanMatcher
11111114
return std::make_tuple(result_pose_with_cov_msg, best_particle_ptr->score);
11121115
}
11131116

1117+
} // namespace autoware::ndt_scan_matcher
1118+
11141119
#include <rclcpp_components/register_node_macro.hpp>
1115-
RCLCPP_COMPONENTS_REGISTER_NODE(NDTScanMatcher)
1120+
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::ndt_scan_matcher::NDTScanMatcher)

localization/ndt_scan_matcher/src/particle.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
#include "ndt_scan_matcher/particle.hpp"
1616

1717
#include "localization_util/util_func.hpp"
18+
namespace autoware::ndt_scan_matcher
19+
{
1820

1921
void push_debug_markers(
2022
visualization_msgs::msg::MarkerArray & marker_array, const builtin_interfaces::msg::Time & stamp,
@@ -61,3 +63,5 @@ void push_debug_markers(
6163
marker.color = exchange_color_crc(static_cast<double>(i) / 100.0);
6264
marker_array.markers.push_back(marker);
6365
}
66+
67+
} // namespace autoware::ndt_scan_matcher

localization/ndt_scan_matcher/test/test_fixture.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class TestNDTScanMatcher : public ::testing::Test
5353
node_options.parameter_overrides().push_back(param);
5454
}
5555
}
56-
node_ = std::make_shared<NDTScanMatcher>(node_options);
56+
node_ = std::make_shared<autoware::ndt_scan_matcher::NDTScanMatcher>(node_options);
5757
rcl_yaml_node_struct_fini(params_st);
5858

5959
// prepare tf_static "base_link -> sensor_frame"
@@ -79,7 +79,7 @@ class TestNDTScanMatcher : public ::testing::Test
7979
sensor_pcd_publisher_ = std::make_shared<StubSensorPcdPublisher>();
8080
}
8181

82-
std::shared_ptr<NDTScanMatcher> node_;
82+
std::shared_ptr<autoware::ndt_scan_matcher::NDTScanMatcher> node_;
8383
std::shared_ptr<tf2_ros::StaticTransformBroadcaster> tf_broadcaster_;
8484
std::shared_ptr<StubPcdLoader> pcd_loader_;
8585
std::shared_ptr<StubInitialposeClient> initialpose_client_;

0 commit comments

Comments
 (0)