summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch origin/pythonize into pythonizeEdoardo Pasca2017-10-2514-1235/+940
|\
| * Add regularization stepEdoardo Pasca2017-10-243-7/+27
| * saves to fileEdoardo Pasca2017-10-241-0/+1
| * moved to test directoryEdoardo Pasca2017-10-241-3/+12
| * Remove dependency on astra-toolbox in meta.yamlEdoardo Pasca2017-10-241-1/+1
| * fix wrong indentationEdoardo Pasca2017-10-241-1/+1
| * added targets and cache variablesEdoardo Pasca2017-10-241-1/+47
| * removed fista directoryEdoardo Pasca2017-10-243-1034/+0
| * use system packageEdoardo Pasca2017-10-241-1/+1
| * latest devEdoardo Pasca2017-10-241-172/+427
| * Builds 2 packages fista and regularizersEdoardo Pasca2017-10-246-26/+359
| * add fista-recipe and stuffEdoardo Pasca2017-10-235-2/+83
| * minor cleanupEdoardo Pasca2017-10-231-17/+7
* | Use MATCH and CMAKE_MATCH_<n>Edoardo Pasca2017-10-251-12/+6
|/
* Bugfixes for UNIX compilationEdoardo Pasca2017-10-233-84/+52
* executable extension is for WIN32Edoardo Pasca2017-10-231-2/+6
* Finds the active conda environmentEdoardo Pasca2017-10-231-4/+56
* Added setup.py.inEdoardo Pasca2017-10-231-0/+67
* Add needed environment variablesEdoardo Pasca2017-10-233-6/+30
* Merge branch origin/pythonize into pythonizeEdoardo Pasca2017-10-202-169/+143
|\
| * Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc...Edoardo Pasca2017-10-208-0/+307
| |\
| * | Further developmentEdoardo Pasca2017-10-202-55/+81
| * | finished first draftEdoardo Pasca2017-10-191-115/+21
| * | further progressEdoardo Pasca2017-10-191-34/+54
| * | progress in pythonizationEdoardo Pasca2017-10-191-22/+44
* | | add conda-forge to the channelEdoardo Pasca2017-10-201-1/+1
| |/ |/|
* | Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc...Edoardo Pasca2017-10-201-0/+1
|\ \
| * | First commit of CMakeLists.txtEdoardo Pasca2017-10-191-0/+79
| |/
* / Initial revision of build environment made with CMakeEdoardo Pasca2017-10-208-0/+306
|/
* added to repositoryEdoardo Pasca2017-10-181-0/+379
* implemented non ordered subset FISTA in reconstructorEdoardo Pasca2017-10-182-25/+165
* minor reorganization of the codeEdoardo Pasca2017-10-181-52/+45
* Modified Region of interest; removed studenttEdoardo Pasca2017-10-181-14/+7
* removed viewer package from treeEdoardo Pasca2017-10-1811-1987/+0
* Progress in pythonizationEdoardo Pasca2017-10-182-35/+298
* Squashing 2 commits: Added and removed hdf5 (too big)Edoardo Pasca2017-10-181-0/+0
* Added many methodsEdoardo Pasca2017-10-171-24/+160
* Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc...Edoardo Pasca2017-10-132-0/+15
|\
| * Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc...Edoardo Pasca2017-10-117-50/+988
| |\
| * | initial revisionEdoardo Pasca2017-10-111-0/+25
| * | read and plot the hdf5Edoardo Pasca2017-10-111-1/+14
| * | table with regularizers outputEdoardo Pasca2017-10-111-33/+33
| * | initial revisionEdoardo Pasca2017-10-111-0/+0
| * | initial revisionEdoardo Pasca2017-10-111-0/+0
| * | initial facility to test the FISTAEdoardo Pasca2017-10-111-0/+179
| * | bugfixEdoardo Pasca2017-10-111-2/+2
| * | initial revision for testingEdoardo Pasca2017-10-111-0/+354
| * | export/import data from hdf5Edoardo Pasca2017-10-111-0/+28
| * | module renameEdoardo Pasca2017-10-111-2/+2
| * | initial revisionEdoardo Pasca2017-10-111-0/+322