X-Git-Url: http://gitweb.michael.orlitzky.com/?p=octave.git;a=blobdiff_plain;f=optimization%2Ftest_functions%2Fwood_hessian1.m;h=106cb403aef60337b946767d7b82df8ab5adf19e;hp=60d98544724801228bf2d52003cf8a508fed0604;hb=8ed65c4235284698686734be82a9f073b90694d4;hpb=6cd387b2e42c3273c6cd48ad2e7e551bddd86474 diff --git a/optimization/test_functions/wood_hessian1.m b/optimization/test_functions/wood_hessian1.m index 60d9854..106cb40 100644 --- a/optimization/test_functions/wood_hessian1.m +++ b/optimization/test_functions/wood_hessian1.m @@ -4,21 +4,9 @@ function H = wood_hessian1(x) ## 4-vector instead of four distinct arguments. See wood_hessian.m ## for more information. ## - H = zeros(4,4); - H(1,1) = 1200*x(1)^2 - 400*x(2) + 2; - H(1,2) = -400*x(1); - H(1,3) = 0; - H(1,4) = 0; - H(2,1) = H(1,2); - H(2,2) = 220.2; - H(2,3) = 0; - H(2,4) = 19.8; - H(3,1) = H(1,3); - H(3,2) = H(2,3); - H(3,3) = 1080*x(3)^2 - 360*x(4) + 2; - H(3,4) = -360*x(3); - H(4,1) = H(1,4); - H(4,2) = H(2,4); - H(4,3) = H(3,4); - H(4,4) = 200.2; + if (length(x) == 4) + H = wood_hessian(x(1), x(2), x(3), x(4)); + else + H = NA; + end end