aboutsummaryrefslogtreecommitdiff
path: root/Optimization/tvdantzig_newton.m
diff options
context:
space:
mode:
Diffstat (limited to 'Optimization/tvdantzig_newton.m')
-rw-r--r--Optimization/tvdantzig_newton.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/Optimization/tvdantzig_newton.m b/Optimization/tvdantzig_newton.m
index 68d7148..b60b173 100644
--- a/Optimization/tvdantzig_newton.m
+++ b/Optimization/tvdantzig_newton.m
@@ -88,7 +88,7 @@ while (~done)
w11 = ntgx - Dh'*(Dhx.*(sig12./sig22).*ntgt) - Dv'*(Dvx.*(sig12./sig22).*ntgt);
if (largescale)
- h11pfun = @(w) H11p(w, A, At, Dh, Dv, Dhx, Dvx, sigb, ft, siga);
+ h11pfun = @(w) H11pFun(w, A, At, Dh, Dv, Dhx, Dvx, sigb, ft, siga);
[dx, cgres, cgiter] = cgsolve(h11pfun, w11, cgtol, cgmaxiter, 0);
if (cgres > 1/2)
disp('Cannot solve system. Returning previous iterate. (See Section 4 of notes for more information.)');
@@ -173,7 +173,7 @@ end
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% H11p auxiliary function
-function y = H11p(v, A, At, Dh, Dv, Dhx, Dvx, sigb, ft, siga)
+function y = H11pFun(v, A, At, Dh, Dv, Dhx, Dvx, sigb, ft, siga)
Dhv = Dh*v;
Dvv = Dv*v;