Fix actuator class calls

Author: zuorenchen

rocketpy/rocket/actuator/roll.py

@@ -14,22 +14,22 @@ class RollActuator(Actuator):
 
     Attributes
     ----------
-    RollActuator.name : str
+    name : str
         Name of the roll actuator.
-    RollActuator.demand_rate : float
+    demand_rate : float
         Demand rate of the roll control in Hz. None indicates a continuous-time actuator.
-    RollActuator.actuator_range : float
+    actuator_range : float
         Range of the roll control in N·m.
-    RollActuator.actuator_rate_limit : float
+    actuator_rate_limit : float
         Rate limit of the roll control in N·m/s. The roll torque change is limited to this rate.
-    RollActuator.clamp : bool, optional
+    clamp : bool, optional
         If True, roll torque is clamped to actuator_range.
         If False, a warning is issued when roll torque exceeds the range.
-    RollActuator.actuator_time_constant : float
+    actuator_time_constant : float
         Time constant for the roll torque actuator dynamics (first-order IIR filter) in seconds.
-    RollActuator.actuator_initial_output : float
+    actuator_initial_output : float
         Initial roll torque in N·m.
-    RollActuator.roll_torque : float
+    roll_torque : float
         Current roll torque output magnitude in N·m (Newton-meters).
         Positive values indicate counter-clockwise rotation when viewed
         from the nose of the rocket.
@@ -90,12 +90,12 @@ def __init__(
     @property
     def roll_torque(self):
         """Returns the current roll torque in N·m."""
-        return self._actuator_output
+        return self.actuator_output
 
     @roll_torque.setter
     def roll_torque(self, value):
         """Sets the roll torque in N·m."""
-        self._actuator_output = value
+        self.actuator_output = value
 
     def info(self):
         """Prints summarized information of the roll control system.

rocketpy/rocket/actuator/throttle.py

@@ -17,22 +17,22 @@ class ThrottleActuator(Actuator):
 
     Attributes
     ----------
-    ThrottleActuator.name : str
+    name : str
         Name of the throttle actuator.
-    ThrottleActuator.demand_rate : float
+    demand_rate : float
         Demand rate of the throttle actuator in Hz. None indicates a continuous-time actuator.
-    ThrottleActuator.actuator_range : float
+    actuator_range : float
         Range of the throttle actuator.
-    ThrottleActuator.actuator_rate_limit : float
+    actuator_rate_limit : float
         Rate limit of the throttle actuator in 1/s. The throttle change is limited to this rate.
-    ThrottleActuator.clamp : bool, optional
+    clamp : bool, optional
         If True, throttle is clamped to actuator_range.
         If False, a warning is issued when throttle exceeds the range.
-    ThrottleActuator.actuator_time_constant : float
+    actuator_time_constant : float
         Time constant for the throttle actuator dynamics (first-order IIR filter) in seconds.
-    ThrottleActuator.actuator_initial_output : float
+    actuator_initial_output : float
         Initial throttle value.
-    ThrottleActuator.throttle : float
+    throttle : float
         Current throttle value. The throttle is the fraction of the maximum thrust produced by the engine
         ranging from 0 (no thrust) to 1 (full thrust).
     """
@@ -91,12 +91,12 @@ def __init__(
     @property
     def throttle(self):
         """Returns the current throttle value."""
-        return self._actuator_output
+        return self.actuator_output
 
     @throttle.setter
     def throttle(self, value):
         """Sets the throttle value."""
-        self._actuator_output = value
+        self.actuator_output = value
 
     def info(self):
         """Prints summarized information of the throttle control system.

rocketpy/rocket/actuator/thrust_vector.py

@@ -13,22 +13,22 @@ class ThrustVectorActuator(Actuator):
 
     Attributes
     ----------
-    ThrustVectorActuator.name : str
+    name : str
         Name of the thrust vector actuator.
-    ThrustVectorActuator.demand_rate : float
+    demand_rate : float
         Demand rate of the thrust vector actuator in Hz. None indicates a continuous-time actuator.
-    ThrustVectorActuator.actuator_range : float
+    actuator_range : float
         Range of the thrust vector actuator in deg.
-    ThrustVectorActuator.actuator_rate_limit : float
+    actuator_rate_limit : float
         Rate limit of the thrust vector actuator in deg/sec. The thrust vector change is limited to this rate.
-    ThrustVectorActuator.clamp : bool, optional
+    clamp : bool, optional
         If True, thrust gimbal angle is clamped to actuator_range.
         If False, a warning is issued when thrust vector exceeds the range.
-    ThrustVectorActuator.actuator_time_constant : float
+    actuator_time_constant : float
         Time constant for the thrust vector actuator dynamics (first-order IIR filter) in seconds.
-    ThrustVectorActuator.actuator_initial_output : float
+    actuator_initial_output : float
         Initial thrust vector gimbal angle in deg.
-    ThrustVectorActuator._actuator_output : float
+    gimbal_angle : float
         Current thrust vector gimbal angle in deg.
 
     """
@@ -90,12 +90,12 @@ def __init__(
     @property
     def gimbal_angle(self):
         """Returns the current gimbal angle in deg."""
-        return self._actuator_output
+        return self.actuator_output
 
     @gimbal_angle.setter
     def gimbal_angle(self, value):
         """Sets the gimbal angle in deg."""
-        self._actuator_output = value
+        self.actuator_output = value
 
     def info(self):
         """Prints summarized information of the thrust vector actuator.
@@ -164,7 +164,7 @@ class ThrustVectorActuator2D:
         Time constant for the thrust vector actuator dynamics (first-order IIR filter) in seconds.
     ThrustVectorActuator2D.actuator_initial_output : float
         Initial thrust  gimbal angles in deg.
-    ThrustVectorActuator2D._actuator_output : float
+    ThrustVectorActuator2D.actuator_output : float
         Current thrust vector gimble angles in deg.
 
     """