ENH: add from_dict to new classes

Author: MateusStano

rocketpy/rocket/aero_surface/fins/_elliptical_mixin.py

@@ -131,3 +131,21 @@ def info(self):
     def all_info(self):
         self.prints.all()
         self.plots.all()
+
+    def to_dict(self, include_outputs=False):
+        data = super().to_dict(include_outputs)
+        if include_outputs:
+            data.update(
+                {
+                    "Af": self.Af,
+                    "AR": self.AR,
+                    "gamma_c": self.gamma_c,
+                    "Yma": self.Yma,
+                    "roll_geometrical_constant": self.roll_geometrical_constant,
+                    "tau": self.tau,
+                    "lift_interference_factor": self.lift_interference_factor,
+                    "roll_damping_interference_factor": self.roll_damping_interference_factor,
+                    "roll_forcing_interference_factor": self.roll_forcing_interference_factor,
+                }
+            )
+        return data

rocketpy/rocket/aero_surface/fins/_free_form_mixin.py

@@ -219,17 +219,6 @@ def to_dict(self, include_outputs=False):
             )
         return data
 
-    @classmethod
-    def from_dict(cls, data):
-        return cls(
-            data["n"],
-            data["shape_points"],
-            data["rocket_radius"],
-            data["cant_angle"],
-            data["airfoil"],
-            data["name"],
-        )
-
     def info(self):
         self.prints.geometry()
         self.prints.lift()

rocketpy/rocket/aero_surface/fins/_trapezoidal_mixin.py

@@ -178,15 +178,3 @@ def to_dict(self, include_outputs=False):
             )
         return data
 
-    @classmethod
-    def from_dict(cls, data):
-        return cls(
-            n=data["n"],
-            root_chord=data["root_chord"],
-            tip_chord=data["tip_chord"],
-            span=data["span"],
-            rocket_radius=data["rocket_radius"],
-            cant_angle=data["cant_angle"],
-            airfoil=data["airfoil"],
-            name=data["name"],
-        )

rocketpy/rocket/aero_surface/fins/elliptical_fin.py

@@ -202,7 +202,7 @@ def to_dict(self, include_outputs=False):
     @classmethod
     def from_dict(cls, data):
         return cls(
-            n=data["n"],
+            angular_position=data["angular_position"],
             root_chord=data["root_chord"],
             span=data["span"],
             rocket_radius=data["rocket_radius"],

rocketpy/rocket/aero_surface/fins/elliptical_fins.py

@@ -184,24 +184,6 @@ def evaluate_center_of_pressure(self):
         self.cpz = cpz
         self.cp = (self.cpx, self.cpy, self.cpz)
 
-    def to_dict(self, include_outputs=False):
-        data = super().to_dict(include_outputs)
-        if include_outputs:
-            data.update(
-                {
-                    "Af": self.Af,
-                    "AR": self.AR,
-                    "gamma_c": self.gamma_c,
-                    "Yma": self.Yma,
-                    "roll_geometrical_constant": self.roll_geometrical_constant,
-                    "tau": self.tau,
-                    "lift_interference_factor": self.lift_interference_factor,
-                    "roll_damping_interference_factor": self.roll_damping_interference_factor,
-                    "roll_forcing_interference_factor": self.roll_forcing_interference_factor,
-                }
-            )
-        return data
-
     @classmethod
     def from_dict(cls, data):
         return cls(

rocketpy/rocket/aero_surface/fins/free_form_fin.py

@@ -168,3 +168,14 @@ def evaluate_center_of_pressure(self):
         self.cpy = self.Yma
         self.cpz = cpz
         self.cp = (self.cpx, self.cpy, self.cpz)
+
+    @classmethod
+    def from_dict(cls, data):
+        return cls(
+            angular_position=data["angular_position"],
+            shape_points=data["shape_points"],
+            rocket_radius=data["rocket_radius"],
+            cant_angle=data["cant_angle"],
+            airfoil=data["airfoil"],
+            name=data["name"],
+        )

rocketpy/rocket/aero_surface/fins/free_form_fins.py

@@ -167,3 +167,14 @@ def evaluate_center_of_pressure(self):
         self.cpy = 0
         self.cpz = cpz
         self.cp = (self.cpx, self.cpy, self.cpz)
+
+    @classmethod
+    def from_dict(cls, data):
+        return cls(
+            n=data["n"],
+            shape_points=data["shape_points"],
+            rocket_radius=data["rocket_radius"],
+            cant_angle=data["cant_angle"],
+            airfoil=data["airfoil"],
+            name=data["name"],
+        )

rocketpy/rocket/aero_surface/fins/trapezoidal_fin.py

@@ -182,3 +182,16 @@ def evaluate_center_of_pressure(self):
         self.cpy = self.Yma
         self.cpz = cpz
         self.cp = (self.cpx, self.cpy, self.cpz)
+
+    @classmethod
+    def from_dict(cls, data):
+        return cls(
+            angular_position=data["angular_position"],
+            root_chord=data["root_chord"],
+            tip_chord=data["tip_chord"],
+            span=data["span"],
+            rocket_radius=data["rocket_radius"],
+            cant_angle=data["cant_angle"],
+            airfoil=data["airfoil"],
+            name=data["name"],
+        )

rocketpy/rocket/aero_surface/fins/trapezoidal_fins.py

@@ -193,3 +193,16 @@ def evaluate_center_of_pressure(self):
         self.cpy = 0
         self.cpz = cpz
         self.cp = (self.cpx, self.cpy, self.cpz)
+
+    @classmethod
+    def from_dict(cls, data):
+        return cls(
+            n=data["n"],
+            root_chord=data["root_chord"],
+            tip_chord=data["tip_chord"],
+            span=data["span"],
+            rocket_radius=data["rocket_radius"],
+            cant_angle=data["cant_angle"],
+            airfoil=data["airfoil"],
+            name=data["name"],
+        )