diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6fdd04df3eb79..77adc8e6479bb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -30,7 +30,7 @@ common/signal_processing/** ali.boyali@tier4.jp fumiya.watanabe@tier4.jp kyoichi
common/tensorrt_common/** dan.umeda@tier4.jp manato.hirabayashi@tier4.jp
common/tier4_adapi_rviz_plugin/** hiroki.ota@tier4.jp isamu.takagi@tier4.jp kosuke.takeuchi@tier4.jp
common/tier4_api_utils/** isamu.takagi@tier4.jp
-common/tier4_autoware_utils/** mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
+common/autoware_universe_utils/** mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
common/tier4_camera_view_rviz_plugin/** makoto.ybauta@tier4.jp uken.ryu@tier4.jp
common/tier4_datetime_rviz_plugin/** isamu.takagi@tier4.jp
common/tier4_localization_rviz_plugin/** isamu.takagi@tier4.jp takamasa.horibe@tier4.jp
diff --git a/common/.pages b/common/.pages
index 1084ec0356336..60300879035d8 100644
--- a/common/.pages
+++ b/common/.pages
@@ -25,7 +25,7 @@ nav:
- 'Introduction': common/signal_processing
- 'Butterworth Filter': common/signal_processing/documentation/ButterworthFilter
- 'TensorRT Common': common/tensorrt_common
- - 'tier4_autoware_utils': common/tier4_autoware_utils
+ - 'autoware_universe_utils': common/autoware_universe_utils
- 'traffic_light_utils': common/traffic_light_utils
- 'TVM Utility':
- 'Introduction': common/tvm_utility
diff --git a/common/README.md b/common/README.md
index 95b8973a66b2b..6401aeab7b685 100644
--- a/common/README.md
+++ b/common/README.md
@@ -12,5 +12,5 @@ The Autoware.Universe Common folder consists of common and testing libraries tha
Some of the commonly used libraries are:
-1. `tier4_autoware_utils`
+1. `autoware_universe_utils`
2. `motion_utils`
diff --git a/common/autoware_grid_map_utils/package.xml b/common/autoware_grid_map_utils/package.xml
index c15470168f318..d8344b08f2341 100644
--- a/common/autoware_grid_map_utils/package.xml
+++ b/common/autoware_grid_map_utils/package.xml
@@ -10,10 +10,10 @@
autoware_cmake
eigen3_cmake_module
+ autoware_universe_utils
grid_map_core
grid_map_cv
libopencv-dev
- tier4_autoware_utils
ament_cmake_gtest
ament_lint_auto
diff --git a/common/autoware_grid_map_utils/test/benchmark.cpp b/common/autoware_grid_map_utils/test/benchmark.cpp
index 77da9ae589b73..90545135b3e18 100644
--- a/common/autoware_grid_map_utils/test/benchmark.cpp
+++ b/common/autoware_grid_map_utils/test/benchmark.cpp
@@ -17,13 +17,13 @@
#include "grid_map_cv/GridMapCvConverter.hpp"
#include "grid_map_cv/GridMapCvProcessing.hpp"
+#include
#include
#include
#include
#include
#include
#include
-#include
#include
#include
@@ -46,7 +46,7 @@ int main(int argc, char * argv[])
result_file
<< "#Size PolygonVertices PolygonIndexes grid_map_utils_constructor grid_map_utils_iteration "
"grid_map_constructor grid_map_iteration\n";
- tier4_autoware_utils::StopWatch stopwatch;
+ autoware_universe_utils::StopWatch stopwatch;
constexpr auto nb_iterations = 10;
constexpr auto polygon_side_vertices =
diff --git a/common/autoware_grid_map_utils/test/test_polygon_iterator.cpp b/common/autoware_grid_map_utils/test/test_polygon_iterator.cpp
index 8d9cff560b5b7..1646586853800 100644
--- a/common/autoware_grid_map_utils/test/test_polygon_iterator.cpp
+++ b/common/autoware_grid_map_utils/test/test_polygon_iterator.cpp
@@ -14,8 +14,8 @@
#include "autoware_grid_map_utils/polygon_iterator.hpp"
+#include
#include
-#include
// gtest
#include
diff --git a/common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp b/common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp
index 093449176b047..b4b5834f71fa1 100644
--- a/common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp
+++ b/common/autoware_test_utils/include/autoware_test_utils/autoware_test_utils.hpp
@@ -15,12 +15,12 @@
#ifndef AUTOWARE_TEST_UTILS__AUTOWARE_TEST_UTILS_HPP_
#define AUTOWARE_TEST_UTILS__AUTOWARE_TEST_UTILS_HPP_
+#include
#include
#include
#include
#include
#include
-#include
#include
#include
@@ -62,6 +62,8 @@ using autoware_planning_msgs::msg::Trajectory;
using tier4_planning_msgs::msg::PathPointWithLaneId;
using tier4_planning_msgs::msg::PathWithLaneId;
using RouteSections = std::vector;
+using autoware_universe_utils::createPoint;
+using autoware_universe_utils::createQuaternionFromRPY;
using geometry_msgs::msg::Point;
using geometry_msgs::msg::Pose;
using geometry_msgs::msg::PoseStamped;
@@ -70,8 +72,6 @@ using nav_msgs::msg::OccupancyGrid;
using nav_msgs::msg::Odometry;
using sensor_msgs::msg::PointCloud2;
using tf2_msgs::msg::TFMessage;
-using tier4_autoware_utils::createPoint;
-using tier4_autoware_utils::createQuaternionFromRPY;
using tier4_planning_msgs::msg::Scenario;
using unique_identifier_msgs::msg::UUID;
diff --git a/common/autoware_test_utils/package.xml b/common/autoware_test_utils/package.xml
index 555345c1d9105..778b9a42ca207 100644
--- a/common/autoware_test_utils/package.xml
+++ b/common/autoware_test_utils/package.xml
@@ -19,6 +19,7 @@
autoware_map_msgs
autoware_perception_msgs
autoware_planning_msgs
+ autoware_universe_utils
autoware_vehicle_msgs
component_interface_specs
component_interface_utils
@@ -29,7 +30,6 @@
tf2_msgs
tf2_ros
tier4_api_msgs
- tier4_autoware_utils
tier4_planning_msgs
tier4_v2x_msgs
unique_identifier_msgs
diff --git a/common/tier4_autoware_utils/CMakeLists.txt b/common/autoware_universe_utils/CMakeLists.txt
similarity index 69%
rename from common/tier4_autoware_utils/CMakeLists.txt
rename to common/autoware_universe_utils/CMakeLists.txt
index 9cb54e52362a5..9e86ddeb60692 100644
--- a/common/tier4_autoware_utils/CMakeLists.txt
+++ b/common/autoware_universe_utils/CMakeLists.txt
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 3.14)
-project(tier4_autoware_utils)
+project(autoware_universe_utils)
find_package(autoware_cmake REQUIRED)
autoware_package()
find_package(Boost REQUIRED)
-ament_auto_add_library(tier4_autoware_utils SHARED
+ament_auto_add_library(autoware_universe_utils SHARED
src/geometry/geometry.cpp
src/geometry/pose_deviation.cpp
src/geometry/boost_polygon_utils.cpp
@@ -23,10 +23,10 @@ if(BUILD_TESTING)
file(GLOB_RECURSE test_files test/**/*.cpp)
- ament_add_ros_isolated_gtest(test_tier4_autoware_utils ${test_files})
+ ament_add_ros_isolated_gtest(test_autoware_universe_utils ${test_files})
- target_link_libraries(test_tier4_autoware_utils
- tier4_autoware_utils
+ target_link_libraries(test_autoware_universe_utils
+ autoware_universe_utils
)
endif()
diff --git a/common/autoware_universe_utils/README.md b/common/autoware_universe_utils/README.md
new file mode 100644
index 0000000000000..22b9355b09635
--- /dev/null
+++ b/common/autoware_universe_utils/README.md
@@ -0,0 +1,9 @@
+# autoware_universe_utils
+
+## Purpose
+
+This package contains many common functions used by other packages, so please refer to them as needed.
+
+## For developers
+
+`autoware_universe_utils.hpp` header file was removed because the source files that directly/indirectly include this file took a long time for preprocessing.
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/geometry/boost_geometry.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/geometry/boost_geometry.hpp
similarity index 84%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/geometry/boost_geometry.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/geometry/boost_geometry.hpp
index d986d0f23fc85..c90cc714367f1 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/geometry/boost_geometry.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/geometry/boost_geometry.hpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__GEOMETRY__BOOST_GEOMETRY_HPP_
-#define TIER4_AUTOWARE_UTILS__GEOMETRY__BOOST_GEOMETRY_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__GEOMETRY__BOOST_GEOMETRY_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__GEOMETRY__BOOST_GEOMETRY_HPP_
#include
#include
@@ -25,7 +25,7 @@
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
// 2D
struct Point2d;
@@ -93,12 +93,12 @@ inline Point3d fromMsg(const geometry_msgs::msg::Point & msg)
point.z() = msg.z;
return point;
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-BOOST_GEOMETRY_REGISTER_POINT_2D( // NOLINT
- tier4_autoware_utils::Point2d, double, cs::cartesian, x(), y()) // NOLINT
-BOOST_GEOMETRY_REGISTER_POINT_3D( // NOLINT
- tier4_autoware_utils::Point3d, double, cs::cartesian, x(), y(), z()) // NOLINT
-BOOST_GEOMETRY_REGISTER_RING(tier4_autoware_utils::LinearRing2d) // NOLINT
+BOOST_GEOMETRY_REGISTER_POINT_2D( // NOLINT
+ autoware_universe_utils::Point2d, double, cs::cartesian, x(), y()) // NOLINT
+BOOST_GEOMETRY_REGISTER_POINT_3D( // NOLINT
+ autoware_universe_utils::Point3d, double, cs::cartesian, x(), y(), z()) // NOLINT
+BOOST_GEOMETRY_REGISTER_RING(autoware_universe_utils::LinearRing2d) // NOLINT
-#endif // TIER4_AUTOWARE_UTILS__GEOMETRY__BOOST_GEOMETRY_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__GEOMETRY__BOOST_GEOMETRY_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/geometry/boost_polygon_utils.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/geometry/boost_polygon_utils.hpp
similarity index 85%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/geometry/boost_polygon_utils.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/geometry/boost_polygon_utils.hpp
index 665e959ed2460..477a1b4c27a6c 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/geometry/boost_polygon_utils.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/geometry/boost_polygon_utils.hpp
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__GEOMETRY__BOOST_POLYGON_UTILS_HPP_
-#define TIER4_AUTOWARE_UTILS__GEOMETRY__BOOST_POLYGON_UTILS_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__GEOMETRY__BOOST_POLYGON_UTILS_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__GEOMETRY__BOOST_POLYGON_UTILS_HPP_
-#include "tier4_autoware_utils/geometry/boost_geometry.hpp"
+#include "autoware/universe_utils/geometry/boost_geometry.hpp"
#include
#include
@@ -24,7 +24,7 @@
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
bool isClockwise(const Polygon2d & polygon);
Polygon2d inverseClockwise(const Polygon2d & polygon);
@@ -47,6 +47,6 @@ Polygon2d toFootprint(
const double base_to_rear, const double width);
double getArea(const autoware_perception_msgs::msg::Shape & shape);
Polygon2d expandPolygon(const Polygon2d & input_polygon, const double offset);
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__GEOMETRY__BOOST_POLYGON_UTILS_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__GEOMETRY__BOOST_POLYGON_UTILS_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/geometry/geometry.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/geometry/geometry.hpp
similarity index 97%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/geometry/geometry.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/geometry/geometry.hpp
index 334df8f32af91..0af9d30ad09c1 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/geometry/geometry.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/geometry/geometry.hpp
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__GEOMETRY__GEOMETRY_HPP_
-#define TIER4_AUTOWARE_UTILS__GEOMETRY__GEOMETRY_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__GEOMETRY__GEOMETRY_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__GEOMETRY__GEOMETRY_HPP_
-#include "tier4_autoware_utils/geometry/boost_geometry.hpp"
-#include "tier4_autoware_utils/math/constants.hpp"
-#include "tier4_autoware_utils/math/normalization.hpp"
-#include "tier4_autoware_utils/ros/msg_covariance.hpp"
+#include "autoware/universe_utils/geometry/boost_geometry.hpp"
+#include "autoware/universe_utils/math/constants.hpp"
+#include "autoware/universe_utils/math/normalization.hpp"
+#include "autoware/universe_utils/ros/msg_covariance.hpp"
#include
#include
@@ -96,7 +96,7 @@ inline void doTransform(
#endif
} // namespace tf2
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
template
geometry_msgs::msg::Point getPoint(const T & p)
@@ -577,6 +577,6 @@ std::optional intersect(
const geometry_msgs::msg::Point & p1, const geometry_msgs::msg::Point & p2,
const geometry_msgs::msg::Point & p3, const geometry_msgs::msg::Point & p4);
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__GEOMETRY__GEOMETRY_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__GEOMETRY__GEOMETRY_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/geometry/pose_deviation.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/geometry/pose_deviation.hpp
similarity index 82%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/geometry/pose_deviation.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/geometry/pose_deviation.hpp
index dfa678eaa07d9..2f2b4a5d3dfb0 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/geometry/pose_deviation.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/geometry/pose_deviation.hpp
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__GEOMETRY__POSE_DEVIATION_HPP_
-#define TIER4_AUTOWARE_UTILS__GEOMETRY__POSE_DEVIATION_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__GEOMETRY__POSE_DEVIATION_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__GEOMETRY__POSE_DEVIATION_HPP_
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
struct PoseDeviation
{
@@ -39,6 +39,6 @@ double calcYawDeviation(
PoseDeviation calcPoseDeviation(
const geometry_msgs::msg::Pose & base_pose, const geometry_msgs::msg::Pose & target_pose);
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__GEOMETRY__POSE_DEVIATION_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__GEOMETRY__POSE_DEVIATION_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/math/constants.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/math/constants.hpp
similarity index 74%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/math/constants.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/math/constants.hpp
index 984fa04016b57..2c1f9fe646723 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/math/constants.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/math/constants.hpp
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__MATH__CONSTANTS_HPP_
-#define TIER4_AUTOWARE_UTILS__MATH__CONSTANTS_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__MATH__CONSTANTS_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__MATH__CONSTANTS_HPP_
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
constexpr double pi = 3.14159265358979323846; // To be replaced by std::numbers::pi in C++20
constexpr double gravity = 9.80665;
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__MATH__CONSTANTS_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__MATH__CONSTANTS_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/math/normalization.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/math/normalization.hpp
similarity index 79%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/math/normalization.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/math/normalization.hpp
index 1eb32f33886cf..502ed4b4f7b34 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/math/normalization.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/math/normalization.hpp
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__MATH__NORMALIZATION_HPP_
-#define TIER4_AUTOWARE_UTILS__MATH__NORMALIZATION_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__MATH__NORMALIZATION_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__MATH__NORMALIZATION_HPP_
-#include "tier4_autoware_utils/math/constants.hpp"
+#include "autoware/universe_utils/math/constants.hpp"
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
inline double normalizeDegree(const double deg, const double min_deg = -180)
{
@@ -45,6 +45,6 @@ inline double normalizeRadian(const double rad, const double min_rad = -pi)
return value - std::copysign(2 * pi, value);
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__MATH__NORMALIZATION_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__MATH__NORMALIZATION_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/math/range.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/math/range.hpp
similarity index 89%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/math/range.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/math/range.hpp
index 957a6f4e729e5..fabf67a683680 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/math/range.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/math/range.hpp
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__MATH__RANGE_HPP_
-#define TIER4_AUTOWARE_UTILS__MATH__RANGE_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__MATH__RANGE_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__MATH__RANGE_HPP_
#include
#include
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
template
std::vector arange(const T start, const T stop, const T step = 1)
@@ -73,6 +73,6 @@ std::vector linspace(const T start, const T stop, const size_t num)
return out;
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__MATH__RANGE_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__MATH__RANGE_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/math/sin_table.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/math/sin_table.hpp
similarity index 76%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/math/sin_table.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/math/sin_table.hpp
index bea3b1e0ecb46..bf67a1b521b6d 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/math/sin_table.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/math/sin_table.hpp
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__MATH__SIN_TABLE_HPP_
-#define TIER4_AUTOWARE_UTILS__MATH__SIN_TABLE_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__MATH__SIN_TABLE_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__MATH__SIN_TABLE_HPP_
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
constexpr size_t sin_table_size = 32769;
@@ -25,6 +25,6 @@ constexpr size_t discrete_arcs_num_90 = 32768;
constexpr size_t discrete_arcs_num_360 = 131072;
extern const float g_sin_table[sin_table_size];
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__MATH__SIN_TABLE_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__MATH__SIN_TABLE_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/math/trigonometry.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/math/trigonometry.hpp
similarity index 74%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/math/trigonometry.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/math/trigonometry.hpp
index 4901e28472acb..7f58735d35963 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/math/trigonometry.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/math/trigonometry.hpp
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__MATH__TRIGONOMETRY_HPP_
-#define TIER4_AUTOWARE_UTILS__MATH__TRIGONOMETRY_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__MATH__TRIGONOMETRY_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__MATH__TRIGONOMETRY_HPP_
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
float sin(float radian);
@@ -26,6 +26,6 @@ float cos(float radian);
std::pair sin_and_cos(float radian);
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__MATH__TRIGONOMETRY_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__MATH__TRIGONOMETRY_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/math/unit_conversion.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/math/unit_conversion.hpp
similarity index 74%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/math/unit_conversion.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/math/unit_conversion.hpp
index 38a0a7696775a..66be4d99d5803 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/math/unit_conversion.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/math/unit_conversion.hpp
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__MATH__UNIT_CONVERSION_HPP_
-#define TIER4_AUTOWARE_UTILS__MATH__UNIT_CONVERSION_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__MATH__UNIT_CONVERSION_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__MATH__UNIT_CONVERSION_HPP_
-#include "tier4_autoware_utils/math/constants.hpp"
+#include "autoware/universe_utils/math/constants.hpp"
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
constexpr double deg2rad(const double deg)
{
@@ -36,6 +36,6 @@ constexpr double mps2kmph(const double mps)
{
return mps * 3600.0 / 1000.0;
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__MATH__UNIT_CONVERSION_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__MATH__UNIT_CONVERSION_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/debug_publisher.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/debug_publisher.hpp
similarity index 83%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/debug_publisher.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/debug_publisher.hpp
index 0750b6894debe..0965f8ffbaefa 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/debug_publisher.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/debug_publisher.hpp
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__DEBUG_PUBLISHER_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__DEBUG_PUBLISHER_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__DEBUG_PUBLISHER_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__DEBUG_PUBLISHER_HPP_
-#include "tier4_autoware_utils/ros/debug_traits.hpp"
+#include "autoware/universe_utils/ros/debug_traits.hpp"
#include
#include
@@ -25,14 +25,15 @@
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
namespace debug_publisher
{
template <
class T_msg, class T,
std::enable_if_t<
- tier4_autoware_utils::debug_traits::is_debug_message::value, std::nullptr_t> = nullptr>
+ autoware_universe_utils::debug_traits::is_debug_message::value, std::nullptr_t> =
+ nullptr>
T_msg toDebugMsg(const T & data, const rclcpp::Time & stamp)
{
T_msg msg;
@@ -72,6 +73,6 @@ class DebugPublisher
const char * ns_;
std::unordered_map> pub_map_;
};
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__ROS__DEBUG_PUBLISHER_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__DEBUG_PUBLISHER_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/debug_traits.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/debug_traits.hpp
similarity index 89%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/debug_traits.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/debug_traits.hpp
index 345e49079eede..330b01b68a0b2 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/debug_traits.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/debug_traits.hpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__DEBUG_TRAITS_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__DEBUG_TRAITS_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__DEBUG_TRAITS_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__DEBUG_TRAITS_HPP_
#include
#include
@@ -28,7 +28,7 @@
#include
-namespace tier4_autoware_utils::debug_traits
+namespace autoware_universe_utils::debug_traits
{
template
struct is_debug_message : std::false_type
@@ -84,6 +84,6 @@ template <>
struct is_debug_message : std::true_type
{
};
-} // namespace tier4_autoware_utils::debug_traits
+} // namespace autoware_universe_utils::debug_traits
-#endif // TIER4_AUTOWARE_UTILS__ROS__DEBUG_TRAITS_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__DEBUG_TRAITS_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/logger_level_configure.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/logger_level_configure.hpp
similarity index 80%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/logger_level_configure.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/logger_level_configure.hpp
index 5aee3a251dad2..41163ea38b018 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/logger_level_configure.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/logger_level_configure.hpp
@@ -22,12 +22,12 @@
// =============== How to use ===============
// ___In your_node.hpp___
-// #include "tier4_autoware_utils/ros/logger_level_configure.hpp"
+// #include "autoware/universe_utils/ros/logger_level_configure.hpp"
// class YourNode : public rclcpp::Node {
// ...
//
// // Define logger_configure as a node class member variable
-// std::unique_ptr logger_configure_;
+// std::unique_ptr logger_configure_;
// }
//
// ___In your_node.cpp___
@@ -38,14 +38,14 @@
// logger_configure_ = std::make_unique(this);
// }
-#ifndef TIER4_AUTOWARE_UTILS__ROS__LOGGER_LEVEL_CONFIGURE_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__LOGGER_LEVEL_CONFIGURE_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__LOGGER_LEVEL_CONFIGURE_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__LOGGER_LEVEL_CONFIGURE_HPP_
#include "logging_demo/srv/config_logger.hpp"
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
class LoggerLevelConfigure
{
@@ -64,5 +64,5 @@ class LoggerLevelConfigure
const ConfigLogger::Response::SharedPtr response);
};
-} // namespace tier4_autoware_utils
-#endif // TIER4_AUTOWARE_UTILS__ROS__LOGGER_LEVEL_CONFIGURE_HPP_
+} // namespace autoware_universe_utils
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__LOGGER_LEVEL_CONFIGURE_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/marker_helper.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/marker_helper.hpp
similarity index 89%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/marker_helper.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/marker_helper.hpp
index c00c3c1c364df..ad2d2f84f82e0 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/marker_helper.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/marker_helper.hpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__MARKER_HELPER_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__MARKER_HELPER_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__MARKER_HELPER_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__MARKER_HELPER_HPP_
#include
@@ -22,7 +22,7 @@
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
inline geometry_msgs::msg::Point createMarkerPosition(double x, double y, double z)
{
@@ -76,6 +76,6 @@ void appendMarkerArray(
visualization_msgs::msg::MarkerArray * marker_array,
const std::optional & current_time = {});
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__ROS__MARKER_HELPER_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__MARKER_HELPER_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/msg_covariance.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/msg_covariance.hpp
similarity index 90%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/msg_covariance.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/msg_covariance.hpp
index 4ebf81d4bfda5..55caf1955b6ec 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/msg_covariance.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/msg_covariance.hpp
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__MSG_COVARIANCE_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__MSG_COVARIANCE_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__MSG_COVARIANCE_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__MSG_COVARIANCE_HPP_
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
namespace xyz_covariance_index
{
@@ -115,6 +115,6 @@ enum XYZ_UPPER_COV_IDX {
Z_Z = 5,
};
} // namespace xyz_upper_covariance_index
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__ROS__MSG_COVARIANCE_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__MSG_COVARIANCE_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/msg_operation.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/msg_operation.hpp
similarity index 79%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/msg_operation.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/msg_operation.hpp
index 4ac5dc05204f9..5ac3441dd2fc4 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/msg_operation.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/msg_operation.hpp
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__MSG_OPERATION_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__MSG_OPERATION_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__MSG_OPERATION_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__MSG_OPERATION_HPP_
#include "geometry_msgs/msg/quaternion.hpp"
-// NOTE: Do not use tier4_autoware_utils namespace
+// NOTE: Do not use autoware_universe_utils namespace
namespace geometry_msgs
{
namespace msg
@@ -28,4 +28,4 @@ Quaternion operator-(Quaternion a, Quaternion b) noexcept;
} // namespace msg
} // namespace geometry_msgs
-#endif // TIER4_AUTOWARE_UTILS__ROS__MSG_OPERATION_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__MSG_OPERATION_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/parameter.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/parameter.hpp
similarity index 78%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/parameter.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/parameter.hpp
index ac9b124a02cdb..5ef1837e0cece 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/parameter.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/parameter.hpp
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__PARAMETER_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__PARAMETER_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__PARAMETER_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__PARAMETER_HPP_
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
template
T getOrDeclareParameter(rclcpp::Node & node, const std::string & name)
@@ -30,6 +30,6 @@ T getOrDeclareParameter(rclcpp::Node & node, const std::string & name)
return node.declare_parameter(name);
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__ROS__PARAMETER_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__PARAMETER_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/pcl_conversion.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/pcl_conversion.hpp
similarity index 90%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/pcl_conversion.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/pcl_conversion.hpp
index c66a63eb1ac51..cce8a75b37aa9 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/pcl_conversion.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/pcl_conversion.hpp
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__PCL_CONVERSION_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__PCL_CONVERSION_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__PCL_CONVERSION_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__PCL_CONVERSION_HPP_
#include
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
/**
* @brief a faster implementation of converting sensor_msgs::msg::PointCloud2 to
@@ -67,6 +67,6 @@ void transformPointCloudFromROSMsg(
}
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__ROS__PCL_CONVERSION_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__PCL_CONVERSION_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/polling_subscriber.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/polling_subscriber.hpp
similarity index 95%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/polling_subscriber.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/polling_subscriber.hpp
index be5104b489db6..a41e13229a826 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/polling_subscriber.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/polling_subscriber.hpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__POLLING_SUBSCRIBER_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__POLLING_SUBSCRIBER_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__POLLING_SUBSCRIBER_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__POLLING_SUBSCRIBER_HPP_
#include
@@ -23,7 +23,7 @@
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
inline rclcpp::SensorDataQoS SingleDepthSensorQoS()
@@ -159,6 +159,6 @@ class InterProcessPollingSubscriber= 2)>::typ
};
};
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__ROS__POLLING_SUBSCRIBER_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__POLLING_SUBSCRIBER_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/processing_time_publisher.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/processing_time_publisher.hpp
similarity index 86%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/processing_time_publisher.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/processing_time_publisher.hpp
index 80d394a1c200e..bb92d615b0a8d 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/processing_time_publisher.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/processing_time_publisher.hpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__PROCESSING_TIME_PUBLISHER_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__PROCESSING_TIME_PUBLISHER_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__PROCESSING_TIME_PUBLISHER_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__PROCESSING_TIME_PUBLISHER_HPP_
#include
@@ -23,7 +23,7 @@
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
class ProcessingTimePublisher
{
@@ -62,6 +62,6 @@ class ProcessingTimePublisher
return oss.str();
}
};
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__ROS__PROCESSING_TIME_PUBLISHER_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__PROCESSING_TIME_PUBLISHER_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/published_time_publisher.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/published_time_publisher.hpp
similarity index 92%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/published_time_publisher.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/published_time_publisher.hpp
index 21705cab9a962..960295944a14b 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/published_time_publisher.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/published_time_publisher.hpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__PUBLISHED_TIME_PUBLISHER_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__PUBLISHED_TIME_PUBLISHER_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__PUBLISHED_TIME_PUBLISHER_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__PUBLISHED_TIME_PUBLISHER_HPP_
#include
@@ -26,7 +26,7 @@
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
class PublishedTimePublisher
@@ -109,6 +109,6 @@ class PublishedTimePublisher
// store them for each different publisher of the node
std::map::SharedPtr, GidCompare> publishers_;
};
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__ROS__PUBLISHED_TIME_PUBLISHER_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__PUBLISHED_TIME_PUBLISHER_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/self_pose_listener.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/self_pose_listener.hpp
similarity index 77%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/self_pose_listener.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/self_pose_listener.hpp
index 8148392ecda3b..0bd9a4db5b674 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/self_pose_listener.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/self_pose_listener.hpp
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__SELF_POSE_LISTENER_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__SELF_POSE_LISTENER_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__SELF_POSE_LISTENER_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__SELF_POSE_LISTENER_HPP_
-#include "tier4_autoware_utils/geometry/geometry.hpp"
-#include "tier4_autoware_utils/ros/transform_listener.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/ros/transform_listener.hpp"
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
class SelfPoseListener
{
@@ -53,6 +53,6 @@ class SelfPoseListener
private:
TransformListener transform_listener_;
};
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__ROS__SELF_POSE_LISTENER_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__SELF_POSE_LISTENER_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/transform_listener.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/transform_listener.hpp
similarity index 91%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/transform_listener.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/transform_listener.hpp
index 96b1cc6ea6ccc..176a11dcde529 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/transform_listener.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/transform_listener.hpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__TRANSFORM_LISTENER_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__TRANSFORM_LISTENER_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__TRANSFORM_LISTENER_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__TRANSFORM_LISTENER_HPP_
#include
@@ -26,7 +26,7 @@
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
class TransformListener
{
@@ -82,6 +82,6 @@ class TransformListener
std::shared_ptr tf_buffer_;
std::shared_ptr tf_listener_;
};
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__ROS__TRANSFORM_LISTENER_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__TRANSFORM_LISTENER_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/update_param.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/update_param.hpp
similarity index 80%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/update_param.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/update_param.hpp
index 36abcc11175e1..8bb505d765aef 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/update_param.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/update_param.hpp
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__UPDATE_PARAM_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__UPDATE_PARAM_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__UPDATE_PARAM_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__UPDATE_PARAM_HPP_
#include
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
template
bool updateParam(const std::vector & params, const std::string & name, T & value)
@@ -37,6 +37,6 @@ bool updateParam(const std::vector & params, const std::strin
value = itr->template get_value();
return true;
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__ROS__UPDATE_PARAM_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__UPDATE_PARAM_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/uuid_helper.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/uuid_helper.hpp
similarity index 87%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/uuid_helper.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/uuid_helper.hpp
index efb5564bdaa71..7d4892f724848 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/uuid_helper.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/uuid_helper.hpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__UUID_HELPER_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__UUID_HELPER_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__UUID_HELPER_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__UUID_HELPER_HPP_
#include
@@ -23,7 +23,7 @@
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
inline unique_identifier_msgs::msg::UUID generateUUID()
{
@@ -58,6 +58,6 @@ inline unique_identifier_msgs::msg::UUID toUUIDMsg(const boost::uuids::uuid & id
return ros_uuid;
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__ROS__UUID_HELPER_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__UUID_HELPER_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/wait_for_param.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/ros/wait_for_param.hpp
similarity index 84%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/ros/wait_for_param.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/ros/wait_for_param.hpp
index 67a1249c5b042..0aaef92835653 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/ros/wait_for_param.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/ros/wait_for_param.hpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__ROS__WAIT_FOR_PARAM_HPP_
-#define TIER4_AUTOWARE_UTILS__ROS__WAIT_FOR_PARAM_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__ROS__WAIT_FOR_PARAM_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__ROS__WAIT_FOR_PARAM_HPP_
#include
@@ -21,7 +21,7 @@
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
template
T waitForParam(
@@ -47,6 +47,6 @@ T waitForParam(
return {};
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__ROS__WAIT_FOR_PARAM_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__ROS__WAIT_FOR_PARAM_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/system/backtrace.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/system/backtrace.hpp
similarity index 71%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/system/backtrace.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/system/backtrace.hpp
index c784d71ad5060..f195cd2b32391 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/system/backtrace.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/system/backtrace.hpp
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__SYSTEM__BACKTRACE_HPP_
-#define TIER4_AUTOWARE_UTILS__SYSTEM__BACKTRACE_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__SYSTEM__BACKTRACE_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__SYSTEM__BACKTRACE_HPP_
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
void print_backtrace();
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__SYSTEM__BACKTRACE_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__SYSTEM__BACKTRACE_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/system/stop_watch.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/system/stop_watch.hpp
similarity index 87%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/system/stop_watch.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/system/stop_watch.hpp
index 0d804e797936c..3df651825f1aa 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/system/stop_watch.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/system/stop_watch.hpp
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__SYSTEM__STOP_WATCH_HPP_
-#define TIER4_AUTOWARE_UTILS__SYSTEM__STOP_WATCH_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__SYSTEM__STOP_WATCH_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__SYSTEM__STOP_WATCH_HPP_
#include
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
template <
class OutputUnit = std::chrono::seconds, class InternalUnit = std::chrono::microseconds,
@@ -58,6 +58,6 @@ class StopWatch
std::unordered_map t_start_;
};
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__SYSTEM__STOP_WATCH_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__SYSTEM__STOP_WATCH_HPP_
diff --git a/common/tier4_autoware_utils/include/tier4_autoware_utils/transform/transforms.hpp b/common/autoware_universe_utils/include/autoware/universe_utils/transform/transforms.hpp
similarity index 85%
rename from common/tier4_autoware_utils/include/tier4_autoware_utils/transform/transforms.hpp
rename to common/autoware_universe_utils/include/autoware/universe_utils/transform/transforms.hpp
index ea88ea7624216..f480a709d169e 100644
--- a/common/tier4_autoware_utils/include/tier4_autoware_utils/transform/transforms.hpp
+++ b/common/autoware_universe_utils/include/autoware/universe_utils/transform/transforms.hpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef TIER4_AUTOWARE_UTILS__TRANSFORM__TRANSFORMS_HPP_
-#define TIER4_AUTOWARE_UTILS__TRANSFORM__TRANSFORMS_HPP_
+#ifndef AUTOWARE__UNIVERSE_UTILS__TRANSFORM__TRANSFORMS_HPP_
+#define AUTOWARE__UNIVERSE_UTILS__TRANSFORM__TRANSFORMS_HPP_
#include
#include
@@ -21,7 +21,7 @@
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
template
void transformPointCloud(
@@ -46,6 +46,6 @@ void transformPointCloud(
pcl::transformPointCloud(cloud_in, cloud_out, transform);
}
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
-#endif // TIER4_AUTOWARE_UTILS__TRANSFORM__TRANSFORMS_HPP_
+#endif // AUTOWARE__UNIVERSE_UTILS__TRANSFORM__TRANSFORMS_HPP_
diff --git a/common/tier4_autoware_utils/package.xml b/common/autoware_universe_utils/package.xml
similarity index 93%
rename from common/tier4_autoware_utils/package.xml
rename to common/autoware_universe_utils/package.xml
index 334ee226a5f22..de0461b5a841d 100644
--- a/common/tier4_autoware_utils/package.xml
+++ b/common/autoware_universe_utils/package.xml
@@ -1,9 +1,9 @@
- tier4_autoware_utils
+ autoware_universe_utils
0.1.0
- The tier4_autoware_utils package
+ The autoware_universe_utils package
Takamasa Horibe
Takayuki Murooka
Mamoru Sobue
diff --git a/common/tier4_autoware_utils/src/geometry/boost_polygon_utils.cpp b/common/autoware_universe_utils/src/geometry/boost_polygon_utils.cpp
similarity index 85%
rename from common/tier4_autoware_utils/src/geometry/boost_polygon_utils.cpp
rename to common/autoware_universe_utils/src/geometry/boost_polygon_utils.cpp
index 01e02d1cf0038..ce9232a8c1add 100644
--- a/common/tier4_autoware_utils/src/geometry/boost_polygon_utils.cpp
+++ b/common/autoware_universe_utils/src/geometry/boost_polygon_utils.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/geometry/boost_polygon_utils.hpp"
+#include "autoware/universe_utils/geometry/boost_polygon_utils.hpp"
-#include "tier4_autoware_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
#include
@@ -23,8 +23,8 @@
namespace
{
namespace bg = boost::geometry;
-using tier4_autoware_utils::Point2d;
-using tier4_autoware_utils::Polygon2d;
+using autoware_universe_utils::Point2d;
+using autoware_universe_utils::Polygon2d;
void appendPointToPolygon(Polygon2d & polygon, const geometry_msgs::msg::Point & geom_point)
{
@@ -68,7 +68,7 @@ double getCircleArea(const geometry_msgs::msg::Vector3 & dimensions)
}
} // namespace
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
bool isClockwise(const Polygon2d & polygon)
{
@@ -123,16 +123,16 @@ Polygon2d toPolygon2d(
Polygon2d polygon;
if (shape.type == autoware_perception_msgs::msg::Shape::BOUNDING_BOX) {
- const auto point0 = tier4_autoware_utils::calcOffsetPose(
+ const auto point0 = autoware_universe_utils::calcOffsetPose(
pose, shape.dimensions.x / 2.0, shape.dimensions.y / 2.0, 0.0)
.position;
- const auto point1 = tier4_autoware_utils::calcOffsetPose(
+ const auto point1 = autoware_universe_utils::calcOffsetPose(
pose, -shape.dimensions.x / 2.0, shape.dimensions.y / 2.0, 0.0)
.position;
- const auto point2 = tier4_autoware_utils::calcOffsetPose(
+ const auto point2 = autoware_universe_utils::calcOffsetPose(
pose, -shape.dimensions.x / 2.0, -shape.dimensions.y / 2.0, 0.0)
.position;
- const auto point3 = tier4_autoware_utils::calcOffsetPose(
+ const auto point3 = autoware_universe_utils::calcOffsetPose(
pose, shape.dimensions.x / 2.0, -shape.dimensions.y / 2.0, 0.0)
.position;
@@ -168,7 +168,7 @@ Polygon2d toPolygon2d(
appendPointToPolygon(polygon, abs_point);
}
} else {
- throw std::logic_error("The shape type is not supported in tier4_autoware_utils.");
+ throw std::logic_error("The shape type is not supported in autoware_universe_utils.");
}
// NOTE: push back the first point in order to close polygon
@@ -179,24 +179,24 @@ Polygon2d toPolygon2d(
return isClockwise(polygon) ? polygon : inverseClockwise(polygon);
}
-tier4_autoware_utils::Polygon2d toPolygon2d(
+autoware_universe_utils::Polygon2d toPolygon2d(
const autoware_perception_msgs::msg::DetectedObject & object)
{
- return tier4_autoware_utils::toPolygon2d(
+ return autoware_universe_utils::toPolygon2d(
object.kinematics.pose_with_covariance.pose, object.shape);
}
-tier4_autoware_utils::Polygon2d toPolygon2d(
+autoware_universe_utils::Polygon2d toPolygon2d(
const autoware_perception_msgs::msg::TrackedObject & object)
{
- return tier4_autoware_utils::toPolygon2d(
+ return autoware_universe_utils::toPolygon2d(
object.kinematics.pose_with_covariance.pose, object.shape);
}
-tier4_autoware_utils::Polygon2d toPolygon2d(
+autoware_universe_utils::Polygon2d toPolygon2d(
const autoware_perception_msgs::msg::PredictedObject & object)
{
- return tier4_autoware_utils::toPolygon2d(
+ return autoware_universe_utils::toPolygon2d(
object.kinematics.initial_pose_with_covariance.pose, object.shape);
}
@@ -206,13 +206,17 @@ Polygon2d toFootprint(
{
Polygon2d polygon;
const auto point0 =
- tier4_autoware_utils::calcOffsetPose(base_link_pose, base_to_front, width / 2.0, 0.0).position;
+ autoware_universe_utils::calcOffsetPose(base_link_pose, base_to_front, width / 2.0, 0.0)
+ .position;
const auto point1 =
- tier4_autoware_utils::calcOffsetPose(base_link_pose, base_to_front, -width / 2.0, 0.0).position;
+ autoware_universe_utils::calcOffsetPose(base_link_pose, base_to_front, -width / 2.0, 0.0)
+ .position;
const auto point2 =
- tier4_autoware_utils::calcOffsetPose(base_link_pose, -base_to_rear, -width / 2.0, 0.0).position;
+ autoware_universe_utils::calcOffsetPose(base_link_pose, -base_to_rear, -width / 2.0, 0.0)
+ .position;
const auto point3 =
- tier4_autoware_utils::calcOffsetPose(base_link_pose, -base_to_rear, width / 2.0, 0.0).position;
+ autoware_universe_utils::calcOffsetPose(base_link_pose, -base_to_rear, width / 2.0, 0.0)
+ .position;
appendPointToPolygon(polygon, point0);
appendPointToPolygon(polygon, point1);
@@ -233,7 +237,7 @@ double getArea(const autoware_perception_msgs::msg::Shape & shape)
return getPolygonArea(shape.footprint);
}
- throw std::logic_error("The shape type is not supported in tier4_autoware_utils.");
+ throw std::logic_error("The shape type is not supported in autoware_universe_utils.");
}
// NOTE: The number of vertices on the expanded polygon by boost::geometry::buffer
@@ -268,4 +272,4 @@ Polygon2d expandPolygon(const Polygon2d & input_polygon, const double offset)
boost::geometry::correct(expanded_polygon);
return expanded_polygon;
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
diff --git a/common/tier4_autoware_utils/src/geometry/geometry.cpp b/common/autoware_universe_utils/src/geometry/geometry.cpp
similarity index 98%
rename from common/tier4_autoware_utils/src/geometry/geometry.cpp
rename to common/autoware_universe_utils/src/geometry/geometry.cpp
index b88646b73dd7c..e6a491671595a 100644
--- a/common/tier4_autoware_utils/src/geometry/geometry.cpp
+++ b/common/autoware_universe_utils/src/geometry/geometry.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
#include
@@ -32,7 +32,7 @@ void fromMsg(const geometry_msgs::msg::PoseStamped & msg, tf2::Stamped().x(point32.x).y(point32.y).z(point32.z);
- const auto transformed_point = tier4_autoware_utils::transformPoint(point, pose);
+ const auto transformed_point = autoware_universe_utils::transformPoint(point, pose);
return geometry_msgs::build()
.x(transformed_point.x)
.y(transformed_point.y)
@@ -383,4 +383,4 @@ std::optional intersect(
return intersect_point;
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
diff --git a/common/tier4_autoware_utils/src/geometry/pose_deviation.cpp b/common/autoware_universe_utils/src/geometry/pose_deviation.cpp
similarity index 92%
rename from common/tier4_autoware_utils/src/geometry/pose_deviation.cpp
rename to common/autoware_universe_utils/src/geometry/pose_deviation.cpp
index dda8afb974d26..5c81519510c8e 100644
--- a/common/tier4_autoware_utils/src/geometry/pose_deviation.cpp
+++ b/common/autoware_universe_utils/src/geometry/pose_deviation.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/geometry/pose_deviation.hpp"
+#include "autoware/universe_utils/geometry/pose_deviation.hpp"
-#include "tier4_autoware_utils/math/normalization.hpp"
+#include "autoware/universe_utils/math/normalization.hpp"
#include
@@ -28,7 +28,7 @@
#include
#endif
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
double calcLateralDeviation(
@@ -82,4 +82,4 @@ PoseDeviation calcPoseDeviation(
return deviation;
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
diff --git a/common/tier4_autoware_utils/src/math/sin_table.cpp b/common/autoware_universe_utils/src/math/sin_table.cpp
similarity index 99%
rename from common/tier4_autoware_utils/src/math/sin_table.cpp
rename to common/autoware_universe_utils/src/math/sin_table.cpp
index 0657c2303226f..bc0a5d7b09024 100644
--- a/common/tier4_autoware_utils/src/math/sin_table.cpp
+++ b/common/autoware_universe_utils/src/math/sin_table.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/math/sin_table.hpp"
+#include "autoware/universe_utils/math/sin_table.hpp"
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
const float g_sin_table[sin_table_size] = {
@@ -8212,4 +8212,4 @@ const float g_sin_table[sin_table_size] = {
0.9999999816164293f, 0.9999999896592414f, 0.9999999954041073f, 0.9999999988510269f,
1.0000000000000000f};
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
diff --git a/common/tier4_autoware_utils/src/math/trigonometry.cpp b/common/autoware_universe_utils/src/math/trigonometry.cpp
similarity index 81%
rename from common/tier4_autoware_utils/src/math/trigonometry.cpp
rename to common/autoware_universe_utils/src/math/trigonometry.cpp
index 0ce65c7aa5bc8..40a993343b1de 100644
--- a/common/tier4_autoware_utils/src/math/trigonometry.cpp
+++ b/common/autoware_universe_utils/src/math/trigonometry.cpp
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/math/trigonometry.hpp"
+#include "autoware/universe_utils/math/trigonometry.hpp"
-#include "tier4_autoware_utils/math/constants.hpp"
-#include "tier4_autoware_utils/math/sin_table.hpp"
+#include "autoware/universe_utils/math/constants.hpp"
+#include "autoware/universe_utils/math/sin_table.hpp"
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
float sin(float radian)
{
- float degree = radian * (180.f / static_cast(tier4_autoware_utils::pi)) *
+ float degree = radian * (180.f / static_cast(autoware_universe_utils::pi)) *
(discrete_arcs_num_360 / 360.f);
size_t idx =
(static_cast(std::round(degree)) % discrete_arcs_num_360 + discrete_arcs_num_360) %
@@ -46,13 +46,13 @@ float sin(float radian)
float cos(float radian)
{
- return sin(radian + static_cast(tier4_autoware_utils::pi) / 2.f);
+ return sin(radian + static_cast(autoware_universe_utils::pi) / 2.f);
}
std::pair sin_and_cos(float radian)
{
constexpr float tmp =
- (180.f / static_cast(tier4_autoware_utils::pi)) * (discrete_arcs_num_360 / 360.f);
+ (180.f / static_cast(autoware_universe_utils::pi)) * (discrete_arcs_num_360 / 360.f);
const float degree = radian * tmp;
size_t idx =
(static_cast(std::round(degree)) % discrete_arcs_num_360 + discrete_arcs_num_360) %
@@ -72,4 +72,4 @@ std::pair sin_and_cos(float radian)
}
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
diff --git a/common/tier4_autoware_utils/src/ros/logger_level_configure.cpp b/common/autoware_universe_utils/src/ros/logger_level_configure.cpp
similarity index 93%
rename from common/tier4_autoware_utils/src/ros/logger_level_configure.cpp
rename to common/autoware_universe_utils/src/ros/logger_level_configure.cpp
index d764299290d05..77e8d9bf16d7f 100644
--- a/common/tier4_autoware_utils/src/ros/logger_level_configure.cpp
+++ b/common/autoware_universe_utils/src/ros/logger_level_configure.cpp
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/ros/logger_level_configure.hpp"
+#include "autoware/universe_utils/ros/logger_level_configure.hpp"
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
LoggerLevelConfigure::LoggerLevelConfigure(rclcpp::Node * node) : ros_logger_(node->get_logger())
{
@@ -58,4 +58,4 @@ void LoggerLevelConfigure::onLoggerConfigService(
return;
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
diff --git a/common/tier4_autoware_utils/src/ros/marker_helper.cpp b/common/autoware_universe_utils/src/ros/marker_helper.cpp
similarity index 94%
rename from common/tier4_autoware_utils/src/ros/marker_helper.cpp
rename to common/autoware_universe_utils/src/ros/marker_helper.cpp
index fda997edc83db..d4f97af2ef90f 100644
--- a/common/tier4_autoware_utils/src/ros/marker_helper.cpp
+++ b/common/autoware_universe_utils/src/ros/marker_helper.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/ros/marker_helper.hpp"
+#include "autoware/universe_utils/ros/marker_helper.hpp"
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
visualization_msgs::msg::Marker createDefaultMarker(
@@ -68,4 +68,4 @@ void appendMarkerArray(
}
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
diff --git a/common/tier4_autoware_utils/src/ros/msg_operation.cpp b/common/autoware_universe_utils/src/ros/msg_operation.cpp
similarity index 92%
rename from common/tier4_autoware_utils/src/ros/msg_operation.cpp
rename to common/autoware_universe_utils/src/ros/msg_operation.cpp
index cc1a59317a8e0..02c24b2a6cb33 100644
--- a/common/tier4_autoware_utils/src/ros/msg_operation.cpp
+++ b/common/autoware_universe_utils/src/ros/msg_operation.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/ros/msg_operation.hpp"
+#include "autoware/universe_utils/ros/msg_operation.hpp"
#include
@@ -22,7 +22,7 @@
#include
#endif
-// NOTE: Do not use tier4_autoware_utils namespace
+// NOTE: Do not use autoware_universe_utils namespace
namespace geometry_msgs
{
namespace msg
diff --git a/common/tier4_autoware_utils/src/system/backtrace.cpp b/common/autoware_universe_utils/src/system/backtrace.cpp
similarity index 85%
rename from common/tier4_autoware_utils/src/system/backtrace.cpp
rename to common/autoware_universe_utils/src/system/backtrace.cpp
index 343f200296cad..f4c4312ce44fb 100644
--- a/common/tier4_autoware_utils/src/system/backtrace.cpp
+++ b/common/autoware_universe_utils/src/system/backtrace.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/system/backtrace.hpp"
+#include "autoware/universe_utils/system/backtrace.hpp"
#include "rclcpp/rclcpp.hpp"
@@ -23,7 +23,7 @@
#include
#include
-namespace tier4_autoware_utils
+namespace autoware_universe_utils
{
void print_backtrace()
@@ -44,9 +44,9 @@ void print_backtrace()
for (int i = 1; i < addrlen; i++) {
ss << " @ " << symbol_list[i] << std::endl;
}
- RCLCPP_DEBUG_STREAM(rclcpp::get_logger("tier4_autoware_utils"), ss.str());
+ RCLCPP_DEBUG_STREAM(rclcpp::get_logger("autoware_universe_utils"), ss.str());
free(symbol_list);
}
-} // namespace tier4_autoware_utils
+} // namespace autoware_universe_utils
diff --git a/common/tier4_autoware_utils/test/src/geometry/test_boost_geometry.cpp b/common/autoware_universe_utils/test/src/geometry/test_boost_geometry.cpp
similarity index 88%
rename from common/tier4_autoware_utils/test/src/geometry/test_boost_geometry.cpp
rename to common/autoware_universe_utils/test/src/geometry/test_boost_geometry.cpp
index 4e5483935da00..764bb388fc74a 100644
--- a/common/tier4_autoware_utils/test/src/geometry/test_boost_geometry.cpp
+++ b/common/autoware_universe_utils/test/src/geometry/test_boost_geometry.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/geometry/boost_geometry.hpp"
+#include "autoware/universe_utils/geometry/boost_geometry.hpp"
#include
@@ -20,8 +20,8 @@
namespace bg = boost::geometry;
-using tier4_autoware_utils::Point2d;
-using tier4_autoware_utils::Point3d;
+using autoware_universe_utils::Point2d;
+using autoware_universe_utils::Point3d;
TEST(boost_geometry, boost_geometry_distance)
{
@@ -54,7 +54,7 @@ TEST(boost_geometry, to_2d)
TEST(boost_geometry, toMsg)
{
- using tier4_autoware_utils::toMsg;
+ using autoware_universe_utils::toMsg;
{
const Point3d p(1.0, 2.0, 3.0);
@@ -68,7 +68,7 @@ TEST(boost_geometry, toMsg)
TEST(boost_geometry, fromMsg)
{
- using tier4_autoware_utils::fromMsg;
+ using autoware_universe_utils::fromMsg;
geometry_msgs::msg::Point p_msg;
p_msg.x = 1.0;
diff --git a/common/tier4_autoware_utils/test/src/geometry/test_boost_polygon_utils.cpp b/common/autoware_universe_utils/test/src/geometry/test_boost_polygon_utils.cpp
similarity index 95%
rename from common/tier4_autoware_utils/test/src/geometry/test_boost_polygon_utils.cpp
rename to common/autoware_universe_utils/test/src/geometry/test_boost_polygon_utils.cpp
index 7689544bd79cc..ed576ba0dceaf 100644
--- a/common/tier4_autoware_utils/test/src/geometry/test_boost_polygon_utils.cpp
+++ b/common/autoware_universe_utils/test/src/geometry/test_boost_polygon_utils.cpp
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/geometry/boost_polygon_utils.hpp"
-#include "tier4_autoware_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/boost_polygon_utils.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
#include
#include
-using tier4_autoware_utils::Polygon2d;
+using autoware_universe_utils::Polygon2d;
namespace
{
@@ -39,7 +39,7 @@ geometry_msgs::msg::Pose createPose(const double x, const double y, const double
p.position.x = x;
p.position.y = y;
p.position.z = 0.0;
- p.orientation = tier4_autoware_utils::createQuaternionFromYaw(yaw);
+ p.orientation = autoware_universe_utils::createQuaternionFromYaw(yaw);
return p;
}
@@ -47,7 +47,7 @@ geometry_msgs::msg::Pose createPose(const double x, const double y, const double
TEST(boost_geometry, boost_isClockwise)
{
- using tier4_autoware_utils::isClockwise;
+ using autoware_universe_utils::isClockwise;
// empty
Polygon2d empty_polygon;
@@ -72,8 +72,8 @@ TEST(boost_geometry, boost_isClockwise)
TEST(boost_geometry, boost_inverseClockwise)
{
- using tier4_autoware_utils::inverseClockwise;
- using tier4_autoware_utils::isClockwise;
+ using autoware_universe_utils::inverseClockwise;
+ using autoware_universe_utils::isClockwise;
// empty
Polygon2d empty_polygon;
@@ -100,7 +100,7 @@ TEST(boost_geometry, boost_inverseClockwise)
TEST(boost_geometry, boost_rotatePolygon)
{
constexpr double epsilon = 1e-6;
- using tier4_autoware_utils::rotatePolygon;
+ using autoware_universe_utils::rotatePolygon;
// empty
geometry_msgs::msg::Polygon empty_polygon;
@@ -130,7 +130,7 @@ TEST(boost_geometry, boost_rotatePolygon)
TEST(boost_geometry, boost_toPolygon2d)
{
- using tier4_autoware_utils::toPolygon2d;
+ using autoware_universe_utils::toPolygon2d;
{ // bounding box
const double x = 1.0;
@@ -206,7 +206,7 @@ TEST(boost_geometry, boost_toPolygon2d)
TEST(boost_geometry, boost_toFootprint)
{
- using tier4_autoware_utils::toFootprint;
+ using autoware_universe_utils::toFootprint;
// from base link
{
@@ -234,7 +234,7 @@ TEST(boost_geometry, boost_toFootprint)
TEST(boost_geometry, boost_getArea)
{
- using tier4_autoware_utils::getArea;
+ using autoware_universe_utils::getArea;
{ // bounding box
const double x = 1.0;
@@ -290,7 +290,7 @@ TEST(boost_geometry, boost_getArea)
TEST(boost_geometry, boost_expandPolygon)
{
- using tier4_autoware_utils::expandPolygon;
+ using autoware_universe_utils::expandPolygon;
{ // box with a certain offset
Polygon2d box_poly{{{-1.0, -1.0}, {-1.0, 1.0}, {1.0, 1.0}, {1.0, -1.0}, {-1.0, -1.0}}};
diff --git a/common/tier4_autoware_utils/test/src/geometry/test_geometry.cpp b/common/autoware_universe_utils/test/src/geometry/test_geometry.cpp
similarity index 90%
rename from common/tier4_autoware_utils/test/src/geometry/test_geometry.cpp
rename to common/autoware_universe_utils/test/src/geometry/test_geometry.cpp
index b492da2d72e88..37e43c0ce08dd 100644
--- a/common/tier4_autoware_utils/test/src/geometry/test_geometry.cpp
+++ b/common/autoware_universe_utils/test/src/geometry/test_geometry.cpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/geometry/geometry.hpp"
-#include "tier4_autoware_utils/math/unit_conversion.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/math/unit_conversion.hpp"
#include
@@ -25,7 +25,7 @@ constexpr double epsilon = 1e-6;
TEST(geometry, getPoint)
{
- using tier4_autoware_utils::getPoint;
+ using autoware_universe_utils::getPoint;
const double x_ans = 1.0;
const double y_ans = 2.0;
@@ -114,7 +114,7 @@ TEST(geometry, getPoint)
TEST(geometry, getPose)
{
- using tier4_autoware_utils::getPose;
+ using autoware_universe_utils::getPose;
const double x_ans = 1.0;
const double y_ans = 2.0;
@@ -203,7 +203,7 @@ TEST(geometry, getPose)
TEST(geometry, getLongitudinalVelocity)
{
- using tier4_autoware_utils::getLongitudinalVelocity;
+ using autoware_universe_utils::getLongitudinalVelocity;
const double velocity = 1.0;
@@ -222,7 +222,7 @@ TEST(geometry, getLongitudinalVelocity)
TEST(geometry, setPose)
{
- using tier4_autoware_utils::setPose;
+ using autoware_universe_utils::setPose;
const double x_ans = 1.0;
const double y_ans = 2.0;
@@ -292,9 +292,9 @@ TEST(geometry, setPose)
TEST(geometry, setOrientation)
{
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
- using tier4_autoware_utils::setOrientation;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
+ using autoware_universe_utils::setOrientation;
geometry_msgs::msg::Pose p;
const auto orientation = createQuaternionFromRPY(deg2rad(30), deg2rad(30), deg2rad(30));
@@ -308,7 +308,7 @@ TEST(geometry, setOrientation)
TEST(geometry, setLongitudinalVelocity)
{
- using tier4_autoware_utils::setLongitudinalVelocity;
+ using autoware_universe_utils::setLongitudinalVelocity;
const double velocity = 1.0;
@@ -327,7 +327,7 @@ TEST(geometry, setLongitudinalVelocity)
TEST(geometry, createPoint)
{
- using tier4_autoware_utils::createPoint;
+ using autoware_universe_utils::createPoint;
const geometry_msgs::msg::Point p_out = createPoint(1.0, 2.0, 3.0);
EXPECT_DOUBLE_EQ(p_out.x, 1.0);
@@ -337,7 +337,7 @@ TEST(geometry, createPoint)
TEST(geometry, createQuaternion)
{
- using tier4_autoware_utils::createQuaternion;
+ using autoware_universe_utils::createQuaternion;
// (0.18257419, 0.36514837, 0.54772256, 0.73029674) is normalized quaternion of (1, 2, 3, 4)
const geometry_msgs::msg::Quaternion q_out =
@@ -350,7 +350,7 @@ TEST(geometry, createQuaternion)
TEST(geometry, createTranslation)
{
- using tier4_autoware_utils::createTranslation;
+ using autoware_universe_utils::createTranslation;
const geometry_msgs::msg::Vector3 v_out = createTranslation(1.0, 2.0, 3.0);
EXPECT_DOUBLE_EQ(v_out.x, 1.0);
@@ -360,8 +360,8 @@ TEST(geometry, createTranslation)
TEST(geometry, createQuaternionFromRPY)
{
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
{
const auto q_out = createQuaternionFromRPY(0, 0, 0);
@@ -390,8 +390,8 @@ TEST(geometry, createQuaternionFromRPY)
TEST(geometry, createQuaternionFromYaw)
{
- using tier4_autoware_utils::createQuaternionFromYaw;
- using tier4_autoware_utils::deg2rad;
+ using autoware_universe_utils::createQuaternionFromYaw;
+ using autoware_universe_utils::deg2rad;
{
const auto q_out = createQuaternionFromYaw(0);
@@ -420,9 +420,9 @@ TEST(geometry, createQuaternionFromYaw)
TEST(geometry, calcElevationAngle)
{
- using tier4_autoware_utils::calcElevationAngle;
- using tier4_autoware_utils::createPoint;
- using tier4_autoware_utils::deg2rad;
+ using autoware_universe_utils::calcElevationAngle;
+ using autoware_universe_utils::createPoint;
+ using autoware_universe_utils::deg2rad;
{
const auto p1 = createPoint(1.0, 1.0, 1.0);
@@ -468,9 +468,9 @@ TEST(geometry, calcElevationAngle)
TEST(geometry, calcAzimuthAngle)
{
- using tier4_autoware_utils::calcAzimuthAngle;
- using tier4_autoware_utils::createPoint;
- using tier4_autoware_utils::deg2rad;
+ using autoware_universe_utils::calcAzimuthAngle;
+ using autoware_universe_utils::createPoint;
+ using autoware_universe_utils::deg2rad;
{
const auto p1 = createPoint(0.0, 0.0, 9.0);
@@ -521,7 +521,7 @@ TEST(geometry, calcAzimuthAngle)
TEST(geometry, calcDistance2d)
{
- using tier4_autoware_utils::calcDistance2d;
+ using autoware_universe_utils::calcDistance2d;
geometry_msgs::msg::Point point;
point.x = 1.0;
@@ -538,7 +538,7 @@ TEST(geometry, calcDistance2d)
TEST(geometry, calcSquaredDistance2d)
{
- using tier4_autoware_utils::calcSquaredDistance2d;
+ using autoware_universe_utils::calcSquaredDistance2d;
geometry_msgs::msg::Point point;
point.x = 1.0;
@@ -555,7 +555,7 @@ TEST(geometry, calcSquaredDistance2d)
TEST(geometry, calcDistance3d)
{
- using tier4_autoware_utils::calcDistance3d;
+ using autoware_universe_utils::calcDistance3d;
geometry_msgs::msg::Point point;
point.x = 1.0;
@@ -572,9 +572,9 @@ TEST(geometry, calcDistance3d)
TEST(geometry, getRPY)
{
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
- using tier4_autoware_utils::getRPY;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
+ using autoware_universe_utils::getRPY;
{
const double ans_roll = deg2rad(5);
@@ -610,9 +610,9 @@ TEST(geometry, getRPY)
TEST(geometry, getRPY_wrapper)
{
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
- using tier4_autoware_utils::getRPY;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
+ using autoware_universe_utils::getRPY;
{
const double ans_roll = deg2rad(45);
@@ -652,9 +652,9 @@ TEST(geometry, getRPY_wrapper)
TEST(geometry, transform2pose)
{
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
- using tier4_autoware_utils::transform2pose;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
+ using autoware_universe_utils::transform2pose;
{
geometry_msgs::msg::Transform transform;
@@ -703,9 +703,9 @@ TEST(geometry, transform2pose)
TEST(geometry, pose2transform)
{
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
- using tier4_autoware_utils::pose2transform;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
+ using autoware_universe_utils::pose2transform;
{
geometry_msgs::msg::Pose pose;
@@ -756,9 +756,9 @@ TEST(geometry, pose2transform)
TEST(geometry, point2tfVector)
{
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
- using tier4_autoware_utils::point2tfVector;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
+ using autoware_universe_utils::point2tfVector;
// Point
{
@@ -823,11 +823,11 @@ TEST(geometry, point2tfVector)
TEST(geometry, transformPoint)
{
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
- using tier4_autoware_utils::Point2d;
- using tier4_autoware_utils::Point3d;
- using tier4_autoware_utils::transformPoint;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
+ using autoware_universe_utils::Point2d;
+ using autoware_universe_utils::Point3d;
+ using autoware_universe_utils::transformPoint;
{
const Point2d p(1.0, 2.0);
@@ -916,9 +916,9 @@ TEST(geometry, transformPoint)
TEST(geometry, transformPose)
{
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
- using tier4_autoware_utils::transformPose;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
+ using autoware_universe_utils::transformPose;
geometry_msgs::msg::Pose pose;
pose.position.x = 2.0;
@@ -967,9 +967,9 @@ TEST(geometry, transformPose)
TEST(geometry, inverseTransformPose)
{
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
- using tier4_autoware_utils::inverseTransformPose;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
+ using autoware_universe_utils::inverseTransformPose;
geometry_msgs::msg::Pose pose;
pose.position.x = 2.0;
@@ -1018,10 +1018,10 @@ TEST(geometry, inverseTransformPose)
TEST(geometry, inverseTransformPoint)
{
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
- using tier4_autoware_utils::inverseTransformPoint;
- using tier4_autoware_utils::inverseTransformPose;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
+ using autoware_universe_utils::inverseTransformPoint;
+ using autoware_universe_utils::inverseTransformPose;
geometry_msgs::msg::Pose pose_transform;
pose_transform.position.x = 1.0;
@@ -1050,10 +1050,10 @@ TEST(geometry, inverseTransformPoint)
TEST(geometry, transformVector)
{
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
- using tier4_autoware_utils::MultiPoint3d;
- using tier4_autoware_utils::transformVector;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
+ using autoware_universe_utils::MultiPoint3d;
+ using autoware_universe_utils::transformVector;
{
const MultiPoint3d ps{{1.0, 2.0, 3.0}, {2.0, 3.0, 4.0}};
@@ -1078,51 +1078,51 @@ TEST(geometry, transformVector)
TEST(geometry, calcCurvature)
{
- using tier4_autoware_utils::calcCurvature;
+ using autoware_universe_utils::calcCurvature;
// Straight Line
{
- geometry_msgs::msg::Point p1 = tier4_autoware_utils::createPoint(0.0, 0.0, 0.0);
- geometry_msgs::msg::Point p2 = tier4_autoware_utils::createPoint(1.0, 0.0, 0.0);
- geometry_msgs::msg::Point p3 = tier4_autoware_utils::createPoint(2.0, 0.0, 0.0);
+ geometry_msgs::msg::Point p1 = autoware_universe_utils::createPoint(0.0, 0.0, 0.0);
+ geometry_msgs::msg::Point p2 = autoware_universe_utils::createPoint(1.0, 0.0, 0.0);
+ geometry_msgs::msg::Point p3 = autoware_universe_utils::createPoint(2.0, 0.0, 0.0);
EXPECT_DOUBLE_EQ(calcCurvature(p1, p2, p3), 0.0);
}
// Clockwise Curved Road with a 1[m] radius
{
- geometry_msgs::msg::Point p1 = tier4_autoware_utils::createPoint(0.0, 0.0, 0.0);
- geometry_msgs::msg::Point p2 = tier4_autoware_utils::createPoint(1.0, 1.0, 0.0);
- geometry_msgs::msg::Point p3 = tier4_autoware_utils::createPoint(2.0, 0.0, 0.0);
+ geometry_msgs::msg::Point p1 = autoware_universe_utils::createPoint(0.0, 0.0, 0.0);
+ geometry_msgs::msg::Point p2 = autoware_universe_utils::createPoint(1.0, 1.0, 0.0);
+ geometry_msgs::msg::Point p3 = autoware_universe_utils::createPoint(2.0, 0.0, 0.0);
EXPECT_DOUBLE_EQ(calcCurvature(p1, p2, p3), -1.0);
}
// Clockwise Curved Road with a 5[m] radius
{
- geometry_msgs::msg::Point p1 = tier4_autoware_utils::createPoint(0.0, 0.0, 0.0);
- geometry_msgs::msg::Point p2 = tier4_autoware_utils::createPoint(5.0, 5.0, 0.0);
- geometry_msgs::msg::Point p3 = tier4_autoware_utils::createPoint(10.0, 0.0, 0.0);
+ geometry_msgs::msg::Point p1 = autoware_universe_utils::createPoint(0.0, 0.0, 0.0);
+ geometry_msgs::msg::Point p2 = autoware_universe_utils::createPoint(5.0, 5.0, 0.0);
+ geometry_msgs::msg::Point p3 = autoware_universe_utils::createPoint(10.0, 0.0, 0.0);
EXPECT_DOUBLE_EQ(calcCurvature(p1, p2, p3), -0.2);
}
// Counter-Clockwise Curved Road with a 1[m] radius
{
- geometry_msgs::msg::Point p1 = tier4_autoware_utils::createPoint(0.0, 0.0, 0.0);
- geometry_msgs::msg::Point p2 = tier4_autoware_utils::createPoint(-1.0, 1.0, 0.0);
- geometry_msgs::msg::Point p3 = tier4_autoware_utils::createPoint(-2.0, 0.0, 0.0);
+ geometry_msgs::msg::Point p1 = autoware_universe_utils::createPoint(0.0, 0.0, 0.0);
+ geometry_msgs::msg::Point p2 = autoware_universe_utils::createPoint(-1.0, 1.0, 0.0);
+ geometry_msgs::msg::Point p3 = autoware_universe_utils::createPoint(-2.0, 0.0, 0.0);
EXPECT_DOUBLE_EQ(calcCurvature(p1, p2, p3), 1.0);
}
// Counter-Clockwise Curved Road with a 5[m] radius
{
- geometry_msgs::msg::Point p1 = tier4_autoware_utils::createPoint(0.0, 0.0, 0.0);
- geometry_msgs::msg::Point p2 = tier4_autoware_utils::createPoint(-5.0, 5.0, 0.0);
- geometry_msgs::msg::Point p3 = tier4_autoware_utils::createPoint(-10.0, 0.0, 0.0);
+ geometry_msgs::msg::Point p1 = autoware_universe_utils::createPoint(0.0, 0.0, 0.0);
+ geometry_msgs::msg::Point p2 = autoware_universe_utils::createPoint(-5.0, 5.0, 0.0);
+ geometry_msgs::msg::Point p3 = autoware_universe_utils::createPoint(-10.0, 0.0, 0.0);
EXPECT_DOUBLE_EQ(calcCurvature(p1, p2, p3), 0.2);
}
// Give same points
{
- geometry_msgs::msg::Point p1 = tier4_autoware_utils::createPoint(0.0, 0.0, 0.0);
- geometry_msgs::msg::Point p2 = tier4_autoware_utils::createPoint(1.0, 0.0, 0.0);
+ geometry_msgs::msg::Point p1 = autoware_universe_utils::createPoint(0.0, 0.0, 0.0);
+ geometry_msgs::msg::Point p2 = autoware_universe_utils::createPoint(1.0, 0.0, 0.0);
ASSERT_ANY_THROW(calcCurvature(p1, p1, p1));
ASSERT_ANY_THROW(calcCurvature(p1, p1, p2));
ASSERT_ANY_THROW(calcCurvature(p1, p2, p1));
@@ -1132,11 +1132,11 @@ TEST(geometry, calcCurvature)
TEST(geometry, calcOffsetPose)
{
- using tier4_autoware_utils::calcOffsetPose;
- using tier4_autoware_utils::createPoint;
- using tier4_autoware_utils::createQuaternion;
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
+ using autoware_universe_utils::calcOffsetPose;
+ using autoware_universe_utils::createPoint;
+ using autoware_universe_utils::createQuaternion;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
// Only translation
{
@@ -1224,12 +1224,12 @@ TEST(geometry, calcOffsetPose)
TEST(geometry, isDrivingForward)
{
- using tier4_autoware_utils::calcInterpolatedPoint;
- using tier4_autoware_utils::createPoint;
- using tier4_autoware_utils::createQuaternion;
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
- using tier4_autoware_utils::isDrivingForward;
+ using autoware_universe_utils::calcInterpolatedPoint;
+ using autoware_universe_utils::createPoint;
+ using autoware_universe_utils::createQuaternion;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
+ using autoware_universe_utils::isDrivingForward;
const double epsilon = 1e-3;
@@ -1286,8 +1286,8 @@ TEST(geometry, isDrivingForward)
TEST(geometry, calcInterpolatedPoint)
{
- using tier4_autoware_utils::calcInterpolatedPoint;
- using tier4_autoware_utils::createPoint;
+ using autoware_universe_utils::calcInterpolatedPoint;
+ using autoware_universe_utils::createPoint;
{
const auto src_point = createPoint(0.0, 0.0, 0.0);
@@ -1343,11 +1343,11 @@ TEST(geometry, calcInterpolatedPoint)
TEST(geometry, calcInterpolatedPose)
{
- using tier4_autoware_utils::calcInterpolatedPose;
- using tier4_autoware_utils::createPoint;
- using tier4_autoware_utils::createQuaternion;
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
+ using autoware_universe_utils::calcInterpolatedPose;
+ using autoware_universe_utils::createPoint;
+ using autoware_universe_utils::createQuaternion;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
const double epsilon = 1e-3;
// Position Interpolation
@@ -1527,11 +1527,11 @@ TEST(geometry, calcInterpolatedPose)
TEST(geometry, calcInterpolatedPose_with_Spherical_Interpolation)
{
- using tier4_autoware_utils::calcInterpolatedPose;
- using tier4_autoware_utils::createPoint;
- using tier4_autoware_utils::createQuaternion;
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
+ using autoware_universe_utils::calcInterpolatedPose;
+ using autoware_universe_utils::createPoint;
+ using autoware_universe_utils::createQuaternion;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
const double epsilon = 1e-3;
// Position Interpolation
@@ -1675,7 +1675,7 @@ TEST(geometry, calcInterpolatedPose_with_Spherical_Interpolation)
TEST(geometry, getTwist)
{
- using tier4_autoware_utils::createVector3;
+ using autoware_universe_utils::createVector3;
geometry_msgs::msg::Vector3 velocity = createVector3(1.0, 2.0, 3.0);
geometry_msgs::msg::Vector3 angular = createVector3(0.1, 0.2, 0.3);
@@ -1691,7 +1691,7 @@ TEST(geometry, getTwist)
// getTwist
{
- auto t_out = tier4_autoware_utils::createTwist(velocity, angular);
+ auto t_out = autoware_universe_utils::createTwist(velocity, angular);
EXPECT_DOUBLE_EQ(t_out.linear.x, twist.linear.x);
EXPECT_DOUBLE_EQ(t_out.linear.y, twist.linear.y);
EXPECT_DOUBLE_EQ(t_out.linear.z, twist.linear.z);
@@ -1703,32 +1703,32 @@ TEST(geometry, getTwist)
TEST(geometry, getTwistNorm)
{
- using tier4_autoware_utils::createVector3;
+ using autoware_universe_utils::createVector3;
geometry_msgs::msg::TwistWithCovariance twist_with_covariance;
twist_with_covariance.twist = geometry_msgs::build()
.linear(createVector3(3.0, 4.0, 0.0))
.angular(createVector3(0.1, 0.2, 0.3));
- EXPECT_NEAR(tier4_autoware_utils::calcNorm(twist_with_covariance.twist.linear), 5.0, epsilon);
+ EXPECT_NEAR(autoware_universe_utils::calcNorm(twist_with_covariance.twist.linear), 5.0, epsilon);
}
TEST(geometry, isTwistCovarianceValid)
{
- using tier4_autoware_utils::createVector3;
+ using autoware_universe_utils::createVector3;
geometry_msgs::msg::TwistWithCovariance twist_with_covariance;
twist_with_covariance.twist = geometry_msgs::build()
.linear(createVector3(1.0, 2.0, 3.0))
.angular(createVector3(0.1, 0.2, 0.3));
- EXPECT_EQ(tier4_autoware_utils::isTwistCovarianceValid(twist_with_covariance), false);
+ EXPECT_EQ(autoware_universe_utils::isTwistCovarianceValid(twist_with_covariance), false);
twist_with_covariance.covariance.at(0) = 1.0;
- EXPECT_EQ(tier4_autoware_utils::isTwistCovarianceValid(twist_with_covariance), true);
+ EXPECT_EQ(autoware_universe_utils::isTwistCovarianceValid(twist_with_covariance), true);
}
TEST(geometry, intersect)
{
- using tier4_autoware_utils::createPoint;
- using tier4_autoware_utils::intersect;
+ using autoware_universe_utils::createPoint;
+ using autoware_universe_utils::intersect;
{ // Normally crossing
const auto p1 = createPoint(0.0, -1.0, 0.0);
diff --git a/common/tier4_autoware_utils/test/src/geometry/test_path_with_lane_id_geometry.cpp b/common/autoware_universe_utils/test/src/geometry/test_path_with_lane_id_geometry.cpp
similarity index 92%
rename from common/tier4_autoware_utils/test/src/geometry/test_path_with_lane_id_geometry.cpp
rename to common/autoware_universe_utils/test/src/geometry/test_path_with_lane_id_geometry.cpp
index 5c55a09af95b1..058149af2c192 100644
--- a/common/tier4_autoware_utils/test/src/geometry/test_path_with_lane_id_geometry.cpp
+++ b/common/autoware_universe_utils/test/src/geometry/test_path_with_lane_id_geometry.cpp
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
#include
TEST(geometry, getPoint_PathWithLaneId)
{
- using tier4_autoware_utils::getPoint;
+ using autoware_universe_utils::getPoint;
const double x_ans = 1.0;
const double y_ans = 2.0;
@@ -36,7 +36,7 @@ TEST(geometry, getPoint_PathWithLaneId)
TEST(geometry, getPose_PathWithLaneId)
{
- using tier4_autoware_utils::getPose;
+ using autoware_universe_utils::getPose;
const double x_ans = 1.0;
const double y_ans = 2.0;
@@ -66,7 +66,7 @@ TEST(geometry, getPose_PathWithLaneId)
TEST(geometry, getLongitudinalVelocity_PathWithLaneId)
{
- using tier4_autoware_utils::getLongitudinalVelocity;
+ using autoware_universe_utils::getLongitudinalVelocity;
const double velocity = 1.0;
@@ -77,7 +77,7 @@ TEST(geometry, getLongitudinalVelocity_PathWithLaneId)
TEST(geometry, setPose_PathWithLaneId)
{
- using tier4_autoware_utils::setPose;
+ using autoware_universe_utils::setPose;
const double x_ans = 1.0;
const double y_ans = 2.0;
@@ -109,7 +109,7 @@ TEST(geometry, setPose_PathWithLaneId)
TEST(geometry, setLongitudinalVelocity_PathWithLaneId)
{
- using tier4_autoware_utils::setLongitudinalVelocity;
+ using autoware_universe_utils::setLongitudinalVelocity;
const double velocity = 1.0;
diff --git a/common/tier4_autoware_utils/test/src/geometry/test_pose_deviation.cpp b/common/autoware_universe_utils/test/src/geometry/test_pose_deviation.cpp
similarity index 78%
rename from common/tier4_autoware_utils/test/src/geometry/test_pose_deviation.cpp
rename to common/autoware_universe_utils/test/src/geometry/test_pose_deviation.cpp
index 76e742edde59c..0808223bb9ea2 100644
--- a/common/tier4_autoware_utils/test/src/geometry/test_pose_deviation.cpp
+++ b/common/autoware_universe_utils/test/src/geometry/test_pose_deviation.cpp
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/geometry/geometry.hpp"
-#include "tier4_autoware_utils/geometry/pose_deviation.hpp"
-#include "tier4_autoware_utils/math/unit_conversion.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/pose_deviation.hpp"
+#include "autoware/universe_utils/math/unit_conversion.hpp"
#include
TEST(geometry, pose_deviation)
{
- using tier4_autoware_utils::calcPoseDeviation;
- using tier4_autoware_utils::createQuaternionFromRPY;
- using tier4_autoware_utils::deg2rad;
+ using autoware_universe_utils::calcPoseDeviation;
+ using autoware_universe_utils::createQuaternionFromRPY;
+ using autoware_universe_utils::deg2rad;
geometry_msgs::msg::Pose pose1;
pose1.position.x = 1.0;
diff --git a/common/tier4_autoware_utils/test/src/math/test_constants.cpp b/common/autoware_universe_utils/test/src/math/test_constants.cpp
similarity index 85%
rename from common/tier4_autoware_utils/test/src/math/test_constants.cpp
rename to common/autoware_universe_utils/test/src/math/test_constants.cpp
index 80db5414a30f4..47e76efd66f6e 100644
--- a/common/tier4_autoware_utils/test/src/math/test_constants.cpp
+++ b/common/autoware_universe_utils/test/src/math/test_constants.cpp
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/math/constants.hpp"
+#include "autoware/universe_utils/math/constants.hpp"
#include
TEST(constants, pi)
{
- using tier4_autoware_utils::pi;
+ using autoware_universe_utils::pi;
EXPECT_DOUBLE_EQ(pi, 3.14159265358979323846);
}
TEST(constants, gravity)
{
- using tier4_autoware_utils::gravity;
+ using autoware_universe_utils::gravity;
EXPECT_DOUBLE_EQ(gravity, 9.80665);
}
diff --git a/common/tier4_autoware_utils/test/src/math/test_normalization.cpp b/common/autoware_universe_utils/test/src/math/test_normalization.cpp
similarity index 94%
rename from common/tier4_autoware_utils/test/src/math/test_normalization.cpp
rename to common/autoware_universe_utils/test/src/math/test_normalization.cpp
index 0ae15ea320850..19b8a29019057 100644
--- a/common/tier4_autoware_utils/test/src/math/test_normalization.cpp
+++ b/common/autoware_universe_utils/test/src/math/test_normalization.cpp
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/math/normalization.hpp"
+#include "autoware/universe_utils/math/normalization.hpp"
#include
TEST(normalization, normalizeDegree)
{
- using tier4_autoware_utils::normalizeDegree;
+ using autoware_universe_utils::normalizeDegree;
// -180 <= deg < 180
{
@@ -51,7 +51,7 @@ TEST(normalization, normalizeDegree)
TEST(normalization, normalizeRadian)
{
- using tier4_autoware_utils::normalizeRadian;
+ using autoware_universe_utils::normalizeRadian;
// -M_PI <= deg < M_PI
{
diff --git a/common/tier4_autoware_utils/test/src/math/test_range.cpp b/common/autoware_universe_utils/test/src/math/test_range.cpp
similarity index 96%
rename from common/tier4_autoware_utils/test/src/math/test_range.cpp
rename to common/autoware_universe_utils/test/src/math/test_range.cpp
index 429c08938949f..400a6a4dd20c1 100644
--- a/common/tier4_autoware_utils/test/src/math/test_range.cpp
+++ b/common/autoware_universe_utils/test/src/math/test_range.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/math/range.hpp"
+#include "autoware/universe_utils/math/range.hpp"
#include
@@ -44,7 +44,7 @@ void expect_eq_vector(const std::vector & input, const std::vector & e
TEST(arange_Test, arange_double)
{
- using tier4_autoware_utils::arange;
+ using autoware_universe_utils::arange;
// general cases
{
@@ -82,7 +82,7 @@ TEST(arange_Test, arange_double)
TEST(arange_Test, arange_float)
{
- using tier4_autoware_utils::arange;
+ using autoware_universe_utils::arange;
// general cases
{
@@ -121,7 +121,7 @@ TEST(arange_Test, arange_float)
TEST(arange_Test, arange_int)
{
- using tier4_autoware_utils::arange;
+ using autoware_universe_utils::arange;
// general cases
{
@@ -154,7 +154,7 @@ TEST(arange_Test, arange_int)
TEST(test_linspace, linspace_double)
{
- using tier4_autoware_utils::linspace;
+ using autoware_universe_utils::linspace;
// general cases
{
@@ -182,7 +182,7 @@ TEST(test_linspace, linspace_double)
TEST(test_linspace, linspace_float)
{
- using tier4_autoware_utils::linspace;
+ using autoware_universe_utils::linspace;
// general cases
{
@@ -211,7 +211,7 @@ TEST(test_linspace, linspace_float)
TEST(test_linspace, linspace_int)
{
- using tier4_autoware_utils::linspace;
+ using autoware_universe_utils::linspace;
// general cases
{
diff --git a/common/tier4_autoware_utils/test/src/math/test_trigonometry.cpp b/common/autoware_universe_utils/test/src/math/test_trigonometry.cpp
similarity index 69%
rename from common/tier4_autoware_utils/test/src/math/test_trigonometry.cpp
rename to common/autoware_universe_utils/test/src/math/test_trigonometry.cpp
index d7106fd823682..c4ba81a6b77ff 100644
--- a/common/tier4_autoware_utils/test/src/math/test_trigonometry.cpp
+++ b/common/autoware_universe_utils/test/src/math/test_trigonometry.cpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/math/constants.hpp"
-#include "tier4_autoware_utils/math/trigonometry.hpp"
+#include "autoware/universe_utils/math/constants.hpp"
+#include "autoware/universe_utils/math/trigonometry.hpp"
#include
@@ -21,31 +21,31 @@
TEST(trigonometry, sin)
{
- float x = 4.f * tier4_autoware_utils::pi / 128.f;
+ float x = 4.f * autoware_universe_utils::pi / 128.f;
for (int i = 0; i < 128; i++) {
EXPECT_TRUE(
std::abs(
std::sin(x * static_cast(i)) -
- tier4_autoware_utils::sin(x * static_cast(i))) < 10e-5);
+ autoware_universe_utils::sin(x * static_cast(i))) < 10e-5);
}
}
TEST(trigonometry, cos)
{
- float x = 4.f * tier4_autoware_utils::pi / 128.f;
+ float x = 4.f * autoware_universe_utils::pi / 128.f;
for (int i = 0; i < 128; i++) {
EXPECT_TRUE(
std::abs(
std::cos(x * static_cast(i)) -
- tier4_autoware_utils::cos(x * static_cast(i))) < 10e-5);
+ autoware_universe_utils::cos(x * static_cast(i))) < 10e-5);
}
}
TEST(trigonometry, sin_and_cos)
{
- float x = 4.f * tier4_autoware_utils::pi / 128.f;
+ float x = 4.f * autoware_universe_utils::pi / 128.f;
for (int i = 0; i < 128; i++) {
- const auto sin_and_cos = tier4_autoware_utils::sin_and_cos(x * static_cast(i));
+ const auto sin_and_cos = autoware_universe_utils::sin_and_cos(x * static_cast(i));
EXPECT_TRUE(std::abs(std::sin(x * static_cast(i)) - sin_and_cos.first) < 10e-7);
EXPECT_TRUE(std::abs(std::cos(x * static_cast(i)) - sin_and_cos.second) < 10e-7);
}
diff --git a/common/tier4_autoware_utils/test/src/math/test_unit_conversion.cpp b/common/autoware_universe_utils/test/src/math/test_unit_conversion.cpp
similarity index 86%
rename from common/tier4_autoware_utils/test/src/math/test_unit_conversion.cpp
rename to common/autoware_universe_utils/test/src/math/test_unit_conversion.cpp
index 9b689d1257932..e00b85f9e24f2 100644
--- a/common/tier4_autoware_utils/test/src/math/test_unit_conversion.cpp
+++ b/common/autoware_universe_utils/test/src/math/test_unit_conversion.cpp
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/math/unit_conversion.hpp"
+#include "autoware/universe_utils/math/unit_conversion.hpp"
#include
-using tier4_autoware_utils::pi;
+using autoware_universe_utils::pi;
TEST(unit_conversion, deg2rad)
{
- using tier4_autoware_utils::deg2rad;
+ using autoware_universe_utils::deg2rad;
EXPECT_DOUBLE_EQ(deg2rad(-720), -4 * pi);
EXPECT_DOUBLE_EQ(deg2rad(0), 0);
@@ -33,7 +33,7 @@ TEST(unit_conversion, deg2rad)
TEST(unit_conversion, rad2deg)
{
- using tier4_autoware_utils::rad2deg;
+ using autoware_universe_utils::rad2deg;
EXPECT_DOUBLE_EQ(rad2deg(-4 * pi), -720);
EXPECT_DOUBLE_EQ(rad2deg(0), 0);
@@ -46,7 +46,7 @@ TEST(unit_conversion, rad2deg)
TEST(unit_conversion, kmph2mps)
{
- using tier4_autoware_utils::kmph2mps;
+ using autoware_universe_utils::kmph2mps;
EXPECT_DOUBLE_EQ(kmph2mps(0), 0);
EXPECT_DOUBLE_EQ(kmph2mps(36), 10);
@@ -56,7 +56,7 @@ TEST(unit_conversion, kmph2mps)
TEST(unit_conversion, mps2kmph)
{
- using tier4_autoware_utils::mps2kmph;
+ using autoware_universe_utils::mps2kmph;
EXPECT_DOUBLE_EQ(mps2kmph(0), 0);
EXPECT_DOUBLE_EQ(mps2kmph(10), 36);
diff --git a/common/tier4_autoware_utils/test/src/ros/test_published_time_publisher.cpp b/common/autoware_universe_utils/test/src/ros/test_published_time_publisher.cpp
similarity index 96%
rename from common/tier4_autoware_utils/test/src/ros/test_published_time_publisher.cpp
rename to common/autoware_universe_utils/test/src/ros/test_published_time_publisher.cpp
index 133cb01f9b348..238a97e901611 100644
--- a/common/tier4_autoware_utils/test/src/ros/test_published_time_publisher.cpp
+++ b/common/autoware_universe_utils/test/src/ros/test_published_time_publisher.cpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include
#include
-#include
#include
#include
@@ -24,7 +24,7 @@ class PublishedTimePublisherWithSubscriptionTest : public ::testing::Test
{
protected:
std::shared_ptr node_{nullptr};
- std::shared_ptr published_time_publisher_ptr_{
+ std::shared_ptr published_time_publisher_ptr_{
nullptr};
std::shared_ptr> first_test_publisher_ptr_{nullptr};
@@ -70,7 +70,7 @@ class PublishedTimePublisherWithSubscriptionTest : public ::testing::Test
// Create a PublishedTimePublisher
published_time_publisher_ptr_ =
- std::make_shared(node_.get());
+ std::make_shared(node_.get());
// Create the first subscriber
first_test_subscriber_ptr_ =
@@ -98,7 +98,7 @@ class PublishedTimePublisherWithoutSubscriptionTest : public ::testing::Test
{
protected:
std::shared_ptr node_{nullptr};
- std::shared_ptr published_time_publisher_ptr_{
+ std::shared_ptr published_time_publisher_ptr_{
nullptr};
std::shared_ptr> first_test_publisher_ptr_{nullptr};
@@ -135,7 +135,7 @@ class PublishedTimePublisherWithoutSubscriptionTest : public ::testing::Test
// Create a PublishedTimePublisher
published_time_publisher_ptr_ =
- std::make_shared(node_.get());
+ std::make_shared(node_.get());
rclcpp::spin_some(node_);
}
diff --git a/common/tier4_autoware_utils/test/src/system/test_stop_watch.cpp b/common/autoware_universe_utils/test/src/system/test_stop_watch.cpp
similarity index 91%
rename from common/tier4_autoware_utils/test/src/system/test_stop_watch.cpp
rename to common/autoware_universe_utils/test/src/system/test_stop_watch.cpp
index cb201ab0dd5ec..6bf9857595f98 100644
--- a/common/tier4_autoware_utils/test/src/system/test_stop_watch.cpp
+++ b/common/autoware_universe_utils/test/src/system/test_stop_watch.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/system/stop_watch.hpp"
+#include "autoware/universe_utils/system/stop_watch.hpp"
#include
@@ -21,7 +21,7 @@
TEST(system, StopWatch_sec)
{
- using tier4_autoware_utils::StopWatch;
+ using autoware_universe_utils::StopWatch;
StopWatch stop_watch;
@@ -50,7 +50,7 @@ TEST(system, StopWatch_sec)
TEST(system, StopWatch_msec)
{
- using tier4_autoware_utils::StopWatch;
+ using autoware_universe_utils::StopWatch;
StopWatch stop_watch;
diff --git a/common/tier4_autoware_utils/test/src/test_autoware_utils.cpp b/common/autoware_universe_utils/test/src/test_autoware_utils.cpp
similarity index 100%
rename from common/tier4_autoware_utils/test/src/test_autoware_utils.cpp
rename to common/autoware_universe_utils/test/src/test_autoware_utils.cpp
diff --git a/common/tier4_autoware_utils/test/src/transform/test_transform.cpp b/common/autoware_universe_utils/test/src/transform/test_transform.cpp
similarity index 85%
rename from common/tier4_autoware_utils/test/src/transform/test_transform.cpp
rename to common/autoware_universe_utils/test/src/transform/test_transform.cpp
index aae8cc22ea9fb..e659ec0f2a749 100644
--- a/common/tier4_autoware_utils/test/src/transform/test_transform.cpp
+++ b/common/autoware_universe_utils/test/src/transform/test_transform.cpp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "tier4_autoware_utils/transform/transforms.hpp"
+#include "autoware/universe_utils/transform/transforms.hpp"
#include
#include
@@ -31,7 +31,7 @@ TEST(system, transform_point_cloud)
42301.179688, -0.001429, -0.017543, 0.999845, -3.157415, 0.000000, 0.000000, 0.000000, 1.000000;
pcl::PointCloud cloud_transformed;
- tier4_autoware_utils::transformPointCloud(cloud, cloud_transformed, transform);
+ autoware_universe_utils::transformPointCloud(cloud, cloud_transformed, transform);
pcl::PointXYZI pt1_gt(89603.187500, 42270.878906, -13.056946, 4);
@@ -52,8 +52,9 @@ TEST(system, empty_point_cloud)
pcl::PointCloud cloud_transformed;
- EXPECT_NO_THROW(tier4_autoware_utils::transformPointCloud(cloud, cloud_transformed, transform));
+ EXPECT_NO_THROW(
+ autoware_universe_utils::transformPointCloud(cloud, cloud_transformed, transform));
EXPECT_NO_FATAL_FAILURE(
- tier4_autoware_utils::transformPointCloud(cloud, cloud_transformed, transform));
+ autoware_universe_utils::transformPointCloud(cloud, cloud_transformed, transform));
EXPECT_EQ(cloud_transformed.size(), 0ul);
}
diff --git a/common/goal_distance_calculator/include/goal_distance_calculator/goal_distance_calculator.hpp b/common/goal_distance_calculator/include/goal_distance_calculator/goal_distance_calculator.hpp
index 3329c1349b707..370765a81c743 100644
--- a/common/goal_distance_calculator/include/goal_distance_calculator/goal_distance_calculator.hpp
+++ b/common/goal_distance_calculator/include/goal_distance_calculator/goal_distance_calculator.hpp
@@ -15,8 +15,8 @@
#ifndef GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_
#define GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_
+#include
#include
-#include
#include
#include
@@ -25,7 +25,7 @@
namespace goal_distance_calculator
{
-using tier4_autoware_utils::PoseDeviation;
+using autoware_universe_utils::PoseDeviation;
struct Param
{
diff --git a/common/goal_distance_calculator/include/goal_distance_calculator/goal_distance_calculator_node.hpp b/common/goal_distance_calculator/include/goal_distance_calculator/goal_distance_calculator_node.hpp
index 680c4a3cdfff1..c1154884e8340 100644
--- a/common/goal_distance_calculator/include/goal_distance_calculator/goal_distance_calculator_node.hpp
+++ b/common/goal_distance_calculator/include/goal_distance_calculator/goal_distance_calculator_node.hpp
@@ -17,9 +17,9 @@
#include "goal_distance_calculator/goal_distance_calculator.hpp"
+#include
+#include
#include
-#include
-#include
#include
#include
@@ -45,7 +45,7 @@ class GoalDistanceCalculatorNode : public rclcpp::Node
private:
// Subscriber
rclcpp::Subscription::SharedPtr sub_initial_pose_;
- tier4_autoware_utils::SelfPoseListener self_pose_listener_;
+ autoware_universe_utils::SelfPoseListener self_pose_listener_;
rclcpp::Subscription::SharedPtr sub_route_;
// Data Buffer
@@ -56,7 +56,7 @@ class GoalDistanceCalculatorNode : public rclcpp::Node
void onRoute(const autoware_planning_msgs::msg::LaneletRoute::ConstSharedPtr & msg);
// Publisher
- tier4_autoware_utils::DebugPublisher debug_publisher_;
+ autoware_universe_utils::DebugPublisher debug_publisher_;
// Timer
rclcpp::TimerBase::SharedPtr timer_;
diff --git a/common/goal_distance_calculator/package.xml b/common/goal_distance_calculator/package.xml
index eb71dc45f31a3..04ea8a37a5053 100644
--- a/common/goal_distance_calculator/package.xml
+++ b/common/goal_distance_calculator/package.xml
@@ -11,10 +11,10 @@
autoware_cmake
autoware_planning_msgs
+ autoware_universe_utils
geometry_msgs
rclcpp
rclcpp_components
- tier4_autoware_utils
tier4_debug_msgs
ament_lint_auto
diff --git a/common/goal_distance_calculator/src/goal_distance_calculator.cpp b/common/goal_distance_calculator/src/goal_distance_calculator.cpp
index 719baef283791..5491fe96c0848 100755
--- a/common/goal_distance_calculator/src/goal_distance_calculator.cpp
+++ b/common/goal_distance_calculator/src/goal_distance_calculator.cpp
@@ -21,7 +21,7 @@ Output GoalDistanceCalculator::update(const Input & input)
Output output{};
output.goal_deviation =
- tier4_autoware_utils::calcPoseDeviation(input.route->goal_pose, input.current_pose->pose);
+ autoware_universe_utils::calcPoseDeviation(input.route->goal_pose, input.current_pose->pose);
return output;
}
diff --git a/common/goal_distance_calculator/src/goal_distance_calculator_node.cpp b/common/goal_distance_calculator/src/goal_distance_calculator_node.cpp
index ab1c35e246719..7f4346dac63dc 100644
--- a/common/goal_distance_calculator/src/goal_distance_calculator_node.cpp
+++ b/common/goal_distance_calculator/src/goal_distance_calculator_node.cpp
@@ -14,9 +14,9 @@
#include "goal_distance_calculator/goal_distance_calculator_node.hpp"
+#include
#include
#include
-#include
#include
@@ -107,7 +107,7 @@ void GoalDistanceCalculatorNode::onTimer()
output_ = goal_distance_calculator_->update(input_);
{
- using tier4_autoware_utils::rad2deg;
+ using autoware_universe_utils::rad2deg;
const auto & deviation = output_.goal_deviation;
debug_publisher_.publish(
diff --git a/common/interpolation/include/interpolation/spline_interpolation.hpp b/common/interpolation/include/interpolation/spline_interpolation.hpp
index f5befefeae9da..38e7b3fed5b8b 100644
--- a/common/interpolation/include/interpolation/spline_interpolation.hpp
+++ b/common/interpolation/include/interpolation/spline_interpolation.hpp
@@ -15,8 +15,8 @@
#ifndef INTERPOLATION__SPLINE_INTERPOLATION_HPP_
#define INTERPOLATION__SPLINE_INTERPOLATION_HPP_
+#include "autoware/universe_utils/geometry/geometry.hpp"
#include "interpolation/interpolation_utils.hpp"
-#include "tier4_autoware_utils/geometry/geometry.hpp"
#include
#include
diff --git a/common/interpolation/include/interpolation/spline_interpolation_points_2d.hpp b/common/interpolation/include/interpolation/spline_interpolation_points_2d.hpp
index 653d6c61d05b6..b2fc5c6c36e54 100644
--- a/common/interpolation/include/interpolation/spline_interpolation_points_2d.hpp
+++ b/common/interpolation/include/interpolation/spline_interpolation_points_2d.hpp
@@ -53,7 +53,7 @@ class SplineInterpolationPoints2d
{
std::vector points_inner;
for (const auto & p : points) {
- points_inner.push_back(tier4_autoware_utils::getPoint(p));
+ points_inner.push_back(autoware_universe_utils::getPoint(p));
}
calcSplineCoefficientsInner(points_inner);
}
diff --git a/common/interpolation/package.xml b/common/interpolation/package.xml
index 6be04482da3ee..bb4af924dd252 100644
--- a/common/interpolation/package.xml
+++ b/common/interpolation/package.xml
@@ -11,7 +11,7 @@
ament_cmake_auto
autoware_cmake
- tier4_autoware_utils
+ autoware_universe_utils
ament_cmake_ros
ament_lint_auto
diff --git a/common/interpolation/src/spline_interpolation_points_2d.cpp b/common/interpolation/src/spline_interpolation_points_2d.cpp
index 61c60df7a8984..11bc407e4c511 100644
--- a/common/interpolation/src/spline_interpolation_points_2d.cpp
+++ b/common/interpolation/src/spline_interpolation_points_2d.cpp
@@ -118,7 +118,7 @@ geometry_msgs::msg::Pose SplineInterpolationPoints2d::getSplineInterpolatedPose(
geometry_msgs::msg::Pose pose;
pose.position = getSplineInterpolatedPoint(idx, s);
pose.orientation =
- tier4_autoware_utils::createQuaternionFromYaw(getSplineInterpolatedYaw(idx, s));
+ autoware_universe_utils::createQuaternionFromYaw(getSplineInterpolatedYaw(idx, s));
return pose;
}
diff --git a/common/interpolation/test/src/test_spline_interpolation.cpp b/common/interpolation/test/src/test_spline_interpolation.cpp
index 94baf50992cf5..d3cb2d6d3060b 100644
--- a/common/interpolation/test/src/test_spline_interpolation.cpp
+++ b/common/interpolation/test/src/test_spline_interpolation.cpp
@@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "autoware/universe_utils/geometry/geometry.hpp"
#include "interpolation/spline_interpolation.hpp"
-#include "tier4_autoware_utils/geometry/geometry.hpp"
#include
diff --git a/common/interpolation/test/src/test_spline_interpolation_points_2d.cpp b/common/interpolation/test/src/test_spline_interpolation_points_2d.cpp
index 09973826387a2..2d582e2318600 100644
--- a/common/interpolation/test/src/test_spline_interpolation_points_2d.cpp
+++ b/common/interpolation/test/src/test_spline_interpolation_points_2d.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "autoware/universe_utils/geometry/geometry.hpp"
#include "interpolation/spline_interpolation.hpp"
#include "interpolation/spline_interpolation_points_2d.hpp"
-#include "tier4_autoware_utils/geometry/geometry.hpp"
#include
@@ -25,7 +25,7 @@ constexpr double epsilon = 1e-6;
TEST(spline_interpolation, splineYawFromPoints)
{
- using tier4_autoware_utils::createPoint;
+ using autoware_universe_utils::createPoint;
{ // straight
std::vector points;
@@ -96,7 +96,7 @@ TEST(spline_interpolation, splineYawFromPoints)
TEST(spline_interpolation, SplineInterpolationPoints2d)
{
- using tier4_autoware_utils::createPoint;
+ using autoware_universe_utils::createPoint;
// curve
std::vector points;
@@ -200,7 +200,7 @@ TEST(spline_interpolation, SplineInterpolationPoints2d)
TEST(spline_interpolation, SplineInterpolationPoints2dPolymorphism)
{
using autoware_planning_msgs::msg::TrajectoryPoint;
- using tier4_autoware_utils::createPoint;
+ using autoware_universe_utils::createPoint;
std::vector points;
points.push_back(createPoint(-2.0, -10.0, 0.0));
diff --git a/common/motion_utils/docs/vehicle/vehicle.md b/common/motion_utils/docs/vehicle/vehicle.md
index c768e6115731c..32cbf6be28dcc 100644
--- a/common/motion_utils/docs/vehicle/vehicle.md
+++ b/common/motion_utils/docs/vehicle/vehicle.md
@@ -36,7 +36,7 @@ bool isVehicleStopped(const double stop_duration)
Necessary includes:
```c++
-#include
+#include
```
1.Create a checker instance.
@@ -116,7 +116,7 @@ bool isVehicleStoppedAtStopPoint(const double stop_duration)
Necessary includes:
```c++
-#include
+#include
```
1.Create a checker instance.
diff --git a/common/motion_utils/include/motion_utils/resample/resample_utils.hpp b/common/motion_utils/include/motion_utils/resample/resample_utils.hpp
index fb151ec56b085..ad312701faad0 100644
--- a/common/motion_utils/include/motion_utils/resample/resample_utils.hpp
+++ b/common/motion_utils/include/motion_utils/resample/resample_utils.hpp
@@ -15,11 +15,11 @@
#ifndef MOTION_UTILS__RESAMPLE__RESAMPLE_UTILS_HPP_
#define MOTION_UTILS__RESAMPLE__RESAMPLE_UTILS_HPP_
-#include "tier4_autoware_utils/system/backtrace.hpp"
+#include "autoware/universe_utils/system/backtrace.hpp"
+#include
#include
#include
-#include
#include
@@ -50,9 +50,9 @@ template
bool validate_points_duplication(const T & points)
{
for (size_t i = 0; i < points.size() - 1; ++i) {
- const auto & curr_pt = tier4_autoware_utils::getPoint(points.at(i));
- const auto & next_pt = tier4_autoware_utils::getPoint(points.at(i + 1));
- const double ds = tier4_autoware_utils::calcDistance2d(curr_pt, next_pt);
+ const auto & curr_pt = autoware_universe_utils::getPoint(points.at(i));
+ const auto & next_pt = autoware_universe_utils::getPoint(points.at(i + 1));
+ const double ds = autoware_universe_utils::calcDistance2d(curr_pt, next_pt);
if (ds < close_s_threshold) {
return false;
}
@@ -67,27 +67,27 @@ bool validate_arguments(const T & input_points, const std::vector & resa
// Check size of the arguments
if (!validate_size(input_points)) {
RCLCPP_DEBUG(get_logger(), "invalid argument: The number of input points is less than 2");
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
return false;
}
if (!validate_size(resampling_intervals)) {
RCLCPP_DEBUG(
get_logger(), "invalid argument: The number of resampling intervals is less than 2");
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
return false;
}
// Check resampling range
if (!validate_resampling_range(input_points, resampling_intervals)) {
RCLCPP_DEBUG(get_logger(), "invalid argument: resampling interval is longer than input points");
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
return false;
}
// Check duplication
if (!validate_points_duplication(input_points)) {
RCLCPP_DEBUG(get_logger(), "invalid argument: input points has some duplicated points");
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
return false;
}
@@ -100,7 +100,7 @@ bool validate_arguments(const T & input_points, const double resampling_interval
// Check size of the arguments
if (!validate_size(input_points)) {
RCLCPP_DEBUG(get_logger(), "invalid argument: The number of input points is less than 2");
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
return false;
}
@@ -109,14 +109,14 @@ bool validate_arguments(const T & input_points, const double resampling_interval
RCLCPP_DEBUG(
get_logger(), "invalid argument: resampling interval is less than %f",
motion_utils::overlap_threshold);
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
return false;
}
// Check duplication
if (!validate_points_duplication(input_points)) {
RCLCPP_DEBUG(get_logger(), "invalid argument: input points has some duplicated points");
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
return false;
}
diff --git a/common/motion_utils/include/motion_utils/trajectory/interpolation.hpp b/common/motion_utils/include/motion_utils/trajectory/interpolation.hpp
index 0a0b14cb7488d..86a8048b9eec4 100644
--- a/common/motion_utils/include/motion_utils/trajectory/interpolation.hpp
+++ b/common/motion_utils/include/motion_utils/trajectory/interpolation.hpp
@@ -15,7 +15,7 @@
#ifndef MOTION_UTILS__TRAJECTORY__INTERPOLATION_HPP_
#define MOTION_UTILS__TRAJECTORY__INTERPOLATION_HPP_
-#include "tier4_autoware_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
#include "autoware_planning_msgs/msg/trajectory.hpp"
#include "tier4_planning_msgs/msg/path_with_lane_id.hpp"
@@ -73,22 +73,22 @@ geometry_msgs::msg::Pose calcInterpolatedPose(const T & points, const double tar
}
if (points.size() < 2 || target_length < 0.0) {
- return tier4_autoware_utils::getPose(points.front());
+ return autoware_universe_utils::getPose(points.front());
}
double accumulated_length = 0;
for (size_t i = 0; i < points.size() - 1; ++i) {
- const auto & curr_pose = tier4_autoware_utils::getPose(points.at(i));
- const auto & next_pose = tier4_autoware_utils::getPose(points.at(i + 1));
- const double length = tier4_autoware_utils::calcDistance3d(curr_pose, next_pose);
+ const auto & curr_pose = autoware_universe_utils::getPose(points.at(i));
+ const auto & next_pose = autoware_universe_utils::getPose(points.at(i + 1));
+ const double length = autoware_universe_utils::calcDistance3d(curr_pose, next_pose);
if (accumulated_length + length > target_length) {
const double ratio = (target_length - accumulated_length) / std::max(length, 1e-6);
- return tier4_autoware_utils::calcInterpolatedPose(curr_pose, next_pose, ratio);
+ return autoware_universe_utils::calcInterpolatedPose(curr_pose, next_pose, ratio);
}
accumulated_length += length;
}
- return tier4_autoware_utils::getPose(points.back());
+ return autoware_universe_utils::getPose(points.back());
}
} // namespace motion_utils
diff --git a/common/motion_utils/include/motion_utils/trajectory/trajectory.hpp b/common/motion_utils/include/motion_utils/trajectory/trajectory.hpp
index 3715f466e7684..d9cb853d7db92 100644
--- a/common/motion_utils/include/motion_utils/trajectory/trajectory.hpp
+++ b/common/motion_utils/include/motion_utils/trajectory/trajectory.hpp
@@ -15,10 +15,10 @@
#ifndef MOTION_UTILS__TRAJECTORY__TRAJECTORY_HPP_
#define MOTION_UTILS__TRAJECTORY__TRAJECTORY_HPP_
-#include "tier4_autoware_utils/geometry/geometry.hpp"
-#include "tier4_autoware_utils/geometry/pose_deviation.hpp"
-#include "tier4_autoware_utils/math/constants.hpp"
-#include "tier4_autoware_utils/system/backtrace.hpp"
+#include "autoware/universe_utils/geometry/geometry.hpp"
+#include "autoware/universe_utils/geometry/pose_deviation.hpp"
+#include "autoware/universe_utils/math/constants.hpp"
+#include "autoware/universe_utils/system/backtrace.hpp"
#include
#include
@@ -51,7 +51,7 @@ template
void validateNonEmpty(const T & points)
{
if (points.empty()) {
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
throw std::invalid_argument("[motion_utils] validateNonEmpty(): Points is empty.");
}
}
@@ -72,22 +72,22 @@ extern template void validateNonEmpty
void validateNonSharpAngle(
const T & point1, const T & point2, const T & point3,
- const double angle_threshold = tier4_autoware_utils::pi / 4)
+ const double angle_threshold = autoware_universe_utils::pi / 4)
{
- const auto p1 = tier4_autoware_utils::getPoint(point1);
- const auto p2 = tier4_autoware_utils::getPoint(point2);
- const auto p3 = tier4_autoware_utils::getPoint(point3);
+ const auto p1 = autoware_universe_utils::getPoint(point1);
+ const auto p2 = autoware_universe_utils::getPoint(point2);
+ const auto p3 = autoware_universe_utils::getPoint(point3);
const std::vector vec_1to2 = {p2.x - p1.x, p2.y - p1.y, p2.z - p1.z};
const std::vector vec_3to2 = {p2.x - p3.x, p2.y - p3.y, p2.z - p3.z};
const auto product = std::inner_product(vec_1to2.begin(), vec_1to2.end(), vec_3to2.begin(), 0.0);
- const auto dist_1to2 = tier4_autoware_utils::calcDistance3d(p1, p2);
- const auto dist_3to2 = tier4_autoware_utils::calcDistance3d(p3, p2);
+ const auto dist_1to2 = autoware_universe_utils::calcDistance3d(p1, p2);
+ const auto dist_3to2 = autoware_universe_utils::calcDistance3d(p3, p2);
constexpr double epsilon = 1e-3;
if (std::cos(angle_threshold) < product / dist_1to2 / dist_3to2 + epsilon) {
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
throw std::invalid_argument("[motion_utils] validateNonSharpAngle(): Too sharp angle.");
}
}
@@ -105,10 +105,10 @@ std::optional isDrivingForward(const T & points)
}
// check the first point direction
- const auto & first_pose = tier4_autoware_utils::getPose(points.at(0));
- const auto & second_pose = tier4_autoware_utils::getPose(points.at(1));
+ const auto & first_pose = autoware_universe_utils::getPose(points.at(0));
+ const auto & second_pose = autoware_universe_utils::getPose(points.at(1));
- return tier4_autoware_utils::isDrivingForward(first_pose, second_pose);
+ return autoware_universe_utils::isDrivingForward(first_pose, second_pose);
}
extern template std::optional
@@ -134,10 +134,10 @@ std::optional isDrivingForwardWithTwist(const T & points_with_twist)
return std::nullopt;
}
if (points_with_twist.size() == 1) {
- if (0.0 < tier4_autoware_utils::getLongitudinalVelocity(points_with_twist.front())) {
+ if (0.0 < autoware_universe_utils::getLongitudinalVelocity(points_with_twist.front())) {
return true;
}
- if (0.0 > tier4_autoware_utils::getLongitudinalVelocity(points_with_twist.front())) {
+ if (0.0 > autoware_universe_utils::getLongitudinalVelocity(points_with_twist.front())) {
return false;
}
return std::nullopt;
@@ -181,8 +181,8 @@ T removeOverlapPoints(const T & points, const size_t start_idx = 0)
constexpr double eps = 1.0E-08;
for (size_t i = start_idx + 1; i < points.size(); ++i) {
- const auto prev_p = tier4_autoware_utils::getPoint(dst.back());
- const auto curr_p = tier4_autoware_utils::getPoint(points.at(i));
+ const auto prev_p = autoware_universe_utils::getPoint(dst.back());
+ const auto curr_p = autoware_universe_utils::getPoint(points.at(i));
if (std::abs(prev_p.x - curr_p.x) < eps && std::abs(prev_p.y - curr_p.y) < eps) {
continue;
}
@@ -298,7 +298,7 @@ size_t findNearestIndex(const T & points, const geometry_msgs::msg::Point & poin
size_t min_idx = 0;
for (size_t i = 0; i < points.size(); ++i) {
- const auto dist = tier4_autoware_utils::calcSquaredDistance2d(points.at(i), point);
+ const auto dist = autoware_universe_utils::calcSquaredDistance2d(points.at(i), point);
if (dist < min_dist) {
min_dist = dist;
min_idx = i;
@@ -350,13 +350,13 @@ std::optional findNearestIndex(
size_t min_idx = 0;
for (size_t i = 0; i < points.size(); ++i) {
- const auto squared_dist = tier4_autoware_utils::calcSquaredDistance2d(points.at(i), pose);
+ const auto squared_dist = autoware_universe_utils::calcSquaredDistance2d(points.at(i), pose);
if (squared_dist > max_squared_dist || squared_dist >= min_squared_dist) {
continue;
}
- const auto yaw =
- tier4_autoware_utils::calcYawDeviation(tier4_autoware_utils::getPose(points.at(i)), pose);
+ const auto yaw = autoware_universe_utils::calcYawDeviation(
+ autoware_universe_utils::getPose(points.at(i)), pose);
if (std::fabs(yaw) > max_yaw) {
continue;
}
@@ -408,7 +408,7 @@ double calcLongitudinalOffsetToSegment(
"[motion_utils] " + std::string(__func__) +
": Failed to calculate longitudinal offset because the given segment index is out of the "
"points size.");
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
if (throw_exception) {
throw std::out_of_range(error_message);
}
@@ -436,7 +436,7 @@ double calcLongitudinalOffsetToSegment(
const std::string error_message(
"[motion_utils] " + std::string(__func__) +
": Longitudinal offset calculation is not supported for the same points.");
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
if (throw_exception) {
throw std::runtime_error(error_message);
}
@@ -447,8 +447,8 @@ double calcLongitudinalOffsetToSegment(
return std::nan("");
}
- const auto p_front = tier4_autoware_utils::getPoint(overlap_removed_points.at(seg_idx));
- const auto p_back = tier4_autoware_utils::getPoint(overlap_removed_points.at(seg_idx + 1));
+ const auto p_front = autoware_universe_utils::getPoint(overlap_removed_points.at(seg_idx));
+ const auto p_back = autoware_universe_utils::getPoint(overlap_removed_points.at(seg_idx + 1));
const Eigen::Vector3d segment_vec{p_back.x - p_front.x, p_back.y - p_front.y, 0};
const Eigen::Vector3d target_vec{p_target.x - p_front.x, p_target.y - p_front.y, 0};
@@ -598,7 +598,7 @@ double calcLateralOffset(
const std::string error_message(
"[motion_utils] " + std::string(__func__) +
": Lateral offset calculation is not supported for the same points.");
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
if (throw_exception) {
throw std::runtime_error(error_message);
}
@@ -613,8 +613,8 @@ double calcLateralOffset(
const auto p_front_idx = (p_indices > seg_idx) ? seg_idx : p_indices;
const auto p_back_idx = p_front_idx + 1;
- const auto p_front = tier4_autoware_utils::getPoint(overlap_removed_points.at(p_front_idx));
- const auto p_back = tier4_autoware_utils::getPoint(overlap_removed_points.at(p_back_idx));
+ const auto p_front = autoware_universe_utils::getPoint(overlap_removed_points.at(p_front_idx));
+ const auto p_back = autoware_universe_utils::getPoint(overlap_removed_points.at(p_back_idx));
const Eigen::Vector3d segment_vec{p_back.x - p_front.x, p_back.y - p_front.y, 0.0};
const Eigen::Vector3d target_vec{p_target.x - p_front.x, p_target.y - p_front.y, 0.0};
@@ -671,7 +671,7 @@ double calcLateralOffset(
const std::string error_message(
"[motion_utils] " + std::string(__func__) +
": Lateral offset calculation is not supported for the same points.");
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
if (throw_exception) {
throw std::runtime_error(error_message);
}
@@ -723,7 +723,7 @@ double calcSignedArcLength(const T & points, const size_t src_idx, const size_t
double dist_sum = 0.0;
for (size_t i = src_idx; i < dst_idx; ++i) {
- dist_sum += tier4_autoware_utils::calcDistance2d(points.at(i), points.at(i + 1));
+ dist_sum += autoware_universe_utils::calcDistance2d(points.at(i), points.at(i + 1));
}
return dist_sum;
}
@@ -771,7 +771,7 @@ std::vector calcSignedArcLengthPartialSum(
double dist_sum = 0.0;
partial_dist.push_back(dist_sum);
for (size_t i = src_idx; i < dst_idx - 1; ++i) {
- dist_sum += tier4_autoware_utils::calcDistance2d(points.at(i), points.at(i + 1));
+ dist_sum += autoware_universe_utils::calcDistance2d(points.at(i), points.at(i + 1));
partial_dist.push_back(dist_sum);
}
return partial_dist;
@@ -958,10 +958,10 @@ std::vector calcCurvature(const T & points)
}
for (size_t i = 1; i < points.size() - 1; ++i) {
- const auto p1 = tier4_autoware_utils::getPoint(points.at(i - 1));
- const auto p2 = tier4_autoware_utils::getPoint(points.at(i));
- const auto p3 = tier4_autoware_utils::getPoint(points.at(i + 1));
- curvature_vec.at(i) = (tier4_autoware_utils::calcCurvature(p1, p2, p3));
+ const auto p1 = autoware_universe_utils::getPoint(points.at(i - 1));
+ const auto p2 = autoware_universe_utils::getPoint(points.at(i));
+ const auto p3 = autoware_universe_utils::getPoint(points.at(i + 1));
+ curvature_vec.at(i) = (autoware_universe_utils::calcCurvature(p1, p2, p3));
}
curvature_vec.at(0) = curvature_vec.at(1);
curvature_vec.at(curvature_vec.size() - 1) = curvature_vec.at(curvature_vec.size() - 2);
@@ -996,12 +996,13 @@ std::vector> calcCurvatureAndArcLength(const T & point
std::vector> curvature_arc_length_vec;
curvature_arc_length_vec.emplace_back(0.0, 0.0);
for (size_t i = 1; i < points.size() - 1; ++i) {
- const auto p1 = tier4_autoware_utils::getPoint(points.at(i - 1));
- const auto p2 = tier4_autoware_utils::getPoint(points.at(i));
- const auto p3 = tier4_autoware_utils::getPoint(points.at(i + 1));
- const double curvature = tier4_autoware_utils::calcCurvature(p1, p2, p3);
- const double arc_length = tier4_autoware_utils::calcDistance2d(points.at(i - 1), points.at(i)) +
- tier4_autoware_utils::calcDistance2d(points.at(i), points.at(i + 1));
+ const auto p1 = autoware_universe_utils::getPoint(points.at(i - 1));
+ const auto p2 = autoware_universe_utils::getPoint(points.at(i));
+ const auto p3 = autoware_universe_utils::getPoint(points.at(i + 1));
+ const double curvature = autoware_universe_utils::calcCurvature(p1, p2, p3);
+ const double arc_length =
+ autoware_universe_utils::calcDistance2d(points.at(i - 1), points.at(i)) +
+ autoware_universe_utils::calcDistance2d(points.at(i), points.at(i + 1));
curvature_arc_length_vec.emplace_back(curvature, arc_length);
}
curvature_arc_length_vec.emplace_back(0.0, 0.0);
@@ -1076,7 +1077,7 @@ std::optional calcLongitudinalOffsetPoint(
"[motion_utils] " + std::string(__func__) +
" error: The given source index is out of the points size. Failed to calculate longitudinal "
"offset.");
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
if (throw_exception) {
throw std::out_of_range(error_message);
}
@@ -1092,7 +1093,7 @@ std::optional calcLongitudinalOffsetPoint(
}
if (src_idx + 1 == points.size() && offset == 0.0) {
- return tier4_autoware_utils::getPoint(points.at(src_idx));
+ return autoware_universe_utils::getPoint(points.at(src_idx));
}
if (offset < 0.0) {
@@ -1108,12 +1109,12 @@ std::optional calcLongitudinalOffsetPoint(
const auto & p_front = points.at(i);
const auto & p_back = points.at(i + 1);
- const auto dist_segment = tier4_autoware_utils::calcDistance2d(p_front, p_back);
+ const auto dist_segment = autoware_universe_utils::calcDistance2d(p_front, p_back);
dist_sum += dist_segment;
const auto dist_res = offset - dist_sum;
if (dist_res <= 0.0) {
- return tier4_autoware_utils::calcInterpolatedPoint(
+ return autoware_universe_utils::calcInterpolatedPoint(
p_back, p_front, std::abs(dist_res / dist_segment));
}
}
@@ -1207,7 +1208,7 @@ std::optional calcLongitudinalOffsetPose(
"[motion_utils] " + std::string(__func__) +
" error: The given source index is out of the points size. Failed to calculate longitudinal "
"offset.");
- tier4_autoware_utils::print_backtrace();
+ autoware_universe_utils::print_backtrace();
if (throw_exception) {
throw std::out_of_range(error_message);
}
@@ -1221,7 +1222,7 @@ std::optional calcLongitudinalOffsetPose(
}
if (src_idx + 1 == points.size() && offset == 0.0) {
- return tier4_autoware_utils::getPose(points.at(src_idx));
+ return autoware_universe_utils::getPose(points.at(src_idx));
}
if (offset < 0.0) {
@@ -1234,12 +1235,12 @@ std::optional calcLongitudinalOffsetPose(
const auto & p_front = reverse_points.at(i);
const auto & p_back = reverse_points.at(i + 1);
- const auto dist_segment = tier4_autoware_utils::calcDistance2d(p_front, p_back);
+ const auto dist_segment = autoware_universe_utils::calcDistance2d(p_front, p_back);
dist_sum += dist_segment;
const auto dist_res = -offset - dist_sum;
if (dist_res <= 0.0) {
- return tier4_autoware_utils::calcInterpolatedPose(
+ return autoware_universe_utils::calcInterpolatedPose(
p_back, p_front, std::abs(dist_res / dist_segment),
set_orientation_from_position_direction);
}
@@ -1251,12 +1252,12 @@ std::optional calcLongitudinalOffsetPose(
const auto & p_front = points.at(i);
const auto & p_back = points.at(i + 1);
- const auto dist_segment = tier4_autoware_utils::calcDistance2d(p_front, p_back);
+ const auto dist_segment = autoware_universe_utils::calcDistance2d(p_front, p_back);
dist_sum += dist_segment;
const auto dist_res = offset - dist_sum;
if (dist_res <= 0.0) {
- return tier4_autoware_utils::calcInterpolatedPose(
+ return autoware_universe_utils::calcInterpolatedPose(
p_front, p_back, 1.0 - std::abs(dist_res / dist_segment),
set_orientation_from_position_direction);
}
@@ -1356,8 +1357,8 @@ std::optional insertTargetPoint(
return {};
}
- const auto p_front = tier4_autoware_utils::getPoint(points.at(seg_idx));
- const auto p_back = tier4_autoware_utils::getPoint(points.at(seg_idx + 1));
+ const auto p_front = autoware_universe_utils::getPoint(points.at(seg_idx));
+ const auto p_back = autoware_universe_utils::getPoint(points.at(seg_idx + 1));
try {
validateNonSharpAngle(p_front, p_target, p_back);
@@ -1367,9 +1368,9 @@ std::optional insertTargetPoint(
}
const auto overlap_with_front =
- tier4_autoware_utils::calcDistance2d(p_target, p_front) < overlap_threshold;
+ autoware_universe_utils::calcDistance2d(p_target, p_front) < overlap_threshold;
const auto overlap_with_back =
- tier4_autoware_utils::calcDistance2d(p_target, p_back) < overlap_threshold;
+ autoware_universe_utils::calcDistance2d(p_target, p_back) < overlap_threshold;
const auto is_driving_forward = isDrivingForward(points);
if (!is_driving_forward) {
@@ -1379,31 +1380,31 @@ std::optional insertTargetPoint(
geometry_msgs::msg::Pose target_pose;
{
const auto p_base = is_driving_forward.value() ? p_back : p_front;
- const auto pitch = tier4_autoware_utils::calcElevationAngle(p_target, p_base);
- const auto yaw = tier4_autoware_utils::calcAzimuthAngle(p_target, p_base);
+ const auto pitch = autoware_universe_utils::calcElevationAngle(p_target, p_base);
+ const auto yaw = autoware_universe_utils::calcAzimuthAngle(p_target, p_base);
target_pose.position = p_target;
- target_pose.orientation = tier4_autoware_utils::createQuaternionFromRPY(0.0, pitch, yaw);
+ target_pose.orientation = autoware_universe_utils::createQuaternionFromRPY(0.0, pitch, yaw);
}
auto p_insert = points.at(seg_idx);
- tier4_autoware_utils::setPose(target_pose, p_insert);
+ autoware_universe_utils::setPose(target_pose, p_insert);
geometry_msgs::msg::Pose base_pose;
{
const auto p_base = is_driving_forward.value() ? p_front : p_back;
- const auto pitch = tier4_autoware_utils::calcElevationAngle(p_base, p_target);
- const auto yaw = tier4_autoware_utils::calcAzimuthAngle(p_base, p_target);
+ const auto pitch = autoware_universe_utils::calcElevationAngle(p_base, p_target);
+ const auto yaw = autoware_universe_utils::calcAzimuthAngle(p_base, p_target);
- base_pose.position = tier4_autoware_utils::getPoint(p_base);
- base_pose.orientation = tier4_autoware_utils::createQuaternionFromRPY(0.0, pitch, yaw);
+ base_pose.position = autoware_universe_utils::getPoint(p_base);
+ base_pose.orientation = autoware_universe_utils::createQuaternionFromRPY(0.0, pitch, yaw);
}
if (!overlap_with_front && !overlap_with_back) {
if (is_driving_forward.value()) {
- tier4_autoware_utils::setPose(base_pose, points.at(seg_idx));
+ autoware_universe_utils::setPose(base_pose, points.at(seg_idx));
} else {
- tier4_autoware_utils::setPose(base_pose, points.at(seg_idx + 1));
+ autoware_universe_utils::setPose(base_pose, points.at(seg_idx + 1));
}
points.insert(points.begin() + seg_idx + 1, p_insert);
return seg_idx + 1;
@@ -1537,9 +1538,9 @@ std::optional insertTargetPoint(
const double target_length =
insert_point_length - calcSignedArcLength(points, src_segment_idx, *segment_idx);
const double ratio = std::clamp(target_length / segment_length, 0.0, 1.0);
- const auto p_target = tier4_autoware_utils::calcInterpolatedPoint(
- tier4_autoware_utils::getPoint(points.at(*segment_idx)),
- tier4_autoware_utils::getPoint(points.at(*segment_idx + 1)), ratio);
+ const auto p_target = autoware_universe_utils::calcInterpolatedPoint(
+ autoware_universe_utils::getPoint(points.at(*segment_idx)),
+ autoware_universe_utils::getPoint(points.at(*segment_idx + 1)), ratio);
return insertTargetPoint(*segment_idx, p_target, points, overlap_threshold);
}
@@ -1643,7 +1644,7 @@ std::optional insertStopPoint(
}
for (size_t i = *stop_idx; i < points_with_twist.size(); ++i) {
- tier4_autoware_utils::setLongitudinalVelocity(0.0, points_with_twist.at(i));
+ autoware_universe_utils::setLongitudinalVelocity(0.0, points_with_twist.at(i));
}
return stop_idx;
@@ -1685,9 +1686,9 @@ std::optional insertStopPoint(
double accumulated_length = 0;
for (size_t i = 0; i < points_with_twist.size() - 1; ++i) {
- const auto curr_pose = tier4_autoware_utils::getPose(points_with_twist.at(i));
- const auto next_pose = tier4_autoware_utils::getPose(points_with_twist.at(i + 1));
- const double length = tier4_autoware_utils::calcDistance2d(curr_pose, next_pose);
+ const auto curr_pose = autoware_universe_utils::getPose(points_with_twist.at(i));
+ const auto next_pose = autoware_universe_utils::getPose(points_with_twist.at(i + 1));
+ const double length = autoware_universe_utils::calcDistance2d(curr_pose, next_pose);
if (accumulated_length + length + overlap_threshold > distance_to_stop_point) {
const double insert_length = distance_to_stop_point - accumulated_length;
return insertStopPoint(i, insert_length, points_with_twist, overlap_threshold);
@@ -1747,7 +1748,7 @@ std::optional