Merge remote-tracking branch 'origin/develop' into enh/parallel_monte…

…carlo

.vscode/settings.json

@@ -78,6 +78,7 @@
         "copybutton",
         "cstride",
         "csys",
+        "cumsum",
         "datapoints",
         "datetime",
         "dcsys",
@@ -149,6 +150,7 @@
         "IGRA",
         "imageio",
         "imread",
+        "imshow",
         "intc",
         "interp",
         "Interquartile",
@@ -259,6 +261,7 @@
         "SRTM",
         "SRTMGL",
         "Stano",
+        "STFT",
         "subintervals",
         "suptitle",
         "ticklabel",

CHANGELOG.md

@@ -32,7 +32,8 @@ Attention: The newest changes should be on top -->
 
 ### Added
 
--  ENH: Rocket Axis Definition [#635](https://github.com/RocketPy-Team/RocketPy/pull/635)
+- ENH: Add STFT function to Function class [#620](https://github.com/RocketPy-Team/RocketPy/pull/620) 
+- ENH: Rocket Axis Definition [#635](https://github.com/RocketPy-Team/RocketPy/pull/635)
 
 ### Changed
 
@@ -42,7 +43,8 @@ Attention: The newest changes should be on top -->
 
 ### Fixed
 
-
+- BUG: Pressure ISA Extrapolation as "linear" [#675](https://github.com/RocketPy-Team/RocketPy/pull/675)
+- BUG: fix the Frequency Response plot of Flight class [#653](https://github.com/RocketPy-Team/RocketPy/pull/653)
 
 ## [v1.4.2] - 2024-08-03
 

rocketpy/environment/environment.py

@@ -2382,7 +2382,7 @@ def load_international_standard_atmosphere(self):  # pragma: no cover
             DeprecationWarning,
         )
 
-    @funcify_method("Height Above Sea Level (m)", "Pressure (Pa)", "spline", "linear")
+    @funcify_method("Height Above Sea Level (m)", "Pressure (Pa)", "spline", "natural")
     def pressure_ISA(self):
         """Pressure, in Pa, as a function of height above sea level as defined
         by the `International Standard Atmosphere ISO 2533`."""

rocketpy/mathutils/function.py

@@ -1007,6 +1007,142 @@ def to_frequency_domain(self, lower, upper, sampling_frequency, remove_dc=True):
             extrapolation="zero",
         )
 
+    def short_time_fft(
+        self,
+        lower,
+        upper,
+        sampling_frequency,
+        window_size,
+        step_size,
+        remove_dc=True,
+        only_positive=True,
+    ):
+        r"""
+        Performs the Short-Time Fourier Transform (STFT) of the Function and
+        returns the result. The STFT is computed by applying the Fourier
+        transform to overlapping windows of the Function.
+
+        Parameters
+        ----------
+        lower : float
+            Lower bound of the time range.
+        upper : float
+            Upper bound of the time range.
+        sampling_frequency : float
+            Sampling frequency at which to perform the Fourier transform.
+        window_size : float
+            Size of the window for the STFT, in seconds.
+        step_size : float
+            Step size for the window, in seconds.
+        remove_dc : bool, optional
+            If True, the DC component is removed from each window before
+            computing the Fourier transform.
+        only_positive: bool, optional
+            If True, only the positive frequencies are returned.
+
+        Returns
+        -------
+        list[Function]
+            A list of Functions, each representing the STFT of a window.
+
+        Examples
+        --------
+
+        >>> import numpy as np
+        >>> import matplotlib.pyplot as plt
+        >>> from rocketpy import Function
+
+        Generate a signal with varying frequency:
+
+        >>> T_x, N = 1 / 20 , 1000  # 20 Hz sampling rate for 50 s signal
+        >>> t_x = np.arange(N) * T_x  # time indexes for signal
+        >>> f_i = 1 * np.arctan((t_x - t_x[N // 2]) / 2) + 5 # varying frequency
+        >>> signal = np.sin(2 * np.pi * np.cumsum(f_i) * T_x)  # the signal
+
+        Create the Function object and perform the STFT:
+
+        >>> time_domain = Function(np.array([t_x, signal]).T)
+        >>> stft_result = time_domain.short_time_fft(
+        ...     lower=0,
+        ...     upper=50,
+        ...     sampling_frequency=95,
+        ...     window_size=2,
+        ...     step_size=0.5,
+        ... )
+
+        Plot the spectrogram:
+
+        >>> Sx = np.abs([window[:, 1] for window in stft_result])
+        >>> t_lo, t_hi = t_x[0], t_x[-1]
+        >>> fig1, ax1 = plt.subplots(figsize=(10, 6))
+        >>> im1 = ax1.imshow(
+        ...     Sx.T,
+        ...     origin='lower',
+        ...     aspect='auto',
+        ...     extent=[t_lo, t_hi, 0, 50],
+        ...     cmap='viridis'
+        ... )
+        >>> _ = ax1.set_title(rf"STFT (2$\,s$ Gaussian window, $\sigma_t=0.4\,$s)")
+        >>> _ = ax1.set(
+        ...     xlabel=f"Time $t$ in seconds",
+        ...     ylabel=f"Freq. $f$ in Hz)",
+        ...     xlim=(t_lo, t_hi)
+        ... )
+        >>> _ = ax1.plot(t_x, f_i, 'r--', alpha=.5, label='$f_i(t)$')
+        >>> _ = fig1.colorbar(im1, label="Magnitude $|S_x(t, f)|$")
+        >>> # Shade areas where window slices stick out to the side
+        >>> for t0_, t1_ in [(t_lo, 1), (49, t_hi)]:
+        ...     _ = ax1.axvspan(t0_, t1_, color='w', linewidth=0, alpha=.2)
+        >>> # Mark signal borders with vertical line
+        >>> for t_ in [t_lo, t_hi]:
+        ...     _ = ax1.axvline(t_, color='y', linestyle='--', alpha=0.5)
+        >>> # Add legend and finalize plot
+        >>> _ = ax1.legend()
+        >>> fig1.tight_layout()
+        >>> # plt.show() # uncomment to show the plot
+
+        References
+        ----------
+        Example adapted from the SciPy documentation:
+        https://docs.scipy.org/doc/scipy/reference/generated/scipy.signal.ShortTimeFFT.html
+        """
+        # Get the time domain data
+        sampling_time_step = 1.0 / sampling_frequency
+        sampling_range = np.arange(lower, upper, sampling_time_step)
+        sampled_points = self(sampling_range)
+        samples_per_window = int(window_size * sampling_frequency)
+        samples_skipped_per_step = int(step_size * sampling_frequency)
+        stft_results = []
+
+        max_start = len(sampled_points) - samples_per_window + 1
+
+        for start in range(0, max_start, samples_skipped_per_step):
+            windowed_samples = sampled_points[start : start + samples_per_window]
+            if remove_dc:
+                windowed_samples -= np.mean(windowed_samples)
+            fourier_amplitude = np.abs(
+                np.fft.fft(windowed_samples) / (samples_per_window / 2)
+            )
+            fourier_frequencies = np.fft.fftfreq(samples_per_window, sampling_time_step)
+
+            # Filter to keep only positive frequencies if specified
+            if only_positive:
+                positive_indices = fourier_frequencies > 0
+                fourier_frequencies = fourier_frequencies[positive_indices]
+                fourier_amplitude = fourier_amplitude[positive_indices]
+
+            stft_results.append(
+                Function(
+                    source=np.array([fourier_frequencies, fourier_amplitude]).T,
+                    inputs="Frequency (Hz)",
+                    outputs="Amplitude",
+                    interpolation="linear",
+                    extrapolation="zero",
+                )
+            )
+
+        return stft_results
+
     def low_pass_filter(self, alpha, file_path=None):
         """Implements a low pass filter with a moving average filter. This does
         not mutate the original Function object, but returns a new one with the

rocketpy/plots/flight_plots.py

@@ -731,32 +731,33 @@ def stability_and_control_data(self):  # pylint: disable=too-many-statements
         ax1.grid()
 
         ax2 = plt.subplot(212)
-        max_attitude = max(self.flight.attitude_frequency_response[:, 1])
+        x_axis = np.arange(0, 5, 0.01)
+        max_attitude = self.flight.attitude_frequency_response.max
         max_attitude = max_attitude if max_attitude != 0 else 1
         ax2.plot(
-            self.flight.attitude_frequency_response[:, 0],
-            self.flight.attitude_frequency_response[:, 1] / max_attitude,
+            x_axis,
+            self.flight.attitude_frequency_response(x_axis) / max_attitude,
             label="Attitude Angle",
         )
-        max_omega1 = max(self.flight.omega1_frequency_response[:, 1])
+        max_omega1 = self.flight.omega1_frequency_response.max
         max_omega1 = max_omega1 if max_omega1 != 0 else 1
         ax2.plot(
-            self.flight.omega1_frequency_response[:, 0],
-            self.flight.omega1_frequency_response[:, 1] / max_omega1,
+            x_axis,
+            self.flight.omega1_frequency_response(x_axis) / max_omega1,
             label=r"$\omega_1$",
         )
-        max_omega2 = max(self.flight.omega2_frequency_response[:, 1])
+        max_omega2 = self.flight.omega2_frequency_response.max
         max_omega2 = max_omega2 if max_omega2 != 0 else 1
         ax2.plot(
-            self.flight.omega2_frequency_response[:, 0],
-            self.flight.omega2_frequency_response[:, 1] / max_omega2,
+            x_axis,
+            self.flight.omega2_frequency_response(x_axis) / max_omega2,
             label=r"$\omega_2$",
         )
-        max_omega3 = max(self.flight.omega3_frequency_response[:, 1])
+        max_omega3 = self.flight.omega3_frequency_response.max
         max_omega3 = max_omega3 if max_omega3 != 0 else 1
         ax2.plot(
-            self.flight.omega3_frequency_response[:, 0],
-            self.flight.omega3_frequency_response[:, 1] / max_omega3,
+            x_axis,
+            self.flight.omega3_frequency_response(x_axis) / max_omega3,
             label=r"$\omega_3$",
         )
         ax2.set_title("Frequency Response")