Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor!: rename abbreviated namespaces to full pathing for Core/IO/Math #191

Closed
wants to merge 1 commit into from
Closed

refactor!: rename abbreviated namespaces to full pathing for Core/IO/Math #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ ENDIF ()

### Open Space Toolkit ▸ Core

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

IF (NOT OpenSpaceToolkitCore_FOUND)

Expand All @@ -298,7 +298,7 @@ ENDIF ()

### Open Space Toolkit ▸ I/O

FIND_PACKAGE ("OpenSpaceToolkitIO" "0.2" REQUIRED)
FIND_PACKAGE ("OpenSpaceToolkitIO" "1.0" REQUIRED)

IF (NOT OpenSpaceToolkitIO_FOUND)

Expand All @@ -308,7 +308,7 @@ ENDIF ()

### Open Space Toolkit ▸ Mathematics

FIND_PACKAGE ("OpenSpaceToolkitMathematics" "0.2" REQUIRED)
FIND_PACKAGE ("OpenSpaceToolkitMathematics" "1.0" REQUIRED)

IF (NOT OpenSpaceToolkitMathematics_FOUND)

Expand Down
6 changes: 3 additions & 3 deletions bindings/python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

numpy>=1.17.4

open-space-toolkit-core~=0.7.3
open-space-toolkit-io~=0.7.2
open-space-toolkit-mathematics~=0.7.5
open-space-toolkit-core~=1.0.0
open-space-toolkit-io~=1.0.0
open-space-toolkit-mathematics~=1.0.0
2 changes: 1 addition & 1 deletion bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Axes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ inline void OpenSpaceToolkitPhysicsPy_Coordinate_Axes(pybind11::module& aModule)

using ostk::core::types::Shared;

using ostk::math::obj::Vector3d;
using ostk::math::object::Vector3d;

using ostk::physics::coord::Axes;
using ostk::physics::coord::Frame;
Expand Down
2 changes: 1 addition & 1 deletion bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Position.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ inline void OpenSpaceToolkitPhysicsPy_Coordinate_Position(pybind11::module& aMod
using ostk::core::types::Integer;
using ostk::core::types::Shared;

using ostk::math::obj::Vector3d;
using ostk::math::object::Vector3d;

using ostk::physics::coord::Position;
using ostk::physics::coord::Frame;
Expand Down
6 changes: 3 additions & 3 deletions bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Transform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ inline void OpenSpaceToolkitPhysicsPy_Coordinate_Transform(pybind11::module& aMo

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

using ostk::math::obj::Vector3d;
using ostk::math::geom::d3::trf::rot::Quaternion;
using ostk::math::geom::d3::trf::rot::RotationVector;
using ostk::math::object::Vector3d;
using ostk::math::geometry::d3::trf::rot::Quaternion;
using ostk::math::geometry::d3::trf::rot::RotationVector;

using ostk::physics::time::Instant;

Expand Down
2 changes: 1 addition & 1 deletion bindings/python/src/OpenSpaceToolkitPhysicsPy/Coordinate/Velocity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ inline void OpenSpaceToolkitPhysicsPy_Coordinate_Velocity(pybind11::module& aMod
using ostk::core::types::Integer;
using ostk::core::types::Shared;

using ostk::math::obj::Vector3d;
using ostk::math::object::Vector3d;

using ostk::physics::coord::Velocity;
using ostk::physics::coord::Frame;
Expand Down
2 changes: 1 addition & 1 deletion bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Gravitational/Earth.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Gravitational_Earth(pybind11::

using ostk::core::types::Integer;
using ostk::core::types::Shared;
using ostk::core::fs::Directory;
using ostk::core::filesystem::Directory;

using ostk::physics::environment::gravitational::Model;
using ostk::physics::environment::gravitational::Earth;
Expand Down
2 changes: 1 addition & 1 deletion bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Gravitational/Moon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Gravitational_Moon(pybind11::m
{
using namespace pybind11;

using ostk::core::fs::Directory;
using ostk::core::filesystem::Directory;
using ostk::core::types::Shared;

using ostk::physics::environment::gravitational::Model;
Expand Down
2 changes: 1 addition & 1 deletion bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Gravitational/Sun.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Gravitational_Sun(pybind11::mo
{
using namespace pybind11;

using ostk::core::fs::Directory;
using ostk::core::filesystem::Directory;
using ostk::core::types::Shared;

using ostk::physics::environment::gravitational::Model;
Expand Down
2 changes: 1 addition & 1 deletion bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Magnetic/Dipole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Magnetic_Dipole(pybind11::modu
{
using namespace pybind11;

using ostk::math::obj::Vector3d;
using ostk::math::object::Vector3d;

using ostk::physics::environment::magnetic::Dipole;

Expand Down
2 changes: 1 addition & 1 deletion bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Magnetic/Earth.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Magnetic_Earth(pybind11::modul
{
using namespace pybind11;

using ostk::core::fs::Directory;
using ostk::core::filesystem::Directory;
using ostk::core::types::Shared;

using ostk::physics::units::Derived;
Expand Down
24 changes: 12 additions & 12 deletions bindings/python/src/OpenSpaceToolkitPhysicsPy/Environment/Object/Geometry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Object_Geometry(pybind11::modu
using ostk::core::types::Unique;
using ostk::core::types::Shared;

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::geom::d3::objects::Composite;
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;
using ostk::math::geometry::d3::objects::Composite;

using ostk::physics::coord::Frame;
using ostk::physics::environment::object::Geometry;
Expand Down
2 changes: 1 addition & 1 deletion bindings/python/src/OpenSpaceToolkitPhysicsPy/Time/Interval.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,5 @@ inline void OpenSpaceToolkitPhysicsPy_Time_Interval(pybind11::module& aModule)

;

implicitly_convertible<ostk::math::obj::Interval<ostk::physics::time::Instant>, Interval>();
implicitly_convertible<ostk::math::object::Interval<ostk::physics::time::Instant>, Interval>();
}
8 changes: 4 additions & 4 deletions bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Derived/Angle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ inline void OpenSpaceToolkitPhysicsPy_Units_Derived_Angle(pybind11::module& aMod
using ostk::core::types::Integer;
using ostk::core::types::Real;

using ostk::math::obj::Vector2d;
using ostk::math::obj::Vector3d;
using ostk::math::object::Vector2d;
using ostk::math::object::Vector3d;

using ostk::physics::units::Angle;

Expand Down Expand Up @@ -151,6 +151,6 @@ inline void OpenSpaceToolkitPhysicsPy_Units_Derived_Angle(pybind11::module& aMod

;

implicitly_convertible<ostk::physics::units::Angle, ostk::math::geom::Angle>();
implicitly_convertible<ostk::math::geom::Angle, ostk::physics::units::Angle>();
implicitly_convertible<ostk::physics::units::Angle, ostk::math::geometry::Angle>();
implicitly_convertible<ostk::math::geometry::Angle, ostk::physics::units::Angle>();
}
2 changes: 1 addition & 1 deletion bindings/python/src/OpenSpaceToolkitPhysicsPy/Units/Length.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ inline void OpenSpaceToolkitPhysicsPy_Units_Length(pybind11::module& aModule)

;

using ostk::math::obj::Interval;
using ostk::math::object::Interval;

class_<Interval<Length>>(aModule, "Interval")

Expand Down
12 changes: 6 additions & 6 deletions docker/development/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ RUN git clone https://github.com/geographiclib/geographiclib /tmp/geographiclib

## Open Space Toolkit ▸ Core

ARG OSTK_CORE_MAJOR="0"
ARG OSTK_CORE_MINOR="7"
ARG OSTK_CORE_MAJOR="1"
ARG OSTK_CORE_MINOR="0"

## Force an image rebuild when new Core patch versions are detected
ADD https://api.github.com/repos/open-space-collective/open-space-toolkit-core/git/matching-refs/tags/${OSTK_CORE_MAJOR}.${OSTK_CORE_MINOR} /tmp/open-space-toolkit-core/versions.json
Expand All @@ -138,8 +138,8 @@ RUN mkdir -p /tmp/open-space-toolkit-core \

## Open Space Toolkit ▸ I/O

ARG OSTK_IO_MAJOR="0"
ARG OSTK_IO_MINOR="7"
ARG OSTK_IO_MAJOR="1"
ARG OSTK_IO_MINOR="0"

## Force an image rebuild when new IO patch versions are detected
ADD https://api.github.com/repos/open-space-collective/open-space-toolkit-io/git/matching-refs/tags/${OSTK_IO_MAJOR}.${OSTK_IO_MINOR} /tmp/open-space-toolkit-io/versions.json
Expand All @@ -154,8 +154,8 @@ RUN mkdir -p /tmp/open-space-toolkit-io \

## Open Space Toolkit ▸ Mathematics

ARG OSTK_MATHEMATICS_MAJOR="0"
ARG OSTK_MATHEMATICS_MINOR="7"
ARG OSTK_MATHEMATICS_MAJOR="1"
ARG OSTK_MATHEMATICS_MINOR="0"

## Force an image rebuild when new Math patch versions are detected
ADD https://api.github.com/repos/open-space-collective/open-space-toolkit-mathematics/git/matching-refs/tags/${OSTK_MATHEMATICS_MAJOR}.${OSTK_MATHEMATICS_MINOR} /tmp/open-space-toolkit-mathematics/versions.json
Expand Down
2 changes: 1 addition & 1 deletion include/OpenSpaceToolkit/Physics/Coordinate/Axes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace coord

using ostk::core::types::Shared;

using ostk::math::obj::Vector3d;
using ostk::math::object::Vector3d;

using ostk::physics::time::Instant;

Expand Down
2 changes: 1 addition & 1 deletion include/OpenSpaceToolkit/Physics/Coordinate/Frame.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ using ostk::core::types::Shared;
using ostk::core::types::Real;
using ostk::core::types::String;

using ostk::math::obj::Vector3d;
using ostk::math::object::Vector3d;

using ostk::physics::coord::Position;
using ostk::physics::coord::Velocity;
Expand Down
6 changes: 3 additions & 3 deletions include/OpenSpaceToolkit/Physics/Coordinate/Frame/Providers/IERS/BulletinA.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ namespace provider
namespace iers
{

namespace fs = ostk::core::fs;
namespace filesystem = ostk::core::filesystem;

using ostk::core::types::Integer;
using ostk::core::types::Real;
using ostk::core::ctnr::Map;
using ostk::core::fs::File;
using ostk::core::filesystem::File;

using ostk::physics::time::Date;
using ostk::physics::time::Instant;
Expand Down Expand Up @@ -197,7 +197,7 @@ class BulletinA
/// @param [in] aFile A file
/// @return Bulletin A object

static BulletinA Load(const fs::File& aFile);
static BulletinA Load(const filesystem::File& aFile);

private:
Date releaseDate_;
Expand Down
6 changes: 3 additions & 3 deletions include/OpenSpaceToolkit/Physics/Coordinate/Frame/Providers/IERS/BulletinB.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ namespace provider
namespace iers
{

namespace fs = ostk::core::fs;
namespace filesystem = ostk::core::filesystem;

using ostk::core::types::Integer;
using ostk::core::types::Real;
using ostk::core::ctnr::Map;
using ostk::core::fs::File;
using ostk::core::filesystem::File;

using ostk::physics::time::Date;
using ostk::physics::time::Instant;
Expand Down Expand Up @@ -86,7 +86,7 @@ class BulletinB
/// @param [in] aFile A file.
/// @return Bulletin B object.

static BulletinB Load(const fs::File& aFile);
static BulletinB Load(const filesystem::File& aFile);

private:
Date releaseDate_;
Expand Down
8 changes: 4 additions & 4 deletions include/OpenSpaceToolkit/Physics/Coordinate/Frame/Providers/IERS/Finals2000A.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ namespace provider
namespace iers
{

namespace fs = ostk::core::fs;
namespace filesystem = ostk::core::filesystem;

using ostk::core::types::Integer;
using ostk::core::types::Real;
using ostk::core::ctnr::Pair;
using ostk::core::ctnr::Map;
using ostk::core::fs::File;
using ostk::core::filesystem::File;

using ostk::math::obj::Vector2d;
using ostk::math::object::Vector2d;

using ostk::physics::time::Date;
using ostk::physics::time::Instant;
Expand Down Expand Up @@ -150,7 +150,7 @@ class Finals2000A
/// @param [in] aFile A file
/// @return Finals2000A object

static Finals2000A Load(const fs::File& aFile);
static Finals2000A Load(const filesystem::File& aFile);

private:
Instant lastModifiedTimestamp_;
Expand Down
4 changes: 2 additions & 2 deletions include/OpenSpaceToolkit/Physics/Coordinate/Frame/Providers/IERS/Manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ namespace iers
using ostk::core::types::Index;
using ostk::core::types::Real;
using ostk::core::ctnr::Array;
using ostk::core::fs::Directory;
using ostk::core::filesystem::Directory;

using ostk::math::obj::Vector2d;
using ostk::math::object::Vector2d;

using ostk::physics::time::Instant;
using ostk::physics::time::Duration;
Expand Down
4 changes: 2 additions & 2 deletions include/OpenSpaceToolkit/Physics/Coordinate/Position.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ using ostk::core::types::Shared;
using ostk::core::types::Integer;
using ostk::core::types::String;

using ostk::math::geom::d3::objects::Point;
using ostk::math::obj::Vector3d;
using ostk::math::geometry::d3::objects::Point;
using ostk::math::object::Vector3d;

using ostk::physics::units::Length;
using ostk::physics::time::Instant;
Expand Down
2 changes: 1 addition & 1 deletion include/OpenSpaceToolkit/Physics/Coordinate/Spherical/AER.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace spherical

using ostk::core::types::String;

using ostk::math::obj::Vector3d;
using ostk::math::object::Vector3d;

using ostk::physics::units::Angle;
using ostk::physics::units::Length;
Expand Down
2 changes: 1 addition & 1 deletion include/OpenSpaceToolkit/Physics/Coordinate/Spherical/LLA.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace spherical
using ostk::core::types::Real;
using ostk::core::types::String;

using ostk::math::obj::Vector3d;
using ostk::math::object::Vector3d;

using ostk::physics::units::Length;
using ostk::physics::units::Angle;
Expand Down
4 changes: 2 additions & 2 deletions include/OpenSpaceToolkit/Physics/Coordinate/Transform.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ namespace coord
using ostk::core::types::Real;
using ostk::core::types::String;

using ostk::math::obj::Vector3d;
using ostk::math::geom::d3::trf::rot::Quaternion;
using ostk::math::object::Vector3d;
using ostk::math::geometry::d3::trf::rot::Quaternion;

using ostk::physics::time::Instant;

Expand Down
2 changes: 1 addition & 1 deletion include/OpenSpaceToolkit/Physics/Coordinate/Velocity.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ using ostk::core::types::Shared;
using ostk::core::types::Integer;
using ostk::core::types::String;

using ostk::math::obj::Vector3d;
using ostk::math::object::Vector3d;

using ostk::physics::units::Derived;
using ostk::physics::time::Instant;
Expand Down
2 changes: 1 addition & 1 deletion include/OpenSpaceToolkit/Physics/Data/Direction.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ using ostk::core::types::Shared;
using ostk::core::types::Integer;
using ostk::core::types::String;

using ostk::math::obj::Vector3d;
using ostk::math::object::Vector3d;

using ostk::physics::time::Instant;
using ostk::physics::coord::Frame;
Expand Down
2 changes: 1 addition & 1 deletion include/OpenSpaceToolkit/Physics/Data/Manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace physics
namespace data
{

using ostk::core::fs::Directory;
using ostk::core::filesystem::Directory;

using ostk::io::URL;

Expand Down
Loading