diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2017-10-11 16:04:49 +0100 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2017-10-11 16:04:49 +0100 |
| commit | ad260ad1ab2e44c8c6d3daa9fe9d24c55bf5f280 (patch) | |
| tree | d417fb4780b142adb817d53cc0903e51ca70ee12 /data | |
| parent | 5c978b706192bc5885c7e5001a4bc4626f63d29f (diff) | |
| parent | f7e1cf04f791898737bc15b0eb437abc2c5d9305 (diff) | |
| download | regularization-ad260ad1ab2e44c8c6d3daa9fe9d24c55bf5f280.tar.gz regularization-ad260ad1ab2e44c8c6d3daa9fe9d24c55bf5f280.tar.bz2 regularization-ad260ad1ab2e44c8c6d3daa9fe9d24c55bf5f280.tar.xz regularization-ad260ad1ab2e44c8c6d3daa9fe9d24c55bf5f280.zip | |
Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
Conflicts:
demos/exportDemoRD2Data.m
main_func/regularizers_CPU/FGP_TV_core.h
main_func/regularizers_CPU/LLT_model.c
src/Python/test/readhd5.py
src/Python/test_reconstructor.py
src/Python/test_regularizers.py
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions