summaryrefslogtreecommitdiffstats
path: root/Wrappers
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #322 from vais-ral/composite_operator_datacontainerevelinaametova2019-06-191-0/+128
|\
| * unittest for nexus data reader and writerEvelina Ametova2019-06-191-0/+128
* | create Readme.txtEdoardo Pasca2019-06-141-0/+3
|/
* Merge pull request #316 from vais-ral/add_nexusEdoardo Pasca2019-06-141-0/+0
|\
| * Add nexus data modified for new readerJakob Jorgensen, WS at HMXIF2019-06-141-0/+0
* | renamed the simple jakobs phantom to hotdogEdoardo Pasca2019-06-141-1/+1
|/
* add numpy numerical types to allowed types for inline algebraEdoardo Pasca2019-06-132-2/+7
* Merge origin/composite_operator_datacontainer into demosEdoardo Pasca2019-06-133-18/+48
|\
| * Merge pull request #309 from vais-ral/dot_fixEdoardo Pasca2019-06-131-2/+2
| |\
| | * replace default for dot by numpyJakob Jorgensen, WS at HMXIF2019-06-121-2/+2
| * | Update NEXUSDataReader.pyevelinaametova2019-06-131-4/+2
| * | fix None values in Reader/ WrirerEvelina Ametova2019-06-133-14/+47
| |/
* | 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
|\ \ \ \ | | |_|/ | |/| |
| * | | fix imports in ioEdoardo Pasca2019-06-123-6/+2
| * | | 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 remote-tracking branch 'origin/demos' into update_demoEdoardo Pasca2019-06-1226-1257/+1240
|\| | | | | |_|/ / |/| | |
| * | | delete old demos from wipepapoutsellis2019-06-127-1212/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 21:59:12 +0000