Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | doing work | Edoardo Pasca | 2017-10-25 | 1 | -213/+258 | |
| | * | Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc... | Edoardo Pasca | 2017-10-25 | 1 | -0/+380 | |
| | |\ | ||||||
| | | * | Merge branch 'origin/pythonize' into pythonize | Edoardo Pasca | 2017-10-25 | 1 | -5/+4 | |
| | | |\ | ||||||
| | | * | | added to repository | Edoardo Pasca | 2017-10-25 | 1 | -0/+380 | |
| | * | | | development | Edoardo Pasca | 2017-10-25 | 1 | -1/+5 | |
| | * | | | Removed unused variables | Edoardo Pasca | 2017-10-25 | 1 | -2/+2 | |
| | * | | | removed dependency | Edoardo Pasca | 2017-10-25 | 1 | -3/+3 | |
| | | |/ | | |/| | ||||||
| | * | | removed print to screen | Edoardo Pasca | 2017-10-25 | 1 | -6/+0 | |
| | * | | Added print to screen to debug faulty FGP_TV | Edoardo Pasca | 2017-10-25 | 1 | -5/+10 | |
| | |/ | ||||||
| | * | Merge branch origin/pythonize into pythonize | Edoardo Pasca | 2017-10-25 | 22 | -1362/+1058 | |
| | |\ | ||||||
| | | * | Add regularization step | Edoardo Pasca | 2017-10-24 | 3 | -7/+27 | |
| | | * | saves to file | Edoardo Pasca | 2017-10-24 | 1 | -0/+1 | |
| | | * | moved to test directory | Edoardo Pasca | 2017-10-24 | 1 | -3/+12 | |
| | | * | Merge branch 'master' of https://github.com/vais-ral/CCPi-FISTA_Reconstructio... | Edoardo Pasca | 2017-10-24 | 7 | -126/+117 | |
| | | |\ | | |_|/ | |/| | | ||||||
| | | * | Remove dependency on astra-toolbox in meta.yaml | Edoardo Pasca | 2017-10-24 | 1 | -1/+1 | |
| | | * | fix wrong indentation | Edoardo Pasca | 2017-10-24 | 1 | -1/+1 | |
| | | * | added targets and cache variables | Edoardo Pasca | 2017-10-24 | 2 | -2/+48 | |
| | | * | removed fista directory | Edoardo Pasca | 2017-10-24 | 3 | -1034/+0 | |
| | | * | use system package | Edoardo Pasca | 2017-10-24 | 1 | -1/+1 | |
| | | * | latest dev | Edoardo Pasca | 2017-10-24 | 1 | -172/+427 | |
| | | * | Builds 2 packages fista and regularizers | Edoardo Pasca | 2017-10-24 | 6 | -26/+359 | |
| | | * | add fista-recipe and stuff | Edoardo Pasca | 2017-10-23 | 5 | -2/+83 | |
| | | * | minor cleanup | Edoardo Pasca | 2017-10-23 | 1 | -17/+7 | |
| | * | | Use MATCH and CMAKE_MATCH_<n> | Edoardo Pasca | 2017-10-25 | 1 | -12/+6 | |
| | |/ | ||||||
| | * | Bugfixes for UNIX compilation | Edoardo Pasca | 2017-10-23 | 3 | -84/+52 | |
| | * | executable extension is for WIN32 | Edoardo Pasca | 2017-10-23 | 1 | -2/+6 | |
| | * | Finds the active conda environment | Edoardo Pasca | 2017-10-23 | 1 | -4/+56 | |
| | * | Added setup.py.in | Edoardo Pasca | 2017-10-23 | 1 | -0/+67 | |
| | * | Add needed environment variables | Edoardo Pasca | 2017-10-23 | 3 | -6/+30 | |
| | * | Merge branch origin/pythonize into pythonize | Edoardo Pasca | 2017-10-20 | 2 | -169/+143 | |
| | |\ | ||||||
| | | * | Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc... | Edoardo Pasca | 2017-10-20 | 13 | -309/+601 | |
| | | |\ | ||||||
| | | * | | Further development | Edoardo Pasca | 2017-10-20 | 2 | -55/+81 | |
| | | * | | finished first draft | Edoardo Pasca | 2017-10-19 | 1 | -115/+21 | |
| | | * | | further progress | Edoardo Pasca | 2017-10-19 | 1 | -34/+54 | |
| | | * | | progress in pythonization | Edoardo Pasca | 2017-10-19 | 1 | -22/+44 | |
| | * | | | add conda-forge to the channel | Edoardo Pasca | 2017-10-20 | 1 | -1/+1 | |
| | | |/ | | |/| | ||||||
| | * | | Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc... | Edoardo Pasca | 2017-10-20 | 2 | -1/+2 | |
| | |\ \ | ||||||
| | | * | | First commit of CMakeLists.txt | Edoardo Pasca | 2017-10-19 | 1 | -0/+79 | |
| | | * | | First commit of CMakeLists.txt | Edoardo Pasca | 2017-10-19 | 1 | -0/+4 | |
| | * | | | Initial revision of build environment made with CMake | Edoardo Pasca | 2017-10-20 | 9 | -0/+336 | |
| | |/ / | ||||||
| | * | | Merge branch 'master' into pythonize | Edoardo Pasca | 2017-10-19 | 3 | -15/+48 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc... | Edoardo Pasca | 2017-10-19 | 3 | -89/+594 | |
| | |\ \ \ | | | | |/ | | | |/| | ||||||
| | | * | | added to repository | Edoardo Pasca | 2017-10-18 | 1 | -0/+379 | |
| | | * | | implemented non ordered subset FISTA in reconstructor | Edoardo Pasca | 2017-10-18 | 2 | -25/+165 | |
| | | * | | minor reorganization of the code | Edoardo Pasca | 2017-10-18 | 1 | -52/+45 | |
| | | * | | Modified Region of interest; removed studentt | Edoardo Pasca | 2017-10-18 | 1 | -14/+7 | |
| | * | | | moved code out of if-the-else | Edoardo Pasca | 2017-10-19 | 1 | -39/+15 | |
| | * | | | Merge branch 'master' into pythonize | Edoardo Pasca | 2017-10-19 | 2 | -76/+108 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' of https://github.com/vais-ral/CCPi-FISTA_Reconstructio... | Edoardo Pasca | 2017-10-18 | 4 | -265/+179 | |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | * | | | | Merge branch 'pythonize' of https://github.com/vais-ral/CCPi-FISTA_Reconstruc... | Edoardo Pasca | 2017-10-18 | 1 | -0/+0 | |
| | |\ \ \ \ |