diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2019-03-21 16:23:58 +0000 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2019-03-21 16:24:02 +0000 |
| commit | 4f4303a5d49e8d330442c74d710b98bd14bb78c0 (patch) | |
| tree | 0e2977deeb2a168c72da675ba30ae16b744409f8 | |
| parent | 27ea6509eaa294529c86567bf50def2d27966bb7 (diff) | |
| download | framework-4f4303a5d49e8d330442c74d710b98bd14bb78c0.tar.gz framework-4f4303a5d49e8d330442c74d710b98bd14bb78c0.tar.bz2 framework-4f4303a5d49e8d330442c74d710b98bd14bb78c0.tar.xz framework-4f4303a5d49e8d330442c74d710b98bd14bb78c0.zip | |
add out
| -rw-r--r-- | Wrappers/Python/ccpi/optimisation/functions/FunctionOperatorComposition.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Wrappers/Python/ccpi/optimisation/functions/FunctionOperatorComposition.py b/Wrappers/Python/ccpi/optimisation/functions/FunctionOperatorComposition.py index 3ac4358..34b7e35 100644 --- a/Wrappers/Python/ccpi/optimisation/functions/FunctionOperatorComposition.py +++ b/Wrappers/Python/ccpi/optimisation/functions/FunctionOperatorComposition.py @@ -37,17 +37,17 @@ class FunctionOperatorComposition(Function): ''' convex_conjugate does not take into account the Operator''' return self.function.convex_conjugate(x) - def proximal(self, x, tau): + def proximal(self, x, tau, out=None): - ''' proximal does not take into account the Operator''' + '''proximal does not take into account the Operator''' - return self.function.proximal(x, tau, out=None) + return self.function.proximal(x, tau, out=out) def proximal_conjugate(self, x, tau, out=None): ''' proximal conjugate does not take into account the Operator''' - return self.function.proximal_conjugate(x, tau) + return self.function.proximal_conjugate(x, tau, out=out) def gradient(self, x, out=None): |