summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Memhandle (#136)Edoardo Pasca2018-09-298-133/+1200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added inplace algebra correctly * readded object to AcquisitionGeometry and ImageGeometry * Add more memory management * added unary and binary operations to DataContainer * Added unary and binary operations added also unittest * added unittest * added unit tests for binary operators * bugfixes and remove prints * dafault initialisation behaviour not to deep_copy * FISTA to use the efficient memory handling additions * add calls with input out=None Starts to address #134 * add methods with arg out=None * add test for memhandle * major bugfix after removal of create_image_data * fixed FISTA memhandle * some bugfix in FISTA and funcs ops * debug in progress * Fixed several bugs in memory optimised code Added methods allocate_adjoint and allocate_direct to Operator. * test with cvx and adjustments * fixed unittest, need to fix inline algebra * fixed inline algebra definition * initial cvxpy unittest * adds cvx demo as unit test closes #150 check equality of cvx calculated with respect to FISTA and FBDP
* Add SIRT and Box constraints (#125)jakobsj2018-09-184-0/+270
| | | | | | * Quick prototype of SIRT with nonnegativity added * Add indicator function for boxconstrint in SIRT and FISTA with demo
* replaces in with explicit test (#141)Edoardo Pasca2018-08-151-2/+3
| | | closes #139
* add scipy as dependency (#138)Edoardo Pasca2018-08-151-0/+1
|
* added alias to prox and grad (#130)Edoardo Pasca2018-07-311-3/+5
|
* Added copy as alias of clone, use copy in algs (#131)Edoardo Pasca2018-07-312-4/+7
| | | closes #126
* move padder to plugins (#121)Edoardo Pasca2018-05-152-106/+0
|
* Cvx (#118)jakobsj2018-05-083-3/+253
| | | | | | | | * add CVX test script * Add L1 and TV CVX and denoising. TV FBPD bug. * Fix TV2D bug and update cvx demo
* Remove already moved files (#116)jakobsj2018-05-084-666/+0
|
* Merge pull request #115 from vais-ral/remove_camelcasejakobsj2018-04-271-8/+8
|\ | | | | removes camelcase
| * fix camel case inputsJakob Jorgensen2018-04-271-4/+4
| |
| * removes camelcaseEdoardo Pasca2018-04-241-4/+4
| | | | | | | | addresses #107
* | Ip removal (#109)jakobsj2018-04-244-168/+0
|/ | | | | | * Removing IP data and files. Still in IP_parking branch. #102 * Also remove IP pyc file
* move demo to plugins (#112)Edoardo Pasca2018-04-241-181/+0
|
* Merge pull request #108 from vais-ral/fix_tv_fbpdjakobsj2018-04-231-6/+4
|\ | | | | Fix ordering #106
| * Fix ordering #106Jakob Jorgensen2018-04-231-6/+4
|/
* Simple comma bugfixJakob Jorgensen2018-04-231-1/+1
|
* Merge pull request #105 from vais-ral/demo_cleanupjakobsj2018-04-192-2/+33
|\ | | | | Demo cleanup
| * added angle_unit to AcquisitionGeometryEdoardo Pasca2018-04-171-0/+1
| |
| * few fixes cleaning the simple_demo_ccpiEdoardo Pasca2018-04-172-2/+32
| |
* | Merge pull request #104 from vais-ral/add_processorsjakobsj2018-04-171-0/+495
|\| | | | | added processors.py
| * added processors.pyEdoardo Pasca2018-04-171-0/+495
|/ | | | closes #100
* Merge pull request #101 from vais-ral/opti_initjakobsj2018-04-121-0/+18
|\ | | | | Added init file in optimisation to make package
| * Added init file in optimisation to make packageJakob Jorgensen2018-04-121-0/+18
|/
* update aboutEdoardo Pasca2018-04-111-2/+2
|
* renamed DataSetProcessor to DataProcessor (#99)Edoardo Pasca2018-04-111-18/+18
|
* Merge pull request #90 from vais-ral/doc_optijakobsj2018-04-113-21/+65
|\ | | | | First opti doc
| * Replaced BaseFunction by FunctionJakob Jorgensen2018-04-112-11/+11
| |
| * Updated READMEJakob Jorgensen2018-04-101-4/+6
| |
| * Replaces .fun in funcs by .__call__Jakob Jorgensen2018-04-102-7/+7
| |
| * First opti docJakob Jorgensen2018-04-091-3/+45
|/
* initial work on docsEdoardo Pasca2018-04-051-0/+48
|
* removed unused recipe (#89)Edoardo Pasca2018-04-043-46/+0
|
* updated licenseEdoardo Pasca2018-04-041-13/+3
|
* Rename (#88)Edoardo Pasca2018-04-048-946/+21
| | | | | | | | | | | | | | | | | | | | * create optimisation package * renamed to framework * added FiniteDiff2D operator * fixed dependencies * fix import packages * added ccpiops.py and move processors.py * updated imports * renamed but not split * Removed reconstruction as moved to optimisation
* Move astra (#85)Edoardo Pasca2018-03-287-608/+20
| | | | | | | | | | | | * removed astra stuff * removed astra and added dependency on ccpi-reconstruction * removed astra test * renamed to ccpi-framework * little changes to demo
* Simple demo ip (#79)jakobsj2018-03-225-540/+107
| | | | | | | | | | * Removed regularizers * DemoIP running. MC Lipschitz incorrect * Fixed MC Lipschitz * Removed old import
* Merge pull request #82 from vais-ral/demo_diamondjakobsj2018-03-223-12/+203
|\ | | | | Demo diamond
| * bugfix: use get_acquisition_dataEdoardo Pasca2018-03-221-15/+3
| |
| * reasonable long runEdoardo Pasca2018-03-211-72/+67
| |
| * initial revisionEdoardo Pasca2018-03-211-0/+198
| |
| * bugfix, cor undefinedEdoardo Pasca2018-03-211-1/+1
| |
| * fix and begin to change to lower_caseEdoardo Pasca2018-03-211-11/+21
| |
* | Working 2D sophiabeads demo ASTRA (#81)jakobsj2018-03-213-3/+68
|/
* Ccpi forward backprojector (#77)Edoardo Pasca2018-03-217-91/+1183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added simple test for SinogramData * initial version of processors This contains a version of a simple normalization algorithm. * added default pixel size = 1 (mm) * Added FindCenter of rotation for parallel beam geometry closes #5 * WIP for ccpi forward/backprojectors * WIP * Added Forward and Backprojectors from ccpi added processor to pad acquisition data to center on center of rotation. requires update of ccpi-reconstruction. * Added simple_demo_ccpi.py Currently there is a problem with the order of the axis after a projection/backprojection with the ccpi operator. In the calculation of the PowerMethod there is a wrong order of the axis. Possibly the creation of the data should be handled by the operator. * fixed calculation of power method * further work * fixed the x_init for the FISTA example * fixed ccpi FISTA demo * Fix missing subset call for display * Added create_image_data method to AstraOperatorSimple * Stack direction 0, not 2, in TV * Added finite different forward processor * wip * add io to setup.py * wip * comment out FiniteDifferentiator * uniformed algorithm interface Added some docstring. Added parsing of opt. * removed ccpi.io * little changes * fix setupCCPiGeometries * added simple astra demo * use minimal size for example
* add io to setup.py (#80)Edoardo Pasca2018-03-211-1/+1
|
* Merge pull request #74 from vais-ral/iojakobsj2018-03-163-0/+444
|\ | | | | Io
| * Readers return AcquisitionData along with GeometrySrikanth Nagella2018-03-161-12/+3
| |
| * Diamond and Xtek ReadersSrikanth Nagella2018-03-163-0/+453
| |
* | Renaming astra (#65)Edoardo Pasca2018-03-152-16/+16
| | | | | | | | | | | | * added test at conda build * use lower_case in geometry methods