summaryrefslogtreecommitdiffstats
path: root/Wrappers
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' into cgls_fixEdoardo Pasca2019-07-011-5/+18
|\
| * removed or from ifEdoardo Pasca2019-07-011-2/+1
| * correct verbose outputEdoardo Pasca2019-07-011-5/+19
* | fix cglsepapoutsellis2019-06-263-29/+26
* | fix cglsepapoutsellis2019-06-262-46/+56
* | fix cgls impleepapoutsellis2019-06-267-164/+486
* | cgls_testepapoutsellis2019-06-252-73/+136
|/
* Merge pull request #330 from vais-ral/demo_data_filesgfardell2019-06-243-12/+107
|\
| * Unit tests on test image loading and image sizeGemma Fardell2019-06-241-38/+69
| * bug fix on generating test dataGemma Fardell2019-06-241-3/+3
| * Added unittests for test dataGemma Fardell2019-06-211-7/+71
| * Merge branch 'master' into demo_data_filesGemma Fardell2019-06-214-49/+420
| |\
| * | added shapes.png to setup.pyGemma Fardell2019-06-211-1/+1
| * | added shapes.png to setup.pyGemma Fardell2019-06-211-1/+1
* | | Update conda_build_config.yamlEdoardo Pasca2019-06-241-0/+2
| |/ |/|
* | added testclass file to hold the CCPiTestClass definitionsEdoardo Pasca2019-06-211-0/+41
* | makes sure write tests happen before read testsEdoardo Pasca2019-06-211-2/+5
* | fix local import for python 2.7Edoardo Pasca2019-06-211-3/+4
* | temporarily renamed test_NexusReaderWriter.pyEdoardo Pasca2019-06-211-0/+0
* | added initial test for random_noiseEdoardo Pasca2019-06-211-0/+18
* | added commentEdoardo Pasca2019-06-211-0/+1
* | added random_noise to TestData as staticmethodEdoardo Pasca2019-06-201-3/+9
* | add random_noise to TestDataEdoardo Pasca2019-06-201-48/+221
* | 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
| |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 04:09:05 +0000