diff options
| author | epapoutsellis <epapoutsellis@gmail.com> | 2019-04-04 17:35:22 +0100 |
|---|---|---|
| committer | epapoutsellis <epapoutsellis@gmail.com> | 2019-04-04 17:35:22 +0100 |
| commit | 7a35a4c8d29455bb268b1e6f01f923c81f9c863a (patch) | |
| tree | 323ecee0f02846efb6ee774a07320474c723480f | |
| parent | 6922cdc16cf1a852c07adea49b7792f68d1ffe37 (diff) | |
| download | framework-7a35a4c8d29455bb268b1e6f01f923c81f9c863a.tar.gz framework-7a35a4c8d29455bb268b1e6f01f923c81f9c863a.tar.bz2 framework-7a35a4c8d29455bb268b1e6f01f923c81f9c863a.tar.xz framework-7a35a4c8d29455bb268b1e6f01f923c81f9c863a.zip | |
reverse add order proximal conjugate
| -rw-r--r-- | Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py b/Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py index 597d4d8..889d703 100644 --- a/Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py +++ b/Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py @@ -80,7 +80,8 @@ class L2NormSquared(Function): tmp = 0 if self.b is not None: - tmp = (self.b * x).sum() +# tmp = (self.b * x).sum() + tmp = (x * self.b).sum() if out is None: # FIXME: this is a number @@ -117,7 +118,8 @@ class L2NormSquared(Function): if out is None: if self.b is not None: - return (x - tau*self.b)/(1 + tau/2) + # change the order cannot add ImageData + NestedBlock + return (-1* tau*self.b + x)/(1 + tau/2) else: return x/(1 + tau/2 ) else: |