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

[RTM after next push] fix: linear continuous multiphase continuity #857

Merged
merged 11 commits into from
Mar 12, 2024

Conversation

Ipuch
Copy link
Collaborator

@Ipuch Ipuch commented Mar 4, 2024

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? LINEAR_CONTINUOUS control is not continuous across phases #844
  • 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

@Ipuch Ipuch changed the title fix: #844 [WIP] fix: #844 Mar 4, 2024
@Ipuch Ipuch changed the title [WIP] fix: #844 [WIP] fix: linear continuous multiphase continuity Mar 4, 2024
Copy link

codecov bot commented Mar 4, 2024

Codecov Report

Attention: Patch coverage is 96.34146% with 3 lines in your changes are missing coverage. Please review.

Project coverage is 78.30%. Comparing base (944c2fe) to head (01d3962).
Report is 34 commits behind head on master.

❗ Current head 01d3962 differs from pull request most recent head 9952c5b. Consider uploading reports for the commit 9952c5b to get more accurate results

Files Patch % Lines
bioptim/limits/phase_transition.py 90.00% 1 Missing ⚠️
bioptim/limits/phase_transtion_builder.py 97.14% 1 Missing ⚠️
bioptim/optimization/optimal_control_program.py 96.77% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #857      +/-   ##
==========================================
+ Coverage   78.25%   78.30%   +0.04%     
==========================================
  Files         140      141       +1     
  Lines       16230    16278      +48     
==========================================
+ Hits        12701    12746      +45     
- Misses       3529     3532       +3     
Flag Coverage Δ
unittests 78.30% <96.34%> (+0.04%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Ipuch Ipuch changed the title [WIP] fix: linear continuous multiphase continuity [RTR] fix: linear continuous multiphase continuity Mar 4, 2024
@Ipuch
Copy link
Collaborator Author

Ipuch commented Mar 4, 2024

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


bioptim/limits/phase_transtion_builder.py line 6 at r2 (raw file):

class PhaseTransitionBuilder:

Factory?


bioptim/limits/phase_transtion_builder.py line 54 at r2 (raw file):

                            weight=None,
                        )
                        for i in range(self.ocp.n_phases - 1)

What is that second for for?


tests/shard1/test_continuity_linear_continuous.py line 28 at r2 (raw file):

    solution = ocp.solve(Solver.IPOPT(_max_iter=5))

    print(solution.detailed_cost)

do not print?

@pariterre pariterre changed the title [RTR] fix: linear continuous multiphase continuity [RTM after next push] fix: linear continuous multiphase continuity Mar 11, 2024
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: 3 of 6 files reviewed, 3 unresolved discussions (waiting on @pariterre)


tests/shard1/test_continuity_linear_continuous.py line 28 at r2 (raw file):

Previously, pariterre (Pariterre) wrote…

do not print?

Done.


bioptim/limits/phase_transtion_builder.py line 6 at r2 (raw file):

Previously, pariterre (Pariterre) wrote…

Factory?

Done.


bioptim/limits/phase_transtion_builder.py line 54 at r2 (raw file):

Previously, pariterre (Pariterre) wrote…

What is that second for for?

Done.

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

@pariterre pariterre merged commit 95fd84e into pyomeca:master Mar 12, 2024
20 of 22 checks passed
@Ipuch Ipuch deleted the linearcontinuous branch March 15, 2024 18:48
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