summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorepapoutsellis <epapoutsellis@gmail.com>2019-04-07 22:41:10 +0100
committerepapoutsellis <epapoutsellis@gmail.com>2019-04-07 22:41:10 +0100
commitac82594858c278685ff7b99a4bfe42385966fba2 (patch)
tree52177572feb0f96cf7ffa494a0bf922fdfcb88ed
parent02b5c1521cf810321a7e93714648dd955272043f (diff)
downloadframework-ac82594858c278685ff7b99a4bfe42385966fba2.tar.gz
framework-ac82594858c278685ff7b99a4bfe42385966fba2.tar.bz2
framework-ac82594858c278685ff7b99a4bfe42385966fba2.tar.xz
framework-ac82594858c278685ff7b99a4bfe42385966fba2.zip
fix prox conjugate
-rw-r--r--Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py b/Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py
index 889d703..f96c7a1 100644
--- a/Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py
+++ b/Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py
@@ -119,7 +119,7 @@ class L2NormSquared(Function):
if out is None:
if self.b is not None:
# change the order cannot add ImageData + NestedBlock
- return (-1* tau*self.b + x)/(1 + tau/2)
+ return (x - tau*self.b)/(1 + tau/2)
else:
return x/(1 + tau/2 )
else: