summaryrefslogtreecommitdiffstats
path: root/matlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into parallel_vecWillem Jan Palenstijn2016-10-071-18/+10
|\
| * Replace use of boost::split by own functionWillem Jan Palenstijn2016-07-281-9/+4
| * Convert one more string parsing function to stringToDoubleWillem Jan Palenstijn2016-07-281-9/+6
* | Merge branch 'master' into parvecWillem Jan Palenstijn2016-07-2821-212/+1728
|\|
| * Merge pull request #29 from wjp/indexmanagerWillem Jan Palenstijn2016-04-151-1/+50
| |\
| | * Merge branch 'master' into indexmanagerWillem Jan Palenstijn2016-03-012-9/+85
| | |\
| | * | Add missing helpWillem Jan Palenstijn2016-02-221-1/+1
| | * | Add astra_mex delete/info based on index managerWillem Jan Palenstijn2016-02-161-0/+49
| * | | Removed regression from opTomoFolkert Bleichrodt2016-03-141-10/+13
| * | | opTomo: output type matches input typeFolkert Bleichrodt2016-03-021-57/+29
| | |/ | |/|
| * | Merge pull request #111 from wjp/pluginbuildWillem Jan Palenstijn2016-02-222-9/+85
| |\ \ | | |/ | |/|
| | * Move fixLapackLoading to astra_mex_pluginWillem Jan Palenstijn2016-01-271-0/+33
| | * Use Py_XDECREF to guard against nullWillem Jan Palenstijn2016-01-271-1/+1
| | * Initialize Python plugins when available in MatlabWillem Jan Palenstijn2016-01-212-1/+32
| | * Fix whitespaceWillem Jan Palenstijn2016-01-211-6/+6
| | * Remove dependency of libastra on libpython by refactoring PluginAlgorithmWillem Jan Palenstijn2016-01-211-3/+15
| * | Merge pull request #107 from wjp/multiWillem Jan Palenstijn2016-02-021-5/+40
| |\ \ | | |/ | |/|
| | * Add multi-GPU support to CompositeGeometryManagerWillem Jan Palenstijn2016-01-191-5/+40
| * | Fix file permissionsWillem Jan Palenstijn2016-01-211-0/+0
| |/
| * Merge pull request #106 from wjp/creditsWillem Jan Palenstijn2016-01-181-9/+12
| |\
| | * Update creditsWillem Jan Palenstijn2016-01-051-9/+12
| * | Merge pull request #105 from wjp/stringsWillem Jan Palenstijn2016-01-182-5/+4
| |\ \ | | |/ | |/|
| | * Replace boost::lexical_cast by stringstreamsWillem Jan Palenstijn2016-01-052-5/+4
| * | Remove (long) obsolete fileWillem Jan Palenstijn2016-01-051-124/+0
| |/
| * Merge pull request #73 from dmpelt/python-pluginsWillem Jan Palenstijn2015-12-043-0/+159
| |\
| | * Merge branch 'master' into python-pluginsWillem Jan Palenstijn2015-12-0116-19/+1328
| | |\
| | * | Add matlab plugin .m fileDaniel M. Pelt2015-07-231-0/+24
| | * | Allow registering plugins without explicit name, and fix exception handling w...Daniel M. Pelt2015-07-231-15/+8
| | * | Fix numpy lapack loading when running in MatlabDaniel M. Pelt2015-07-231-0/+3
| | * | Add support for Python algorithm pluginsDaniel M. Pelt2015-07-231-0/+139
| * | | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-12-025-2/+1317
| |\ \ \
| | * | | Fix Windows builds of astra_mex_directWillem Jan Palenstijn2015-12-022-0/+20
| | | |/ | | |/|
| | * | Merge pull request #94 from wjp/cuda_options2Willem Jan Palenstijn2015-12-011-2/+7
| | |\ \
| | | * | Add options passing to projectors from matlabNicola Vigano2015-10-091-2/+7
| | * | | astra_mex_direct: Don't initialize newly allocated mxArrayNicola Vigano2015-10-091-2/+18
| | * | | Build astra_mex_direct in MSVCWillem Jan Palenstijn2015-10-072-0/+918
| | * | | Add astra_mex_direct('FP3D'/'BP3D', ...)Willem Jan Palenstijn2015-10-072-0/+356
| | |/ /
| * | | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-11-183-3/+5
| |\| |
| | * | Use mxLogical instead of bool.Willem Jan Palenstijn2015-09-172-3/+3
| | * | Fix algorithm leak in opTomoWillem Jan Palenstijn2015-09-041-0/+2
| * | | Let astra_create_vol_geom also generate flexible volume geometriesWillem Jan Palenstijn2015-09-251-0/+15
| |/ /
| * | Fix algorithm object leak in astra_create_fbp_reconstruction.mWillem Jan Palenstijn2015-08-121-0/+1
| * | Fix formatting when passing strings to log from high-level codeDaniel M. Pelt2015-07-172-5/+5
| * | Fix memory leak in configuration codeDaniel M. Pelt2015-06-252-5/+12
| * | Fix config to struct/dict translation for array optionsDaniel M. Pelt2015-06-241-1/+5
| * | Actually use the rec_type argument in astra_create_reconstruction_cudaDaniel M. Pelt2015-06-201-1/+1
| * | Fix matlab compilation without CUDADaniel M. Pelt2015-06-201-2/+2
| |/
* | Merge remote-tracking branch 'upstream/master' into parallel_vecWim van Aarle2015-05-2636-1745/+3759
|\|
| * Merge pull request #49 from 3cHeLoN/astra-spotWillem Jan Palenstijn2015-05-152-0/+309
| |\
| | * Added ASTRA-Spot operator opTomoFolkert Bleichrodt2015-05-152-0/+309
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 08:33:43 +0000