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

feat(preprocessor,interpreter): support ParameterValueDistribution #878

Closed
wants to merge 168 commits into from
Closed

feat(preprocessor,interpreter): support ParameterValueDistribution #878

wants to merge 168 commits into from

Conversation

HansRobo
Copy link
Member

@HansRobo HansRobo commented Sep 13, 2022 •
edited
Loading

Types of PR

  • New Features
  • Upgrade of existing features
  • Bugfix

Link to the issue

Description

  • Support ParameterValueDistribution
    • except UserDefinedValueDistribution
  • Add C++ implementation of XML validation
  • Divide ROS interface in openscenario_preprocessor package

Note

The following points are not covered by this pull-request

  • Enable parallel execution of parameter derivation
    • overload ofderive and getNumberOfDeriveScenarios are experimental implementation
  • Delete the python implementation of XML validation and unified to its C++ implementation
  • Delete ROS from dependencies of openscenario_preprocessor/openscenario_preprocessor.cpp completely
    • To achieve this, we must delete ROS fom openscenario_interpreter::OpenScenario class
    • This will be supported in next pull-request.

How to review this PR.

Others

Operation Checking for openscenario_preprocessor

  • Deterministic.DistributionRange.xosc
  • Deterministic.DistributionSet.xosc
  • Deterministic.ValueSetDistribution.xosc
  • Stochastic.Histogram.xosc
  • Stochastic.NormalDistribution.xosc
  • Stochastic.LogNormalDistribution.xosc
  • Stochastic.PoissonDistribution.xosc
  • Stochastic.ProbabilityDistributionSet.xosc
  • Stochastic.UniformDistribution.xosc

Results of Sample Scenarios

openscenario_preprocessor.zip

@HansRobo HansRobo added the feature New feature or request label Sep 13, 2022
@HansRobo HansRobo self-assigned this Sep 13, 2022
@HansRobo HansRobo changed the title Feature/parameter value distribution feat(preprocessor,interpreter): support ParameterValueDistribution Nov 8, 2022
@HansRobo HansRobo requested a review from yamacir-kit November 8, 2022 04:40
HansRobo added 21 commits November 8, 2022 14:07
@HansRobo
chore(compile error): fix compile error
ff0bbfb 
Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
feat(interpreter): implement DistributionSet::evaluate
d4f4a02 
Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
fix(interpreter): add missing attribute in DistributionRange
0f88fc2 
Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
feat(interpreter): implement DistributionRange::evaluate
70ac4dc 
Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
Merge branch 'feature/empty/parameter_value_distribution-fixed' into …
408e1ef 
…feature/parameter_value_distribution

# Conflicts:
#	openscenario/openscenario_interpreter/include/openscenario_interpreter/random/stochastic_distribution_sampler.hpp
#	openscenario/openscenario_interpreter/src/syntax/histogram.cpp
#	openscenario/openscenario_interpreter/src/syntax/normal_distribution.cpp
#	openscenario/openscenario_interpreter/src/syntax/poisson_distribution.cpp
#	openscenario/openscenario_interpreter/src/syntax/probability_distribution_set.cpp
#	openscenario/openscenario_interpreter/src/syntax/uniform_distribution.cpp
@HansRobo
chore(interpreter): fix include guard
4cacaa4 
Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
chore(interpreter): fix include path
edfebf7 
Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
feat(interpreter): add SingleParameterList struct
1f69890 
Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
Merge remote-tracking branch 'origin/master' into feature/parameter_v…
17aec1e 
…alue_distribution

# Conflicts:
#	openscenario/openscenario_interpreter/include/openscenario_interpreter/random/stochastic_distribution_sampler.hpp
@HansRobo
refactor(interpreter): update interface
3900b81 
Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
refactor(interpreter): update interface
a37bd58 
Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
feat(interpreter): add base classes for parameter distributions
fd23c5c 
Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
chore(interpreter): delete support for UserDefinedDistribution
05afff8 
Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
feat(interpreter): use single parameter distribution interface in sto…
e52220c 
…chastic parameter distributions

Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
feat(interpreter): implement Stochatic::derive()
e06dd23 
Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
feat(interpreter): implement DeterministicSingleParameterDistribution…
a38941a 
…::derive()

Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
feat(interpreter): implement DeterministicMultiParameterDistribution:…
1e8308a 
…:derive()

Signed-off-by: Kotaro Yoshimoto <[email protected]>
@HansRobo
feat(interpreter/ParameterValueDistribution): implement distribution …
2d696d3 
…merging function
@HansRobo
feat(interpreter/ParameterValueDistribution): use new struct for dist…
7fedfce 
…ributions
@HansRobo
Merge remote-tracking branch 'origin/master' into feature/parameter_v…
a016211 
…alue_distribution
@HansRobo
chore: apply linter
9632f25
HansRobo added 29 commits April 22, 2024 15:13
@HansRobo
refactor: update test parameters
44a470d
@HansRobo
Merge remote-tracking branch 'origin/feature/openscenario_validator' …
b4b89c4 
…into feature/parameter_value_distribution
@HansRobo
refactor: rename ParameterList into ParameterSet
d28bc1d
@HansRobo
fix: cmake configuration for openscenario_validator
872212f
@HansRobo
refactor: stop using nifty counter in OpenSCENARIOValidator
9882926
@HansRobo
chore: update test for ProbabilityDistributionSet
f8df589
@HansRobo
Merge remote-tracking branch 'origin/master' into feature/parameter_v…
48db217 
…alue_distribution
@HansRobo
fix: adjust export settings of openscenario_validator
a2882b6
@HansRobo
refactor: use const reference in ranged for loop
7e1bff9
@HansRobo
refactor: use const reference
d15d16b
@HansRobo
refactor: mergeParameterDistribution
1f51e47
@HansRobo
refactor: Improved accuracy of results in DistributionRange
c12fbf3
@HansRobo
feat: add test for merging deterministic distributions
7b1b3a4
@HansRobo
refactor: use EXPECT_DOUBLE_EQ for testing double variables
161cfac
@HansRobo
fix: fix modify test value due to random engine update
6e9885b
@HansRobo
chore: improve test for ProbabilityDistributionSet
6aeb6a3
@HansRobo
refactor: refactor tests
6b0d1a1
@HansRobo
fix: fix wrong number of derivations in DistributionRange
2d6dead
@HansRobo
Merge branch 'master' into feature/parameter_value_distribution
65f3ab8
@HansRobo
Merge remote-tracking branch 'origin/feature/openscenario_validator' …
05a2558 
…into feature/parameter_value_distribution
@HansRobo
Merge remote-tracking branch 'origin/feature/openscenario_validator' …
fa57d73 
…into feature/parameter_value_distribution
@HansRobo
Merge remote-tracking branch 'origin/feature/openscenario_validator' …
b93356b 
…into feature/parameter_value_distribution
@HansRobo
Merge branch 'refs/heads/feature/openscenario_validator' into feature…
58e89db 
…/parameter_value_distribution
@HansRobo
Merge remote-tracking branch 'origin/feature/openscenario_validator' …
5826ed7 
…into feature/parameter_value_distribution
@HansRobo
Merge remote-tracking branch 'origin/feature/openscenario_validator' …
4b53db9 
…into feature/parameter_value_distribution
@HansRobo
fix: fix bug in Histogram::BinAdaptor
828bc27
@HansRobo
refactor: delete Histogram::BinAdaptor
9279d4b
@HansRobo
Merge remote-tracking branch 'origin/master' into feature/parameter_v…
c9fdc8c 
…alue_distribution
@HansRobo
chore: update test for Histogram
b77e3ae
@HansRobo HansRobo closed this May 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@HansRobo HansRobo

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

Successfully merging this pull request may close these issues.
2 participants
@HansRobo @hakuturu583