Merge branch 'develop' into mnt/export-non-apogee-flights

MateusStano · web-flow · commit a9ec005b2501 · 2025-10-27T18:15:22.000-03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,7 @@ Attention: The newest changes should be on top -->
 ### Changed
 
 - MNT: allow for exporting of non apogee flights. [#863](https://github.com/RocketPy-Team/RocketPy/pull/863)
+- TST: remove remaining files after test session. [#862](https://github.com/RocketPy-Team/RocketPy/pull/862)
 - MNT: bumps min python version to 3.10 [#857](https://github.com/RocketPy-Team/RocketPy/pull/857)
 - DOC: Update docs dependencies and sub dependencies [#851](https://github.com/RocketPy-Team/RocketPy/pull/851)
 - MNT: extract flight data exporters [#845](https://github.com/RocketPy-Team/RocketPy/pull/845)
@@ -53,6 +54,7 @@ Attention: The newest changes should be on top -->
 
 ### Fixed
 
+- BUG: correct encoding for trapezoidal sweep length and angle. [#861](https://github.com/RocketPy-Team/RocketPy/pull/861)
 - BUG: Fix no time initialization when passing initial_solution as array to Flight object [#844](https://github.com/RocketPy-Team/RocketPy/pull/844)
 
 
diff --git a/rocketpy/rocket/aero_surface/fins/trapezoidal_fins.py b/rocketpy/rocket/aero_surface/fins/trapezoidal_fins.py
@@ -176,9 +176,6 @@ def __init__(
             sweep_length = np.tan(sweep_angle * np.pi / 180) * span
         elif sweep_length is None:
             sweep_length = root_chord - tip_chord
-        else:
-            # Sweep length is given
-            pass
 
         self._tip_chord = tip_chord
         self._sweep_length = sweep_length
@@ -351,12 +348,12 @@ def all_info(self):
     def to_dict(self, **kwargs):
         data = super().to_dict(**kwargs)
         data["tip_chord"] = self.tip_chord
+        data["sweep_length"] = self.sweep_length
+        data["sweep_angle"] = self.sweep_angle
 
         if kwargs.get("include_outputs", False):
             data.update(
                 {
-                    "sweep_length": self.sweep_length,
-                    "sweep_angle": self.sweep_angle,
                     "shape_vec": self.shape_vec,
                     "Af": self.Af,
                     "AR": self.AR,
@@ -382,4 +379,5 @@ def from_dict(cls, data):
             cant_angle=data["cant_angle"],
             airfoil=data["airfoil"],
             name=data["name"],
+            sweep_length=data.get("sweep_length"),
         )
diff --git a/tests/fixtures/surfaces/surface_fixtures.py b/tests/fixtures/surfaces/surface_fixtures.py
@@ -69,6 +69,50 @@ def calisto_trapezoidal_fins():
     )
 
 
+@pytest.fixture
+def calisto_trapezoidal_fins_custom_sweep_length():
+    """The trapezoidal fins of the Calisto rocket with
+    a custom sweep length.
+
+    Returns
+    -------
+    rocketpy.TrapezoidalFins
+        The trapezoidal fins of the Calisto rocket.
+    """
+    return TrapezoidalFins(
+        n=4,
+        span=0.100,
+        root_chord=0.120,
+        tip_chord=0.040,
+        rocket_radius=0.0635,
+        name="calisto_trapezoidal_fins_custom_sweep_length",
+        cant_angle=0,
+        sweep_length=0.1,
+    )
+
+
+@pytest.fixture
+def calisto_trapezoidal_fins_custom_sweep_angle():
+    """The trapezoidal fins of the Calisto rocket with
+    a custom sweep angle.
+
+    Returns
+    -------
+    rocketpy.TrapezoidalFins
+        The trapezoidal fins of the Calisto rocket.
+    """
+    return TrapezoidalFins(
+        n=4,
+        span=0.100,
+        root_chord=0.120,
+        tip_chord=0.040,
+        rocket_radius=0.0635,
+        name="calisto_trapezoidal_fins_custom_sweep_angle",
+        cant_angle=0,
+        sweep_angle=30,
+    )
+
+
 @pytest.fixture
 def calisto_free_form_fins():
     """The free form fins of the Calisto rocket.
diff --git a/tests/integration/simulation/test_monte_carlo.py b/tests/integration/simulation/test_monte_carlo.py
@@ -9,6 +9,18 @@
 plt.rcParams.update({"figure.max_open_warning": 0})
 
 
+def _post_test_file_cleanup():
+    """Clean monte carlo files after test session if they exist."""
+    if os.path.exists("monte_carlo_class_example.kml"):
+        os.remove("monte_carlo_class_example.kml")
+    if os.path.exists("monte_carlo_test.errors.txt"):
+        os.remove("monte_carlo_test.errors.txt")
+    if os.path.exists("monte_carlo_test.inputs.txt"):
+        os.remove("monte_carlo_test.inputs.txt")
+    if os.path.exists("monte_carlo_test.outputs.txt"):
+        os.remove("monte_carlo_test.outputs.txt")
+
+
 @pytest.mark.slow
 @pytest.mark.parametrize("parallel", [False, True])
 def test_monte_carlo_simulate(monte_carlo_calisto, parallel):
@@ -19,27 +31,29 @@ def test_monte_carlo_simulate(monte_carlo_calisto, parallel):
     monte_carlo_calisto : MonteCarlo
         The MonteCarlo object, this is a pytest fixture.
     """
-    # NOTE: this is really slow, it runs 10 flight simulations
-    monte_carlo_calisto.simulate(
-        number_of_simulations=10, append=False, parallel=parallel
-    )
-
-    assert monte_carlo_calisto.num_of_loaded_sims == 10
-    assert monte_carlo_calisto.number_of_simulations == 10
-    assert str(monte_carlo_calisto.filename.name) == "monte_carlo_test"
-    assert str(monte_carlo_calisto.error_file.name) == "monte_carlo_test.errors.txt"
-    assert str(monte_carlo_calisto.output_file.name) == "monte_carlo_test.outputs.txt"
-    assert np.isclose(
-        monte_carlo_calisto.processed_results["apogee"][0], 4711, rtol=0.2
-    )
-    assert np.isclose(
-        monte_carlo_calisto.processed_results["impact_velocity"][0],
-        -5.234,
-        rtol=0.2,
-    )
-    os.remove("monte_carlo_test.errors.txt")
-    os.remove("monte_carlo_test.outputs.txt")
-    os.remove("monte_carlo_test.inputs.txt")
+    try:
+        # NOTE: this is really slow, it runs 10 flight simulations
+        monte_carlo_calisto.simulate(
+            number_of_simulations=10, append=False, parallel=parallel
+        )
+
+        assert monte_carlo_calisto.num_of_loaded_sims == 10
+        assert monte_carlo_calisto.number_of_simulations == 10
+        assert str(monte_carlo_calisto.filename.name) == "monte_carlo_test"
+        assert str(monte_carlo_calisto.error_file.name) == "monte_carlo_test.errors.txt"
+        assert (
+            str(monte_carlo_calisto.output_file.name) == "monte_carlo_test.outputs.txt"
+        )
+        assert np.isclose(
+            monte_carlo_calisto.processed_results["apogee"][0], 4711, rtol=0.2
+        )
+        assert np.isclose(
+            monte_carlo_calisto.processed_results["impact_velocity"][0],
+            -5.234,
+            rtol=0.2,
+        )
+    finally:
+        _post_test_file_cleanup()
 
 
 def test_monte_carlo_set_inputs_log(monte_carlo_calisto):
@@ -50,14 +64,17 @@ def test_monte_carlo_set_inputs_log(monte_carlo_calisto):
     monte_carlo_calisto : MonteCarlo
         The MonteCarlo object, this is a pytest fixture.
     """
-    monte_carlo_calisto.input_file = "tests/fixtures/monte_carlo/example.inputs.txt"
-    monte_carlo_calisto.set_inputs_log()
-    assert len(monte_carlo_calisto.inputs_log) == 100
-    assert all(isinstance(item, dict) for item in monte_carlo_calisto.inputs_log)
-    assert all(
-        "gravity" in item and "elevation" in item
-        for item in monte_carlo_calisto.inputs_log
-    )
+    try:
+        monte_carlo_calisto.input_file = "tests/fixtures/monte_carlo/example.inputs.txt"
+        monte_carlo_calisto.set_inputs_log()
+        assert len(monte_carlo_calisto.inputs_log) == 100
+        assert all(isinstance(item, dict) for item in monte_carlo_calisto.inputs_log)
+        assert all(
+            "gravity" in item and "elevation" in item
+            for item in monte_carlo_calisto.inputs_log
+        )
+    finally:
+        _post_test_file_cleanup()
 
 
 def test_monte_carlo_set_outputs_log(monte_carlo_calisto):
@@ -68,14 +85,19 @@ def test_monte_carlo_set_outputs_log(monte_carlo_calisto):
     monte_carlo_calisto : MonteCarlo
         The MonteCarlo object, this is a pytest fixture.
     """
-    monte_carlo_calisto.output_file = "tests/fixtures/monte_carlo/example.outputs.txt"
-    monte_carlo_calisto.set_outputs_log()
-    assert len(monte_carlo_calisto.outputs_log) == 100
-    assert all(isinstance(item, dict) for item in monte_carlo_calisto.outputs_log)
-    assert all(
-        "apogee" in item and "impact_velocity" in item
-        for item in monte_carlo_calisto.outputs_log
-    )
+    try:
+        monte_carlo_calisto.output_file = (
+            "tests/fixtures/monte_carlo/example.outputs.txt"
+        )
+        monte_carlo_calisto.set_outputs_log()
+        assert len(monte_carlo_calisto.outputs_log) == 100
+        assert all(isinstance(item, dict) for item in monte_carlo_calisto.outputs_log)
+        assert all(
+            "apogee" in item and "impact_velocity" in item
+            for item in monte_carlo_calisto.outputs_log
+        )
+    finally:
+        _post_test_file_cleanup()
 
 
 # def test_monte_carlo_set_errors_log(monte_carlo_calisto):
@@ -86,22 +108,30 @@ def test_monte_carlo_set_outputs_log(monte_carlo_calisto):
 
 def test_monte_carlo_prints(monte_carlo_calisto):
     """Tests the prints methods of the MonteCarlo class."""
-    monte_carlo_calisto.info()
-    monte_carlo_calisto.compare_info(monte_carlo_calisto)
+    try:
+        monte_carlo_calisto.info()
+        monte_carlo_calisto.compare_info(monte_carlo_calisto)
+    finally:
+        _post_test_file_cleanup()
 
 
 @patch("matplotlib.pyplot.show")  # pylint: disable=unused-argument
 def test_monte_carlo_plots(mock_show, monte_carlo_calisto_pre_loaded):
     """Tests the plots methods of the MonteCarlo class."""
-    assert monte_carlo_calisto_pre_loaded.all_info() is None
-    assert (
-        monte_carlo_calisto_pre_loaded.compare_plots(monte_carlo_calisto_pre_loaded)
-        is None
-    )
-    assert (
-        monte_carlo_calisto_pre_loaded.compare_ellipses(monte_carlo_calisto_pre_loaded)
-        is None
-    )
+    try:
+        assert monte_carlo_calisto_pre_loaded.all_info() is None
+        assert (
+            monte_carlo_calisto_pre_loaded.compare_plots(monte_carlo_calisto_pre_loaded)
+            is None
+        )
+        assert (
+            monte_carlo_calisto_pre_loaded.compare_ellipses(
+                monte_carlo_calisto_pre_loaded
+            )
+            is None
+        )
+    finally:
+        _post_test_file_cleanup()
 
 
 def test_monte_carlo_export_ellipses_to_kml(monte_carlo_calisto_pre_loaded):
@@ -112,17 +142,18 @@ def test_monte_carlo_export_ellipses_to_kml(monte_carlo_calisto_pre_loaded):
     monte_carlo_calisto_pre_loaded : MonteCarlo
         The MonteCarlo object, this is a pytest fixture.
     """
-    assert (
-        monte_carlo_calisto_pre_loaded.export_ellipses_to_kml(
-            filename="monte_carlo_class_example.kml",
-            origin_lat=32.990254,
-            origin_lon=-106.974998,
-            type="all",
+    try:
+        assert (
+            monte_carlo_calisto_pre_loaded.export_ellipses_to_kml(
+                filename="monte_carlo_class_example.kml",
+                origin_lat=32.990254,
+                origin_lon=-106.974998,
+                type="all",
+            )
+            is None
         )
-        is None
-    )
-
-    os.remove("monte_carlo_class_example.kml")
+    finally:
+        _post_test_file_cleanup()
 
 
 @pytest.mark.slow
@@ -134,47 +165,45 @@ def test_monte_carlo_callback(monte_carlo_calisto):
     monte_carlo_calisto : MonteCarlo
         The MonteCarlo object, this is a pytest fixture.
     """
-
-    # define valid data collector
-    valid_data_collector = {
-        "name": lambda flight: flight.name,
-        "density_t0": lambda flight: flight.env.density(0),
-    }
-
-    monte_carlo_calisto.data_collector = valid_data_collector
-    # NOTE: this is really slow, it runs 10 flight simulations
-    monte_carlo_calisto.simulate(number_of_simulations=10, append=False)
-
-    # tests if print works when we have None in summary
-    monte_carlo_calisto.info()
-
-    ## tests if an error is raised for invalid data_collector definitions
-    # invalid type
-    def invalid_data_collector(flight):
-        return flight.name
-
-    with pytest.raises(ValueError):
-        monte_carlo_calisto._check_data_collector(invalid_data_collector)
-
-    # invalid key overwrite
-    invalid_data_collector = {"apogee": lambda flight: flight.apogee}
-    with pytest.raises(ValueError):
-        monte_carlo_calisto._check_data_collector(invalid_data_collector)
-
-    # invalid callback definition
-    invalid_data_collector = {"name": "Calisto"}  # callbacks must be callables!
-    with pytest.raises(ValueError):
-        monte_carlo_calisto._check_data_collector(invalid_data_collector)
-
-    # invalid logic (division by zero)
-    invalid_data_collector = {
-        "density_t0": lambda flight: flight.env.density(0) / "0",
-    }
-    monte_carlo_calisto.data_collector = invalid_data_collector
-    # NOTE: this is really slow, it runs 10 flight simulations
-    with pytest.raises(ValueError):
+    try:
+        # define valid data collector
+        valid_data_collector = {
+            "name": lambda flight: flight.name,
+            "density_t0": lambda flight: flight.env.density(0),
+        }
+
+        monte_carlo_calisto.data_collector = valid_data_collector
+        # NOTE: this is really slow, it runs 10 flight simulations
         monte_carlo_calisto.simulate(number_of_simulations=10, append=False)
 
-    os.remove("monte_carlo_test.errors.txt")
-    os.remove("monte_carlo_test.outputs.txt")
-    os.remove("monte_carlo_test.inputs.txt")
+        # tests if print works when we have None in summary
+        monte_carlo_calisto.info()
+
+        ## tests if an error is raised for invalid data_collector definitions
+        # invalid type
+        def invalid_data_collector(flight):
+            return flight.name
+
+        with pytest.raises(ValueError):
+            monte_carlo_calisto._check_data_collector(invalid_data_collector)
+
+        # invalid key overwrite
+        invalid_data_collector = {"apogee": lambda flight: flight.apogee}
+        with pytest.raises(ValueError):
+            monte_carlo_calisto._check_data_collector(invalid_data_collector)
+
+        # invalid callback definition
+        invalid_data_collector = {"name": "Calisto"}  # callbacks must be callables!
+        with pytest.raises(ValueError):
+            monte_carlo_calisto._check_data_collector(invalid_data_collector)
+
+        # invalid logic (division by zero)
+        invalid_data_collector = {
+            "density_t0": lambda flight: flight.env.density(0) / "0",
+        }
+        monte_carlo_calisto.data_collector = invalid_data_collector
+        # NOTE: this is really slow, it runs 10 flight simulations
+        with pytest.raises(ValueError):
+            monte_carlo_calisto.simulate(number_of_simulations=10, append=False)
+    finally:
+        _post_test_file_cleanup()
diff --git a/tests/integration/test_encoding.py b/tests/integration/test_encoding.py
