Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 4e0ef92
Merge: 0009c24 7864590
Author: Gui-FernandesBR <[email protected]>
Date:   Mon Feb 10 05:05:23 2025 -0300

    Merge branch 'develop' into enh/parallel_montecarlo

commit 0009c24
Author: Lucas de Oliveira Prates <[email protected]>
Date:   Wed Dec 18 09:39:40 2024 -0300

    BUG: fixing random number generator bug in StochasticRocket and issues inside methods of Components

commit ebf6bd0
Merge: 00d9d02 2218f0f
Author: Pedro Bressan <[email protected]>
Date:   Mon Dec 16 22:35:18 2024 +0100

    Merge remote-tracking branch 'origin/develop' into enh/parallel_montecarlo

commit 00d9d02
Author: Pedro Bressan <[email protected]>
Date:   Mon Dec 16 22:11:16 2024 +0100

    MNT: Simplify Monte Carlo parallel export structure.

commit 2218f0f
Author: Yogiraj Gutte <[email protected]>
Date:   Mon Dec 16 08:22:33 2024 +0530

    MNT: move piecewise functions to separate file (#746)

    * MNT: move piecewise functions to separate file
    closes #667

    * improved import for linting

    * MNT: applying code formaters

    * ENH: simplifying and optimizing the function, implementing tests.

    * MNT: update changelog and apply changes suggested in review

    ---------

    Co-authored-by: Lucas Prates <[email protected]>
    Co-authored-by: Lucas de Oliveira Prates <[email protected]>
    Co-authored-by: Gui-FernandesBR <[email protected]>

commit 7a122ad
Author: Lucas Gonçalves <[email protected]>
Date:   Mon Dec 16 02:49:34 2024 +0000

    DOCS: Erebus11 - BME Suborbitals -  2022 flight simulation (#757)

    * DOCS: add data for bme suborbitals flight example

    * DOCS: add simulation file for bme suborbitals flight example

    * DOCS: Error in motor fixed

    * DOC: Improve flight examples documentation
    Update flight simulation documentation with improved markdown headers and replace matplotlib with Plotly for enhanced visualizations

    * DEV: update changelog

    * DOC: Update simulation and flight data

    * DOC: Add weather file for simulations

    * DOC: Updates to erebus flight sim

    * DOC: Update changelog

    * DOC: Fix title in camoes simul

    * DOC:Update flight data

    * DOC: Comparison plots

    * MNT: Delete unnecessary file

    * DOC: Update index

    * DOC: run Black

    * DEV: update changelog

    * DOC: small fix index

    ---------

    Co-authored-by: Gui-FernandesBR <[email protected]>
    Co-authored-by: Gui-FernandesBR <[email protected]>

commit ed6af68
Author: Gui-FernandesBR <[email protected]>
Date:   Sun Dec 15 23:43:31 2024 -0300

    DOC: flight comparison improvements (#755)

    * DOC: Improve flight examples documentation
    Update flight simulation documentation with improved markdown headers and replace matplotlib with Plotly for enhanced visualizations

    * DEV: update changelog

    * DOC: Fix title in camoes simul

    * DOC: Update docs/requirements.txt to include new dependencies

    ---------

    Co-authored-by: LUCKIN13 <[email protected]>

commit c7f1623
Author: Gui-FernandesBR <[email protected]>
Date:   Sat Dec 14 23:55:09 2024 -0300

    DEV: move CITATION file back to the root

commit f407559
Author: Lucas Gonçalves <[email protected]>
Date:   Sun Dec 15 02:30:57 2024 +0000

    DOC: Lince (Team STAR) 2023 flight sim (#752)

    * DOC: Add data for lince example

    * DOC: create simulation file

    * DOC: Update simulation file

    * DOC: Add euroc_2023 weather data

    * DOC: Add flight data

    * DOC: Update flight sim

    * DOC: Changelog update & Run black

    * DOC: Small fixes to fligh sim

    * DOC : Run black

    * DOC: Simulation fixes and index sim add

    * DOC: Update environments in flight documentation

    * DOC: fix Lince values in the rst file

    ---------

    Co-authored-by: Gui-FernandesBR <[email protected]>
    Co-authored-by: Gui-FernandesBR <[email protected]>

commit 5d2fdef
Author: Lucas Gonçalves <[email protected]>
Date:   Sun Dec 15 01:55:16 2024 +0000

    DOCS : Andromeda 2022 flight simulation (#754)

    * DOC : Add weather file for simulation

    * DOC : Add data for simulation example

    * DOC: Add flight simulation example

    * DOC: Update index

    * DOC: Update Changelog

    * Update docs/examples/index.rst

    ---------

    Co-authored-by: Gui-FernandesBR <[email protected]>

commit 17207ca
Author: Caio Souza <[email protected]>
Date:   Sun Dec 8 03:15:00 2024 +0100

    ENH: create a dataset of pre-registered motors. See #664 (#744)

    * ENH: Create a dataset of pre-registered motors. See #664

    I followed the recommendation "Download and save several .eng files in the repo so we can install it along with the rocketpy package itself".

    The website thrustcurve.org was very useful to search for some .eng files. I mainly focused in some of the main brands on the market: Cesaroni, Aero Tech, Animal Motors and Loki. And also focused on classes K to M, because this is the main range of total impulse that I'm used to seeing in rocketry. I tried to pick motors with a difference of about 300~600Ns in total impulse.

    Some more improvements than can also be made following this issue are expanding the dataset for whole SolidMotor objects, more than only thrust curves. I think this would be what the recommendation "Save .json files with all the information we may find available on internet" could mean. I decided to go for the simple for now, but having the thrust curves is a good first step to implementing that in the future, which I would totally be able to do!

    * Update CHANGELOG.md

    * MNT: git rename motor eng files in data folder

    * ENH: Create a dataset of pre-registered motors. See #664

    I followed the recommendation "Download and save several .eng files in the repo so we can install it along with the rocketpy package itself".

    The website thrustcurve.org was very useful to search for some .eng files. I mainly focused in some of the main brands on the market: Cesaroni, Aero Tech, Animal Motors and Loki. And also focused on classes K to M, because this is the main range of total impulse that I'm used to seeing in rocketry. I tried to pick motors with a difference of about 300~600Ns in total impulse.

    Some more improvements than can also be made following this issue are expanding the dataset for whole SolidMotor objects, more than only thrust curves. I think this would be what the recommendation "Save .json files with all the information we may find available on internet" could mean. I decided to go for the simple for now, but having the thrust curves is a good first step to implementing that in the future, which I would totally be able to do!

    Update CHANGELOG.md

    MNT: git rename motor eng files in data folder

    ---------

    Co-authored-by: Gui-FernandesBR <[email protected]>

commit f1b57ef
Author: ArthurJWH <[email protected]>
Date:   Sat Dec 7 20:58:13 2024 -0500

    DOC: add Defiance flight example (#742)

    * BLD: add a flight example to rocketpy

    "Defiance" rocket flight example was added to doc\examples as my (Arthur Hwang) challenge submission for the Team Recruitment

    * DOC: Add Defiance launch to flight examples graph.

    * Updates CHANGELOG

    ---------

    Co-authored-by: Pedro Bressan <[email protected]>
    Co-authored-by: Gui-FernandesBR <[email protected]>

    DOC: add Defiance flight example (#742)

    * BLD: add a flight example to rocketpy

    "Defiance" rocket flight example was added to doc\examples as my (Arthur Hwang) challenge submission for the Team Recruitment

    * DOC: Add Defiance launch to flight examples graph.

    * Updates CHANGELOG

    ---------

    Co-authored-by: Pedro Bressan <[email protected]>
    Co-authored-by: Gui-FernandesBR <[email protected]>

commit fec6bf0
Author: Pedro Bressan <[email protected]>
Date:   Sun Nov 24 18:53:58 2024 +0100

    ENH: Allow for Alternative and Custom ODE Solvers.

    TST: Add slow testing for different ode solvers.

    MNT: Move ode solver validation to separate method.

commit 8082710
Author: Pedro Bressan <[email protected]>
Date:   Thu Sep 5 16:17:26 2024 -0300

    MNT: fix pylint messages on file handling.

commit df07955
Author: Pedro Bressan <[email protected]>
Date:   Thu Sep 5 16:10:41 2024 -0300

    MNT: add number of workers in parallel mode to prints.

commit 1baedf6
Author: Pedro Bressan <[email protected]>
Date:   Thu Sep 5 16:10:07 2024 -0300

    MNT: simplify process start up syntax.

commit 9f7325c
Author: Pedro Bressan <[email protected]>
Date:   Thu Sep 5 16:01:41 2024 -0300

    MNT: avoid unnecessary reseedings on parallel monte carlo.

commit 4246809
Author: Pedro Bressan <[email protected]>
Date:   Thu Sep 5 16:00:03 2024 -0300

    MNT: add index to outputs of monte carlo.

commit e40a871
Author: Pedro Bressan <[email protected]>
Date:   Fri Aug 23 12:12:43 2024 -0300

    DOC: improve docstrings regarding number of workers.

commit 6fa90b7
Merge: d07fcc2 44beade
Author: Pedro Bressan <[email protected]>
Date:   Fri Aug 23 12:04:10 2024 -0300

    Merge remote-tracking branch 'origin/develop' into enh/parallel_montecarlo

commit d07fcc2
Author: Pedro Bressan <[email protected]>
Date:   Fri Aug 23 12:04:00 2024 -0300

    MNT: solve review comments on docstrings and code comments.

commit 6dab002
Author: Pedro Bressan <[email protected]>
Date:   Fri Aug 23 11:57:25 2024 -0300

    DOC: run 1000 MonteCarlo simulations for better documentatiion example.

commit d22c957
Author: Pedro Bressan <[email protected]>
Date:   Fri Aug 23 10:17:59 2024 -0300

    MNT: improve process ordering for spawned workers.

commit 1e24643
Author: Pedro Bressan <[email protected]>
Date:   Wed Aug 21 19:18:51 2024 -0300

    FIX: return to multiprocess library for spawned process support.

commit 0e4d243
Author: Pedro Bressan <[email protected]>
Date:   Wed Aug 21 19:09:18 2024 -0300

    MNT: solve number of processes issue on Windows.

commit 5141791
Author: Pedro Bressan <[email protected]>
Date:   Mon Aug 19 11:35:04 2024 -0300

    MNT: improve object encoding and file handling.

commit 8671e52
Author: Pedro Bressan <[email protected]>
Date:   Sun Aug 18 19:46:43 2024 -0300

    MNT: soft stop on parallel errors or interrupt.

commit 6715791
Merge: b749979 8b4c14a
Author: Gui-FernandesBR <[email protected]>
Date:   Sun Aug 18 09:44:03 2024 -0300

    Merge branch 'develop' into enh/parallel_montecarlo

commit b749979
Author: Pedro Henrique Marinho Bressan <[email protected]>
Date:   Fri Aug 16 22:59:06 2024 -0300

    Update rocketpy/simulation/monte_carlo.py

    Co-authored-by: MateusStano <[email protected]>

commit 6061d3a
Author: Pedro Bressan <[email protected]>
Date:   Fri Aug 16 22:37:41 2024 -0300

    MNT: use standard multiprocessing with instance methods.

    Co-authored-by: MateusStano <[email protected]>

commit c3c6c3d
Merge: cb88e69 3b61784
Author: Gui-FernandesBR <[email protected]>
Date:   Tue Aug 13 09:58:50 2024 -0300

    Merge branch 'develop' into enh/parallel_montecarlo

commit cb88e69
Merge: 3a08f48 4531ed5
Author: Pedro Bressan <[email protected]>
Date:   Tue Aug 6 08:33:54 2024 -0300

    Merge remote-tracking branch 'origin/develop' into enh/parallel_montecarlo

commit 3a08f48
Merge: 049276d 0048737
Author: Pedro Henrique Marinho Bressan <[email protected]>
Date:   Mon Aug 5 17:45:55 2024 -0300

    Merge pull request #649 from RocketPy-Team/mnt/parallel-refactor

    MNT: Refactor Parallel MonteCarlo and Stochastic Seeding

commit 0048737
Author: Pedro Bressan <[email protected]>
Date:   Sat Aug 3 22:39:38 2024 -0300

    MNT: improve docstrings according to code reviews.

commit fe7bad3
Author: Pedro Bressan <[email protected]>
Date:   Sat Aug 3 22:27:26 2024 -0300

    MNT: correct outdated docstrings and improve function naming.

commit abe5747
Author: Pedro Bressan <[email protected]>
Date:   Sat Aug 3 22:21:18 2024 -0300

    FIX: stochastic model seed input not being used.

commit d18408e
Author: Pedro Bressan <[email protected]>
Date:   Sat Aug 3 22:18:40 2024 -0300

    MNT: improve random number generator naming.

commit 26f692e
Author: Pedro Bressan <[email protected]>
Date:   Sat Aug 3 14:25:52 2024 -0300

    MNT: fix printing and formatting issues.

commit 004bf23
Author: Pedro Bressan <[email protected]>
Date:   Sat Aug 3 13:16:28 2024 -0300

    MNT: improve docstrings for parallel MonteCarlo.

commit 8316993
Author: Pedro Bressan <[email protected]>
Date:   Fri Aug 2 23:13:25 2024 -0300

    FIX: parallel random value generation not being independent.

commit 049276d
Author: Pedro Bressan <[email protected]>
Date:   Mon Jul 29 11:11:18 2024 -0300

    FIX: optional import handling of multiprocess module.

commit 2169db1
Author: Pedro Bressan <[email protected]>
Date:   Fri Jul 26 18:11:13 2024 -0300

    MNT: update optional dependencies for multiprocess.

commit 2cdc95e
Author: Pedro Bressan <[email protected]>
Date:   Fri Jul 26 17:59:57 2024 -0300

    TST: fix testing for file Paths.

commit d3a9004
Merge: 25a2fed a901b45
Author: Pedro Bressan <[email protected]>
Date:   Fri Jul 26 17:55:45 2024 -0300

    Merge remote-tracking branch 'origin/develop' into enh/parallel_montecarlo

commit 25a2fed
Author: Pedro Bressan <[email protected]>
Date:   Fri Jul 26 17:54:46 2024 -0300

    MNT: remove light mode and refactor I/O file handling.

commit 8008aa7
Author: Pedro Bressan <[email protected]>
Date:   Fri Jul 26 11:09:14 2024 -0300

    MNT: remove post processing scripts.

commit 2a42b26
Author: Pedro Bressan <[email protected]>
Date:   Fri Jul 19 18:12:37 2024 -0300

    FIX: small post merge corrections.

commit c563472
Merge: 615a907 d977fbe
Author: Pedro Bressan <[email protected]>
Date:   Fri Jul 19 17:28:41 2024 -0300

    Merge remote-tracking branch 'origin/develop' into enh/parallel_montecarlo

commit 615a907
Author: Pedro Bressan <[email protected]>
Date:   Fri Jul 19 16:56:10 2024 -0300

    MNT: run formatters and apply simple review suggestions.

commit 3428608
Author: Bruno Sorban <[email protected]>
Date:   Wed Jun 26 13:52:32 2024 +0200

    Added time back to exported functions

commit 01d77fa
Author: Bruno Sorban <[email protected]>
Date:   Wed Jun 26 10:07:49 2024 +0200

    Encapsulated methods and reduced buffer size

commit 2e56977
Author: Bruno Sorban <[email protected]>
Date:   Wed Jun 19 17:27:01 2024 +0200

    added input export to light mode

commit cb276de
Author: Bruno Sorban <[email protected]>
Date:   Wed Jun 19 16:20:43 2024 +0200

    Update sim counter for append mode

commit 3114f81
Author: Bruno Sorban <[email protected]>
Date:   Wed Jun 19 16:12:35 2024 +0200

    Removed alpha serializer

commit 4fe5314
Author: Bruno Sorban <[email protected]>
Date:   Wed Jun 19 12:21:21 2024 +0200

    Updated writer to write unpickled data

commit d7ed4a1
Author: Bruno Sorban <[email protected]>
Date:   Wed Jun 19 11:50:54 2024 +0200

    Working shared memory with big buffer

commit 1999c6d
Author: Bruno Sorban <[email protected]>
Date:   Tue Jun 18 17:39:59 2024 +0200

    not deserializing data

commit ceb1832
Author: Bruno Sorban <[email protected]>
Date:   Wed Jun 12 21:41:33 2024 +0200

    Added cpu limit

commit d421a83
Author: Bruno Sorban <[email protected]>
Date:   Wed Jun 12 18:58:33 2024 +0200

    Working 2 way semaphore

commit 2b8dc4b
Author: Bruno Sorban <[email protected]>
Date:   Tue Jun 11 14:45:32 2024 +0200

    Updated start time

commit 98ce6ba
Author: Bruno Sorban <[email protected]>
Date:   Tue Jun 11 13:37:38 2024 +0200

    Centralized simulation control in SimCounter

commit 38a29b1
Author: Bruno Sorban <[email protected]>
Date:   Sun Jun 9 15:21:36 2024 +0200

    Added documentation

commit ee06b9d
Author: Bruno Sorban <[email protected]>
Date:   Sun Jun 9 15:04:11 2024 +0200

    removed unsused file

commit b3dcfc6
Author: Bruno Sorban <[email protected]>
Date:   Sun Jun 9 15:01:54 2024 +0200

    Updated append mode

commit 918cbe0
Author: Bruno Sorban <[email protected]>
Date:   Sun Jun 9 14:25:52 2024 +0200

    Removed dev files

commit 75bc96b
Author: Bruno Sorban <[email protected]>
Date:   Sun Jun 9 13:31:29 2024 +0200

    removed test file

commit 5a6547d
Author: Bruno Sorban <[email protected]>
Date:   Sun Jun 9 13:27:23 2024 +0200

    Updated example notebook

commit 1fe04e1
Author: Bruno Sorban <[email protected]>
Date:   Sun Jun 9 13:27:12 2024 +0200

    Added central post-processing script

commit d57e436
Author: Bruno Sorban <[email protected]>
Date:   Sun Jun 9 11:32:37 2024 +0200

    Enabled number of workers control

commit 9cef636
Author: Bruno Sorban <[email protected]>
Date:   Sun Jun 9 10:26:06 2024 +0200

    Added append logic to h5 file

commit 175a025
Author: Bruno Sorban <[email protected]>
Date:   Wed Jun 5 18:19:21 2024 +0200

    one lock per file

commit 1146e20
Author: Bruno Sorban <[email protected]>
Date:   Wed Jun 5 18:09:06 2024 +0200

    using queue to manage simulations

commit be32a75
Author: Bruno Sorban <[email protected]>
Date:   Tue May 21 21:15:33 2024 +0200

    Added post-processing scripts

commit 6ea6ef8
Author: Bruno Sorban <[email protected]>
Date:   Tue May 21 17:18:58 2024 +0200

    Style changes

commit 46f5f00
Author: Bruno Sorban <[email protected]>
Date:   Tue May 21 17:09:14 2024 +0200

    Enable both export modes for serial and parallel

commit 1b50e94
Author: Bruno Sorban <[email protected]>
Date:   Thu May 9 16:36:50 2024 +0200

    Write mode added

commit 2927448
Author: Bruno Sorban <[email protected]>
Date:   Thu May 9 12:17:22 2024 +0200

    Working version with shared objects

commit 6fbe0f7
Author: Bruno Sorban <[email protected]>
Date:   Thu May 9 11:17:46 2024 +0200

    added counter

commit 2d5ff8d
Author: Bruno Sorban <[email protected]>
Date:   Sat May 4 14:17:38 2024 +0200

    Basic paralllel structure added
  • Loading branch information
Gui-FernandesBR committed Feb 10, 2025
1 parent 7864590 commit 0bfec91
Show file tree
Hide file tree
Showing 10 changed files with 585 additions and 211 deletions.
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@
"Metrum",
"modindex",
"mult",
"multiprocess",
"Mumma",
"NASADEM",
"nbformat",
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ env-analysis = [
]

monte-carlo = [
"imageio",
"imageio",
"multiprocess>=0.70",
"statsmodels",
"prettytable",
]
Expand Down
1 change: 1 addition & 0 deletions requirements-optional.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ ipywidgets>=7.6.3
jsonpickle
timezonefinder
imageio
multiprocess>=0.70
statsmodels
prettytable
6 changes: 6 additions & 0 deletions rocketpy/rocket/components.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ def remove(self, component):
"""
for index, comp in enumerate(self._components):
if comp.component == component:
self.__component_list.pop(index)
self.__position_list.pop(index)
self._components.pop(index)
break
else:
Expand All @@ -168,6 +170,8 @@ def pop(self, index=-1):
component : Any
The component removed from the list of components.
"""
self.__component_list.pop(index)
self.__position_list.pop(index)
return self._components.pop(index)

def clear(self):
Expand All @@ -177,6 +181,8 @@ def clear(self):
-------
None
"""
self.__component_list.clear()
self.__position_list.clear()
self._components.clear()

def sort_by_position(self, reverse=False):
Expand Down
Loading

0 comments on commit 0bfec91

Please sign in to comment.