Skip to content
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

ENH: Pre-calculate attributes in Rocket class #595

Merged
merged 18 commits into from
May 16, 2024

Conversation

Gui-FernandesBR
Copy link
Member

@Gui-FernandesBR Gui-FernandesBR commented May 5, 2024

Pull request type

  • Code changes (bugfix, features)

Checklist

  • Tests for the changes have been added (if needed)
  • Docs have been reviewed and added / updated
  • Lint (black rocketpy/ tests/) has passed locally
  • All tests (pytest tests -m slow --runslow) have passed locally
  • CHANGELOG.md has been updated (if relevant)

Current behavior

The u_dot_generalized method is quite slow...

New behavior

Some calculations are now being done directly in the Rocket class, so the u_dot_generalized only needs to get it from the Rocket object, instead of calculating it repeatedly.

Breaking change

  • No

Additional information

This PR requires #594 to be merged.

@Gui-FernandesBR Gui-FernandesBR added Enhancement New feature or request, including adjustments in current codes Flight Flight Class related features labels May 5, 2024
@Gui-FernandesBR Gui-FernandesBR added this to the Release v1.X.0 milestone May 5, 2024
Copy link

codecov bot commented May 5, 2024

Codecov Report

Attention: Patch coverage is 94.00000% with 3 lines in your changes are missing coverage. Please review.

Project coverage is 73.37%. Comparing base (fc6804c) to head (61ebbc7).
Report is 3 commits behind head on develop.

Files Patch % Lines
rocketpy/simulation/flight.py 85.71% 2 Missing ⚠️
rocketpy/rocket/aero_surface.py 50.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #595      +/-   ##
===========================================
+ Coverage    73.31%   73.37%   +0.05%     
===========================================
  Files           57       57              
  Lines         9436     9453      +17     
===========================================
+ Hits          6918     6936      +18     
+ Misses        2518     2517       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

docs/user/rocket.rst Show resolved Hide resolved
rocketpy/rocket/rocket.py Outdated Show resolved Hide resolved
@MateusStano
Copy link
Member

Is there nothing in the other udots that can be changed to something saved in the rocket class or that can use the new derivative?

Might as well go all the way here

@MateusStano
Copy link
Member

Is there nothing in the other udots that can be changed to something saved in the rocket class or that can use the new derivative?

Might as well go all the way here

nvm just saw your other PR

Base automatically changed from enh/complex-step-differentiation to develop May 9, 2024 13:41
@Gui-FernandesBR
Copy link
Member Author

Is there nothing in the other udots that can be changed to something saved in the rocket class or that can use the new derivative?

Might as well go all the way here

This is a good suggestion. I changed a few attributes in the old u_dot that might be helpful.

Copy link
Member Author

@Gui-FernandesBR Gui-FernandesBR left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is ready for a re-review, just to double check.
@MateusStano could you help me here please?

@phmbressan phmbressan merged commit e76aa1c into develop May 16, 2024
10 checks passed
@phmbressan phmbressan deleted the enh/pre-calculate-attributes-in-rocket-class branch May 16, 2024 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement New feature or request, including adjustments in current codes Flight Flight Class related features
Projects
Status: Closed
Development

Successfully merging this pull request may close these issues.

4 participants