X-Git-Url: http://gitweb.michael.orlitzky.com/?p=octave.git;a=blobdiff_plain;f=optimization%2Ftest_functions%2Fwood_hessian1.m;h=4af006a785994a697242ab3083576de7158126ed;hp=60d98544724801228bf2d52003cf8a508fed0604;hb=b12c6c2a4bf4cef29b2e08b743c92889505c7ed9;hpb=87d434fa93b3e52e8a5a0a9d99ae43492c35e1be

diff --git a/optimization/test_functions/wood_hessian1.m b/optimization/test_functions/wood_hessian1.m
index 60d9854..4af006a 100644
--- a/optimization/test_functions/wood_hessian1.m
+++ b/optimization/test_functions/wood_hessian1.m
@@ -1,24 +1,12 @@
 function H = wood_hessian1(x)
-  ##
-  ## A version of the wood_hessian() function which takes a column
-  ## 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;
+  %
+  % A version of the wood_hessian() function which takes a column
+  % 4-vector instead of four distinct arguments. See wood_hessian.m
+  % for more information.
+  %
+  if (length(x) == 4)
+    H = wood_hessian(x(1), x(2), x(3), x(4));
+  else
+    H = NA;
+  end
 end