summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* removed DS_Store filesEdoardo Pasca2019-06-123-0/+0
|
* Merge pull request #303 from vais-ral/update_demoEdoardo Pasca2019-06-1226-224/+156
|\ | | | | Update demos branch with latest composite_operator_datacontainer
| * Merge remote-tracking branch 'origin/demos' into update_demoEdoardo Pasca2019-06-1226-1257/+1240
| |\ | |/ |/|
* | delete old demos from wipepapoutsellis2019-06-127-1212/+0
| |
* | delete old demosepapoutsellis2019-06-122-373/+0
| |
* | tgv tomoepapoutsellis2019-06-121-31/+51
| |
* | tomo 2d TVepapoutsellis2019-06-112-0/+173
| |
* | mergeepapoutsellis2019-06-116-46/+436
|\ \
| * | add 2d time demoepapoutsellis2019-06-111-14/+65
| | |
| * | fix tomophantom demoepapoutsellis2019-06-101-11/+6
| | |
| * | merge demosepapoutsellis2019-06-1020-464/+1264
| |\ \
| * | | imat colorbay demosepapoutsellis2019-06-104-21/+365
| | | |
* | | | tv tomo 2Depapoutsellis2019-06-112-0/+173
| |/ / |/| |
* | | demos with tomophantomepapoutsellis2019-06-102-0/+344
| | |
* | | denoising exam with cvx cmpepapoutsellis2019-06-103-5/+3
| | |
* | | color denoisingepapoutsellis2019-06-051-0/+115
| | |
* | | new phantom imageepapoutsellis2019-06-053-0/+373
| | |
* | | fista trialsepapoutsellis2019-06-055-79/+61
| | |
| | * Merge pull request #305 from vais-ral/config_algEdoardo Pasca2019-06-079-95/+25
| | |\ | | | | | | | | Config alg
| | | * removed FBPDEdoardo Pasca2019-06-073-85/+0
| | | |
| | | * added bool configured to AlgorithmEdoardo Pasca2019-06-077-32/+47
| | |/ | | | | | | | | | | | | Algorithms will not run if not configured (meaning set_up has been run). closes #304
| | * Merge branch 'composite_operator_datacontainer' into update_demoEdoardo Pasca2019-06-0720-129/+131
| |/| |/| | | | | | | | | | | | | | | | | Conflicts: Wrappers/Python/ccpi/optimisation/operators/GradientOperator.py Wrappers/Python/ccpi/optimisation/operators/SymmetrizedGradientOperator.py Wrappers/Python/test/test_functions.py
| | * Merge norm ref (#301)Edoardo Pasca2019-06-0714-98/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix upper/lower case inconsistency to allow astra demo to run * fix import and calls in tests * add storage in Operator Class of the operator norm scaled operator is not an Operator * add test for norm * simplified calls to norm for LinearOperators, added default in base class * add pillow as dependency * resolve conflict
| | * Norm refactor (#299)Edoardo Pasca2019-06-069-12/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix upper/lower case inconsistency to allow astra demo to run * fix import and calls in tests * add storage in Operator Class of the operator norm scaled operator is not an Operator * add test for norm * reduced iteration in PowerMethod
| | * Merge pull request #291 from vais-ral/norm2sq_bugfixEdoardo Pasca2019-06-044-11/+11
| | |\ | | | | | | | | Fix upper/lower case inconsistency to allow astra demo to run
| | | * Merge branch 'norm2sq_bugfix' into composite_operator_datacontainerEdoardo Pasca2019-06-034-11/+11
| | | |\
| | | | * fix import and calls in testsEdoardo Pasca2019-06-032-8/+8
| | | | |
| | | | * Fix upper/lower case inconsistency to allow astra demo to runJakob Jorgensen, WS at HMXIF2019-05-212-3/+3
| | | | |
| | * | | Merge pull request #297 from vais-ral/algorithm_print27Edoardo Pasca2019-06-041-8/+7
| | |\ \ \ | | | |/ / | | |/| | fix print for python27
| | | * | fix print for python27Edoardo Pasca2019-06-041-8/+7
| | |/ /
| | * | updated printEdoardo Pasca2019-05-231-6/+5
| | | |
| | * | update pretty printEdoardo Pasca2019-05-231-10/+34
| | | |
* | | | fix call kl divepapoutsellis2019-06-031-5/+4
| | | |
* | | | fix dotepapoutsellis2019-06-031-3/+3
| | | |
* | | | add nice phantomepapoutsellis2019-06-031-2/+25
| | | |
* | | | fix dotepapoutsellis2019-06-031-81/+7
| | | |
* | | | add also cvx demosepapoutsellis2019-06-033-120/+211
| | | |
* | | | fix memopt/input FISTAepapoutsellis2019-06-031-26/+16
| | | |
* | | | final demosepapoutsellis2019-06-031-91/+96
| | | |
* | | | final demosepapoutsellis2019-06-033-236/+221
| | | |
* | | | remove memoptepapoutsellis2019-06-031-35/+4
| | | |
* | | | mergeepapoutsellis2019-06-032-1/+269
|\ \ \ \
| * \ \ \ Merge pull request #294 from vais-ral/fix_dotEdoardo Pasca2019-06-031-1/+1
| |\ \ \ \ | | |/ / / | |/| | | fix dot for numpy method
| | * | | fix dot for numpy methodEdoardo Pasca2019-06-031-1/+1
| |/ / /
| * | | add colorbay demoepapoutsellis2019-05-311-9/+11
| | | |
| * | | add colorbay demoepapoutsellis2019-05-311-0/+266
| | | |
* | | | remove memoptepapoutsellis2019-06-031-39/+39
|/ / /
* | | fista/cgls cmpepapoutsellis2019-05-231-7/+7
| | |
* | | delete algs/funcsepapoutsellis2019-05-232-572/+0
| | |
* | | fix dir demosepapoutsellis2019-05-2318-3484/+0
| | |