summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* further development using abstract forward/backward projectorEdoardo Pasca2018-01-194-59/+84
|
* uses AstraDeviceEdoardo Pasca2018-01-191-32/+92
|
* Added DeviceModel and AstraDeviceEdoardo Pasca2018-01-192-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 executableEdoardo Pasca2018-01-192-3/+8
|
* handles correctly the slicingEdoardo Pasca2018-01-191-3/+3
|
* initializes R3Edoardo Pasca2018-01-191-4/+1
| | | | Bugfix, R2 was initialized twice, R3 never.
* matlab mexed updatedalgol2017-11-241-5/+5
|
* 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
| |\ | | | | | | Pythonize
| | * added to repositoryEdoardo Pasca2017-10-251-0/+412
| | |
| | * doing workEdoardo Pasca2017-10-251-213/+258
| | |
| | * Merge branch 'pythonize' of ↵Edoardo Pasca2017-10-251-0/+380
| | |\ | | | | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| | | * 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
| | | | | | | | | | | | | | | | Fixed #2
| | * | Added print to screen to debug faulty FGP_TVEdoardo Pasca2017-10-251-5/+10
| | |/ | | | | | | | | | Bug #2 came from not initializing lambda but mu.
| | * Merge branch origin/pythonize into pythonizeEdoardo Pasca2017-10-2522-1362/+1058
| | |\
| | | * Add regularization stepEdoardo Pasca2017-10-243-7/+27
| | | | | | | | | | | | | | | | | | | | Add regularization step OS seems to work
| | | * saves to fileEdoardo Pasca2017-10-241-0/+1
| | | |
| | | * moved to test directoryEdoardo Pasca2017-10-241-3/+12
| | | |
| | | * Merge branch 'master' of ↵Edoardo Pasca2017-10-247-126/+117
| | | |\ | | |_|/ | |/| | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| | | * Remove dependency on astra-toolbox in meta.yamlEdoardo Pasca2017-10-241-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 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 the standard package reconstruction directory for the fista code
| | | * 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
| | | | | | | | | | | | sets up for the current active conda environmnet
| | * Added setup.py.inEdoardo Pasca2017-10-231-0/+67
| | |
| | * Add needed environment variablesEdoardo Pasca2017-10-233-6/+30
| | | | | | | | | | | | Adds the environment variables that are needed to compile via conda.
| | * Merge branch origin/pythonize into pythonizeEdoardo Pasca2017-10-202-169/+143
| | |\
| | | * Merge branch 'pythonize' of ↵Edoardo Pasca2017-10-2013-309/+601
| | | |\ | | | | | | | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| | | * | 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 ↵Edoardo Pasca2017-10-202-1/+2
| | |\ \ | | | | | | | | | | | | | | | https://github.com/vais-ral/CCPi-FISTA_Reconstruction into pythonize
| | | * | First commit of CMakeLists.txtEdoardo Pasca2017-10-191-0/+79
| | | | | | | | | | | | | | | | | | | | attempting to locate conda python environment
| | | * | First commit of CMakeLists.txtEdoardo Pasca2017-10-191-0/+4
| | | | | | | | | | | | | | | | | | | | attempt to use CMake to create the build environment
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 16:25:02 +0000