Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into parallel_vec | Willem Jan Palenstijn | 2017-09-15 | 37 | -6026/+190 |
|\ | |||||
| * | Use standard _OPENMP directive for checking openmp | Willem Jan Palenstijn | 2017-03-20 | 1 | -4/+2 |
| | | |||||
| * | Remove using namespace std; from headers | Willem Jan Palenstijn | 2017-02-16 | 1 | -2/+2 |
| | | |||||
| * | Make python -sinocone a synonym of -sino. | Willem Jan Palenstijn | 2017-02-08 | 1 | -1/+1 |
| | | | | | | | | The matlab interface already behaves like this. | ||||
| * | Remove unused 3d global min/max | Willem Jan Palenstijn | 2017-02-08 | 3 | -17/+0 |
| | | |||||
| * | Fix warnings | Willem Jan Palenstijn | 2017-01-17 | 1 | -5/+5 |
| | | |||||
| * | Update headers (website+2016) | Willem Jan Palenstijn | 2016-11-28 | 18 | -66/+50 |
| | | |||||
| * | Add VS2015 build files | Willem Jan Palenstijn | 2016-11-24 | 9 | -0/+2766 |
| | | |||||
| * | Remove VS2008/VS2012 build files | Willem Jan Palenstijn | 2016-11-24 | 19 | -8611/+0 |
| | | |||||
| * | Add experimental support for Octave | Willem Jan Palenstijn | 2016-11-18 | 2 | -1/+45 |
| | | | | | | | | Based on initial patch by @kalvdans. | ||||
| * | Improve consts in matlab undocumented function declarations | Willem Jan Palenstijn | 2016-11-18 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'master' into parallel_vec | Willem Jan Palenstijn | 2016-10-07 | 1 | -18/+10 |
|\| | |||||
| * | Replace use of boost::split by own function | Willem Jan Palenstijn | 2016-07-28 | 1 | -9/+4 |
| | | |||||
| * | Convert one more string parsing function to stringToDouble | Willem Jan Palenstijn | 2016-07-28 | 1 | -9/+6 |
| | | |||||
* | | Merge branch 'master' into parvec | Willem Jan Palenstijn | 2016-07-28 | 14 | -158/+1628 |
|\| | |||||
| * | Merge branch 'master' into indexmanager | Willem Jan Palenstijn | 2016-03-01 | 2 | -9/+85 |
| |\ | |||||
| | * | Merge pull request #111 from wjp/pluginbuild | Willem Jan Palenstijn | 2016-02-22 | 2 | -9/+85 |
| | |\ | | | | | | | | | Remove dependency of libastra on libpython | ||||
| | | * | Move fixLapackLoading to astra_mex_plugin | Willem Jan Palenstijn | 2016-01-27 | 1 | -0/+33 |
| | | | | |||||
| | | * | Use Py_XDECREF to guard against null | Willem Jan Palenstijn | 2016-01-27 | 1 | -1/+1 |
| | | | | |||||
| | | * | Initialize Python plugins when available in Matlab | Willem Jan Palenstijn | 2016-01-21 | 2 | -1/+32 |
| | | | | |||||
| | | * | Fix whitespace | Willem Jan Palenstijn | 2016-01-21 | 1 | -6/+6 |
| | | | | |||||
| | | * | Remove dependency of libastra on libpython by refactoring PluginAlgorithm | Willem Jan Palenstijn | 2016-01-21 | 1 | -3/+15 |
| | | | | |||||
| * | | | Add missing help | Willem Jan Palenstijn | 2016-02-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add astra_mex delete/info based on index manager | Willem Jan Palenstijn | 2016-02-16 | 1 | -0/+49 |
| |/ / | |||||
| * | | Merge pull request #107 from wjp/multi | Willem Jan Palenstijn | 2016-02-02 | 1 | -5/+40 |
| |\ \ | | |/ | |/| | Add multi-GPU support to CompositeGeometryManager | ||||
| | * | Add multi-GPU support to CompositeGeometryManager | Willem Jan Palenstijn | 2016-01-19 | 1 | -5/+40 |
| | | | |||||
| * | | Fix file permissions | Willem Jan Palenstijn | 2016-01-21 | 1 | -0/+0 |
| |/ | |||||
| * | Merge pull request #106 from wjp/credits | Willem Jan Palenstijn | 2016-01-18 | 1 | -9/+12 |
| |\ | | | | | | | Update credits | ||||
| | * | Update credits | Willem Jan Palenstijn | 2016-01-05 | 1 | -9/+12 |
| | | | |||||
| * | | Merge pull request #105 from wjp/strings | Willem Jan Palenstijn | 2016-01-18 | 2 | -5/+4 |
| |\ \ | | |/ | |/| | Replace boost::lexical_cast by stringstreams | ||||
| | * | Replace boost::lexical_cast by stringstreams | Willem Jan Palenstijn | 2016-01-05 | 2 | -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 file | Willem Jan Palenstijn | 2016-01-05 | 1 | -124/+0 |
| |/ | |||||
| * | Merge pull request #73 from dmpelt/python-plugins | Willem Jan Palenstijn | 2015-12-04 | 2 | -0/+135 |
| |\ | | | | | | | Add support for Python algorithm plugins | ||||
| | * | Merge branch 'master' into python-plugins | Willem Jan Palenstijn | 2015-12-01 | 11 | -16/+1293 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: python/astra/utils.pyx | ||||
| | * | | Allow registering plugins without explicit name, and fix exception handling ↵ | Daniel M. Pelt | 2015-07-23 | 1 | -15/+8 |
| | | | | | | | | | | | | | | | | when running in Matlab | ||||
| | * | | Fix numpy lapack loading when running in Matlab | Daniel M. Pelt | 2015-07-23 | 1 | -0/+3 |
| | | | | |||||
| | * | | Add support for Python algorithm plugins | Daniel M. Pelt | 2015-07-23 | 1 | -0/+139 |
| | | | | |||||
| * | | | Fix Windows builds of astra_mex_direct | Willem Jan Palenstijn | 2015-12-02 | 2 | -0/+20 |
| | |/ | |/| | |||||
| * | | astra_mex_direct: Don't initialize newly allocated mxArray | Nicola Vigano | 2015-10-09 | 1 | -2/+18 |
| | | | | | | | | | | | | | | | This avoids letting matlab initialize the memory we will overwrite shortly after. | ||||
| * | | Build astra_mex_direct in MSVC | Willem Jan Palenstijn | 2015-10-07 | 2 | -0/+918 |
| | | | |||||
| * | | Add astra_mex_direct('FP3D'/'BP3D', ...) | Willem Jan Palenstijn | 2015-10-07 | 1 | -0/+332 |
| | | | |||||
| * | | Use mxLogical instead of bool. | Willem Jan Palenstijn | 2015-09-17 | 2 | -3/+3 |
| | | | | | | | | | | | | This should improve compatibility with Octave according to Christian Häggström. | ||||
| * | | Fix formatting when passing strings to log from high-level code | Daniel M. Pelt | 2015-07-17 | 2 | -5/+5 |
| | | | |||||
| * | | Fix memory leak in configuration code | Daniel M. Pelt | 2015-06-25 | 2 | -5/+12 |
| | | | |||||
| * | | Fix config to struct/dict translation for array options | Daniel M. Pelt | 2015-06-24 | 1 | -1/+5 |
| | | | |||||
| * | | Fix matlab compilation without CUDA | Daniel M. Pelt | 2015-06-20 | 1 | -2/+2 |
| |/ | |||||
* | | Merge remote-tracking branch 'upstream/master' into parallel_vec | Wim van Aarle | 2015-05-26 | 31 | -1720/+3387 |
|\| | | | | | | | | | | | | | | | Conflicts: astra_vc11.vcxproj.filters python/astra/functions.py src/ParallelBeamBlobKernelProjector2D.cpp src/ProjectionGeometry2D.cpp | ||||
| * | Make XML array handling consistent | Willem Jan Palenstijn | 2015-05-06 | 1 | -20/+2 |
| | | | | | | | | setContent and getContent were using different XML formats previously. | ||||
| * | Change XMLNode* to XMLNode | Willem Jan Palenstijn | 2015-05-06 | 6 | -42/+36 |
| | | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes. | ||||
| * | Fix bug in astra_mex_data3d('create') zero-initialization | Willem Jan Palenstijn | 2015-04-15 | 1 | -1/+1 |
| | |