Skip to content

Commit

Permalink
Merge branch 'master' into feature/enable_specify_entity_type_in_auto…
Browse files Browse the repository at this point in the history
…sink
  • Loading branch information
hakuturu583 authored Nov 13, 2024
2 parents 56f31cc + 85fec17 commit 51dfd98
Show file tree
Hide file tree
Showing 77 changed files with 957 additions and 238 deletions.
25 changes: 25 additions & 0 deletions common/math/arithmetic/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,31 @@ Changelog for package arithmetic
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

5.1.0 (2024-11-12)
------------------
* Merge branch 'master' into feature/traffic_light_group
* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group
# Conflicts:
# simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp
# simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp
# simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Contributors: Kotaro Yoshimoto

5.0.2 (2024-11-11)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue
* Merge branch 'master' into fix/sonor-cloud-issue
* Contributors: Masaya Kataoka, Taiga

5.0.1 (2024-11-11)
------------------

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

5.1.0 (2024-11-12)
------------------
* Merge branch 'master' into feature/traffic_light_group
* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group
# Conflicts:
# simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp
# simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp
# simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Contributors: Kotaro Yoshimoto

5.0.2 (2024-11-11)
------------------
* Merge pull request `#1431 <https://github.com/tier4/scenario_simulator_v2/issues/1431>`_ from tier4/fix/sonor-cloud-issue
fix/sonor-cloud-issue
* Merge branch 'master' into fix/sonor-cloud-issue
* Merge branch 'master' into fix/sonor-cloud-issue
* adding const to objects.
* Defined individually in each statement.
* adding const to large objects.
* Fix declaration mismatch.
* Remove unnecessary const from the return value of the function.
* Contributors: Masaya Kataoka, Taiga, Taiga Takano

5.0.1 (2024-11-11)
------------------
* Merge pull request `#1428 <https://github.com/tier4/scenario_simulator_v2/issues/1428>`_ from tier4/fix/dont-float-loop
Refactor curvature sampling loop to avoid using float counter
* add comment
* Refactor curvature sampling loop to avoid using float counter
* Contributors: Masaya Kataoka, Taiga Takano

5.0.0 (2024-11-08)
------------------
* Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager
Expand Down
8 changes: 4 additions & 4 deletions common/math/geometry/include/geometry/bounding_box.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ auto toPolygon2D(const traffic_simulator_msgs::msg::BoundingBox & bounding_box)
-> std::vector<geometry_msgs::msg::Point>;
auto toPolygon2D(
const geometry_msgs::msg::Pose & pose,
const traffic_simulator_msgs::msg::BoundingBox & bounding_box) -> const boost_polygon;
const traffic_simulator_msgs::msg::BoundingBox & bounding_box) -> boost_polygon;
std::vector<geometry_msgs::msg::Point> getPointsFromBbox(
traffic_simulator_msgs::msg::BoundingBox bounding_box, double width_extension_right = 0.0,
double width_extension_left = 0.0, double length_extension_front = 0.0,
double length_extension_rear = 0.0);
const traffic_simulator_msgs::msg::BoundingBox & bounding_box,
const double width_extension_right = 0.0, const double width_extension_left = 0.0,
const double length_extension_front = 0.0, const double length_extension_rear = 0.0);
DistancesFromCenterToEdge getDistancesFromCenterToEdge(
const traffic_simulator_msgs::msg::BoundingBox & bounding_box);

Expand Down
2 changes: 1 addition & 1 deletion common/math/geometry/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>geometry</name>
<version>5.0.0</version>
<version>5.1.0</version>
<description>geometry math library for scenario_simulator_v2 application</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<license>Apache License 2.0</license>
Expand Down
16 changes: 12 additions & 4 deletions common/math/geometry/src/bounding_box.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,15 @@ boost_point pointToSegmentProjection(

auto toPolygon2D(
const geometry_msgs::msg::Pose & pose,
const traffic_simulator_msgs::msg::BoundingBox & bounding_box) -> const boost_polygon
const traffic_simulator_msgs::msg::BoundingBox & bounding_box) -> boost_polygon
{
return toBoostPolygon(transformPoints(pose, getPointsFromBbox(bounding_box)));
}

std::vector<geometry_msgs::msg::Point> getPointsFromBbox(
traffic_simulator_msgs::msg::BoundingBox bounding_box, double width_extension_right,
double width_extension_left, double length_extension_front, double length_extension_rear)
const traffic_simulator_msgs::msg::BoundingBox & bounding_box, const double width_extension_right,
const double width_extension_left, const double length_extension_front,
const double length_extension_rear)
{
std::vector<geometry_msgs::msg::Point> points;
auto distances_from_center_to_edge = getDistancesFromCenterToEdge(bounding_box);
Expand Down Expand Up @@ -159,7 +160,14 @@ auto toPolygon2D(const traffic_simulator_msgs::msg::BoundingBox & bounding_box)
-> std::vector<geometry_msgs::msg::Point>
{
std::vector<geometry_msgs::msg::Point> points_bounding_box;
geometry_msgs::msg::Point p0, p1, p2, p3, p4, p5, p6, p7;
geometry_msgs::msg::Point p0;
geometry_msgs::msg::Point p1;
geometry_msgs::msg::Point p2;
geometry_msgs::msg::Point p3;
geometry_msgs::msg::Point p4;
geometry_msgs::msg::Point p5;
geometry_msgs::msg::Point p6;
geometry_msgs::msg::Point p7;

p0.x = bounding_box.center.x + bounding_box.dimensions.x * 0.5;
p0.y = bounding_box.center.y + bounding_box.dimensions.y * 0.5;
Expand Down
14 changes: 10 additions & 4 deletions common/math/geometry/src/spline/hermite_curve.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -313,13 +313,19 @@ std::pair<double, double> HermiteCurve::get2DMinMaxCurvatureValue() const
{
std::pair<double, double> ret;
std::vector<double> curvatures;
/**
* @brief 0.1 is a sampling resolution of the curvature
*/
for (double s = 0; s <= 1; s = s + 0.1) {

/// @note Specifies the number of samples. The curve is divided into 10 segments for calculation.
constexpr int sample_count = 10;

/// @note Sampling resolution. Calculated as 1.0 divided by sample_count.
constexpr double resolution = 1.0 / sample_count;

for (int i = 0; i <= sample_count; ++i) {
double s = i * resolution;
double curvature = get2DCurvature(s);
curvatures.push_back(curvature);
}

ret.first = *std::min_element(curvatures.begin(), curvatures.end());
ret.second = *std::max_element(curvatures.begin(), curvatures.end());
return ret;
Expand Down
25 changes: 25 additions & 0 deletions common/scenario_simulator_exception/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,31 @@ Changelog for package scenario_simulator_exception
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

5.1.0 (2024-11-12)
------------------
* Merge branch 'master' into feature/traffic_light_group
* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group
# Conflicts:
# simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp
# simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp
# simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Contributors: Kotaro Yoshimoto

5.0.2 (2024-11-11)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue
* Merge branch 'master' into fix/sonor-cloud-issue
* Contributors: Masaya Kataoka, Taiga

5.0.1 (2024-11-11)
------------------

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

5.1.0 (2024-11-12)
------------------
* Merge branch 'master' into feature/traffic_light_group
* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group
# Conflicts:
# simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp
# simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp
# simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Contributors: Kotaro Yoshimoto

5.0.2 (2024-11-11)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue
* Merge branch 'master' into fix/sonor-cloud-issue
* Contributors: Masaya Kataoka, Taiga

5.0.1 (2024-11-11)
------------------

5.0.0 (2024-11-08)
------------------
* Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager
Expand Down
2 changes: 1 addition & 1 deletion common/simple_junit/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>simple_junit</name>
<version>5.0.0</version>
<version>5.1.0</version>
<description>Lightweight JUnit library for ROS 2</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
Expand Down
25 changes: 25 additions & 0 deletions common/status_monitor/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,31 @@ Changelog for package status_monitor
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

5.1.0 (2024-11-12)
------------------
* Merge branch 'master' into feature/traffic_light_group
* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group
# Conflicts:
# simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp
# simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp
# simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Contributors: Kotaro Yoshimoto

5.0.2 (2024-11-11)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue
* Merge branch 'master' into fix/sonor-cloud-issue
* Contributors: Masaya Kataoka, Taiga

5.0.1 (2024-11-11)
------------------

5.0.0 (2024-11-08)
------------------
* Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager
Expand Down
2 changes: 1 addition & 1 deletion common/status_monitor/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>status_monitor</name>
<version>5.0.0</version>
<version>5.1.0</version>
<description>none</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
25 changes: 25 additions & 0 deletions external/concealer/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,31 @@ Changelog for package concealer
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

5.1.0 (2024-11-12)
------------------
* Merge branch 'master' into feature/traffic_light_group
* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group
# Conflicts:
# simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp
# simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp
# simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Contributors: Kotaro Yoshimoto

5.0.2 (2024-11-11)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue
* Merge branch 'master' into fix/sonor-cloud-issue
* Contributors: Masaya Kataoka, Taiga

5.0.1 (2024-11-11)
------------------

5.0.0 (2024-11-08)
------------------
* Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager
Expand Down
2 changes: 1 addition & 1 deletion external/concealer/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>concealer</name>
<version>5.0.0</version>
<version>5.1.0</version>
<description>Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator.</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
25 changes: 25 additions & 0 deletions external/embree_vendor/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,31 @@ Changelog for package embree_vendor
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

5.1.0 (2024-11-12)
------------------
* Merge branch 'master' into feature/traffic_light_group
* Merge remote-tracking branch 'origin/master' into feature/traffic_light_group
# Conflicts:
# simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp
# simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp
# simulation/traffic_simulator/src/traffic_lights/traffic_light_publisher.cpp
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Merge branch 'master' into feature/traffic_light_group
* Contributors: Kotaro Yoshimoto

5.0.2 (2024-11-11)
------------------
* Merge branch 'master' into fix/sonor-cloud-issue
* Merge branch 'master' into fix/sonor-cloud-issue
* Contributors: Masaya Kataoka, Taiga

5.0.1 (2024-11-11)
------------------

5.0.0 (2024-11-08)
------------------
* Merge remote-tracking branch 'tier4/master' into RJD-1057-remove-traffic-lights-from-entity-manager
Expand Down
2 changes: 1 addition & 1 deletion external/embree_vendor/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>embree_vendor</name>
<version>5.0.0</version>
<version>5.1.0</version>
<description>vendor packages for intel raytracing kernel library</description>
<maintainer email="[email protected]">masaya</maintainer>
<license>Apache 2.0</license>
Expand Down
Loading

0 comments on commit 51dfd98

Please sign in to comment.