fix tests

fix slow tests

update CHANGELOG

Update rocketpy/simulation/flight.py

fix lint

Author: Gui-FernandesBR

CHANGELOG.md

@@ -41,7 +41,7 @@ Attention: The newest changes should be on top -->
 
 ### Changed
 
--
+- ENH: Refactor Flight class to improve time node handling and sensor/controllers [#843](https://github.com/RocketPy-Team/RocketPy/pull/843)
 
 ### Fixed
 

rocketpy/plots/flight_plots.py

@@ -656,9 +656,16 @@ def energy_data(self, *, filename=None):  # pylint: disable=too-many-statements
         ax2.grid()
 
         ax3 = plt.subplot(413)
+        # Handle both array-based and callable-based Functions
+        thrust_power = self.flight.thrust_power
+        if callable(thrust_power.source):
+            # For callable sources, discretize based on speed
+            thrust_power = thrust_power.set_discrete_based_on_model(
+                self.flight.speed, mutate_self=False
+            )
         ax3.plot(
-            self.flight.thrust_power[:, 0],
-            self.flight.thrust_power[:, 1],
+            thrust_power[:, 0],
+            thrust_power[:, 1],
             label="|Thrust Power|",
         )
         ax3.set_xlim(0, self.flight.rocket.motor.burn_out_time)
@@ -670,9 +677,16 @@ def energy_data(self, *, filename=None):  # pylint: disable=too-many-statements
         ax3.grid()
 
         ax4 = plt.subplot(414)
+        # Handle both array-based and callable-based Functions
+        drag_power = self.flight.drag_power
+        if callable(drag_power.source):
+            # For callable sources, discretize based on speed
+            drag_power = drag_power.set_discrete_based_on_model(
+                self.flight.speed, mutate_self=False
+            )
         ax4.plot(
-            self.flight.drag_power[:, 0],
-            -self.flight.drag_power[:, 1],
+            drag_power[:, 0],
+            -drag_power[:, 1],
             label="|Drag Power|",
         )
         ax4.set_xlim(

rocketpy/simulation/flight.py

@@ -665,7 +665,7 @@ def __simulate(self, verbose):
             )
 
             # Initialize phase time nodes
-            self.__setup_phase_time_nodes(phase, phase_index)
+            self.__setup_phase_time_nodes(phase)
 
             # Iterate through time nodes
             for node_index, node in self.time_iterator(phase.time_nodes):
@@ -799,15 +799,13 @@ def __simulate(self, verbose):
         if verbose:
             print(f"\n>>> Simulation Completed at Time: {self.t:3.4f} s")
 
-    def __setup_phase_time_nodes(self, phase, phase_index):
+    def __setup_phase_time_nodes(self, phase):
         """Set up time nodes for the current phase.
 
         Parameters
         ----------
         phase : FlightPhase
             The current flight phase.
-        phase_index : int
-            The index of the current phase.
         """
         phase.time_nodes = self.TimeNodes()
 
@@ -929,8 +927,11 @@ def __check_and_handle_parachute_triggers(
             ):
                 continue  # Check next parachute
 
-            # Remove parachute from flight parachutes
-            self.parachutes.remove(parachute)
+            # Remove parachute from flight parachutes (if not already removed)
+            if parachute in self.parachutes:
+                self.parachutes.remove(parachute)
+            else:
+                continue  # Parachute already triggered, skip to next
 
             # Create phase for time after detection and before inflation
             # Must only be created if parachute has any lag
@@ -1569,7 +1570,6 @@ def __init_controllers(self):
         """Initialize controllers and sensors"""
         self._controllers = self.rocket._controllers[:]
         self.sensors = self.rocket.sensors.get_components()
-        # Note: time_overshoot now supports both controllers and sensors
 
         # reset controllable object to initial state (only airbrakes for now)
         for air_brakes in self.rocket.air_brakes:

tests/conftest.py

@@ -76,6 +76,7 @@ def pytest_collection_modifyitems(config, items):
             item.add_marker(skip_slow)
 
 
+# TODO: move this to Environment fixtures when possible
 @pytest.fixture
 def merra2_file_path(tmp_path):  # pylint: disable=too-many-statements
     """

tests/integration/environment/test_environment.py

@@ -280,7 +280,7 @@ def test_merra2_full_specification_compliance(merra2_file_path, example_plain_en
     # Input: 9806.65 m2/s2
     # Expected: 1000.0 m
     print(f"Calculated Elevation: {env.elevation} m")
-    assert abs(env.elevation - 1000.0) < 1e-6, (
+    assert abs(env.elevation - 1000.0) < 1e-4, (
         f"Failed to convert PHIS (m2/s2) to meters. Got {env.elevation}, expected 1000.0"
     )