diff scripts/optimization/sqp.m @ 7399:c1a3d6c7d2fb

[project @ 2008-01-18 07:37:35 by jwe]
author jwe
date Fri, 18 Jan 2008 07:37:35 +0000
parents 90b931a40617
children 32c1c3a3b07c
line wrap: on
line diff
--- a/scripts/optimization/sqp.m	Fri Jan 18 05:47:59 2008 +0000
+++ b/scripts/optimization/sqp.m	Fri Jan 18 07:37:35 2008 +0000
@@ -503,7 +503,7 @@
 
   endif
 
-### endfunction
+endfunction
 
 
 function [merit, obj] = phi_L1 (obj, obj_fun, ce_fun, ci_fun, x, mu)
@@ -529,7 +529,7 @@
     merit += t;
   endif
 
-### endfunction
+endfunction
 
 
 function [x_new, alpha, obj] = linesearch_L1 (x, p, obj_fun, obj_grd,
@@ -585,7 +585,7 @@
 
   x_new = x + alpha * p;
 
-### endfunction
+endfunction
 
 
 function report (iter, qp_iter, alpha, nfun, obj)
@@ -596,7 +596,7 @@
     printf ("%5d %4d %8.1g %5d %13.6e\n", iter, qp_iter, alpha, nfun, obj);
   endif
 
-### endfunction
+endfunction
 
 
 function grd = fdgrd (f, x)
@@ -616,7 +616,7 @@
     grd = zeros (0, 1);
   endif
 
-### endfunction
+endfunction
 
 
 function jac = fdjac (f, x)
@@ -637,7 +637,7 @@
     jac = zeros  (0, nx);
   endif
 
-### endfunction
+endfunction
 
 
 function grd = fd_obj_grd (x)
@@ -646,21 +646,21 @@
 
   grd = fdgrd (__sqp_obj_fun__, x);
 
-### endfunction
+endfunction
 
 
 function res = empty_cf (x)
 
   res = zeros (0, 1);
 
-### endfunction
+endfunction
 
 
 function res = empty_jac (x)
 
   res = zeros (0, length (x));
 
-### endfunction
+endfunction
 
 
 function jac = fd_ce_jac (x)
@@ -669,7 +669,7 @@
 
   jac = fdjac (__sqp_ce_fun__, x);
 
-### endfunction
+endfunction
 
 
 function jac = fd_ci_jac (x)
@@ -678,7 +678,7 @@
   ## __sqp_cifcn__ = constraint function without gradients and lb or ub
   jac = fdjac (__sqp_cifcn__, x);
 
-### endfunction
+endfunction
 
 
 function res = cf_ub_lb (x)
@@ -692,7 +692,7 @@
     res = [feval(__sqp_cifcn__,x); x-__sqp_lb__; __sqp_ub__-x];
   endif
 
-### endfunction
+endfunction
 
 
 function res = cigrad_ub_lb (x)
@@ -711,7 +711,7 @@
     res = [feval(cigradfcn,x); eye(numel(x)); -eye(numel(x))];
   endif
 
-### endfunction
+endfunction
 
 %!function r = g (x)
 %!  r = [sumsq(x)-10;