From 02b5c1521cf810321a7e93714648dd955272043f Mon Sep 17 00:00:00 2001 From: epapoutsellis Date: Sun, 7 Apr 2019 22:40:10 +0100 Subject: fix pdgap for function composition --- Wrappers/Python/ccpi/optimisation/algorithms/PDHG.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Wrappers/Python') diff --git a/Wrappers/Python/ccpi/optimisation/algorithms/PDHG.py b/Wrappers/Python/ccpi/optimisation/algorithms/PDHG.py index 94b0bde..df53e57 100644 --- a/Wrappers/Python/ccpi/optimisation/algorithms/PDHG.py +++ b/Wrappers/Python/ccpi/optimisation/algorithms/PDHG.py @@ -140,18 +140,18 @@ def PDHG_old(f, g, operator, tau = None, sigma = None, opt = None, **kwargs): y_old = y # if isinstance(f, FunctionOperatorComposition): - p1 = f(x) + g(x) +# p1 = f(x) + g(x) # else: -# p1 = f(operator.direct(x)) + g(x) - d1 = -(f.convex_conjugate(y) + g(-1*operator.adjoint(y))) - pd1 = p1 - d1 +# p1 = f(operator.direct(x)) + g(x) +# d1 = -(f.convex_conjugate(y) + g(-1*operator.adjoint(y))) +# pd1 = p1 - d1 - primal.append(p1) - dual.append(d1) - pdgap.append(pd1) +# primal.append(p1) +# dual.append(d1) +# pdgap.append(pd1) - if i%100==0: - print(p1, d1, pd1) +# if i%100==0: +# print(p1, d1, pd1) # if isinstance(f, FunctionOperatorComposition): # p1 = f(x) + g(x) # else: -- cgit v1.2.3