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.

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(data_collecting_tool): add multiple courses #113

Merged
merged 11 commits into from
Sep 27, 2024

Conversation

YoshihiroKogure
Copy link
Contributor

Description

Course Selection

Added several courses to accommodate various cases of data collection.
You can use following courses by setting COURSE_NAME to "eight_course", "u_shaped_return", "straight_line_positive" or "straight_line_negative" in data_collecting_trajectory_publisher.py.
( Both "straight_line_positive" and "straight_line_negative" represent straight line courses, but the direction of travel of the course is reversed.)

  • Eight course
    eight

  • U-shaped course
    u_shaped

  • Straight line course
    straight

Increased Frequency

There was a problem with the frequency dropping when plotting data counts in real time. This problem was mitigated via threading and Callback Groups.

Related links

Tests performed

Notes for reviewers

Interface changes

Effects on system behavior

Pre-review checklist for the PR author

The PR author must check the checkboxes below when creating the PR.

In-review checklist for the PR reviewers

The PR reviewers must check the checkboxes below before approval.

  • The PR follows the pull request guidelines.
  • The PR has been properly tested.
  • The PR has been reviewed by the code owners.

Post-review checklist for the PR author

The PR author must check the checkboxes below before merging.

  • There are no open discussions or they are tracked via tickets.
  • The PR is ready for merge.

After all checkboxes are checked, anyone who has write access can merge the PR.

@@ -410,22 +749,52 @@ def updateNominalTargetTrajectory(self):

long_side_margin = 5
long_side_margin = 5
total_distance = ld * (1 + np.pi) * 2
# total_distance = ld * (1 + np.pi) * 2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remove commentout if it is not necessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your feedback. I removed commentout.

@@ -372,7 +711,7 @@ def updateNominalTargetTrajectory(self):
lb = (l2 + l4) / 2
if np.abs(la - lb) < 1e-6:
la += 0.1 # long_side_length must not be equal to short_side_length
ld = np.sqrt(la**2 + lb**2)
# ld = np.sqrt(la**2 + lb**2)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remove commentout if it is not necessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your feedback. I removed commentout.

@kosuke55
Copy link
Contributor

confirmed that it works in my environment.

image

internal slack: https://star4.slack.com/archives/C05UHMNSE5C/p1726122855613459?thread_ts=1726120701.103249&cid=C05UHMNSE5C

Copy link
Contributor

@SakodaShintaro SakodaShintaro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know why, but there are some unnecessary differences related to map and so on. Please follow the latest main.

Signed-off-by: Yoshihiro Kogure <[email protected]>
Signed-off-by: Yoshihiro Kogure <[email protected]>
Signed-off-by: Yoshihiro Kogure <[email protected]>
Signed-off-by: Yoshihiro Kogure <[email protected]>
Signed-off-by: Yoshihiro Kogure <[email protected]>
Signed-off-by: Yoshihiro Kogure <[email protected]>
Signed-off-by: Yoshihiro Kogure <[email protected]>
Signed-off-by: Yoshihiro Kogure <[email protected]>
@kosuke55
Copy link
Contributor

kosuke55 commented Sep 26, 2024

I don't know why, but there are some unnecessary differences related to map and so on. Please follow the latest main.

rebased on main to fix commits

This reverts commit 369fb12.

Signed-off-by: Yoshihiro Kogure <[email protected]>
Signed-off-by: Yoshihiro Kogure <[email protected]>
Signed-off-by: Yoshihiro Kogure <[email protected]>
@kosuke55 kosuke55 merged commit 56d1758 into autowarefoundation:main Sep 27, 2024
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants