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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge origin/composite_operator_datacontainer into demos	Edoardo Pasca	2019-06-13	3	-18/+48
\|\ \| \| \| \| \| \| \| \|	Conflicts: Wrappers/Python/ccpi/framework/framework.py
\| *	Merge pull request #309 from vais-ral/dot_fix	Edoardo Pasca	2019-06-13	1	-2/+2
\| \|\ \| \| \| \| \| \|	replace default for dot by numpy
\| \| *	replace default for dot by numpy	Jakob Jorgensen, WS at HMXIF	2019-06-12	1	-2/+2
\| \| \|
\| * \|	Merge pull request #315 from vais-ral/evelinaametova-patch-1	evelinaametova	2019-06-13	1	-4/+2
\| \|\ \ \| \| \| \| \| \| \| \|	Update NEXUSDataReader.py
\| \| * \|	Update NEXUSDataReader.py	evelinaametova	2019-06-13	1	-4/+2
\| \|/ /
\| * \|	Merge pull request #314 from vais-ral/data_readers_fix	evelinaametova	2019-06-13	3	-14/+47
\| \|\ \ \| \| \|/ \| \|/\|	fix None values in Reader/ Wrirer
\| \| *	fix None values in Reader/ Wrirer	Evelina Ametova	2019-06-13	3	-14/+47
\| \|/
* \|	Merge pull request #313 from vais-ral/update_fix_test	Edoardo Pasca	2019-06-13	11	-82/+450
\|\ \ \| \| \| \| \| \|	Update fix test
\| * \	Merge remote branch 'update_fix_test'	Edoardo Pasca	2019-06-13	2	-13/+16
\| \|\ \
\| \| * \|	fix test import	Edoardo Pasca	2019-06-13	2	-13/+16
\| \| \| \|
\| * \| \|	remove check isnan which fails with BlockDataContainers	Edoardo Pasca	2019-06-13	1	-3/+1
\| \|/ /
\| * \|	added test	Edoardo Pasca	2019-06-13	2	-19/+44
\| \|\ \
\| \| * \|	demo cmp fista, cgls, cvx, grdesc	epapoutsellis	2019-06-13	1	-12/+37
\| \| \| \|
\| * \| \|	play around with test	Edoardo Pasca	2019-06-13	2	-17/+35
\| \|/ /
\| * \|	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
\| \|\ \
\| * \| \|	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 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
\| \| \| \| \| \|
* \| \| \| \| \|	Delete FiniteDifferenceOperator_old.py	Edoardo Pasca	2019-06-13	1	-374/+0
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	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
\| \|_\|/ / \|/\| \| \|
* \| \| \|	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
\| \| \| \|