summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix PDHG denoising examplesepapoutsellis2019-05-096-45/+1136
* fix proximal conjepapoutsellis2019-05-092-29/+32
* delete build pycacheepapoutsellis2019-05-0769-8813/+0
* add demos from wip direpapoutsellis2019-05-0790-265/+6594
* add ccpi.dataepapoutsellis2019-05-071-1/+1
* fix methods for merge to demosepapoutsellis2019-05-0748-5504/+959
|\
| * Update yamlVaggelis Papoutsellis2019-05-071-0/+1
| * Merge branch 'demo_ccpi' of https://github.com/vais-ral/CCPi-Framework into d...Edoardo Pasca2019-05-071-1/+1
| |\
| | * Merge branch 'demo_ccpi' of https://github.com/vais-ral/CCPi-Framework into d...Edoardo Pasca2019-04-307-109/+158
| | |\
| | * | change numpy versionsEdoardo Pasca2019-04-301-1/+1
| * | | update astra callsEdoardo Pasca2019-05-071-2/+1
| * | | allows passing update_objective_interval in creatorEdoardo Pasca2019-05-071-1/+1
| * | | Merge remote-tracking branch 'origin/composite_operator_datacontainer' into d...Edoardo Pasca2019-05-038-82/+482
| |\ \ \
| | * \ \ Merge pull request #273 from vais-ral/cgls_bug_beastEdoardo Pasca2019-05-034-10/+151
| | |\ \ \
| | | * | | raise error if method is not recognisedEdoardo Pasca2019-05-011-0/+3
| | | * | | fix importEdoardo Pasca2019-05-012-1/+6
| | | * | | reimplements dot productEdoardo Pasca2019-05-011-4/+14
| | | * | | removed useless importsEdoardo Pasca2019-05-011-7/+2
| | | * | | Fix dot product bugJakob Jorgensen, WS at HMXIF2019-04-302-1/+129
| | |/ / /
| | * | | Merge pull request #266 from vais-ral/sirt2beastEdoardo Pasca2019-04-266-72/+331
| | |\ \ \
| | | * | | Change array->as_array and loss->objectiveJakob Jorgensen, WS at HMXIF2019-04-261-14/+14
| | | * | | Tidy SIRT and demoJakob Jorgensen, WS at HMXIF2019-04-252-81/+69
| | | * | | Add demo FISTA with constraints previously in SIRT demoJakob Jorgensen, WS at HMXIF2019-04-171-0/+158
| | | * | | Implemented using geometries in SIRTJakob Jorgensen, WS at HMXIF2019-04-173-64/+16
| | | * | | Copied SIRT manuallyJakob Jorgensen, WS at HMXIF2019-04-161-28/+30
| | | * | | bugfixes, whitespaceJakob Jorgensen, WS at HMXIF2019-04-162-5/+5
| | | * | | Transferred from move_sirt_algorithm branchJakob Jorgensen, WS at HMXIF2019-04-165-17/+176
| * | | | | update demoEdoardo Pasca2019-05-011-130/+71
| | |_|_|/ | |/| | |
| * | | | Merge branch 'demo_ccpi' of https://github.com/vais-ral/CCPi-Framework into d...Edoardo Pasca2019-04-305-71/+253
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'demos' into demo_ccpiEdoardo Pasca2019-04-292-70/+67
| | |\ \ \
| | * \ \ \ Merge branch 'demos' into demo_ccpiEdoardo Pasca2019-04-265-9/+194
| | |\ \ \ \
| * | | | | | added test and removed processors.pyEdoardo Pasca2019-04-303-515/+4
| * | | | | | added test for center of rotation finderEdoardo Pasca2019-04-301-0/+21
| * | | | | | restructured processorsEdoardo Pasca2019-04-304-0/+542
| * | | | | | removed numpy from build requirementsEdoardo Pasca2019-04-301-2/+0
| * | | | | | removed matplotlib dependenceEdoardo Pasca2019-04-261-1/+0
| |/ / / / /
| * | | | | demo updatedEdoardo Pasca2019-04-261-9/+12
| * | | | | removed memopt as not neededEdoardo Pasca2019-04-261-10/+6
| * | | | | fixed printsEdoardo Pasca2019-04-261-16/+7
| * | | | | Merge branch 'demos' of https://github.com/vais-ral/CCPi-Framework into demosEdoardo Pasca2019-04-2570-8885/+1883
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'demos' fixed PDHG and KullbackLeibler and L2NormEdoardo Pasca2019-04-2569-789/+9870
| |\ \ \ \ \ \
| * | | | | | | add tomography type of example with ccpi projectorEdoardo Pasca2019-04-231-0/+273
| * | | | | | | pass current solution to callback, fix PDHG setupEdoardo Pasca2019-04-232-2/+7
| * | | | | | | fixed conflictEdoardo Pasca2019-04-171-4/+0
| * | | | | | | Merge branch 'composite_operator_datacontainer' into demosEdoardo Pasca2019-04-1723-485/+313
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | merge remote branch demos_ccpiepapoutsellis2019-05-072-18/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Delete __init__.pyVaggelis Papoutsellis2019-05-071-0/+0
| * | | | | | | | Delete __init__.pyVaggelis Papoutsellis2019-05-071-18/+0
* | | | | | | | | try precondepapoutsellis2019-05-073-0/+479
* | | | | | | | | add cvx scriptepapoutsellis2019-05-071-102/+101
|/ / / / / / / /