From 08ab617e7c19765171641d7501c858b0819a1826 Mon Sep 17 00:00:00 2001 From: Vishwa Shah Date: Mon, 5 Aug 2024 16:42:03 +0000 Subject: [PATCH] chore: update clang format settings --- .../Geometry/2D/Intersection.cpp | 12 +- .../Geometry/2D/Object/Composite.cpp | 12 +- .../Geometry/2D/Object/Line.cpp | 4 +- .../Geometry/2D/Object/LineString.cpp | 4 +- .../Geometry/2D/Object/MultiPolygon.cpp | 6 +- .../Geometry/2D/Object/Point.cpp | 2 +- .../Geometry/2D/Object/PointSet.cpp | 2 +- .../Geometry/2D/Object/Polygon.cpp | 4 +- .../Geometry/2D/Transformation.cpp | 6 +- .../Geometry/3D/Intersection.cpp | 20 +- .../Geometry/3D/Object.cpp | 12 +- .../Geometry/3D/Object/Composite.cpp | 24 +-- .../Geometry/3D/Object/Cone.cpp | 17 +- .../Geometry/3D/Object/Cuboid.cpp | 12 +- .../Geometry/3D/Object/Ellipsoid.cpp | 12 +- .../Geometry/3D/Object/Line.cpp | 10 +- .../Geometry/3D/Object/LineString.cpp | 2 +- .../Geometry/3D/Object/Plane.cpp | 8 +- .../Geometry/3D/Object/Point.cpp | 4 +- .../Geometry/3D/Object/Pyramid.cpp | 15 +- .../Geometry/3D/Object/Ray.cpp | 8 +- .../Geometry/3D/Object/Segment.cpp | 6 +- .../Geometry/3D/Object/Sphere.cpp | 10 +- .../Geometry/3D/Transformation.cpp | 6 +- .../3D/Transformation/Rotation/EulerAngle.cpp | 2 +- .../3D/Transformation/Rotation/Quaternion.cpp | 2 +- .../Rotation/RotationVector.cpp | 2 +- .../Geometry/Angle.cpp | 2 +- .../Mathematics/CurveFitting/Interpolator.hpp | 2 +- .../Mathematics/Geometry/2D/Intersection.hpp | 4 +- .../Geometry/2D/Object/Composite.hpp | 4 +- .../Mathematics/Geometry/2D/Object/Line.hpp | 2 +- .../Geometry/2D/Object/LineString.hpp | 4 +- .../Geometry/2D/Object/MultiLineString.hpp | 6 +- .../Geometry/2D/Object/MultiPolygon.hpp | 6 +- .../Mathematics/Geometry/2D/Object/Point.hpp | 2 +- .../Geometry/2D/Object/PointSet.hpp | 4 +- .../Geometry/2D/Object/Polygon.hpp | 8 +- .../Geometry/2D/Object/Segment.hpp | 2 +- .../Geometry/2D/Transformation.hpp | 8 +- .../Mathematics/Geometry/3D/Intersection.hpp | 4 +- .../Geometry/3D/Object/Composite.hpp | 4 +- .../Mathematics/Geometry/3D/Object/Cone.hpp | 6 +- .../Mathematics/Geometry/3D/Object/Cuboid.hpp | 6 +- .../Geometry/3D/Object/Ellipsoid.hpp | 4 +- .../Mathematics/Geometry/3D/Object/Line.hpp | 2 +- .../Geometry/3D/Object/LineString.hpp | 4 +- .../Mathematics/Geometry/3D/Object/Plane.hpp | 4 +- .../Mathematics/Geometry/3D/Object/Point.hpp | 2 +- .../Geometry/3D/Object/PointSet.hpp | 4 +- .../Geometry/3D/Object/Polygon.hpp | 6 +- .../Geometry/3D/Object/Pyramid.hpp | 6 +- .../Mathematics/Geometry/3D/Object/Ray.hpp | 2 +- .../Geometry/3D/Object/Segment.hpp | 2 +- .../Geometry/3D/Transformation.hpp | 10 +- .../3D/Transformation/Rotation/Quaternion.hpp | 2 +- .../Rotation/RotationMatrix.hpp | 2 +- .../Rotation/RotationVector.hpp | 2 +- .../Mathematics/Geometry/2D/Object.cpp | 6 +- .../Geometry/2D/Object/MultiPolygon.cpp | 4 +- .../Geometry/2D/Transformation.cpp | 2 +- .../Mathematics/Geometry/3D/Object.cpp | 72 +++---- .../Mathematics/Geometry/3D/Object/Cone.cpp | 2 +- .../Geometry/3D/Object/Pyramid.cpp | 2 +- .../Geometry/3D/Transformation.cpp | 2 +- .../Geometry/2D/Object/Composite.test.cpp | 50 ++--- .../Geometry/2D/Object/Line.test.cpp | 20 +- .../Geometry/2D/Object/LineString.test.cpp | 16 +- .../Geometry/2D/Object/MultiPolygon.test.cpp | 4 +- .../Geometry/2D/Object/Point.test.cpp | 10 +- .../Geometry/2D/Object/PointSet.test.cpp | 2 +- .../Geometry/2D/Object/Polygon.test.cpp | 18 +- .../Geometry/2D/Object/Segment.test.cpp | 4 +- .../Geometry/3D/Object/Composite.test.cpp | 178 +++++++++--------- .../Geometry/3D/Object/Cone.test.cpp | 82 ++++---- .../Geometry/3D/Object/Cuboid.test.cpp | 92 ++++----- .../Geometry/3D/Object/Ellipsoid.test.cpp | 56 +++--- .../Geometry/3D/Object/Line.test.cpp | 26 +-- .../Geometry/3D/Object/LineString.test.cpp | 10 +- .../Geometry/3D/Object/Plane.test.cpp | 36 ++-- .../Geometry/3D/Object/Point.test.cpp | 12 +- .../Geometry/3D/Object/PointSet.test.cpp | 2 +- .../Geometry/3D/Object/Polygon.test.cpp | 2 +- .../Geometry/3D/Object/Pyramid.test.cpp | 38 ++-- .../Geometry/3D/Object/Ray.test.cpp | 14 +- .../Geometry/3D/Object/Segment.test.cpp | 12 +- .../Geometry/3D/Object/Sphere.test.cpp | 8 +- .../Rotations/EulerAngle.test.cpp | 8 +- .../Rotations/Quaternion.test.cpp | 10 +- .../Rotations/RotationMatrix.test.cpp | 12 +- .../Rotations/RotationVector.test.cpp | 10 +- .../Mathematics/Object/Interval.test.cpp | 12 +- thirdparty/clang/.clang-format | 2 +- 93 files changed, 592 insertions(+), 594 deletions(-) diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Intersection.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Intersection.cpp index b224e7fd..491b9122 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Intersection.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Intersection.cpp @@ -6,18 +6,18 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Intersection(pybind11::mod { using namespace pybind11; - using ostk::core::type::Unique; using ostk::core::container::Array; + using ostk::core::type::Unique; + using ostk::mathematics::geometry::d2::Intersection; using ostk::mathematics::geometry::d2::Object; - using ostk::mathematics::geometry::d2::object::Point; - using ostk::mathematics::geometry::d2::object::PointSet; + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::Line; - using ostk::mathematics::geometry::d2::object::Segment; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::geometry::d2::object::PointSet; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; - using ostk::mathematics::geometry::d2::Intersection; + using ostk::mathematics::geometry::d2::object::Segment; class_ intersection(aModule, "Intersection"); diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Composite.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Composite.cpp index 3b5f8863..1ec5b2a3 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Composite.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Composite.cpp @@ -9,18 +9,18 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Object_Composite(pybind11: { using namespace pybind11; - using ostk::core::type::Shared; using ostk::core::type::Real; + using ostk::core::type::Shared; + using ostk::mathematics::geometry::d2::Intersection; using ostk::mathematics::geometry::d2::Object; - using ostk::mathematics::geometry::d2::object::Point; - using ostk::mathematics::geometry::d2::object::PointSet; + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::Line; - using ostk::mathematics::geometry::d2::object::Segment; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::geometry::d2::object::PointSet; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; - using ostk::mathematics::geometry::d2::Intersection; + using ostk::mathematics::geometry::d2::object::Segment; class_(aModule, "Composite") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Line.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Line.cpp index c5a4ce02..f5abaebf 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Line.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Line.cpp @@ -8,11 +8,11 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Object_Line(pybind11::modu using ostk::core::type::Real; - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::Object; + using ostk::mathematics::geometry::d2::object::Line; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::PointSet; - using ostk::mathematics::geometry::d2::object::Line; + using ostk::mathematics::object::Vector2d; class_(aModule, "Line") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/LineString.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/LineString.cpp index fec7b5bf..863249a1 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/LineString.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/LineString.cpp @@ -6,12 +6,12 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Object_LineString(pybind11 { using namespace pybind11; - using ostk::core::type::Integer; using ostk::core::container::Array; + using ostk::core::type::Integer; using ostk::mathematics::geometry::d2::Object; - using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Point; class_(aModule, "LineString") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/MultiPolygon.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/MultiPolygon.cpp index 8b4d0e02..4f700e06 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/MultiPolygon.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/MultiPolygon.cpp @@ -6,15 +6,15 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Object_MultiPolygon(pybind { using namespace pybind11; - using ostk::core::type::Integer; using ostk::core::container::Array; + using ostk::core::type::Integer; - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::Object; + using ostk::mathematics::geometry::d2::object::MultiPolygon; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::PointSet; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::MultiPolygon; + using ostk::mathematics::object::Vector2d; class_(aModule, "MultiPolygon") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Point.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Point.cpp index cbc8c881..08a5f28f 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Point.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Point.cpp @@ -23,9 +23,9 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Object_Point(pybind11::mod using ostk::core::type::Integer; using ostk::core::type::Real; - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::Object; using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::object::Vector2d; class_(aModule, "Point") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/PointSet.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/PointSet.cpp index 44d24666..d3cedec1 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/PointSet.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/PointSet.cpp @@ -6,8 +6,8 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Object_PointSet(pybind11:: { using namespace pybind11; - using ostk::core::type::Integer; using ostk::core::container::Array; + using ostk::core::type::Integer; using ostk::mathematics::geometry::d2::Object; using ostk::mathematics::geometry::d2::object::Point; diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Polygon.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Polygon.cpp index 1c5498a3..426e834f 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Polygon.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object/Polygon.cpp @@ -6,14 +6,14 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Object_Polygon(pybind11::m { using namespace pybind11; - using ostk::core::type::Integer; using ostk::core::container::Array; + using ostk::core::type::Integer; - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::Object; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::PointSet; using ostk::mathematics::geometry::d2::object::Polygon; + using ostk::mathematics::object::Vector2d; class_(aModule, "Polygon") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Transformation.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Transformation.cpp index f77c0abf..606f9af6 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Transformation.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Transformation.cpp @@ -6,10 +6,10 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Transformation(pybind11::m { using namespace pybind11; - using ostk::mathematics::object::Vector2d; - using ostk::mathematics::object::Matrix3d; - using ostk::mathematics::geometry::d2::Transformation; using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::geometry::d2::Transformation; + using ostk::mathematics::object::Matrix3d; + using ostk::mathematics::object::Vector2d; class_ transf(aModule, "Transformation"); diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Intersection.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Intersection.cpp index 37065dd1..c7ee5a82 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Intersection.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Intersection.cpp @@ -6,24 +6,24 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Intersection(pybind11::mod { using namespace pybind11; - using ostk::core::type::Unique; using ostk::core::container::Array; + using ostk::core::type::Unique; + using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::LineString; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Polygon; + using ostk::mathematics::geometry::d3::object::Pyramid; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::LineString; - using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::object::Cuboid; - using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; - using ostk::mathematics::geometry::d3::Intersection; // scope in_Intersection = class_("Intersection", init>>()) class_ intersection(aModule, "Intersection"); diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object.cpp index 4f006383..f4d3b324 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object.cpp @@ -22,17 +22,17 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Object(pybind11::module& a using namespace pybind11; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::LineString; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Polygon; + using ostk::mathematics::geometry::d3::object::Pyramid; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::LineString; - using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::object::Pyramid; // class_("Object", no_init) class_(aModule, "Object") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Composite.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Composite.cpp index 6d6f9227..74cd3302 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Composite.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Composite.cpp @@ -10,27 +10,27 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Object_Composite(pybind11: { using namespace pybind11; - using ostk::core::type::Shared; using ostk::core::type::Real; + using ostk::core::type::Shared; - using ostk::mathematics::object::Vector3d; + using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::LineString; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Polygon; + using ostk::mathematics::geometry::d3::object::Pyramid; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::LineString; - using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::object::Cuboid; - using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Cone; - using ostk::mathematics::geometry::d3::object::Composite; - using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; + using ostk::mathematics::object::Vector3d; class_(aModule, "Composite") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Cone.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Cone.cpp index 2da82dad..875dda8f 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Cone.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Cone.cpp @@ -7,24 +7,23 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Object_Cone(pybind11::modu { using namespace pybind11; - using ostk::core::type::Size; using ostk::core::type::Real; + using ostk::core::type::Size; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; + using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::Ray; - using ostk::mathematics::geometry::d3::object::Plane; - using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::object::Cone; - using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::object::Vector3d; class_(aModule, "Cone") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Cuboid.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Cuboid.cpp index 7b1791ba..b85f3864 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Cuboid.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Cuboid.cpp @@ -9,19 +9,19 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Object_Cuboid(pybind11::mo using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; + using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Pyramid; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Cuboid; - using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; + using ostk::mathematics::object::Vector3d; // scope in_Cuboid = class_, bases>("Cuboid", no_init) class_(aModule, "Cuboid") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Ellipsoid.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Ellipsoid.cpp index 7ae96a64..94768e7e 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Ellipsoid.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Ellipsoid.cpp @@ -9,18 +9,18 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Object_Ellipsoid(pybind11: using ostk::core::type::Real; + using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Pyramid; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Cone; - using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; class_(aModule, "Ellipsoid") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Line.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Line.cpp index 702925be..703ad685 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Line.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Line.cpp @@ -8,15 +8,15 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Object_Line(pybind11::modu using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; + using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; - using ostk::mathematics::geometry::d3::object::Point; - using ostk::mathematics::geometry::d3::object::PointSet; + using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::object::Line; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::geometry::d3::object::PointSet; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::object::Vector3d; class_(aModule, "Line") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/LineString.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/LineString.cpp index d05fadce..bc29f7e7 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/LineString.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/LineString.cpp @@ -9,8 +9,8 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Object_LineString(pybind11 using ostk::core::container::Array; using ostk::mathematics::geometry::d3::Object; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::LineString; + using ostk::mathematics::geometry::d3::object::Point; class_(aModule, "LineString") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Plane.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Plane.cpp index ebb0e81b..58624a98 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Plane.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Plane.cpp @@ -6,15 +6,15 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Object_Plane(pybind11::mod { using namespace pybind11; - using ostk::mathematics::object::Vector3d; + using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Plane; - using ostk::mathematics::geometry::d3::object::Line; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::object::Vector3d; class_(aModule, "Plane") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Point.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Point.cpp index 0a73423e..46a8766b 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Point.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Point.cpp @@ -15,13 +15,13 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Object_Point(pybind11::mod { using namespace pybind11; - using ostk::core::type::Shared; using ostk::core::type::Integer; using ostk::core::type::Real; + using ostk::core::type::Shared; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; class_(aModule, "Point") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Pyramid.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Pyramid.cpp index 0f675878..da964b1a 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Pyramid.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Pyramid.cpp @@ -7,22 +7,21 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Object_Pyramid(pybind11::m { using namespace pybind11; - using ostk::core::type::Size; using ostk::core::type::Real; + using ostk::core::type::Size; + using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Polygon; + using ostk::mathematics::geometry::d3::object::Pyramid; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::Plane; - using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; class_(aModule, "Pyramid") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Ray.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Ray.cpp index 72c4f25c..984f33eb 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Ray.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Ray.cpp @@ -6,15 +6,15 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Object_Ray(pybind11::modul { using namespace pybind11; - using ostk::mathematics::object::Vector3d; + using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; using ostk::mathematics::geometry::d3::object::Ray; - using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::object::Vector3d; class_(aModule, "Ray") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Segment.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Segment.cpp index 72385bb8..378642c7 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Segment.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Segment.cpp @@ -6,14 +6,14 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Object_Segment(pybind11::m { using namespace pybind11; + using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::Intersection; class_(aModule, "Segment") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Sphere.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Sphere.cpp index d2291edd..28e3cb9b 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Sphere.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object/Sphere.cpp @@ -8,17 +8,17 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Object_Sphere(pybind11::mo using ostk::core::type::Real; + using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Pyramid; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::Intersection; class_(aModule, "Sphere") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation.cpp index e6e3f521..dc30feb9 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation.cpp @@ -8,12 +8,12 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformation(pybind11::m { using namespace pybind11; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::object::Matrix4d; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::Transformation; - using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; using ostk::mathematics::geometry::d3::transformation::rotation::RotationMatrix; + using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Matrix4d; + using ostk::mathematics::object::Vector3d; class_ transformation(aModule, "Transformation"); diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation/Rotation/EulerAngle.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation/Rotation/EulerAngle.cpp index 6d7b3722..f007f258 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation/Rotation/EulerAngle.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation/Rotation/EulerAngle.cpp @@ -12,9 +12,9 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformation_Rotation_Eu using ostk::core::type::Real; using ostk::core::type::String; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::transformation::rotation::EulerAngle; + using ostk::mathematics::object::Vector3d; class_ eulerAngle(aModule, "EulerAngle"); diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation/Rotation/Quaternion.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation/Rotation/Quaternion.cpp index 206b3c39..5dcf6379 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation/Rotation/Quaternion.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation/Rotation/Quaternion.cpp @@ -19,9 +19,9 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformation_Rotation_Qu using ostk::core::type::Real; using ostk::core::type::String; + using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; using ostk::mathematics::object::Vector3d; using ostk::mathematics::object::Vector4d; - using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; class_ quaternion(aModule, "Quaternion"); diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation/Rotation/RotationVector.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation/Rotation/RotationVector.cpp index da4bdc70..8fee6658 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation/Rotation/RotationVector.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Transformation/Rotation/RotationVector.cpp @@ -12,9 +12,9 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Transformation_Rotation_Ro using ostk::core::type::Real; using ostk::core::type::String; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; class_(aModule, "RotationVector") diff --git a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/Angle.cpp b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/Angle.cpp index eed7ba22..65f7b394 100644 --- a/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/Angle.cpp +++ b/bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/Angle.cpp @@ -9,9 +9,9 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_Angle(pybind11::module& aModu using ostk::core::type::Real; using ostk::core::type::String; + using ostk::mathematics::geometry::Angle; using ostk::mathematics::object::Vector2d; using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::Angle; class_ angle(aModule, "Angle"); diff --git a/include/OpenSpaceToolkit/Mathematics/CurveFitting/Interpolator.hpp b/include/OpenSpaceToolkit/Mathematics/CurveFitting/Interpolator.hpp index 26d1b7aa..c5dc23fa 100644 --- a/include/OpenSpaceToolkit/Mathematics/CurveFitting/Interpolator.hpp +++ b/include/OpenSpaceToolkit/Mathematics/CurveFitting/Interpolator.hpp @@ -17,8 +17,8 @@ namespace curvefitting { using ostk::core::type::Real; -using ostk::core::type::Size; using ostk::core::type::Shared; +using ostk::core::type::Size; using ostk::mathematics::object::VectorXd; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Intersection.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Intersection.hpp index 3af3c32a..49d90c8f 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Intersection.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Intersection.hpp @@ -27,10 +27,10 @@ namespace geometry namespace d2 { -using ostk::core::type::Unique; +using ostk::core::container::Array; using ostk::core::type::Index; using ostk::core::type::Size; -using ostk::core::container::Array; +using ostk::core::type::Unique; using ostk::mathematics::geometry::d2::Object; using ostk::mathematics::geometry::d2::object::Composite; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Composite.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Composite.hpp index 1aa1b79a..a3c2f725 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Composite.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Composite.hpp @@ -22,10 +22,10 @@ namespace d2 namespace object { -using ostk::core::type::Unique; +using ostk::core::container::Array; using ostk::core::type::Index; using ostk::core::type::Size; -using ostk::core::container::Array; +using ostk::core::type::Unique; using ostk::mathematics::geometry::d2::Object; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Line.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Line.hpp index 4362ce3e..3698bf97 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Line.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Line.hpp @@ -22,9 +22,9 @@ namespace object using ostk::core::type::Real; -using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::Object; using ostk::mathematics::geometry::d2::object::Point; +using ostk::mathematics::object::Vector2d; class PointSet; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/LineString.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/LineString.hpp index 9cc67136..59ed6f0c 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/LineString.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/LineString.hpp @@ -21,13 +21,13 @@ namespace d2 namespace object { +using ostk::core::container::Array; using ostk::core::type::Index; using ostk::core::type::Size; -using ostk::core::container::Array; -using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::Object; using ostk::mathematics::geometry::d2::object::Point; +using ostk::mathematics::object::Vector2d; class Segment; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiLineString.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiLineString.hpp index 63730b2f..ae91e00d 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiLineString.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiLineString.hpp @@ -24,14 +24,14 @@ namespace d2 namespace object { +using ostk::core::container::Array; using ostk::core::type::Index; using ostk::core::type::Size; -using ostk::core::container::Array; -using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::Object; -using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::LineString; +using ostk::mathematics::geometry::d2::object::Point; +using ostk::mathematics::object::Vector2d; /// @brief Multi Line string diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiPolygon.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiPolygon.hpp index 002f2607..d6274a4d 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiPolygon.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiPolygon.hpp @@ -26,15 +26,15 @@ namespace d2 namespace object { -using ostk::core::type::Unique; +using ostk::core::container::Array; using ostk::core::container::Index; using ostk::core::container::Size; -using ostk::core::container::Array; +using ostk::core::type::Unique; using ostk::mathematics::geometry::d2::Object; +using ostk::mathematics::geometry::d2::object::LineString; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Segment; -using ostk::mathematics::geometry::d2::object::LineString; using Polygon2d = ostk::mathematics::geometry::d2::object::Polygon; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Point.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Point.hpp index 995e7e78..6f9f1e33 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Point.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Point.hpp @@ -21,8 +21,8 @@ namespace object using ostk::core::type::Real; -using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::Object; +using ostk::mathematics::object::Vector2d; /// @brief Point /// diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/PointSet.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/PointSet.hpp index fb06bf12..76756fe1 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/PointSet.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/PointSet.hpp @@ -23,13 +23,13 @@ namespace d2 namespace object { +using ostk::core::container::Array; using ostk::core::type::Index; using ostk::core::type::Size; -using ostk::core::container::Array; -using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::Object; using ostk::mathematics::geometry::d2::object::Point; +using ostk::mathematics::object::Vector2d; /// @brief Point set diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Polygon.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Polygon.hpp index b49ab2d6..1c83c07a 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Polygon.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Polygon.hpp @@ -27,16 +27,16 @@ namespace object class MultiPolygon; -using ostk::core::type::Unique; +using ostk::core::container::Array; using ostk::core::container::Index; using ostk::core::container::Size; -using ostk::core::container::Array; +using ostk::core::type::Unique; +using ostk::mathematics::geometry::d2::Intersection; using ostk::mathematics::geometry::d2::Object; +using ostk::mathematics::geometry::d2::object::LineString; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Segment; -using ostk::mathematics::geometry::d2::object::LineString; -using ostk::mathematics::geometry::d2::Intersection; /// @brief Polygon /// diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Segment.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Segment.hpp index 0e2adf9f..c357ae14 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Segment.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Segment.hpp @@ -23,8 +23,8 @@ namespace object using ostk::core::type::Real; using ostk::mathematics::geometry::d2::Object; -using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Line; +using ostk::mathematics::geometry::d2::object::Point; class PointSet; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Transformation.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Transformation.hpp index 1ff86b9b..334d2723 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Transformation.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/2D/Transformation.hpp @@ -20,15 +20,15 @@ namespace geometry namespace d2 { -using ostk::core::type::Unique; using ostk::core::type::String; +using ostk::core::type::Unique; -using ostk::mathematics::object::Vector2d; -using ostk::mathematics::object::Vector3d; -using ostk::mathematics::object::Matrix3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d2::Object; using ostk::mathematics::geometry::d2::object::Point; +using ostk::mathematics::object::Matrix3d; +using ostk::mathematics::object::Vector2d; +using ostk::mathematics::object::Vector3d; class Transformation { diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Intersection.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Intersection.hpp index c6dda057..99cb205d 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Intersection.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Intersection.hpp @@ -33,10 +33,10 @@ namespace geometry namespace d3 { -using ostk::core::type::Unique; +using ostk::core::container::Array; using ostk::core::type::Index; using ostk::core::type::Size; -using ostk::core::container::Array; +using ostk::core::type::Unique; using ostk::mathematics::geometry::d3::Object; using ostk::mathematics::geometry::d3::object::Composite; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Composite.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Composite.hpp index 21a50be8..638bccee 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Composite.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Composite.hpp @@ -22,10 +22,10 @@ namespace d3 namespace object { -using ostk::core::type::Unique; +using ostk::core::container::Array; using ostk::core::type::Index; using ostk::core::type::Size; -using ostk::core::container::Array; +using ostk::core::type::Unique; using ostk::mathematics::geometry::d3::Object; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cone.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cone.hpp index 6977530b..42648029 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cone.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cone.hpp @@ -22,16 +22,16 @@ namespace d3 namespace object { +using ostk::core::container::Array; using ostk::core::container::Index; using ostk::core::container::Size; -using ostk::core::container::Array; -using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; +using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Ray; -using ostk::mathematics::geometry::d3::Intersection; +using ostk::mathematics::object::Vector3d; #define DEFAULT_RAY_COUNT 0 #define DEFAULT_DISCRETIZATION_LEVEL 40 diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cuboid.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cuboid.hpp index c67ae203..98bf2875 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cuboid.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cuboid.hpp @@ -21,14 +21,14 @@ namespace d3 namespace object { -using ostk::core::type::Real; using ostk::core::container::Array; +using ostk::core::type::Real; -using ostk::mathematics::object::Vector3d; +using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Segment; -using ostk::mathematics::geometry::d3::Intersection; +using ostk::mathematics::object::Vector3d; class PointSet; class Line; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ellipsoid.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ellipsoid.hpp index 0a0f2959..67d63039 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ellipsoid.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ellipsoid.hpp @@ -22,11 +22,11 @@ namespace object using ostk::core::type::Real; -using ostk::mathematics::object::Matrix3d; +using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; using ostk::mathematics::geometry::d3::object::Point; -using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; +using ostk::mathematics::object::Matrix3d; #define DEFAULT_ORIENTATION Quaternion::Unit() diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Line.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Line.hpp index d8d06261..76643331 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Line.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Line.hpp @@ -21,9 +21,9 @@ namespace object using ostk::core::type::Real; -using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; using ostk::mathematics::geometry::d3::object::Point; +using ostk::mathematics::object::Vector3d; class PointSet; class Plane; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/LineString.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/LineString.hpp index fc91243e..2b143967 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/LineString.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/LineString.hpp @@ -21,13 +21,13 @@ namespace d3 namespace object { +using ostk::core::container::Array; using ostk::core::type::Index; using ostk::core::type::Size; -using ostk::core::container::Array; -using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; using ostk::mathematics::geometry::d3::object::Point; +using ostk::mathematics::object::Vector3d; class Segment; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Plane.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Plane.hpp index 3178e99b..79c7fbd0 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Plane.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Plane.hpp @@ -22,13 +22,13 @@ namespace d3 namespace object { -using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; +using ostk::mathematics::geometry::d3::object::Line; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; -using ostk::mathematics::geometry::d3::object::Line; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Segment; +using ostk::mathematics::object::Vector3d; /// @brief Plane /// diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Point.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Point.hpp index a0787680..3f9e0073 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Point.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Point.hpp @@ -25,8 +25,8 @@ using ostk::core::type::Integer; using ostk::core::type::Real; using ostk::core::type::String; -using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; +using ostk::mathematics::object::Vector3d; #define DEFAULT_PRECISION Integer::Undefined() diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/PointSet.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/PointSet.hpp index 8626c717..64764582 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/PointSet.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/PointSet.hpp @@ -23,13 +23,13 @@ namespace d3 namespace object { +using ostk::core::container::Array; using ostk::core::type::Index; using ostk::core::type::Size; -using ostk::core::container::Array; -using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; using ostk::mathematics::geometry::d3::object::Point; +using ostk::mathematics::object::Vector3d; /// @brief Point set diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Polygon.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Polygon.hpp index 43fd4fe9..868e91eb 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Polygon.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Polygon.hpp @@ -25,16 +25,16 @@ namespace d3 namespace object { +using ostk::core::container::Array; using ostk::core::container::Index; using ostk::core::container::Size; -using ostk::core::container::Array; using Polygon2d = ostk::mathematics::geometry::d2::object::Polygon; using ostk::mathematics::geometry::d3::Object; -using ostk::mathematics::geometry::d3::object::Point; -using ostk::mathematics::geometry::d3::object::Segment; using ostk::mathematics::geometry::d3::object::LineString; using ostk::mathematics::geometry::d3::object::Plane; +using ostk::mathematics::geometry::d3::object::Point; +using ostk::mathematics::geometry::d3::object::Segment; /// @brief Polygon /// diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Pyramid.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Pyramid.hpp index ad901869..1303588f 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Pyramid.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Pyramid.hpp @@ -23,15 +23,15 @@ namespace d3 namespace object { +using ostk::core::container::Array; using ostk::core::container::Index; using ostk::core::container::Size; -using ostk::core::container::Array; +using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::Object; using ostk::mathematics::geometry::d3::object::Point; -using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Polygon; -using ostk::mathematics::geometry::d3::Intersection; +using ostk::mathematics::geometry::d3::object::Ray; #define DEFAULT_ONLY_IN_SIGHT false #define DEFAULT_DISCRETIZATION_LEVEL 40 diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ray.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ray.hpp index 31222b2a..7f15a592 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ray.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ray.hpp @@ -21,9 +21,9 @@ namespace object using ostk::core::type::Real; -using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; using ostk::mathematics::geometry::d3::object::Point; +using ostk::mathematics::object::Vector3d; #define DEFAULT_ONLY_IN_SIGHT false diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Segment.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Segment.hpp index ca8390da..9a27e782 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Segment.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Segment.hpp @@ -23,9 +23,9 @@ namespace object using ostk::core::type::Real; using ostk::mathematics::geometry::d3::Object; +using ostk::mathematics::geometry::d3::object::Line; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; -using ostk::mathematics::geometry::d3::object::Line; class PointSet; class Plane; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.hpp index 1ba5348d..b3ef5617 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.hpp @@ -23,17 +23,17 @@ namespace d3 class Transformation; -using ostk::core::type::Unique; using ostk::core::type::String; +using ostk::core::type::Unique; -using ostk::mathematics::object::Vector3d; -using ostk::mathematics::object::Vector4d; -using ostk::mathematics::object::Matrix4d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::Object; using ostk::mathematics::geometry::d3::object::Point; -using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; using ostk::mathematics::geometry::d3::transformation::rotation::RotationMatrix; +using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; +using ostk::mathematics::object::Matrix4d; +using ostk::mathematics::object::Vector3d; +using ostk::mathematics::object::Vector4d; class Transformation { diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation/Rotation/Quaternion.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation/Rotation/Quaternion.hpp index 30c28fde..86201c2f 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation/Rotation/Quaternion.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation/Rotation/Quaternion.hpp @@ -27,9 +27,9 @@ using ostk::core::type::Integer; using ostk::core::type::Real; using ostk::core::type::String; +using ostk::mathematics::geometry::Angle; using ostk::mathematics::object::Vector3d; using ostk::mathematics::object::Vector4d; -using ostk::mathematics::geometry::Angle; class RotationVector; class RotationMatrix; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation/Rotation/RotationMatrix.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation/Rotation/RotationMatrix.hpp index 8fd4ef72..6fcf8fd7 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation/Rotation/RotationMatrix.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation/Rotation/RotationMatrix.hpp @@ -26,8 +26,8 @@ namespace rotation using ostk::core::type::Index; using ostk::core::type::Real; using ostk::core::type::String; -using ostk::mathematics::object::Matrix3d; using ostk::mathematics::geometry::Angle; +using ostk::mathematics::object::Matrix3d; class Quaternion; class RotationVector; diff --git a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation/Rotation/RotationVector.hpp b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation/Rotation/RotationVector.hpp index e347bc77..8bc02cc3 100644 --- a/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation/Rotation/RotationVector.hpp +++ b/include/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation/Rotation/RotationVector.hpp @@ -25,8 +25,8 @@ namespace rotation using ostk::core::type::Real; using ostk::core::type::String; -using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; +using ostk::mathematics::object::Vector3d; class Quaternion; class RotationMatrix; diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/2D/Object.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/2D/Object.cpp index 6d5feb3b..dc517aed 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/2D/Object.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/2D/Object.cpp @@ -23,9 +23,9 @@ Object::~Object() {} bool Object::operator==(const Object& anObject) const { + using ostk::mathematics::geometry::d2::object::MultiPolygon; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::MultiPolygon; if ((!this->isDefined()) || (!anObject.isDefined())) { @@ -93,11 +93,11 @@ bool Object::intersects(const Object& anObject) const bool Object::contains(const Object& anObject) const { + using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::MultiPolygon; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::PointSet; - using ostk::mathematics::geometry::d2::object::LineString; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::MultiPolygon; if (!anObject.isDefined()) { diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiPolygon.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiPolygon.cpp index 71519ed6..5b423839 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiPolygon.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiPolygon.cpp @@ -29,10 +29,10 @@ namespace object { using boost::geometry::cs::cartesian; +using boost::geometry::model::multi_polygon; using boost::geometry::model::point; -using boost::geometry::model::ring; using boost::geometry::model::polygon; -using boost::geometry::model::multi_polygon; +using boost::geometry::model::ring; using ostk::core::type::Index; using ostk::core::type::Size; diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/2D/Transformation.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/2D/Transformation.cpp index ef422e8d..dae5570e 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/2D/Transformation.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/2D/Transformation.cpp @@ -63,8 +63,8 @@ Vector3d Transformation::operator*(const Vector3d& aVector) const Transformation& Transformation::operator*=(const Transformation& aTransformation) { - using ostk::core::container::Pair; using ostk::core::container::Map; + using ostk::core::container::Pair; if (!aTransformation.isDefined()) { diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Object.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Object.cpp index a2b0a8e5..45d1403f 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Object.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Object.cpp @@ -33,20 +33,20 @@ Object::~Object() {} bool Object::operator==(const Object& anObject) const { + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::LineString; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Polygon; + using ostk::mathematics::geometry::d3::object::Pyramid; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::LineString; - using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Plane; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Cone; - using ostk::mathematics::geometry::d3::object::Composite; if ((!this->isDefined()) || (!anObject.isDefined())) { @@ -220,20 +220,20 @@ std::ostream& operator<<(std::ostream& anOutputStream, const Object& anObject) bool Object::intersects(const Object& anObject) const { + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::LineString; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Polygon; + using ostk::mathematics::geometry::d3::object::Pyramid; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::LineString; - using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Plane; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Cone; - using ostk::mathematics::geometry::d3::object::Composite; if (!anObject.isDefined()) { @@ -493,20 +493,20 @@ bool Object::intersects(const Object& anObject) const bool Object::contains(const Object& anObject) const { + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::LineString; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Polygon; + using ostk::mathematics::geometry::d3::object::Pyramid; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::LineString; - using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Plane; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Cone; - using ostk::mathematics::geometry::d3::object::Composite; if (!anObject.isDefined()) { @@ -680,20 +680,20 @@ bool Object::contains(const Object& anObject) const Intersection Object::intersectionWith(const Object& anObject) const { + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::LineString; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Polygon; + using ostk::mathematics::geometry::d3::object::Pyramid; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::LineString; - using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Plane; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Cone; - using ostk::mathematics::geometry::d3::object::Composite; if (!anObject.isDefined()) { diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cone.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cone.cpp index 584222cd..59d3bef5 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cone.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cone.cpp @@ -241,9 +241,9 @@ Angle Cone::getAngle() const Array Cone::getRaysOfLateralSurface(const Size aRayCount) const { - using ostk::mathematics::object::Interval; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Interval; if (aRayCount == 0) { diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Pyramid.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Pyramid.cpp index bc6f359c..6692408d 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Pyramid.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Pyramid.cpp @@ -271,9 +271,9 @@ Polygon Pyramid::getLateralFaceAt(const Index aLateralFaceIndex) const Array Pyramid::getRaysOfLateralFaceAt(const Index aLateralFaceIndex, const Size aRayCount) const { - using ostk::mathematics::object::Interval; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Interval; // if (aRayCount < 2) // { diff --git a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.cpp b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.cpp index 30c64275..4232b3e0 100644 --- a/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.cpp +++ b/src/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformation.cpp @@ -65,8 +65,8 @@ Vector4d Transformation::operator*(const Vector4d& aVector) const Transformation& Transformation::operator*=(const Transformation& aTransformation) { - using ostk::core::container::Pair; using ostk::core::container::Map; + using ostk::core::container::Pair; if (!aTransformation.isDefined()) { diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Composite.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Composite.test.cpp index a8da888b..de45ac46 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Composite.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Composite.test.cpp @@ -11,13 +11,13 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, Constructor) { - using ostk::core::type::Unique; using ostk::core::container::Array; + using ostk::core::type::Unique; using ostk::mathematics::geometry::d2::Object; + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -38,8 +38,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, Constructor) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, Clone) { using ostk::mathematics::geometry::d2::Object; - using ostk::mathematics::geometry::d2::object::Polygon; using ostk::mathematics::geometry::d2::object::Composite; + using ostk::mathematics::geometry::d2::object::Polygon; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -51,9 +51,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, Clone) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, CopyConstructor) { using ostk::mathematics::geometry::d2::Object; + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -66,9 +66,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, CopyConstructor) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, EqualToOperator) { + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -91,9 +91,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, EqualToOperator) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, NotEqualToOperator) { + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -116,9 +116,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, NotEqualToOperat TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, AdditionOperator) { + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -150,9 +150,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, AdditionOperator TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, AdditionAssignmentOperator) { + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -184,8 +184,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, AdditionAssignme TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, StreamOperator) { - using ostk::mathematics::geometry::d2::object::Polygon; using ostk::mathematics::geometry::d2::object::Composite; + using ostk::mathematics::geometry::d2::object::Polygon; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -202,8 +202,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, StreamOperator) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, IsDefined) { - using ostk::mathematics::geometry::d2::object::Polygon; using ostk::mathematics::geometry::d2::object::Composite; + using ostk::mathematics::geometry::d2::object::Polygon; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -220,9 +220,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, IsDefined) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, IsEmpty) { + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -243,8 +243,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, IsEmpty) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, Intersects) { - using ostk::mathematics::geometry::d2::object::Polygon; using ostk::mathematics::geometry::d2::object::Composite; + using ostk::mathematics::geometry::d2::object::Polygon; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -261,10 +261,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, Intersects) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, Contains) { using ostk::mathematics::geometry::d2::Object; - using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; { const Point point = {1.0, 0.0}; @@ -374,10 +374,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, Contains) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, AnyContains) { - using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; { const Point point = {1.0, 0.0}; @@ -502,9 +502,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, AnyContains) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, Is) { + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -523,10 +523,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, Is) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, As) { using ostk::mathematics::geometry::d2::Object; - using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -559,9 +559,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, As) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, AccessObjectAt) { + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -594,12 +594,12 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, AccessObjectAt) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, AccessObjects) { - using ostk::core::type::Unique; using ostk::core::container::Array; + using ostk::core::type::Unique; using ostk::mathematics::geometry::d2::Object; - using ostk::mathematics::geometry::d2::object::Polygon; using ostk::mathematics::geometry::d2::object::Composite; + using ostk::mathematics::geometry::d2::object::Polygon; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -620,9 +620,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, AccessObjects) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, GetObjectCount) { + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -654,9 +654,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, GetObjectCount) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, ConstIterator) { using ostk::mathematics::geometry::d2::Object; + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; { const Polygon polygon = {{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}}}; @@ -687,9 +687,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, ConstIterator) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Composite, ApplyTransformation) { using ostk::mathematics::geometry::d2::Object; + using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::object::Composite; using ostk::mathematics::geometry::d2::Transformation; { diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Line.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Line.test.cpp index 2d3c3f54..a6fdc9bb 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Line.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Line.test.cpp @@ -105,8 +105,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Line, IsDefined) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Line, Intersects_Point) { - using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Line; + using ostk::mathematics::geometry::d2::object::Point; { EXPECT_TRUE(Line({0.0, 0.0}, {0.0, 1.0}).intersects(Point(0.0, 0.0))); @@ -133,8 +133,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Line, Intersects_Point) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Line, Contains_Point) { - using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Line; + using ostk::mathematics::geometry::d2::object::Point; { EXPECT_TRUE(Line({0.0, 0.0}, {0.0, 1.0}).contains(Point(0.0, -2.0))); @@ -159,9 +159,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Line, Contains_Point) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Line, Contains_PointSet) { + using ostk::mathematics::geometry::d2::object::Line; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::PointSet; - using ostk::mathematics::geometry::d2::object::Line; { EXPECT_TRUE(Line({0.0, 0.0}, {0.0, 1.0}).contains(PointSet({Point {0.0, -2.0}}))); @@ -188,8 +188,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Line, Contains_PointSet) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Line, GetOrigin) { - using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Line; + using ostk::mathematics::geometry::d2::object::Point; { EXPECT_EQ(Point(0.0, 0.0), Line({0.0, 0.0}, {0.0, 1.0}).getOrigin()); @@ -205,9 +205,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Line, GetOrigin) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Line, GetDirection) { - using ostk::mathematics::object::Vector2d; - using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Line; + using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::object::Vector2d; { EXPECT_EQ(Vector2d(0.0, +1.0), Line({0.0, 0.0}, {0.0, +2.0}).getDirection()); @@ -223,8 +223,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Line, DistanceTo_Point) { using ostk::core::type::Real; - using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Line; + using ostk::mathematics::geometry::d2::object::Point; { EXPECT_EQ(Line({0.0, 0.0}, {0.0, +1.0}).distanceTo({0.0, 0.0}), 0.0); @@ -268,9 +268,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Line, ApplyTransformation) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::object::Line; using ostk::mathematics::geometry::d2::Transformation; + using ostk::mathematics::object::Vector2d; // Translation @@ -301,9 +301,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Line, Undefined) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Line, Points) { - using ostk::mathematics::object::Vector2d; - using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Line; + using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::object::Vector2d; { const Line line = Line::Points(Point(1.0, 2.0), Point(2.0, 3.0)); diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/LineString.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/LineString.test.cpp index 65462922..86eb3fd4 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/LineString.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/LineString.test.cpp @@ -8,8 +8,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_LineString, Constructor) { - using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Point; { EXPECT_NO_THROW(LineString({{0.0, 0.0}, {0.0, 1.0}, {1.0, 0.0}})); @@ -165,8 +165,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_LineString, Contains) { using ostk::core::container::Array; - using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Point; { const Point point = {1.0, 0.0}; @@ -245,8 +245,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_LineString, GetPointArray) { using ostk::core::container::Array; - using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Point; { Array pointArray = {{0.0, 0.0}, {0.0, 1.0}, {1.0, 0.0}, {0.0, 0.0}}; @@ -261,8 +261,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_LineString, GetPointArray) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_LineString, AccessPointAt) { - using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Point; { EXPECT_EQ(Point(0.0, 0.0), LineString({{0.0, 0.0}, {0.0, 1.0}, {1.0, 0.0}, {0.0, 0.0}}).accessPointAt(0)); @@ -294,8 +294,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_LineString, GetPointCount) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_LineString, ToString) { - using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Point; { EXPECT_EQ( @@ -351,10 +351,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_LineString, ConstIterator) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_LineString, ApplyTransformation) { - using ostk::mathematics::object::Vector2d; - using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::Transformation; + using ostk::mathematics::object::Vector2d; // Translation @@ -384,8 +384,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_LineString, Empty) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_LineString, Segment) { - using ostk::mathematics::geometry::d2::object::Segment; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Segment; { EXPECT_EQ(LineString({{0.0, 0.0}, {0.0, 1.0}}), LineString::Segment(Segment({0.0, 0.0}, {0.0, 1.0}))); diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiPolygon.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiPolygon.test.cpp index a2b66b80..3452856b 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiPolygon.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/MultiPolygon.test.cpp @@ -983,8 +983,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_MultiPolygon, GetConvexHull) { - using ostk::mathematics::geometry::d2::object::Polygon; using ostk::mathematics::geometry::d2::object::MultiPolygon; + using ostk::mathematics::geometry::d2::object::Polygon; { // Convex hull of convex polygon @@ -1223,8 +1223,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_MultiPolygon, Polygon) { using ostk::core::container::Array; - using ostk::mathematics::geometry::d2::object::Polygon; using ostk::mathematics::geometry::d2::object::MultiPolygon; + using ostk::mathematics::geometry::d2::object::Polygon; { const Array vertices = {{0.0, 0.0}, {0.0, 1.0}, {1.0, 1.0}, {1.0, 0.0}}; diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Point.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Point.test.cpp index ea3b7fba..39c2f5b8 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Point.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Point.test.cpp @@ -25,8 +25,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Point, Clone) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Point, AdditionOperator) { - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::object::Vector2d; { EXPECT_EQ(Point(1.0, 2.0), Point(1.0, 2.0) + Vector2d(0.0, 0.0)); @@ -41,8 +41,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Point, AdditionOperator) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Point, SubtractionOperator) { - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::object::Vector2d; { EXPECT_EQ(Point(1.0, 2.0), Point(1.0, 2.0) - Vector2d(0.0, 0.0)); @@ -153,8 +153,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Point, IsNear) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Point, AsVector) { - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::object::Vector2d; { EXPECT_EQ(Vector2d(1.0, 2.0), Point(1.0, 2.0).asVector()); @@ -233,10 +233,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Point, ApplyTransformation) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::Transformation; + using ostk::mathematics::object::Vector2d; // Translation @@ -297,8 +297,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Point, Origin) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Point, Vector) { - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::object::Vector2d; { EXPECT_NO_THROW(Point::Vector(Vector2d(1.0, 2.0))); diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/PointSet.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/PointSet.test.cpp index 157989a2..c79e1fb4 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/PointSet.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/PointSet.test.cpp @@ -259,10 +259,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_PointSet, ConstIterator) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_PointSet, ApplyTransformation) { - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::PointSet; using ostk::mathematics::geometry::d2::Transformation; + using ostk::mathematics::object::Vector2d; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Polygon.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Polygon.test.cpp index b9542271..13c66249 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Polygon.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Polygon.test.cpp @@ -241,8 +241,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Polygon, IsNear) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Polygon, IntersectsPolygon) { - using ostk::core::container::Tuple; using ostk::core::container::Array; + using ostk::core::container::Tuple; using ostk::mathematics::geometry::d2::object::Polygon; @@ -321,8 +321,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Polygon, IntersectsPolygon) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Polygon, ContainsPoint) { - using ostk::core::container::Tuple; using ostk::core::container::Array; + using ostk::core::container::Tuple; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; @@ -376,8 +376,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Polygon, ContainsPoint) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Polygon, ContainsPointSet) { - using ostk::core::container::Tuple; using ostk::core::container::Array; + using ostk::core::container::Tuple; using ostk::mathematics::geometry::d2::object::PointSet; using ostk::mathematics::geometry::d2::object::Polygon; @@ -727,10 +727,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Polygon, GetConvexHull) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Polygon, IntersectionWith) { - using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::geometry::d2::Intersection; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::Intersection; // TBI: Intersection type to be improved @@ -882,10 +882,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Polygon, IntersectionWith) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Polygon, DifferenceWith) { - using ostk::mathematics::geometry::d2::object::Point; + using ostk::mathematics::geometry::d2::Intersection; using ostk::mathematics::geometry::d2::object::LineString; + using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Polygon; - using ostk::mathematics::geometry::d2::Intersection; // Polygon difference between two intersecting simple convex polygons @@ -1081,8 +1081,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Polygon, ToString) { using ostk::core::container::Array; - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::object::Polygon; + using ostk::mathematics::object::Vector2d; { const Array vertices = {{0.0, 0.0}, {0.0, 1.0}, {1.0, 1.0}, {1.0, 0.0}}; @@ -1137,9 +1137,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Polygon, ApplyTransformatio { using ostk::core::container::Array; - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::object::Polygon; using ostk::mathematics::geometry::d2::Transformation; + using ostk::mathematics::object::Vector2d; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Segment.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Segment.test.cpp index a09cc3d5..7f705384 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Segment.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/2D/Object/Segment.test.cpp @@ -155,9 +155,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Segment, GetCenter) TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Segment, GetDirection) { - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::object::Point; using ostk::mathematics::geometry::d2::object::Segment; + using ostk::mathematics::object::Vector2d; { EXPECT_EQ(Vector2d(0.0, +1.0), Segment({0.0, 0.0}, {0.0, +2.0}).getDirection()); @@ -284,9 +284,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_2D_Object_Segment, ApplyTransformatio { using ostk::core::type::Real; - using ostk::mathematics::object::Vector2d; using ostk::mathematics::geometry::d2::object::Segment; using ostk::mathematics::geometry::d2::Transformation; + using ostk::mathematics::object::Vector2d; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Composite.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Composite.test.cpp index dccf0866..f5c39af9 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Composite.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Composite.test.cpp @@ -20,17 +20,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, Constructor) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -81,12 +81,12 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, Constructor) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, Clone) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -102,12 +102,12 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, Clone) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, CopyConstructor) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -125,17 +125,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, CopyConstructor) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, EqualToOperator) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -250,17 +250,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, EqualToOperator) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, NotEqualToOperator) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -375,17 +375,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, NotEqualToOperat TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, AdditionOperator) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -417,17 +417,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, AdditionOperator TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, AdditionAssignmentOperator) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -459,17 +459,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, AdditionAssignme TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, StreamOperator) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -491,17 +491,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, StreamOperator) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, IsDefined) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -523,17 +523,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, IsDefined) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, IsEmpty) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -559,17 +559,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, IsEmpty) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, Intersects) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; // [TBI] @@ -604,17 +604,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, Intersects) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, Contains) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; // [TBI] @@ -649,17 +649,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, Contains) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, Is) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -683,17 +683,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, Is) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, As) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -717,17 +717,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, As) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, AccessObjectAt) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -780,17 +780,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, AccessObjectAt) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, AccessObjects) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -838,17 +838,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, AccessObjects) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, GetObjectCount) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -896,17 +896,17 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, GetObjectCount) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, ConstIterator) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -966,18 +966,18 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, ConstIterator) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Composite, ApplyTransformation) { - using ostk::core::type::Unique; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Unique; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::Object; + using ostk::mathematics::geometry::d3::object::Composite; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::object::Composite; using ostk::mathematics::geometry::d3::Transformation; + using ostk::mathematics::object::Vector3d; { const Polygon base = { diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cone.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cone.test.cpp index eeac7ee8..677d2eae 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cone.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cone.test.cpp @@ -10,10 +10,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, Constructor) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point apex = {0.0, 0.0, 0.0}; @@ -26,10 +26,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, Constructor) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, Clone) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point apex = {0.0, 0.0, 0.0}; @@ -42,10 +42,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, Clone) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, EqualToOperator) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point apex = {0.0, 0.0, 0.0}; @@ -84,10 +84,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, EqualToOperator) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, NotEqualToOperator) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point apex = {0.0, 0.0, 0.0}; @@ -126,10 +126,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, NotEqualToOperator) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, StreamOperator) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { testing::internal::CaptureStdout(); @@ -146,10 +146,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, StreamOperator) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, IsDefined) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point apex = {0.0, 0.0, 0.0}; @@ -166,11 +166,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, IsDefined) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, Intersects_Ellipsoid) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; - using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point apex = {-10.0, 0.0, 10.0}; @@ -191,10 +191,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, Intersects_Ellipsoid) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, Contains_Point) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point apex = {-10.0, 0.0, 10.0}; @@ -226,11 +226,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, Contains_Point) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, Contains_PointSet) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; + using ostk::mathematics::geometry::d3::object::Cone; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::object::Vector3d; { const Point apex = {-10.0, 0.0, 10.0}; @@ -253,11 +253,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, Contains_PointSet) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, Contains_Segment) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; + using ostk::mathematics::geometry::d3::object::Cone; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::object::Vector3d; { const Point apex = {-10.0, 0.0, 10.0}; @@ -287,11 +287,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, Contains_Sphere) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; + using ostk::mathematics::geometry::d3::object::Cone; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Sphere; - using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::object::Vector3d; { const Point apex = {-10.0, 0.0, 10.0}; @@ -321,10 +321,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, Contains_Sphere) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, GetApex) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point apex = {0.0, 0.0, 0.0}; @@ -341,10 +341,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, GetApex) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, GetAxis) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point apex = {0.0, 0.0, 0.0}; @@ -361,10 +361,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, GetAxis) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, GetAngle) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point apex = {0.0, 0.0, 0.0}; @@ -381,14 +381,14 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, GetAngle) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, GetRaysOfLateralSurface) { - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; + using ostk::mathematics::geometry::d3::object::Cone; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Ray; - using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::object::Vector3d; { const Point apex = {0.0, 0.0, 0.0}; @@ -421,10 +421,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, GetRaysOfLateralSurfa TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, DistanceTo_Point) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point apex = {-10.0, 0.0, 10.0}; @@ -464,13 +464,13 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, IntersectionWith_Elli { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; - using ostk::mathematics::geometry::d3::object::LineString; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::object::Cone; using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::LineString; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point apex = {10.0, 0.0, 10.0}; @@ -510,12 +510,12 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cone, ApplyTransformation) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cone; + using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::Transformation; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cuboid.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cuboid.test.cpp index b8a318b6..7ebbe000 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cuboid.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Cuboid.test.cpp @@ -18,9 +18,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, Constructor) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -37,9 +37,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, Clone) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -56,9 +56,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, EqualToOperator) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -113,9 +113,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, NotEqualToOperator) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -170,9 +170,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, StreamOperator) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -193,9 +193,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, IsDefined) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -216,9 +216,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, IsNear) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -291,9 +291,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, Intersects_Point) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -349,10 +349,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, Intersects_PointSet { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -441,11 +441,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, Intersects_Line) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; + using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Line; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Line; - using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -598,9 +598,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, Contains_Point) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -656,10 +656,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, Contains_PointSet) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; + using ostk::mathematics::geometry::d3::object::Cuboid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -748,9 +748,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, GetCenter) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -771,9 +771,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, GetFirstAxis) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -794,9 +794,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, GetSecondAxis) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -817,9 +817,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, GetThirdAxis) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -840,9 +840,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, GetFirstExtent) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -863,9 +863,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, GetSecondExtent) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -886,9 +886,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, GetThirdExtent) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -907,12 +907,12 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, GetThirdExtent) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, GetVertices) { - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Point center = {0.0, 0.0, 0.0}; @@ -1042,13 +1042,13 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, ApplyTransformation { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::Transformation; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; // Translation @@ -1113,9 +1113,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, Undefined) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Cuboid, Cube) { - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Cuboid; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Cuboid cube = Cuboid::Cube({0.0, 0.0, 0.0}, 1.0); diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ellipsoid.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ellipsoid.test.cpp index 740b6916..42538d59 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ellipsoid.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ellipsoid.test.cpp @@ -16,8 +16,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Constructor) { - using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; { ASSERT_NO_THROW(Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0)); @@ -159,8 +159,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, IsDefined) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Intersects_Point) { - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Point; { ASSERT_TRUE(Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0).intersects(Point(+5.0, +2.0, +3.0))); @@ -186,9 +186,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Intersects_Point TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Intersects_PointSet) { + using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Ellipsoid; { ASSERT_TRUE(Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0) @@ -219,9 +219,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Intersects_Line) { using ostk::core::type::Real; - using ostk::mathematics::geometry::d3::object::Point; - using ostk::mathematics::geometry::d3::object::Line; using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Point; { const Ellipsoid ellipsoid = {Point::Origin(), 1.0, 2.0, 3.0}; @@ -365,9 +365,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Intersects_Ray) { using ostk::core::type::Real; + using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Ray; - using ostk::mathematics::geometry::d3::object::Ellipsoid; { const Ellipsoid ellipsoid = {Point::Origin(), 1.0, 2.0, 3.0}; @@ -533,9 +533,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Intersects_Segme { using ostk::core::type::Real; + using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::Ellipsoid; { const Ellipsoid ellipsoid = {Point::Origin(), 1.0, 2.0, 3.0}; @@ -656,9 +656,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Intersects_Plane { using ostk::core::type::Real; - using ostk::mathematics::geometry::d3::object::Point; - using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Point; { const Ellipsoid ellipsoid = {Point::Origin(), 1.0, 2.0, 3.0}; @@ -699,8 +699,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Intersects_Plane TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Intersects_Pyramid) { - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Pyramid; { @@ -717,8 +717,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Intersects_Pyram TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Contains_Point) { - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Point; { ASSERT_TRUE(Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0).contains(Point(+5.0, +2.0, +3.0))); @@ -744,9 +744,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Contains_Point) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Contains_PointSet) { + using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Ellipsoid; { ASSERT_TRUE(Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0) @@ -784,8 +784,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, Contains_PointSe TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, GetCenter) { - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Point; { ASSERT_EQ(Point(1.0, 2.0, 3.0), Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0).getCenter()); @@ -839,11 +839,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, GetFirstAxis) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; { ASSERT_EQ(Vector3d(1.0, 0.0, 0.0), Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0).getFirstAxis()); @@ -868,11 +868,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, GetSecondAxis) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; { ASSERT_EQ(Vector3d(0.0, 1.0, 0.0), Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0).getSecondAxis()); @@ -897,11 +897,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, GetThirdAxis) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; { ASSERT_EQ(Vector3d(0.0, 0.0, 1.0), Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0).getThirdAxis()); @@ -924,8 +924,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, GetThirdAxis) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, GetOrientation) { - using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; { ASSERT_EQ(Quaternion::Unit(), Ellipsoid({1.0, 2.0, 3.0}, 4.0, 5.0, 6.0).getOrientation()); @@ -947,12 +947,12 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, GetMatrix) { using ostk::core::type::Real; - using ostk::mathematics::object::Matrix3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; - using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; using ostk::mathematics::geometry::d3::transformation::rotation::RotationMatrix; + using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Matrix3d; { Matrix3d referenceEllipsoidMatrix; @@ -997,11 +997,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, IntersectionWith { using ostk::core::type::Real; + using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Line; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Line; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::Intersection; { const Line line = {{0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}}; @@ -1107,11 +1107,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, IntersectionWith { using ostk::core::type::Real; + using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; using ostk::mathematics::geometry::d3::object::Ray; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::Intersection; // onlyInSight = false @@ -1358,11 +1358,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, IntersectionWith { using ostk::core::type::Real; + using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::Ellipsoid; - using ostk::mathematics::geometry::d3::Intersection; { const Segment segment = {{0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}}; @@ -1537,8 +1537,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, IntersectionWith TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, IntersectionWith_Pyramid) { - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Pyramid; { @@ -1557,12 +1557,12 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid, ApplyTransformat { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::Transformation; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Line.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Line.test.cpp index 3f7dfc70..5eb0e673 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Line.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Line.test.cpp @@ -107,8 +107,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, IsDefined) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, Intersects_Point) { - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Point; { EXPECT_TRUE(Line({0.0, 0.0, 0.0}, {0.0, 0.0, 1.0}).intersects(Point(0.0, 0.0, 0.0))); @@ -184,8 +184,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, Intersects_Sphere) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, Intersects_Ellipsoid) { - using ostk::mathematics::geometry::d3::object::Line; using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Line; { // See: OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid.Intersects_Line @@ -201,8 +201,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, Intersects_Ellipsoid) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, Contains_Point) { - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Point; { EXPECT_TRUE(Line({0.0, 0.0, 0.0}, {0.0, 0.0, 1.0}).contains(Point(0.0, 0.0, -2.0))); @@ -227,8 +227,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, Contains_Point) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, Contains_PointSet) { - using ostk::mathematics::geometry::d3::object::PointSet; using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::PointSet; { EXPECT_TRUE(Line({0.0, 0.0, 0.0}, {0.0, 0.0, 1.0}).contains(PointSet({{0.0, 0.0, -2.0}}))); @@ -255,8 +255,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, Contains_PointSet) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, GetOrigin) { - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Point; { EXPECT_EQ(Point(0.0, 0.0, 0.0), Line({0.0, 0.0, 0.0}, {0.0, 0.0, 1.0}).getOrigin()); @@ -272,9 +272,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, GetOrigin) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, GetDirection) { - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { EXPECT_EQ(Vector3d(0.0, 0.0, +1.0), Line({0.0, 0.0, 0.0}, {0.0, 0.0, +2.0}).getDirection()); @@ -290,8 +290,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, DistanceTo_Point) { using ostk::core::type::Real; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Point; { EXPECT_EQ(Line({0.0, 0.0, 0.0}, {0.0, 0.0, +1.0}).distanceTo({0.0, 0.0, 0.0}), 0.0); @@ -333,10 +333,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, IntersectionWith_Plan { using ostk::core::type::Real; - using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::geometry::d3::Intersection; using ostk::mathematics::geometry::d3::object::Line; using ostk::mathematics::geometry::d3::object::Plane; - using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::geometry::d3::object::Point; const auto expectLineIntersection = [](const Line& aLine, const Plane& aPlane, const Line& anIntersectionLine ) -> void @@ -429,11 +429,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, ApplyTransformation) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::object::Line; using ostk::mathematics::geometry::d3::Transformation; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; // Translation @@ -477,9 +477,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, Undefined) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Line, Points) { - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { const Line line = Line::Points(Point(1.0, 2.0, 3.0), Point(2.0, 3.0, 4.0)); diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/LineString.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/LineString.test.cpp index 31c5cb1e..2b197981 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/LineString.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/LineString.test.cpp @@ -8,8 +8,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_LineString, Constructor) { - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::LineString; + using ostk::mathematics::geometry::d3::object::Point; { EXPECT_NO_THROW(LineString({{0.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {1.0, 0.0, 1.0}})); @@ -183,8 +183,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_LineString, IsNear) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_LineString, AccessPointAt) { - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::LineString; + using ostk::mathematics::geometry::d3::object::Point; { EXPECT_EQ( @@ -287,12 +287,12 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_LineString, ApplyTransforma { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::LineString; + using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::Transformation; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; // Translation @@ -328,8 +328,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_LineString, Empty) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_LineString, Segment) { - using ostk::mathematics::geometry::d3::object::Segment; using ostk::mathematics::geometry::d3::object::LineString; + using ostk::mathematics::geometry::d3::object::Segment; { EXPECT_EQ( diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Plane.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Plane.test.cpp index b3ed0c15..b83eb01d 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Plane.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Plane.test.cpp @@ -100,8 +100,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, IsDefined) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Intersects_Point) { - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Point; { EXPECT_TRUE(Plane({0.0, 0.0, 0.0}, {0.0, 0.0, 1.0}).intersects(Point(0.0, 0.0, 0.0))); @@ -128,8 +128,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Intersects_Point) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Intersects_PointSet) { - using ostk::mathematics::geometry::d3::object::PointSet; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::PointSet; { EXPECT_TRUE(Plane({0.0, 0.0, 0.0}, {0.0, 0.0, 1.0}) @@ -170,8 +170,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Intersects_Line) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Intersects_Ray) { - using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Ray; { // See: OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ray.Intersects_Plane @@ -182,8 +182,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Intersects_Ray) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Intersects_Segment) { - using ostk::mathematics::geometry::d3::object::Segment; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Segment; { // See: OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Segment.Intersects_Plane @@ -194,8 +194,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Intersects_Segment) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Contains_Point) { - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Point; { EXPECT_TRUE(Plane({0.0, 0.0, 0.0}, {0.0, 0.0, 1.0}).contains(Point(0.0, 0.0, 0.0))); @@ -222,8 +222,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Contains_Point) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Contains_PointSet) { - using ostk::mathematics::geometry::d3::object::PointSet; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::PointSet; { EXPECT_TRUE(Plane({0.0, 0.0, 0.0}, {0.0, 0.0, 1.0}) @@ -280,8 +280,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Contains_Line) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Contains_Ray) { - using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Ray; { EXPECT_TRUE(Plane({0.0, 0.0, 0.0}, {0.0, 0.0, 1.0}).contains(Ray({0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}))); @@ -309,8 +309,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Contains_Ray) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Contains_Segment) { - using ostk::mathematics::geometry::d3::object::Segment; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Segment; { EXPECT_TRUE(Plane({0.0, 0.0, 0.0}, {0.0, 0.0, 1.0}).contains(Segment({0.0, 0.0, 0.0}, {0.0, 0.0, 0.0}))); @@ -339,8 +339,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, Contains_Segment) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, GetPoint) { - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Point; { EXPECT_EQ(Point(0.0, 0.0, 0.0), Plane({0.0, 0.0, 0.0}, {0.0, 0.0, 0.0}).getPoint()); @@ -354,9 +354,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, GetPoint) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, GetNormalVector) { - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { EXPECT_EQ(Vector3d(0.0, 0.0, +1.0), Plane({0.0, 0.0, 0.0}, {0.0, 0.0, +2.0}).getNormalVector()); @@ -372,9 +372,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, IntersectionWith_Poi { using ostk::core::type::Real; - using ostk::mathematics::geometry::d3::object::Point; - using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Point; const auto expectPointIntersection = [](const Plane& aPlane, const Point& aPoint, const Point& anIntersectionPoint ) -> void @@ -425,10 +425,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, IntersectionWith_Poi { using ostk::core::type::Real; + using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; - using ostk::mathematics::geometry::d3::object::Plane; - using ostk::mathematics::geometry::d3::Intersection; const auto expectPointIntersection = [](const Plane& aPlane, const PointSet& aPointSet, const Point& anIntersectionPoint) -> void @@ -543,8 +543,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, IntersectionWith_Lin TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, IntersectionWith_Ray) { - using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Ray; { // See: OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ray.IntersectionWith_Plane @@ -559,8 +559,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, IntersectionWith_Ray TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, IntersectionWith_Segment) { - using ostk::mathematics::geometry::d3::object::Segment; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Segment; { // See: OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Segment.IntersectionWith_Plane @@ -577,11 +577,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Plane, ApplyTransformation) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::Transformation; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Point.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Point.test.cpp index 764407ee..fa3c6221 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Point.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Point.test.cpp @@ -8,8 +8,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Point, Constructor) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { EXPECT_NO_THROW(Point(1.0, 2.0, 3.0)); @@ -65,8 +65,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Point, NotEqualToOperator) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Point, AdditionOperator) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { EXPECT_EQ(Point(1.0, 2.0, 3.0), Point(1.0, 2.0, 3.0) + Vector3d(0.0, 0.0, 0.0)); @@ -81,8 +81,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Point, AdditionOperator) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Point, SubtractionOperator) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { EXPECT_EQ(Point(1.0, 2.0, 3.0), Point(1.0, 2.0, 3.0) - Vector3d(0.0, 0.0, 0.0)); @@ -155,8 +155,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Point, IsNear) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Point, AsVector) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { EXPECT_EQ(Vector3d(1.0, 2.0, 3.0), Point(1.0, 2.0, 3.0).asVector()); @@ -223,11 +223,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Point, ApplyTransformation) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::Transformation; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; // Translation @@ -278,8 +278,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Point, Origin) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Point, Vector) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::object::Vector3d; { EXPECT_NO_THROW(Point::Vector(Vector3d(1.0, 2.0, 3.0))); diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/PointSet.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/PointSet.test.cpp index 0fa3154d..4422c431 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/PointSet.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/PointSet.test.cpp @@ -311,12 +311,12 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_PointSet, ApplyTransformati { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; using ostk::mathematics::geometry::d3::Transformation; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Polygon.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Polygon.test.cpp index 774380e4..51711127 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Polygon.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Polygon.test.cpp @@ -343,8 +343,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Polygon, ApplyTransformatio { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; + using ostk::mathematics::object::Vector3d; using Polygon2d = ostk::mathematics::geometry::d2::object::Polygon; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Pyramid.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Pyramid.test.cpp index 8b9c634a..67c0b112 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Pyramid.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Pyramid.test.cpp @@ -10,10 +10,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, Constructor) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Pyramid; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -27,10 +27,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, Constructor) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, Clone) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Pyramid; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -44,10 +44,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, Clone) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, EqualToOperator) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Pyramid; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -76,10 +76,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, EqualToOperator) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, NotEqualToOperator) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Pyramid; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -108,10 +108,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, NotEqualToOperator TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, StreamOperator) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Pyramid; + using ostk::mathematics::object::Vector3d; { testing::internal::CaptureStdout(); @@ -129,10 +129,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, StreamOperator) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, IsDefined) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Pyramid; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -150,11 +150,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, IsDefined) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, Intersects_Ellipsoid) { - using ostk::mathematics::object::Vector3d; + using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::object::Pyramid; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -179,10 +179,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, Intersects_Ellipso TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, Contains_Point) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Pyramid; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -299,11 +299,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, Contains_Point) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, Contains_PointSet) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::PointSet; using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Pyramid; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -331,11 +331,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, Contains_PointSet) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, Contains_Segment) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; - using ostk::mathematics::geometry::d3::object::Segment; using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Pyramid; + using ostk::mathematics::geometry::d3::object::Segment; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -363,10 +363,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, Contains_Segment) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, GetBase) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Pyramid; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -384,10 +384,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, GetBase) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, GetApex) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Pyramid; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -407,13 +407,13 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, IntersectionWith_E { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; - using ostk::mathematics::geometry::d3::object::Point; + using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::object::LineString; + using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; - using ostk::mathematics::geometry::d3::object::Ellipsoid; using ostk::mathematics::geometry::d3::object::Pyramid; - using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::object::Vector3d; { const Polygon base = { @@ -461,13 +461,13 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid, ApplyTransformatio { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Polygon; using ostk::mathematics::geometry::d3::object::Pyramid; using ostk::mathematics::geometry::d3::Transformation; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ray.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ray.test.cpp index 112d6426..a64c5547 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ray.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Ray.test.cpp @@ -133,8 +133,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ray, Intersects_Point) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ray, Intersects_Plane) { - using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Ray; { EXPECT_TRUE(Ray({0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}).intersects(Plane({0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}))); @@ -183,8 +183,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ray, Intersects_Sphere) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ray, Intersects_Ellipsoid) { - using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Ray; { // See: OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid.Intersects_Ray @@ -270,9 +270,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ray, GetOrigin) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ray, GetDirection) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Ray; + using ostk::mathematics::object::Vector3d; { EXPECT_EQ(Vector3d(0.0, 0.0, +1.0), Ray({0.0, 0.0, 0.0}, {0.0, 0.0, +2.0}).getDirection()); @@ -314,10 +314,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ray, IntersectionWith_Plane { using ostk::core::type::Real; + using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Ray; - using ostk::mathematics::geometry::d3::object::Plane; - using ostk::mathematics::geometry::d3::Intersection; const auto expectRayIntersection = [](const Ray& aRay, const Plane& aPlane, const Ray& anIntersectionRay) -> void { @@ -406,8 +406,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ray, IntersectionWith_Plane TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ray, IntersectionWith_Ellipsoid) { - using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Ray; { // See: OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid.IntersectionWith_Ray @@ -424,11 +424,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ray, ApplyTransformation) { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::object::Ray; using ostk::mathematics::geometry::d3::Transformation; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Segment.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Segment.test.cpp index bca93728..c7f8595b 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Segment.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Segment.test.cpp @@ -116,8 +116,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Segment, IsDegenerate) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Segment, Intersects_Plane) { - using ostk::mathematics::geometry::d3::object::Segment; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Segment; { EXPECT_TRUE(Segment({0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}).intersects(Plane({0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}))); @@ -166,8 +166,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Segment, Intersects_Sphere) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Segment, Intersects_Ellipsoid) { - using ostk::mathematics::geometry::d3::object::Segment; using ostk::mathematics::geometry::d3::object::Ellipsoid; + using ostk::mathematics::geometry::d3::object::Segment; { // See: OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Ellipsoid.Intersects @@ -226,9 +226,9 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Segment, GetCenter) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Segment, GetDirection) { - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Segment; + using ostk::mathematics::object::Vector3d; { EXPECT_EQ(Vector3d(0.0, 0.0, +1.0), Segment({0.0, 0.0, 0.0}, {0.0, 0.0, +2.0}).getDirection()); @@ -343,10 +343,10 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Segment, IntersectionWith_P { using ostk::core::type::Real; + using ostk::mathematics::geometry::d3::Intersection; + using ostk::mathematics::geometry::d3::object::Plane; using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Segment; - using ostk::mathematics::geometry::d3::object::Plane; - using ostk::mathematics::geometry::d3::Intersection; const auto expectSegmentIntersection = [](const Segment& aSegment, const Plane& aPlane, const Segment& anIntersectionSegment) -> void @@ -466,11 +466,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Segment, ApplyTransformatio { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::object::Segment; using ostk::mathematics::geometry::d3::Transformation; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Sphere.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Sphere.test.cpp index d732d649..66f40794 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Sphere.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Object/Sphere.test.cpp @@ -179,8 +179,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Sphere, Intersects_Line) { using ostk::core::type::Real; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Line; + using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Sphere; { @@ -641,8 +641,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Sphere, Intersects_Plane) { using ostk::core::type::Real; - using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Plane; + using ostk::mathematics::geometry::d3::object::Point; using ostk::mathematics::geometry::d3::object::Sphere; { @@ -685,8 +685,8 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Sphere, Intersects_Plane) TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Sphere, Intersects_Pyramid) { using ostk::mathematics::geometry::d3::object::Point; - using ostk::mathematics::geometry::d3::object::Sphere; using ostk::mathematics::geometry::d3::object::Pyramid; + using ostk::mathematics::geometry::d3::object::Sphere; { // See: OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Pyramid.Intersects_Sphere @@ -798,11 +798,11 @@ TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Object_Sphere, ApplyTransformation { using ostk::core::type::Real; - using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::object::Sphere; using ostk::mathematics::geometry::d3::Transformation; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; + using ostk::mathematics::object::Vector3d; // Translation diff --git a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/EulerAngle.test.cpp b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/EulerAngle.test.cpp index 533d052a..af742900 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/EulerAngle.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/EulerAngle.test.cpp @@ -11,17 +11,17 @@ #include -using ostk::core::type::String; -using ostk::core::filesystem::Path; -using ostk::core::filesystem::File; using ostk::core::container::Table; +using ostk::core::filesystem::File; +using ostk::core::filesystem::Path; +using ostk::core::type::String; -using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::transformation::rotation::EulerAngle; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; using ostk::mathematics::geometry::d3::transformation::rotation::RotationMatrix; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; +using ostk::mathematics::object::Vector3d; TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformation_Rotation_EulerAngle, Constructor) { 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 58e4f310..7ba52892 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/Quaternion.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/Quaternion.test.cpp @@ -11,19 +11,19 @@ #include +using ostk::core::container::Table; +using ostk::core::filesystem::File; +using ostk::core::filesystem::Path; using ostk::core::type::Real; using ostk::core::type::String; -using ostk::core::filesystem::Path; -using ostk::core::filesystem::File; -using ostk::core::container::Table; -using ostk::mathematics::object::Vector3d; -using ostk::mathematics::object::Vector4d; using ostk::mathematics::geometry::Angle; using ostk::mathematics::geometry::d3::transformation::rotation::EulerAngle; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; using ostk::mathematics::geometry::d3::transformation::rotation::RotationMatrix; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; +using ostk::mathematics::object::Vector3d; +using ostk::mathematics::object::Vector4d; TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformation_Rotation_Quaternion, Constructor) { 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 1ed154d1..d3110ee1 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationMatrix.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationMatrix.test.cpp @@ -11,19 +11,19 @@ #include +using ostk::core::container::Table; +using ostk::core::filesystem::File; +using ostk::core::filesystem::Path; using ostk::core::type::Real; using ostk::core::type::String; -using ostk::core::filesystem::Path; -using ostk::core::filesystem::File; -using ostk::core::container::Table; -using ostk::mathematics::object::Vector3d; -using ostk::mathematics::object::Matrix3d; using ostk::mathematics::geometry::Angle; +using ostk::mathematics::geometry::d3::transformation::rotation::EulerAngle; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; using ostk::mathematics::geometry::d3::transformation::rotation::RotationMatrix; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; -using ostk::mathematics::geometry::d3::transformation::rotation::EulerAngle; +using ostk::mathematics::object::Matrix3d; +using ostk::mathematics::object::Vector3d; TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformation_Rotation_RotationMatrix, Constructor) { 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 f4b8d97f..15f252af 100644 --- a/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationVector.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Geometry/3D/Transformations/Rotations/RotationVector.test.cpp @@ -10,17 +10,17 @@ #include +using ostk::core::container::Table; +using ostk::core::filesystem::File; +using ostk::core::filesystem::Path; using ostk::core::type::Real; using ostk::core::type::String; -using ostk::core::filesystem::Path; -using ostk::core::filesystem::File; -using ostk::core::container::Table; -using ostk::mathematics::object::Vector3d; using ostk::mathematics::geometry::Angle; +using ostk::mathematics::geometry::d3::transformation::rotation::EulerAngle; using ostk::mathematics::geometry::d3::transformation::rotation::Quaternion; using ostk::mathematics::geometry::d3::transformation::rotation::RotationVector; -using ostk::mathematics::geometry::d3::transformation::rotation::EulerAngle; +using ostk::mathematics::object::Vector3d; TEST(OpenSpaceToolkit_Mathematics_Geometry_3D_Transformation_Rotation_RotationVector, Constructor) { diff --git a/test/OpenSpaceToolkit/Mathematics/Object/Interval.test.cpp b/test/OpenSpaceToolkit/Mathematics/Object/Interval.test.cpp index a01b2ffe..8debf3b0 100644 --- a/test/OpenSpaceToolkit/Mathematics/Object/Interval.test.cpp +++ b/test/OpenSpaceToolkit/Mathematics/Object/Interval.test.cpp @@ -880,10 +880,10 @@ TEST(OpenSpaceToolkit_Mathematics_Object_Interval, GetUpperBound) TEST(OpenSpaceToolkit_Mathematics_Object_Interval, GetIntersectionWith) { - using ostk::core::type::String; - using ostk::core::type::Real; using ostk::core::container::Array; using ostk::core::container::Tuple; + using ostk::core::type::Real; + using ostk::core::type::String; using ostk::mathematics::object::Interval; @@ -943,10 +943,10 @@ TEST(OpenSpaceToolkit_Mathematics_Object_Interval, GetIntersectionWith) TEST(OpenSpaceToolkit_Mathematics_Object_Interval, GetUnionWith) { - using ostk::core::type::String; - using ostk::core::type::Real; using ostk::core::container::Array; using ostk::core::container::Tuple; + using ostk::core::type::Real; + using ostk::core::type::String; using ostk::mathematics::object::Interval; @@ -1023,9 +1023,9 @@ TEST(OpenSpaceToolkit_Mathematics_Object_Interval, GetUnionWith) TEST(OpenSpaceToolkit_Mathematics_Object_Interval, GenerateArrayWithSize) { - using ostk::core::type::Size; - using ostk::core::type::Real; using ostk::core::container::Array; + using ostk::core::type::Real; + using ostk::core::type::Size; using ostk::mathematics::object::Interval; diff --git a/thirdparty/clang/.clang-format b/thirdparty/clang/.clang-format index a6f28c4d..e7a53f25 100644 --- a/thirdparty/clang/.clang-format +++ b/thirdparty/clang/.clang-format @@ -145,7 +145,7 @@ ReferenceAlignment: Pointer ReflowComments: true SeparateDefinitionBlocks: Always SortIncludes: true -SortUsingDeclarations: Never +SortUsingDeclarations: Lexicographic SpaceAfterCStyleCast: false SpaceAfterLogicalNot: false SpaceAfterTemplateKeyword: true