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

holonomic graph multiphase multi all combinations #885

Merged
merged 7 commits into from
Jul 19, 2024

Conversation

Ipuch
Copy link
Collaborator

@Ipuch Ipuch commented Jul 16, 2024

@SamHybz, @AnaisFarr

This change is Reviewable

@Ipuch
Copy link
Collaborator Author

Ipuch commented Jul 16, 2024

okay guys @SamHybz @AnaisFarr , It seems like show_bounds works back !!

sol = ocp.solve(Solver.IPOPT(show_online_optim=False, show_options={show_bounds: True}))
sol.graphs(show_bounds=True)

image

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 2 of 2 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: all files reviewed, 5 unresolved discussions (waiting on @Ipuch)


bioptim/dynamics/configure_problem.py line 1017 at r2 (raw file):

        all_multipliers_names = []
        for nlp_i in ocp.nlp:
            if hasattr(nlp_i.model, "_dependent_joint_index"):  # making sure we have a HolonomicBiorbdModel

if hasattr(nlp_i.model, "is_holonomic" and nlp_i.model.is_holonomic):


bioptim/dynamics/configure_problem.py line 1081 at r2 (raw file):

        all_multipliers_names = []
        for nlp_i in ocp.nlp:
            if hasattr(nlp_i.model, "_dependent_joint_index"):  # making sure we have a HolonomicBiorbdModel

if hasattr(nlp_i.model, "is_holonomic" and nlp_i.model.is_holonomic):


bioptim/dynamics/configure_problem.py line 1099 at r2 (raw file):

            plot_type=PlotType.INTEGRATED,
            axes_idx=axes_idx,
            legend=all_multipliers_names,

combine_to="q",


bioptim/dynamics/configure_problem.py line 1144 at r2 (raw file):

        all_multipliers_names = []
        for nlp_i in ocp.nlp:
            if hasattr(nlp_i.model, "_dependent_joint_index"):  # making sure we have a HolonomicBiorbdModel

if hasattr(nlp_i.model, "is_holonomic" and nlp_i.model.is_holonomic):


bioptim/dynamics/configure_problem.py line 1346 at r2 (raw file):

        nlp.plot["contact_forces"] = CustomPlot(
            lambda t0, phases_dt, node_idx, x, u, p, a, d: nlp.contact_forces_func(
                np.concatenate([t0, t0 + phases_dt[nlp.phase_idx]]), x, u, p, a, d

np.array() ?

Copy link
Collaborator Author

@Ipuch Ipuch 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: 2 of 3 files reviewed, 5 unresolved discussions (waiting on @pariterre)


bioptim/dynamics/configure_problem.py line 1017 at r2 (raw file):

Previously, pariterre (Pariterre) wrote…

if hasattr(nlp_i.model, "is_holonomic" and nlp_i.model.is_holonomic):

Done


bioptim/dynamics/configure_problem.py line 1081 at r2 (raw file):

Previously, pariterre (Pariterre) wrote…

if hasattr(nlp_i.model, "is_holonomic" and nlp_i.model.is_holonomic):

Done


bioptim/dynamics/configure_problem.py line 1099 at r2 (raw file):

Previously, pariterre (Pariterre) wrote…

combine_to="q",

Didnt work


bioptim/dynamics/configure_problem.py line 1144 at r2 (raw file):

Previously, pariterre (Pariterre) wrote…

if hasattr(nlp_i.model, "is_holonomic" and nlp_i.model.is_holonomic):

Done


bioptim/dynamics/configure_problem.py line 1346 at r2 (raw file):

Previously, pariterre (Pariterre) wrote…

np.array() ?

finally concatenate was the good shot

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 r3, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @Ipuch)

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:

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @Ipuch)

@pariterre pariterre merged commit 9989053 into pyomeca:master Jul 19, 2024
20 of 22 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.

2 participants