diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 014aad116c8..ffbec95e648 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -21,6 +21,96 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index a410497d6ca..f6e3214ac47 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 6.2.1 + 7.0.0 arithmetic library for scenario_simulator_v2 Tatsuya Yamasaki Apache License 2.0 diff --git a/common/math/geometry/CHANGELOG.rst b/common/math/geometry/CHANGELOG.rst index 07987dbd534..c5936ea71e6 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -21,6 +21,96 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index 0a8e7a6d940..a9b603c7e7f 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 6.2.1 + 7.0.0 geometry math library for scenario_simulator_v2 application Masaya Kataoka Apache License 2.0 diff --git a/common/scenario_simulator_exception/CHANGELOG.rst b/common/scenario_simulator_exception/CHANGELOG.rst index a1d6ecd1924..1151b1ff95c 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -21,6 +21,96 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index d8d4ac0d246..74d9979120a 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 6.2.1 + 7.0.0 Exception types for scenario simulator Tatsuya Yamasaki Apache License 2.0 diff --git a/common/simple_junit/CHANGELOG.rst b/common/simple_junit/CHANGELOG.rst index 61930e6692a..f753416d42b 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -21,6 +21,96 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 561ed2a3f89..18a6bd5e5b8 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 6.2.1 + 7.0.0 Lightweight JUnit library for ROS 2 Masaya Kataoka Tatsuya Yamasaki diff --git a/common/status_monitor/CHANGELOG.rst b/common/status_monitor/CHANGELOG.rst index ba9406874ff..d047520783c 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -21,6 +21,96 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 22a73d04bd8..46aa5e5e1ed 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 6.2.1 + 7.0.0 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index d848fe14a1f..bfee9cd9f14 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -21,6 +21,122 @@ Changelog for package concealer * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* refactor: delete unused include +* refactor: delete unused include +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* docs: fix doxygen comment +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* chore: apply formatter +* fix: fix build errors +* refactor: delete unused include +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* chore: stop using autoware_auto_msgs +* Merge remote-tracking branch 'origin/RJD-736/autoware_msgs_support_new_traffic_light_group' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # external/concealer/src/autoware_universe.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Delete unused autoware_auto_system_msgs package +* Concealer: Delete unused autoware_planning_msgs +* PathWithLaneId: change autoware_msgs to tier4_planning_msgs +* Port TrafficSignalArray from autoware_auto_perception_msgs to autoware_perception_msgs +* Port AckermannControlCommand to Control +* Finish porting autoware_auto_planning_msgs to autoware_planning_msgs +* Port PathWithLaneId +* Port AutowareState +* Port ControlModeReport +* Port GearCommand +* Port GearReport +* Port SteeringReport +* Port TurnIndicatorsCommand +* Port TurnIndicatorsReport +* Port VelocityReport message +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 2415ad7c489..0803d4c4cfb 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 6.2.1 + 7.0.0 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/external/embree_vendor/CHANGELOG.rst b/external/embree_vendor/CHANGELOG.rst index 0d236ec057b..d8076f4cae3 100644 --- a/external/embree_vendor/CHANGELOG.rst +++ b/external/embree_vendor/CHANGELOG.rst @@ -24,6 +24,96 @@ Changelog for package embree_vendor * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/external/embree_vendor/package.xml b/external/embree_vendor/package.xml index be0d6d51687..e9ea9025c11 100644 --- a/external/embree_vendor/package.xml +++ b/external/embree_vendor/package.xml @@ -2,7 +2,7 @@ embree_vendor - 6.2.1 + 7.0.0 vendor packages for intel raytracing kernel library masaya Apache 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 30de62bfaad..cd5eb9f6491 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -21,6 +21,98 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge pull request `#1468 `_ from tier4/feature/lane-change-everywhere +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* chore: use 'solid' as a subtype of linestrings between road and road shoulder +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/map/kashiwanoha_map/map/road_shoulder_added/lanelet2_map.osm b/map/kashiwanoha_map/map/road_shoulder_added/lanelet2_map.osm index 3b9d6e47cee..ef36562172b 100644 --- a/map/kashiwanoha_map/map/road_shoulder_added/lanelet2_map.osm +++ b/map/kashiwanoha_map/map/road_shoulder_added/lanelet2_map.osm @@ -3477,7 +3477,7 @@ - + @@ -3489,7 +3489,7 @@ - + @@ -3501,7 +3501,7 @@ - + diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 4b1ea45055c..1f90ffe02a6 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 6.2.1 + 7.0.0 map package for kashiwanoha Masaya Kataoka Apache License 2.0 diff --git a/map/simple_cross_map/CHANGELOG.rst b/map/simple_cross_map/CHANGELOG.rst index 27ac1882135..2609e18e217 100644 --- a/map/simple_cross_map/CHANGELOG.rst +++ b/map/simple_cross_map/CHANGELOG.rst @@ -9,6 +9,84 @@ Changelog for package simple_cross_map * Merge branch 'master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/map/simple_cross_map/package.xml b/map/simple_cross_map/package.xml index a159bf6bfc8..21100000215 100644 --- a/map/simple_cross_map/package.xml +++ b/map/simple_cross_map/package.xml @@ -2,7 +2,7 @@ simple_cross_map - 6.2.1 + 7.0.0 map package for simple cross Masaya Kataoka Apache License 2.0 diff --git a/mock/cpp_mock_scenarios/CHANGELOG.rst b/mock/cpp_mock_scenarios/CHANGELOG.rst index e003c340269..7324aafffb5 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -21,6 +21,102 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* fix: replace "awf/universe" with "awf/universe/20240605" for architecture_type +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* fix mock_test.launch.py to follow master +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Fix cpp_mock_scenarios launch parameters +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge pull request `#1468 `_ from tier4/feature/lane-change-everywhere +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* replace true with false for include_opposite_direction option +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index 660691ef05f..83b675be3d8 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 6.2.1 + 7.0.0 C++ mock scenarios masaya Apache License 2.0 diff --git a/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp b/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp index eed467535ce..11e07f35501 100644 --- a/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp +++ b/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp @@ -85,7 +85,7 @@ class GetDistanceInLaneCoordinateScenario : public cpp_mock_scenarios::CppScenar to_entity && to_entity->laneMatchingSucceed()) { return traffic_simulator::distance::longitudinalDistance( from_entity->getCanonicalizedLaneletPose().value(), - to_entity->getCanonicalizedLaneletPose().value(), false, true, + to_entity->getCanonicalizedLaneletPose().value(), false, false, traffic_simulator::RoutingConfiguration(), api_.getHdmapUtils()); } } diff --git a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst index b7cbe9e946d..0e6f94cf1b9 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -21,6 +21,96 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 5a841067505..b7bc016fa2c 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 6.2.1 + 7.0.0 TIER IV experimental catalogs for OpenSCENARIO Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter/CHANGELOG.rst b/openscenario/openscenario_interpreter/CHANGELOG.rst index 66723713f8f..d9efb5ec129 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -32,6 +32,114 @@ Changelog for package openscenario_interpreter * add publish_empty_context parameter * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* fix: replace "awf/universe" with "awf/universe/20240605" for architecture_type +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge pull request `#1469 `_ from tier4/refactor/speed-condition + Refactor/speed condition +* Add comment about element that may confuse readers +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Update `SpeedCondition` to use `SpeedCondition::evaluate` instead of `evaluateSpeed` +* Update `SpeedProfileAction` to use `SpeedCondition::evaluate` instead of `evaluateSpeed` +* Update `SpeedAction` to use `SpeedCondition::evaluate` instead of `evaluateSpeed` +* Update `SpeedCondition` to support `DirectionalDimension` +* Update `evaluateSpeed` to return `Eigen::Vector3d` instead of `double` +* Contributors: Tatsuya Yamasaki, yamacir-kit + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge pull request `#1467 `_ from tier4/refactor/distance-condition + Refactor/distance condition +* Merge branch 'master' into refactor/distance-condition +* Update member function `DistanceCondition::evaluate` to be static +* Remove duplicate entity existence check in `DistanceCondition` +* Update `DistanceCondition::evaluate` to check if the given entity exists +* Add default clause to switch to suppress warnings +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Update `RelativeDistanceCondition::evaluate` to receive `Position` +* Rename `DistanceCondition::distance` to `evaluate` +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge pull request `#1466 `_ from tier4/refactor/distance-condition-and-relative-distance-condition diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/simulator_core.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/simulator_core.hpp index 711966df9ae..c665a97c913 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/simulator_core.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/simulator_core.hpp @@ -598,7 +598,16 @@ class SimulatorCore template static auto evaluateSpeed(Ts &&... xs) { - return core->getCurrentTwist(std::forward(xs)...).linear.x; + /* + The function name "evaluateSpeed" stands for "evaluate SpeedCondition" + and is a part used to implement `SpeedCondition::evaluate`. + SpeedCondition can be evaluated in three directions: longitudinal, + lateral, and vertical, based on the attribute direction. Therefore, + please note that this function returns velocity, that is, a vector, + rather than speed, contrary to the name "evaluateSpeed". + */ + const auto linear = core->getCurrentTwist(std::forward(xs)...).linear; + return Eigen::Vector3d(linear.x, linear.y, linear.z); } template diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/distance_condition.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/distance_condition.hpp index 091ee67894c..95c1d2ad3a5 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/distance_condition.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/distance_condition.hpp @@ -112,16 +112,18 @@ struct DistanceCondition : private Scope, private SimulatorCore::ConditionEvalua auto description() const -> std::string; - auto distance(const EntityRef &) const -> double; - template < CoordinateSystem::value_type, RelativeDistanceType::value_type, RoutingAlgorithm::value_type, Boolean::value_type> - auto distance(const EntityRef &) const -> double + static auto distance(const EntityRef &, const Position &) -> double { throw SyntaxError(__FILE__, ":", __LINE__); } + static auto evaluate( + const Entities *, const Entity &, const Position &, CoordinateSystem, RelativeDistanceType, + RoutingAlgorithm, Boolean) -> double; + auto evaluate() -> Object; }; @@ -129,20 +131,20 @@ struct DistanceCondition : private Scope, private SimulatorCore::ConditionEvalua // cspell: ignore euclidian // clang-format off -template <> auto DistanceCondition::distance(const EntityRef &) const -> double; -template <> auto DistanceCondition::distance(const EntityRef &) const -> double; -template <> auto DistanceCondition::distance(const EntityRef &) const -> double; -template <> auto DistanceCondition::distance(const EntityRef &) const -> double; -template <> auto DistanceCondition::distance(const EntityRef &) const -> double; -template <> auto DistanceCondition::distance(const EntityRef &) const -> double; -template <> auto DistanceCondition::distance(const EntityRef &) const -> double; -template <> auto DistanceCondition::distance(const EntityRef &) const -> double; -template <> auto DistanceCondition::distance(const EntityRef &) const -> double; -template <> auto DistanceCondition::distance(const EntityRef &) const -> double; -template <> auto DistanceCondition::distance(const EntityRef &) const -> double; -template <> auto DistanceCondition::distance(const EntityRef &) const -> double; -template <> auto DistanceCondition::distance(const EntityRef &) const -> double; -template <> auto DistanceCondition::distance(const EntityRef &) const -> double; +template <> auto DistanceCondition::distance(const EntityRef &, const Position &) -> double; +template <> auto DistanceCondition::distance(const EntityRef &, const Position &) -> double; +template <> auto DistanceCondition::distance(const EntityRef &, const Position &) -> double; +template <> auto DistanceCondition::distance(const EntityRef &, const Position &) -> double; +template <> auto DistanceCondition::distance(const EntityRef &, const Position &) -> double; +template <> auto DistanceCondition::distance(const EntityRef &, const Position &) -> double; +template <> auto DistanceCondition::distance(const EntityRef &, const Position &) -> double; +template <> auto DistanceCondition::distance(const EntityRef &, const Position &) -> double; +template <> auto DistanceCondition::distance(const EntityRef &, const Position &) -> double; +template <> auto DistanceCondition::distance(const EntityRef &, const Position &) -> double; +template <> auto DistanceCondition::distance(const EntityRef &, const Position &) -> double; +template <> auto DistanceCondition::distance(const EntityRef &, const Position &) -> double; +template <> auto DistanceCondition::distance(const EntityRef &, const Position &) -> double; +template <> auto DistanceCondition::distance(const EntityRef &, const Position &) -> double; // clang-format on } // namespace syntax } // namespace openscenario_interpreter diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_action.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_action.hpp index c37b96b513f..899ffd69da2 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_action.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_action.hpp @@ -38,8 +38,7 @@ inline namespace syntax * * -------------------------------------------------------------------------- */ struct SpeedAction : private Scope, // NOTE: Required for access to actors - private SimulatorCore::ActionApplication, - private SimulatorCore::ConditionEvaluation + private SimulatorCore::ActionApplication { const TransitionDynamics speed_action_dynamics; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_condition.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_condition.hpp index c33ac44e1f7..9c2bf1ffb92 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_condition.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_condition.hpp @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -27,22 +28,36 @@ namespace openscenario_interpreter { inline namespace syntax { -/* ---- SpeedCondition --------------------------------------------------------- - * - * Compares a triggering entity's/entities' speed to a target speed. The - * logical operator for the comparison is given by the rule attribute. - * - * - * - * - * - * - * -------------------------------------------------------------------------- */ -struct SpeedCondition : private SimulatorCore::ConditionEvaluation +/* + SpeedCondition (OpenSCENARIO XML 1.3.1) + + Compares a triggering entity's/entities' speed to a target speed. The + logical operator for the comparison is given by the rule attribute. If + direction is used, only the projection to that direction is used in the + comparison. + + + + + + +*/ +struct SpeedCondition : private Scope, private SimulatorCore::ConditionEvaluation { + /* + The operator (less, greater, equal). + */ + const Rule rule; + + /* + Speed value of the speed condition. Unit: [m/s]. + */ const Double value; - const Rule compare; + /* + Direction of the speed (if not given, the total speed is considered). + */ + const std::optional direction; const TriggeringEntities triggering_entities; @@ -52,6 +67,11 @@ struct SpeedCondition : private SimulatorCore::ConditionEvaluation auto description() const -> String; + static auto evaluate(const Entities *, const Entity &) -> Eigen::Vector3d; + + static auto evaluate( + const Entities *, const Entity &, const std::optional &) -> double; + auto evaluate() -> Object; }; } // namespace syntax diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_profile_action.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_profile_action.hpp index 19550531412..b0ee4cbbbf7 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_profile_action.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_profile_action.hpp @@ -40,8 +40,7 @@ inline namespace syntax * * -------------------------------------------------------------------------- */ struct SpeedProfileAction : private Scope, // NOTE: Required for access to actors - private SimulatorCore::ActionApplication, - private SimulatorCore::ConditionEvaluation + private SimulatorCore::ActionApplication { /* Reference entity. If set, the speed values will be interpreted as relative diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index efbc437d34d..189fc370650 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 6.2.1 + 7.0.0 OpenSCENARIO 1.2.0 interpreter package for Autoware Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter/src/syntax/distance_condition.cpp b/openscenario/openscenario_interpreter/src/syntax/distance_condition.cpp index 960283dbee0..3feb93b1131 100644 --- a/openscenario/openscenario_interpreter/src/syntax/distance_condition.cpp +++ b/openscenario/openscenario_interpreter/src/syntax/distance_condition.cpp @@ -69,70 +69,82 @@ auto DistanceCondition::description() const -> std::string return description.str(); } -#define SWITCH_COORDINATE_SYSTEM(FUNCTION, ...) \ - switch (coordinate_system) { \ - case CoordinateSystem::entity: \ - FUNCTION(__VA_ARGS__, CoordinateSystem::entity); \ - break; \ - case CoordinateSystem::lane: \ - FUNCTION(__VA_ARGS__, CoordinateSystem::lane); \ - break; \ - case CoordinateSystem::road: \ - FUNCTION(__VA_ARGS__, CoordinateSystem::road); \ - break; \ - case CoordinateSystem::trajectory: \ - FUNCTION(__VA_ARGS__, CoordinateSystem::trajectory); \ - break; \ +#define SWITCH_COORDINATE_SYSTEM(FUNCTION, ...) \ + switch (coordinate_system) { \ + case CoordinateSystem::entity: \ + FUNCTION(__VA_ARGS__, CoordinateSystem::entity); \ + break; \ + case CoordinateSystem::lane: \ + FUNCTION(__VA_ARGS__, CoordinateSystem::lane); \ + break; \ + case CoordinateSystem::road: \ + FUNCTION(__VA_ARGS__, CoordinateSystem::road); \ + break; \ + case CoordinateSystem::trajectory: \ + FUNCTION(__VA_ARGS__, CoordinateSystem::trajectory); \ + break; \ + default: \ + throw UNEXPECTED_ENUMERATION_VALUE_ASSIGNED(CoordinateSystem, coordinate_system); \ } -#define SWITCH_RELATIVE_DISTANCE_TYPE(FUNCTION, ...) \ - switch (relative_distance_type) { \ - case RelativeDistanceType::longitudinal: \ - FUNCTION(__VA_ARGS__, RelativeDistanceType::longitudinal); \ - break; \ - case RelativeDistanceType::lateral: \ - FUNCTION(__VA_ARGS__, RelativeDistanceType::lateral); \ - break; \ - case RelativeDistanceType::euclidianDistance: \ - FUNCTION(__VA_ARGS__, RelativeDistanceType::euclidianDistance); \ - break; \ +#define SWITCH_RELATIVE_DISTANCE_TYPE(FUNCTION, ...) \ + switch (relative_distance_type) { \ + case RelativeDistanceType::longitudinal: \ + FUNCTION(__VA_ARGS__, RelativeDistanceType::longitudinal); \ + break; \ + case RelativeDistanceType::lateral: \ + FUNCTION(__VA_ARGS__, RelativeDistanceType::lateral); \ + break; \ + case RelativeDistanceType::euclidianDistance: \ + FUNCTION(__VA_ARGS__, RelativeDistanceType::euclidianDistance); \ + break; \ + default: \ + throw UNEXPECTED_ENUMERATION_VALUE_ASSIGNED(RelativeDistanceType, relative_distance_type); \ } -#define SWITCH_ROUTING_ALGORITHM(FUNCTION, ...) \ - switch (routing_algorithm) { \ - case RoutingAlgorithm::assigned_route: \ - FUNCTION(__VA_ARGS__, RoutingAlgorithm::assigned_route); \ - break; \ - case RoutingAlgorithm::fastest: \ - FUNCTION(__VA_ARGS__, RoutingAlgorithm::fastest); \ - break; \ - case RoutingAlgorithm::least_intersections: \ - FUNCTION(__VA_ARGS__, RoutingAlgorithm::least_intersections); \ - break; \ - case RoutingAlgorithm::shortest: \ - FUNCTION(__VA_ARGS__, RoutingAlgorithm::shortest); \ - break; \ - case RoutingAlgorithm::undefined: \ - FUNCTION(__VA_ARGS__, RoutingAlgorithm::undefined); \ - break; \ +#define SWITCH_ROUTING_ALGORITHM(FUNCTION, ...) \ + switch (routing_algorithm) { \ + case RoutingAlgorithm::assigned_route: \ + FUNCTION(__VA_ARGS__, RoutingAlgorithm::assigned_route); \ + break; \ + case RoutingAlgorithm::fastest: \ + FUNCTION(__VA_ARGS__, RoutingAlgorithm::fastest); \ + break; \ + case RoutingAlgorithm::least_intersections: \ + FUNCTION(__VA_ARGS__, RoutingAlgorithm::least_intersections); \ + break; \ + case RoutingAlgorithm::shortest: \ + FUNCTION(__VA_ARGS__, RoutingAlgorithm::shortest); \ + break; \ + case RoutingAlgorithm::undefined: \ + FUNCTION(__VA_ARGS__, RoutingAlgorithm::undefined); \ + break; \ + default: \ + throw UNEXPECTED_ENUMERATION_VALUE_ASSIGNED(RoutingAlgorithm, routing_algorithm); \ } #define SWITCH_FREESPACE(FUNCTION, ...) \ return freespace ? FUNCTION(__VA_ARGS__, true) : FUNCTION(__VA_ARGS__, false) -#define DISTANCE(...) distance<__VA_ARGS__>(triggering_entity) +#define DISTANCE(...) distance<__VA_ARGS__>(triggering_entity, position) -auto DistanceCondition::distance(const EntityRef & triggering_entity) const -> double +auto DistanceCondition::evaluate( + const Entities * entities, const Entity & triggering_entity, const Position & position, + CoordinateSystem coordinate_system, RelativeDistanceType relative_distance_type, + RoutingAlgorithm routing_algorithm, Boolean freespace) -> double { - SWITCH_COORDINATE_SYSTEM( - SWITCH_RELATIVE_DISTANCE_TYPE, SWITCH_ROUTING_ALGORITHM, SWITCH_FREESPACE, DISTANCE); - return Double::nan(); + if (entities->isAdded(triggering_entity)) { + SWITCH_COORDINATE_SYSTEM( + SWITCH_RELATIVE_DISTANCE_TYPE, SWITCH_ROUTING_ALGORITHM, SWITCH_FREESPACE, DISTANCE); + } else { + return Double::nan(); + } } template <> auto DistanceCondition::distance< CoordinateSystem::entity, RelativeDistanceType::euclidianDistance, RoutingAlgorithm::undefined, - false>(const EntityRef & triggering_entity) const -> double + false>(const EntityRef & triggering_entity, const Position & position) -> double { return apply( overload( @@ -166,7 +178,7 @@ auto DistanceCondition::distance< template <> auto DistanceCondition::distance< CoordinateSystem::entity, RelativeDistanceType::euclidianDistance, RoutingAlgorithm::undefined, - true>(const EntityRef & triggering_entity) const -> double + true>(const EntityRef & triggering_entity, const Position & position) -> double { return apply( overload( @@ -200,7 +212,7 @@ auto DistanceCondition::distance< template <> auto DistanceCondition::distance< CoordinateSystem::entity, RelativeDistanceType::lateral, RoutingAlgorithm::undefined, false>( - const EntityRef & triggering_entity) const -> double + const EntityRef & triggering_entity, const Position & position) -> double { return apply( overload( @@ -230,7 +242,7 @@ auto DistanceCondition::distance< template <> auto DistanceCondition::distance< CoordinateSystem::entity, RelativeDistanceType::lateral, RoutingAlgorithm::undefined, true>( - const EntityRef & triggering_entity) const -> double + const EntityRef & triggering_entity, const Position & position) -> double { return apply( overload( @@ -260,7 +272,7 @@ auto DistanceCondition::distance< template <> auto DistanceCondition::distance< CoordinateSystem::entity, RelativeDistanceType::longitudinal, RoutingAlgorithm::undefined, false>( - const EntityRef & triggering_entity) const -> double + const EntityRef & triggering_entity, const Position & position) -> double { return apply( overload( @@ -290,7 +302,7 @@ auto DistanceCondition::distance< template <> auto DistanceCondition::distance< CoordinateSystem::entity, RelativeDistanceType::longitudinal, RoutingAlgorithm::undefined, true>( - const EntityRef & triggering_entity) const -> double + const EntityRef & triggering_entity, const Position & position) -> double { return apply( overload( @@ -320,48 +332,32 @@ auto DistanceCondition::distance< template <> auto DistanceCondition::distance< CoordinateSystem::lane, RelativeDistanceType::lateral, RoutingAlgorithm::undefined, false>( - const EntityRef & triggering_entity) const -> double + const EntityRef & triggering_entity, const Position & position) -> double { return apply( overload( [&](const WorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return static_cast( - makeNativeRelativeLanePosition( - triggering_entity, static_cast(position))) - .offset; - } else { - return std::numeric_limits::quiet_NaN(); - } + return static_cast( + makeNativeRelativeLanePosition( + triggering_entity, static_cast(position))) + .offset; }, [&](const RelativeWorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return static_cast( - makeNativeRelativeLanePosition( - triggering_entity, static_cast(position))) - .offset; - } else { - return std::numeric_limits::quiet_NaN(); - } + return static_cast( + makeNativeRelativeLanePosition( + triggering_entity, static_cast(position))) + .offset; }, [&](const RelativeObjectPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return makeNativeRelativeLanePosition( - triggering_entity, static_cast(position)) - .offset; - } else { - return std::numeric_limits::quiet_NaN(); - } + return makeNativeRelativeLanePosition( + triggering_entity, static_cast(position)) + .offset; }, [&](const LanePosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return static_cast( - makeNativeRelativeLanePosition( - triggering_entity, static_cast(position))) - .offset; - } else { - return std::numeric_limits::quiet_NaN(); - } + return static_cast( + makeNativeRelativeLanePosition( + triggering_entity, static_cast(position))) + .offset; }), position); } @@ -369,48 +365,32 @@ auto DistanceCondition::distance< template <> auto DistanceCondition::distance< CoordinateSystem::lane, RelativeDistanceType::lateral, RoutingAlgorithm::undefined, true>( - const EntityRef & triggering_entity) const -> double + const EntityRef & triggering_entity, const Position & position) -> double { return apply( overload( [&](const WorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return static_cast( - makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position))) - .offset; - } else { - return std::numeric_limits::quiet_NaN(); - } + return static_cast( + makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position))) + .offset; }, [&](const RelativeWorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return static_cast( - makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position))) - .offset; - } else { - return std::numeric_limits::quiet_NaN(); - } + return static_cast( + makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position))) + .offset; }, [&](const RelativeObjectPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position)) - .offset; - } else { - return std::numeric_limits::quiet_NaN(); - } + return makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position)) + .offset; }, [&](const LanePosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return static_cast( - makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position))) - .offset; - } else { - return std::numeric_limits::quiet_NaN(); - } + return static_cast( + makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position))) + .offset; }), position); } @@ -418,48 +398,32 @@ auto DistanceCondition::distance< template <> auto DistanceCondition::distance< CoordinateSystem::lane, RelativeDistanceType::longitudinal, RoutingAlgorithm::undefined, false>( - const EntityRef & triggering_entity) const -> double + const EntityRef & triggering_entity, const Position & position) -> double { return apply( overload( [&](const WorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return static_cast( - makeNativeRelativeLanePosition( - triggering_entity, static_cast(position))) - .s; - } else { - return std::numeric_limits::quiet_NaN(); - } + return static_cast( + makeNativeRelativeLanePosition( + triggering_entity, static_cast(position))) + .s; }, [&](const RelativeWorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return static_cast( - makeNativeRelativeLanePosition( - triggering_entity, static_cast(position))) - .s; - } else { - return std::numeric_limits::quiet_NaN(); - } + return static_cast( + makeNativeRelativeLanePosition( + triggering_entity, static_cast(position))) + .s; }, [&](const RelativeObjectPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return makeNativeRelativeLanePosition( - triggering_entity, static_cast(position)) - .s; - } else { - return std::numeric_limits::quiet_NaN(); - } + return makeNativeRelativeLanePosition( + triggering_entity, static_cast(position)) + .s; }, [&](const LanePosition & position) { - if (global().entities->ref(triggering_entity).template as().is_added) { - return static_cast( - makeNativeRelativeLanePosition( - triggering_entity, static_cast(position))) - .s; - } else { - return std::numeric_limits::quiet_NaN(); - } + return static_cast( + makeNativeRelativeLanePosition( + triggering_entity, static_cast(position))) + .s; }), position); } @@ -467,48 +431,32 @@ auto DistanceCondition::distance< template <> auto DistanceCondition::distance< CoordinateSystem::lane, RelativeDistanceType::longitudinal, RoutingAlgorithm::undefined, true>( - const EntityRef & triggering_entity) const -> double + const EntityRef & triggering_entity, const Position & position) -> double { return apply( overload( [&](const WorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return static_cast( - makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position))) - .s; - } else { - return std::numeric_limits::quiet_NaN(); - } + return static_cast( + makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position))) + .s; }, [&](const RelativeWorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return static_cast( - makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position))) - .s; - } else { - return std::numeric_limits::quiet_NaN(); - } + return static_cast( + makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position))) + .s; }, [&](const RelativeObjectPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position)) - .s; - } else { - return std::numeric_limits::quiet_NaN(); - } + return makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position)) + .s; }, [&](const LanePosition & position) { - if (global().entities->ref(triggering_entity).template as().is_added) { - return static_cast( - makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position))) - .s; - } else { - return std::numeric_limits::quiet_NaN(); - } + return static_cast( + makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position))) + .s; }), position); } @@ -516,52 +464,36 @@ auto DistanceCondition::distance< template <> auto DistanceCondition::distance< CoordinateSystem::lane, RelativeDistanceType::lateral, RoutingAlgorithm::shortest, false>( - const EntityRef & triggering_entity) const -> double + const EntityRef & triggering_entity, const Position & position) -> double { return apply( overload( [&](const WorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return std::abs(static_cast( - makeNativeRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest)) - .offset); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(static_cast( + makeNativeRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest)) + .offset); }, [&](const RelativeWorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return std::abs(static_cast( - makeNativeRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest)) - .offset); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(static_cast( + makeNativeRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest)) + .offset); }, [&](const RelativeObjectPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return std::abs(makeNativeRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest) - .offset); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(makeNativeRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest) + .offset); }, [&](const LanePosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return std::abs(static_cast( - makeNativeRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest)) - .offset); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(static_cast( + makeNativeRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest)) + .offset); }), position); } @@ -569,52 +501,36 @@ auto DistanceCondition::distance< template <> auto DistanceCondition::distance< CoordinateSystem::lane, RelativeDistanceType::lateral, RoutingAlgorithm::shortest, true>( - const EntityRef & triggering_entity) const -> double + const EntityRef & triggering_entity, const Position & position) -> double { return apply( overload( [&](const WorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return std::abs(static_cast( - makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest)) - .offset); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(static_cast( + makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest)) + .offset); }, [&](const RelativeWorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return std::abs(static_cast( - makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest)) - .offset); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(static_cast( + makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest)) + .offset); }, [&](const RelativeObjectPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return std::abs(makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest) - .offset); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest) + .offset); }, [&](const LanePosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return std::abs(static_cast( - makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest)) - .offset); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(static_cast( + makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest)) + .offset); }), position); } @@ -622,52 +538,36 @@ auto DistanceCondition::distance< template <> auto DistanceCondition::distance< CoordinateSystem::lane, RelativeDistanceType::longitudinal, RoutingAlgorithm::shortest, false>( - const EntityRef & triggering_entity) const -> double + const EntityRef & triggering_entity, const Position & position) -> double { return apply( overload( [&](const WorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return std::abs(static_cast( - makeNativeRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest)) - .s); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(static_cast( + makeNativeRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest)) + .s); }, [&](const RelativeWorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return std::abs(static_cast( - makeNativeRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest)) - .s); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(static_cast( + makeNativeRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest)) + .s); }, [&](const RelativeObjectPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return std::abs(makeNativeRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest) - .s); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(makeNativeRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest) + .s); }, [&](const LanePosition & position) { - if (global().entities->ref(triggering_entity).template as().is_added) { - return std::abs(static_cast( - makeNativeRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest)) - .s); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(static_cast( + makeNativeRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest)) + .s); }), position); } @@ -675,52 +575,36 @@ auto DistanceCondition::distance< template <> auto DistanceCondition::distance< CoordinateSystem::lane, RelativeDistanceType::longitudinal, RoutingAlgorithm::shortest, true>( - const EntityRef & triggering_entity) const -> double + const EntityRef & triggering_entity, const Position & position) -> double { return apply( overload( [&](const WorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return std::abs(static_cast( - makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest)) - .s); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(static_cast( + makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest)) + .s); }, [&](const RelativeWorldPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return std::abs(static_cast( - makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest)) - .s); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(static_cast( + makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest)) + .s); }, [&](const RelativeObjectPosition & position) { - if (global().entities->ref(triggering_entity).as().is_added) { - return std::abs(makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest) - .s); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest) + .s); }, [&](const LanePosition & position) { - if (global().entities->ref(triggering_entity).template as().is_added) { - return std::abs(static_cast( - makeNativeBoundingBoxRelativeLanePosition( - triggering_entity, static_cast(position), - RoutingAlgorithm::shortest)) - .s); - } else { - return std::numeric_limits::quiet_NaN(); - } + return std::abs(static_cast( + makeNativeBoundingBoxRelativeLanePosition( + triggering_entity, static_cast(position), + RoutingAlgorithm::shortest)) + .s); }), position); } @@ -729,9 +613,12 @@ auto DistanceCondition::evaluate() -> Object { results.clear(); - return asBoolean(triggering_entities.apply([&](auto && triggering_entity) { - results.push_back( - triggering_entity.apply([&](const auto & object) { return distance(object); })); + return asBoolean(triggering_entities.apply([&](const auto & triggering_entity) { + results.push_back(triggering_entity.apply([&](const auto & triggering_entity) { + return evaluate( + global().entities, triggering_entity, position, coordinate_system, relative_distance_type, + routing_algorithm, freespace); + })); return not results.back().size() or rule(results.back(), value).min(); })); } diff --git a/openscenario/openscenario_interpreter/src/syntax/speed_action.cpp b/openscenario/openscenario_interpreter/src/syntax/speed_action.cpp index ff317f7a48f..935d62e434a 100644 --- a/openscenario/openscenario_interpreter/src/syntax/speed_action.cpp +++ b/openscenario/openscenario_interpreter/src/syntax/speed_action.cpp @@ -14,9 +14,9 @@ #include #include -#include #include #include +#include #include namespace openscenario_interpreter @@ -55,7 +55,9 @@ auto SpeedAction::accomplished() -> bool }; auto check = [this](auto && actor) { - auto evaluation = actor.apply([](const auto & object) { return evaluateSpeed(object); }); + const auto evaluation = actor.apply([this](const auto & actor) { + return SpeedCondition::evaluate(global().entities, actor, std::nullopt); + }); if (speed_action_target.is()) { return not evaluation.size() or equal_to>()( @@ -66,14 +68,18 @@ auto SpeedAction::accomplished() -> bool case SpeedTargetValueType::delta: return not evaluation.size() or equal_to>()( - evaluateSpeed(speed_action_target.as().entity_ref) + + SpeedCondition::evaluate( + global().entities, speed_action_target.as().entity_ref, + std::nullopt) + speed_action_target.as().value, evaluation) .min(); case SpeedTargetValueType::factor: return not evaluation.size() or equal_to>()( - evaluateSpeed(speed_action_target.as().entity_ref) * + SpeedCondition::evaluate( + global().entities, speed_action_target.as().entity_ref, + std::nullopt) * speed_action_target.as().value, evaluation) .min(); diff --git a/openscenario/openscenario_interpreter/src/syntax/speed_condition.cpp b/openscenario/openscenario_interpreter/src/syntax/speed_condition.cpp index b8e3a6640b8..cc8d64b0c41 100644 --- a/openscenario/openscenario_interpreter/src/syntax/speed_condition.cpp +++ b/openscenario/openscenario_interpreter/src/syntax/speed_condition.cpp @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -23,8 +24,10 @@ inline namespace syntax { SpeedCondition::SpeedCondition( const pugi::xml_node & node, Scope & scope, const TriggeringEntities & triggering_entities) -: value(readAttribute("value", node, scope)), - compare(readAttribute("rule", node, scope)), +: Scope(scope), + rule(readAttribute("rule", node, scope)), + value(readAttribute("value", node, scope)), + direction(readAttribute("direction", node, scope, std::nullopt)), triggering_entities(triggering_entities), results(triggering_entities.entity_refs.size(), {Double::nan()}) { @@ -38,19 +41,49 @@ auto SpeedCondition::description() const -> String print_to(description, results); - description << " " << compare << " " << value << "?"; + description << " " << rule << " " << value << "?"; return description.str(); } +auto SpeedCondition::evaluate(const Entities * entities, const Entity & triggering_entity) + -> Eigen::Vector3d +{ + if (entities->isAdded(triggering_entity)) { + return evaluateSpeed(triggering_entity); + } else { + return Eigen::Vector3d(Double::nan(), Double::nan(), Double::nan()); + } +} + +auto SpeedCondition::evaluate( + const Entities * entities, const Entity & triggering_entity, + const std::optional & direction) -> double +{ + if (const Eigen::Vector3d v = evaluate(entities, triggering_entity); direction) { + switch (*direction) { + default: + case DirectionalDimension::longitudinal: + return v.x(); + case DirectionalDimension::lateral: + return v.y(); + case DirectionalDimension::vertical: + return v.z(); + } + } else { + return v.norm(); + } +} + auto SpeedCondition::evaluate() -> Object { results.clear(); - return asBoolean(triggering_entities.apply([&](auto && triggering_entity) { - results.push_back( - triggering_entity.apply([&](const auto & object) { return evaluateSpeed(object); })); - return not results.back().size() or compare(results.back(), value).min(); + return asBoolean(triggering_entities.apply([&](const auto & triggering_entity) { + results.push_back(triggering_entity.apply([&](const auto & triggering_entity) { + return evaluate(global().entities, triggering_entity, direction); + })); + return not results.back().size() or std::invoke(rule, results.back(), value).min(); })); } } // namespace syntax diff --git a/openscenario/openscenario_interpreter/src/syntax/speed_profile_action.cpp b/openscenario/openscenario_interpreter/src/syntax/speed_profile_action.cpp index 2e1ef370611..e294a09523d 100644 --- a/openscenario/openscenario_interpreter/src/syntax/speed_profile_action.cpp +++ b/openscenario/openscenario_interpreter/src/syntax/speed_profile_action.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -120,12 +121,15 @@ auto SpeedProfileAction::run() -> void { for (auto && [actor, iter] : accomplishments) { auto accomplished = [this](const auto & actor, const auto & speed_profile_entry) { - auto speeds = actor.apply([&](const auto & object) { return evaluateSpeed(object); }); + auto speeds = actor.apply([&](const auto & actor) { + return SpeedCondition::evaluate(global().entities, actor, std::nullopt); + }); if (not speeds.size()) { return true; } else if (entity_ref) { return equal_to>()( - speeds, speed_profile_entry.speed + evaluateSpeed(entity_ref)) + speeds, speed_profile_entry.speed + + SpeedCondition::evaluate(global().entities, entity_ref, std::nullopt)) .min(); } else { return equal_to>()(speeds, speed_profile_entry.speed).min(); diff --git a/openscenario/openscenario_interpreter_example/CHANGELOG.rst b/openscenario/openscenario_interpreter_example/CHANGELOG.rst index 8c65f536fd3..58277e25f72 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -21,6 +21,102 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Apply clang format +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/RJD-736/autoware_msgs_support_new_traffic_light_group' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # external/concealer/src/autoware_universe.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Port AutowareState +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 733beb257e1..7b79d5418f6 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 6.2.1 + 7.0.0 Examples for some TIER IV OpenSCENARIO Interpreter's features Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst index bcabc48ecb6..3a0dbbbd85b 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -21,6 +21,96 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 746993c3196..a2b749e70d0 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 6.2.1 + 7.0.0 ROS message types for package openscenario_interpreter Yamasaki Tatsuya Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor/CHANGELOG.rst b/openscenario/openscenario_preprocessor/CHANGELOG.rst index ee9d317f707..45aa124d2ab 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -21,6 +21,96 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index e441da7abbb..8e1cf8e1c32 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 6.2.1 + 7.0.0 Example package for TIER IV OpenSCENARIO Interpreter Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst index a574fcf2107..cd4d1c1d339 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -21,6 +21,96 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index 44577bf75c6..f944de3e947 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 6.2.1 + 7.0.0 ROS message types for package openscenario_preprocessor Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_utility/CHANGELOG.rst b/openscenario/openscenario_utility/CHANGELOG.rst index 15ae5301e76..1fc991b6a01 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -24,6 +24,96 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index e8ffb46b8bb..baf21f54724 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 6.2.1 + 7.0.0 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_validator/CHANGELOG.rst b/openscenario/openscenario_validator/CHANGELOG.rst index f3b3e1cdba0..cec132f84ec 100644 --- a/openscenario/openscenario_validator/CHANGELOG.rst +++ b/openscenario/openscenario_validator/CHANGELOG.rst @@ -10,6 +10,96 @@ Changelog for package openscenario_validator * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/openscenario/openscenario_validator/package.xml b/openscenario/openscenario_validator/package.xml index 67ccd702d9e..fc8cccc8550 100644 --- a/openscenario/openscenario_validator/package.xml +++ b/openscenario/openscenario_validator/package.xml @@ -2,7 +2,7 @@ openscenario_validator - 6.2.1 + 7.0.0 Validator for OpenSCENARIO 1.3 Kotaro Yoshimoto Apache License 2.0 diff --git a/rviz_plugins/openscenario_visualization/CHANGELOG.rst b/rviz_plugins/openscenario_visualization/CHANGELOG.rst index 4d9ec88bd81..92bcf0fc007 100644 --- a/rviz_plugins/openscenario_visualization/CHANGELOG.rst +++ b/rviz_plugins/openscenario_visualization/CHANGELOG.rst @@ -21,6 +21,102 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge pull request `#1471 `_ from tier4/fix/sonor-cloud-issue-8-2 + Fix/sonor cloud issue 8-2 +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Replace the redundant type with "auto". + Remove this redundant cast. + Remove unused exception parameter 'e' + implicit conversion loses floating-point precision: 'double' to 'const float' +* Contributors: Masaya Kataoka, Taiga Takano + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/rviz_plugins/openscenario_visualization/package.xml b/rviz_plugins/openscenario_visualization/package.xml index 0c7d221d683..f400f471349 100644 --- a/rviz_plugins/openscenario_visualization/package.xml +++ b/rviz_plugins/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 6.2.1 + 7.0.0 Visualization tools for simulation results Masaya Kataoka Kyoichi Sugahara diff --git a/rviz_plugins/openscenario_visualization/src/openscenario_visualization_condition_groups_plugin/openscenario_visualization_condition_groups_plugin.cpp b/rviz_plugins/openscenario_visualization/src/openscenario_visualization_condition_groups_plugin/openscenario_visualization_condition_groups_plugin.cpp index 0d1c54a46f5..93e8ef1a4f0 100644 --- a/rviz_plugins/openscenario_visualization/src/openscenario_visualization_condition_groups_plugin/openscenario_visualization_condition_groups_plugin.cpp +++ b/rviz_plugins/openscenario_visualization/src/openscenario_visualization_condition_groups_plugin/openscenario_visualization_condition_groups_plugin.cpp @@ -48,7 +48,7 @@ VisualizationConditionGroupsDisplay::VisualizationConditionGroupsDisplay() * but the initial value of 35.0 is set to ensure a default size that is likely suitable for most screens. * The scaling factor adjusts this size to ensure readability across various resolutions. */ - const float text_size = scale * 35.0; + const float text_size = scale * 35.0f; /// @note Define initial value of left edge position of condition results panel const int left = 0; @@ -60,21 +60,21 @@ VisualizationConditionGroupsDisplay::VisualizationConditionGroupsDisplay() * The purpose of this calculation is to position the top edge of the panel at an appropriate place on the screen, * again scaling according to screen resolution to maintain a consistent look across different devices. */ - const int top = static_cast(std::round(450 * scale)); + const auto top = static_cast(std::round(450 * scale)); /** * @note Define initial value of horizontal length of condition results panel. * The reason 2000 is hard-coded here is because that number displayed most beautifully when we tested the operation on a 4K/non 4K display. * Also, this number can be set via the rviz GUI. */ - const int length = static_cast(std::round(2000 * scale)); + const auto length = static_cast(std::round(2000 * scale)); /** * @note Define initial value of width of condition results panel. * The reason 2000 is hard-coded here is because that number displayed most beautifully when we tested the operation on a 4K/non 4K display. * Also, this number can be set via the rviz GUI. */ - const int width = static_cast(std::round(2000 * scale)); + const auto width = static_cast(std::round(2000 * scale)); property_topic_name_ = std::make_unique( "Topic", "/simulation/context", "The topic on which to publish simulation context.", this, @@ -99,7 +99,7 @@ VisualizationConditionGroupsDisplay::VisualizationConditionGroupsDisplay() "This property controls the scaling factor for the text size on the panel. Setting a higher " "value results in larger text, making the displayed information easier to read.", this, SLOT(updateVisualization()), this); - property_value_scale_->setMin(0.01); + property_value_scale_->setMin(0.01f); } VisualizationConditionGroupsDisplay::~VisualizationConditionGroupsDisplay() @@ -174,7 +174,7 @@ void VisualizationConditionGroupsDisplay::processMessage(const Context::ConstSha // QColor text_color = property_text_color_->getColor(); QColor text_color(property_text_color_->getColor()); text_color.setAlpha(255); - painter.setPen(QPen(text_color, static_cast(2), Qt::SolidLine)); + painter.setPen(QPen(text_color, 2, Qt::SolidLine)); QFont font = painter.font(); font.setPixelSize(std::max(static_cast(property_value_scale_->getFloat()), 1)); font.setBold(true); @@ -262,7 +262,7 @@ void VisualizationConditionGroupsDisplay::processEvent(const YAML::Node & event_ std::string event_name; try { event_name = event_node["name"].as(); - } catch (const YAML::BadConversion & e) { + } catch (const YAML::BadConversion &) { event_name = ""; } if (event_name.empty()) { diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst index 33497147708..1a482062317 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst @@ -21,6 +21,96 @@ Changelog for package real_time_factor_control_rviz_plugin * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml index c5f4ec6f799..65fceb3047c 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml @@ -2,7 +2,7 @@ real_time_factor_control_rviz_plugin - 6.2.1 + 7.0.0 Slider controlling real time factor value. Paweł Lech Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index c9b16e38068..266932b7f88 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -21,6 +21,96 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index 09944f90a69..0845fa1e7eb 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 6.2.1 + 7.0.0 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 diff --git a/simulation/behavior_tree_plugin/CHANGELOG.rst b/simulation/behavior_tree_plugin/CHANGELOG.rst index 47cf1281bcc..b699f100bb5 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -21,6 +21,96 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index e4b0c0bd19e..862137bf157 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 6.2.1 + 7.0.0 Behavior tree plugin for traffic_simulator masaya Apache 2.0 diff --git a/simulation/do_nothing_plugin/CHANGELOG.rst b/simulation/do_nothing_plugin/CHANGELOG.rst index 063a3d0f6c0..b54d16b55e4 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -21,6 +21,96 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index f8b7f5d5b93..01ad3e54707 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 6.2.1 + 7.0.0 Behavior plugin for do nothing Masaya Kataoka Apache 2.0 diff --git a/simulation/simple_sensor_simulator/CHANGELOG.rst b/simulation/simple_sensor_simulator/CHANGELOG.rst index c434caa75d5..ca1c8360096 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -21,6 +21,123 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* chore: apply linter +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* fix: replace "awf/universe" with "awf/universe/20240605" for architecture_type +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* refactor: added handling when autoware_perception_msgs/msg/traffic_signal_array.hpp is not present +* chore: delete wrongly doubled word +* docs: update comment +* docs: update comment +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* docs: delete comment for unsupported "awf/universe" +* fix: delete autoware_auto_xx_msgs from include +* fix: delete unsupported architecture_type "awf/universe" +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Apply clang format +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge pull request `#1277 `_ from tier4/RJD-736/autoware_msgs_support_new_traffic_light_group + Rjd 736/autoware msgs support new traffic light group +* Merge remote-tracking branch 'origin/RJD-736/autoware_msgs_support_new_traffic_light_group' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # external/concealer/src/autoware_universe.cpp +* feat(traffic_simulator): support TrafficLightGroupArray in SimpleSensorSimulator +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Port DetectedObjects and TrackedObjects +* Port TrafficSignalArray from autoware_auto_perception_msgs to autoware_perception_msgs +* Port GearCommand +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge pull request `#1477 `_ from tier4/fix/acc_by_slope +* refactor: use std::atan2 instead of std::atan +* Merge branch 'master' into fix/acc_by_slope +* fix: EgoEntitySimulation::calculateAccelerationBySlope() +* refactor: EgoEntitySimulation::calculateAccelerationBySlope unit test +* chore: add test for calculated expected value in EgoEntitySimulation::calculateAccelerationBySlope unit test +* fix: use pitch-filled map pose in EgoEntitySimulation::calculateAccelerationBySlope test +* fix: fix pitch angle sign in ego entity simulation test +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 117ce5f1a5c..30d0cc939da 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 6.2.1 + 7.0.0 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simple_sensor_simulator/src/vehicle_simulation/ego_entity_simulation.cpp b/simulation/simple_sensor_simulator/src/vehicle_simulation/ego_entity_simulation.cpp index 756f3f4db4f..99fb0380396 100644 --- a/simulation/simple_sensor_simulator/src/vehicle_simulation/ego_entity_simulation.cpp +++ b/simulation/simple_sensor_simulator/src/vehicle_simulation/ego_entity_simulation.cpp @@ -345,8 +345,10 @@ auto EgoEntitySimulation::calculateAccelerationBySlope() const -> double if (consider_acceleration_by_road_slope_) { constexpr double gravity_acceleration = -9.81; const double ego_pitch_angle = - math::geometry::convertQuaternionToEulerAngle(status_.getMapPose().orientation).y; - return gravity_acceleration * std::sin(ego_pitch_angle); + math::geometry::convertQuaternionToEulerAngle( + hdmap_utils_ptr_->toMapPose(status_.getLaneletPose(), true).pose.orientation) + .y; + return -std::sin(ego_pitch_angle) * gravity_acceleration; } else { return 0.0; } diff --git a/simulation/simple_sensor_simulator/test/src/vehicle_simulation/test_ego_entity_simulation.cpp b/simulation/simple_sensor_simulator/test/src/vehicle_simulation/test_ego_entity_simulation.cpp index 00c86c4f71b..90c801d74da 100644 --- a/simulation/simple_sensor_simulator/test/src/vehicle_simulation/test_ego_entity_simulation.cpp +++ b/simulation/simple_sensor_simulator/test/src/vehicle_simulation/test_ego_entity_simulation.cpp @@ -40,19 +40,20 @@ TEST(EgoEntitySimulation, calculateAccelerationBySlope) // expected value in the lanelet(id:7) // first 25m: 1m up constexpr double expected_slope_acceleration_first_25m = - std::sin(std::atan(1. / 25.)) * gravity_acceleration; + -std::sin(-std::atan2(1., 25.)) * gravity_acceleration; + EXPECT_LE(expected_slope_acceleration_first_25m, 0.0); // up -> negative slope acceleration // last 25m: 4m up constexpr double expected_slope_acceleration_last_25m = - std::sin(std::atan(4. / 25.)) * gravity_acceleration; + -std::sin(-std::atan2(4., 25.)) * gravity_acceleration; + EXPECT_LE(expected_slope_acceleration_last_25m, 0.0); // up -> negative slope acceleration auto get_slope_acceleration_at = [&](const traffic_simulator_msgs::msg::LaneletPose & lanelet_pose, bool consider_slope) { traffic_simulator_msgs::msg::EntityStatus initial_status; initial_status.name = "ego"; - initial_status.lanelet_pose_valid = true; - initial_status.lanelet_pose = lanelet_pose; - initial_status.pose = - traffic_simulator::pose::toMapPose(initial_status.lanelet_pose, hdmap_utils); + // use pitch-filled map pose + initial_status.lanelet_pose_valid = false; + initial_status.pose = hdmap_utils->toMapPose(lanelet_pose, true).pose; EgoEntitySimulation ego_entity_simulation( initial_status, traffic_simulator_msgs::msg::VehicleParameters(), 1.f / 30.f, hdmap_utils, @@ -68,45 +69,61 @@ TEST(EgoEntitySimulation, calculateAccelerationBySlope) // it will not exactly match the ideal value, so we manually selected the smallest possible value specifically for this test. constexpr double compare_epsilon = 1e-7; - // first 25m, up, with considering slope - lanelet_pose.s = 12.5; - lanelet_pose.rpy.z = 0.0; - EXPECT_NEAR( - expected_slope_acceleration_first_25m, get_slope_acceleration_at(lanelet_pose, true), - compare_epsilon); + // first 25m, up + { + lanelet_pose.s = 12.5; + lanelet_pose.rpy.z = 0.0; - // first 25m, up, without considering slope - EXPECT_DOUBLE_EQ(0.0, get_slope_acceleration_at(lanelet_pose, false)); + // with considering slope + EXPECT_NEAR( + expected_slope_acceleration_first_25m, get_slope_acceleration_at(lanelet_pose, true), + compare_epsilon); + + // without considering slope + EXPECT_DOUBLE_EQ(0.0, get_slope_acceleration_at(lanelet_pose, false)); + } // last 25m, up - lanelet_pose.s = 37.5; - lanelet_pose.rpy.z = 0.0; - EXPECT_NEAR( - expected_slope_acceleration_last_25m, get_slope_acceleration_at(lanelet_pose, true), - compare_epsilon); + { + lanelet_pose.s = 37.5; + lanelet_pose.rpy.z = 0.0; + + // with considering slope + EXPECT_NEAR( + expected_slope_acceleration_last_25m, get_slope_acceleration_at(lanelet_pose, true), + compare_epsilon); - // last 25m, up, without considering slope - EXPECT_DOUBLE_EQ(0.0, get_slope_acceleration_at(lanelet_pose, false)); + // without considering slope + EXPECT_DOUBLE_EQ(0.0, get_slope_acceleration_at(lanelet_pose, false)); + } // first 25m, down - lanelet_pose.s = 12.5; - lanelet_pose.rpy.z = M_PI; - EXPECT_NEAR( - -expected_slope_acceleration_first_25m, get_slope_acceleration_at(lanelet_pose, true), - compare_epsilon); + { + lanelet_pose.s = 12.5; + lanelet_pose.rpy.z = M_PI; + + // with considering slope + EXPECT_NEAR( + -expected_slope_acceleration_first_25m, get_slope_acceleration_at(lanelet_pose, true), + compare_epsilon); - // first 25m, down, without considering slope - EXPECT_DOUBLE_EQ(0.0, get_slope_acceleration_at(lanelet_pose, false)); + // without considering slope + EXPECT_DOUBLE_EQ(0.0, get_slope_acceleration_at(lanelet_pose, false)); + } // last 25m, down - lanelet_pose.s = 37.5; - lanelet_pose.rpy.z = M_PI; - EXPECT_NEAR( - -expected_slope_acceleration_last_25m, get_slope_acceleration_at(lanelet_pose, true), - compare_epsilon); - - // last 25m, down, without considering slope - EXPECT_DOUBLE_EQ(0.0, get_slope_acceleration_at(lanelet_pose, false)); + { + lanelet_pose.s = 37.5; + lanelet_pose.rpy.z = M_PI; + + // with considering slope + EXPECT_NEAR( + -expected_slope_acceleration_last_25m, get_slope_acceleration_at(lanelet_pose, true), + compare_epsilon); + + // without considering slope + EXPECT_DOUBLE_EQ(0.0, get_slope_acceleration_at(lanelet_pose, false)); + } rclcpp::shutdown(); diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index d2a175ca782..773d73013ec 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -21,6 +21,105 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Fix GitHub CI test job +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Apply clang format +* Fix SpellCheck GitHub Action +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/RJD-736/autoware_msgs_support_new_traffic_light_group' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # external/concealer/src/autoware_universe.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Port AckermannControlCommand to Control +* Port GearCommand +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index 53cd5f38b99..9cbff0ec53e 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 6.2.1 + 7.0.0 packages to define interface between simulator and scenario interpreter Masaya Kataoka Apache License 2.0 diff --git a/simulation/traffic_simulator/CHANGELOG.rst b/simulation/traffic_simulator/CHANGELOG.rst index 516adfd0c11..ebe8a1143ae 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -21,6 +21,130 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* chore: apply linter +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* fix: replace "awf/universe" with "awf/universe/20240605" for architecture_type +* chore: delete a test using autoware_auto_perception_msgs +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* refactor: added handling when autoware_perception_msgs/msg/traffic_signal_array.hpp is not present +* chore: delete wrongly doubled word +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* fix: delete autoware_auto_xx_msgs from include +* Merge branch 'master' into RJD-736/autoware_msgs_support +* apply linter +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Fix conflicts in includes +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Revert "add autoware\_ prefix" + This reverts commit a3591f038b30ca35f9188d552556a482a2ffbe17. +* add autoware\_ prefix +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge pull request `#1277 `_ from tier4/RJD-736/autoware_msgs_support_new_traffic_light_group + Rjd 736/autoware msgs support new traffic light group +* Merge remote-tracking branch 'origin/RJD-736/autoware_msgs_support_new_traffic_light_group' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # external/concealer/src/autoware_universe.cpp +* feat(traffic_simulator): support TrafficLightGroup for V2I traffic lights +* feat(traffic_simulator): support TrafficLightGroupArray in TrafficLightPublisher +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Delete unused autoware_auto_system_msgs package +* Port DetectedObjects and TrackedObjects +* Port TrafficSignalArray from autoware_auto_perception_msgs to autoware_perception_msgs +* Port AckermannControlCommand to Control +* Port HADMapBin to LaneletMapBin +* Port GearCommand +* Delete unused vehicle_state_command and vehicle_control_command +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski, Yutaka Kondo + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge pull request `#1468 `_ from tier4/feature/lane-change-everywhere +* fix:　disable default argument value for include_oppsite_direction in HdMapUtils::getLeftLaneletIds/getRightLaneletIds +* Merge branch 'master' into feature/lane-change-everywhere +* fix: fit test constants to latest algorithm +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* replace true with false for include_opposite_direction option +* fix:　use lanelet2 functions correctly in HdMapUtils::getLeftLaneletIds/getRightLaneletIds +* chore: fix linelint error +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* feat: allow lane-change everywhere in `VEHICLE_WITH_ROAD_SHOULDER` routing graph +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/hdmap_utils.hpp b/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/hdmap_utils.hpp index 36725531112..0f34b2c7c97 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/hdmap_utils.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/hdmap_utils.hpp @@ -204,7 +204,7 @@ class HdMapUtils auto getLeftLaneletIds( const lanelet::Id, const traffic_simulator::RoutingGraphType, - const bool include_opposite_direction = true) const -> lanelet::Ids; + const bool include_opposite_direction) const -> lanelet::Ids; auto getLongitudinalDistance( const traffic_simulator_msgs::msg::LaneletPose & from_pose, @@ -269,7 +269,7 @@ class HdMapUtils auto getRightLaneletIds( const lanelet::Id, const traffic_simulator::RoutingGraphType, - const bool include_opposite_direction = true) const -> lanelet::Ids; + const bool include_opposite_direction) const -> lanelet::Ids; auto getRightOfWayLaneletIds(const lanelet::Ids &) const -> std::unordered_map; @@ -367,7 +367,7 @@ class HdMapUtils auto toLaneletPoses( const geometry_msgs::msg::Pose &, const lanelet::Id, const double matching_distance = 5.0, - const bool include_opposite_direction = true, + const bool include_opposite_direction = false, const traffic_simulator::RoutingGraphType type = traffic_simulator::RoutingConfiguration().routing_graph_type) const -> std::vector; diff --git a/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/traffic_rules.hpp b/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/traffic_rules.hpp index 7acbbeb5e5b..d16133ee5f0 100644 --- a/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/traffic_rules.hpp +++ b/simulation/traffic_simulator/include/traffic_simulator/hdmap_utils/traffic_rules.hpp @@ -66,6 +66,9 @@ class GermanRoadShoulderPassableVehicle : public lanelet::traffic_rules::GermanV return startsWith(this->participant(), participant); }); } + + lanelet::traffic_rules::LaneChangeType laneChangeType( + const lanelet::ConstLineString3d &, bool) const override; }; } // namespace hdmap_utils #endif // TRAFFIC_SIMULATOR__HDMAP_UTILS__TRAFFIC_RULES_HPP_ diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index bd0f3697374..8113d65ce1e 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 6.2.1 + 7.0.0 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator/src/entity/entity_base.cpp b/simulation/traffic_simulator/src/entity/entity_base.cpp index 4a283710e8d..0b1d7af890a 100644 --- a/simulation/traffic_simulator/src/entity/entity_base.cpp +++ b/simulation/traffic_simulator/src/entity/entity_base.cpp @@ -719,7 +719,7 @@ auto EntityBase::requestSynchronize( lane_changeable_routing_configuration.allow_lane_change = true; const auto entity_distance = longitudinalDistance( - entity_lanelet_pose.value(), entity_target, true, true, + entity_lanelet_pose.value(), entity_target, true, false, lane_changeable_routing_configuration, hdmap_utils_ptr_); if (!entity_distance.has_value()) { THROW_SEMANTIC_ERROR( @@ -735,7 +735,7 @@ auto EntityBase::requestSynchronize( const auto target_entity_distance = longitudinalDistance( CanonicalizedLaneletPose(target_entity_lanelet_pose, hdmap_utils_ptr_), target_sync_pose, - true, true, lane_changeable_routing_configuration, hdmap_utils_ptr_); + true, false, lane_changeable_routing_configuration, hdmap_utils_ptr_); if (!target_entity_distance.has_value() || target_entity_distance.value() < 0.0) { RCLCPP_WARN_ONCE( rclcpp::get_logger("traffic_simulator"), diff --git a/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp b/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp index 5f037da71b7..650fb0fd802 100644 --- a/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp +++ b/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp @@ -220,11 +220,12 @@ auto HdMapUtils::countLaneChanges( if (auto followings = getNextLaneletIds(previous, routing_configuration.routing_graph_type); std::find(followings.begin(), followings.end(), current) == followings.end()) { - if (auto lefts = getLeftLaneletIds(previous, routing_configuration.routing_graph_type); + if (auto lefts = + getLeftLaneletIds(previous, routing_configuration.routing_graph_type, false); std::find(lefts.begin(), lefts.end(), current) != lefts.end()) { lane_changes.first++; } else if (auto rights = - getRightLaneletIds(previous, routing_configuration.routing_graph_type); + getRightLaneletIds(previous, routing_configuration.routing_graph_type, false); std::find(rights.begin(), rights.end(), current) != rights.end()) { lane_changes.second++; } @@ -1183,11 +1184,11 @@ auto HdMapUtils::getLeftLaneletIds( const bool include_opposite_direction) const -> lanelet::Ids { if (include_opposite_direction) { + throw common::Error( + "HdMapUtils::getLeftLaneletIds with include_opposite_direction=true is not implemented yet."); + } else { return getLaneletIds( routing_graphs_->routing_graph(type)->lefts(lanelet_map_ptr_->laneletLayer.get(lanelet_id))); - } else { - return getLaneletIds(routing_graphs_->routing_graph(type)->adjacentLefts( - lanelet_map_ptr_->laneletLayer.get(lanelet_id))); } } @@ -1196,11 +1197,12 @@ auto HdMapUtils::getRightLaneletIds( const bool include_opposite_direction) const -> lanelet::Ids { if (include_opposite_direction) { + throw common::Error( + "HdMapUtils::getRightLaneletIds with include_opposite_direction=true is not implemented " + "yet."); + } else { return getLaneletIds( routing_graphs_->routing_graph(type)->rights(lanelet_map_ptr_->laneletLayer.get(lanelet_id))); - } else { - return getLaneletIds(routing_graphs_->routing_graph(type)->adjacentRights( - lanelet_map_ptr_->laneletLayer.get(lanelet_id))); } } diff --git a/simulation/traffic_simulator/src/hdmap_utils/traffic_rules.cpp b/simulation/traffic_simulator/src/hdmap_utils/traffic_rules.cpp index 2140970be62..08b3c948461 100644 --- a/simulation/traffic_simulator/src/hdmap_utils/traffic_rules.cpp +++ b/simulation/traffic_simulator/src/hdmap_utils/traffic_rules.cpp @@ -19,3 +19,11 @@ lanelet::traffic_rules::RegisterTrafficRules germanRoadShoulderPassableVehicleRules( hdmap_utils::Locations::RoadShoulderPassableGermany, lanelet::Participants::Vehicle); + +lanelet::traffic_rules::LaneChangeType +hdmap_utils::GermanRoadShoulderPassableVehicle::laneChangeType( + const lanelet::ConstLineString3d &, bool) const +{ + /// @note allow lane-changes everywhere even if prohibited by lanelet2 map, because lane-change settings are not for entities but only for Autoware. + return lanelet::traffic_rules::LaneChangeType::Both; +} diff --git a/simulation/traffic_simulator/test/src/utils/test_distance.cpp b/simulation/traffic_simulator/test/src/utils/test_distance.cpp index ebe1558fb98..d288117c96b 100644 --- a/simulation/traffic_simulator/test/src/utils/test_distance.cpp +++ b/simulation/traffic_simulator/test/src/utils/test_distance.cpp @@ -524,7 +524,7 @@ TEST_F(distanceTest_IntersectionMap, longitudinalDistance_adjacent_noOpposite_ch pose_from.value(), pose_to.value(), true, false, lane_changeable_routing_configuration, hdmap_utils_ptr); ASSERT_TRUE(result.has_value()); - EXPECT_NEAR(result.value(), 103.0, 1.0); + EXPECT_DOUBLE_EQ(result.value(), 97.648110014340688); } { const auto pose_from = traffic_simulator::toCanonicalizedLaneletPose( @@ -540,7 +540,7 @@ TEST_F(distanceTest_IntersectionMap, longitudinalDistance_adjacent_noOpposite_ch pose_from.value(), pose_to.value(), true, false, lane_changeable_routing_configuration, hdmap_utils_ptr); ASSERT_TRUE(result.has_value()); - EXPECT_NEAR(result.value(), 131.0, 1.0); + EXPECT_DOUBLE_EQ(result.value(), 127.99532311325152); } } diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 7859ad9c7de..cf8105964a2 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -21,6 +21,96 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index c3a8b89ea90..e7c090973f2 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 6.2.1 + 7.0.0 ROS messages for openscenario Masaya Kataoka Apache License 2.0 diff --git a/test_runner/random_test_runner/CHANGELOG.rst b/test_runner/random_test_runner/CHANGELOG.rst index 06775777c24..91e98512908 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -21,6 +21,106 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* fix: DataTypes/stringFromArchitectureType_correct in random_test_runner +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* fix: replace "awf/universe" with "awf/universe/20240605" for architecture_type +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Revert "add autoware\_ prefix" + This reverts commit a3591f038b30ca35f9188d552556a482a2ffbe17. +* add autoware\_ prefix +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski, Yutaka Kondo + +6.3.1 (2024-12-10) +------------------ +* Merge pull request `#1474 `_ from tier4/fix/sonor-cloud-issue-8-3 + Fix Sonor Cloud Issue8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Fix Sonor Cloud Issue: should be declared "const". +* Contributors: Masaya Kataoka, Taiga Takano + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/test_runner/random_test_runner/include/random_test_runner/lanelet_utils.hpp b/test_runner/random_test_runner/include/random_test_runner/lanelet_utils.hpp index 5203d1068cd..e5de867a84a 100644 --- a/test_runner/random_test_runner/include/random_test_runner/lanelet_utils.hpp +++ b/test_runner/random_test_runner/include/random_test_runner/lanelet_utils.hpp @@ -51,19 +51,19 @@ class LaneletUtils double computeDistance( const traffic_simulator_msgs::msg::LaneletPose & p1, - const traffic_simulator_msgs::msg::LaneletPose & p2); + const traffic_simulator_msgs::msg::LaneletPose & p2) const; std::optional getOppositeLaneLet( const traffic_simulator_msgs::msg::LaneletPose & pose); std::vector getLanesWithinDistance( const traffic_simulator_msgs::msg::LaneletPose & pose, double min_distance, double max_distance); - std::vector getLaneletIds(); + std::vector getLaneletIds() const; geometry_msgs::msg::PoseStamped toMapPose( - const traffic_simulator_msgs::msg::LaneletPose & lanelet_pose, const bool fill_pitch); + const traffic_simulator_msgs::msg::LaneletPose & lanelet_pose, const bool fill_pitch) const; std::vector getRoute(int64_t from_lanelet_id, int64_t to_lanelet_id); - double getLaneletLength(int64_t lanelet_id); - bool isInLanelet(int64_t lanelet_id, double s); + double getLaneletLength(int64_t lanelet_id) const; + bool isInLanelet(int64_t lanelet_id, double s) const; private: lanelet::LaneletMapPtr lanelet_map_ptr_; diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index 0d2143d8dca..4438911c445 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 6.2.1 + 7.0.0 Random behavior test runner piotr-zyskowski-rai Apache License 2.0 diff --git a/test_runner/random_test_runner/src/lanelet_utils.cpp b/test_runner/random_test_runner/src/lanelet_utils.cpp index dd462c9ff00..e228a0e7bb9 100644 --- a/test_runner/random_test_runner/src/lanelet_utils.cpp +++ b/test_runner/random_test_runner/src/lanelet_utils.cpp @@ -47,10 +47,13 @@ LaneletUtils::LaneletUtils(const boost::filesystem::path & filename) std::make_shared(filename, geographic_msgs::msg::GeoPoint()); } -std::vector LaneletUtils::getLaneletIds() { return hdmap_utils_ptr_->getLaneletIds(); } +std::vector LaneletUtils::getLaneletIds() const +{ + return hdmap_utils_ptr_->getLaneletIds(); +} geometry_msgs::msg::PoseStamped LaneletUtils::toMapPose( - const traffic_simulator_msgs::msg::LaneletPose & lanelet_pose, const bool fill_pitch) + const traffic_simulator_msgs::msg::LaneletPose & lanelet_pose, const bool fill_pitch) const { return hdmap_utils_ptr_->toMapPose(lanelet_pose, fill_pitch); } @@ -60,14 +63,14 @@ std::vector LaneletUtils::getRoute(int64_t from_lanelet_id, int64_t to_ return hdmap_utils_ptr_->getRoute(from_lanelet_id, to_lanelet_id); } -double LaneletUtils::getLaneletLength(int64_t lanelet_id) +double LaneletUtils::getLaneletLength(int64_t lanelet_id) const { return hdmap_utils_ptr_->getLaneletLength(lanelet_id); } double LaneletUtils::computeDistance( const traffic_simulator_msgs::msg::LaneletPose & p1, - const traffic_simulator_msgs::msg::LaneletPose & p2) + const traffic_simulator_msgs::msg::LaneletPose & p2) const { auto p1_g = hdmap_utils_ptr_->toMapPose(p1).pose.position; auto p2_g = hdmap_utils_ptr_->toMapPose(p2).pose.position; @@ -78,7 +81,7 @@ double LaneletUtils::computeDistance( return std::sqrt(d.x * d.x + d.y * d.y + d.z * d.z); } -bool LaneletUtils::isInLanelet(int64_t lanelet_id, double s) +bool LaneletUtils::isInLanelet(int64_t lanelet_id, double s) const { return hdmap_utils_ptr_->isInLanelet(lanelet_id, s); } diff --git a/test_runner/scenario_test_runner/CHANGELOG.rst b/test_runner/scenario_test_runner/CHANGELOG.rst index d58d9dbec6f..e2d016367e9 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -35,6 +35,104 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context * Contributors: Masaya Kataoka +7.0.0 (2024-12-10) +------------------ +* Merge pull request `#1454 `_ from tier4/RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support + # Conflicts: + # external/concealer/include/concealer/autoware.hpp + # external/concealer/include/concealer/autoware_universe.hpp + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp + # external/concealer/src/autoware_universe.cpp + # external/concealer/src/field_operator_application_for_autoware_universe.cpp +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge branch 'master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/feature/manual_on_follow_trajectory' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge pull request `#1277 `_ from tier4/RJD-736/autoware_msgs_support_new_traffic_light_group + Rjd 736/autoware msgs support new traffic light group +* Merge remote-tracking branch 'origin/RJD-736/autoware_msgs_support_new_traffic_light_group' into feature/manual_on_follow_trajectory_not_auto + # Conflicts: + # external/concealer/src/autoware_universe.cpp +* fix: correct new architecture_type name +* chore(scenario_test_runner): add new architecture_type and delete old one in launch file +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Merge remote-tracking branch 'origin/master' into RJD-736/autoware_msgs_support +* Contributors: Kotaro Yoshimoto, Masaya Kataoka, Michał Kiełczykowski + +6.3.1 (2024-12-10) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Merge branch 'master' into fix/sonor-cloud-issue-8-3 +* Contributors: Masaya Kataoka + +6.3.0 (2024-12-10) +------------------ +* Merge branch 'master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Merge remote-tracking branch 'origin/master' into feature/lane-change-everywhere +* Contributors: Kotaro Yoshimoto + +6.2.5 (2024-12-09) +------------------ +* Merge branch 'master' into fix/acc_by_slope +* Contributors: Kotaro Yoshimoto + +6.2.4 (2024-12-09) +------------------ +* Merge branch 'master' into refactor/speed-condition +* Merge branch 'master' into refactor/speed-condition +* Contributors: Tatsuya Yamasaki + +6.2.3 (2024-12-05) +------------------ +* Merge branch 'master' into fix/sonor-cloud-issue-8-2 +* Contributors: Masaya Kataoka + +6.2.2 (2024-12-04) +------------------ +* Merge branch 'master' into refactor/distance-condition +* Merge remote-tracking branch 'origin/master' into refactor/distance-condition +* Contributors: Tatsuya Yamasaki, yamacir-kit + 6.2.1 (2024-12-03) ------------------ * Merge branch 'master' into refactor/distance-condition-and-relative-distance-condition diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 355c8a52622..58ba79dc752 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 6.2.1 + 7.0.0 scenario test runner package Tatsuya Yamasaki Apache License 2.0