resolve conflict

tier4 · Sep 10, 2024 · c0859ab · c0859ab
2 parents af63e5f + 33a329d
commit c0859ab
Show file tree

Hide file tree

Showing 86 changed files with 1,741 additions and 784 deletions.
diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst
@@ -21,6 +21,17 @@ Changelog for package arithmetic
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.2 (2024-09-10)
+------------------
+* Merge branch 'master' into RJD-1278/geometry-update
+* Merge branch 'master' into RJD-1278/geometry-update
+* Merge branch 'master' into RJD-1278/geometry-update
+* Merge branch 'master' into RJD-1278/geometry-update
+* Contributors: Masaya Kataoka, Michał Ciasnocha
+
+4.2.1 (2024-09-10)
+------------------
+
 4.2.0 (2024-09-09)
 ------------------
 

diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>arithmetic</name>
-  <version>4.2.0</version>
+  <version>4.2.2</version>
   <description>arithmetic library for scenario_simulator_v2</description>
   <maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
   <license>Apache License 2.0</license>

diff --git a/common/math/geometry/CHANGELOG.rst b/common/math/geometry/CHANGELOG.rst
@@ -21,6 +21,52 @@ Changelog for package geometry
 * Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
 * Contributors: Masaya Kataoka
 
+4.2.2 (2024-09-10)
+------------------
+* Merge pull request `#1341 <https://github.com/tier4/scenario_simulator_v2/issues/1341>`_ from tier4/RJD-1278/geometry-update
+  Rjd 1278/geometry update
+* Merge branch 'master' into RJD-1278/geometry-update
+* updates after merge
+* update testcase
+* remove empty line
+* isIntersect2D_collinear
+* refactor toPolygon2D tests
+* add comments
+* bounding_box clean up
+* clean up vector3
+* rename tests in HermiteCurve
+* rename tests in CatmullRomSpline
+* quaternion operators
+* tune down numbers
+* sort tests, rm old duplicate
+* getIntersection2D function
+* getIntersection2DSValue and isIntersect2D functions
+* getPose, getPoint refactor
+* add a proper structure to the test files
+* Merge branch 'master' into RJD-1278/geometry-update
+* Merge branch 'master' into RJD-1278/geometry-update
+* update testcase
+* remove empty line
+* isIntersect2D_collinear
+* Merge branch 'master' into RJD-1278/geometry-update
+* refactor toPolygon2D tests
+* add comments
+* bounding_box clean up
+* clean up vector3
+* rename tests in HermiteCurve
+* rename tests in CatmullRomSpline
+* quaternion operators
+* tune down numbers
+* sort tests, rm old duplicate
+* getIntersection2D function
+* getIntersection2DSValue and isIntersect2D functions
+* getPose, getPoint refactor
+* add a proper structure to the test files
+* Contributors: Masaya Kataoka, Michał Ciasnocha, robomic
+
+4.2.1 (2024-09-10)
+------------------
+
 4.2.0 (2024-09-09)
 ------------------
 

diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>geometry</name>
-  <version>4.2.0</version>
+  <version>4.2.2</version>
   <description>geometry math library for scenario_simulator_v2 application</description>
   <maintainer email="[email protected]">Masaya Kataoka</maintainer>
   <license>Apache License 2.0</license>

diff --git a/common/math/geometry/test/CMakeLists.txt b/common/math/geometry/test/CMakeLists.txt
@@ -1,26 +1,15 @@
-add_subdirectory(vector3)
+add_subdirectory(src/intersection)
+add_subdirectory(src/polygon)
+add_subdirectory(src/quaternion)
+add_subdirectory(src/solver)
+add_subdirectory(src/spline)
+add_subdirectory(src/vector3)
 
-ament_add_gtest(test_bounding_box test_bounding_box.cpp)
-ament_add_gtest(test_catmull_rom_spline test_catmull_rom_spline.cpp)
-ament_add_gtest(test_catmull_rom_subspline test_catmull_rom_subspline.cpp)
-ament_add_gtest(test_collision test_collision.cpp)
-ament_add_gtest(test_distance test_distance.cpp)
-ament_add_gtest(test_hermite_curve test_hermite_curve.cpp)
-ament_add_gtest(test_polygon test_polygon.cpp)
-ament_add_gtest(test_polynomial_solver test_polynomial_solver.cpp)
-ament_add_gtest(test_transform test_transform.cpp)
-ament_add_gtest(test_intersection test_intersection.cpp)
-ament_add_gtest(test_line_segment test_line_segment.cpp)
-ament_add_gtest(test_quaternion test_quaternion.cpp)
-target_link_libraries(test_bounding_box geometry)
-target_link_libraries(test_catmull_rom_spline geometry)
-target_link_libraries(test_catmull_rom_subspline geometry)
-target_link_libraries(test_collision geometry)
+ament_add_gtest(test_distance src/test_distance.cpp)
 target_link_libraries(test_distance geometry)
-target_link_libraries(test_hermite_curve geometry)
-target_link_libraries(test_polygon geometry)
-target_link_libraries(test_polynomial_solver geometry)
+
+ament_add_gtest(test_bounding_box src/test_bounding_box.cpp)
+target_link_libraries(test_bounding_box geometry)
+
+ament_add_gtest(test_transform src/test_transform.cpp)
 target_link_libraries(test_transform geometry)
-target_link_libraries(test_intersection geometry)
-target_link_libraries(test_line_segment geometry)
-target_link_libraries(test_quaternion geometry)
diff --git a/...n/math/geometry/test/expect_eq_macros.hpp → ...th/geometry/test/src/expect_eq_macros.hpp b/...n/math/geometry/test/expect_eq_macros.hpp → ...th/geometry/test/src/expect_eq_macros.hpp
diff --git a/common/math/geometry/test/src/intersection/CMakeLists.txt b/common/math/geometry/test/src/intersection/CMakeLists.txt
@@ -0,0 +1,5 @@
+ament_add_gtest(test_collision test_collision.cpp)
+target_link_libraries(test_collision geometry)
+
+ament_add_gtest(test_intersection test_intersection.cpp)
+target_link_libraries(test_intersection geometry)
diff --git a/common/math/geometry/test/test_collision.cpp → .../test/src/intersection/test_collision.cpp b/common/math/geometry/test/test_collision.cpp → .../test/src/intersection/test_collision.cpp
@@ -17,7 +17,7 @@
 #include <geometry/intersection/collision.hpp>
 #include <scenario_simulator_exception/exception.hpp>
 
-#include "test_utils.hpp"
+#include "../test_utils.hpp"
 
 TEST(Collision, DifferentHeight)
 {

diff --git a/.../math/geometry/test/test_intersection.cpp → ...st/src/intersection/test_intersection.cpp b/.../math/geometry/test/test_intersection.cpp → ...st/src/intersection/test_intersection.cpp
@@ -18,8 +18,8 @@
 #include <geometry/intersection/intersection.hpp>
 #include <scenario_simulator_exception/exception.hpp>
 
-#include "expect_eq_macros.hpp"
-#include "test_utils.hpp"
+#include "../expect_eq_macros.hpp"
+#include "../test_utils.hpp"
 
 TEST(Intersection, isIntersect2DDisjoint)
 {

diff --git a/common/math/geometry/test/src/polygon/CMakeLists.txt b/common/math/geometry/test/src/polygon/CMakeLists.txt
@@ -0,0 +1,5 @@
+ament_add_gtest(test_line_segment test_line_segment.cpp)
+target_link_libraries(test_line_segment geometry)
+
+ament_add_gtest(test_polygon test_polygon.cpp)
+target_link_libraries(test_polygon geometry)