diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2019-04-12 15:16:06 +0100 |
|---|---|---|
| committer | Edoardo Pasca <edo.paskino@gmail.com> | 2019-04-12 15:16:06 +0100 |
| commit | 9c4776d7da4a599755badf018292d54317a2817b (patch) | |
| tree | d53afedc17dbd135d6717f06622f5eedacea367c /Wrappers/Python | |
| parent | 9ede79fb417bdbbb21e94045af16d62c366e35ee (diff) | |
| download | framework-9c4776d7da4a599755badf018292d54317a2817b.tar.gz framework-9c4776d7da4a599755badf018292d54317a2817b.tar.bz2 framework-9c4776d7da4a599755badf018292d54317a2817b.tar.xz framework-9c4776d7da4a599755badf018292d54317a2817b.zip | |
scaled function proximal conjugate uses out
Diffstat (limited to 'Wrappers/Python')
| -rwxr-xr-x | Wrappers/Python/ccpi/optimisation/functions/ScaledFunction.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Wrappers/Python/ccpi/optimisation/functions/ScaledFunction.py b/Wrappers/Python/ccpi/optimisation/functions/ScaledFunction.py index 464b944..3fbb858 100755 --- a/Wrappers/Python/ccpi/optimisation/functions/ScaledFunction.py +++ b/Wrappers/Python/ccpi/optimisation/functions/ScaledFunction.py @@ -61,7 +61,8 @@ class ScaledFunction(object): if out is None:
return self.scalar * self.function.proximal_conjugate(x/self.scalar, tau/self.scalar)
else:
- out.fill(self.scalar*self.function.proximal_conjugate(x/self.scalar, tau/self.scalar))
+ self.function.proximal_conjugate(x/self.scalar, tau/self.scalar, out=out)
+ out *= self.scalar
def grad(self, x):
'''Alias of gradient(x,None)'''
|