summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * doing workEdoardo Pasca2017-10-251-213/+258
| | * Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc...Edoardo Pasca2017-10-251-0/+380
| | |\
| | | * Merge branch 'origin/pythonize' into pythonizeEdoardo Pasca2017-10-251-5/+4
| | | |\
| | | * | added to repositoryEdoardo Pasca2017-10-251-0/+380
| | * | | developmentEdoardo Pasca2017-10-251-1/+5
| | * | | Removed unused variablesEdoardo Pasca2017-10-251-2/+2
| | * | | removed dependencyEdoardo Pasca2017-10-251-3/+3
| | | |/ | | |/|
| | * | removed print to screenEdoardo Pasca2017-10-251-6/+0
| | * | Added print to screen to debug faulty FGP_TVEdoardo Pasca2017-10-251-5/+10
| | |/
| | * Merge branch origin/pythonize into pythonizeEdoardo Pasca2017-10-2522-1362/+1058
| | |\
| | | * 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
| | | * Merge branch 'master' of https://github.com/vais-ral/CCPi-FISTA_Reconstructio...Edoardo Pasca2017-10-247-126/+117
| | | |\ | | |_|/ | |/| |
| | | * 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-242-2/+48
| | | * 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-2013-309/+601
| | | |\
| | | * | 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-202-1/+2
| | |\ \
| | | * | First commit of CMakeLists.txtEdoardo Pasca2017-10-191-0/+79
| | | * | First commit of CMakeLists.txtEdoardo Pasca2017-10-191-0/+4
| | * | | Initial revision of build environment made with CMakeEdoardo Pasca2017-10-209-0/+336
| | |/ /
| | * | Merge branch 'master' into pythonizeEdoardo Pasca2017-10-193-15/+48
| | |\ \
| | * \ \ Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc...Edoardo Pasca2017-10-193-89/+594
| | |\ \ \ | | | | |/ | | | |/|
| | | * | 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
| | * | | moved code out of if-the-elseEdoardo Pasca2017-10-191-39/+15
| | * | | Merge branch 'master' into pythonizeEdoardo Pasca2017-10-192-76/+108
| | |\ \ \
| | * \ \ \ Merge branch 'master' of https://github.com/vais-ral/CCPi-FISTA_Reconstructio...Edoardo Pasca2017-10-184-265/+179
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc...Edoardo Pasca2017-10-181-0/+0
| | |\ \ \ \