diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2019-06-07 17:04:50 +0100 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2019-06-07 17:04:50 +0100 |
| commit | 897e8359f8c9e60c0a9b68ff3fcae86b2c42e8af (patch) | |
| tree | 5974182c94460c36e61ada3c4367894c4ad7a4d7 /README.md | |
| parent | 53e09caf548d51ca1d071f4bffe249afab5649f6 (diff) | |
| parent | 218dc267849a8fd53f3e92ebe56d2a5926a302b9 (diff) | |
| download | framework-897e8359f8c9e60c0a9b68ff3fcae86b2c42e8af.tar.gz framework-897e8359f8c9e60c0a9b68ff3fcae86b2c42e8af.tar.bz2 framework-897e8359f8c9e60c0a9b68ff3fcae86b2c42e8af.tar.xz framework-897e8359f8c9e60c0a9b68ff3fcae86b2c42e8af.zip | |
Merge remote-tracking branch 'origin/fix_test' into update_fix_test
Conflicts:
Wrappers/Python/ccpi/framework/__init__.py
Wrappers/Python/ccpi/optimisation/algorithms/CGLS.py
Wrappers/Python/ccpi/optimisation/algorithms/FISTA.py
Wrappers/Python/ccpi/optimisation/operators/LinearOperatorMatrix.py
Wrappers/Python/test/test_run_test.py
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions