diff options
| author | epapoutsellis <epapoutsellis@gmail.com> | 2019-04-15 17:26:30 +0100 |
|---|---|---|
| committer | epapoutsellis <epapoutsellis@gmail.com> | 2019-04-15 17:26:30 +0100 |
| commit | 85171b24b4bddf18b82a4fd5fd6e2bfe16f0afbf (patch) | |
| tree | b410118e56993d5737450bb90e74b8e3a8b98c4d /Wrappers/Python | |
| parent | bac56c8103bd70e6e343d4a1495df85b6491b62b (diff) | |
| download | framework-85171b24b4bddf18b82a4fd5fd6e2bfe16f0afbf.tar.gz framework-85171b24b4bddf18b82a4fd5fd6e2bfe16f0afbf.tar.bz2 framework-85171b24b4bddf18b82a4fd5fd6e2bfe16f0afbf.tar.xz framework-85171b24b4bddf18b82a4fd5fd6e2bfe16f0afbf.zip | |
change grad & prox
Diffstat (limited to 'Wrappers/Python')
| -rwxr-xr-x | Wrappers/Python/ccpi/optimisation/algorithms/FISTA.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Wrappers/Python/ccpi/optimisation/algorithms/FISTA.py b/Wrappers/Python/ccpi/optimisation/algorithms/FISTA.py index 93ba178..dbe8174 100755 --- a/Wrappers/Python/ccpi/optimisation/algorithms/FISTA.py +++ b/Wrappers/Python/ccpi/optimisation/algorithms/FISTA.py @@ -106,9 +106,9 @@ class FISTA(Algorithm): else: - u = self.y - self.invL*self.f.grad(self.y) + u = self.y - self.invL*self.f.gradient(self.y) - self.x = self.g.prox(u,self.invL) + self.x = self.g.proximal(u,self.invL) self.t = 0.5*(1 + numpy.sqrt(1 + 4*(self.t_old**2))) |