Skip to content

Commit

Permalink
refactor: rename abbreviated namespaces to full pathing (#100)
Browse files Browse the repository at this point in the history 
* refactor: rename abbreviated namespaces to full pathing

* refactor: rename abbreviated namespaces to full pathing
  • Loading branch information
@vishwa2710
vishwa2710 authored Nov 22, 2023
1 parent 86899ac commit cf4f059
Show file tree
Hide file tree
Showing 155 changed files with 1,897 additions and 1,903 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ ENDIF ()

### Open Space Toolkit ▸ Core [0.2.x]

FIND_PACKAGE ("OpenSpaceToolkitCore" "0.2" REQUIRED)
FIND_PACKAGE ("OpenSpaceToolkitCore" "1.0" REQUIRED)

IF (NOT OpenSpaceToolkitCore_FOUND)

Expand Down
2 changes: 1 addition & 1 deletion bindings/python/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

numpy>=1.17.4

open-space-toolkit-core~=0.7.3
open-space-toolkit-core~=1.0.0
4 changes: 2 additions & 2 deletions ...ython/src/OpenSpaceToolkitMathematicsPy/CurveFitting/Interpolator/BarycentricRational.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ inline void OpenSpaceToolkitMathematicsPy_CurveFitting_Interpolator_BarycentricR
{
using namespace pybind11;

using ostk::math::obj::VectorXd;
using ostk::math::object::VectorXd;

using ostk::math::curvefitting::interp::BarycentricRational;
using ostk::math::curvefitting::interpolator::BarycentricRational;

// noncopyable class with Boost, removed in Pybind11
class_<BarycentricRational>(aModule, "BarycentricRational")
Expand Down
4 changes: 2 additions & 2 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/CurveFitting/Interpolator/CubicSpline.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ inline void OpenSpaceToolkitMathematicsPy_CurveFitting_Interpolator_CubicSpline(
using namespace pybind11;

using ostk::core::types::Real;
using ostk::math::obj::VectorXd;
using ostk::math::object::VectorXd;

using ostk::math::curvefitting::interp::CubicSpline;
using ostk::math::curvefitting::interpolator::CubicSpline;

// noncopyable class with Boost, removed in Pybind11
class_<CubicSpline>(aModule, "CubicSpline")
Expand Down
4 changes: 2 additions & 2 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/CurveFitting/Interpolator/Linear.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ inline void OpenSpaceToolkitMathematicsPy_CurveFitting_Interpolator_Linear(pybin
{
using namespace pybind11;

using ostk::math::obj::VectorXd;
using ostk::math::object::VectorXd;

using ostk::math::curvefitting::interp::Linear;
using ostk::math::curvefitting::interpolator::Linear;

// noncopyable class with Boost, removed in Pybind11
class_<Linear>(aModule, "Linear")
Expand Down
18 changes: 9 additions & 9 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Intersection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Intersection(pybind11::mod
using ostk::core::types::Unique;
using ostk::core::ctnr::Array;

using ostk::math::geom::d2::Object;
using ostk::math::geom::d2::objects::Point;
using ostk::math::geom::d2::objects::PointSet;
using ostk::math::geom::d2::objects::Line;
using ostk::math::geom::d2::objects::Segment;
using ostk::math::geom::d2::objects::LineString;
using ostk::math::geom::d2::objects::Polygon;
using ostk::math::geom::d2::objects::Composite;
using ostk::math::geom::d2::Intersection;
using ostk::math::geometry::d2::Object;
using ostk::math::geometry::d2::objects::Point;
using ostk::math::geometry::d2::objects::PointSet;
using ostk::math::geometry::d2::objects::Line;
using ostk::math::geometry::d2::objects::Segment;
using ostk::math::geometry::d2::objects::LineString;
using ostk::math::geometry::d2::objects::Polygon;
using ostk::math::geometry::d2::objects::Composite;
using ostk::math::geometry::d2::Intersection;

class_<Intersection> intersection(aModule, "Intersection");

Expand Down
8 changes: 4 additions & 4 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Object.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
// The following trampoline function might be used if the virtual functions defined in C++ are to be overriden in Python
// Probably not needed for now. To be included if writing python extension classes

// using ostk::math::geom::d2::Object ;
// using ostk::math::geom::d2::Transformation ;
// using ostk::math::geometry::d2::Object ;
// using ostk::math::geometry::d2::Transformation ;
// using ostk::core::types::String ;
// using ostk::core::types::Integer ;

Expand All @@ -18,7 +18,7 @@
// {
// public:
// /* Inherit the constructors */
// using ostk::math::geom::d2::Object::Object;
// using ostk::math::geometry::d2::Object::Object;

// /* Trampoline (need one for each virtual function) */
// virtual Object* clone() const override {
Expand Down Expand Up @@ -78,7 +78,7 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Object(pybind11::module &a
{
using namespace pybind11;

using ostk::math::geom::d2::Object;
using ostk::math::geometry::d2::Object;

// noncopyable class with Boost, removed in Pybind11
class_<Object> ob(aModule, "Object");
Expand Down
18 changes: 9 additions & 9 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Objects/Composite.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Objects_Composite(pybind11
using ostk::core::types::Shared;
using ostk::core::types::Real;

using ostk::math::geom::d2::Object;
using ostk::math::geom::d2::objects::Point;
using ostk::math::geom::d2::objects::PointSet;
using ostk::math::geom::d2::objects::Line;
using ostk::math::geom::d2::objects::Segment;
using ostk::math::geom::d2::objects::LineString;
using ostk::math::geom::d2::objects::Polygon;
using ostk::math::geom::d2::objects::Composite;
using ostk::math::geom::d2::Intersection;
using ostk::math::geometry::d2::Object;
using ostk::math::geometry::d2::objects::Point;
using ostk::math::geometry::d2::objects::PointSet;
using ostk::math::geometry::d2::objects::Line;
using ostk::math::geometry::d2::objects::Segment;
using ostk::math::geometry::d2::objects::LineString;
using ostk::math::geometry::d2::objects::Polygon;
using ostk::math::geometry::d2::objects::Composite;
using ostk::math::geometry::d2::Intersection;

class_<Composite, Object>(aModule, "Composite")

Expand Down
10 changes: 5 additions & 5 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Objects/Line.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Objects_Line(pybind11::mod

using ostk::core::types::Real;

using ostk::math::obj::Vector2d;
using ostk::math::geom::d2::Object;
using ostk::math::geom::d2::objects::Point;
using ostk::math::geom::d2::objects::PointSet;
using ostk::math::geom::d2::objects::Line;
using ostk::math::object::Vector2d;
using ostk::math::geometry::d2::Object;
using ostk::math::geometry::d2::objects::Point;
using ostk::math::geometry::d2::objects::PointSet;
using ostk::math::geometry::d2::objects::Line;

class_<Line, Object>(aModule, "Line")

Expand Down
6 changes: 3 additions & 3 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Objects/LineString.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Objects_LineString(pybind1
using ostk::core::types::Integer;
using ostk::core::ctnr::Array;

using ostk::math::geom::d2::Object;
using ostk::math::geom::d2::objects::Point;
using ostk::math::geom::d2::objects::LineString;
using ostk::math::geometry::d2::Object;
using ostk::math::geometry::d2::objects::Point;
using ostk::math::geometry::d2::objects::LineString;

class_<LineString, Object>(aModule, "LineString")

Expand Down
12 changes: 6 additions & 6 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Objects/MultiPolygon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Objects_MultiPolygon(pybin
using ostk::core::types::Integer;
using ostk::core::ctnr::Array;

using ostk::math::obj::Vector2d;
using ostk::math::geom::d2::Object;
using ostk::math::geom::d2::objects::Point;
using ostk::math::geom::d2::objects::PointSet;
using ostk::math::geom::d2::objects::Polygon;
using ostk::math::geom::d2::objects::MultiPolygon;
using ostk::math::object::Vector2d;
using ostk::math::geometry::d2::Object;
using ostk::math::geometry::d2::objects::Point;
using ostk::math::geometry::d2::objects::PointSet;
using ostk::math::geometry::d2::objects::Polygon;
using ostk::math::geometry::d2::objects::MultiPolygon;

class_<MultiPolygon, Object>(aModule, "MultiPolygon")

Expand Down
10 changes: 5 additions & 5 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Objects/Point.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include <OpenSpaceToolkit/Mathematics/Geometry/2D/Objects/Point.hpp>

using ostk::core::ctnr::Array;
using ostk::math::geom::d2::objects::Point;
using ostk::math::obj::VectorXd;
using ostk::math::geometry::d2::objects::Point;
using ostk::math::object::VectorXd;

void set_point_array(const Array<Point>& anArray)
{
Expand All @@ -23,9 +23,9 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Objects_Point(pybind11::mo
using ostk::core::types::Integer;
using ostk::core::types::Real;

using ostk::math::obj::Vector2d;
using ostk::math::geom::d2::Object;
using ostk::math::geom::d2::objects::Point;
using ostk::math::object::Vector2d;
using ostk::math::geometry::d2::Object;
using ostk::math::geometry::d2::objects::Point;

class_<Point, Object>(aModule, "Point")

Expand Down
6 changes: 3 additions & 3 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Objects/PointSet.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Objects_PointSet(pybind11:
using ostk::core::types::Integer;
using ostk::core::ctnr::Array;

using ostk::math::geom::d2::Object;
using ostk::math::geom::d2::objects::Point;
using ostk::math::geom::d2::objects::PointSet;
using ostk::math::geometry::d2::Object;
using ostk::math::geometry::d2::objects::Point;
using ostk::math::geometry::d2::objects::PointSet;

class_<PointSet, Object>(aModule, "PointSet")

Expand Down
10 changes: 5 additions & 5 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Objects/Polygon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Objects_Polygon(pybind11::
using ostk::core::types::Integer;
using ostk::core::ctnr::Array;

using ostk::math::obj::Vector2d;
using ostk::math::geom::d2::Object;
using ostk::math::geom::d2::objects::Point;
using ostk::math::geom::d2::objects::PointSet;
using ostk::math::geom::d2::objects::Polygon;
using ostk::math::object::Vector2d;
using ostk::math::geometry::d2::Object;
using ostk::math::geometry::d2::objects::Point;
using ostk::math::geometry::d2::objects::PointSet;
using ostk::math::geometry::d2::objects::Polygon;

class_<Polygon, Object>(aModule, "Polygon")

Expand Down
8 changes: 4 additions & 4 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Objects/Segment.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Objects_Segment(pybind11::

using ostk::core::types::Integer;

using ostk::math::geom::d2::Object;
using ostk::math::geom::d2::objects::Point;
using ostk::math::geom::d2::objects::PointSet;
using ostk::math::geom::d2::objects::Segment;
using ostk::math::geometry::d2::Object;
using ostk::math::geometry::d2::objects::Point;
using ostk::math::geometry::d2::objects::PointSet;
using ostk::math::geometry::d2::objects::Segment;

class_<Segment, Object>(aModule, "Segment")

Expand Down
8 changes: 4 additions & 4 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/2D/Transformation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_2D_Transformation(pybind11::m
{
using namespace pybind11;

using ostk::math::obj::Vector2d;
using ostk::math::obj::Matrix3d;
using ostk::math::geom::d2::Transformation;
using ostk::math::geom::d2::objects::Point;
using ostk::math::object::Vector2d;
using ostk::math::object::Matrix3d;
using ostk::math::geometry::d2::Transformation;
using ostk::math::geometry::d2::objects::Point;

class_<Transformation> transf(aModule, "Transformation");

Expand Down
30 changes: 15 additions & 15 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Intersection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Intersection(pybind11::mod
using ostk::core::types::Unique;
using ostk::core::ctnr::Array;

using ostk::math::geom::d3::Object;
using ostk::math::geom::d3::objects::Point;
using ostk::math::geom::d3::objects::PointSet;
using ostk::math::geom::d3::objects::Line;
using ostk::math::geom::d3::objects::Ray;
using ostk::math::geom::d3::objects::Segment;
using ostk::math::geom::d3::objects::LineString;
using ostk::math::geom::d3::objects::Polygon;
using ostk::math::geom::d3::objects::Plane;
using ostk::math::geom::d3::objects::Sphere;
using ostk::math::geom::d3::objects::Ellipsoid;
using ostk::math::geom::d3::objects::Cuboid;
using ostk::math::geom::d3::objects::Pyramid;
using ostk::math::geom::d3::objects::Composite;
using ostk::math::geom::d3::Intersection;
using ostk::math::geometry::d3::Object;
using ostk::math::geometry::d3::objects::Point;
using ostk::math::geometry::d3::objects::PointSet;
using ostk::math::geometry::d3::objects::Line;
using ostk::math::geometry::d3::objects::Ray;
using ostk::math::geometry::d3::objects::Segment;
using ostk::math::geometry::d3::objects::LineString;
using ostk::math::geometry::d3::objects::Polygon;
using ostk::math::geometry::d3::objects::Plane;
using ostk::math::geometry::d3::objects::Sphere;
using ostk::math::geometry::d3::objects::Ellipsoid;
using ostk::math::geometry::d3::objects::Cuboid;
using ostk::math::geometry::d3::objects::Pyramid;
using ostk::math::geometry::d3::objects::Composite;
using ostk::math::geometry::d3::Intersection;

// scope in_Intersection = class_<Intersection>("Intersection", init<const Array<Unique<Object>>>())
class_<Intersection> intersection(aModule, "Intersection");
Expand Down
24 changes: 12 additions & 12 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Object.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Object(pybind11::module& a
{
using namespace pybind11;

using ostk::math::geom::d3::Object;
using ostk::math::geom::d3::objects::Point;
using ostk::math::geom::d3::objects::PointSet;
using ostk::math::geom::d3::objects::Line;
using ostk::math::geom::d3::objects::Ray;
using ostk::math::geom::d3::objects::Segment;
using ostk::math::geom::d3::objects::LineString;
using ostk::math::geom::d3::objects::Polygon;
using ostk::math::geom::d3::objects::Plane;
using ostk::math::geom::d3::objects::Sphere;
using ostk::math::geom::d3::objects::Ellipsoid;
using ostk::math::geom::d3::objects::Pyramid;
using ostk::math::geometry::d3::Object;
using ostk::math::geometry::d3::objects::Point;
using ostk::math::geometry::d3::objects::PointSet;
using ostk::math::geometry::d3::objects::Line;
using ostk::math::geometry::d3::objects::Ray;
using ostk::math::geometry::d3::objects::Segment;
using ostk::math::geometry::d3::objects::LineString;
using ostk::math::geometry::d3::objects::Polygon;
using ostk::math::geometry::d3::objects::Plane;
using ostk::math::geometry::d3::objects::Sphere;
using ostk::math::geometry::d3::objects::Ellipsoid;
using ostk::math::geometry::d3::objects::Pyramid;

// class_<Object, boost::noncopyable>("Object", no_init)
class_<Object>(aModule, "Object")
Expand Down
34 changes: 17 additions & 17 deletions bindings/python/src/OpenSpaceToolkitMathematicsPy/Geometry/3D/Objects/Composite.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ inline void OpenSpaceToolkitMathematicsPy_Geometry_3D_Objects_Composite(pybind11
using ostk::core::types::Shared;
using ostk::core::types::Real;

using ostk::math::obj::Vector3d;
using ostk::math::geom::d3::Object;
using ostk::math::geom::d3::objects::Point;
using ostk::math::geom::d3::objects::PointSet;
using ostk::math::geom::d3::objects::Line;
using ostk::math::geom::d3::objects::Ray;
using ostk::math::geom::d3::objects::Segment;
using ostk::math::geom::d3::objects::LineString;
using ostk::math::geom::d3::objects::Polygon;
using ostk::math::geom::d3::objects::Plane;
using ostk::math::geom::d3::objects::Sphere;
using ostk::math::geom::d3::objects::Ellipsoid;
using ostk::math::geom::d3::objects::Cuboid;
using ostk::math::geom::d3::objects::Pyramid;
using ostk::math::geom::d3::objects::Composite;
using ostk::math::geom::d3::Intersection;
using ostk::math::geom::d3::trf::rot::Quaternion;
using ostk::math::object::Vector3d;
using ostk::math::geometry::d3::Object;
using ostk::math::geometry::d3::objects::Point;
using ostk::math::geometry::d3::objects::PointSet;
using ostk::math::geometry::d3::objects::Line;
using ostk::math::geometry::d3::objects::Ray;
using ostk::math::geometry::d3::objects::Segment;
using ostk::math::geometry::d3::objects::LineString;
using ostk::math::geometry::d3::objects::Polygon;
using ostk::math::geometry::d3::objects::Plane;
using ostk::math::geometry::d3::objects::Sphere;
using ostk::math::geometry::d3::objects::Ellipsoid;
using ostk::math::geometry::d3::objects::Cuboid;
using ostk::math::geometry::d3::objects::Pyramid;
using ostk::math::geometry::d3::objects::Composite;
using ostk::math::geometry::d3::Intersection;
using ostk::math::geometry::d3::trf::rot::Quaternion;

class_<Composite, Object>(aModule, "Composite")

Expand Down
Loading

0 comments on commit cf4f059

Please sign in to comment.