-
Notifications
You must be signed in to change notification settings - Fork 34
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.
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
feat(control_data_collecting_tool): add trajectory inside circle and lanelet2 trajectory #156
Merged
kosuke55
merged 36 commits into
autowarefoundation:main
from
YoshihiroKogure:feat/trajectory_inside_circle_and_lanelet2_trajectory
Dec 2, 2024
+3,958
−953
Merged
Changes from all commits
Commits
Show all changes
36 commits
Select commit
Hold shift + click to select a range
98cfbb1
Add trajectory inside circle
YoshihiroKogure 6305aa5
Fix bug
YoshihiroKogure 43316cf
Add lanelet2 trajectory
YoshihiroKogure 40c6c9c
pre-commit run
YoshihiroKogure a9d671a
Fix bug
YoshihiroKogure 5d8654a
pre-commit
YoshihiroKogure 61312ec
Update README.md
YoshihiroKogure 4adc140
Add parameter descriptions to the README
YoshihiroKogure 063f281
style(pre-commit): autofix
pre-commit-ci[bot] 1e31241
Revise the content
YoshihiroKogure 2d954d8
style(pre-commit): autofix
pre-commit-ci[bot] ebd457e
Update README
YoshihiroKogure 5f7df16
Update README
YoshihiroKogure d3b8e37
Add comments
YoshihiroKogure 7014de7
Update prameters for along_road course
YoshihiroKogure 80e95a8
style(pre-commit): autofix
pre-commit-ci[bot] 2362225
Add default mask and mask selector
YoshihiroKogure 08bc15e
Add mask to plotter
YoshihiroKogure 857f08b
Data collection concerning Mask
YoshihiroKogure 36ee806
Modify the code to publish the pose
YoshihiroKogure 9f6e7ef
style(pre-commit): autofix
pre-commit-ci[bot] ef6afa9
Modify to work even when map_path is not provided
YoshihiroKogure c6d6cfb
Add steer rate plot
YoshihiroKogure 3537a91
Update README.md and fix typo
YoshihiroKogure 42e524e
Changes to the README and parameter values
YoshihiroKogure fa6c2a7
fix markdownlint
kosuke55 b5a4630
ignore prettier
kosuke55 edf18ab
Fix typo
YoshihiroKogure 57856fa
style(pre-commit): autofix
pre-commit-ci[bot] 31449f9
Add cpell:ignore
YoshihiroKogure ffd36b1
Remove cspell:ignore
YoshihiroKogure 50f46bd
Merge branch 'main' into feat/trajectory_inside_circle_and_lanelet2_t…
YoshihiroKogure d372051
Merge branch 'feat/default_mask' into feat/trajectory_inside_circle_a…
YoshihiroKogure 1cdbd05
style(pre-commit): autofix
pre-commit-ci[bot] 1f5ec46
Revert "style(pre-commit): autofix"
YoshihiroKogure f98536d
Revert "Merge branch 'feat/default_mask' into feat/trajectory_inside_…
YoshihiroKogure File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
/**: | ||
ros__parameters: | ||
LOAD_ROSBAG2_FILES: true | ||
|
||
# COURSE_NAME: eight_course | ||
# COURSE_NAME: u_shaped_return | ||
# COURSE_NAME: straight_line_positive | ||
# COURSE_NAME: straight_line_negative | ||
COURSE_NAME: reversal_loop_circle | ||
# COURSE_NAME: along_road | ||
|
||
NUM_BINS_V: 10 | ||
NUM_BINS_STEER: 20 | ||
NUM_BINS_A: 10 | ||
V_MIN: 0.0 | ||
V_MAX: 11.5 | ||
STEER_MIN: -0.6 | ||
STEER_MAX: 0.6 | ||
A_MIN: -1.0 | ||
A_MAX: 1.0 | ||
|
||
max_lateral_accel: 2.00 | ||
lateral_error_threshold: 1.50 | ||
yaw_error_threshold: 0.75 | ||
velocity_limit_by_tracking_error: 1.0 | ||
mov_ave_window: 50 | ||
target_longitudinal_velocity: 6.0 | ||
|
||
pure_pursuit_type: linearized | ||
# pure_pursuit_type: naive | ||
wheel_base: 2.79 | ||
acc_kp: 1.0 | ||
lookahead_time: 2.0 | ||
min_lookahead: 2.0 | ||
linearized_pure_pursuit_steer_kp_param: 2.0 | ||
linearized_pure_pursuit_steer_kd_param: 2.0 | ||
stop_acc: -2.0 | ||
stop_jerk_lim: 5.0 | ||
lon_acc_lim: 1.5 | ||
lon_jerk_lim: 0.5 | ||
steer_lim: 0.6 | ||
steer_rate_lim: 0.6 |
29 changes: 29 additions & 0 deletions
29
control_data_collecting_tool/config/course_param/along_road_param.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/**: | ||
ros__parameters: | ||
# Course Specific Parameters | ||
velocity_on_curve: 3.5 | ||
stopping_distance: 15.0 | ||
course_width: 1.5 | ||
smoothing_window: 100 | ||
length_of_straight_line: 50.0 | ||
longitude: 139.6503 | ||
latitude: 35.6762 | ||
|
||
# Data Collection Range | ||
COLLECTING_DATA_V_MIN: 0.5 | ||
COLLECTING_DATA_V_MAX: 8.0 | ||
COLLECTING_DATA_A_MIN: -1.0 | ||
COLLECTING_DATA_A_MAX: 1.0 | ||
|
||
# Noise Parameters | ||
longitudinal_velocity_noise_amp: 0.01 | ||
longitudinal_velocity_noise_min_period: 5.0 | ||
longitudinal_velocity_noise_max_period: 20.0 | ||
|
||
acc_noise_amp: 0.01 | ||
acc_noise_min_period: 5.0 | ||
acc_noise_max_period: 20.0 | ||
|
||
steer_noise_amp: 0.01 | ||
steer_noise_min_period: 5.0 | ||
steer_noise_max_period: 20.0 |
24 changes: 24 additions & 0 deletions
24
control_data_collecting_tool/config/course_param/eight_course_param.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
/**: | ||
ros__parameters: | ||
# Course Specific Parameters | ||
velocity_on_curve: 4.5 | ||
smoothing_window: 400 | ||
|
||
# Data Collection Range | ||
COLLECTING_DATA_V_MIN: 0.5 | ||
COLLECTING_DATA_V_MAX: 8.0 | ||
COLLECTING_DATA_A_MIN: -1.0 | ||
COLLECTING_DATA_A_MAX: 1.0 | ||
|
||
# Noise Parameters | ||
longitudinal_velocity_noise_amp: 0.01 | ||
longitudinal_velocity_noise_min_period: 5.0 | ||
longitudinal_velocity_noise_max_period: 20.0 | ||
|
||
acc_noise_amp: 0.01 | ||
acc_noise_min_period: 5.0 | ||
acc_noise_max_period: 20.0 | ||
|
||
steer_noise_amp: 0.01 | ||
steer_noise_min_period: 5.0 | ||
steer_noise_max_period: 20.0 |
25 changes: 25 additions & 0 deletions
25
control_data_collecting_tool/config/course_param/reversal_loop_circle_param.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
/**: | ||
ros__parameters: | ||
# Course Specific Parameters | ||
trajectory_radius: 35.0 | ||
enclosing_radius: 40.0 | ||
look_ahead_distance: 15.0 | ||
|
||
# Data Collection Range | ||
COLLECTING_DATA_V_MIN: 0.5 | ||
COLLECTING_DATA_V_MAX: 8.0 | ||
COLLECTING_DATA_A_MIN: -1.0 | ||
COLLECTING_DATA_A_MAX: 1.0 | ||
|
||
# Noise Parameters | ||
longitudinal_velocity_noise_amp: 0.01 | ||
longitudinal_velocity_noise_min_period: 5.0 | ||
longitudinal_velocity_noise_max_period: 20.0 | ||
|
||
acc_noise_amp: 0.01 | ||
acc_noise_min_period: 5.0 | ||
acc_noise_max_period: 20.0 | ||
|
||
steer_noise_amp: 0.01 | ||
steer_noise_min_period: 5.0 | ||
steer_noise_max_period: 20.0 |
23 changes: 23 additions & 0 deletions
23
control_data_collecting_tool/config/course_param/straight_line_negative_param.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
/**: | ||
ros__parameters: | ||
# Course Specific Parameters | ||
stopping_buffer_distance: 10.0 | ||
|
||
# Data Collection Range | ||
COLLECTING_DATA_V_MIN: 0.5 | ||
COLLECTING_DATA_V_MAX: 8.0 | ||
COLLECTING_DATA_A_MIN: -1.0 | ||
COLLECTING_DATA_A_MAX: 1.0 | ||
|
||
# Noise Parameters | ||
longitudinal_velocity_noise_amp: 0.01 | ||
longitudinal_velocity_noise_min_period: 5.0 | ||
longitudinal_velocity_noise_max_period: 20.0 | ||
|
||
acc_noise_amp: 0.01 | ||
acc_noise_min_period: 5.0 | ||
acc_noise_max_period: 20.0 | ||
|
||
steer_noise_amp: 0.01 | ||
steer_noise_min_period: 5.0 | ||
steer_noise_max_period: 20.0 |
23 changes: 23 additions & 0 deletions
23
control_data_collecting_tool/config/course_param/straight_line_positive_param.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
/**: | ||
ros__parameters: | ||
# Course Specific Parameters | ||
stopping_buffer_distance: 10.0 | ||
|
||
# Data Collection Range | ||
COLLECTING_DATA_V_MIN: 0.5 | ||
COLLECTING_DATA_V_MAX: 8.0 | ||
COLLECTING_DATA_A_MIN: -1.0 | ||
COLLECTING_DATA_A_MAX: 1.0 | ||
|
||
# Noise Parameters | ||
longitudinal_velocity_noise_amp: 0.01 | ||
longitudinal_velocity_noise_min_period: 5.0 | ||
longitudinal_velocity_noise_max_period: 20.0 | ||
|
||
acc_noise_amp: 0.01 | ||
acc_noise_min_period: 5.0 | ||
acc_noise_max_period: 20.0 | ||
|
||
steer_noise_amp: 0.01 | ||
steer_noise_min_period: 5.0 | ||
steer_noise_max_period: 20.0 |
23 changes: 23 additions & 0 deletions
23
control_data_collecting_tool/config/course_param/u_shaped_return_param.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
/**: | ||
ros__parameters: | ||
# Course Specific Parameters | ||
velocity_on_curve: 4.5 | ||
|
||
# Data Collection Range | ||
COLLECTING_DATA_V_MIN: 0.5 | ||
COLLECTING_DATA_V_MAX: 8.0 | ||
COLLECTING_DATA_A_MIN: -1.0 | ||
COLLECTING_DATA_A_MAX: 1.0 | ||
|
||
# Noise Parameters | ||
longitudinal_velocity_noise_amp: 0.01 | ||
longitudinal_velocity_noise_min_period: 5.0 | ||
longitudinal_velocity_noise_max_period: 20.0 | ||
|
||
acc_noise_amp: 0.01 | ||
acc_noise_min_period: 5.0 | ||
acc_noise_max_period: 20.0 | ||
|
||
steer_noise_amp: 0.01 | ||
steer_noise_min_period: 5.0 | ||
steer_noise_max_period: 20.0 |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
memo: the data collection area only indicates the center, currently need to set in params.
better to specify radius from area in the future