csa/tomo/tnv/framework.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	demo cmp fista, cgls, cvx, grdesc	epapoutsellis	2019-06-13	1	-12/+37
\|
*	fix Vector import	Edoardo Pasca	2019-06-13	1	-1/+1
\|
*	removed unused files	Edoardo Pasca	2019-06-13	3	-131/+0
\|
*	test binary divide speedup is tested on 10 consecutive divisions	Edoardo Pasca	2019-06-13	1	-10/+13
\|
*	Merge remote-tracking branch 'origin/demos' into update_fix_test	Edoardo Pasca	2019-06-13	13	-1713/+15
\|\
\| *	delete old demos	epapoutsellis	2019-06-12	7	-1265/+0
\| \|
\| *	fix demos	epapoutsellis	2019-06-12	2	-8/+8
\| \|
\| *	delete old demo	epapoutsellis	2019-06-12	2	-195/+1
\| \|
\| *	delete old demo	epapoutsellis	2019-06-12	1	-245/+0
\| \|
\| *	add random	epapoutsellis	2019-06-12	1	-0/+6
\| \|
* \|	trying to fix python2.7 import	Edoardo Pasca	2019-06-13	2	-2/+100
\| \|
* \|	moved import	Edoardo Pasca	2019-06-12	1	-1/+2
\| \|
* \|	Merge branch 'demos' into update_fix_test	Edoardo Pasca	2019-06-12	35	-1284/+2101
\|\\|
\| *	Merge branch 'composite_operator_datacontainer' into demos	Edoardo Pasca	2019-06-12	6	-1/+843
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Wrappers/Python/ccpi/processors/__init__.py
\| \| *	Merge pull request #308 from vais-ral/fix_io_imports	Edoardo Pasca	2019-06-12	3	-6/+2
\| \| \|\ \| \| \| \| \| \| \| \|	fix imports in io
\| \| \| *	fix imports in io	Edoardo Pasca	2019-06-12	3	-6/+2
\| \| \|/
\| \| *	Merge pull request #307 from vais-ral/data_readers_merge	evelinaametova	2019-06-12	6	-1/+856
\| \| \|\ \| \| \| \| \| \| \| \|	data readers, writer, resizer to composite_data_container branch
\| \| \| *	data readers, writer, resizer to composite_data_container branch	Evelina Ametova	2019-06-12	6	-1/+856
\| \| \|/
\| * \|	Merge branch 'demos' of https://github.com/vais-ral/CCPi-Framework into demos	Edoardo Pasca	2019-06-12	1	-36/+28
\| \|\ \
\| \| * \	merge	epapoutsellis	2019-06-12	26	-224/+156
\| \| \|\ \
\| \| * \| \|	TGV tomophantom	epapoutsellis	2019-06-12	1	-36/+28
\| \| \| \| \|
\| * \| \| \|	removed DS_Store files	Edoardo Pasca	2019-06-12	3	-0/+0
\| \| \|/ / \| \|/\| \|
\| * \| \|	Merge pull request #303 from vais-ral/update_demo	Edoardo Pasca	2019-06-12	26	-224/+156
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	Update demos branch with latest composite_operator_datacontainer
\| \| * \|	Merge remote-tracking branch 'origin/demos' into update_demo	Edoardo Pasca	2019-06-12	26	-1257/+1240
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	delete old demos from wip	epapoutsellis	2019-06-12	7	-1212/+0
\| \| \| \|
\| * \| \|	delete old demos	epapoutsellis	2019-06-12	2	-373/+0
\| \| \| \|
\| * \| \|	tgv tomo	epapoutsellis	2019-06-12	1	-31/+51
\| \| \| \|
\| * \| \|	tomo 2d TV	epapoutsellis	2019-06-11	2	-0/+173
\| \| \| \|
\| * \| \|	merge	epapoutsellis	2019-06-11	6	-46/+436
\| \|\ \ \
\| \| * \| \|	add 2d time demo	epapoutsellis	2019-06-11	1	-14/+65
\| \| \| \| \|
\| \| * \| \|	fix tomophantom demo	epapoutsellis	2019-06-10	1	-11/+6
\| \| \| \| \|
\| \| * \| \|	merge demos	epapoutsellis	2019-06-10	20	-464/+1264
\| \| \|\ \ \
\| \| * \| \| \|	imat colorbay demos	epapoutsellis	2019-06-10	4	-21/+365
\| \| \| \| \| \|
\| * \| \| \| \|	tv tomo 2D	epapoutsellis	2019-06-11	2	-0/+173
\| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	demos with tomophantom	epapoutsellis	2019-06-10	2	-0/+344
\| \| \| \| \|
\| * \| \| \|	denoising exam with cvx cmp	epapoutsellis	2019-06-10	3	-5/+3
\| \| \| \| \|
\| * \| \| \|	color denoising	epapoutsellis	2019-06-05	1	-0/+115
\| \| \| \| \|
\| * \| \| \|	new phantom image	epapoutsellis	2019-06-05	3	-0/+373
\| \| \| \| \|
\| * \| \| \|	fista trials	epapoutsellis	2019-06-05	5	-79/+61
\| \| \| \| \|
* \| \| \| \|	Merge remote-tracking branch 'origin/fix_test' into update_fix_test	Edoardo Pasca	2019-06-07	11	-50/+403
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Wrappers/Python/ccpi/framework/__init__.py Wrappers/Python/ccpi/optimisation/algorithms/CGLS.py Wrappers/Python/ccpi/optimisation/algorithms/FISTA.py Wrappers/Python/ccpi/optimisation/operators/LinearOperatorMatrix.py Wrappers/Python/test/test_run_test.py
\| * \| \| \|	reinstated check of dimension_label None	Edoardo Pasca	2019-06-07	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	add memopt and some checks	Edoardo Pasca	2019-06-06	1	-2/+47
\| \| \| \| \|
\| * \| \| \|	add prints	Edoardo Pasca	2019-06-06	1	-23/+15
\| \| \| \| \|
\| * \| \| \|	add callback	Edoardo Pasca	2019-06-06	2	-18/+41
\| \| \| \| \|
\| * \| \| \|	fixed test	Edoardo Pasca	2019-06-05	4	-19/+35
\| \| \| \| \|
\| * \| \| \|	added example file	Edoardo Pasca	2019-06-04	1	-0/+133
\| \| \| \| \|
\| * \| \| \|	progress	Edoardo Pasca	2019-06-04	7	-12/+149
\| \| \| \| \|
\| * \| \| \|	fixing tests	Edoardo Pasca	2019-06-04	5	-98/+59
\| \| \| \| \|
* \| \| \| \|	Merge pull request #305 from vais-ral/config_alg	Edoardo Pasca	2019-06-07	9	-95/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Config alg
\| * \| \| \| \|	removed FBPD	Edoardo Pasca	2019-06-07	3	-85/+0
\| \| \| \| \| \|