summaryrefslogtreecommitdiffstats
path: root/src/Python/ccpi
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2017-10-30 11:35:19 +0000
committerEdoardo Pasca <edo.paskino@gmail.com>2017-10-30 11:35:19 +0000
commit1a7d0382db817b5d35f3f45516301cc8003d9b2f (patch)
treeebf9f71d0d3b570670aab7de3943f51588497e0a /src/Python/ccpi
parent1a7bac65a199a8dccface95f5eebfef5ec70a8ff (diff)
downloadregularization-1a7d0382db817b5d35f3f45516301cc8003d9b2f.tar.gz
regularization-1a7d0382db817b5d35f3f45516301cc8003d9b2f.tar.bz2
regularization-1a7d0382db817b5d35f3f45516301cc8003d9b2f.tar.xz
regularization-1a7d0382db817b5d35f3f45516301cc8003d9b2f.zip
regularization parameter is divided by Lipschitz constant
as 09f9bf9828c39bcdd870cfefbcb52e61451802eb
Diffstat (limited to 'src/Python/ccpi')
-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