Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | removed print to screen | Edoardo Pasca | 2017-10-25 | 1 | -6/+0 |
| | | | | Fixed #2 | ||||
* | Added print to screen to debug faulty FGP_TV | Edoardo Pasca | 2017-10-25 | 1 | -5/+10 |
| | | | | Bug #2 came from not initializing lambda but mu. | ||||
* | 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 |
| | | | | | | | | | | Add regularization step OS seems to work | ||||
| * | 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 ↵ | Edoardo Pasca | 2017-10-24 | 7 | -126/+117 |
| |\ | | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize | ||||
| | * | demo_parallel update | algol | 2017-10-20 | 1 | -0/+12 |
| | | | |||||
| | * | GH-OS fixed, demos updated, add_artifacts function | Daniil Kazantsev | 2017-10-19 | 7 | -126/+105 |
| | | | |||||
| * | | Remove dependency on astra-toolbox in meta.yaml | Edoardo Pasca | 2017-10-24 | 1 | -1/+1 |
| | | | | | | | | | | | | this just because otherwise conda wants to install a version from astra-toolbox which I'm not sure works for us. | ||||
| * | | 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 the standard package reconstruction directory for the fista code | ||||
| * | | 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 |
| | | | | | | | | sets up for the current active conda environmnet | ||||
* | | Added setup.py.in | Edoardo Pasca | 2017-10-23 | 1 | -0/+67 |
| | | |||||
* | | Add needed environment variables | Edoardo Pasca | 2017-10-23 | 3 | -6/+30 |
| | | | | | | | | Adds the environment variables that are needed to compile via conda. | ||||
* | | Merge branch origin/pythonize into pythonize | Edoardo Pasca | 2017-10-20 | 2 | -169/+143 |
|\ \ | |||||
| * \ | Merge branch 'pythonize' of ↵ | Edoardo Pasca | 2017-10-20 | 13 | -309/+601 |
| |\ \ | | | | | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize | ||||
| * | | | 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 ↵ | Edoardo Pasca | 2017-10-20 | 2 | -1/+2 |
|\ \ \ | | | | | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize | ||||
| * | | | First commit of CMakeLists.txt | Edoardo Pasca | 2017-10-19 | 1 | -0/+79 |
| | | | | | | | | | | | | | | | | attempting to locate conda python environment | ||||
| * | | | First commit of CMakeLists.txt | Edoardo Pasca | 2017-10-19 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | attempt to use CMake to create the build environment | ||||
* | | | | Initial revision of build environment made with CMake | Edoardo Pasca | 2017-10-20 | 9 | -0/+336 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial revision of build environment made with CMake First commit of CMakeLists.txt attempt to use CMake to create the build environment First commit of CMakeLists.txt attempting to locate conda python environment Added a few files for CMake Many changes for the CMake compilation. Tested CMake build Bugfixes | ||||
* | | | Merge branch 'master' into pythonize | Edoardo Pasca | 2017-10-19 | 3 | -15/+48 |
|\ \ \ | | |/ | |/| | |||||
| * | | OS loop now fixed | Daniil Kazantsev | 2017-10-19 | 3 | -27/+44 |
| | | | |||||
| * | | Merge pull request #6 from vais-ral/if-then-else | dkazanc | 2017-10-19 | 1 | -39/+15 |
| |\ \ | | | | | | | | | moved code out of if-then-else | ||||
| | * | | moved code out of if-then-else | Edoardo Pasca | 2017-10-19 | 1 | -39/+15 |
| |/ / | | | | | | | | | | fixed #5 | ||||
* | | | Merge branch 'pythonize' of ↵ | Edoardo Pasca | 2017-10-19 | 3 | -89/+594 |
|\ \ \ | | |/ | |/| | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize | ||||
| * | | 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 |
| | | | | | | | | | | | | added RSME | ||||
| * | | Modified Region of interest; removed studentt | Edoardo Pasca | 2017-10-18 | 1 | -14/+7 |
| | | | | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction/commit/6fb8f5d188ed31d7a7077cba8ab7aea17b25b8bf | ||||
* | | | moved code out of if-the-else | Edoardo Pasca | 2017-10-19 | 1 | -39/+15 |
| | | | | | | | | | | | | closes issue #5 | ||||
* | | | Merge branch 'master' into pythonize | Edoardo Pasca | 2017-10-19 | 2 | -76/+108 |
|\ \ \ | | |/ | |/| | |||||
| * | | ordered subsets fix for GH term | Daniil Kazantsev | 2017-10-18 | 2 | -76/+108 |
| | | | |||||
* | | | Merge branch 'master' of ↵ | Edoardo Pasca | 2017-10-18 | 4 | -265/+179 |
|\| | | |/ |/| | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize | ||||
| * | linked demos to TomoPhantom, cone beam demo, some FISTA modificastions | Daniil Kazantsev | 2017-10-18 | 4 | -265/+179 |
| | | |||||
* | | Merge branch 'pythonize' of ↵ | Edoardo Pasca | 2017-10-18 | 1 | -0/+0 |
|\ \ | | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize |