-
-
Notifications
You must be signed in to change notification settings - Fork 167
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
BUG: Allow multiple sets of stochastic fins #737
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #737 +/- ##
===========================================
+ Coverage 75.97% 75.99% +0.01%
===========================================
Files 95 95
Lines 11027 11025 -2
===========================================
Hits 8378 8378
+ Misses 2649 2647 -2 ☔ View full report in Codecov by Sentry. 🚨 Try these New Features:
|
@WilliamArmst regarding git, we are working on an improvement to our development documentation, I think that should help you to understand what is happening. This is what I recommend you to do: git checkout origin develop
git pull
git checkout - # this goes to your previous branch
git rebase -i develop # this will rebase your branch on top of develop, allowing you to decide what to do with each commit This will open an editor, which could be vim or nano, for example. git log --graph --oneline You should expect something like this: If everything is correct, try to push again: git push or, as I like to do: git push -f |
Ok so I did not do it right. |
Don't worry, we can get you from here. Not a problem. Dealing with rebase isn't so trivial. Next branch you open, try to git pull before creating the new branch, that might help you. If you plan to open more PRs, please let me know so I grant you permission to create branches directly in our repos instead of your fork, that could make your life easier. |
I think I got it |
I think it might be because I only forked the master branch, but I now have the develop one too. I should be all good going forward. Thanks for your help! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tests are passing locally, including slow tests.
This time I won't wait for regression tests, let's keep moving.
Thx again for another problem solved, @WilliamArmst !
Pull request type
Bugfix
Checklist
black rocketpy/ tests/
) has passed locallypytest tests -m slow --runslow
) have passed locallyCHANGELOG.md
has been updated (if relevant)Current behavior
If there is a rocket with 2 sets of fins and you try to make them stochastic, the function that is fixed in the code will throw because it only checks the first set of fins. This makes it impossible to add 2 sets of fins.
Here is a sample program if you wish to confirm:
I also tested adding a stochastic fin that actually wasn't a part of the rocket, and it still catches that error (replace one of the
trapezoidal_fins=
withfin_set_3
to see this work)New behavior
Behaves as expected.
Breaking change
Additional information
I thought I figured out the git stuff but ig I didn't. Oh well. I am allowed to not know how to use git because I am fixing your bugs.