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] Mayer_TRACK_CONTACT_FORCES #797

Merged
merged 2 commits into from Nov 8, 2023
Merged

Conversation

Alpha2Shahiri
Copy link
Contributor

@Alpha2Shahiri Alpha2Shahiri commented Nov 6, 2023

All Submissions:

  • [ YES] Have you followed the guidelines in our Contributing document [docs/contribution.md]?
  • [YES ] Have you checked to ensure there aren't other open [Pull Requests] for the same update/change?
  • [ YES] 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. [ YES] 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

@Alpha2Shahiri Alpha2Shahiri marked this pull request as ready for review November 7, 2023 15:08
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.

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @Alpha2Shahiri)


bioptim/limits/objective_functions.py line 379 at r1 (raw file):

        MINIMIZE_COM_POSITION = (PenaltyFunctionAbstract.Functions.minimize_com_position,)
        MINIMIZE_COM_VELOCITY = (PenaltyFunctionAbstract.Functions.minimize_com_velocity,)
        MINIMIZE_CONTROL = (PenaltyFunctionAbstract.Functions.minimize_controls,)

Remove this line


bioptim/limits/objective_functions.py line 396 at r1 (raw file):

        SUPERIMPOSE_MARKERS = (PenaltyFunctionAbstract.Functions.superimpose_markers,)
        SUPERIMPOSE_MARKERS_VELOCITY = (PenaltyFunctionAbstract.Functions.superimpose_markers_velocity,)
        TRACK_CONTROL = (PenaltyFunctionAbstract.Functions.minimize_controls,)

Remove this


bioptim/limits/objective_functions.py line 401 at r1 (raw file):

        TRACK_MARKERS_ACCELERATION = (PenaltyFunctionAbstract.Functions.minimize_markers_acceleration,)
        TRACK_MARKERS_VELOCITY = (PenaltyFunctionAbstract.Functions.minimize_markers_velocity,)
        TRACK_CONTACT_FORCES = (PenaltyFunctionAbstract.Functions.minimize_contact_forces,)

Remove this

@pariterre pariterre changed the title Mayer_TRACK_CONTACT_FORCES [RTR] Mayer_TRACK_CONTACT_FORCES Nov 8, 2023
@pariterre pariterre changed the title [RTR] Mayer_TRACK_CONTACT_FORCES Mayer_TRACK_CONTACT_FORCES Nov 8, 2023
@pariterre pariterre changed the title Mayer_TRACK_CONTACT_FORCES [RTM when comments are answered] Mayer_TRACK_CONTACT_FORCES Nov 8, 2023
@Alpha2Shahiri Alpha2Shahiri changed the title [RTM when comments are answered] Mayer_TRACK_CONTACT_FORCES [WIP] Mayer_TRACK_CONTACT_FORCES Nov 8, 2023
Copy link
Contributor Author

@Alpha2Shahiri Alpha2Shahiri 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: 0 of 1 files reviewed, 3 unresolved discussions (waiting on @pariterre)


bioptim/limits/objective_functions.py line 379 at r1 (raw file):

Previously, pariterre (Pariterre) wrote…

Remove this line

Done


bioptim/limits/objective_functions.py line 396 at r1 (raw file):

Previously, pariterre (Pariterre) wrote…

Remove this

Done


bioptim/limits/objective_functions.py line 401 at r1 (raw file):

Previously, pariterre (Pariterre) wrote…

Remove this

Done

@Alpha2Shahiri Alpha2Shahiri changed the title [WIP] Mayer_TRACK_CONTACT_FORCES [RTR] Mayer_TRACK_CONTACT_FORCES Nov 8, 2023
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 1 of 1 files at r2, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @Alpha2Shahiri)

@pariterre pariterre merged commit c89ac8c into pyomeca:master Nov 8, 2023
1 of 2 checks passed
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.

None yet

2 participants