open-space-toolkit-astrodynamics 6.1.0__py311-none-any.whl → 7.0.0__py311-none-any.whl

ostk/astrodynamics/test/trajectory/state/test_coordinate_broker.py

@@ -0,0 +1,84 @@
+# Apache License 2.0
+
+import pytest
+
+from ostk.astrodynamics.trajectory.state import CoordinateBroker, CoordinateSubset
+
+
+@pytest.fixture
+def coordinate_subsets() -> list:
+    return [CoordinateSubset("Subset1", 2), CoordinateSubset("Subset2", 3)]
+
+
+@pytest.fixture
+def coordinate_broker(coordinate_subsets) -> CoordinateBroker:
+    return CoordinateBroker(coordinate_subsets)
+
+
+@pytest.fixture
+def coordinates() -> list[float]:
+    return [1.0, 2.0, 3.0, 4.0, 5.0]
+
+
+class TestCoordinateBroker:
+    def test_constructor(self, coordinate_broker: CoordinateBroker):
+        assert coordinate_broker is not None
+
+    def test_eq(self, coordinate_broker: CoordinateBroker):
+        assert coordinate_broker == coordinate_broker
+
+    def test_ne(self, coordinate_broker: CoordinateBroker):
+        assert (coordinate_broker != coordinate_broker) == False
+
+    def test_access_subsets(
+        self, coordinate_broker: CoordinateBroker, coordinate_subsets: list
+    ):
+        assert coordinate_broker.access_subsets() == coordinate_subsets
+
+    def test_get_number_of_coordinates(self, coordinate_broker: CoordinateBroker):
+        assert coordinate_broker.get_number_of_coordinates() == 5
+
+    def test_get_number_of_subsets(self, coordinate_broker: CoordinateBroker):
+        assert coordinate_broker.get_number_of_subsets() == 2
+
+    def test_get_subsets(
+        self, coordinate_broker: CoordinateBroker, coordinate_subsets: list
+    ):
+        assert coordinate_broker.get_subsets() == coordinate_subsets
+
+    def test_add_subset(self, coordinate_broker: CoordinateBroker):
+        new_subset = CoordinateSubset("NewSubset", 4)
+        number_of_coordinates = coordinate_broker.get_number_of_coordinates()
+        assert coordinate_broker.add_subset(new_subset) == number_of_coordinates
+        assert coordinate_broker.has_subset(new_subset)
+
+    def test_has_subset(
+        self, coordinate_broker: CoordinateBroker, coordinate_subsets: list
+    ):
+        assert coordinate_broker.has_subset(coordinate_subsets[0])
+
+    def test_extract_coordinate(
+        self,
+        coordinate_broker: CoordinateBroker,
+        coordinates: list[float],
+        coordinate_subsets: list[CoordinateSubset],
+    ):
+        assert (
+            coordinate_broker.extract_coordinate(coordinates, coordinate_subsets[0])
+            == [1.0, 2.0]
+        ).all()
+        assert (
+            coordinate_broker.extract_coordinate(coordinates, coordinate_subsets[1])
+            == [3.0, 4.0, 5.0]
+        ).all()
+
+    def test_extract_coordinates(
+        self,
+        coordinate_broker: CoordinateBroker,
+        coordinates: list[float],
+        coordinate_subsets: list[CoordinateSubset],
+    ):
+        assert (
+            coordinate_broker.extract_coordinates(coordinates, coordinate_subsets)
+            == [1.0, 2.0, 3.0, 4.0, 5.0]
+        ).all()

ostk/astrodynamics/test/trajectory/state/test_coordinate_subset.py

@@ -0,0 +1,43 @@
+# Apache License 2.0
+
+import pytest
+
+from ostk.astrodynamics.trajectory.state import CoordinateSubset
+
+
+@pytest.fixture
+def name() -> str:
+    return "MySubset"
+
+
+@pytest.fixture
+def size() -> int:
+    return 3
+
+
+@pytest.fixture
+def coordinate_subset(name: str, size: int) -> CoordinateSubset:
+    return CoordinateSubset(name, size)
+
+
+class TestCoordinateSubset:
+    def test_constructor(self, coordinate_subset: CoordinateSubset):
+        assert coordinate_subset is not None
+
+    def test_eq(self, coordinate_subset: CoordinateSubset):
+        assert coordinate_subset == coordinate_subset
+
+    def test_ne(self, coordinate_subset: CoordinateSubset):
+        assert (coordinate_subset != coordinate_subset) == False
+
+    def test_get_id(self, coordinate_subset: CoordinateSubset):
+        assert coordinate_subset.get_id() is not None
+
+    def test_get_name(self, coordinate_subset: CoordinateSubset, name: str):
+        assert coordinate_subset.get_name() == name
+
+    def test_get_size(self, coordinate_subset: CoordinateSubset, size: int):
+        assert coordinate_subset.get_size() == size
+
+    def test_mass(self):
+        assert CoordinateSubset.mass() is not None

ostk/astrodynamics/test/trajectory/state/test_numerical_solver.py

@@ -11,8 +11,8 @@ from ostk.physics.coordinate import Frame
 from ostk.astrodynamics.trajectory import State
 from ostk.astrodynamics.trajectory.state import (
     NumericalSolver,
-    CoordinatesBroker,
-    CoordinatesSubset,
+    CoordinateBroker,
+    CoordinateSubset,
 )
 from ostk.astrodynamics.event_condition import RealCondition
 
@@ -28,15 +28,15 @@ def get_state_vec(time: float) -> np.ndarray:
 
 
 @pytest.fixture
-def coordinates_subsets() -> list[CoordinatesSubset]:
-    return [CoordinatesSubset("Subset", 2)]
+def coordinate_subsets() -> list[CoordinateSubset]:
+    return [CoordinateSubset("Subset", 2)]
 
 
 @pytest.fixture
-def coordinates_broker(
-    coordinates_subsets: list[CoordinatesSubset],
-) -> CoordinatesBroker:
-    return CoordinatesBroker(coordinates_subsets)
+def coordinate_broker(
+    coordinate_subsets: list[CoordinateSubset],
+) -> CoordinateBroker:
+    return CoordinateBroker(coordinate_subsets)
 
 
 @pytest.fixture
@@ -53,9 +53,9 @@ def frame() -> Frame:
 def initial_state(
     start_instant: Instant,
     frame: Frame,
-    coordinates_broker: CoordinatesBroker,
+    coordinate_broker: CoordinateBroker,
 ) -> State:
-    return State(start_instant, get_state_vec(0.0), frame, coordinates_broker)
+    return State(start_instant, get_state_vec(0.0), frame, coordinate_broker)
 
 
 @pytest.fixture

ostk/astrodynamics/test/trajectory/test_orbit.py

@@ -2,15 +2,15 @@
 
 import pytest
 
-from ostk.physics.environment.objects.celestial_bodies import Earth
-from ostk.physics.units import Length, Angle
+from ostk.physics.environment.object.celestial import Earth
+from ostk.physics.unit import Length, Angle
 from ostk.physics.time import Scale, Instant, DateTime, Time, Duration, Interval
 
 from ostk.astrodynamics.trajectory import Orbit, State
 from ostk.astrodynamics.trajectory.orbit import Pass
 from ostk.astrodynamics.trajectory.orbit import Pass
-from ostk.astrodynamics.trajectory.orbit.models import SGP4
-from ostk.astrodynamics.trajectory.orbit.models.sgp4 import TLE
+from ostk.astrodynamics.trajectory.orbit.model import SGP4
+from ostk.astrodynamics.trajectory.orbit.model.sgp4 import TLE
 
 
 @pytest.fixture

ostk/astrodynamics/test/trajectory/test_propagator.py

@@ -4,12 +4,12 @@ import pytest
 
 import numpy as np
 
-from ostk.mathematics.geometry.d3.objects import Cuboid
-from ostk.mathematics.geometry.d3.objects import Composite
-from ostk.mathematics.geometry.d3.objects import Point
+from ostk.mathematics.geometry.d3.object import Cuboid
+from ostk.mathematics.geometry.d3.object import Composite
+from ostk.mathematics.geometry.d3.object import Point
 
 from ostk.physics import Environment
-from ostk.physics.units import Mass
+from ostk.physics.unit import Mass
 from ostk.physics.time import Instant
 from ostk.physics.time import DateTime
 from ostk.physics.time import Scale
@@ -17,7 +17,7 @@ from ostk.physics.time import Duration
 from ostk.physics.coordinate import Position
 from ostk.physics.coordinate import Velocity
 from ostk.physics.coordinate import Frame
-from ostk.physics.environment.objects.celestial_bodies import Earth, Sun
+from ostk.physics.environment.object.celestial import Earth, Sun
 from ostk.physics.environment.gravitational import Earth as EarthGravitationalModel
 from ostk.physics.environment.magnetic import Earth as EarthMagneticModel
 from ostk.physics.environment.atmospheric import Earth as EarthAtmosphericModel
@@ -25,10 +25,10 @@ from ostk.physics.environment.atmospheric import Earth as EarthAtmosphericModel
 from ostk.astrodynamics.trajectory import LocalOrbitalFrameFactory
 from ostk.astrodynamics.trajectory import LocalOrbitalFrameDirection
 
-from ostk.astrodynamics.trajectory.state import CoordinatesSubset
-from ostk.astrodynamics.trajectory.state.coordinates_subset import CartesianPosition
-from ostk.astrodynamics.trajectory.state.coordinates_subset import CartesianVelocity
-from ostk.astrodynamics.trajectory.state import CoordinatesBroker
+from ostk.astrodynamics.trajectory.state import CoordinateSubset
+from ostk.astrodynamics.trajectory.state.coordinate_subset import CartesianPosition
+from ostk.astrodynamics.trajectory.state.coordinate_subset import CartesianVelocity
+from ostk.astrodynamics.trajectory.state import CoordinateBroker
 from ostk.astrodynamics.trajectory.state import NumericalSolver
 
 from ostk.astrodynamics.flight.system import PropulsionSystem
@@ -40,8 +40,8 @@ from ostk.astrodynamics.dynamics import PositionDerivative
 from ostk.astrodynamics.dynamics import AtmosphericDrag
 from ostk.astrodynamics.guidance_law import ConstantThrust
 from ostk.astrodynamics.trajectory import State
-from ostk.astrodynamics.trajectory.state import CoordinatesSubset, CoordinatesBroker
-from ostk.astrodynamics.trajectory.state.coordinates_subset import (
+from ostk.astrodynamics.trajectory.state import CoordinateSubset, CoordinateBroker
+from ostk.astrodynamics.trajectory.state.coordinate_subset import (
     CartesianPosition,
     CartesianVelocity,
 )
@@ -99,32 +99,32 @@ def environment(earth) -> Environment:
 
 
 @pytest.fixture
-def coordinates_broker_7d():
-    return CoordinatesBroker(
+def coordinate_broker_7d():
+    return CoordinateBroker(
         [
             CartesianPosition.default(),
             CartesianVelocity.default(),
-            CoordinatesSubset.mass(),
+            CoordinateSubset.mass(),
         ]
     )
 
 
 @pytest.fixture
-def coordinates_broker_9d():
-    return CoordinatesBroker(
+def coordinate_broker_9d():
+    return CoordinateBroker(
         [
             CartesianPosition.default(),
             CartesianVelocity.default(),
-            CoordinatesSubset.mass(),
-            CoordinatesSubset.surface_area(),
-            CoordinatesSubset.drag_coefficient(),
+            CoordinateSubset.mass(),
+            CoordinateSubset.surface_area(),
+            CoordinateSubset.drag_coefficient(),
         ]
     )
 
 
 @pytest.fixture
 def state(
-    satellite_system: SatelliteSystem, coordinates_broker_7d: CoordinatesBroker
+    satellite_system: SatelliteSystem, coordinate_broker_7d: CoordinateBroker
 ) -> State:
     instant: Instant = Instant.date_time(DateTime(2018, 1, 1, 0, 0, 0), Scale.UTC)
 
@@ -140,12 +140,12 @@ def state(
         satellite_system.get_mass().in_kilograms() + propellant_mass,
     ]
 
-    return State(instant, coordinates, Frame.GCRF(), coordinates_broker_7d)
+    return State(instant, coordinates, Frame.GCRF(), coordinate_broker_7d)
 
 
 @pytest.fixture
 def state_low_altitude(
-    satellite_system: SatelliteSystem, coordinates_broker_9d: CoordinatesBroker
+    satellite_system: SatelliteSystem, coordinate_broker_9d: CoordinateBroker
 ) -> State:
     instant: Instant = Instant.date_time(DateTime(2018, 1, 1, 0, 0, 0), Scale.UTC)
 
@@ -165,7 +165,7 @@ def state_low_altitude(
         cd,
     ]
 
-    return State(instant, coordinates, Frame.GCRF(), coordinates_broker_9d)
+    return State(instant, coordinates, Frame.GCRF(), coordinate_broker_9d)
 
 
 @pytest.fixture

ostk/astrodynamics/test/trajectory/test_segment.py

@@ -9,7 +9,7 @@ from ostk.physics.time import DateTime
 from ostk.physics.time import Scale
 from ostk.physics.time import Duration
 from ostk.physics.coordinate import Frame
-from ostk.physics.environment.objects.celestial_bodies import Earth
+from ostk.physics.environment.object.celestial import Earth
 
 from ostk.astrodynamics.trajectory.state import NumericalSolver
 from ostk.astrodynamics.flight.system import SatelliteSystem
@@ -20,10 +20,10 @@ from ostk.astrodynamics.guidance_law import ConstantThrust
 from ostk.astrodynamics.trajectory import State
 from ostk.astrodynamics.trajectory import Segment
 from ostk.astrodynamics.event_condition import InstantCondition
-from ostk.astrodynamics.trajectory.state import CoordinatesSubset
-from ostk.astrodynamics.trajectory.state import CoordinatesBroker
-from ostk.astrodynamics.trajectory.state.coordinates_subset import CartesianPosition
-from ostk.astrodynamics.trajectory.state.coordinates_subset import CartesianVelocity
+from ostk.astrodynamics.trajectory.state import CoordinateSubset
+from ostk.astrodynamics.trajectory.state import CoordinateBroker
+from ostk.astrodynamics.trajectory.state.coordinate_subset import CartesianPosition
+from ostk.astrodynamics.trajectory.state.coordinate_subset import CartesianVelocity
 
 
 @pytest.fixture
@@ -44,14 +44,14 @@ def state() -> State:
         300.0,
     ]
     frame: Frame = Frame.GCRF()
-    coordinates_broker: CoordinatesBroker = CoordinatesBroker(
+    coordinate_broker: CoordinateBroker = CoordinateBroker(
         [
             CartesianPosition.default(),
             CartesianVelocity.default(),
-            CoordinatesSubset.mass(),
+            CoordinateSubset.mass(),
         ]
     )
-    return State(instant, coordinates, frame, coordinates_broker)
+    return State(instant, coordinates, frame, coordinate_broker)
 
 
 @pytest.fixture

ostk/astrodynamics/test/trajectory/test_sequence.py

@@ -4,23 +4,23 @@ import pytest
 
 import numpy as np
 
-from ostk.mathematics.geometry.d3.objects import Composite
-from ostk.mathematics.geometry.d3.objects import Cuboid
-from ostk.mathematics.geometry.d3.objects import Point
+from ostk.mathematics.geometry.d3.object import Composite
+from ostk.mathematics.geometry.d3.object import Cuboid
+from ostk.mathematics.geometry.d3.object import Point
 
 from ostk.physics import Environment
 from ostk.physics.coordinate import Frame
 from ostk.physics.environment.atmospheric import Earth as EarthAtmosphericModel
 from ostk.physics.environment.gravitational import Earth as EarthGravitationalModel
 from ostk.physics.environment.magnetic import Earth as EarthMagneticModel
-from ostk.physics.environment.objects.celestial_bodies import Earth
+from ostk.physics.environment.object.celestial import Earth
 from ostk.physics.time import DateTime
 from ostk.physics.time import Duration
 from ostk.physics.time import Instant
 from ostk.physics.time import Scale
-from ostk.physics.units import Derived
-from ostk.physics.units import Length
-from ostk.physics.units import Mass
+from ostk.physics.unit import Derived
+from ostk.physics.unit import Length
+from ostk.physics.unit import Mass
 
 from ostk.astrodynamics.event_condition import COECondition
 from ostk.astrodynamics.event_condition import InstantCondition
@@ -36,11 +36,11 @@ from ostk.astrodynamics.trajectory import LocalOrbitalFrameFactory
 from ostk.astrodynamics.trajectory import Segment
 from ostk.astrodynamics.trajectory import Sequence
 from ostk.astrodynamics.trajectory import State
-from ostk.astrodynamics.trajectory.state import CoordinatesBroker
-from ostk.astrodynamics.trajectory.state import CoordinatesSubset
+from ostk.astrodynamics.trajectory.state import CoordinateBroker
+from ostk.astrodynamics.trajectory.state import CoordinateSubset
 from ostk.astrodynamics.trajectory.state import NumericalSolver
-from ostk.astrodynamics.trajectory.state.coordinates_subset import CartesianPosition
-from ostk.astrodynamics.trajectory.state.coordinates_subset import CartesianVelocity
+from ostk.astrodynamics.trajectory.state.coordinate_subset import CartesianPosition
+from ostk.astrodynamics.trajectory.state.coordinate_subset import CartesianVelocity
 
 
 @pytest.fixture
@@ -112,14 +112,14 @@ def environment() -> Environment:
 
 
 @pytest.fixture
-def coordinates_broker() -> CoordinatesBroker:
-    return CoordinatesBroker(
+def coordinate_broker() -> CoordinateBroker:
+    return CoordinateBroker(
         [
             CartesianPosition.default(),
             CartesianVelocity.default(),
-            CoordinatesSubset.mass(),
-            CoordinatesSubset.surface_area(),
-            CoordinatesSubset.drag_coefficient(),
+            CoordinateSubset.mass(),
+            CoordinateSubset.surface_area(),
+            CoordinateSubset.drag_coefficient(),
         ]
     )
 
@@ -143,7 +143,7 @@ def state(
     wet_mass: Mass,
     cross_sectional_surface_area: float,
     drag_coefficient: float,
-    coordinates_broker: CoordinatesBroker,
+    coordinate_broker: CoordinateBroker,
 ) -> State:
     frame: Frame = Frame.GCRF()
     instant: Instant = Instant.date_time(DateTime(2018, 1, 1, 0, 0, 0), Scale.UTC)
@@ -168,7 +168,7 @@ def state(
             drag_coefficient,
         ],
         frame,
-        coordinates_broker,
+        coordinate_broker,
     )
 
 

ostk/astrodynamics/test/trajectory/test_state.py

@@ -14,8 +14,8 @@ from ostk.physics.coordinate import Velocity
 from ostk.physics.coordinate import Frame
 
 from ostk.astrodynamics.trajectory import State
-from ostk.astrodynamics.trajectory.state import CoordinatesBroker
-from ostk.astrodynamics.trajectory.state.coordinates_subset import (
+from ostk.astrodynamics.trajectory.state import CoordinateBroker
+from ostk.astrodynamics.trajectory.state.coordinate_subset import (
     CartesianPosition,
     CartesianVelocity,
 )
@@ -53,14 +53,28 @@ def angular_velocity() -> np.ndarray:
 
 @pytest.fixture
 def state(
-    instant: Instant, position: Position, velocity: Velocity, frame: Frame
+    instant: Instant,
+    position: Position,
+    velocity: Velocity,
 ) -> State:
     return State(instant, position, velocity)
 
 
 @pytest.fixture
-def coordinates_broker() -> CoordinatesBroker:
-    return CoordinatesBroker([CartesianPosition.default(), CartesianVelocity.default()])
+def profile_state(
+    instant: Instant,
+    position: Position,
+    velocity: Velocity,
+    attitude: Quaternion,
+    angular_velocity: np.ndarray,
+    frame: Frame,
+) -> State:
+    return State(instant, position, velocity, attitude, angular_velocity, frame)
+
+
+@pytest.fixture
+def coordinate_broker() -> CoordinateBroker:
+    return CoordinateBroker([CartesianPosition.default(), CartesianVelocity.default()])
 
 
 class TestState:
@@ -95,7 +109,7 @@ class TestState:
         position: Position,
         velocity: Velocity,
         frame: Frame,
-        coordinates_broker: CoordinatesBroker,
+        coordinate_broker: CoordinateBroker,
     ):
         state = State(instant, position, velocity)
         assert state is not None
@@ -106,7 +120,7 @@ class TestState:
             instant,
             np.append(position.get_coordinates(), velocity.get_coordinates()),
             frame,
-            coordinates_broker,
+            coordinate_broker,
         )
 
         assert state is not None
@@ -173,24 +187,24 @@ class TestState:
 
     def test_getters(
         self,
-        state: State,
+        profile_state: State,
         instant: Instant,
         position: Position,
         velocity: Velocity,
+        attitude: Quaternion,
+        angular_velocity: np.ndarray,
         frame: Frame,
-        coordinates_broker: CoordinatesBroker,
     ):
-        assert state.get_instant() == instant
-        assert state.get_position() == position
-        assert state.get_velocity() == velocity
-        assert state.has_subset(CartesianPosition.default())
-        assert state.has_subset(CartesianVelocity.default())
-        assert state.get_frame() == frame
-        assert (
-            state.get_coordinates()
-            == np.append(position.get_coordinates(), velocity.get_coordinates())
-        ).all()
-        assert state.get_coordinates_subsets() == coordinates_broker.get_subsets()
+        assert profile_state.get_instant() == instant
+        assert profile_state.get_position() == position
+        assert profile_state.get_velocity() == velocity
+        assert profile_state.get_attitude() == attitude
+        assert np.all(profile_state.get_angular_velocity() == angular_velocity)
+        assert profile_state.has_subset(CartesianPosition.default())
+        assert profile_state.has_subset(CartesianVelocity.default())
+        assert profile_state.get_frame() == frame
+        assert profile_state.get_coordinates() is not None
+        assert profile_state.get_coordinate_subsets() is not None
 
     def test_in_frame(
         self,

ostk/astrodynamics/test/trajectory/test_state_builder.py

@@ -14,10 +14,10 @@ from ostk.astrodynamics.trajectory import (
     StateBuilder,
 )
 from ostk.astrodynamics.trajectory.state import (
-    CoordinatesBroker,
-    CoordinatesSubset,
+    CoordinateBroker,
+    CoordinateSubset,
 )
-from ostk.astrodynamics.trajectory.state.coordinates_subset import (
+from ostk.astrodynamics.trajectory.state.coordinate_subset import (
     CartesianPosition,
     CartesianVelocity,
 )
@@ -34,7 +34,7 @@ def frame() -> Frame:
 
 
 @pytest.fixture
-def coordinates_subsets() -> list[CoordinatesSubset]:
+def coordinate_subsets() -> list[CoordinateSubset]:
     return [CartesianPosition.default(), CartesianVelocity.default()]
 
 
@@ -44,10 +44,10 @@ def coordinates() -> list[float]:
 
 
 @pytest.fixture
-def coordinates_broker(
-    coordinates_subsets: list[CoordinatesSubset],
-) -> CoordinatesBroker:
-    return CoordinatesBroker(coordinates_subsets)
+def coordinate_broker(
+    coordinate_subsets: list[CoordinateSubset],
+) -> CoordinateBroker:
+    return CoordinateBroker(coordinate_subsets)
 
 
 @pytest.fixture
@@ -55,23 +55,23 @@ def state(
     instant: Instant,
     coordinates: list[float],
     frame: Frame,
-    coordinates_broker: CoordinatesBroker,
+    coordinate_broker: CoordinateBroker,
 ) -> State:
-    return State(instant, coordinates, frame, coordinates_broker)
+    return State(instant, coordinates, frame, coordinate_broker)
 
 
 @pytest.fixture
-def state_builder(frame: Frame, coordinates_broker: CoordinatesBroker) -> State:
-    return StateBuilder(frame, coordinates_broker)
+def state_builder(frame: Frame, coordinate_broker: CoordinateBroker) -> State:
+    return StateBuilder(frame, coordinate_broker)
 
 
 class TestStateBuilder:
     def test_broker_constructor(
         self,
         frame: Frame,
-        coordinates_broker: CoordinatesBroker,
+        coordinate_broker: CoordinateBroker,
     ):
-        builder = StateBuilder(frame, coordinates_broker)
+        builder = StateBuilder(frame, coordinate_broker)
         assert builder is not None
         assert isinstance(builder, StateBuilder)
         assert builder.is_defined()
@@ -79,9 +79,9 @@ class TestStateBuilder:
     def test_subsets_constructor(
         self,
         frame: Frame,
-        coordinates_subsets: list[CoordinatesSubset],
+        coordinate_subsets: list[CoordinateSubset],
     ):
-        builder = StateBuilder(frame, coordinates_subsets)
+        builder = StateBuilder(frame, coordinate_subsets)
         assert builder is not None
         assert isinstance(builder, StateBuilder)
         assert builder.is_defined()
@@ -103,7 +103,7 @@ class TestStateBuilder:
         self,
         state_builder: StateBuilder,
     ):
-        added_builder: StateBuilder = state_builder + CoordinatesSubset.mass()
+        added_builder: StateBuilder = state_builder + CoordinateSubset.mass()
         assert isinstance(added_builder, StateBuilder)
         assert state_builder != added_builder
 
@@ -125,7 +125,7 @@ class TestStateBuilder:
         assert state.get_instant() == instant
         assert (state.get_coordinates() == coordinates).all()
         assert state.get_frame() == state_builder.get_frame()
-        assert state.get_coordinates_subsets() == state_builder.get_coordinates_subsets()
+        assert state.get_coordinate_subsets() == state_builder.get_coordinate_subsets()
 
     def test_reduce(
         self,
@@ -146,14 +146,14 @@ class TestStateBuilder:
             [
                 CartesianPosition.default(),
                 CartesianVelocity.default(),
-                CoordinatesSubset.mass(),
+                CoordinateSubset.mass(),
             ],
         )
         default_state: State = State(
             state.get_instant(),
             [100],
             state.get_frame(),
-            CoordinatesBroker([CoordinatesSubset.mass()]),
+            CoordinateBroker([CoordinateSubset.mass()]),
         )
         expanded_state: State = builder.expand(state, default_state)
 
@@ -165,7 +165,7 @@ class TestStateBuilder:
         self,
         state_builder: StateBuilder,
         frame: Frame,
-        coordinates_broker: CoordinatesBroker,
+        coordinate_broker: CoordinateBroker,
     ):
         assert state_builder.get_frame() == frame
-        assert state_builder.get_coordinates_subsets() == coordinates_broker.get_subsets()
+        assert state_builder.get_coordinate_subsets() == coordinate_broker.get_subsets()

ostk/astrodynamics/utilities.py

@@ -11,7 +11,7 @@ from ostk.physics.coordinate.spherical import LLA
 from ostk.physics.coordinate.spherical import AER
 from ostk.physics.coordinate import Position
 from ostk.physics.coordinate import Frame
-from ostk.physics.environment.objects.celestial_bodies import Earth
+from ostk.physics.environment.object.celestial import Earth
 from ostk.physics.environment.gravitational import Earth as EarthGravitationalModel