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

#746 Issue Fixed [get_nlp in controller could be renamed to nlp ] #802

Closed
wants to merge 2 commits into from

Conversation

Alpha2Shahiri
Copy link
Contributor

@Alpha2Shahiri Alpha2Shahiri commented Nov 9, 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?
  • [NO get_nlp in controller could be renamed to nlp #746] Have you opened/linked the issue related to your pull request?
  • [NO] 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:

  • [get_nlp in controller could be renamed to nlp #746] 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
Copy link
Contributor Author

Regarding our last meeting (Removing some lines of Mayer (Track_Force and Control), seems that ../../bioptim/examples/stochastic_optimal_control/obstacle_avoidance_direct_collocation is using Mayer:
"ObjectiveFcn.Mayer.MINIMIZE_CONTROL" Probably this test: def test_obstacle_avoidance_direct_collocation()
The other test were passed and rename was done. [get_nlp to nlp]

@Alpha2Shahiri Alpha2Shahiri changed the title #746 Issue Fixed #746 Issue Fixed [get_nlp in controller could be renamed to nlp ] Nov 9, 2023
More options in ipopt solverOptions (Renaming based on CasADi::IpoptSolver Class Reference)
@Alpha2Shahiri Alpha2Shahiri changed the title #746 Issue Fixed [get_nlp in controller could be renamed to nlp ] [RTR] #746 Issue Fixed [get_nlp in controller could be renamed to nlp ] Nov 10, 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 9 of 9 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Alpha2Shahiri)


bioptim/interfaces/solver_options.py line 685 at r2 (raw file):

        type: SolverType = SolverType.ACADOS
        _qp_solver: str = "PARTIAL_CONDENSING_HPIPM"  # FULL_CONDENSING_QPOASES
        _hessian_approximation: str = "GAUSS_NEWTON"

Please do not mix pull requests together

@pariterre
Copy link
Member

This PR won't merge because of the conflict, please resolve :)

@pariterre pariterre changed the title [RTR] #746 Issue Fixed [get_nlp in controller could be renamed to nlp ] #746 Issue Fixed [get_nlp in controller could be renamed to nlp ] Nov 14, 2023
@pariterre
Copy link
Member

This will not merge as the changes for 3.2.0 are too major.

@pariterre pariterre closed this Jan 11, 2024
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