Fix some more pylint errors

Gui-FernandesBR · Gui-FernandesBR · commit d2c36910b993 · 2024-06-29T00:18:50.000-03:00
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8"]
+        python-version: ["3.9"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/.pylintrc b/.pylintrc
@@ -225,6 +225,8 @@ good-names=FlightPhases,
            motor_I_11_derivative_at_t,
            M3_forcing,
            M3_damping,
+           CM_to_CDM,
+           CM_to_CPM,
 
 # Good variable names regexes, separated by a comma. If names match any regex,
 # they will always be accepted
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ black:
 	black rocketpy/ tests/ docs/
 	
 pylint:
-	-pylint rocketpy tests --output=.pylint-report.txt
+	-pylint rocketpy --output=.pylint-report.txt
 
 build-docs:
 	cd docs && $(PYTHON) -m pip install -r requirements.txt && make html
diff --git a/rocketpy/environment/environment_analysis.py b/rocketpy/environment/environment_analysis.py
@@ -1273,9 +1273,7 @@ def precipitation_per_day(self):
             List with total precipitation for each day in the dataset.
         """
         return [
-            sum(
-                [day_dict[hour]["total_precipitation"] for hour in day_dict.keys()]
-            )  # pylint: disable=consider-using-generator
+            sum(day_dict[hour]["total_precipitation"] for hour in day_dict.keys())
             for day_dict in self.converted_surface_data.values()
         ]
 
@@ -2583,15 +2581,8 @@ def max_average_temperature_at_altitude(self):
             Maximum average temperature.
         """
         max_temp = float("-inf")
-        for (
-            hour
-        ) in (
-            self.average_temperature_profile_by_hour.keys()
-        ):  # pylint: disable=consider-iterating-dictionary,consider-using-dict-items
-            max_temp = max(
-                max_temp,
-                np.max(self.average_temperature_profile_by_hour[hour][0]),
-            )
+        for temp_profile in self.average_temperature_profile_by_hour.values():
+            max_temp = max(max_temp, np.max(temp_profile[0]))
         return max_temp
 
     @cached_property
@@ -2607,15 +2598,8 @@ def min_average_temperature_at_altitude(self):
             Minimum average temperature.
         """
         min_temp = float("inf")
-        for (
-            hour
-        ) in (
-            self.average_temperature_profile_by_hour.keys()
-        ):  # pylint: disable=consider-iterating-dictionary,consider-using-dict-items
-            min_temp = min(
-                min_temp,
-                np.min(self.average_temperature_profile_by_hour[hour][0]),
-            )
+        for temp_profile in self.average_temperature_profile_by_hour.values():
+            min_temp = min(min_temp, np.min(temp_profile[0]))
         return min_temp
 
     @cached_property
@@ -2632,15 +2616,8 @@ def max_average_wind_speed_at_altitude(self):
             Maximum average wind speed.
         """
         max_wind_speed = float("-inf")
-        for (
-            hour
-        ) in (
-            self.average_wind_speed_profile_by_hour.keys()
-        ):  # pylint: disable=consider-iterating-dictionary,consider-using-dict-items
-            max_wind_speed = max(
-                max_wind_speed,
-                np.max(self.average_wind_speed_profile_by_hour[hour][0]),
-            )
+        for wind_speed_profile in self.average_wind_speed_profile_by_hour.values():
+            max_wind_speed = max(max_wind_speed, np.max(wind_speed_profile[0]))
         return max_wind_speed
 
     # Pressure level data - Average values
@@ -2816,35 +2793,31 @@ def export_mean_profiles(self, filename="export_env_analysis"):
         flipped_pressure_dict = {}
         flipped_wind_x_dict = {}
         flipped_wind_y_dict = {}
-        # pylint: disable=consider-using-dict-items
-        for (
-            hour
-        ) in (
-            self.average_temperature_profile_by_hour.keys()
-        ):  # pylint: disable=consider-iterating-dictionary
+
+        for hour, temp_profile in self.average_temperature_profile_by_hour.items():
             flipped_temperature_dict[hour] = np.column_stack(
-                (
-                    self.average_temperature_profile_by_hour[hour][1],
-                    self.average_temperature_profile_by_hour[hour][0],
-                )
+                (temp_profile[1], temp_profile[0])
             ).tolist()
+
+        for hour, pressure_profile in self.average_pressure_profile_by_hour.items():
             flipped_pressure_dict[hour] = np.column_stack(
-                (
-                    self.average_pressure_profile_by_hour[hour][1],
-                    self.average_pressure_profile_by_hour[hour][0],
-                )
+                (pressure_profile[1], pressure_profile[0])
             ).tolist()
+
+        for (
+            hour,
+            wind_x_profile,
+        ) in self.average_wind_velocity_x_profile_by_hour.items():
             flipped_wind_x_dict[hour] = np.column_stack(
-                (
-                    self.average_wind_velocity_x_profile_by_hour[hour][1],
-                    self.average_wind_velocity_x_profile_by_hour[hour][0],
-                )
+                (wind_x_profile[1], wind_x_profile[0])
             ).tolist()
+
+        for (
+            hour,
+            wind_y_profile,
+        ) in self.average_wind_velocity_y_profile_by_hour.items():
             flipped_wind_y_dict[hour] = np.column_stack(
-                (
-                    self.average_wind_velocity_y_profile_by_hour[hour][1],
-                    self.average_wind_velocity_y_profile_by_hour[hour][0],
-                )
+                (wind_y_profile[1], wind_y_profile[0])
             ).tolist()
 
         self.export_dictionary = {
@@ -2865,23 +2838,15 @@ def export_mean_profiles(self, filename="export_env_analysis"):
             "atmospheric_model_wind_velocity_y_profile": flipped_wind_y_dict,
         }
 
-        # Convert to json
-        f = open(filename + ".json", "w")  # pylint: disable=consider-using-with
-
-        # write json object to file
-        f.write(
-            json.dumps(self.export_dictionary, sort_keys=False, indent=4, default=str)
-        )
-
-        # close file
-        f.close()
-        print(
-            "Your Environment Analysis file was saved, check it out: "
-            + filename
-            + ".json"
-        )
+        with open(filename + ".json", "w") as f:
+            f.write(
+                json.dumps(
+                    self.export_dictionary, sort_keys=False, indent=4, default=str
+                )
+            )
         print(
-            "You can use it in the future by using the customAtmosphere atmospheric model."
+            f"Your Environment Analysis file was saved, check it out: {filename}.json\n"
+            "You can use it to set a `customAtmosphere` atmospheric model"
         )
 
     @classmethod
diff --git a/rocketpy/mathutils/function.py b/rocketpy/mathutils/function.py
@@ -1539,7 +1539,7 @@ def compare_plots(
                     ax.scatter(points[0], points[1], marker="o")
 
         # Setup legend
-        if any([plot[1] for plot in plots]):
+        if any(plot[1] for plot in plots):
             ax.legend(loc="best", shadow=True)
 
         # Turn on grid and set title and axis
diff --git a/rocketpy/plots/environment_analysis_plots.py b/rocketpy/plots/environment_analysis_plots.py
@@ -394,9 +394,7 @@ def average_surface100m_wind_speed_evolution(self):
         # Format plot
         plt.gca().xaxis.set_major_locator(plt.MaxNLocator(integer=True))
         plt.gca().xaxis.set_major_formatter(
-            lambda x, pos: "{0:02.0f}:{1:02.0f}".format(
-                *divmod(x * 60, 60)
-            )  # pylint: disable=consider-using-f-string
+            lambda x, pos: f"{int(x):02}:{int((x * 60) % 60):02}"
         )
         plt.autoscale(enable=True, axis="x", tight=True)
         plt.xlabel("Time (hours)")
diff --git a/rocketpy/plots/rocket_plots.py b/rocketpy/plots/rocket_plots.py
@@ -352,10 +352,8 @@ def _draw_tubes(self, ax, drawn_surfaces, vis_args):
             else:
                 # If it is not the last surface, the tube goes to the beginning
                 # of the next surface
-                # pylint: disable=unused-variable
-                next_surface, next_position, next_radius, next_last_x = drawn_surfaces[
-                    i + 1
-                ]  # pylint: disable=unused-variable
+                # [next_surface, next_position, next_radius, next_last_x]
+                next_position = drawn_surfaces[i + 1][1]
                 x_tube = [last_x, next_position]
                 y_tube = [radius, radius]
                 y_tube_negated = [-radius, -radius]
diff --git a/rocketpy/rocket/aero_surface.py b/rocketpy/rocket/aero_surface.py
@@ -570,7 +570,6 @@ def evaluate_k(self):
         """
         if self.kind == "powerseries":
             self.k = (2 * self.power) / ((2 * self.power) + 1)
-        return None
 
     def evaluate_center_of_pressure(self):
         """Calculates and returns the center of pressure of the nose cone in
@@ -876,19 +875,25 @@ def evaluate_lift_coefficient(self):
         clalpha2D = Function(lambda mach: clalpha2D_incompressible / self._beta(mach))
 
         # Diederich's Planform Correlation Parameter
-        FD = (
+        planform_correlation_parameter = (
             2 * np.pi * self.AR / (clalpha2D * np.cos(self.gamma_c))
         )  # pylint: disable=invalid-name
 
         # Lift coefficient derivative for a single fin
-        self.clalpha_single_fin = Function(
-            lambda mach: (
+        def lift_source(mach):
+            return (
                 clalpha2D(mach)
-                * FD(mach)
+                * planform_correlation_parameter(mach)
                 * (self.Af / self.ref_area)
                 * np.cos(self.gamma_c)
+            ) / (
+                2
+                + planform_correlation_parameter(mach)
+                * np.sqrt(1 + (2 / planform_correlation_parameter(mach)) ** 2)
             )
-            / (2 + FD(mach) * np.sqrt(1 + (2 / FD(mach)) ** 2)),
+
+        self.clalpha_single_fin = Function(
+            lift_source,
             "Mach",
             "Lift coefficient derivative for a single fin",
         )
@@ -1515,9 +1520,9 @@ def evaluate_geometrical_parameters(self):
         """
 
         # Compute auxiliary geometrical parameters
-        Af = (
+        Af = (  # Fin area  # pylint: disable=invalid-name
             np.pi * self.root_chord / 2 * self.span
-        ) / 2  # Fin area  # pylint: disable=invalid-name
+        ) / 2
         gamma_c = 0  # Zero for elliptical fins
         AR = 2 * self.span**2 / Af  # Fin aspect ratio  # pylint: disable=invalid-name
         Yma = (  # pylint: disable=invalid-name
@@ -1613,7 +1618,7 @@ def evaluate_geometrical_parameters(self):
         self.Af = Af  # Fin area  # pylint: disable=invalid-name
         self.AR = AR  # Fin aspect ratio  # pylint: disable=invalid-name
         self.gamma_c = gamma_c  # Mid chord angle
-        self.Yma = (
+        self.Yma = (  # pylint: disable=invalid-name
             Yma  # Span wise coord of mean aero chord  # pylint: disable=invalid-name
         )
         self.roll_geometrical_constant = roll_geometrical_constant
diff --git a/rocketpy/rocket/rocket.py b/rocketpy/rocket/rocket.py
@@ -716,12 +716,8 @@ def evaluate_inertias(self):
         dry_mass = self.dry_mass  # Constant rocket mass with motor, without propellant
 
         # Compute axes distances
-        CM_to_CDM = (
-            self.center_of_mass - self.center_of_dry_mass_position
-        )  # pylint: disable=invalid-name
-        CM_to_CPM = (
-            self.center_of_mass - self.center_of_propellant_position
-        )  # pylint: disable=invalid-name
+        CM_to_CDM = self.center_of_mass - self.center_of_dry_mass_position
+        CM_to_CPM = self.center_of_mass - self.center_of_propellant_position
 
         # Compute inertias
         self.I_11 = parallel_axis_theorem_from_com(
@@ -894,13 +890,13 @@ def add_motor(self, motor, position):
         -------
         None
         """
-        if hasattr(self, "motor") and not isinstance(
-            self.motor, EmptyMotor
-        ):  # pylint: disable=access-member-before-definition
-            print(
-                "Only one motor per rocket is currently supported. "
-                + "Overwriting previous motor."
-            )
+        if hasattr(self, "motor"):
+            # pylint: disable=access-member-before-definition
+            if not isinstance(self.motor, EmptyMotor):
+                print(
+                    "Only one motor per rocket is currently supported. "
+                    + "Overwriting previous motor."
+                )
         self.motor = motor
         self.motor_position = position
         _ = self._csys * self.motor._csys
diff --git a/rocketpy/simulation/flight.py b/rocketpy/simulation/flight.py
@@ -635,13 +635,10 @@ def __repr__(self):
             f"name= {self.name})>"
         )
 
-    def __simulate(
-        self, verbose
-    ):  #  pylint: disable=too-many-branches  # pylint: disable=too-many-locals,too-many-statements
+    # pylint: disable=too-many-nested-blocks, too-many-branches, too-many-locals,too-many-statements
+    def __simulate(self, verbose):
         """Simulate the flight trajectory."""
-        for phase_index, phase in self.time_iterator(
-            self.flight_phases
-        ):  # pylint: disable=too-many-nested-blocks
+        for phase_index, phase in self.time_iterator(self.flight_phases):
             # Determine maximum time for this flight phase
             phase.time_bound = self.flight_phases[phase_index + 1].t
 
@@ -775,29 +772,21 @@ def __simulate(
                         self.solution[-1][3] -= self.env.elevation
                         # Get points
                         y0 = (
-                            sum(
-                                [self.solution[-2][i] ** 2 for i in [1, 2, 3]]
-                            )  # pylint: disable=consider-using-generator
+                            sum(self.solution[-2][i] ** 2 for i in [1, 2, 3])
                             - self.effective_1rl**2
                         )
-                        yp0 = 2 * sum(  # pylint: disable=consider-using-generator
-                            [
-                                self.solution[-2][i] * self.solution[-2][i + 3]
-                                for i in [1, 2, 3]
-                            ]
+                        yp0 = 2 * sum(
+                            self.solution[-2][i] * self.solution[-2][i + 3]
+                            for i in [1, 2, 3]
                         )
                         t1 = self.solution[-1][0] - self.solution[-2][0]
                         y1 = (
-                            sum(
-                                [self.solution[-1][i] ** 2 for i in [1, 2, 3]]
-                            )  # pylint: disable=consider-using-generator
+                            sum(self.solution[-1][i] ** 2 for i in [1, 2, 3])
                             - self.effective_1rl**2
                         )
-                        yp1 = 2 * sum(  # pylint: disable=consider-using-generator
-                            [
-                                self.solution[-1][i] * self.solution[-1][i + 3]
-                                for i in [1, 2, 3]
-                            ]
+                        yp1 = 2 * sum(
+                            self.solution[-1][i] * self.solution[-1][i + 3]
+                            for i in [1, 2, 3]
                         )
                         # Put elevation back
                         self.solution[-2][3] += self.env.elevation
diff --git a/rocketpy/simulation/monte_carlo.py b/rocketpy/simulation/monte_carlo.py
@@ -146,6 +146,7 @@ def __init__(self, filename, environment, rocket, flight, export_list=None):
         except FileNotFoundError:
             self._error_file = f"{filename}.errors.txt"
 
+    # pylint: disable=consider-using-with
     def simulate(self, number_of_simulations, append=False):
         """
         Runs the Monte Carlo simulation and saves all data.
@@ -178,15 +179,9 @@ def simulate(self, number_of_simulations, append=False):
         """
         # Create data files for inputs, outputs and error logging
         open_mode = "a" if append else "w"
-        input_file = open(
-            self._input_file, open_mode, encoding="utf-8"
-        )  # pylint: disable=consider-using-with
-        output_file = open(
-            self._output_file, open_mode, encoding="utf-8"
-        )  # pylint: disable=consider-using-with
-        error_file = open(
-            self._error_file, open_mode, encoding="utf-8"
-        )  # pylint: disable=consider-using-with
+        input_file = open(self._input_file, open_mode, encoding="utf-8")
+        output_file = open(self._output_file, open_mode, encoding="utf-8")
+        error_file = open(self._error_file, open_mode, encoding="utf-8")
 
         # initialize counters
         self.number_of_simulations = number_of_simulations
diff --git a/rocketpy/stochastic/stochastic_model.py b/rocketpy/stochastic/stochastic_model.py
diff --git a/rocketpy/stochastic/stochastic_rocket.py b/rocketpy/stochastic/stochastic_rocket.py
