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

[WIP] Bis Min_max_torque (Pariterre to fix) #683

Merged
merged 47 commits into from
Jun 23, 2023
Merged

Conversation

EveCharbie
Copy link
Collaborator

@EveCharbie EveCharbie commented May 19, 2023

All comments from the other PR were addressed (the other branch can be deleted)


This change is Reviewable

the parameter contraint is only applyed to the first phase (bug to be fixed)
Might be wrong bu committing for the form
RuntimeError: Error in Function::call for 'PHASE_TRANSITION_CONTINUOUS_0_1' [MXFunction] at .../casadi/core/function.cpp:330:
       .../casadi/core/function_internal.hpp:1644: Input 1 (i1) has mismatching shape. Got 6-by-1. Allowed dimensions, in general, are:
        - The input dimension N-by-M (here 3-by-1)
        - A scalar, i.e. 1-by-1
        - M-by-N if N=1 or M=1 (i.e. a transposed vector)
        - N-by-M1 if K*M1=M for some K (argument repeated horizontally)
        - N-by-P*M, indicating evaluation with multiple arguments (P must be a multiple of 1 for consistency with previous inputs)
@EveCharbie
Copy link
Collaborator Author

  1. The tests with the casadi error seem like a merge problem, since I did not touch this part of the code, @pariterre does it seem familiar to you?
  2. The other tests with the value error pass on my computer, weird...

@EveCharbie EveCharbie changed the title Bis Min_max_torque [RTR] Bis Min_max_torque May 21, 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.

Reviewed 25 of 25 files at r1, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @EveCharbie)


bioptim/examples/torque_driven_ocp/minimize_maximum_torque_by_extra_parameter.py line 1 at r1 (raw file):

import numpy as np

Add a description?


bioptim/optimization/parameters.py line 109 at r1 (raw file):

        return self.cx.shape[0]

    def add_or_replace_to_parameter_penalty_pool(self, ocp, penalty):

keep previous naming convention to reflect on Penalty

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, 2 unresolved discussions (waiting on @pariterre)


bioptim/examples/torque_driven_ocp/minimize_maximum_torque_by_extra_parameter.py line 1 at r1 (raw file):

Previously, pariterre (Pariterre) wrote…

Add a description?

Done.


bioptim/optimization/parameters.py line 109 at r1 (raw file):

Previously, pariterre (Pariterre) wrote…

keep previous naming convention to reflect on Penalty

Done.

@pariterre pariterre changed the title [RTR] Bis Min_max_torque [WIP] Bis Min_max_torque (Pariterre to fix) Jun 1, 2023
@pariterre pariterre merged commit 57a846c into pyomeca:master Jun 23, 2023
1 of 5 checks passed
@EveCharbie EveCharbie deleted the tata branch August 2, 2023 08:58
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