aboutsummaryrefslogtreecommitdiff
path: root/Optimization/tvqc_newton.m
diff options
context:
space:
mode:
authorEugeniy E. Mikhailov <evgmik@gmail.com>2021-01-29 16:29:19 -0500
committerEugeniy E. Mikhailov <evgmik@gmail.com>2021-01-29 16:43:25 -0500
commit08d3232bdcbada58ffe9d20c6924b7e55aeeafda (patch)
treee3c94b2ed8bb95f79dd0f06ad09644f8a912ab43 /Optimization/tvqc_newton.m
parent3983eb46023c1edd00617729ba929057fda8d0bd (diff)
downloadl1magic-08d3232bdcbada58ffe9d20c6924b7e55aeeafda.tar.gz
l1magic-08d3232bdcbada58ffe9d20c6924b7e55aeeafda.zip
Small fix to make code Matlab 2020 compatible
variables and function names should be different
Diffstat (limited to 'Optimization/tvqc_newton.m')
-rw-r--r--Optimization/tvqc_newton.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/Optimization/tvqc_newton.m b/Optimization/tvqc_newton.m
index febe8ff..f7ca330 100644
--- a/Optimization/tvqc_newton.m
+++ b/Optimization/tvqc_newton.m
@@ -79,7 +79,7 @@ while (~done)
w1p = ntgx - Dh'*(Dhx.*(sig12./sig22).*ntgt) - Dv'*(Dvx.*(sig12./sig22).*ntgt);
if (largescale)
- h11pfun = @(z) H11p(z, A, At, Dh, Dv, Dhx, Dvx, sigb, ft, fe, Atr);
+ h11pfun = @(z) H11pFun(z, A, At, Dh, Dv, Dhx, Dvx, sigb, ft, fe, Atr);
[dx, cgres, cgiter] = cgsolve(h11pfun, w1p, cgtol, cgmaxiter, 0);
if (cgres > 1/2)
disp('Cannot solve system. Returning previous iterate. (See Section 4 of notes for more information.)');
@@ -164,7 +164,7 @@ end
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% H11p auxiliary function
-function y = H11p(v, A, At, Dh, Dv, Dhx, Dvx, sigb, ft, fe, atr)
+function y = H11pFun(v, A, At, Dh, Dv, Dhx, Dvx, sigb, ft, fe, atr)
Dhv = Dh*v;
Dvv = Dv*v;