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

[RTR] StochastiOCP merge #715

Merged
merged 57 commits into from
Jul 18, 2023
Merged

Conversation

EveCharbie
Copy link
Collaborator

@EveCharbie EveCharbie commented Jul 12, 2023

All Submissions:

  • Have you followed the guidelines in our Contributing document [docs/contribution.md]?
  • Have you checked to ensure there aren't other open [Pull Requests] for the same update/change?
  • Have you opened/linked the issue related to your pull request?
  • Have you used the tag [WIP] for on-going changes, and removed it when the pull request was ready?
  • When ready to merge, have you sent a comment pinging @pariterre in it?

New Feature Submissions:

  1. Does your submission pass the tests (if not please explain why this is intended)?
  2. Did you write a proper documentation (docstrings and ReadMe)
  3. Have you linted your code locally prior to submission (using the command: black . -l120 --exclude "external/*")?

Changes to Core Features:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new examples for your core changes, as applicable?
  • Have you written new tests for your core changes, as applicable?

This change is Reviewable

@EveCharbie EveCharbie changed the title [WIP] StochastiOCP merge [RTR] StochastiOCP merge Jul 17, 2023
@EveCharbie
Copy link
Collaborator Author

@pariterre think we could merge?

@codecov
Copy link

codecov bot commented Jul 17, 2023

Codecov Report

Patch coverage: 79.75% and project coverage change: -0.31 ⚠️

Comparison is base (fe6bb40) 81.75% compared to head (377de7b) 81.44%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #715      +/-   ##
==========================================
- Coverage   81.75%   81.44%   -0.31%     
==========================================
  Files         124      129       +5     
  Lines       14059    15466    +1407     
==========================================
+ Hits        11494    12597    +1103     
- Misses       2565     2869     +304     
Impacted Files Coverage Δ
...les/custom_model/custom_package/custom_dynamics.py 100.00% <ø> (ø)
...ioptim/examples/getting_started/custom_dynamics.py 88.88% <ø> (ø)
...es/muscle_driven_ocp/muscle_activations_tracker.py 76.99% <ø> (ø)
...es/muscle_driven_ocp/muscle_excitations_tracker.py 74.13% <ø> (ø)
bioptim/interfaces/biomodel.py 81.00% <ø> (ø)
...ptimization/variational_optimal_control_program.py 86.70% <ø> (ø)
bioptim/limits/penalty.py 88.56% <50.00%> (-0.73%) ⬇️
bioptim/limits/multinode_penalty.py 76.11% <51.42%> (-5.21%) ⬇️
bioptim/gui/check_conditioning.py 80.72% <52.63%> (-2.94%) ⬇️
bioptim/gui/plot.py 71.53% <55.55%> (-1.22%) ⬇️
... and 30 more

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Member

@pariterre pariterre left a comment

Choose a reason for hiding this comment

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

Only two minors comment and we are good to go!

Reviewed 33 of 33 files at r3, all commit messages.
Reviewable status: all files reviewed, 4 unresolved discussions (waiting on @EveCharbie)


OCP_equation.png line 0 at r3 (raw file):
Is this useful/mandatory? If so, could it be replaced by a <100kB file?


bioptim/examples/stochastic_optimal_control/arm_reaching_muscle_driven.py line 53 at r3 (raw file):

    nlp: NonLinearProgram,
    motor_noise,
    sensory_noise,

I love those names!


bioptim/examples/stochastic_optimal_control/LeuvenArmModel.py line 5 at r3 (raw file):

"""

from typing import Callable

Quick change can you name the file as snake_case_file?

Copy link
Collaborator Author

@EveCharbie EveCharbie left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 4 unresolved discussions (waiting on @pariterre)


OCP_equation.png line at r3 (raw file):

Previously, pariterre (Pariterre) wrote…

Is this useful/mandatory? If so, could it be replaced by a <100kB file?

OK


bioptim/examples/stochastic_optimal_control/arm_reaching_muscle_driven.py line 53 at r3 (raw file):

Previously, pariterre (Pariterre) wrote…

I love those names!

Done.


bioptim/examples/stochastic_optimal_control/LeuvenArmModel.py line 5 at r3 (raw file):

Previously, pariterre (Pariterre) wrote…

Quick change can you name the file as snake_case_file?

Done.

@EveCharbie
Copy link
Collaborator Author

@pariterre Should be good now

Copy link
Member

@pariterre pariterre left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 6 of 6 files at r4, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @EveCharbie)

@pariterre pariterre merged commit 1112d7d into pyomeca:master Jul 18, 2023
4 of 6 checks passed
Ipuch added a commit to Ipuch/bioptim that referenced this pull request Jul 19, 2023
@EveCharbie EveCharbie deleted the StochasticOCP_merge branch August 24, 2023 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants