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.

Sign up for GitHub

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

Jump to bottom

Feature/time to collision condition #1258

Merged
merged 62 commits into from
Dec 16, 2024
Merged

Feature/time to collision condition #1258

merged 62 commits into from
Dec 16, 2024

Conversation

yamacir-kit
Copy link
Collaborator

@yamacir-kit yamacir-kit commented May 21, 2024 •
edited
Loading

Description

Abstract

Added partial support for OpenSCENARIO XML 1.3.1 TimeToCollisionCondition.

Background

None.

Details

None.

References

Destructive Changes

None.

Known Limitations

Since TimeToCollisionCondition is implemented using DistanceCondition, RelativeDistanceCondition, SpeedCondition, and RelativeSpeedCondition, if a combination of properties that is not supported by those Conditions is given to TimeToCollisionCondition, an error will be thrown.

@yamacir-kit yamacir-kit added the bump minor If this pull request merged, bump minor version of the scenario_simulator_v2 label May 21, 2024
@yamacir-kit yamacir-kit self-assigned this May 21, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented May 21, 2024 •
edited by HansRobo
Loading

Checklist for reviewers ☑️

All references to "You" in the following text refer to the code reviewer.

  • Is this pull request written in a way that is easy to read from a third-party perspective?
  • Is there sufficient information (background, purpose, specification, algorithm description, list of disruptive changes, and migration guide) in the description of this pull request?
  • If this pull request contains a destructive change, does this pull request contain the migration guide?
  • Labels of this pull request are valid?
  • All unit tests/integration tests are included in this pull request? If you think adding test cases is unnecessary, please describe why and cross out this line.
  • The documentation for this pull request is enough? If you think adding documents for this pull request is unnecessary, please describe why and cross out this line.

yamacir-kit added 25 commits May 21, 2024 16:16
@yamacir-kit
Add new structs RelativeSpeedCondition and DirectionalDimension
5447363 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Add static member function ConditionEvaluation::evaluateRelativeSpeed
b09ca1f 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Move entity existence check into distance from speceialized distance
d270cdc 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Update RelativeDistanceCondition::distance to static member function
3be8459 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Merge remote-tracking branch 'origin/master' into feature/time-to-col…
a7c5b23 
…lision-condition

Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Merge branch 'master' into feature/time-to-collision-condition
cdcfc37
@yamacir-kit
Add new static member function RelativeSpeedCondition::evaluate
6535eeb 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Merge remote-tracking branch 'origin/master' into feature/time-to-col…
a55bcae 
…lision-condition

Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Merge branch 'master' into feature/time-to-collision-condition
ee02017
@yamacir-kit
Remove data member DistanceCondition::consider_z
be16d09 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Add const Position & to the argument of DistanceCondition::distance
77a1b31 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Update member function CoordinateSystem::distance to be static member
9b13ccd 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Rename (Relative)?DistanceCondition::distance to evaluate
f95eccb 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Merge branch 'master' into feature/time-to-collision-condition
d005100
@yamacir-kit
Merge branch 'master' into feature/time-to-collision-condition
138ed19
@yamacir-kit
Add support for DirectionalDimension to SpeedCondition
26e5a41 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Move function hypot into new header cmath/hypot.hpp
cddc3a5 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Update unordered_map of the Entities base class to private
5018106 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Add new static member function TimeToCollisionCondition::evaluate
fdae8b4 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Merge branch 'master' into feature/time-to-collision-condition
27749e1
@yamacir-kit
Merge branch 'master' into feature/time-to-collision-condition
c28fc48
@yamacir-kit
Merge remote-tracking branch 'origin/master' into feature/time-to-col…
79a9ac8 
…lision-condition

Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Merge branch 'master' into feature/time-to-collision-condition
6deadb0
@yamacir-kit
Merge branch 'master' into feature/time-to-collision-condition
3206624
@yamacir-kit
Merge remote-tracking branch 'origin/master' into feature/time-to-col…
fc5345e 
…lision-condition

Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Add new test scenario ...EntityCondition.TimeToCollisionCondition.yaml
6bc50fe 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Cleanup static member function TimeToCollisionCondition::evaluate
ec0bea7 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Fix TimeToCollisionCondition to return inf if relative speed < zero
64da482 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Fix evaluateTimeToCollisionCondition to not return meaningless valu…
4f2863a 
…e when collisions cannot occur

Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Merge branch 'master' into feature/time-to-collision-condition
ca2551e
@yamacir-kit
Merge branch 'master' into feature/time-to-collision-condition
8e51bbe
@yamacir-kit
Merge remote-tracking branch 'origin/master' into feature/time-to-col…
4bc0308 
…lision-condition

Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Merge branch 'master' into feature/time-to-collision-condition
a832790
@yamacir-kit
Merge remote-tracking branch 'origin/master' into feature/time-to-col…
cb21f12 
…lision-condition

Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Merge remote-tracking branch 'origin/master' into feature/time-to-col…
8bd7b41 
…lision-condition
@yamacir-kit
Merge remote-tracking branch 'origin/master' into feature/time-to-col…
6977438 
…lision-condition

Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Merge remote-tracking branch 'origin/master' into feature/time-to-col…
912d59d 
…lision-condition

Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Cleanup
d524164 
Signed-off-by: yamacir-kit <[email protected]>
@yamacir-kit
Merge remote-tracking branch 'origin/master' into feature/time-to-col…
30767e7 
…lision-condition
@yamacir-kit yamacir-kit marked this pull request as ready for review December 11, 2024 01:52
@yamacir-kit yamacir-kit requested a review from HansRobo December 11, 2024 01:52
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
13 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@yamacir-kit yamacir-kit merged commit 2823983 into master Dec 16, 2024
16 checks passed
@github-actions github-actions bot deleted the feature/time-to-collision-condition branch December 16, 2024 01:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@HansRobo HansRobo HansRobo approved these changes

Assignees

@yamacir-kit yamacir-kit

Labels
bump minor If this pull request merged, bump minor version of the scenario_simulator_v2 feature New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@yamacir-kit @HansRobo