summaryrefslogtreecommitdiffstats
path: root/matlab/mex
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into parallel_vecWillem Jan Palenstijn2017-10-113-6/+22
|\
| * Improve object creation error messagesWillem Jan Palenstijn2017-10-113-6/+22
| |
* | Merge branch 'master' into parallel_vecWillem Jan Palenstijn2017-09-1537-6026/+190
|\|
| * Use standard _OPENMP directive for checking openmpWillem Jan Palenstijn2017-03-201-4/+2
| |
| * Remove using namespace std; from headersWillem Jan Palenstijn2017-02-161-2/+2
| |
| * Make python -sinocone a synonym of -sino.Willem Jan Palenstijn2017-02-081-1/+1
| | | | | | | | The matlab interface already behaves like this.
| * Remove unused 3d global min/maxWillem Jan Palenstijn2017-02-083-17/+0
| |
| * Fix warningsWillem Jan Palenstijn2017-01-171-5/+5
| |
| * Update headers (website+2016)Willem Jan Palenstijn2016-11-2818-66/+50
| |
| * Add VS2015 build filesWillem Jan Palenstijn2016-11-249-0/+2766
| |
| * Remove VS2008/VS2012 build filesWillem Jan Palenstijn2016-11-2419-8611/+0
| |
| * Add experimental support for OctaveWillem Jan Palenstijn2016-11-182-1/+45
| | | | | | | | Based on initial patch by @kalvdans.
| * Improve consts in matlab undocumented function declarationsWillem Jan Palenstijn2016-11-181-5/+5
| |
* | 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-2814-158/+1628
|\|
| * Merge branch 'master' into indexmanagerWillem Jan Palenstijn2016-03-012-9/+85
| |\
| | * Merge pull request #111 from wjp/pluginbuildWillem Jan Palenstijn2016-02-222-9/+85
| | |\ | | | | | | | | Remove dependency of libastra on libpython
| | | * 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
| | | |
| * | | Add missing helpWillem Jan Palenstijn2016-02-221-1/+1
| | | |
| * | | Add astra_mex delete/info based on index managerWillem Jan Palenstijn2016-02-161-0/+49
| |/ /
| * | Merge pull request #107 from wjp/multiWillem Jan Palenstijn2016-02-021-5/+40
| |\ \ | | |/ | |/| Add multi-GPU support to CompositeGeometryManager
| | * 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 credits
| | * 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 stringstreams
| | * Replace boost::lexical_cast by stringstreamsWillem Jan Palenstijn2016-01-052-5/+4
| | | | | | | | | | | | | | | | | | This is to avoid the dependence of lexical_cast on the current locale. The stringstreams used for the new string parsing/output functions are explicitly imbued with the C/classic locale.
| * | Remove (long) obsolete fileWillem Jan Palenstijn2016-01-051-124/+0
| |/
| * Merge pull request #73 from dmpelt/python-pluginsWillem Jan Palenstijn2015-12-042-0/+135
| |\ | | | | | | Add support for Python algorithm plugins
| | * Merge branch 'master' into python-pluginsWillem Jan Palenstijn2015-12-0111-16/+1293
| | |\ | | | | | | | | | | | | | | | | Conflicts: python/astra/utils.pyx
| | * | Allow registering plugins without explicit name, and fix exception handling ↵Daniel M. Pelt2015-07-231-15/+8
| | | | | | | | | | | | | | | | when running in Matlab
| | * | 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
| | | |
| * | | Fix Windows builds of astra_mex_directWillem Jan Palenstijn2015-12-022-0/+20
| | |/ | |/|
| * | astra_mex_direct: Don't initialize newly allocated mxArrayNicola Vigano2015-10-091-2/+18
| | | | | | | | | | | | | | | This avoids letting matlab initialize the memory we will overwrite shortly after.
| * | Build astra_mex_direct in MSVCWillem Jan Palenstijn2015-10-072-0/+918
| | |
| * | Add astra_mex_direct('FP3D'/'BP3D', ...)Willem Jan Palenstijn2015-10-071-0/+332
| | |
| * | Use mxLogical instead of bool.Willem Jan Palenstijn2015-09-172-3/+3
| | | | | | | | | | | | This should improve compatibility with Octave according to Christian Häggström.
| * | 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
| | |
| * | Fix matlab compilation without CUDADaniel M. Pelt2015-06-201-2/+2
| |/
* | Merge remote-tracking branch 'upstream/master' into parallel_vecWim van Aarle2015-05-2631-1720/+3387
|\| | | | | | | | | | | | | | | Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp
| * Make XML array handling consistentWillem Jan Palenstijn2015-05-061-20/+2
| | | | | | | | setContent and getContent were using different XML formats previously.