diff options
| author | epapoutsellis <epapoutsellis@gmail.com> | 2019-04-25 16:30:33 +0100 |
|---|---|---|
| committer | epapoutsellis <epapoutsellis@gmail.com> | 2019-04-25 16:30:33 +0100 |
| commit | b726c09f16c256daf92544668d2ff51bed3cf06f (patch) | |
| tree | 1162249b25a58fa0a69be7377c81162961162310 /Wrappers | |
| parent | fe9b3c9b99b39c6261a2c86dbfd7afa951c0c4c2 (diff) | |
| download | framework-b726c09f16c256daf92544668d2ff51bed3cf06f.tar.gz framework-b726c09f16c256daf92544668d2ff51bed3cf06f.tar.bz2 framework-b726c09f16c256daf92544668d2ff51bed3cf06f.tar.xz framework-b726c09f16c256daf92544668d2ff51bed3cf06f.zip | |
L2Norm fix memopt
Diffstat (limited to 'Wrappers')
| -rw-r--r-- | Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py b/Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py index 5490782..20e754e 100644 --- a/Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py +++ b/Wrappers/Python/ccpi/optimisation/functions/L2NormSquared.py @@ -94,12 +94,12 @@ class L2NormSquared(Function): return x/(1+2*tau) else: -# tmp = x.subtract(self.b) + tmp = x.subtract(self.b) # tmp -= self.b -# tmp /= (1+2*tau) -# tmp += self.b -# return tmp - return (x-self.b)/(1+2*tau) + self.b + tmp /= (1+2*tau) + tmp += self.b + return tmp +# return (x-self.b)/(1+2*tau) + self.b # if self.b is not None: # out=x |