summaryrefslogtreecommitdiffstats
path: root/Wrappers/Python
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2019-03-14 14:53:59 +0000
committerEdoardo Pasca <edo.paskino@gmail.com>2019-03-14 14:53:59 +0000
commit11af3e2d27d521f1305eb6622d5d614449e7378e (patch)
tree8975d98172d8febf7bff46730e2eb196e4c85335 /Wrappers/Python
parent86efea890fd591c3b67a07aa308f8f6fa26de3b1 (diff)
downloadframework-11af3e2d27d521f1305eb6622d5d614449e7378e.tar.gz
framework-11af3e2d27d521f1305eb6622d5d614449e7378e.tar.bz2
framework-11af3e2d27d521f1305eb6622d5d614449e7378e.tar.xz
framework-11af3e2d27d521f1305eb6622d5d614449e7378e.zip
removed composition_with
Diffstat (limited to 'Wrappers/Python')
-rw-r--r--Wrappers/Python/ccpi/optimisation/functions/mixed_L12Norm.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/Wrappers/Python/ccpi/optimisation/functions/mixed_L12Norm.py b/Wrappers/Python/ccpi/optimisation/functions/mixed_L12Norm.py
index 8fe8620..ffeb32e 100644
--- a/Wrappers/Python/ccpi/optimisation/functions/mixed_L12Norm.py
+++ b/Wrappers/Python/ccpi/optimisation/functions/mixed_L12Norm.py
@@ -10,8 +10,6 @@ import numpy as np
#from ccpi.optimisation.funcs import Function
from ccpi.optimisation.functions import Function
from ccpi.framework import DataContainer, ImageData, ImageGeometry
-from ccpi.optimisation.functions.FunctionOperatorComposition import FunctionOperatorComposition
-
############################ mixed_L1,2NORM FUNCTIONS #############################
class mixed_L12Norm(Function):
@@ -56,11 +54,3 @@ class mixed_L12Norm(Function):
res = x.divide((ImageData(x.power(2).sum(axis=0)).sqrt()/self.alpha).maximum(1.0))
return res
-
- def composition_with(self, operator):
-
- if self.b is None:
- return FunctionOperatorComposition(operator, mixed_L12Norm(self.alpha))
- else:
- return FunctionOperatorComposition(operator, mixed_L12Norm(self.alpha, b=self.b))
-