summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fixed tests and py27 quirksEdoardo Pasca2019-03-064-18/+38
|
* conda recipe conditional for testingvagrant2019-03-062-4/+5
|
* removed default before positionalEdoardo Pasca2019-03-061-18/+9
|
* fix named argument before *argsEdoardo Pasca2019-03-062-32/+51
|
* python 2.7 fixEdoardo Pasca2019-03-051-1/+1
|
* code refactoring and unittest for block containerEdoardo Pasca2019-03-059-277/+586
|
* Merge branch 'composite_operator_datacontainer' of ↵Edoardo Pasca2019-03-013-476/+114
|\ | | | | | | https://github.com/vais-ral/CCPi-ReconstructionFramework into composite_operator_datacontainer
| * delete Algorithms.pyEdoardo Pasca2019-03-011-362/+0
| |
| * Merge branch 'master' into composite_operator_datacontainerEdoardo Pasca2019-02-2822-1295/+1881
| |\ | | | | | | | | | | | | | | | | | | Conflicts: Wrappers/Python/ccpi/optimisation/ops.py Wrappers/Python/conda-recipe/run_test.py Wrappers/Python/setup.py
| | * removed dos line endingEdoardo Pasca2019-02-281-28/+28
| | |
| | * removed line endingsEdoardo Pasca2019-02-281-86/+86
| | |
* | | renamed to Block...Edoardo Pasca2019-03-013-106/+22
| | |
* | | Merge branch 'master' into composite_operator_datacontainerEdoardo Pasca2019-03-0121-1294/+1889
|\ \ \ | |/ / |/| |
| * | removed gitattributesEdoardo Pasca2019-03-011-1/+0
| |/
| * Proposal of Algorithm class (#179)Edoardo Pasca2019-02-2818-1131/+1903
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial revision * Removed class members of Algorithm class added update_objective * initial version. Fix inline __idiv__ * First implementation of CompositeOperator/DataContainer * removed __getitem__ added get_item added shape * added CGLS * working unit test, initial tomography test * added reverse multiplication of operator with number * added operators directory * fixed typo * added unittest for CompositeDataContainer * fix TomoIdentity with scalar * check numerical types from numpy * add default stop criterion and run method * add run method * first working implementation of CGLS with CompositeOperator/DataContainer notice problem with _rmul_ and _mul_ methods precedence with numpy. * new Algorithm class and algorithms in separate files Added new Algorithm class and derivatives in different files for GradientDescent, CGLS, FBPD, FISTA * added algorithms and restored CIL_VERSION env variable * removed Algorithms.py * modified run and renamed a few members/methods * uses squared_norm * renamed get_current_objective to get_last_objective update_objective can be issued every N iteration, default 1. fixed run method to run N iterations within the stop criterion. * load class as module files * force py line endings to LF * updates * call super __init__ as first thing * unit tests are now to be found in test directory unit tests are now split in several files in the directory test * install algorithms module * Implementation with Algorithm * skip Reader tests * unittest for linux * commented not needed import Iterable * removed explicit return from __init__ * remove composite operator file
| * added squared_norm (#204)Edoardo Pasca2019-02-275-16/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * added squared_norm closes #203 * added norm and squared_norm closes #203 * Power method uses norm, bugfixes * fix power method
| * add norm to DataContainer (#195)Edoardo Pasca2019-02-151-0/+4
| |
| * Merge pull request #186 from vais-ral/colourbay_initial_demojakobsj2019-02-142-7/+7
| |\ | | | | | | Colourbay initial demo
| | * Merge branch 'master' into colourbay_initial_demojakobsj2019-02-1420-282/+2951
| | |\ | | |/ | |/|
| | * Updated paths in IMAT whitebeam scriptJakob Jorgensen, WS at HMXIF2019-02-141-4/+4
| | |
| | * Change local pathsJakob Jorgensen, WS at HMXIF2018-09-242-7/+8
| | |
| | * some updates to demoalgol2018-08-231-6/+7
| | |
| | * script to reconstruct multi-channel imat data updatedDaniil Kazantsev2018-08-221-163/+115
| | |
| | * IMAT data multichannel script startedDaniil Kazantsev2018-08-141-0/+198
| | |
| | * corrections to normalization and log with zeroes in flatsDaniil Kazantsev2018-08-141-7/+17
| | |
| | * Added IMAT white-beam demo loading summed fits filesJakob Jorgensen, WS at HMXIF2018-07-311-0/+128
| | |
| | * Added working demo of colourbay data load and recon.Jakob Jorgensen, WS at HMXIF2018-07-311-0/+137
| | |
* | | first working implementation of CGLS with CompositeOperator/DataContainerEdoardo Pasca2019-02-201-646/+818
| | | | | | | | | | | | notice problem with _rmul_ and _mul_ methods precedence with numpy.
* | | add run methodEdoardo Pasca2019-02-201-0/+6
| | |
* | | add default stop criterion and run methodEdoardo Pasca2019-02-201-7/+9
| | |
* | | check numerical types from numpyEdoardo Pasca2019-02-201-1/+8
| | |
* | | fix TomoIdentity with scalarEdoardo Pasca2019-02-181-8/+8
| | |
* | | added unittest for CompositeDataContainerEdoardo Pasca2019-02-181-0/+176
| | |
* | | fixed typoEdoardo Pasca2019-02-181-2/+2
| | |
* | | added operators directoryEdoardo Pasca2019-02-181-1/+1
| | |
* | | added reverse multiplication of operator with numberEdoardo Pasca2019-02-181-5/+32
| | |
* | | working unit test, initial tomography testEdoardo Pasca2019-02-181-130/+54
| | |
* | | added CGLSEdoardo Pasca2019-02-181-0/+50
| | |
* | | removed __getitem__ added get_item added shapeEdoardo Pasca2019-02-171-97/+170
| | |
* | | First implementation of CompositeOperator/DataContainerEdoardo Pasca2019-02-162-25/+17
| | |
* | | initial version. Fix inline __idiv__Edoardo Pasca2019-02-151-0/+661
| | |
* | | Removed class members of Algorithm classEdoardo Pasca2019-02-131-27/+33
| | | | | | | | | | | | added update_objective
* | | initial revisionEdoardo Pasca2019-02-111-0/+298
|/ /
* | Update README.mdvais-ral2019-01-291-1/+5
| |
* | Merge pull request #177 from TomasKulhanek/mastervais-ral2019-01-294-44/+7
|\ \ | | | | | | Universal build script
| * \ Merge branch 'master' into masterTomas Kulhanek2019-01-282-7/+11
| |\ \ | |/ / |/| |
* | | UPDATE: CIL VERSION needs to be set (#173)Tomas Kulhanek2019-01-115-5/+59
| | | | | | | | | | | | | | | | | | | | | | | | * UPDATE: CIL VERSION needs to be set * UPDATE: jenkins build and variants * UPDATE: channels conda-forge and ccpi
* | | Norm2sq does not fail if cannot calculate Lipschitz constantEdoardo Pasca2019-01-081-5/+9
| | |
* | | added L member to FunctionEdoardo Pasca2019-01-081-1/+1
| | |
| * | UPDATEKulhanek2019-01-282-1/+4
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 20:58:54 +0000