From 11af3e2d27d521f1305eb6622d5d614449e7378e Mon Sep 17 00:00:00 2001 From: Edoardo Pasca Date: Thu, 14 Mar 2019 14:53:59 +0000 Subject: removed composition_with --- Wrappers/Python/ccpi/optimisation/functions/mixed_L12Norm.py | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'Wrappers/Python') 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)) - -- cgit v1.2.3