summaryrefslogtreecommitdiffstats
path: root/Wrappers
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2019-04-12 12:11:49 +0100
committerEdoardo Pasca <edo.paskino@gmail.com>2019-04-12 12:11:49 +0100
commit60f73fe79526dc61d721b2dc76a942f2e9a082d1 (patch)
tree5a1e85d289eeea1271934f10ff2bd0f789ac4f6f /Wrappers
parent04c3f99648e38756e8180519db5f32ac3344ea2b (diff)
downloadframework-60f73fe79526dc61d721b2dc76a942f2e9a082d1.tar.gz
framework-60f73fe79526dc61d721b2dc76a942f2e9a082d1.tar.bz2
framework-60f73fe79526dc61d721b2dc76a942f2e9a082d1.tar.xz
framework-60f73fe79526dc61d721b2dc76a942f2e9a082d1.zip
uses new Algebra of BDC
Diffstat (limited to 'Wrappers')
-rwxr-xr-xWrappers/Python/ccpi/optimisation/functions/MixedL21Norm.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Wrappers/Python/ccpi/optimisation/functions/MixedL21Norm.py b/Wrappers/Python/ccpi/optimisation/functions/MixedL21Norm.py
index a655e03..c5be084 100755
--- a/Wrappers/Python/ccpi/optimisation/functions/MixedL21Norm.py
+++ b/Wrappers/Python/ccpi/optimisation/functions/MixedL21Norm.py
@@ -99,8 +99,9 @@ class MixedL21Norm(Function):
else:
res1 = functools.reduce(lambda a,b: a + b*b, x.containers, x.get_item(0) * 0 )
res = res1.sqrt().maximum(1.0)
- for i,el in enumerate(x.containers):
- el.divide(res, out=out.get_item(i))
+ x.divide(res, out=out)
+ #for i,el in enumerate(x.containers):
+ # el.divide(res, out=out.get_item(i))
def __rmul__(self, scalar):
return ScaledFunction(self, scalar)