MNT: fix merge errors

rocketpy/__init__.py

@@ -37,7 +37,7 @@
     Tail,
     TrapezoidalFins,
 )
-from .sensors import Accelerometer, Barometer, Gyroscope, GNSS
+from .sensors import GNSS, Accelerometer, Barometer, Gyroscope
 from .simulation import Flight, MonteCarlo
 from .stochastic import (
     StochasticEllipticalFins,

rocketpy/rocket/rocket.py

@@ -4,7 +4,7 @@
 
 from rocketpy.control.controller import _Controller
 from rocketpy.mathutils.function import Function
-from rocketpy.mathutils.vector_matrix import Vector, Matrix
+from rocketpy.mathutils.vector_matrix import Matrix, Vector
 from rocketpy.motors.motor import EmptyMotor
 from rocketpy.plots.rocket_plots import _RocketPlots
 from rocketpy.prints.rocket_prints import _RocketPrints

rocketpy/sensors/__init__.py

@@ -1,5 +1,5 @@
-from .sensor import InertialSensor, ScalarSensor, Sensor
 from .accelerometer import Accelerometer
-from .gyroscope import Gyroscope
 from .barometer import Barometer
 from .gnss import GNSS
+from .gyroscope import Gyroscope
+from .sensor import InertialSensor, ScalarSensor, Sensor

rocketpy/sensors/gnss.py

@@ -4,11 +4,11 @@
 import numpy as np
 
 from ..mathutils.vector_matrix import Matrix, Vector
-from ..prints.sensors_prints import _BarometerPrints, _GNSSPrints
-from .sensors import ScalarSensors
+from ..prints.sensors_prints import _GNSSPrints
+from .sensor import ScalarSensor
 
 
-class GNSS(ScalarSensors):
+class GNSS(ScalarSensor):
     """Class for the GNSS sensor
 
     Attributes
@@ -90,7 +90,7 @@ def measure(self, time, **kwargs):
         # Apply accuracy to the position
         x = np.random.normal(x, self.position_accuracy)
         y = np.random.normal(y, self.position_accuracy)
-        z = np.random.normal(z, self.altitude_accuracy)
+        altitude = np.random.normal(z, self.altitude_accuracy)
 
         # Convert x and y to latitude and longitude
         lat1 = math.radians(lat)  # Launch lat point converted to radians
@@ -120,30 +120,26 @@ def measure(self, time, **kwargs):
             )
         )
 
-        latitude = np.random.normal(latitude, self.position_accuracy)
-        longitude = np.random.normal(longitude, self.position_accuracy)
-        altitude = np.random.normal(z, self.altitude_accuracy)
-
         self.measurement = (latitude, longitude, altitude)
         self._save_data((time, *self.measurement))
 
-    def export_measured_data(self, filename, format):
+    def export_measured_data(self, filename, file_format):
         """Export the measured values to a file
 
         Parameters
         ----------
         filename : str
             Name of the file to export the values to
-        format : str
+        file_format : str
             Format of the file to export the values to. Options are "csv" and
             "json". Default is "csv".
 
         Returns
         -------
         None
         """
-        super().export_measured_data(
+        self._generic_export_measured_data(
             filename=filename,
-            format=format,
+            file_format=file_format,
             data_labels=("t", "latitude", "longitude", "altitude"),
         )

rocketpy/simulation/flight.py

@@ -662,10 +662,9 @@ def __simulate(self, verbose):
             # Initialize phase time nodes
             phase.time_nodes = self.TimeNodes()
             # Add first time node to the time_nodes list
-            phase.time_nodes.add_node(phase.t, [], [])
+            phase.time_nodes.add_node(phase.t, [], [], [])
             # Add non-overshootable parachute time nodes
             if self.time_overshoot is False:
-                # TODO: move parachutes to controllers
                 phase.time_nodes.add_parachutes(
                     self.parachutes, phase.t, phase.time_bound
                 )
@@ -1147,7 +1146,7 @@ def __init_flight_state(self):
             self.out_of_rail_time = self.initial_solution[0]
             self.out_of_rail_time_index = 0
             self.initial_derivative = self.u_dot_generalized
-        if self._controllers:
+        if self._controllers or self.sensors:
             # Handle post process during simulation, get initial accel/forces
             self.initial_derivative(
                 self.t_initial, self.initial_solution[1:], post_processing=True
@@ -3503,8 +3502,8 @@ def merge(self):
                     # Try to access the node and merge if it exists
                     tmp_dict[time].parachutes += node.parachutes
                     tmp_dict[time].callbacks += node.callbacks
-                    tmp_dict[-1]._component_sensors += node._component_sensors
-                    tmp_dict[-1]._controllers += node._controllers
+                    tmp_dict[time]._component_sensors += node._component_sensors
+                    tmp_dict[time]._controllers += node._controllers
                 except KeyError:
                     # If the node does not exist, add it to the dictionary
                     tmp_dict[time] = node