Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | first working OS FISTA python test | Edoardo Pasca | 2017-10-31 | 1 | -24/+47 |
| | |||||
* | demo updated | Edoardo Pasca | 2017-10-31 | 1 | -30/+24 |
| | |||||
* | Allows regularizer to output simply an image | Edoardo Pasca | 2017-10-31 | 1 | -2/+3 |
| | |||||
* | fixed setParameter | Edoardo Pasca | 2017-10-31 | 1 | -15/+27 |
| | | | | | fixed setParameter allows regularizer to output simply the image rather than list. | ||||
* | regularization parameter is divided by Lipschitz constant | Edoardo Pasca | 2017-10-30 | 1 | -1/+4 |
| | | | | as 09f9bf9828c39bcdd870cfefbcb52e61451802eb | ||||
* | bugfixes for AstraDevice use | Edoardo Pasca | 2017-10-30 | 4 | -35/+71 |
| | |||||
* | bugfix | Edoardo Pasca | 2017-10-27 | 1 | -0/+2 |
| | |||||
* | Added AstraDevice and DeviceModel | Edoardo Pasca | 2017-10-27 | 1 | -0/+2 |
| | |||||
* | further development using abstract forward/backward projector | Edoardo Pasca | 2017-10-27 | 4 | -59/+84 |
| | |||||
* | uses AstraDevice | Edoardo Pasca | 2017-10-27 | 1 | -32/+92 |
| | |||||
* | Added DeviceModel and AstraDevice | Edoardo Pasca | 2017-10-27 | 2 | -0/+124 |
| | | | | | | these classes are to abstract the calls to forward/backprojection so that the FISTA implementation is independent of ASTRA and we may use CCPi code from CGLS. | ||||
* | Finds the conda executable | Edoardo Pasca | 2017-10-27 | 2 | -3/+8 |
| | |||||
* | handles correctly the slicing | Edoardo Pasca | 2017-10-27 | 1 | -3/+3 |
| | |||||
* | initializes R3 | Edoardo Pasca | 2017-10-27 | 1 | -4/+1 |
| | | | | Bugfix, R2 was initialized twice, R3 never. | ||||
* | added to repository | Edoardo Pasca | 2017-10-25 | 1 | -0/+412 |
| | |||||
* | doing work | Edoardo Pasca | 2017-10-25 | 1 | -213/+258 |
| | |||||
* | Merge branch 'pythonize' of ↵ | Edoardo Pasca | 2017-10-25 | 1 | -0/+380 |
|\ | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize | ||||
| * | 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 |
| | | | | | | | | 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 | 14 | -1235/+940 |
|\ | |||||
| * | 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 |
| | | |||||
| * | 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 | 1 | -1/+47 |
| | | |||||
| * | 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 | 8 | -0/+307 |
| |\ | | | | | | | | | | 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 |
| |/ |/| |