Skip to content

refactor: rename abbreviated namespaces to full pathing #190

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.

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

Merged
merged 1 commit into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment(pybind11::module& aModule)

using ostk::physics::time::Instant;
using ostk::physics::Environment;
using ostk::physics::env::Object;
using ostk::physics::environment::Object;

class_<Environment>(aModule, "Environment")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Atmospheric_Earth(pybind11::mo
using ostk::physics::environment::atmospheric::Earth;
using EarthGravityModel = ostk::physics::environment::gravitational::Earth;

using ostk::physics::env::obj::Celestial;
using ostk::physics::environment::object::Celestial;
using ostk::physics::units::Length;
using ostk::physics::time::Instant;
using ostk::physics::coord::Position;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Atmospheric_Earth_NRLMSISE00(p
using ostk::physics::time::Instant;
using ostk::physics::coord::Frame;
using ostk::physics::coord::spherical::LLA;
using ostk::physics::env::obj::Celestial;
using ostk::physics::environment::object::Celestial;
using EarthGravityModel = ostk::physics::environment::gravitational::Earth;
using EarthAtmosphericModel = ostk::physics::environment::atmospheric::Earth;
using ostk::physics::environment::atmospheric::earth::NRLMSISE00;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Object(pybind11::module& aModu
using ostk::core::types::String;

using ostk::physics::time::Instant;
using ostk::physics::env::Object;
using ostk::physics::environment::Object;

// Binding class "Object"
class_<Object, Shared<Object>>(aModule, "Object")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Object_Geometry(pybind11::modu
using ostk::math::geom::d3::objects::Composite;

using ostk::physics::coord::Frame;
using ostk::physics::env::object::Geometry;
using ostk::physics::environment::object::Geometry;

class_<Geometry>(aModule, "Geometry")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Objects_Celestial(pybind11::mo
using ostk::physics::time::Instant;
using ostk::physics::units::Length;
using ostk::physics::units::Derived;
using ostk::physics::env::Ephemeris;
using ostk::physics::env::Object;
using ostk::physics::env::obj::Celestial;
using ostk::physics::environment::Ephemeris;
using ostk::physics::environment::Object;
using ostk::physics::environment::object::Celestial;
using GravitationalModel = ostk::physics::environment::gravitational::Model;
using MagneticModel = ostk::physics::environment::magnetic::Model;
using AtmosphericModel = ostk::physics::environment::atmospheric::Model;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Objects_CelestialBodies_Earth(
using ostk::physics::units::Derived;
using ostk::physics::coord::Frame;
using ostk::physics::time::Instant;
using ostk::physics::env::Ephemeris;
using ostk::physics::env::ephem::Analytical;
using ostk::physics::env::obj::Celestial;
using ostk::physics::env::obj::celest::Earth;
using ostk::physics::environment::Ephemeris;
using ostk::physics::environment::ephemerides::Analytical;
using ostk::physics::environment::object::Celestial;
using ostk::physics::environment::object::celestial::Earth;
using EarthGravitationalModel = ostk::physics::environment::gravitational::Earth;
using EarthMagneticModel = ostk::physics::environment::magnetic::Earth;
using EarthAtmosphericModel = ostk::physics::environment::atmospheric::Earth;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Objects_CelestialBodies_Moon(p
using ostk::core::types::Shared;

using ostk::physics::time::Instant;
using ostk::physics::env::Ephemeris;
using ostk::physics::env::obj::Celestial;
using ostk::physics::env::obj::celest::Moon;
using ostk::physics::environment::Ephemeris;
using ostk::physics::environment::object::Celestial;
using ostk::physics::environment::object::celestial::Moon;
using MoonGravitationalModel = ostk::physics::environment::gravitational::Moon;

{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ inline void OpenSpaceToolkitPhysicsPy_Environment_Objects_CelestialBodies_Sun(py
using ostk::core::types::Shared;

using ostk::physics::time::Instant;
using ostk::physics::env::Ephemeris;
using ostk::physics::env::obj::Celestial;
using ostk::physics::env::obj::celest::Sun;
using ostk::physics::environment::Ephemeris;
using ostk::physics::environment::object::Celestial;
using ostk::physics::environment::object::celestial::Sun;
using SunGravitationalModel = ostk::physics::environment::gravitational::Sun;

{
Expand Down
2 changes: 1 addition & 1 deletion include/OpenSpaceToolkit/Physics/Data/Providers/Nadir.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace providers
using ostk::physics::data::Direction;
using ostk::physics::coord::Position;
using ostk::physics::Environment;
using ostk::physics::env::obj::Celestial;
using ostk::physics::environment::object::Celestial;

Direction Nadir(const Position& aPosition, const Celestial& aCelestialObject, const Environment& anEnvironment);

Expand Down
4 changes: 2 additions & 2 deletions include/OpenSpaceToolkit/Physics/Environment.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ using ostk::core::ctnr::Array;

using ostk::physics::time::Instant;
using ostk::physics::coord::Position;
using ostk::physics::env::Object;
using ostk::physics::env::obj::Celestial;
using ostk::physics::environment::Object;
using ostk::physics::environment::object::Celestial;

/// @brief Environment modeling

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ using ostk::physics::coord::Position;
using ostk::physics::coord::spherical::LLA;
using ostk::physics::units::Length;
using ostk::physics::coord::Frame;
using ostk::physics::env::obj::Celestial;
using ostk::physics::environment::object::Celestial;
using ostk::physics::environment::atmospheric::Model;
using EarthGravitationalModel = ostk::physics::environment::gravitational::Earth;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ using ostk::physics::time::Instant;
using ostk::physics::units::Length;
using ostk::physics::coord::spherical::LLA;
using ostk::physics::coord::Frame;
using ostk::physics::env::obj::Celestial;
using ostk::physics::environment::object::Celestial;
using ostk::physics::environment::atmospheric::Model;
using EarthAtmosphericModel = ostk::physics::environment::atmospheric::Earth;
using EarthGravitationalModel = ostk::physics::environment::gravitational::Earth;
Expand Down
4 changes: 2 additions & 2 deletions include/OpenSpaceToolkit/Physics/Environment/Constants.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ namespace ostk
{
namespace physics
{
namespace env
namespace environment
{

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

} // namespace env
} // namespace environment
} // namespace physics
} // namespace ostk

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ namespace ostk
{
namespace physics
{
namespace env
namespace environment
{
namespace ephem
namespace ephemerides
{

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

using ostk::physics::time::Instant;
using ostk::physics::coord::Frame;
using ostk::physics::env::Ephemeris;
using ostk::physics::environment::Ephemeris;

class Analytical : public Ephemeris
{
Expand All @@ -41,8 +41,8 @@ class Analytical : public Ephemeris
Shared<const Frame> frameSPtr_;
};

} // namespace ephem
} // namespace env
} // namespace ephemerides
} // namespace environment
} // namespace physics
} // namespace ostk

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ namespace ostk
{
namespace physics
{
namespace env
namespace environment
{
namespace ephem
namespace ephemerides
{

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

using ostk::physics::time::Instant;
using ostk::physics::coord::Frame;
using ostk::physics::env::Ephemeris;
using ostk::physics::environment::Ephemeris;

/// @brief SPICE Toolkit ephemeris
///
Expand Down Expand Up @@ -91,8 +91,8 @@ class SPICE : public Ephemeris
SPICE::Object object_;
};

} // namespace ephem
} // namespace env
} // namespace ephemerides
} // namespace environment
} // namespace physics
} // namespace ostk

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ namespace ostk
{
namespace physics
{
namespace env
namespace environment
{
namespace ephem
namespace ephemerides
{
namespace spice
{
Expand All @@ -48,8 +48,8 @@ using ostk::physics::time::Instant;
using ostk::physics::time::Interval;
using ostk::physics::coord::Frame;
using ostk::physics::coord::Transform;
using ostk::physics::env::ephem::SPICE;
using ostk::physics::env::ephem::spice::Kernel;
using ostk::physics::environment::ephemerides::SPICE;
using ostk::physics::environment::ephemerides::spice::Kernel;

/// @brief SPICE Toolkit engine
///
Expand Down Expand Up @@ -183,8 +183,8 @@ class Engine
};

} // namespace spice
} // namespace ephem
} // namespace env
} // namespace ephemerides
} // namespace environment
} // namespace physics
} // namespace ostk

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ namespace ostk
{
namespace physics
{
namespace env
namespace environment
{
namespace ephem
namespace ephemerides
{
namespace spice
{
Expand Down Expand Up @@ -135,15 +135,15 @@ class Kernel
};

} // namespace spice
} // namespace ephem
} // namespace env
} // namespace ephemerides
} // namespace environment
} // namespace physics
} // namespace ostk

namespace std
{

using ostk::physics::env::ephem::spice::Kernel;
using ostk::physics::environment::ephemerides::spice::Kernel;

template <>
struct hash<Kernel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ namespace ostk
{
namespace physics
{
namespace env
namespace environment
{
namespace ephem
namespace ephemerides
{
namespace spice
{
Expand All @@ -45,7 +45,7 @@ using ostk::core::fs::Directory;
using ostk::io::URL;

using ostk::physics::time::Instant;
using ostk::physics::env::ephem::spice::Kernel;
using ostk::physics::environment::ephemerides::spice::Kernel;

using ManifestManager = ostk::physics::data::Manager;

Expand Down Expand Up @@ -131,8 +131,8 @@ class Manager
};

} // namespace spice
} // namespace ephem
} // namespace env
} // namespace ephemerides
} // namespace environment
} // namespace physics
} // namespace ostk

Expand Down
4 changes: 2 additions & 2 deletions include/OpenSpaceToolkit/Physics/Environment/Ephemeris.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace ostk
{
namespace physics
{
namespace env
namespace environment
{

using ostk::core::types::Shared;
Expand All @@ -38,7 +38,7 @@ class Ephemeris
virtual Shared<const Frame> accessFrame() const = 0;
};

} // namespace env
} // namespace environment
} // namespace physics
} // namespace ostk

Expand Down
4 changes: 2 additions & 2 deletions include/OpenSpaceToolkit/Physics/Environment/Object.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace ostk
{
namespace physics
{
namespace env
namespace environment
{

using ostk::core::types::Unique;
Expand Down Expand Up @@ -82,7 +82,7 @@ class Object
Object::Geometry geometry_;
};

} // namespace env
} // namespace environment
} // namespace physics
} // namespace ostk

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace ostk
{
namespace physics
{
namespace env
namespace environment
{
namespace object
{
Expand Down Expand Up @@ -147,7 +147,7 @@ class Geometry
};

} // namespace object
} // namespace env
} // namespace environment
} // namespace physics
} // namespace ostk

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ namespace ostk
{
namespace physics
{
namespace env
namespace environment
{
namespace obj
namespace object
{

using ostk::core::types::Shared;
Expand All @@ -52,8 +52,8 @@ using ostk::physics::coord::spherical::LLA;
using ostk::physics::coord::Axes;
using ostk::physics::coord::Frame;
using ostk::physics::coord::Transform;
using ostk::physics::env::Object;
using ostk::physics::env::Ephemeris;
using ostk::physics::environment::Object;
using ostk::physics::environment::Ephemeris;
using GravitationalModel = ostk::physics::environment::gravitational::Model;
using MagneticModel = ostk::physics::environment::magnetic::Model;
using AtmosphericModel = ostk::physics::environment::atmospheric::Model;
Expand Down Expand Up @@ -191,8 +191,8 @@ class Celestial : public Object
Shared<AtmosphericModel> atmosphericModelSPtr_;
};

} // namespace obj
} // namespace env
} // namespace object
} // namespace environment
} // namespace physics
} // namespace ostk

Expand Down
Loading