Mercurial > octave
diff scripts/optimization/sqp.m @ 17245:7babcdb9bc13
Use ... instead of \ for line continuation marker.
* plotimages.m, bsxfun.cc, cellfun.cc, __unimplemented__.m,
importdata.m, textscan.m, edit.m, fsolve.m, sqp.m,
__gnuplot_drawnow__.m, __marching_cube__.m, stemleaf.m, polyfit.m,
z_test.m, z_test_2.m, test.m:
Use ... instead of \ for line continuation marker.
| author | Stefan Mahr <dac922@gmx.de> |
|---|---|
| date | Mon, 12 Aug 2013 17:36:54 +0200 |
| parents | c3c1ebfaa7dc |
| children | b81b9d079515 |
line wrap: on
line diff
--- a/scripts/optimization/sqp.m Wed Aug 14 02:07:07 2013 -0400 +++ b/scripts/optimization/sqp.m Mon Aug 12 17:36:54 2013 +0200 @@ -425,8 +425,8 @@ ## Choose mu such that p is a descent direction for the chosen ## merit function phi. - [x_new, alpha, obj_new, globals] = \ - linesearch_L1 (x, p, obj_fun, obj_grd, ce_fun, ci_fun, lambda, \ + [x_new, alpha, obj_new, globals] = ... + linesearch_L1 (x, p, obj_fun, obj_grd, ce_fun, ci_fun, lambda, ... obj, globals); ## Evaluate objective function, constraints, and gradients at x_new. @@ -520,7 +520,7 @@ endfunction -function [merit, obj, globals] = phi_L1 (obj, obj_fun, ce_fun, ci_fun, \ +function [merit, obj, globals] = phi_L1 (obj, obj_fun, ce_fun, ci_fun, ... x, mu, globals) ce = feval (ce_fun, x); @@ -545,8 +545,8 @@ endfunction -function [x_new, alpha, obj, globals] = \ - linesearch_L1 (x, p, obj_fun, obj_grd, ce_fun, ci_fun, lambda, \ +function [x_new, alpha, obj, globals] = ... + linesearch_L1 (x, p, obj_fun, obj_grd, ce_fun, ci_fun, lambda, ... obj, globals) ## Choose parameters @@ -570,7 +570,7 @@ c = feval (obj_grd, x); ce = feval (ce_fun, x); - [phi_x_mu, obj, globals] = phi_L1 (obj, obj_fun, ce_fun, ci_fun, x, \ + [phi_x_mu, obj, globals] = phi_L1 (obj, obj_fun, ce_fun, ci_fun, x, ... mu, globals); D_phi_x_mu = c' * p; @@ -584,7 +584,7 @@ endif while (1) - [p1, obj, globals] = phi_L1 ([], obj_fun, ce_fun, ci_fun, \ + [p1, obj, globals] = phi_L1 ([], obj_fun, ce_fun, ci_fun, ... x+alpha*p, mu, globals); p2 = phi_x_mu+eta*alpha*D_phi_x_mu; if (p1 > p2)