summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2017-10-30 11:35:19 +0000
committerEdoardo Pasca <edo.paskino@gmail.com>2018-01-19 14:26:06 +0000
commit43b6f16ea68523f9d13457b17b44181222f1e6c1 (patch)
tree99a74cfd07fd173e8fb813286fb24855510a234f /src
parentb34327044a63d5f4029727509c96074dbdbaf246 (diff)
downloadregularization-43b6f16ea68523f9d13457b17b44181222f1e6c1.tar.gz
regularization-43b6f16ea68523f9d13457b17b44181222f1e6c1.tar.bz2
regularization-43b6f16ea68523f9d13457b17b44181222f1e6c1.tar.xz
regularization-43b6f16ea68523f9d13457b17b44181222f1e6c1.zip
regularization parameter is divided by Lipschitz constant
as 09f9bf9828c39bcdd870cfefbcb52e61451802eb
Diffstat (limited to 'src')
-rw-r--r--src/Python/ccpi/reconstruction/FISTAReconstructor.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Python/ccpi/reconstruction/FISTAReconstructor.py b/src/Python/ccpi/reconstruction/FISTAReconstructor.py
index 0607003..0a66e67 100644
--- a/src/Python/ccpi/reconstruction/FISTAReconstructor.py
+++ b/src/Python/ccpi/reconstruction/FISTAReconstructor.py
@@ -602,7 +602,10 @@ class FISTAReconstructor():
regularizer = self.getParameter('regularizer')
if regularizer is not None:
- return regularizer(input=X)
+ lc = self.getParameter('Lipschitz_constant')
+ reg_par = regularizer.getParameter('regularization_parameter') / lc
+ return regularizer(input=X,
+ regularization_parameter = reg_par)
else:
return X