BUG: parachute callbacks attribute naming.

Author: phmbressan

CHANGELOG.md

@@ -31,8 +31,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 Attention: The newest changes should be on top -->
 
 ### Added
-- ENH: Discretized and No-Pickle Encoding Options [#827] (https://github.com/RocketPy-Team/RocketPy/pull/827)
-  
+- ENH: Controller (AirBrakes) and Sensors Encoding [#849] (https://github.com/RocketPy-Team/RocketPy/pull/849)
 - EHN: Addition of ensemble variable to ECMWF dictionaries [#842] (https://github.com/RocketPy-Team/RocketPy/pull/842) 
 - ENH: Added Crop and Clip Methods to Function Class [#817](https://github.com/RocketPy-Team/RocketPy/pull/817)
 - DOC: Add Flight class usage documentation and update index [#841](https://github.com/RocketPy-Team/RocketPy/pull/841)

rocketpy/mathutils/function.py

@@ -1551,7 +1551,7 @@ def short_time_fft(
         ...     ylabel=f"Freq. $f$ in Hz)",
         ...     xlim=(t_lo, t_hi)
         ... )
-        # >>> _ = ax1.plot(t_x, f_i, 'r--', alpha=.5, label='$f_i(t)$')
+        >>> _ = 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)]:
@@ -1856,7 +1856,8 @@ def plot_1d(  # pylint: disable=too-many-statements
         None
         """
         # Define a mesh and y values at mesh nodes for plotting
-        fig, ax = plt.subplots()
+        fig = plt.figure()
+        ax = fig.axes
         if self._source_type is SourceType.CALLABLE:
             # Determine boundaries
             domain = [0, 10]
@@ -1894,9 +1895,9 @@ def plot_1d(  # pylint: disable=too-many-statements
         plt.title(self.title)
         plt.xlabel(self.__inputs__[0].title())
         plt.ylabel(self.__outputs__[0].title())
+        show_or_save_plot(filename)
         if return_object:
             return fig, ax
-        show_or_save_plot(filename)
 
     @deprecated(
         reason="The `Function.plot2D` method is set to be deprecated and fully "

rocketpy/rocket/rocket.py

@@ -2083,11 +2083,8 @@ def from_dict(cls, data):
             rocket.air_brakes.append(air_brake)
 
         for controller in data["_controllers"]:
-            if (
-                interactive_objects_hash := getattr(
-                    controller, "_interactive_objects_hash"
-                )
-            ) is not None:
+            interactive_objects_hash = getattr(controller, "_interactive_objects_hash")
+            if interactive_objects_hash is not None:
                 is_iterable = isinstance(interactive_objects_hash, Iterable)
                 if not is_iterable:
                     interactive_objects_hash = [interactive_objects_hash]

rocketpy/simulation/flight.py

@@ -762,12 +762,10 @@ def __simulate(self, verbose):
                             lambda self, parachute_cd_s=parachute.cd_s: setattr(
                                 self, "parachute_cd_s", parachute_cd_s
                             ),
-                            lambda self,
-                            parachute_radius=parachute.parachute_radius: setattr(
+                            lambda self, parachute_radius=parachute.radius: setattr(
                                 self, "parachute_radius", parachute_radius
                             ),
-                            lambda self,
-                            parachute_height=parachute.parachute_height: setattr(
+                            lambda self, parachute_height=parachute.height: setattr(
                                 self, "parachute_height", parachute_height
                             ),
                             lambda self, parachute_porosity=parachute.porosity: setattr(

rocketpy/tools.py

@@ -1303,7 +1303,7 @@ def find_obj_from_hash(obj, hash_, depth_limit=None):
     ----------
     obj : object
         Object to search.
-    hash_ : str
+    hash_ : int
         Hash value to search for in the '__rpy_hash' field.
     depth_limit : int, optional
         Maximum depth to search recursively. If None, no limit.
@@ -1322,8 +1322,6 @@ def _search(o, current_depth):
             return o
 
         if isinstance(o, dict):
-            # Check if this dict has the '__rpy_hash' key
-            # Recurse into each value
             for value in o.values():
                 result = _search(value, current_depth + 1)
                 if result is not None:
@@ -1335,7 +1333,6 @@ def _search(o, current_depth):
                 if result is not None:
                     return result
 
-        # Not a container or not matching
         return None
 
     return _search(obj, 0)