Skip to content

ENH: Refactor and replace plots and outputs + Compare plots #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 149 commits into from
Jan 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
106c17b
enh: create plots module
MateusStano Nov 12, 2022
66f3af7
enh: created files in the expected structure
MateusStano Nov 12, 2022
86532e0
bug: fized init and added underscore to classes
MateusStano Nov 13, 2022
33d7867
enh: Flight plots moved to plots/flight_plots.py
MateusStano Nov 13, 2022
79e2340
bug: fixed __init__ again
MateusStano Nov 13, 2022
bb5d7c5
enh: added prints folder
MateusStano Nov 13, 2022
e57f825
GIT: renaming the compare_plots file
Gui-FernandesBR Nov 13, 2022
ab23ce8
enh: moved Flight prints to flight_prints.py
MateusStano Nov 13, 2022
d4e6a96
updated docs
MateusStano Nov 13, 2022
48b0fd3
updated docs
MateusStano Nov 13, 2022
74da4ca
Merge branch 'enh/new_plots' into enh/flight_plots
MateusStano Nov 13, 2022
42f7cf0
Fix code style issues with Black
lint-action Nov 13, 2022
7925d60
Merge branch 'beta/v1.0.0' into enh/new_plots
Gui-FernandesBR Nov 13, 2022
8863bbc
Merge branch 'enh/new_plots' into enh/flight_plots
MateusStano Nov 13, 2022
f5f7bca
Merge branch 'master' into enh/flight_prints
Gui-FernandesBR Nov 13, 2022
418ddfd
Merge branch 'enh/new_plots' into enh/flight_prints
MateusStano Nov 13, 2022
41f55ca
Squashed commit of the following:
Gui-FernandesBR Nov 13, 2022
fd8eb41
Merge branch 'enh/flight_prints' of https://github.com/rocketpy-team/…
Gui-FernandesBR Nov 13, 2022
811b3f0
Merge branch 'enh/new_plots' into enh/new_plotscompare-plots
Gui-FernandesBR Nov 13, 2022
d118c0e
maint: removed 'print' from methods names
MateusStano Nov 13, 2022
5577ec2
maint: removed '\n' from prints
MateusStano Nov 13, 2022
8bbe42f
Merge branch 'enh/flight_prints' of https://github.com/RocketPy-Team/…
MateusStano Nov 13, 2022
aa54bd6
maint: removed 'plot' from methods names
MateusStano Nov 13, 2022
e5a61d6
Merge branch 'enh/flight_plots' of https://github.com/RocketPy-Team/R…
MateusStano Nov 13, 2022
67e3711
enh: changed Environment infos into environment_prints.py
MateusStano Nov 13, 2022
d0da62b
maint: deleted repeated lines of code
MateusStano Nov 13, 2022
8517ceb
maint: deleted unnecessary comment
MateusStano Nov 13, 2022
3b3e845
maint: removed unused variables
MateusStano Nov 13, 2022
553df48
Merge pull request #289 from RocketPy-Team/enh/flight_prints
MateusStano Nov 13, 2022
d84abc5
Merge branch 'enh/new_plots' into enh/flight_plots
MateusStano Nov 13, 2022
bb0ce50
maint: replaced self.plots in __init__
MateusStano Nov 13, 2022
c5b4857
ENH: adding name as a karg in Flight class
Gui-FernandesBR Nov 13, 2022
46a4397
enh: added event time attributes definition in __init__
MateusStano Nov 14, 2022
80776fc
Fix code style issues with Black
lint-action Nov 14, 2022
4ebab9a
added author
MateusStano Nov 14, 2022
64eb8a1
enh: moved plots from Environment.py to environment_plots.py
MateusStano Nov 14, 2022
fa3faa9
maint: docs
MateusStano Nov 14, 2022
c37d95f
MAINT: modifying default name value
Gui-FernandesBR Nov 14, 2022
ca68cd8
MAINT: Update flight docs
Gui-FernandesBR Nov 14, 2022
221b1bb
MAINT: adding new lines to __init__.py files
Gui-FernandesBR Nov 14, 2022
48fb4a1
ENH: update the __init__ method of CompareFlights
Gui-FernandesBR Nov 14, 2022
1864f14
ENH: auxiliary function to create figures and axes
Gui-FernandesBR Nov 14, 2022
ecca579
ENH: compare positions method
Gui-FernandesBR Nov 14, 2022
6493a41
ENH: compare velocities method
Gui-FernandesBR Nov 14, 2022
2b50940
ENH: compare stream velocities method
Gui-FernandesBR Nov 14, 2022
e55c5f2
ENH: compare accelerations method
Gui-FernandesBR Nov 14, 2022
e2de760
ENH: compare euler angles method
Gui-FernandesBR Nov 14, 2022
9886137
ENH: compare quaternions method
Gui-FernandesBR Nov 14, 2022
f053fd8
ENH: compare attitude_angles method
Gui-FernandesBR Nov 14, 2022
eedfaa5
ENH: compare angular velocities method
Gui-FernandesBR Nov 14, 2022
35a7f0b
ENH: compare angular_accelerations
Gui-FernandesBR Nov 14, 2022
35b771e
ENH: compare aero forces and moments methods
Gui-FernandesBR Nov 14, 2022
c230e4c
ENH: compare energies and compare powers methods
Gui-FernandesBR Nov 14, 2022
64c2cf8
ENH: compare rail_buttons_forces method
Gui-FernandesBR Nov 14, 2022
5506c8a
ENH: compare angles of attack method
Gui-FernandesBR Nov 14, 2022
939b897
ENH: compare fluid mechanics
Gui-FernandesBR Nov 14, 2022
1b17914
ENH: compare attitude frequency response
Gui-FernandesBR Nov 14, 2022
bbe0d6e
ENH: static method to compare 3d trajectories
Gui-FernandesBR Nov 14, 2022
82657da
ENH: compare trajectories_3d method
Gui-FernandesBR Nov 14, 2022
890c7c5
ENH: Create CompareFlights.all() method
Gui-FernandesBR Nov 14, 2022
8f3c903
ENH: adding methods that will be created in future
Gui-FernandesBR Nov 14, 2022
78a0bd8
Merge pull request #294 from RocketPy-Team/enh/environment_prints
MateusStano Nov 14, 2022
14ee975
Merge branch 'enh/new_plots' into enh/environment_plots
MateusStano Nov 14, 2022
6faef4c
Merge pull request #293 from RocketPy-Team/enh/add_name_arguments
Gui-FernandesBR Nov 14, 2022
540be8c
Merge pull request #296 from RocketPy-Team/enh/environment_plots
MateusStano Nov 14, 2022
3256dd8
bug: created __calculate_indexes method to fix @cached_property bug
MateusStano Nov 14, 2022
c2dfade
maint: __calculate_indexes documentation
MateusStano Nov 14, 2022
83c311f
enh: added self.plots.all() to allInfo
MateusStano Nov 14, 2022
a66a579
FIX: removing broken import
Gui-FernandesBR Nov 16, 2022
4eef4fc
Squashed commit of the following:
Gui-FernandesBR Nov 16, 2022
8760bb1
ENH: add temporary time and solutionArray propert
Gui-FernandesBR Nov 16, 2022
d8c7b89
FIX: debugging grids and legends
Gui-FernandesBR Nov 16, 2022
a73f2d4
GIT: giving up of frequency comparison
Gui-FernandesBR Nov 16, 2022
291d479
BUG: starting with null values of retrieved accel
Gui-FernandesBR Nov 16, 2022
7b81c0e
MAINT: refactor max_time variable
Gui-FernandesBR Nov 16, 2022
4203d82
ADD: new compare flights notebook
Gui-FernandesBR Nov 16, 2022
3f0c7df
initial changes to parachute
MateusStano Nov 17, 2022
0fe4da6
ENH: Moved Rocket plots to rocket_plots.py
ompro07 Nov 18, 2022
72499cc
Fix code style issues with Black
lint-action Nov 18, 2022
2d49f97
Fix typo
ompro07 Nov 18, 2022
b1b3806
Merge branch 'enh/rocket_plots' of https://github.com/RocketPy-Team/R…
ompro07 Nov 18, 2022
7739032
fix attribute reference
ompro07 Nov 18, 2022
a9c62c2
enh: new methods added to rocket_plots.py
ompro07 Nov 19, 2022
1fdefd2
Fix code style issues with Black
lint-action Nov 19, 2022
6990d64
ENH: Moved Rocket prints to rocket_prints.py
ompro07 Nov 19, 2022
a6b0ed1
Fix code style issues with Black
lint-action Nov 19, 2022
c7bd0a6
Merge pull request #302 from RocketPy-Team/enh/rocket_plots
MateusStano Nov 19, 2022
5cbcffc
bug: fix import errors and clalpha print
MateusStano Nov 19, 2022
5420446
enh: added line skips
MateusStano Nov 19, 2022
f910f68
Merge branch 'enh/new_plots' into enh/rocket_prints
MateusStano Nov 19, 2022
14932f6
Merge pull request #303 from RocketPy-Team/enh/rocket_prints
MateusStano Nov 21, 2022
60ea09b
enh: create plots module
MateusStano Nov 12, 2022
4e70be8
enh: created files in the expected structure
MateusStano Nov 12, 2022
3950ab8
bug: fized init and added underscore to classes
MateusStano Nov 13, 2022
a10680c
bug: fixed __init__ again
MateusStano Nov 13, 2022
09a7108
enh: added prints folder
MateusStano Nov 13, 2022
ef1dfc1
enh: moved Flight prints to flight_prints.py
MateusStano Nov 13, 2022
0602840
updated docs
MateusStano Nov 13, 2022
42f0434
maint: removed 'print' from methods names
MateusStano Nov 13, 2022
b01931d
maint: removed '\n' from prints
MateusStano Nov 13, 2022
0405f76
Squashed commit of the following:
Gui-FernandesBR Nov 13, 2022
8fc8c41
maint: deleted repeated lines of code
MateusStano Nov 13, 2022
e09d12d
enh: changed Environment infos into environment_prints.py
MateusStano Nov 13, 2022
6de03bd
Fix code style issues with Black
lint-action Nov 14, 2022
1a59d14
added author
MateusStano Nov 14, 2022
9ed2685
ENH: adding name as a karg in Flight class
Gui-FernandesBR Nov 13, 2022
b49788b
MAINT: modifying default name value
Gui-FernandesBR Nov 14, 2022
c4a88c8
MAINT: Update flight docs
Gui-FernandesBR Nov 14, 2022
addadb4
enh: moved plots from Environment.py to environment_plots.py
MateusStano Nov 14, 2022
ee3a1df
maint: docs
MateusStano Nov 14, 2022
8c17479
ENH: Moved Rocket prints to rocket_prints.py
ompro07 Nov 19, 2022
0df159b
Fix code style issues with Black
lint-action Nov 19, 2022
df1d422
bug: fix import errors and clalpha print
MateusStano Nov 19, 2022
58d09e3
enh: added line skips
MateusStano Nov 19, 2022
b3cd638
ENH: Moved Rocket plots to rocket_plots.py
ompro07 Nov 18, 2022
9c3ef28
Fix typo
ompro07 Nov 18, 2022
68d62ab
fix attribute reference
ompro07 Nov 18, 2022
3ea8641
enh: new methods added to rocket_plots.py
ompro07 Nov 19, 2022
276d31f
Fix code style issues with Black
lint-action Nov 19, 2022
275e443
maint. remaining rebase conflicts
MateusStano Dec 28, 2022
e300dd5
Merge branch 'enh/new_plots' of https://github.com/RocketPy-Team/Rock…
MateusStano Dec 28, 2022
79a50ae
Merge branch 'enh/new_plots' into enh/flight_plots
MateusStano Dec 28, 2022
c520f7b
enh: added events cached property and fixed pressure plots
MateusStano Dec 29, 2022
8a7c74a
FIX: pressure_rocket_altitude not working
Gui-FernandesBR Dec 29, 2022
30339cf
enh: remove plt.close()
MateusStano Dec 30, 2022
7094d0a
enh: add title and formatting to pressure at rockets altitude plots
MateusStano Jan 2, 2023
eaf508f
Merge pull request #290 from RocketPy-Team/enh/flight_plots
MateusStano Jan 2, 2023
f80d7c3
enh: created compare.py super class
MateusStano Jan 3, 2023
4d4161e
enh: adapted compare_flights to inherit compare class
MateusStano Jan 3, 2023
a6df18b
Merge branch 'enh/new_plots' into enh/new_plotscompare-plots
MateusStano Jan 3, 2023
d4ec8f3
MAINT: update __init__ files
Gui-FernandesBR Jan 4, 2023
fce219f
ENH: finish compare trajectories 2d functions
Gui-FernandesBR Jan 4, 2023
2586876
MAINT: update notebook
Gui-FernandesBR Jan 4, 2023
2d086a2
maint: docstring parameters order
MateusStano Jan 4, 2023
8105234
enh: rail_buttons_forces
MateusStano Jan 4, 2023
069b136
enh: made x_attributes optional
MateusStano Jan 4, 2023
a64c50c
Merge pull request #295 from RocketPy-Team/enh/new_plotscompare-plots
Gui-FernandesBR Jan 4, 2023
2110f85
MAINT: avoid DRY - duplicate calls at rocket_plots
Gui-FernandesBR Jan 5, 2023
9354ec8
TST: moving fixtures to conftest.py
Gui-FernandesBR Jan 5, 2023
c910f89
MAINT: extract logic methods, avoid repeating
Gui-FernandesBR Jan 5, 2023
f5a4d6d
TST: new plots for compare plots
Gui-FernandesBR Jan 5, 2023
973cf60
Merge pull request #320 from RocketPy-Team/tst/new_plots_tests
Gui-FernandesBR Jan 8, 2023
2b8ee0a
Merge branch 'beta/v1.0.0' into enh/new_plots
Gui-FernandesBR Jan 8, 2023
083fa20
Fix code style issues with Black
lint-action Jan 8, 2023
56a40af
Revert 2b8ee0a9bdd7f3b6854a2c209bce867b0c6bb722
Gui-FernandesBR Jan 8, 2023
0108d2f
MAINT: remove properties' definition from __init__
Gui-FernandesBR Jan 8, 2023
6d66c9e
MAINT: refactor __init__ method
Gui-FernandesBR Jan 8, 2023
d5b4366
Fix code style issues with Black
lint-action Jan 8, 2023
012feee
BUG: additional conditions for initialSolution
Gui-FernandesBR Jan 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
669 changes: 669 additions & 0 deletions docs/notebooks/compare_flights_usage.ipynb

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/user/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ Welcome to RocketPy's user documentation!
../notebooks/environment_analysis_EuroC_example.ipynb
../notebooks/dispersion_analysis/dispersion_analysis.ipynb
../notebooks/utilities_usage.ipynb
../notebooks/compare_flights_usage.ipynb
../matlab/matlab.rst

3 changes: 3 additions & 0 deletions rocketpy/AeroSurfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,8 @@ class Fins(ABC):
Geometrical relation used to simplify lift and roll calculations
Fins.liftInterferenceFactor : float
Factor of Fin-Body interference in the lift coefficient
Fins.clalpha : float
Lift coefficient slope. Has units of 1/rad.
"""

def __init__(
Expand Down Expand Up @@ -372,6 +374,7 @@ def evaluateLiftCoefficient(self):
self.clalphaMultipleFins.setOutputs(
"Lift coefficient derivative for {:.0f} fins".format(self.n)
)
self.clalpha = self.clalphaMultipleFins

# Calculates clalpha * alpha
self.cl = Function(
Expand Down
Loading