diff --git a/README.md b/README.md index b0f5c00e..003f049b 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ Once the shell is up and running, playing with it is easy: ```py import numpy from ostk.mathematics.geometry import Angle -from ostk.mathematics.geometry.d3.transformations.rotations import Quaternion -from ostk.mathematics.geometry.d3.transformations.rotations import RotationVector +from ostk.mathematics.geometry.d3.transformation.rotation import Quaternion +from ostk.mathematics.geometry.d3.transformation.rotation import RotationVector rv = RotationVector(numpy.array([[0.0], [0.0], [1.0]], dtype=float), Angle.degrees(15.0)) # Construct rotation vector diff --git a/bindings/python/docs/Reference/Geometry.ipynb b/bindings/python/docs/Reference/Geometry.ipynb index f59c670f..6356fe54 100644 --- a/bindings/python/docs/Reference/Geometry.ipynb +++ b/bindings/python/docs/Reference/Geometry.ipynb @@ -46,9 +46,9 @@ "Sphere = mathematics.geometry.d3.objects.Sphere\n", "Ellipsoid = mathematics.geometry.d3.objects.Ellipsoid\n", "Transformation3d = mathematics.geometry.d3.Transformation\n", - "Quaternion = mathematics.geometry.d3.transformations.rotations.Quaternion\n", - "RotationVector = mathematics.geometry.d3.transformations.rotations.RotationVector\n", - "RotationMatrix = mathematics.geometry.d3.transformations.rotations.RotationMatrix" + "Quaternion = mathematics.geometry.d3.transformation.rotation.Quaternion\n", + "RotationVector = mathematics.geometry.d3.transformation.rotation.RotationVector\n", + "RotationMatrix = mathematics.geometry.d3.transformation.rotation.RotationMatrix" ] }, { diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Composite.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Composite.cpp index 40743b6a..b7e03718 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Composite.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Composite.cpp @@ -28,7 +28,7 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Objects_Composite(pybind11 using ostk::math::geometry::d3::objects::Pyramid; using ostk::math::geometry::d3::objects::Composite; using ostk::math::geometry::d3::Intersection; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; class_(aModule, "Composite") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Cuboid.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Cuboid.cpp index c973dbf8..5fbf1839 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Cuboid.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Cuboid.cpp @@ -21,7 +21,7 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Objects_Cuboid(pybind11::m using ostk::math::geometry::d3::objects::Cuboid; using ostk::math::geometry::d3::objects::Pyramid; using ostk::math::geometry::d3::Intersection; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; // scope in_Cuboid = class_, bases>("Cuboid", no_init) class_(aModule, "Cuboid") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Ellipsoid.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Ellipsoid.cpp index 83a08f5a..9ee2bb31 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Ellipsoid.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Ellipsoid.cpp @@ -21,7 +21,7 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Objects_Ellipsoid(pybind11 using ostk::math::geometry::d3::objects::Pyramid; using ostk::math::geometry::d3::objects::Cone; using ostk::math::geometry::d3::Intersection; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; class_(aModule, "Ellipsoid") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Pyramid.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Pyramid.cpp index 68d4261f..0a507ed6 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Pyramid.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Pyramid.cpp @@ -23,7 +23,7 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Objects_Pyramid(pybind11:: using ostk::math::geometry::d3::objects::Ellipsoid; using ostk::math::geometry::d3::objects::Pyramid; using ostk::math::geometry::d3::Intersection; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; class_(aModule, "Pyramid") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation.cpp index 9928770a..af44b6b4 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation.cpp @@ -10,8 +10,8 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformation(pybind11::m using ostk::math::object::Matrix4d; using ostk::math::geometry::d3::objects::Point; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; - using ostk::math::geometry::d3::transformations::rotations::RotationMatrix; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationMatrix; class_ transformation(aModule, "Transformation"); diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations.cpp index fa5f641d..59652093 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations.cpp @@ -4,12 +4,12 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformations(pybind11::module& aModule) { - // Create "transformations" python submodule - auto transformations = aModule.def_submodule("transformations"); + // Create "transformation" python submodule + auto transformation = aModule.def_submodule("transformation"); - // Add __path__ attribute for "transformations" submodule - transformations.attr("__path__") = "ostk.mathematics.geometry.d3.transformations"; + // Add __path__ attribute for "transformation" submodule + transformation.attr("__path__") = "ostk.mathematics.geometry.d3.transformation"; - // Add objects to python "transformations" submodules - OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformations_Rotations(transformations); + // Add objects to python "transformation" submodules + OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformations_Rotations(transformation); } diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations.cpp index 1a5747d1..c0d39129 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations.cpp @@ -6,14 +6,14 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformations_Rotations(pybind11::module& aModule) { - // Create "rotations" python submodule - auto rotations = aModule.def_submodule("rotations"); + // Create "rotation" python submodule + auto rotation = aModule.def_submodule("rotation"); - // Add __path__ attribute for "rotations" submodule - rotations.attr("__path__") = "ostk.mathematics.geometry.d3.transformations.rotations"; + // Add __path__ attribute for "rotation" submodule + rotation.attr("__path__") = "ostk.mathematics.geometry.d3.transformation.rotation"; - // Add objects to python "rotations" submodules - OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformations_Rotations_Quaternion(rotations); - OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformations_Rotations_RotationVector(rotations); - OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformations_Rotations_RotationMatrix(rotations); + // Add objects to python "rotation" submodules + OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformations_Rotations_Quaternion(rotation); + OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformations_Rotations_RotationVector(rotation); + OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformations_Rotations_RotationMatrix(rotation); } diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations/Quaternion.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations/Quaternion.cpp index bdc05588..0b30a5a0 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations/Quaternion.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations/Quaternion.cpp @@ -5,7 +5,7 @@ #include using ostk::core::ctnr::Array; -using ostk::math::geometry::d3::transformations::rotations::Quaternion; +using ostk::math::geometry::d3::transformation::rotation::Quaternion; void set_quaternion_array(const Array& anArray) { @@ -21,7 +21,7 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformations_Rotations_ using ostk::math::object::Vector3d; using ostk::math::object::Vector4d; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; class_ quaternion(aModule, "Quaternion"); diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations/RotationMatrix.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations/RotationMatrix.cpp index c6709492..d478361e 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations/RotationMatrix.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations/RotationMatrix.cpp @@ -14,7 +14,7 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformations_Rotations_ using ostk::math::object::Vector3d; using ostk::math::object::Matrix3d; - using ostk::math::geometry::d3::transformations::rotations::RotationMatrix; + using ostk::math::geometry::d3::transformation::rotation::RotationMatrix; class_(aModule, "RotationMatrix") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations/RotationVector.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations/RotationVector.cpp index b4b1f380..7dd96cbe 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations/RotationVector.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformations/Rotations/RotationVector.cpp @@ -15,7 +15,7 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformations_Rotations_ using ostk::math::object::Vector3d; using ostk::math::geometry::Angle; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; class_(aModule, "RotationVector") diff --git a/bindings/python/test/geometry/d3/transformations/rotations/test_quaternion.py b/bindings/python/test/geometry/d3/transformations/rotations/test_quaternion.py index 9535dcf5..501b97ac 100644 --- a/bindings/python/test/geometry/d3/transformations/rotations/test_quaternion.py +++ b/bindings/python/test/geometry/d3/transformations/rotations/test_quaternion.py @@ -8,9 +8,9 @@ Angle = geometry.Angle -Quaternion = geometry.d3.transformations.rotations.Quaternion -RotationVector = geometry.d3.transformations.rotations.RotationVector -RotationMatrix = geometry.d3.transformations.rotations.RotationMatrix +Quaternion = geometry.d3.transformation.rotation.Quaternion +RotationVector = geometry.d3.transformation.rotation.RotationVector +RotationMatrix = geometry.d3.transformation.rotation.RotationMatrix @pytest.fixture diff --git a/bindings/python/test/geometry/d3/transformations/rotations/test_rotation_matrix.py b/bindings/python/test/geometry/d3/transformations/rotations/test_rotation_matrix.py index 4f2976fa..c7f3130f 100644 --- a/bindings/python/test/geometry/d3/transformations/rotations/test_rotation_matrix.py +++ b/bindings/python/test/geometry/d3/transformations/rotations/test_rotation_matrix.py @@ -4,8 +4,8 @@ Angle = geometry.Angle -Quaternion = geometry.d3.transformations.rotations.Quaternion -RotationMatrix = geometry.d3.transformations.rotations.RotationMatrix +Quaternion = geometry.d3.transformation.rotation.Quaternion +RotationMatrix = geometry.d3.transformation.rotation.RotationMatrix # isDefined diff --git a/bindings/python/test/geometry/d3/transformations/rotations/test_rotation_vector.py b/bindings/python/test/geometry/d3/transformations/rotations/test_rotation_vector.py index bf8ca18c..af9ea1ad 100644 --- a/bindings/python/test/geometry/d3/transformations/rotations/test_rotation_vector.py +++ b/bindings/python/test/geometry/d3/transformations/rotations/test_rotation_vector.py @@ -6,8 +6,8 @@ Angle = geometry.Angle -Quaternion = geometry.d3.transformations.rotations.Quaternion -RotationVector = geometry.d3.transformations.rotations.RotationVector +Quaternion = geometry.d3.transformation.rotation.Quaternion +RotationVector = geometry.d3.transformation.rotation.RotationVector def test_geometry_d3_transformations_rotations_rotation_vector(): diff --git a/bindings/python/test/test_objects.py b/bindings/python/test/test_objects.py index e381a2a2..aee5be0e 100644 --- a/bindings/python/test/test_objects.py +++ b/bindings/python/test/test_objects.py @@ -19,6 +19,6 @@ Sphere = mathematics.geometry.d3.objects.Sphere Ellipsoid = mathematics.geometry.d3.objects.Ellipsoid Transformation3d = mathematics.geometry.d3.Transformation -Quaternion = mathematics.geometry.d3.transformations.rotations.Quaternion -RotationVector = mathematics.geometry.d3.transformations.rotations.RotationVector -RotationMatrix = mathematics.geometry.d3.transformations.rotations.RotationMatrix +Quaternion = mathematics.geometry.d3.transformation.rotation.Quaternion +RotationVector = mathematics.geometry.d3.transformation.rotation.RotationVector +RotationMatrix = mathematics.geometry.d3.transformation.rotation.RotationMatrix diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ellipsoid.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ellipsoid.hpp index acf90e3b..bf510c53 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ellipsoid.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ellipsoid.hpp @@ -26,7 +26,7 @@ using ostk::math::object::Matrix3d; using ostk::math::geometry::d3::Object; using ostk::math::geometry::d3::objects::Point; using ostk::math::geometry::d3::Intersection; -using ostk::math::geometry::d3::transformations::rotations::Quaternion; +using ostk::math::geometry::d3::transformation::rotation::Quaternion; #define DEFAULT_ORIENTATION Quaternion::Unit() diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.hpp index 4dfb5b27..5338dfd1 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.hpp @@ -32,8 +32,8 @@ using ostk::math::object::Matrix4d; using ostk::math::geometry::Angle; using ostk::math::geometry::d3::Object; using ostk::math::geometry::d3::objects::Point; -using ostk::math::geometry::d3::transformations::rotations::RotationVector; -using ostk::math::geometry::d3::transformations::rotations::RotationMatrix; +using ostk::math::geometry::d3::transformation::rotation::RotationVector; +using ostk::math::geometry::d3::transformation::rotation::RotationMatrix; class Transformation { @@ -77,7 +77,7 @@ class Transformation /// @brief Returns true if transformation is rigid /// /// A rigid transformation preserves the Euclidean distance between every pair of points. - /// The rigid transformations include rotations, translations, reflections, or their + /// The rigid transformation include rotation, translations, reflections, or their /// combination. /// /// @ref https://en.wikipedia.org/wiki/Rigid_transformation diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/EulerAngle.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/EulerAngle.hpp index dd7c8244..099e7348 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/EulerAngle.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/EulerAngle.hpp @@ -11,13 +11,13 @@ namespace geometry { namespace d3 { -namespace transformations +namespace transformation { -namespace rotations +namespace rotation { } -} // namespace transformations +} // namespace transformation } // namespace d3 } // namespace geometry } // namespace math diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/Quaternion.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/Quaternion.hpp index ca20b2f4..73b8db2c 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/Quaternion.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/Quaternion.hpp @@ -18,9 +18,9 @@ namespace geometry { namespace d3 { -namespace transformations +namespace transformation { -namespace rotations +namespace rotation { using ostk::core::types::Integer; @@ -36,7 +36,7 @@ class RotationMatrix; /// @brief Quaternion /// -/// Provide a convenient mathematical notation for representing orientations and rotations +/// Provide a convenient mathematical notation for representing orientations and rotation /// of objects in three dimensions. Compared to Euler angles they are simpler to compose and /// avoid the problem of gimbal lock. Compared to rotation matrices they are more compact, /// more numerically stable, and more efficient. @@ -616,7 +616,7 @@ class Quaternion /// @param [in] aRotationVector A rotation vector /// @return Quaternion - static Quaternion RotationVector(const rotations::RotationVector& aRotationVector); + static Quaternion RotationVector(const rotation::RotationVector& aRotationVector); /// @brief Constructs a rquaternion from a rotation matrix /// @@ -627,7 +627,7 @@ class Quaternion /// @param [in] aRotationMatrix A rotation matrix /// @return Quaternion - static Quaternion RotationMatrix(const rotations::RotationMatrix& aRotationMatrix); + static Quaternion RotationMatrix(const rotation::RotationMatrix& aRotationMatrix); /// @brief Constructs a quaternion from a string /// @@ -713,8 +713,8 @@ class Quaternion Real s_; }; -} // namespace rotations -} // namespace transformations +} // namespace rotation +} // namespace transformation } // namespace d3 } // namespace geometry } // namespace math diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationMatrix.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationMatrix.hpp index a61ad74c..adb1a817 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationMatrix.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationMatrix.hpp @@ -18,9 +18,9 @@ namespace geometry { namespace d3 { -namespace transformations +namespace transformation { -namespace rotations +namespace rotation { using ostk::core::types::Index; @@ -302,7 +302,7 @@ class RotationMatrix /// @param [in] aQuaternion A quaternion /// @return Rotation matrix - static RotationMatrix Quaternion(const rotations::Quaternion& aQuaternion); + static RotationMatrix Quaternion(const rotation::Quaternion& aQuaternion); /// @brief Constructs a rotation matrix from a rotation vector /// @@ -314,7 +314,7 @@ class RotationMatrix /// @param [in] aRotationVector A rotation vector /// @return Rotation matrix - static RotationMatrix RotationVector(const rotations::RotationVector& aRotationVector); + static RotationMatrix RotationVector(const rotation::RotationVector& aRotationVector); private: Matrix3d matrix_; @@ -322,8 +322,8 @@ class RotationMatrix RotationMatrix(); }; -} // namespace rotations -} // namespace transformations +} // namespace rotation +} // namespace transformation } // namespace d3 } // namespace geometry } // namespace math diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationVector.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationVector.hpp index 8b024b5f..ef79ba65 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationVector.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationVector.hpp @@ -17,9 +17,9 @@ namespace geometry { namespace d3 { -namespace transformations +namespace transformation { -namespace rotations +namespace rotation { using ostk::core::types::Real; @@ -178,7 +178,7 @@ class RotationVector /// @param [in] aQuaternion A quaternion /// @return Rotation vector - static RotationVector Quaternion(const rotations::Quaternion& aQuaternion); + static RotationVector Quaternion(const rotation::Quaternion& aQuaternion); /// @brief Constructs a rotation vector from a rotation matrix /// @@ -189,7 +189,7 @@ class RotationVector /// @param [in] aRotationMatrix A rotation matrix /// @return Rotation vector - static RotationVector RotationMatrix(const rotations::RotationMatrix& aRotationMatrix); + static RotationVector RotationMatrix(const rotation::RotationMatrix& aRotationMatrix); private: Vector3d axis_; @@ -198,8 +198,8 @@ class RotationVector RotationVector(); }; -} // namespace rotations -} // namespace transformations +} // namespace rotation +} // namespace transformation } // namespace d3 } // namespace geometry } // namespace math diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Composite.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Composite.cpp index 643a6147..dce7a500 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Composite.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Composite.cpp @@ -434,7 +434,7 @@ void Composite::print(std::ostream& anOutputStream, bool displayDecorators) cons void Composite::applyTransformation(const Transformation& aTransformation) { - using ostk::math::geometry::d3::transformations::rotations::RotationMatrix; + using ostk::math::geometry::d3::transformation::rotation::RotationMatrix; if (!aTransformation.isDefined()) { diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cone.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cone.cpp index 9b50053a..9cb7932d 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cone.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cone.cpp @@ -242,8 +242,8 @@ Angle Cone::getAngle() const Array Cone::getRaysOfLateralSurface(const Size aRayCount) const { using ostk::math::object::Interval; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; if (aRayCount == 0) { diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cuboid.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cuboid.cpp index a3ef5238..5eb560ff 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cuboid.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cuboid.cpp @@ -452,7 +452,7 @@ void Cuboid::print(std::ostream& anOutputStream, bool displayDecorators) const void Cuboid::applyTransformation(const Transformation& aTransformation) { - using ostk::math::geometry::d3::transformations::rotations::RotationMatrix; + using ostk::math::geometry::d3::transformation::rotation::RotationMatrix; if (!aTransformation.isDefined()) { diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ellipsoid.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ellipsoid.cpp index 2930868c..31349f6d 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ellipsoid.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ellipsoid.cpp @@ -914,7 +914,7 @@ void Ellipsoid::print(std::ostream& anOutputStream, bool displayDecorators) cons void Ellipsoid::applyTransformation(const Transformation& aTransformation) { - using ostk::math::geometry::d3::transformations::rotations::RotationMatrix; + using ostk::math::geometry::d3::transformation::rotation::RotationMatrix; if (!aTransformation.isDefined()) { diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Pyramid.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Pyramid.cpp index 72ce76bb..dad015f0 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Pyramid.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Pyramid.cpp @@ -272,8 +272,8 @@ Polygon Pyramid::getLateralFaceAt(const Index aLateralFaceIndex) const Array Pyramid::getRaysOfLateralFaceAt(const Index aLateralFaceIndex, const Size aRayCount) const { using ostk::math::object::Interval; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; // if (aRayCount < 2) // { diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/Quaternion.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/Quaternion.cpp index 197c4aef..37cb9fec 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/Quaternion.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/Quaternion.cpp @@ -15,9 +15,9 @@ namespace geometry { namespace d3 { -namespace transformations +namespace transformation { -namespace rotations +namespace rotation { Quaternion::Quaternion( @@ -496,7 +496,7 @@ Quaternion Quaternion::XYZS( return {aFirstComponent, aSecondComponent, aThirdComponent, aFourthComponent, Quaternion::Format::XYZS}; } -Quaternion Quaternion::RotationVector(const rotations::RotationVector& aRotationVector) +Quaternion Quaternion::RotationVector(const rotation::RotationVector& aRotationVector) { /// @ref Markley F. L.: Fundamentals of Spacecraft Attitude Determination and Control, 45 @@ -508,7 +508,7 @@ Quaternion Quaternion::RotationVector(const rotations::RotationVector& aRotation return Quaternion(vectorPart, scalarPart).normalize(); } -Quaternion Quaternion::RotationMatrix(const rotations::RotationMatrix& aRotationMatrix) +Quaternion Quaternion::RotationMatrix(const rotation::RotationMatrix& aRotationMatrix) { /// @ref Markley F. L.: Fundamentals of Spacecraft Attitude Determination and Control, 48 /// @note Should we use this method instead? @@ -654,8 +654,8 @@ Quaternion Quaternion::SLERP( return (aFirstQuaternion * ((aFirstQuaternion.toInverse() * (-1.0) * aSecondQuaternion) ^ aRatio)).toNormalized(); } -} // namespace rotations -} // namespace transformations +} // namespace rotation +} // namespace transformation } // namespace d3 } // namespace geometry } // namespace math diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationMatrix.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationMatrix.cpp index 57d7b1ab..2e8c690f 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationMatrix.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationMatrix.cpp @@ -15,9 +15,9 @@ namespace geometry { namespace d3 { -namespace transformations +namespace transformation { -namespace rotations +namespace rotation { RotationMatrix::RotationMatrix(const Matrix3d& aMatrix) @@ -453,7 +453,7 @@ RotationMatrix RotationMatrix::Columns( return RotationMatrix(matrix); } -RotationMatrix RotationMatrix::Quaternion(const rotations::Quaternion& aQuaternion) +RotationMatrix RotationMatrix::Quaternion(const rotation::Quaternion& aQuaternion) { if (!aQuaternion.isDefined()) { @@ -465,7 +465,7 @@ RotationMatrix RotationMatrix::Quaternion(const rotations::Quaternion& aQuaterni throw ostk::core::error::RuntimeError("Quaternion is not unitary."); } - if (aQuaternion == rotations::Quaternion::Unit()) + if (aQuaternion == rotation::Quaternion::Unit()) { return RotationMatrix::Unit(); } @@ -494,7 +494,7 @@ RotationMatrix RotationMatrix::Quaternion(const rotations::Quaternion& aQuaterni return RotationMatrix(matrix); } -RotationMatrix RotationMatrix::RotationVector(const rotations::RotationVector& aRotationVector) +RotationMatrix RotationMatrix::RotationVector(const rotation::RotationVector& aRotationVector) { if (!aRotationVector.isDefined()) { @@ -533,8 +533,8 @@ RotationMatrix::RotationMatrix() { } -} // namespace rotations -} // namespace transformations +} // namespace rotation +} // namespace transformation } // namespace d3 } // namespace geometry } // namespace math diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationVector.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationVector.cpp index f9ebe76e..774f199e 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationVector.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationVector.cpp @@ -15,9 +15,9 @@ namespace geometry { namespace d3 { -namespace transformations +namespace transformation { -namespace rotations +namespace rotation { RotationVector::RotationVector(const Vector3d& anAxis, const Angle& anAngle) @@ -142,7 +142,7 @@ RotationVector RotationVector::Z(const Angle& anAngle) return {Vector3d::Z(), anAngle}; } -RotationVector RotationVector::Quaternion(const rotations::Quaternion& aQuaternion) +RotationVector RotationVector::Quaternion(const rotation::Quaternion& aQuaternion) { if (!aQuaternion.isDefined()) { @@ -165,7 +165,7 @@ RotationVector RotationVector::Quaternion(const rotations::Quaternion& aQuaterni return RotationVector(axis, angle); } -RotationVector RotationVector::RotationMatrix(const rotations::RotationMatrix& aRotationMatrix) +RotationVector RotationVector::RotationMatrix(const rotation::RotationMatrix& aRotationMatrix) { if (!aRotationMatrix.isDefined()) { @@ -195,8 +195,8 @@ RotationVector::RotationVector() { } -} // namespace rotations -} // namespace transformations +} // namespace rotation +} // namespace transformation } // namespace d3 } // namespace geometry } // namespace math diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cone.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cone.test.cpp index ec05c606..5d435986 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cone.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cone.test.cpp @@ -514,7 +514,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Cone, ApplyTransformation) using ostk::math::geometry::d3::objects::Point; using ostk::math::geometry::d3::objects::Cone; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cuboid.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cuboid.test.cpp index 541ebd46..6400c6e0 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cuboid.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Cuboid.test.cpp @@ -1001,8 +1001,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Cuboid, ApplyTransformatio using ostk::math::geometry::d3::objects::Point; using ostk::math::geometry::d3::objects::Cuboid; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ellipsoid.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ellipsoid.test.cpp index 7792c18a..e11bcb57 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ellipsoid.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ellipsoid.test.cpp @@ -16,7 +16,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Ellipsoid, Constructor) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; using ostk::math::geometry::d3::objects::Ellipsoid; { @@ -42,8 +42,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Ellipsoid, EqualToOperator { using ostk::math::geometry::Angle; using ostk::math::geometry::d3::objects::Ellipsoid; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; { ASSERT_TRUE(Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0) == Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0)); @@ -88,8 +88,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Ellipsoid, NotEqualToOpera { using ostk::math::geometry::Angle; using ostk::math::geometry::d3::objects::Ellipsoid; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; { ASSERT_TRUE(Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0) != Ellipsoid({1.0, 2.0, 4.0}, 4.0, 5.0, 6.0)); @@ -842,8 +842,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Ellipsoid, GetFirstAxis) using ostk::math::object::Vector3d; using ostk::math::geometry::Angle; using ostk::math::geometry::d3::objects::Ellipsoid; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; { ASSERT_EQ(Vector3d(1.0, 0.0, 0.0), Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0).getFirstAxis()); @@ -871,8 +871,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Ellipsoid, GetSecondAxis) using ostk::math::object::Vector3d; using ostk::math::geometry::Angle; using ostk::math::geometry::d3::objects::Ellipsoid; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; { ASSERT_EQ(Vector3d(0.0, 1.0, 0.0), Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0).getSecondAxis()); @@ -900,8 +900,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Ellipsoid, GetThirdAxis) using ostk::math::object::Vector3d; using ostk::math::geometry::Angle; using ostk::math::geometry::d3::objects::Ellipsoid; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; { ASSERT_EQ(Vector3d(0.0, 0.0, 1.0), Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0).getThirdAxis()); @@ -924,7 +924,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Ellipsoid, GetThirdAxis) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Ellipsoid, GetOrientation) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; using ostk::math::geometry::d3::objects::Ellipsoid; { @@ -950,9 +950,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Ellipsoid, GetMatrix) using ostk::math::object::Matrix3d; using ostk::math::geometry::Angle; using ostk::math::geometry::d3::objects::Ellipsoid; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; - using ostk::math::geometry::d3::transformations::rotations::RotationMatrix; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationMatrix; { Matrix3d referenceEllipsoidMatrix; @@ -1561,8 +1561,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Ellipsoid, ApplyTransforma using ostk::math::geometry::Angle; using ostk::math::geometry::d3::objects::Ellipsoid; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Line.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Line.test.cpp index 838a0fde..69adc4d4 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Line.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Line.test.cpp @@ -433,7 +433,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Line, ApplyTransformation) using ostk::math::geometry::Angle; using ostk::math::geometry::d3::objects::Line; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/LineString.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/LineString.test.cpp index 6855a6c7..ed215d02 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/LineString.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/LineString.test.cpp @@ -292,7 +292,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_LineString, ApplyTransform using ostk::math::geometry::d3::objects::Point; using ostk::math::geometry::d3::objects::LineString; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Plane.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Plane.test.cpp index e8c28e68..900d5ad1 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Plane.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Plane.test.cpp @@ -581,7 +581,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Plane, ApplyTransformation using ostk::math::geometry::Angle; using ostk::math::geometry::d3::objects::Plane; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Point.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Point.test.cpp index 55dd85fe..c2d31018 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Point.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Point.test.cpp @@ -227,7 +227,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Point, ApplyTransformation using ostk::math::geometry::Angle; using ostk::math::geometry::d3::objects::Point; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/PointSet.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/PointSet.test.cpp index b5fd0e47..3c842d1d 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/PointSet.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/PointSet.test.cpp @@ -316,7 +316,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_PointSet, ApplyTransformat using ostk::math::geometry::d3::objects::Point; using ostk::math::geometry::d3::objects::PointSet; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Polygon.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Polygon.test.cpp index 6ff21e87..c6a37d79 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Polygon.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Polygon.test.cpp @@ -330,7 +330,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Polygon, ApplyTransformati using ostk::math::geometry::d3::objects::Point; using ostk::math::geometry::d3::objects::Polygon; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Pyramid.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Pyramid.test.cpp index 7e815aa9..434f9b91 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Pyramid.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Pyramid.test.cpp @@ -448,7 +448,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Pyramid, ApplyTransformati using ostk::math::geometry::d3::objects::Polygon; using ostk::math::geometry::d3::objects::Pyramid; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ray.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ray.test.cpp index 7056035e..c4fddcdd 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ray.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Ray.test.cpp @@ -428,7 +428,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Ray, ApplyTransformation) using ostk::math::geometry::Angle; using ostk::math::geometry::d3::objects::Ray; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Segment.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Segment.test.cpp index 48ebcb3e..b312d959 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Segment.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Segment.test.cpp @@ -470,7 +470,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Segment, ApplyTransformati using ostk::math::geometry::Angle; using ostk::math::geometry::d3::objects::Segment; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Sphere.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Sphere.test.cpp index 17773970..091b4139 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Sphere.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Objects/Sphere.test.cpp @@ -802,7 +802,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Objects_Sphere, ApplyTransformatio using ostk::math::geometry::Angle; using ostk::math::geometry::d3::objects::Sphere; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.test.cpp index e6919725..4cddd32d 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.test.cpp @@ -222,7 +222,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformation, RotationAround) using ostk::math::geometry::Angle; using ostk::math::geometry::d3::objects::Point; using ostk::math::geometry::d3::Transformation; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; { const Point rotationCenter = {0.0, 0.0, 0.0}; diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/Quaternion.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/Quaternion.test.cpp index 8c70ba33..c4bea412 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/Quaternion.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/Quaternion.test.cpp @@ -12,7 +12,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni { using ostk::math::object::Vector3d; using ostk::math::object::Vector4d; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_NO_THROW(Quaternion(0.0, 0.0, 0.0, 1.0, Quaternion::Format::XYZS)); @@ -41,7 +41,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, EqualToOperator) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_TRUE( @@ -120,7 +120,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, NotEqualToOperator) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_TRUE( @@ -199,7 +199,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, AdditionOperator) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ( @@ -216,7 +216,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, MultiplicationOperator_Quaternion) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(Quaternion::Unit(), Quaternion::Unit() * Quaternion::Unit()); @@ -231,7 +231,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, MultiplicationOperator_Vector3d) { using ostk::math::object::Vector3d; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(Vector3d::X(), Quaternion::Unit() * Vector3d::X()); @@ -247,7 +247,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni { using ostk::core::types::Real; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(Quaternion::Unit(), Quaternion::Unit() * 1.0); @@ -266,7 +266,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni // TEST (OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, DivisionOperator) // { -// using ostk::math::geometry::d3::transformations::rotations::Quaternion ; +// using ostk::math::geometry::d3::transformation::rotation::Quaternion ; // { @@ -281,7 +281,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni using ostk::core::types::Real; using ostk::math::geometry::Angle; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(Quaternion::Unit(), Quaternion::Unit() ^ 1.0); @@ -299,7 +299,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni // MultiplicationAssignmentOperator) // { -// using ostk::math::geometry::d3::transformations::rotations::Quaternion ; +// using ostk::math::geometry::d3::transformation::rotation::Quaternion ; // { @@ -312,7 +312,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni // TEST (OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, DivisionAssignmentOperator) // { -// using ostk::math::geometry::d3::transformations::rotations::Quaternion ; +// using ostk::math::geometry::d3::transformation::rotation::Quaternion ; // { @@ -324,7 +324,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, StreamOperator) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { testing::internal::CaptureStdout(); @@ -337,7 +337,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, IsDefined) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_TRUE(Quaternion::XYZS(1.0, 0.0, 0.0, 0.0).isDefined()); @@ -357,7 +357,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, IsUnitary) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_TRUE(Quaternion::XYZS(1.0, 0.0, 0.0, 0.0).isUnitary()); @@ -378,7 +378,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, IsNear) { using ostk::math::geometry::Angle; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_TRUE(Quaternion::XYZS(1.0, 0.0, 0.0, 0.0).isNear(Quaternion::XYZS(1.0, 0.0, 0.0, 0.0), Angle::Zero())); @@ -422,7 +422,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, X) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(1.0, Quaternion::XYZS(1.0, 2.0, 3.0, 4.0).x()); @@ -435,7 +435,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, Y) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(2.0, Quaternion::XYZS(1.0, 2.0, 3.0, 4.0).y()); @@ -448,7 +448,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, Z) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(3.0, Quaternion::XYZS(1.0, 2.0, 3.0, 4.0).z()); @@ -461,7 +461,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, S) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(4.0, Quaternion::XYZS(1.0, 2.0, 3.0, 4.0).s()); @@ -475,7 +475,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, GetVectorPart) { using ostk::math::object::Vector3d; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(Vector3d(1.0, 2.0, 3.0), Quaternion::XYZS(1.0, 2.0, 3.0, 4.0).getVectorPart()); @@ -488,7 +488,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, GetScalarPart) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(4.0, Quaternion::XYZS(1.0, 2.0, 3.0, 4.0).getScalarPart()); @@ -502,7 +502,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni // TEST (OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, ToNormalized) // { -// using ostk::math::geometry::d3::transformations::rotations::Quaternion ; +// using ostk::math::geometry::d3::transformation::rotation::Quaternion ; // { @@ -514,7 +514,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, ToConjugate) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(Quaternion::XYZS(-1.0, -2.0, -3.0, +4.0), Quaternion::XYZS(+1.0, +2.0, +3.0, +4.0).toConjugate()); @@ -532,7 +532,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni // TEST (OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, ToInverse) // { -// using ostk::math::geometry::d3::transformations::rotations::Quaternion ; +// using ostk::math::geometry::d3::transformation::rotation::Quaternion ; // { @@ -545,7 +545,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, Exp) { using ostk::math::geometry::Angle; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(Quaternion::Unit(), Quaternion::Unit().exp()); @@ -563,7 +563,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, Log) { using ostk::math::geometry::Angle; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(Quaternion({0.0, 0.0, 0.0}, 0.0), Quaternion::Unit().log()); @@ -583,7 +583,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni using ostk::core::types::Real; using ostk::math::geometry::Angle; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(Quaternion::Unit(), Quaternion::Unit().pow(1.0)); @@ -601,7 +601,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni // TEST (OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, Norm) // { -// using ostk::math::geometry::d3::transformations::rotations::Quaternion ; +// using ostk::math::geometry::d3::transformation::rotation::Quaternion ; // { @@ -614,7 +614,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni // TEST (OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, CrossMultiply) // { -// using ostk::math::geometry::d3::transformations::rotations::Quaternion ; +// using ostk::math::geometry::d3::transformation::rotation::Quaternion ; // { @@ -627,7 +627,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni // TEST (OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, DotMultiply) // { -// using ostk::math::geometry::d3::transformations::rotations::Quaternion ; +// using ostk::math::geometry::d3::transformation::rotation::Quaternion ; // { @@ -640,7 +640,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni // TEST (OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, RotateVector) // { -// using ostk::math::geometry::d3::transformations::rotations::Quaternion ; +// using ostk::math::geometry::d3::transformation::rotation::Quaternion ; // { @@ -653,7 +653,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, ToVector) { using ostk::math::object::Vector4d; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ( @@ -671,7 +671,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, ToString) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ("[0.0, 0.0, 0.0, 1.0]", Quaternion::XYZS(0.0, 0.0, 0.0, 1.0).toString(Quaternion::Format::XYZS)); @@ -702,7 +702,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni // TEST (OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, Normalize) // { -// using ostk::math::geometry::d3::transformations::rotations::Quaternion ; +// using ostk::math::geometry::d3::transformation::rotation::Quaternion ; // { @@ -715,7 +715,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni // TEST (OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, Conjugate) // { -// using ostk::math::geometry::d3::transformations::rotations::Quaternion ; +// using ostk::math::geometry::d3::transformation::rotation::Quaternion ; // { @@ -728,7 +728,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni // TEST (OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, Inverse) // { -// using ostk::math::geometry::d3::transformations::rotations::Quaternion ; +// using ostk::math::geometry::d3::transformation::rotation::Quaternion ; // { @@ -741,7 +741,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni // TEST (OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, Rectify) // { -// using ostk::math::geometry::d3::transformations::rotations::Quaternion ; +// using ostk::math::geometry::d3::transformation::rotation::Quaternion ; // { @@ -754,7 +754,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, AngularDifferenceWith) { using ostk::math::geometry::Angle; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_EQ(Angle::Zero(), Quaternion::Unit().angularDifferenceWith(Quaternion::Unit())); @@ -781,7 +781,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, Undefined) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_NO_THROW(Quaternion::Undefined()); @@ -791,7 +791,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, Unit) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_NO_THROW(Quaternion::Unit()); @@ -801,7 +801,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, XYZS) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_NO_THROW(Quaternion::XYZS(0.0, 0.0, 0.0, 1.0)); @@ -814,8 +814,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni using ostk::core::types::Real; using ostk::math::geometry::Angle; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_TRUE(Quaternion(0.0, 0.0, 0.0, 1.0, Quaternion::Format::XYZS) @@ -841,9 +841,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni using ostk::math::object::Vector3d; using ostk::math::geometry::Angle; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; - using ostk::math::geometry::d3::transformations::rotations::RotationMatrix; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::RotationMatrix; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_TRUE(Quaternion(0.0, 0.0, 0.0, 1.0, Quaternion::Format::XYZS) @@ -889,7 +889,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaternion, Parse) { - using ostk::math::geometry::d3::transformations::rotations::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; { EXPECT_NO_THROW(Quaternion::Parse("[0.0, 0.0, 0.0, 1.0]", Quaternion::Format::XYZS)); @@ -915,8 +915,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni { using ostk::math::object::Vector3d; using ostk::math::geometry::Angle; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; { EXPECT_TRUE(Quaternion::ShortestRotation({1.0, 0.0, 0.0}, {1.0, 0.0, 0.0}) @@ -948,8 +948,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni using ostk::core::types::Real; using ostk::math::geometry::Angle; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; { EXPECT_TRUE(Quaternion::LERP(Quaternion::XYZS(0.0, 0.0, 0.0, 1.0), Quaternion::XYZS(0.0, 0.0, 1.0, 0.0), 0.0) @@ -973,8 +973,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni using ostk::core::types::Real; using ostk::math::geometry::Angle; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; { EXPECT_TRUE(Quaternion::NLERP(Quaternion::XYZS(0.0, 0.0, 0.0, 1.0), Quaternion::XYZS(0.0, 0.0, 1.0, 0.0), 0.0) @@ -1008,8 +1008,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Quaterni using ostk::core::types::Real; using ostk::math::geometry::Angle; - using ostk::math::geometry::d3::transformations::rotations::Quaternion; - using ostk::math::geometry::d3::transformations::rotations::RotationVector; + using ostk::math::geometry::d3::transformation::rotation::Quaternion; + using ostk::math::geometry::d3::transformation::rotation::RotationVector; { EXPECT_TRUE(Quaternion::SLERP(Quaternion::XYZS(0.0, 0.0, 0.0, 1.0), Quaternion::XYZS(0.0, 0.0, 1.0, 0.0), 0.0) diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationMatrix.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationMatrix.test.cpp index 53d0906c..ba8850da 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationMatrix.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationMatrix.test.cpp @@ -10,7 +10,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_RotationMatrix, Constructor) { using ostk::math::geometry::Angle; - using ostk::math::geometry::d3::transformations::rotations::RotationMatrix; + using ostk::math::geometry::d3::transformation::rotation::RotationMatrix; // { @@ -38,7 +38,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Rotation // { // using ostk::math::geometry::Angle ; -// using ostk::math::geometry::d3::transformations::rotations::RotationMatrix ; +// using ostk::math::geometry::d3::transformation::rotation::RotationMatrix ; // { @@ -81,7 +81,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Rotation // { // using ostk::math::geometry::Angle ; -// using ostk::math::geometry::d3::transformations::rotations::RotationMatrix ; +// using ostk::math::geometry::d3::transformation::rotation::RotationMatrix ; // { @@ -124,7 +124,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Rotation // { // using ostk::math::geometry::Angle ; -// using ostk::math::geometry::d3::transformations::rotations::RotationMatrix ; +// using ostk::math::geometry::d3::transformation::rotation::RotationMatrix ; // { @@ -143,7 +143,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Rotation // using ostk::math::object::Vector3d ; // using ostk::math::geometry::Angle ; -// using ostk::math::geometry::d3::transformations::rotations::RotationMatrix ; +// using ostk::math::geometry::d3::transformation::rotation::RotationMatrix ; // { @@ -166,7 +166,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Rotation // using ostk::math::object::Vector3d ; // using ostk::math::geometry::Angle ; -// using ostk::math::geometry::d3::transformations::rotations::RotationMatrix ; +// using ostk::math::geometry::d3::transformation::rotation::RotationMatrix ; // { @@ -188,7 +188,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Rotation // { // using ostk::math::geometry::Angle ; -// using ostk::math::geometry::d3::transformations::rotations::RotationMatrix ; +// using ostk::math::geometry::d3::transformation::rotation::RotationMatrix ; // { @@ -216,7 +216,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Rotation // TEST (OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_RotationMatrix, Undefined) // { -// using ostk::math::geometry::d3::transformations::rotations::RotationMatrix ; +// using ostk::math::geometry::d3::transformation::rotation::RotationMatrix ; // { @@ -231,7 +231,7 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Rotation // { // using ostk::math::geometry::Angle ; -// using ostk::math::geometry::d3::transformations::rotations::RotationMatrix ; +// using ostk::math::geometry::d3::transformation::rotation::RotationMatrix ; // { @@ -251,8 +251,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformations_Rotations_Rotation // using ostk::core::types::Real ; // using ostk::math::geometry::Angle ; -// using ostk::math::geometry::d3::transformations::rotations::Quaternion ; -// using ostk::math::geometry::d3::transformations::rotations::RotationMatrix ; +// using ostk::math::geometry::d3::transformation::rotation::Quaternion ; +// using ostk::math::geometry::d3::transformation::rotation::RotationMatrix ; // { diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationVector.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationVector.test.cpp index 78aadb23..ad4806d0 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationVector.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationVector.test.cpp @@ -7,8 +7,8 @@ #include using ostk::math::geometry::Angle; -using ostk::math::geometry::d3::transformations::rotations::Quaternion; -using ostk::math::geometry::d3::transformations::rotations::RotationVector; +using ostk::math::geometry::d3::transformation::rotation::Quaternion; +using ostk::math::geometry::d3::transformation::rotation::RotationVector; using ostk::math::object::Vector3d; using ostk::core::types::Real;