diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2019-04-01 17:00:50 +0100 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2019-04-01 17:00:50 +0100 |
| commit | 2b483605262a756a3bbbcab689f1e6db6e36b8d3 (patch) | |
| tree | 71ac83c2a2baa5abe35e2966bd9fb328439cd874 | |
| parent | ad4ba705e2c9265c829c00ff96306070bf045988 (diff) | |
| download | framework-2b483605262a756a3bbbcab689f1e6db6e36b8d3.tar.gz framework-2b483605262a756a3bbbcab689f1e6db6e36b8d3.tar.bz2 framework-2b483605262a756a3bbbcab689f1e6db6e36b8d3.tar.xz framework-2b483605262a756a3bbbcab689f1e6db6e36b8d3.zip | |
fixed tests
| -rwxr-xr-x | Wrappers/Python/test/test_algorithms.py | 1 | ||||
| -rwxr-xr-x | Wrappers/Python/test/test_run_test.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Wrappers/Python/test/test_algorithms.py b/Wrappers/Python/test/test_algorithms.py index b5959b5..a35ffc1 100755 --- a/Wrappers/Python/test/test_algorithms.py +++ b/Wrappers/Python/test/test_algorithms.py @@ -86,6 +86,7 @@ class TestAlgorithms(unittest.TestCase): identity = TomoIdentity(geometry=ig) norm2sq = Norm2sq(identity, b) + norm2sq.L = 2 * norm2sq.c * identity.norm()**2 opt = {'tol': 1e-4, 'memopt':False} alg = FISTA(x_init=x_init, f=norm2sq, g=None, opt=opt) alg.max_iteration = 2 diff --git a/Wrappers/Python/test/test_run_test.py b/Wrappers/Python/test/test_run_test.py index 3c7d9ab..8cef925 100755 --- a/Wrappers/Python/test/test_run_test.py +++ b/Wrappers/Python/test/test_run_test.py @@ -9,7 +9,7 @@ from ccpi.framework import AcquisitionGeometry from ccpi.optimisation.algs import FISTA from ccpi.optimisation.algs import FBPD from ccpi.optimisation.funcs import Norm2sq -from ccpi.optimisation.funcs import ZeroFun +from ccpi.optimisation.functions import ZeroFun from ccpi.optimisation.funcs import Norm1 from ccpi.optimisation.funcs import TV2D from ccpi.optimisation.funcs import Norm2 |