Skip to content

Commit

Permalink
Merge branch 'master' into fix/math-closest-point
Browse files Browse the repository at this point in the history
  • Loading branch information
HansRobo authored Dec 16, 2024
2 parents d2b52ce + ada25b1 commit 25cf2e1
Show file tree
Hide file tree
Showing 76 changed files with 707 additions and 98 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/custom_spell.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
"Tschirnhaus",
"walltime",
"xerces",
"xercesc"
"xercesc",
"Szymon",
"Parapura"
]
}
9 changes: 9 additions & 0 deletions common/math/arithmetic/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ Changelog for package arithmetic
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.3.0 (2024-12-16)
------------------
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Contributors: Kotaro Yoshimoto, SzymonParapura

7.2.0 (2024-12-16)
------------------
* Merge branch 'master' into RJD-736/autoware_msgs_support_and_localization_sim_mode_support
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>7.2.0</version>
<version>7.3.0</version>
<description>arithmetic library for scenario_simulator_v2</description>
<maintainer email="tatsuya.yamasaki@tier4.jp">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
20 changes: 20 additions & 0 deletions common/math/geometry/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,26 @@ Changelog for package geometry
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.3.0 (2024-12-16)
------------------
* Merge pull request `#1481 <https://github.com/tier4/scenario_simulator_v2/issues/1481>`_ from tier4/feature/multi-level-lanelet-support
Feature/multi level lanelet support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* ref(traffic_simulator, simple_sensor_simulator): refactor altitude checks
* Refactor code to improve readability based on SonarQube findings
* Merge branch 'master' into feature/multi-level-lanelet-support
* Remove comment
* Merge branch 'master' into feature/multi-level-lanelet-support
* Fix missing newline at end of file
* [RJD-1369] Improve Collision Solving for Multi-Level Support
- Enhanced BehaviorTree to consider altitude when detecting potential obstacles,
allowing to ignore objects located at different altitudes.
- Modified the detection sensor by introducing Ego plane determination to exclude objects below the Ego plane,
preventing unnecessary slowing or stopping caused by incorrect detections.
* Contributors: Dawid Moszynski, Kotaro Yoshimoto, SzymonParapura

7.2.0 (2024-12-16)
------------------
* Merge branch 'master' into RJD-736/autoware_msgs_support_and_localization_sim_mode_support
Expand Down
45 changes: 45 additions & 0 deletions common/math/geometry/include/geometry/plane.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// Copyright 2015 TIER IV, Inc. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GEOMETRY__PLANE_HPP_
#define GEOMETRY__PLANE_HPP_

#include <geometry_msgs/msg/point.hpp>
#include <geometry_msgs/msg/vector3.hpp>
#include <optional>

namespace math
{
namespace geometry
{

/// @class Plane
/// @brief Represents a plane in 3D space, defined by a normal vector and a point on the plane.
///
/// The plane is described using the equation:
/// Ax + By + Cz + D = 0
/// where:
/// - A, B, C are the components of the normal vector (normal_ attribute).
/// - D is the offset from the origin, calculated using the point and normal vector (d_ attribute).
struct Plane
{
Plane(const geometry_msgs::msg::Point & point, const geometry_msgs::msg::Vector3 & normal);
auto offset(const geometry_msgs::msg::Point & point) const -> double;

const geometry_msgs::msg::Vector3 normal_;
const double d_;
};
} // namespace geometry
} // namespace math
#endif // GEOMETRY__PLANE_HPP_
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// Copyright 2015 TIER IV, Inc. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GEOMETRY__QUATERNION__GET_ANGLE_DIFFERENCE_HPP_
#define GEOMETRY__QUATERNION__GET_ANGLE_DIFFERENCE_HPP_

#include <Eigen/Geometry>
#include <geometry/quaternion/is_like_quaternion.hpp>

namespace math
{
namespace geometry
{
template <
typename T, std::enable_if_t<std::conjunction_v<IsLikeQuaternion<T>>, std::nullptr_t> = nullptr>
auto getAngleDifference(const T & quat1, const T & quat2) -> double
{
const Eigen::Quaterniond q1(quat1.w, quat1.x, quat1.y, quat1.z);
const Eigen::Quaterniond q2(quat2.w, quat2.x, quat2.y, quat2.z);

const Eigen::AngleAxisd delta(q1.inverse() * q2);

return std::abs(delta.angle()); // [rad]
}
} // namespace geometry
} // namespace math

#endif // GEOMETRY__QUATERNION__GET_ANGLE_DIFFERENCE_HPP_
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// Copyright 2015 TIER IV, Inc. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GEOMETRY__VECTOR3__GET_NORMAL_VECTOR_HPP_
#define GEOMETRY__VECTOR3__GET_NORMAL_VECTOR_HPP_

#include <geometry/quaternion/get_rotation_matrix.hpp>
#include <geometry/quaternion/is_like_quaternion.hpp>
#include <geometry_msgs/msg/vector3.hpp>

namespace math
{
namespace geometry
{
template <
typename T, std::enable_if_t<std::conjunction_v<IsLikeQuaternion<T>>, std::nullptr_t> = nullptr>
auto getNormalVector(const T & orientation) -> geometry_msgs::msg::Vector3
{
const Eigen::Matrix3d rotation_matrix = getRotationMatrix(orientation);

return geometry_msgs::build<geometry_msgs::msg::Vector3>()
.x(rotation_matrix(0, 2))
.y(rotation_matrix(1, 2))
.z(rotation_matrix(2, 2));
}

} // namespace geometry
} // namespace math

#endif // GEOMETRY__VECTOR3__GET_NORMAL_VECTOR_HPP_
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>7.2.0</version>
<version>7.3.0</version>
<description>geometry math library for scenario_simulator_v2 application</description>
<maintainer email="masaya.kataoka@tier4.jp">Masaya Kataoka</maintainer>
<license>Apache License 2.0</license>
Expand Down
39 changes: 39 additions & 0 deletions common/math/geometry/src/plane.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// Copyright 2015 TIER IV, Inc. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include <cmath>
#include <geometry/plane.hpp>
#include <geometry/quaternion/operator.hpp>
#include <scenario_simulator_exception/exception.hpp>

namespace math
{
namespace geometry
{
Plane::Plane(const geometry_msgs::msg::Point & point, const geometry_msgs::msg::Vector3 & normal)
: normal_(normal), d_(-(normal.x * point.x + normal.y * point.y + normal.z * point.z))
{
if (normal.x == 0.0 && normal.y == 0.0 && normal.z == 0.0) {
THROW_SIMULATION_ERROR("Plane cannot be created using zero normal vector.");
} else if (std::isnan(point.x) || std::isnan(point.y) || std::isnan(point.z)) {
THROW_SIMULATION_ERROR("Plane cannot be created using point with NaN value.");
}
}

auto Plane::offset(const geometry_msgs::msg::Point & point) const -> double
{
return normal_.x * point.x + normal_.y * point.y + normal_.z * point.z + d_;
}
} // namespace geometry
} // namespace math
9 changes: 9 additions & 0 deletions common/scenario_simulator_exception/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ Changelog for package scenario_simulator_exception
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.3.0 (2024-12-16)
------------------
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Contributors: Kotaro Yoshimoto, SzymonParapura

7.2.0 (2024-12-16)
------------------
* Merge branch 'master' into RJD-736/autoware_msgs_support_and_localization_sim_mode_support
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>7.2.0</version>
<version>7.3.0</version>
<description>Exception types for scenario simulator</description>
<maintainer email="tatsuya.yamasaki@tier4.jp">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
9 changes: 9 additions & 0 deletions common/simple_junit/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ Changelog for package junit_exporter
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.3.0 (2024-12-16)
------------------
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Contributors: Kotaro Yoshimoto, SzymonParapura

7.2.0 (2024-12-16)
------------------
* Merge branch 'master' into RJD-736/autoware_msgs_support_and_localization_sim_mode_support
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>7.2.0</version>
<version>7.3.0</version>
<description>Lightweight JUnit library for ROS 2</description>
<maintainer email="masaya.kataoka@tier4.jp">Masaya Kataoka</maintainer>
<maintainer email="tatsuya.yamasaki@tier4.jp">Tatsuya Yamasaki</maintainer>
Expand Down
9 changes: 9 additions & 0 deletions common/status_monitor/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ Changelog for package status_monitor
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.3.0 (2024-12-16)
------------------
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Contributors: Kotaro Yoshimoto, SzymonParapura

7.2.0 (2024-12-16)
------------------
* Merge branch 'master' into RJD-736/autoware_msgs_support_and_localization_sim_mode_support
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>7.2.0</version>
<version>7.3.0</version>
<description>none</description>
<maintainer email="tatsuya.yamasaki@tier4.jp">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
9 changes: 9 additions & 0 deletions external/concealer/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ Changelog for package concealer
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.3.0 (2024-12-16)
------------------
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Contributors: Kotaro Yoshimoto, SzymonParapura

7.2.0 (2024-12-16)
------------------
* Merge pull request `#1484 <https://github.com/tier4/scenario_simulator_v2/issues/1484>`_ from tier4/RJD-736/autoware_msgs_support_and_localization_sim_mode_support
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>7.2.0</version>
<version>7.3.0</version>
<description>Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator.</description>
<maintainer email="tatsuya.yamasaki@tier4.jp">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
9 changes: 9 additions & 0 deletions external/embree_vendor/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ Changelog for package embree_vendor
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.3.0 (2024-12-16)
------------------
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Contributors: Kotaro Yoshimoto, SzymonParapura

7.2.0 (2024-12-16)
------------------
* Merge branch 'master' into RJD-736/autoware_msgs_support_and_localization_sim_mode_support
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>7.2.0</version>
<version>7.3.0</version>
<description>vendor packages for intel raytracing kernel library</description>
<maintainer email="ms.kataoka@gmail.com">masaya</maintainer>
<license>Apache 2.0</license>
Expand Down
9 changes: 9 additions & 0 deletions map/kashiwanoha_map/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ Changelog for package kashiwanoha_map
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

7.3.0 (2024-12-16)
------------------
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Merge branch 'master' into feature/multi-level-lanelet-support
* Contributors: Kotaro Yoshimoto, SzymonParapura

7.2.0 (2024-12-16)
------------------
* Merge branch 'master' into RJD-736/autoware_msgs_support_and_localization_sim_mode_support
Expand Down
2 changes: 1 addition & 1 deletion map/kashiwanoha_map/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>kashiwanoha_map</name>
<version>7.2.0</version>
<version>7.3.0</version>
<description>map package for kashiwanoha</description>
<maintainer email="masaya.kataoka@tier4.jp">Masaya Kataoka</maintainer>
<license>Apache License 2.0</license>
Expand Down
Loading

0 comments on commit 25cf2e1

Please sign in to comment.