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

Add constraints, create distribution files for variation and add units for parameters #45

Merged
merged 19 commits into from
Aug 4, 2021
Merged

Add constraints, create distribution files for variation and add units for parameters #45

merged 19 commits into from
Aug 4, 2021

Conversation

arauschert
Copy link
Collaborator

@arauschert arauschert commented Jul 8, 2021 •
edited by jdsika
Loading

  • added constraints for the parameters to make variation less error-prone
  • added units in the parameter name to make variation less error-prone
  • added distribution files for scenarios according to the ALKS regulation's test specification and reference for automated variation
  • adds different road curvatures and resolves Handle variation of curvature of road #46

arauschert added 2 commits July 6, 2021 14:22
@arauschert
Add constraints for parameters and fix trail setting for esmini
531b5de 
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
@arauschert
Add variation files for logical scenarios
618e0e4 
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
@arauschert arauschert force-pushed the create_distribution_files branch from 408156c to 618e0e4 Compare July 8, 2021 10:15
@arauschert arauschert changed the title Create distribution files for variation and add units for parameters Add constraints, create distribution files for variation and add units for parameters Jul 8, 2021
arauschert and others added 4 commits July 8, 2021 13:30
@arauschert
Update README.md
9c5d29f
@arauschert
Update speed variations and constraints
c00aa4a 
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
@arauschert
Remove not needed parameters
9b4111a 
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
@arauschert
Added units to parameters, removed duration parameter
d65c10e 
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
@arauschert arauschert force-pushed the create_distribution_files branch from be0a6b5 to b44fcb2 Compare July 9, 2021 16:39
@arauschert
Update dates in scenarios
24f6d7a 
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
@arauschert arauschert force-pushed the create_distribution_files branch from b44fcb2 to 24f6d7a Compare July 9, 2021 16:43
@arauschert arauschert mentioned this pull request Jul 12, 2021
Closed
@arauschert
Bugfixes while testing with esmini 2.12.0
d6d91ea 
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
@arauschert arauschert force-pushed the create_distribution_files branch from 8f88f2e to d6d91ea Compare July 13, 2021 15:07
arauschert and others added 5 commits July 22, 2021 14:25
@arauschert
Updates after review
4270c88 
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
@arauschert
Updated outdated link to SET Level project
130fc8f
@arauschert
Updated to latest OpenDRIVE release
9fdc487
@arauschert
Fixed behaviour for left-hand traffic
9cc567b 
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
@arauschert
Initial position of lead vehicles is now precisely the desired headwa…
d7ce25f 
…y time (bumper-to-bumper)

Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
jdsika
jdsika reviewed Jul 23, 2021
View reviewed changes
Copy link
Collaborator

@jdsika jdsika left a comment

Choose a reason for hiding this comment

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

partial review

.github/workflows/validate_maps_and_scenarios_with_xmllint.yml Show resolved Hide resolved
Scenarios/ALKS_Scenario_4.1_2_SwervingLeadVehicle_TEMPLATE.xosc
<ParameterDeclarations>
<!--The ParameterDeclarations section is needed for easy variation.-->
<ParameterDeclaration name="Ego_InitPosition_LaneId" parameterType="string" value="-4" />
Copy link
Collaborator

Choose a reason for hiding this comment

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

Ask question in ASAM Group on what style to recommend, use "magic numbers" or not? I would be inclined to have a large declaration section

Scenarios/ALKS_Scenario_4.1_2_SwervingLeadVehicle_TEMPLATE.xosc Show resolved Hide resolved
Scenarios/ALKS_Scenario_4.2_2_PartiallyBlockingTarget_TEMPLATE.xosc Show resolved Hide resolved
Variations/ALKS_Scenario_4.1_3_SwervingSideVehicle_Variation.xosc Outdated
<ParameterValueDistribution>
<ScenarioFile filepath="../Scenarios/ALKS_Scenario_4.1_3_SwervingSideVehicle_TEMPLATE.xosc" />
<Deterministic>
<DeterministicSingleParameterDistribution parameterName="Ego_InitSpeed_Ve0_kph">
Copy link
Collaborator

Choose a reason for hiding this comment

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

How to validate that a parameter does exists in the other file?

Copy link
Collaborator Author

@arauschert arauschert Jul 23, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

This would be a semantic validation (not a syntactic validation against the schema). It's similar to checking, if a vehicle model, which is referred to in a scenario also exists in the catalog. Semantic checks are possible with the OSC API checker so this could be a way to include the check in the CI.

@arauschert arauschert force-pushed the create_distribution_files branch 2 times, most recently from f3d08e7 to a1b6e66 Compare July 23, 2021 13:31
@arauschert
Testing manual line breaks in yaml
3f7d788 
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
@arauschert arauschert force-pushed the create_distribution_files branch from a1b6e66 to 3f7d788 Compare July 23, 2021 13:33
@arauschert arauschert requested a review from a team as a code owner July 26, 2021 14:16
@arauschert
Added variation of curvature for 4.1-4.3
7680a8e 
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
@arauschert
Added variation of acceleration for Cut-in
9e5bec2 
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
@arauschert
Temporary comment openPASS execution in script for 1.1 scenarios
5c9ab7c 
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
@jdsika jdsika added the enhancement New feature or request label Aug 3, 2021
@arauschert arauschert merged commit 1cbfa77 into master Aug 4, 2021
@arauschert arauschert deleted the create_distribution_files branch August 4, 2021 07:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdsika jdsika jdsika approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Handle variation of curvature of road
2 participants
@arauschert @jdsika