summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* regularization parameter is divided by Lipschitz constantEdoardo Pasca2017-10-301-1/+4
* Merge branch 'master' of https://github.com/vais-ral/CCPi-FISTA_Reconstructio...Edoardo Pasca2017-10-303-70/+55
|\
| * Lipshitz constant attached to the regularization parameteralgol2017-10-263-24/+9
| * Merge branch 'master' of https://github.com/vais-ral/CCPi-FISTA_Reconstructionalgol2017-10-2656-59/+6590
| |\
| | * Merge pull request #8 from vais-ral/pythonizedkazanc2017-10-2656-59/+6590
| | |\
| * | | Lipshitz constant attached to the regularization parameteralgol2017-10-263-46/+46
| |/ /
* | | bugfixes for AstraDevice useEdoardo Pasca2017-10-304-35/+71
* | | bugfixEdoardo Pasca2017-10-271-0/+2
* | | Added AstraDevice and DeviceModelEdoardo Pasca2017-10-271-0/+2
* | | further development using abstract forward/backward projectorEdoardo Pasca2017-10-274-59/+84
* | | uses AstraDeviceEdoardo Pasca2017-10-271-32/+92
* | | Added DeviceModel and AstraDeviceEdoardo Pasca2017-10-272-0/+124
* | | Finds the conda executableEdoardo Pasca2017-10-272-3/+8
* | | handles correctly the slicingEdoardo Pasca2017-10-271-3/+3
* | | initializes R3Edoardo Pasca2017-10-271-4/+1
| |/ |/|
* | added to repositoryEdoardo Pasca2017-10-251-0/+412
* | 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
| |\|
| | * demo_parallel updatealgol2017-10-201-0/+12
| | * GH-OS fixed, demos updated, add_artifacts functionDaniil Kazantsev2017-10-197-126/+105
| * | 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