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

429 almo and bcfw changes #437

Merged
merged 15 commits into from
Oct 19, 2023
Merged

429 almo and bcfw changes #437

merged 15 commits into from
Oct 19, 2023

Conversation

JannisHal
Copy link
Collaborator

This pull request contains:

  • Add ALM header for ouput
  • Remove infeasibility from BCFW output
  • Add update order to BCFW output
  • Add print callback extension allowing to add custom columns to the output of any algorithm
    -- minimal changes to make_print_callback and make_trajectory_callback needed
    -- Applied for ALM to print infeasibility
  • Add BCFW example with showcase of custom update order

@JannisHal JannisHal linked an issue Oct 11, 2023 that may be closed by this pull request
@codecov
Copy link

codecov bot commented Oct 11, 2023

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (6be7c09) 87.04% compared to head (0877347) 87.08%.
Report is 4 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #437      +/-   ##
==========================================
+ Coverage   87.04%   87.08%   +0.03%     
==========================================
  Files          20       20              
  Lines        2439     2578     +139     
==========================================
+ Hits         2123     2245     +122     
- Misses        316      333      +17     
Files Coverage Δ
src/alternating_methods.jl 94.84% <100.00%> (+0.40%) ⬆️
src/block_coordinate_algorithms.jl 93.81% <100.00%> (-0.13%) ⬇️
src/callback.jl 96.38% <96.72%> (-1.66%) ⬇️

... and 2 files with indirect coverage changes

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

end

labels = ["Full update", "Cyclic order", "Stochstic order", "Custom order"]
plot_trajectories(trajectories, labels, xscalelog=true)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't forget new lines at the end of files

src/callback.jl Outdated Show resolved Hide resolved
src/callback.jl Outdated Show resolved Hide resolved
@matbesancon
Copy link
Member

probably need to rerun the formatter after this

@matbesancon matbesancon merged commit 429c044 into master Oct 19, 2023
11 checks passed
@matbesancon matbesancon deleted the 429-almo-and-bcfw-changes branch October 19, 2023 10:31
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.

ALMO and BCFW changes
2 participants