diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2019-05-01 16:16:17 +0100 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2019-05-01 16:16:17 +0100 |
| commit | 67fa9b5a985912232d8b5aeeec12451ed55a1a7a (patch) | |
| tree | 780712c0d66cd8a4171c73429a91f5bc6c7b4456 /Wrappers/Python | |
| parent | da581e6061ebe206e007fe4378cc9d449b67d791 (diff) | |
| download | framework-67fa9b5a985912232d8b5aeeec12451ed55a1a7a.tar.gz framework-67fa9b5a985912232d8b5aeeec12451ed55a1a7a.tar.bz2 framework-67fa9b5a985912232d8b5aeeec12451ed55a1a7a.tar.xz framework-67fa9b5a985912232d8b5aeeec12451ed55a1a7a.zip | |
fix import
Diffstat (limited to 'Wrappers/Python')
| -rwxr-xr-x | Wrappers/Python/test/test_DataContainer.py | 5 | ||||
| -rw-r--r-- | Wrappers/Python/wip/compare_CGLS_algos.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Wrappers/Python/test/test_DataContainer.py b/Wrappers/Python/test/test_DataContainer.py index 8e8ab87..e92d4c6 100755 --- a/Wrappers/Python/test/test_DataContainer.py +++ b/Wrappers/Python/test/test_DataContainer.py @@ -455,6 +455,11 @@ class TestDataContainer(unittest.TestCase): self.assertTrue(False) except ValueError as ve: self.assertTrue(True) + + print ("test dot numpy") + n0 = (ds0 * ds1).sum() + n1 = ds0.as_array().ravel().dot(ds1.as_array().ravel()) + self.assertEqual(n0, n1) diff --git a/Wrappers/Python/wip/compare_CGLS_algos.py b/Wrappers/Python/wip/compare_CGLS_algos.py index 333805d..119752c 100644 --- a/Wrappers/Python/wip/compare_CGLS_algos.py +++ b/Wrappers/Python/wip/compare_CGLS_algos.py @@ -5,7 +5,7 @@ from ccpi.framework import ImageData, ImageGeometry, AcquisitionGeometry, \ AcquisitionData from ccpi.optimisation.algs import FISTA, FBPD, CGLS, SIRT -from ccpi.astra.ops import AstraProjectorSimple +from ccpi.astra.operators import AstraProjectorSimple from ccpi.optimisation.algorithms import CGLS as CGLSalg |