Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | removed DS_Store files | Edoardo Pasca | 2019-06-12 | 3 | -0/+0 |
| | |||||
* | Merge pull request #303 from vais-ral/update_demo | Edoardo Pasca | 2019-06-12 | 26 | -224/+156 |
|\ | | | | | Update demos branch with latest composite_operator_datacontainer | ||||
| * | Merge remote-tracking branch 'origin/demos' into update_demo | Edoardo Pasca | 2019-06-12 | 26 | -1257/+1240 |
| |\ | |/ |/| | |||||
* | | delete old demos from wip | epapoutsellis | 2019-06-12 | 7 | -1212/+0 |
| | | |||||
* | | delete old demos | epapoutsellis | 2019-06-12 | 2 | -373/+0 |
| | | |||||
* | | tgv tomo | epapoutsellis | 2019-06-12 | 1 | -31/+51 |
| | | |||||
* | | tomo 2d TV | epapoutsellis | 2019-06-11 | 2 | -0/+173 |
| | | |||||
* | | merge | epapoutsellis | 2019-06-11 | 6 | -46/+436 |
|\ \ | |||||
| * | | add 2d time demo | epapoutsellis | 2019-06-11 | 1 | -14/+65 |
| | | | |||||
| * | | fix tomophantom demo | epapoutsellis | 2019-06-10 | 1 | -11/+6 |
| | | | |||||
| * | | merge demos | epapoutsellis | 2019-06-10 | 20 | -464/+1264 |
| |\ \ | |||||
| * | | | imat colorbay demos | epapoutsellis | 2019-06-10 | 4 | -21/+365 |
| | | | | |||||
* | | | | tv tomo 2D | epapoutsellis | 2019-06-11 | 2 | -0/+173 |
| |/ / |/| | | |||||
* | | | demos with tomophantom | epapoutsellis | 2019-06-10 | 2 | -0/+344 |
| | | | |||||
* | | | denoising exam with cvx cmp | epapoutsellis | 2019-06-10 | 3 | -5/+3 |
| | | | |||||
* | | | color denoising | epapoutsellis | 2019-06-05 | 1 | -0/+115 |
| | | | |||||
* | | | new phantom image | epapoutsellis | 2019-06-05 | 3 | -0/+373 |
| | | | |||||
* | | | fista trials | epapoutsellis | 2019-06-05 | 5 | -79/+61 |
| | | | |||||
| | * | Merge pull request #305 from vais-ral/config_alg | Edoardo Pasca | 2019-06-07 | 9 | -95/+25 |
| | |\ | | | | | | | | | Config alg | ||||
| | | * | removed FBPD | Edoardo Pasca | 2019-06-07 | 3 | -85/+0 |
| | | | | |||||
| | | * | added bool configured to Algorithm | Edoardo Pasca | 2019-06-07 | 7 | -32/+47 |
| | |/ | | | | | | | | | | | | | Algorithms will not run if not configured (meaning set_up has been run). closes #304 | ||||
| | * | Merge branch 'composite_operator_datacontainer' into update_demo | Edoardo Pasca | 2019-06-07 | 20 | -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 Pasca | 2019-06-07 | 14 | -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 Pasca | 2019-06-06 | 9 | -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_bugfix | Edoardo Pasca | 2019-06-04 | 4 | -11/+11 |
| | |\ | | | | | | | | | Fix upper/lower case inconsistency to allow astra demo to run | ||||
| | | * | Merge branch 'norm2sq_bugfix' into composite_operator_datacontainer | Edoardo Pasca | 2019-06-03 | 4 | -11/+11 |
| | | |\ | |||||
| | | | * | fix import and calls in tests | Edoardo Pasca | 2019-06-03 | 2 | -8/+8 |
| | | | | | |||||
| | | | * | Fix upper/lower case inconsistency to allow astra demo to run | Jakob Jorgensen, WS at HMXIF | 2019-05-21 | 2 | -3/+3 |
| | | | | | |||||
| | * | | | Merge pull request #297 from vais-ral/algorithm_print27 | Edoardo Pasca | 2019-06-04 | 1 | -8/+7 |
| | |\ \ \ | | | |/ / | | |/| | | fix print for python27 | ||||
| | | * | | fix print for python27 | Edoardo Pasca | 2019-06-04 | 1 | -8/+7 |
| | |/ / | |||||
| | * | | updated print | Edoardo Pasca | 2019-05-23 | 1 | -6/+5 |
| | | | | |||||
| | * | | update pretty print | Edoardo Pasca | 2019-05-23 | 1 | -10/+34 |
| | | | | |||||
* | | | | fix call kl div | epapoutsellis | 2019-06-03 | 1 | -5/+4 |
| | | | | |||||
* | | | | fix dot | epapoutsellis | 2019-06-03 | 1 | -3/+3 |
| | | | | |||||
* | | | | add nice phantom | epapoutsellis | 2019-06-03 | 1 | -2/+25 |
| | | | | |||||
* | | | | fix dot | epapoutsellis | 2019-06-03 | 1 | -81/+7 |
| | | | | |||||
* | | | | add also cvx demos | epapoutsellis | 2019-06-03 | 3 | -120/+211 |
| | | | | |||||
* | | | | fix memopt/input FISTA | epapoutsellis | 2019-06-03 | 1 | -26/+16 |
| | | | | |||||
* | | | | final demos | epapoutsellis | 2019-06-03 | 1 | -91/+96 |
| | | | | |||||
* | | | | final demos | epapoutsellis | 2019-06-03 | 3 | -236/+221 |
| | | | | |||||
* | | | | remove memopt | epapoutsellis | 2019-06-03 | 1 | -35/+4 |
| | | | | |||||
* | | | | merge | epapoutsellis | 2019-06-03 | 2 | -1/+269 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #294 from vais-ral/fix_dot | Edoardo Pasca | 2019-06-03 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | fix dot for numpy method | ||||
| | * | | | fix dot for numpy method | Edoardo Pasca | 2019-06-03 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | add colorbay demo | epapoutsellis | 2019-05-31 | 1 | -9/+11 |
| | | | | |||||
| * | | | add colorbay demo | epapoutsellis | 2019-05-31 | 1 | -0/+266 |
| | | | | |||||
* | | | | remove memopt | epapoutsellis | 2019-06-03 | 1 | -39/+39 |
|/ / / | |||||
* | | | fista/cgls cmp | epapoutsellis | 2019-05-23 | 1 | -7/+7 |
| | | | |||||
* | | | delete algs/funcs | epapoutsellis | 2019-05-23 | 2 | -572/+0 |
| | | | |||||
* | | | fix dir demos | epapoutsellis | 2019-05-23 | 18 | -3484/+0 |
| | | |