Skip to content

Commit

Permalink
Merge branch 'master' into RJD-1457/traffic_sink_refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
robomic authored Dec 3, 2024
2 parents ebec879 + 3dd43ab commit 6898d27
Show file tree
Hide file tree
Showing 112 changed files with 9,685 additions and 543 deletions.
48 changes: 48 additions & 0 deletions common/math/arithmetic/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,54 @@ Changelog for package arithmetic
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

6.2.1 (2024-12-03)
------------------
* Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition
* Contributors: Tatsuya Yamasaki

6.2.0 (2024-12-02)
------------------
* Merge branch 'master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Contributors: Tatsuya Yamasaki, yamacir-kit

6.1.3 (2024-11-29)
------------------
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/RJD-1057-traffic-lights-tests' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Mateusz Palczuk, Tatsuya Yamasaki

6.1.2 (2024-11-29)
------------------
* Merge branch 'master' into refactor/interpreter
* Contributors: Tatsuya Yamasaki

6.1.1 (2024-11-29)
------------------
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into fix/sonarcloud_warning
* Merge branch 'master' into fix/sonarcloud_warning
* Merge branch 'master' into fix/sonarcloud_warning
* Contributors: Masaya Kataoka

6.1.0 (2024-11-29)
------------------

6.0.1 (2024-11-27)
------------------

Expand Down
2 changes: 1 addition & 1 deletion common/math/arithmetic/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>arithmetic</name>
<version>6.0.1</version>
<version>6.2.1</version>
<description>arithmetic library for scenario_simulator_v2</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
48 changes: 48 additions & 0 deletions common/math/geometry/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,54 @@ Changelog for package geometry
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

6.2.1 (2024-12-03)
------------------
* Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition
* Contributors: Tatsuya Yamasaki

6.2.0 (2024-12-02)
------------------
* Merge branch 'master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Contributors: Tatsuya Yamasaki, yamacir-kit

6.1.3 (2024-11-29)
------------------
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/RJD-1057-traffic-lights-tests' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Mateusz Palczuk, Tatsuya Yamasaki

6.1.2 (2024-11-29)
------------------
* Merge branch 'master' into refactor/interpreter
* Contributors: Tatsuya Yamasaki

6.1.1 (2024-11-29)
------------------
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into fix/sonarcloud_warning
* Merge branch 'master' into fix/sonarcloud_warning
* Merge branch 'master' into fix/sonarcloud_warning
* Contributors: Masaya Kataoka

6.1.0 (2024-11-29)
------------------

6.0.1 (2024-11-27)
------------------

Expand Down
2 changes: 1 addition & 1 deletion common/math/geometry/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>geometry</name>
<version>6.0.1</version>
<version>6.2.1</version>
<description>geometry math library for scenario_simulator_v2 application</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<license>Apache License 2.0</license>
Expand Down
48 changes: 48 additions & 0 deletions common/scenario_simulator_exception/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,54 @@ Changelog for package scenario_simulator_exception
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

6.2.1 (2024-12-03)
------------------
* Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition
* Contributors: Tatsuya Yamasaki

6.2.0 (2024-12-02)
------------------
* Merge branch 'master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Contributors: Tatsuya Yamasaki, yamacir-kit

6.1.3 (2024-11-29)
------------------
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/RJD-1057-traffic-lights-tests' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Mateusz Palczuk, Tatsuya Yamasaki

6.1.2 (2024-11-29)
------------------
* Merge branch 'master' into refactor/interpreter
* Contributors: Tatsuya Yamasaki

6.1.1 (2024-11-29)
------------------
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into fix/sonarcloud_warning
* Merge branch 'master' into fix/sonarcloud_warning
* Merge branch 'master' into fix/sonarcloud_warning
* Contributors: Masaya Kataoka

6.1.0 (2024-11-29)
------------------

6.0.1 (2024-11-27)
------------------

Expand Down
2 changes: 1 addition & 1 deletion common/scenario_simulator_exception/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_simulator_exception</name>
<version>6.0.1</version>
<version>6.2.1</version>
<description>Exception types for scenario simulator</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
48 changes: 48 additions & 0 deletions common/simple_junit/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,54 @@ Changelog for package junit_exporter
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

6.2.1 (2024-12-03)
------------------
* Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition
* Contributors: Tatsuya Yamasaki

6.2.0 (2024-12-02)
------------------
* Merge branch 'master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Contributors: Tatsuya Yamasaki, yamacir-kit

6.1.3 (2024-11-29)
------------------
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/RJD-1057-traffic-lights-tests' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Mateusz Palczuk, Tatsuya Yamasaki

6.1.2 (2024-11-29)
------------------
* Merge branch 'master' into refactor/interpreter
* Contributors: Tatsuya Yamasaki

6.1.1 (2024-11-29)
------------------
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into fix/sonarcloud_warning
* Merge branch 'master' into fix/sonarcloud_warning
* Merge branch 'master' into fix/sonarcloud_warning
* Contributors: Masaya Kataoka

6.1.0 (2024-11-29)
------------------

6.0.1 (2024-11-27)
------------------

Expand Down
2 changes: 1 addition & 1 deletion common/simple_junit/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>simple_junit</name>
<version>6.0.1</version>
<version>6.2.1</version>
<description>Lightweight JUnit library for ROS 2</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
Expand Down
48 changes: 48 additions & 0 deletions common/status_monitor/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,54 @@ Changelog for package status_monitor
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

6.2.1 (2024-12-03)
------------------
* Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition
* Contributors: Tatsuya Yamasaki

6.2.0 (2024-12-02)
------------------
* Merge branch 'master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Merge remote-tracking branch 'origin/master' into feature/relative-speed-condition
* Contributors: Tatsuya Yamasaki, yamacir-kit

6.1.3 (2024-11-29)
------------------
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/RJD-1057-traffic-lights-tests' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/master' into RJD-1057-traffic-lights-tests
* Merge branch 'master' into RJD-1057-traffic-lights-tests
* Merge remote-tracking branch 'tier4/RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Merge branch 'RJD-1057-remove-traffic-lights-from-entity-manager' into RJD-1057-traffic-lights-tests
* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Mateusz Palczuk, Tatsuya Yamasaki

6.1.2 (2024-11-29)
------------------
* Merge branch 'master' into refactor/interpreter
* Contributors: Tatsuya Yamasaki

6.1.1 (2024-11-29)
------------------
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into fix/sonarcloud_warning
* Merge branch 'master' into fix/sonarcloud_warning
* Merge branch 'master' into fix/sonarcloud_warning
* Contributors: Masaya Kataoka

6.1.0 (2024-11-29)
------------------

6.0.1 (2024-11-27)
------------------

Expand Down
2 changes: 1 addition & 1 deletion common/status_monitor/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>status_monitor</name>
<version>6.0.1</version>
<version>6.2.1</version>
<description>none</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
10 changes: 3 additions & 7 deletions docs/developer_guide/OpenSCENARIOSupport.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ The OpenSCENARIO XML standard [does not define](https://releases.asam.net/OpenSC

### Command

OpenSCENARIO XML standard states that `CustomCommandAction` can be used to either issue a command to the simulation environment or start an external script.
OpenSCENARIO XML standard states that `CustomCommandAction` can be used to either issue a command to the simulation environment or start an external script.

For OpenSCENARIO interpreters implemented in scripting languages such as Python, this action is often implemented as a call to an external script file written in the same language as the host language. However, `scenario_simulator_v2` is implemented in C++ and we cannot simply implement such a feature. Therefore, `scenario_simulator_v2` treats the string given in `CustomCommandAction.type` as a command and executes it on a subprocess, as `sh` does.

Expand Down Expand Up @@ -308,7 +308,7 @@ Currently, the only way to know the result of the simulation is by viewing the s
| DynamicsDimension | 1.3 | |
| DynamicsShape | 1.3 (partial) | [detail](#DynamicsShape) |
| EndOfRoadCondition | unimplemented | |
| Entities | 1.3 (partial) | [detail](#Entities) |
| Entities | 1.3.1 | |
| EntityAction | 1.3 | |
| EntityCondition | 1.3 (partial) | [detail](#EntityCondition) |
| EntityDistribution | unimplemented | |
Expand Down Expand Up @@ -432,7 +432,7 @@ Currently, the only way to know the result of the simulation is by viewing the s
| RelativeLaneRange | 1.3 | |
| RelativeObjectPosition | 1.3 | |
| RelativeRoadPosition | unimplemented | |
| RelativeSpeedCondition | unimplemented | |
| RelativeSpeedCondition | 1.3.1 | |
| RelativeSpeedToMaster | unimplemented | |
| RelativeTargetLane | 1.3 | |
| RelativeTargetLaneOffset | unimplemented | |
Expand Down Expand Up @@ -637,10 +637,6 @@ Currently, the only way to know the result of the simulation is by viewing the s

- Enumeration literal `sinusoidal` is **not** supported.

#### Entities

- Property `EntitySelection` is **not** supported.

#### EntityCondition

- Properties `EndOfRoadCondition`, `OffroadCondition`, `TimeToCollisionCondition`, `RelativeDistanceCondition`, `TraveledDistanceCondition`, `AngleCondition`, and `RelativeAngleCondition` are **not** supported.
Expand Down
Loading

0 comments on commit 6898d27

Please sign in to comment.