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

Armijo: Work with ISTA and FISTA and new default #1934

Merged
merged 19 commits into from
Oct 8, 2024

Conversation

MargaretDuff
Copy link
Member

@MargaretDuff MargaretDuff commented Sep 24, 2024

Changes

  • ISTA and FISTA now have a "objective_function" function and tests this works with Armijo rule
  • Armijo rule now uses the step size from the previous iteration to initialise the current iteration by default but users can turn this off.
  • Killed max_iteration from test_algorithms.py

Testing you performed

Please add any demo scripts to https://github.com/TomographicImaging/CIL-Demos/tree/main/misc

Related issues/links

Closes #1933 and closes #1931

Checklist

  • I have performed a self-review of my code
  • I have added docstrings in line with the guidance in the developer guide
  • I have updated the relevant documentation
  • I have implemented unit tests that cover any new or modified functionality
  • CHANGELOG.md has been updated with any functionality change
  • Request review from all relevant developers
  • Change pull request label to 'Waiting for review'

Contribution Notes

Please read and adhere to the developer guide and local patterns and conventions.

  • The content of this Pull Request (the Contribution) is intentionally submitted for inclusion in CIL (the Work) under the terms and conditions of the Apache-2.0 License
  • I confirm that the contribution does not violate any intellectual property rights of third parties

@MargaretDuff MargaretDuff self-assigned this Sep 24, 2024
Signed-off-by: Margaret Duff <[email protected]>
@MargaretDuff MargaretDuff merged commit 0181b3f into TomographicImaging:master Oct 8, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FISTA and ISTA and armijio rule Change in behaviour Armijio rule
3 participants