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

BlockOperator: added a function to return a list of norms and the ability to set this list of norms #1513

Merged
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6575af6
Initial changes and tests- currently failing tests
MargaretDuff Sep 28, 2023
6b463bc
Sorted tests and checks on the set_norms function
MargaretDuff Oct 2, 2023
215bfa6
Changed a comment
MargaretDuff Oct 2, 2023
96e4730
Changes based on Gemma's review
MargaretDuff Oct 5, 2023
1ca3a2b
Comments from Edo fixed
MargaretDuff Oct 9, 2023
4b541e7
Merge branch 'master' into blockoperator-norms
MargaretDuff Oct 9, 2023
5a302c8
Fixed tests
MargaretDuff Oct 9, 2023
cf1b7f1
Vaggelis comment on checks
MargaretDuff Oct 17, 2023
544a215
Merge branch 'TomographicImaging:master' into blockoperator-norms
MargaretDuff Oct 17, 2023
32e057b
Docstring change
MargaretDuff Oct 18, 2023
4e0ca6a
Docstring change
MargaretDuff Oct 18, 2023
8f100e0
Updated changelog
MargaretDuff Oct 18, 2023
381342c
Changes to docstring
MargaretDuff Oct 25, 2023
876d4c9
Added size to the BlockOperator
MargaretDuff Oct 26, 2023
f0f4de3
Changes after discussion with Edo and Gemma
MargaretDuff Nov 2, 2023
100a42d
Merge branch 'blockoperator-norms' of github.com:MargaretDuff/CIL-mar…
MargaretDuff Nov 2, 2023
26584c9
Documentation changes
MargaretDuff Nov 2, 2023
2c072c0
Changes to documentation
MargaretDuff Nov 3, 2023
b669fb9
Documentation
MargaretDuff Nov 3, 2023
7cdd521
Merge branch 'master' into blockoperator-norms
MargaretDuff Nov 6, 2023
0962313
Documentation update
MargaretDuff Nov 7, 2023
1eea20b
Documentation update
MargaretDuff Nov 7, 2023
8de3bd6
Documentation update
MargaretDuff Nov 7, 2023
3d40876
Update Wrappers/Python/cil/optimisation/operators/Operator.py
MargaretDuff Nov 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@

* xx.x.x
- Added the functions `set_norms` and `get_norms` to the `BlockOperator` class
-
* 23.1.0
- Fix bug in IndicatorBox proximal_conjugate
- Allow CCPi Regulariser functions for non CIL object
Expand Down
Loading