Skip to content

Commit 316be18

Browse files
committed
Update readme an tests
Signed-off-by: Alberto Tudela <[email protected]>
1 parent 26688ec commit 316be18

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

README.md

-8
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,6 @@ Segmentation of the laserscans.
128128

129129
Parameter for noise reduction in "Santos" and "Dietmayer" algorithms.
130130

131-
## Future work
132-
- [ ] Add Delaunay triangulation method based on "Human Detection using Multimodal and Multidimensional Features" (Spinello).
133-
- [ ] Add Agglomerative Hierarchical Clustering.
134-
- [x] Change the decay of the markers because sometimes Rviz doesn't erase them. Maybe delete all at the end?
135-
- [x] Update distance_threshold / method_threshold parameters. Too confusion.
136-
- [ ] Restore default parameters in runtime.
137-
- [x] Convert nodes to LifeCycleNodes.
138-
139131
[Ubuntu]: https://ubuntu.com/
140132
[ROS2]: https://docs.ros.org/en/humble/
141133
[Rviz2]: https://github.com/ros2/rviz

test/test_laser_segmentation.cpp

+14-8
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ class LaserSegmentationColorTest
138138
TEST_P(LaserSegmentationColorTest, color)
139139
{
140140
auto node = std::make_shared<laserSegmentationFixture>();
141+
node->configure();
141142
auto index = std::get<0>(GetParam());
142143
auto expected_color = std::get<1>(GetParam());
143144
auto color = node->get_palette_color(index);
@@ -164,6 +165,7 @@ INSTANTIATE_TEST_SUITE_P(
164165
TEST(LaserSegmentationTest, createVizPoints) {
165166
// Create the node
166167
auto node = std::make_shared<laserSegmentationFixture>();
168+
node->configure();
167169
// Set a segment list with one segment of 3 points
168170
std_msgs::msg::Header header;
169171
header.frame_id = "laser_frame";
@@ -208,7 +210,6 @@ TEST(LaserSegmentationTest, createVizPoints) {
208210
TEST(LaserSegmentationTest, filterSegments) {
209211
// Create the node
210212
auto node = std::make_shared<laserSegmentationFixture>();
211-
212213
// Set the parameters
213214
nav2_util::declare_parameter_if_not_declared(
214215
node, "min_points_segment", rclcpp::ParameterValue(1));
@@ -303,26 +304,31 @@ TEST(LaserSegmentationTest, filterSegments) {
303304
// Check the filtered segments
304305
EXPECT_EQ(filtered_segments.size(), 0);
305306

306-
// Set a segment list with 2 segment with 2 points
307+
// Set a segment list with several segments
307308
segment_list.clear();
308309
segment.clear();
309310
segment.add_point(slg::Point2D(0.0, 0.0, slg::BACKGROUND));
311+
segment_list.push_back(segment);
312+
segment.add_point(slg::Point2D(0.0, 0.0, slg::BACKGROUND));
310313
segment.add_point(slg::Point2D(1.0, 1.0, slg::BACKGROUND));
311-
std::cout << "Width: " << segment.width_squared() << std::endl;
312-
std::cout << "Centroid: " << segment.centroid().x << " " << segment.centroid().y << std::endl;
313314
segment_list.push_back(segment);
314315
segment.clear();
315316
segment.add_point(slg::Point2D(2.0, 2.0, slg::BACKGROUND));
316317
segment.add_point(slg::Point2D(3.0, 3.0, slg::BACKGROUND));
317-
std::cout << "Width: " << segment.width_squared() << std::endl;
318-
std::cout << "Centroid: " << segment.centroid().x << " " << segment.centroid().y << std::endl;
318+
segment.add_point(slg::Point2D(4.0, 4.0, slg::BACKGROUND));
319+
segment_list.push_back(segment);
320+
segment.clear();
321+
segment.add_point(slg::Point2D(5.0, 5.0, slg::BACKGROUND));
322+
segment.add_point(slg::Point2D(6.0, 6.0, slg::BACKGROUND));
323+
segment.add_point(slg::Point2D(7.0, 7.0, slg::BACKGROUND));
324+
segment.add_point(slg::Point2D(8.0, 8.0, slg::BACKGROUND));
319325
segment_list.push_back(segment);
320326
// Filter the segments
321327
filtered_segments = node->filter_segments(segment_list);
322328
// Check the filtered segments
323329
EXPECT_EQ(filtered_segments.size(), 1);
324-
EXPECT_EQ(filtered_segments[0].centroid().x, 2.5);
325-
EXPECT_EQ(filtered_segments[0].centroid().y, 2.5);
330+
EXPECT_EQ(filtered_segments[0].centroid().x, 3.0);
331+
EXPECT_EQ(filtered_segments[0].centroid().y, 3.0);
326332
}
327333

328334
int main(int argc, char ** argv)

0 commit comments

Comments
 (0)