pass current solution to callback, fix PDHG setup

2 files changed, 7 insertions, 2 deletions

diff --git a/Wrappers/Python/ccpi/optimisation/algorithms/Algorithm.py b/Wrappers/Python/ccpi/optimisation/algorithms/Algorithm.py
index ed95c3f..7604c8a 100755
--- a/Wrappers/Python/ccpi/optimisation/algorithms/Algorithm.py
+++ b/Wrappers/Python/ccpi/optimisation/algorithms/Algorithm.py
@@ -151,7 +151,7 @@ class Algorithm(object):
                        self.max_iteration, self.get_last_objective()) )
             else:
                 if callback is not None:
-                    callback(self.iteration, self.get_last_objective())
+                    callback(self.iteration, self.get_last_objective(), self.x)
             i += 1
             if i == iterations:
                 break
diff --git a/Wrappers/Python/ccpi/optimisation/algorithms/PDHG.py b/Wrappers/Python/ccpi/optimisation/algorithms/PDHG.py
index bc080f8..bc3059b 100644
--- a/Wrappers/Python/ccpi/optimisation/algorithms/PDHG.py
+++ b/Wrappers/Python/ccpi/optimisation/algorithms/PDHG.py
@@ -37,7 +37,12 @@ class PDHG(Algorithm):
 
     def set_up(self, f, g, operator, tau = None, sigma = None, opt = None, **kwargs):
         # algorithmic parameters
-            
+        self.operator = operator
+        self.f = f
+        self.g = g
+        self.tau = tau
+        self.sigma = sigma
+        self.opt = opt
         if sigma is None and tau is None:
             raise ValueError('Need sigma*tau||K||^2<1')