From 85171b24b4bddf18b82a4fd5fd6e2bfe16f0afbf Mon Sep 17 00:00:00 2001
From: epapoutsellis <epapoutsellis@gmail.com>
Date: Mon, 15 Apr 2019 17:26:30 +0100
Subject: change grad & prox
---
Wrappers/Python/ccpi/optimisation/algorithms/FISTA.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'Wrappers')
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)))
--
cgit v1.2.3