summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* added shapes.png to setup.pyGemma Fardell2019-06-211-1/+1
|
* added shapes.png to setup.pyGemma Fardell2019-06-211-1/+1
|
* create Readme.txtEdoardo Pasca2019-06-141-0/+3
|
* Merge pull request #207 from vais-ral/composite_operator_datacontainerEdoardo Pasca2019-06-14131-2067/+17893
|\ | | | | Block operator and datacontainer
| * Merge pull request #316 from vais-ral/add_nexusEdoardo Pasca2019-06-141-0/+0
| |\ | | | | | | Add nexus data modified for new reader
| | * 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
| |/
| * update readmeEdoardo Pasca2019-06-131-3/+5
| |
| * Merge pull request #254 from vais-ral/demosEdoardo Pasca2019-06-13113-3604/+9827
| |\ | | | | | | Demos
| | * 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
| | |\ | | |/ | |/| | | | | | | Conflicts: Wrappers/Python/ccpi/framework/framework.py
| * | Merge pull request #309 from vais-ral/dot_fixEdoardo Pasca2019-06-131-2/+2
| |\ \ | | | | | | | | replace default for dot by numpy
| | * | replace default for dot by numpyJakob Jorgensen, WS at HMXIF2019-06-121-2/+2
| | | |
| * | | Merge pull request #315 from vais-ral/evelinaametova-patch-1evelinaametova2019-06-131-4/+2
| |\ \ \ | | | | | | | | | | Update NEXUSDataReader.py
| | * | | Update NEXUSDataReader.pyevelinaametova2019-06-131-4/+2
| |/ / /
| * | | Merge pull request #314 from vais-ral/data_readers_fixevelinaametova2019-06-133-14/+47
| |\ \ \ | | |/ / | |/| | fix None values in Reader/ Wrirer
| | * | 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
| | |\ | | | | | | | | Update fix test
| | | * 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
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Wrappers/Python/ccpi/framework/__init__.py Wrappers/Python/ccpi/optimisation/algorithms/CGLS.py Wrappers/Python/ccpi/optimisation/algorithms/FISTA.py Wrappers/Python/ccpi/optimisation/operators/LinearOperatorMatrix.py Wrappers/Python/test/test_run_test.py
| | | | * | | 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
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: Wrappers/Python/ccpi/processors/__init__.py
| * | | | Merge pull request #308 from vais-ral/fix_io_importsEdoardo Pasca2019-06-123-6/+2
| |\ \ \ \ | | | | | | | | | | | | fix imports in io
| | * | | | 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 branch
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 19:32:48 +0000