summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #313 from vais-ral/update_fix_testEdoardo Pasca2019-06-1311-82/+450
|\
| * Merge remote branch 'update_fix_test'Edoardo Pasca2019-06-132-13/+16
| |\
| | * fix test importEdoardo Pasca2019-06-132-13/+16
| * | remove check isnan which fails with BlockDataContainersEdoardo Pasca2019-06-131-3/+1
| |/
| * added testEdoardo Pasca2019-06-132-19/+44
| |\
| | * demo cmp fista, cgls, cvx, grdescepapoutsellis2019-06-131-12/+37
| * | play around with testEdoardo Pasca2019-06-132-17/+35
| |/
| * fix Vector importEdoardo Pasca2019-06-131-1/+1
| * removed unused filesEdoardo Pasca2019-06-133-131/+0
| * test binary divide speedup is tested on 10 consecutive divisionsEdoardo Pasca2019-06-131-10/+13
| * Merge remote-tracking branch 'origin/demos' into update_fix_testEdoardo Pasca2019-06-1313-1713/+15
| |\
| * | trying to fix python2.7 importEdoardo Pasca2019-06-132-2/+100
| * | moved importEdoardo Pasca2019-06-121-1/+2
| * | Merge branch 'demos' into update_fix_testEdoardo Pasca2019-06-1235-1284/+2101
| |\ \
| * \ \ Merge remote-tracking branch 'origin/fix_test' into update_fix_testEdoardo Pasca2019-06-0711-50/+403
| |\ \ \
| | * | | reinstated check of dimension_label NoneEdoardo Pasca2019-06-071-1/+1
| | * | | add memopt and some checksEdoardo Pasca2019-06-061-2/+47
| | * | | add printsEdoardo Pasca2019-06-061-23/+15
| | * | | add callbackEdoardo Pasca2019-06-062-18/+41
| | * | | fixed testEdoardo Pasca2019-06-054-19/+35
| | * | | added example fileEdoardo Pasca2019-06-041-0/+133
| | * | | progressEdoardo Pasca2019-06-047-12/+149
| | * | | fixing testsEdoardo Pasca2019-06-045-98/+59
* | | | | Delete FiniteDifferenceOperator_old.pyEdoardo Pasca2019-06-131-374/+0
| |_|_|/ |/| | |
* | | | delete old demosepapoutsellis2019-06-127-1265/+0
* | | | fix demosepapoutsellis2019-06-122-8/+8
* | | | delete old demoepapoutsellis2019-06-122-195/+1
* | | | delete old demoepapoutsellis2019-06-121-245/+0
* | | | add randomepapoutsellis2019-06-121-0/+6
| |_|/ |/| |
* | | Merge branch 'composite_operator_datacontainer' into demosEdoardo Pasca2019-06-126-1/+843
|\ \ \
| * \ \ Merge pull request #308 from vais-ral/fix_io_importsEdoardo Pasca2019-06-123-6/+2
| |\ \ \
| | * | | fix imports in ioEdoardo Pasca2019-06-123-6/+2
| |/ / /
| * | | Merge pull request #307 from vais-ral/data_readers_mergeevelinaametova2019-06-126-1/+856
| |\ \ \
| | * | | data readers, writer, resizer to composite_data_container branchEvelina Ametova2019-06-126-1/+856
| |/ / /
* | | | Merge branch 'demos' of https://github.com/vais-ral/CCPi-Framework into demosEdoardo Pasca2019-06-121-36/+28
|\ \ \ \
| * \ \ \ mergeepapoutsellis2019-06-1226-224/+156
| |\ \ \ \
| * | | | | TGV tomophantomepapoutsellis2019-06-121-36/+28
* | | | | | removed DS_Store filesEdoardo Pasca2019-06-123-0/+0
| |/ / / / |/| | | |
* | | | | Merge pull request #303 from vais-ral/update_demoEdoardo Pasca2019-06-1226-224/+156
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
| |/ / / / |/| | | |