open-space-toolkit-astrodynamics 13.1.0__py310-none-manylinux2014_x86_64.whl → 15.0.0__py310-none-manylinux2014_x86_64.whl

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

@@ -1,5 +1,7 @@
 # Apache License 2.0
 
+from typing import Callable
+
 import pytest
 
 import numpy as np
@@ -99,7 +101,7 @@ def absolute_tolerance() -> float:
 
 
 @pytest.fixture
-def state_logger() -> callable:
+def state_logger() -> Callable:
     def log_state(state: State) -> None:
         print(state.get_coordinates())
 
@@ -255,7 +257,7 @@ class TestNumericalSolver:
     def test_integrate_conditional_with_logger(
         self,
         initial_state: State,
-        state_logger: callable,
+        state_logger: Callable,
         custom_condition: RealCondition,
         capsys,
     ):

ostk/astrodynamics/test/trajectory/test_local_orbital_frame_factory.py

@@ -1,5 +1,7 @@
 # Apache License 2.0
 
+from typing import Callable
+
 import pytest
 
 from ostk.physics.time import Instant
@@ -7,7 +9,10 @@ from ostk.physics.time import DateTime
 from ostk.physics.time import Scale
 from ostk.physics.coordinate import Frame
 from ostk.physics.coordinate import Transform
+from ostk.physics.coordinate import Position
+from ostk.physics.coordinate import Velocity
 
+from ostk.astrodynamics.trajectory import State
 from ostk.astrodynamics.trajectory import LocalOrbitalFrameFactory
 from ostk.astrodynamics.trajectory import LocalOrbitalFrameTransformProvider
 
@@ -23,8 +28,8 @@ def local_orbital_transform_provider_type() -> LocalOrbitalFrameTransformProvide
 
 
 @pytest.fixture
-def transform_generator() -> callable:
-    return lambda instant, position, velocity: Transform.identity(Transform.Type.passive)
+def transform_generator() -> Callable:
+    return lambda state: Transform.identity(Transform.Type.passive)
 
 
 @pytest.fixture
@@ -38,13 +43,24 @@ def instant() -> Instant:
 
 
 @pytest.fixture
-def position_vector() -> list:
-    return [7500000.0, 0.0, 0.0]
+def position() -> Position:
+    return Position.meters([7500000.0, 0.0, 0.0], Frame.GCRF())
 
 
 @pytest.fixture
-def velocity_vector() -> list:
-    return [0.0, 5335.865450622126, 5335.865450622126]
+def velocity() -> Velocity:
+    return Velocity.meters_per_second(
+        [0.0, 5335.865450622126, 5335.865450622126], Frame.GCRF()
+    )
+
+
+@pytest.fixture
+def state(
+    instant: Instant,
+    position: Position,
+    velocity: Velocity,
+) -> State:
+    return State(instant, position, velocity)
 
 
 class TestLocalOrbitalFrameFactory:
@@ -66,15 +82,9 @@ class TestLocalOrbitalFrameFactory:
     def test_generate_frame(
         self,
         local_orbital_frame_factory: LocalOrbitalFrameFactory,
-        instant: Instant,
-        position_vector: list,
-        velocity_vector: list,
+        state: State,
     ):
-        frame = local_orbital_frame_factory.generate_frame(
-            instant,
-            position_vector,
-            velocity_vector,
-        )
+        frame = local_orbital_frame_factory.generate_frame(state=state)
 
         assert frame is not None
         assert frame.is_defined()
@@ -99,7 +109,7 @@ class TestLocalOrbitalFrameFactory:
 
     def test_custom_constructor(
         self,
-        transform_generator: callable,
+        transform_generator: Callable,
         parent_frame: Frame,
     ):
         assert (

ostk/astrodynamics/test/trajectory/test_propagator.py

@@ -15,8 +15,6 @@ from ostk.physics.time import Instant
 from ostk.physics.time import DateTime
 from ostk.physics.time import Scale
 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.object.celestial import Earth, Sun
 from ostk.physics.environment.gravitational import Earth as EarthGravitationalModel
@@ -25,13 +23,12 @@ 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 CoordinateSubset
 from ostk.astrodynamics.trajectory.state.coordinate_subset import CartesianPosition
 from ostk.astrodynamics.trajectory.state.coordinate_subset import CartesianVelocity
+from ostk.astrodynamics.trajectory.state.coordinate_subset import CartesianAcceleration
 from ostk.astrodynamics.trajectory.state import CoordinateBroker
 from ostk.astrodynamics.trajectory.state import NumericalSolver
-
 from ostk.astrodynamics import Dynamics
 from ostk.astrodynamics.dynamics import Thruster
 from ostk.astrodynamics.dynamics import CentralBodyGravity
@@ -43,22 +40,9 @@ from ostk.astrodynamics.flight import Maneuver
 from ostk.astrodynamics.flight.system import PropulsionSystem
 from ostk.astrodynamics.flight.system import SatelliteSystem
 from ostk.astrodynamics.trajectory import State
-from ostk.astrodynamics.trajectory.state import CoordinateSubset, CoordinateBroker
-from ostk.astrodynamics.trajectory.state.coordinate_subset import (
-    CartesianPosition,
-    CartesianVelocity,
-)
 from ostk.astrodynamics.trajectory import Propagator
 
 
-from ..flight.test_maneuver import (
-    instants as maneuver_instants,
-    acceleration_profile as maneuver_acceleration_profile,
-    frame as maneuver_frame,
-    mass_flow_rate_profile as maneuver_mass_flow_rate_profile,
-)
-
-
 @pytest.fixture
 def propulsion_system() -> PropulsionSystem:
     return PropulsionSystem(
@@ -249,19 +233,29 @@ def event_condition(state: State) -> InstantCondition:
     )
 
 
+@pytest.fixture
+def maneuver_states(frame: Frame) -> list[State]:
+    return [
+        State(
+            Instant.J2000() + Duration.seconds(float(i)),
+            [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, -1e-3],
+            frame,
+            [
+                CartesianPosition.default(),
+                CartesianVelocity.default(),
+                CartesianAcceleration.thrust_acceleration(),
+                CoordinateSubset.mass_flow_rate(),
+            ],
+        )
+        for i in range(0, 100, 10)
+    ]
+
+
 @pytest.fixture
 def maneuver(
-    maneuver_instants: list[Instant],
-    maneuver_acceleration_profile: list[np.ndarray],
-    maneuver_frame: Frame,
-    maneuver_mass_flow_rate_profile: list[float],
+    maneuver_states: list[State],
 ) -> Maneuver:
-    return Maneuver(
-        maneuver_instants,
-        maneuver_acceleration_profile,
-        maneuver_frame,
-        maneuver_mass_flow_rate_profile,
-    )
+    return Maneuver(states=maneuver_states)
 
 
 @pytest.fixture

ostk/astrodynamics/test/trajectory/test_segment.py

@@ -183,7 +183,6 @@ class TestSegmentSolution:
     ):
         assert segment_solution.compute_delta_mass() is not None
 
-    @pytest.mark.skip(reason="Not implemented yet")
     def test_extract_maneuvers(
         self,
         segment_solution: Segment.Solution,

ostk/astrodynamics/test/trajectory/test_state_builder.py

@@ -169,3 +169,4 @@ class TestStateBuilder:
     ):
         assert state_builder.get_frame() == frame
         assert state_builder.get_coordinate_subsets() == coordinate_broker.get_subsets()
+        assert state_builder.get_size() == coordinate_broker.get_number_of_coordinates()