Skip to content

Commit

Permalink
Merge branch 'main' into chore/tracking_object_merger/use_config
Browse files Browse the repository at this point in the history
  • Loading branch information
kminoda authored Jan 26, 2024
2 parents 07e2ad7 + 57cf88d commit 85195f2
Show file tree
Hide file tree
Showing 31 changed files with 802 additions and 194 deletions.
8 changes: 1 addition & 7 deletions localization/localization_error_monitor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,4 @@ The package monitors the following two values:

## Parameters

| Name | Type | Description |
| -------------------------------------- | ------ | -------------------------------------------------------------------------------------------- |
| `scale` | double | scale factor for monitored values (default: 3.0) |
| `error_ellipse_size` | double | error threshold for long radius of confidence ellipse [m] (default: 1.0) |
| `warn_ellipse_size` | double | warning threshold for long radius of confidence ellipse [m] (default: 0.8) |
| `error_ellipse_size_lateral_direction` | double | error threshold for size of confidence ellipse along lateral direction [m] (default: 0.3) |
| `warn_ellipse_size_lateral_direction` | double | warning threshold for size of confidence ellipse along lateral direction [m] (default: 0.25) |
{{ json_to_markdown("localization/localization_error_monitor/schema/localization_error_monitor.schema.json") }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "Parameters for Localization Error Monitor node",
"type": "object",
"definitions": {
"localization_error_monitor": {
"type": "object",
"properties": {
"scale": {
"type": "number",
"default": 3.0,
"description": "scale factor for monitored values"
},
"error_ellipse_size": {
"type": "number",
"default": 1.5,
"description": "error threshold for long radius of confidence ellipse [m]"
},
"warn_ellipse_size": {
"type": "number",
"default": 1.2,
"description": "warning threshold for long radius of confidence ellipse [m]"
},
"error_ellipse_size_lateral_direction": {
"type": "number",
"default": 0.3,
"description": "error threshold for size of confidence ellipse along lateral direction [m]"
},
"warn_ellipse_size_lateral_direction": {
"type": "number",
"default": 0.25,
"description": "warning threshold for size of confidence ellipse along lateral direction [m]"
}
},
"required": [
"scale",
"error_ellipse_size",
"warn_ellipse_size",
"error_ellipse_size_lateral_direction",
"warn_ellipse_size_lateral_direction"
]
}
},
"properties": {
"/**": {
"type": "object",
"properties": {
"ros__parameters": {
"$ref": "#/definitions/localization_error_monitor"
}
},
"required": ["ros__parameters"]
}
},
"required": ["/**"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
# Tolerance of distance difference between two initial poses used for linear interpolation. [m]
initial_pose_distance_tolerance_m: 10.0

# The execution time which means probably NDT cannot matches scans properly. [ms]
critical_upper_bound_exe_time_ms: 100.0

# Number of threads used for parallel computing
num_threads: 4

Expand Down Expand Up @@ -98,6 +101,3 @@

# If lidar_point.z - base_link.z <= this threshold , the point will be removed
z_margin_for_ground_removal: 0.8

# The execution time which means probably NDT cannot matches scans properly. [ms]
critical_upper_bound_exe_time_ms: 100
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ class NDTScanMatcher : public rclcpp::Node
double z_margin_for_ground_removal_;

// The execution time which means probably NDT cannot matches scans properly
int64_t critical_upper_bound_exe_time_ms_;
double critical_upper_bound_exe_time_ms_;
};

#endif // NDT_SCAN_MATCHER__NDT_SCAN_MATCHER_CORE_HPP_
5 changes: 2 additions & 3 deletions localization/ndt_scan_matcher/src/ndt_scan_matcher_core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ NDTScanMatcher::NDTScanMatcher()
lidar_topic_timeout_sec_ = this->declare_parameter<double>("lidar_topic_timeout_sec");

critical_upper_bound_exe_time_ms_ =
this->declare_parameter<int64_t>("critical_upper_bound_exe_time_ms");
this->declare_parameter<double>("critical_upper_bound_exe_time_ms");

initial_pose_timeout_sec_ = this->declare_parameter<double>("initial_pose_timeout_sec");

Expand Down Expand Up @@ -316,8 +316,7 @@ void NDTScanMatcher::publish_diagnostic()
}
if (
state_ptr_->count("execution_time") &&
std::stod((*state_ptr_)["execution_time"]) >=
static_cast<double>(critical_upper_bound_exe_time_ms_)) {
std::stod((*state_ptr_)["execution_time"]) >= critical_upper_bound_exe_time_ms_) {
diag_status_msg.level = diagnostic_msgs::msg::DiagnosticStatus::WARN;
diag_status_msg.message +=
"NDT exe time is too long. (took " + (*state_ptr_)["execution_time"] + " [ms])";
Expand Down
6 changes: 1 addition & 5 deletions localization/yabloc/yabloc_common/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,4 @@ This node extracts the elements related to the road surface markings and yabloc

### Parameters

| Name | Type | Description |
| --------------------- | ---------------- | ---------------------------------------------------------------------- |
| `road_marking_labels` | vector\<string\> | This label is used to extract the road surface markings from lanelet2. |
| `sign_board_labels` | vector\<string\> | This label is used to extract the traffic sign boards from lanelet2. |
| `bounding_box_labels` | vector\<string\> | This label is used to extract the bounding boxes from lanelet2. |
{{ json_to_markdown("localization/yabloc/yabloc_common/schema/ll2_decomposer.schema.json") }}
43 changes: 43 additions & 0 deletions localization/yabloc/yabloc_common/schema/ground_server.schema.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "Parameters for ground_server",
"type": "object",
"definitions": {
"ground_server": {
"type": "object",
"properties": {
"force_zero_tilt": {
"type": "boolean",
"description": "if true, the tilt is always determined to be horizontal",
"default": false
},
"K": {
"type": "number",
"description": "the number of neighbors for ground search on a map",
"default": 50
},
"R": {
"type": "number",
"description": "radius for ground search on a map [m]",
"default": 10
}
},
"required": ["force_zero_tilt", "K", "R"],
"additionalProperties": false
}
},
"properties": {
"/**": {
"type": "object",
"properties": {
"ros__parameters": {
"$ref": "#/definitions/ground_server"
}
},
"required": ["ros__parameters"],
"additionalProperties": false
}
},
"required": ["/**"],
"additionalProperties": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "Parameters for ll2_decomposer",
"type": "object",
"definitions": {
"ll2_decomposer": {
"type": "object",
"properties": {
"road_marking_labels": {
"type": "array",
"description": "line string types that indicating road surface markings in lanelet2",
"default": [
"cross_walk",
"zebra_marking",
"line_thin",
"line_thick",
"pedestrian_marking",
"stop_line",
"road_border"
]
},
"sign_board_labels": {
"type": "array",
"description": "line string types that indicating traffic sign boards in lanelet2",
"default": ["sign-board"]
},
"bounding_box_labels": {
"type": "array",
"description": "line string types that indicating not mapped areas in lanelet2",
"default": ["none"]
}
},
"required": ["road_marking_labels", "sign_board_labels", "bounding_box_labels"],
"additionalProperties": false
}
},
"properties": {
"/**": {
"type": "object",
"properties": {
"ros__parameters": {
"$ref": "#/definitions/ll2_decomposer"
}
},
"required": ["ros__parameters"],
"additionalProperties": false
}
},
"required": ["/**"],
"additionalProperties": false
}
15 changes: 2 additions & 13 deletions localization/yabloc/yabloc_image_processing/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,7 @@ This is a node that integrates the results of graph_segment and lsd to extract r

### Parameters

| Name | Type | Description |
| -------------------------------------- | ------ | ------------------------------------------------------------------- |
| `min_segment_length` | double | min length threshold (if it is negative, it is unlimited) |
| `max_segment_distance` | double | max distance threshold (if it is negative, it is unlimited) |
| `max_lateral_distance` | double | max lateral distance threshold (if it is negative, it is unlimited) |
| `publish_image_with_segment_for_debug` | bool | toggle whether to publish the filtered line segment for debug |
| `max_range` | double | range of debug projection visualization |
| `image_size` | int | image size of debug projection visualization |
{{ json_to_markdown("localization/yabloc/yabloc_common/schema/segment_filter.schema.json") }}

## undistort

Expand Down Expand Up @@ -127,11 +120,7 @@ This is to avoid redundant decompression within Autoware.

### Parameters

| Name | Type | Description |
| ------------------- | ------ | ---------------------------------------------------------------------------------------------- |
| `use_sensor_qos` | bool | where to use sensor qos or not |
| `width` | int | resized image width size |
| `override_frame_id` | string | value for overriding the camera's frame_id. if blank, frame_id of static_tf is not overwritten |
{{ json_to_markdown("localization/yabloc/yabloc_common/schema/undistort.schema.json") }}

#### about tf_static overriding

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "Parameters for graph_segment",
"type": "object",
"definitions": {
"graph_segment": {
"type": "object",
"properties": {
"target_height_ratio": {
"type": "number",
"description": "height on the image to retrieve the candidate road surface",
"default": 0.85
},
"target_candidate_box_width": {
"type": "number",
"description": "size of the square area to search for candidate road surfaces",
"default": 15
},
"pickup_additional_graph_segment": {
"type": "boolean",
"description": "if this is true, additional regions of similar color are retrieved",
"default": true
},
"similarity_score_threshold": {
"type": "number",
"description": "threshold for picking up additional areas",
"default": 0.8
},
"sigma": {
"type": "number",
"description": "parameter for cv::ximgproc::segmentation::GraphSegmentation",
"default": 0.5
},
"k": {
"type": "number",
"description": "parameter for cv::ximgproc::segmentation::GraphSegmentation",
"default": 300.0
},
"min_size": {
"type": "number",
"description": "parameter for cv::ximgproc::segmentation::GraphSegmentation",
"default": 100.0
}
},
"required": [
"target_height_ratio",
"target_candidate_box_width",
"pickup_additional_graph_segment",
"similarity_score_threshold",
"sigma",
"k",
"min_size"
],
"additionalProperties": false
}
},
"properties": {
"/**": {
"type": "object",
"properties": {
"ros__parameters": {
"$ref": "#/definitions/graph_segment"
}
},
"required": ["ros__parameters"],
"additionalProperties": false
}
},
"required": ["/**"],
"additionalProperties": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "Parameters for segment_filter",
"type": "object",
"definitions": {
"segment_filter": {
"type": "object",
"properties": {
"min_segment_length": {
"type": "number",
"description": "min length threshold (if it is negative, it is unlimited)",
"default": 1.5
},
"max_segment_distance": {
"type": "number",
"description": "max distance threshold (if it is negative, it is unlimited)",
"default": 30.0
},
"max_lateral_distance": {
"type": "number",
"description": "max lateral distance threshold (if it is negative, it is unlimited)",
"default": 10.0
},
"publish_image_with_segment_for_debug": {
"type": "boolean",
"description": "toggle whether to publish the filtered line segment for debug",
"default": true
},
"max_range": {
"type": "number",
"description": "range of debug projection visualization",
"default": 20.0
},
"image_size": {
"type": "number",
"description": "image size of debug projection visualization",
"default": 800
}
},
"required": [
"min_segment_length",
"max_segment_distance",
"max_lateral_distance",
"publish_image_with_segment_for_debug",
"max_range",
"image_size"
],
"additionalProperties": false
}
},
"properties": {
"/**": {
"type": "object",
"properties": {
"ros__parameters": {
"$ref": "#/definitions/segment_filter"
}
},
"required": ["ros__parameters"],
"additionalProperties": false
}
},
"required": ["/**"],
"additionalProperties": false
}
Loading

0 comments on commit 85195f2

Please sign in to comment.