Mercurial > octave-nkf

changeset 7815:a41df65f3f00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add some single precision test code and fix resulting bugs
author David Bateman <dbateman@free.fr>
date Wed, 28 May 2008 01:03:35 +0200
parents 87865ed7405f
children ddecf2eb1910
files libcruft/ChangeLog libcruft/slatec-fn/xsgmainc.f scripts/ChangeLog scripts/general/interp1q.m src/DLD-FUNCTIONS/betainc.cc src/DLD-FUNCTIONS/gammainc.cc src/DLD-FUNCTIONS/gcd.cc src/data.cc src/mappers.cc src/ov-float.cc src/ov-flt-complex.cc src/ov-flt-cx-mat.cc src/ov-flt-cx-mat.h src/ov-flt-re-mat.cc test/ChangeLog test/test_arith.m test/test_func.m
diffstat 17 files changed, 1043 insertions(+), 583 deletions(-) [+]
line wrap: on
line diff
--- a/libcruft/ChangeLog	Mon Jun 02 16:57:45 2008 +0200
+++ b/libcruft/ChangeLog	Wed May 28 01:03:35 2008 +0200
@@ -1,3 +1,7 @@
+2008-06-02  David Bateman  <dbateman@free.fr>
+
+	* libcruft/xsgmainc.f: Replace DLGAMS with ALGAMS.
+
 2008-05-30  Thomas Treichl  <Thomas.Treichl@gmx.net>
 
 	* quadpack/qk15i.f: Delete extraneous semicolons.
--- a/libcruft/slatec-fn/xsgmainc.f	Mon Jun 02 16:57:45 2008 +0200
+++ b/libcruft/slatec-fn/xsgmainc.f	Wed May 28 01:03:35 2008 +0200
@@ -53,7 +53,7 @@
 C      RETURN
 C
  20   IF (X.GT.1.E0) GO TO 30
-      IF (A.GE.(-0.5E0) .OR. AEPS.NE.0.E0) CALL DLGAMS (A+1.0E0, ALGAP1,
+      IF (A.GE.(-0.5E0) .OR. AEPS.NE.0.E0) CALL ALGAMS (A+1.0E0, ALGAP1,
      1  SGNGAM)
 C      GAMIT = R9GMIT (A, X, ALGAP1, SGNGAM, ALX)
       result = exp (a*alx + log (R9GMIT (A, X, ALGAP1, SGNGAM, ALX)))
@@ -73,7 +73,7 @@
       H = 1.0E0
       IF (AEPS.EQ.0.E0 .AND. AINTA.LE.0.E0) GO TO 50
 C
-      CALL DLGAMS (A+1.0E0, ALGAP1, SGNGAM)
+      CALL ALGAMS (A+1.0E0, ALGAP1, SGNGAM)
       T = LOG (ABS(A)) + ALNG - ALGAP1
       IF (T.GT.ALNEPS) GO TO 60
 C
--- a/scripts/ChangeLog	Mon Jun 02 16:57:45 2008 +0200
+++ b/scripts/ChangeLog	Wed May 28 01:03:35 2008 +0200
@@ -1,3 +1,8 @@
+2008-06-02  David Bateman  <dbateman@free.fr>
+
+	* general/interp1q.m: Remove spaces between functions and args in
+	[]. Fix test code to actually test interp1q.
+
 2008-06-02  Jaroslav Hajek <highegg@gmail.com>
 
 	* strings/strcat.m: Add tests.
--- a/scripts/general/interp1q.m	Mon Jun 02 16:57:45 2008 +0200
+++ b/scripts/general/interp1q.m	Wed May 28 01:03:35 2008 +0200
@@ -53,18 +53,20 @@
   s = (xi - x (idx)) ./ dx (idx);
   yi (range, :) = s (:, ones (1, nc)) .* dy (idx, :) + y (idx, :);
   if (length (szx) == 2 && any (szx == 1))
-    yi = reshape (yi, [max (szx), szy (2 : end)]);
+    yi = reshape (yi, [max(szx), szy(2:end)]);
   else
     yi = reshape (yi, [szx, szy(2:end)]);
   endif
 endfunction
 
-%!shared xp, yp, xi
+%!shared xp, yp, xi, yi
 %! xp=[0:2:10].';      yp = sin(2*pi*xp/5);
 %! xi = [-1; 0; 2.2; 4; 6.6; 10; 11];
-%!assert (interp1(xp, yp, [min(xp)-1; max(xp)+1]), [NA; NA]);
-%!assert (interp1(xp,yp,xp), yp, 100*eps);
-%!assert (isempty(interp1(xp,yp,[])));
-%!assert (interp1(xp,[yp,yp],xi), [interp1(xp,yp,xi),interp1(xp,yp,xi)]);
-%!assert (interp1(xp,yp,[xi,xi]), [interp1(xp,yp,xi),interp1(xp,yp,xi)]);
-%!assert (interp1(xp,[yp,yp],[xi,xi]), [interp1(xp,yp,xi),interp1(xp,yp,xi)]);
+%! yi = interp1 (xp,yp,xi);
+%!assert (interp1q(xp, yp, [min(xp)-1; max(xp)+1]), [NA; NA]);
+%!assert (interp1q(xp,yp,xp), yp, 100*eps);
+%!assert (isempty(interp1q(xp,yp,[])));
+%!assert (interp1q(xp,yp,xi), yi);
+%!assert (interp1q(xp,[yp,yp],xi), [yi, yi]);
+%!assert (interp1q(xp,yp,[xi,xi]), [yi, yi]);
+%!assert (interp1q(xp,[yp,yp],[xi,xi]), cat (3, [yi, yi], [yi, yi]));
--- a/src/DLD-FUNCTIONS/betainc.cc	Mon Jun 02 16:57:45 2008 +0200
+++ b/src/DLD-FUNCTIONS/betainc.cc	Wed May 28 01:03:35 2008 +0200
@@ -281,6 +281,55 @@
 }
 
 /*
+
+%% test/octave.test/arith/betainc-1.m
+%!test
+%! a=[1, 1.5, 2, 3];
+%! b=[4, 3, 2, 1];
+%! v1=betainc(1,a,b);
+%! v2=[1,1,1,1];
+%! x = [.2, .4, .6, .8];
+%! v3=betainc(x, a, b);
+%! v4 = 1-betainc(1.-x, b, a);
+%! assert(v1, v2, sqrt(eps));
+%! assert(v3, v4, sqrt(eps));
+
+%% Single precision
+%!test
+%! a=single ([1, 1.5, 2, 3]);
+%! b=single ([4, 3, 2, 1]);
+%! v1=betainc(1,a,b);
+%! v2=single ([1,1,1,1]);
+%! x = single ([.2, .4, .6, .8]);
+%! v3=betainc(x, a, b);
+%! v4 = 1-betainc(1.-x, b, a);
+%! assert(v1, v2, sqrt(eps ('single')));
+%! assert(v3, v4, sqrt(eps ('single')));
+
+%% Mixed double/single precision
+%!test
+%! a=single ([1, 1.5, 2, 3]);
+%! b=[4, 3, 2, 1];
+%! v1=betainc(1,a,b);
+%! v2=single ([1,1,1,1]);
+%! x = [.2, .4, .6, .8];
+%! v3=betainc(x, a, b);
+%! v4 = 1-betainc(1.-x, b, a);
+%! assert(v1, v2, sqrt(eps ('single')));
+%! assert(v3, v4, sqrt(eps ('single')));
+
+%% test/octave.test/arith/betainc-2.m
+%!error <Invalid call to betainc.*> betainc();
+
+%% test/octave.test/arith/betainc-3.m
+%!error <Invalid call to betainc.*> betainc(1);
+
+%% test/octave.test/arith/betainc-4.m
+%!error <Invalid call to betainc.*> betainc(1,2);
+
+*/
+
+/*
 ;;; Local Variables: ***
 ;;; mode: C++ ***
 ;;; End: ***
--- a/src/DLD-FUNCTIONS/gammainc.cc	Mon Jun 02 16:57:45 2008 +0200
+++ b/src/DLD-FUNCTIONS/gammainc.cc	Wed May 28 01:03:35 2008 +0200
@@ -177,6 +177,24 @@
 }
 
 /*
+
+%!test
+%! a = [.5 .5 .5 .5 .5];
+%! x = [0 1 2 3 4];
+%! v1 = sqrt(pi)*erf(x)./gamma(a);
+%! v3 = gammainc(x.*x,a);
+%! assert(v1, v3, sqrt(eps));
+
+%!test
+%! a = single ([.5 .5 .5 .5 .5]);
+%! x = single([0 1 2 3 4]);
+%! v1 = sqrt(pi('single'))*erf(x)./gamma(a);
+%! v3 = gammainc(x.*x,a);
+%! assert(v1, v3, sqrt(eps('single')));
+
+*/
+
+/*
 ;;; Local Variables: ***
 ;;; mode: C++ ***
 ;;; End: ***
--- a/src/DLD-FUNCTIONS/gcd.cc	Mon Jun 02 16:57:45 2008 +0200
+++ b/src/DLD-FUNCTIONS/gcd.cc	Wed May 28 01:03:35 2008 +0200
@@ -26,6 +26,8 @@
 
 #include "dNDArray.h"
 #include "CNDArray.h"
+#include "fNDArray.h"
+#include "fCNDArray.h"
 #include "lo-mappers.h"
 
 #include "defun-dld.h"
@@ -40,6 +42,12 @@
   return x == std::floor (x);
 }
 
+static inline bool
+is_integer_value (float x)
+{
+  return x == std::floor (x);
+}
+
 DEFUN_DLD (gcd, args, nargout,
   "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{g} =} gcd (@var{a1}, @dots{})\n\
@@ -99,6 +107,7 @@
     }
 
   bool all_args_scalar = true;
+  bool any_single = false;
 
   dim_vector dv(1);
 
@@ -126,9 +135,196 @@
 		}
 	    }
 	}
+      if (!any_single && args(i).is_single_type ())
+	any_single = true;
     }
 
-  if (nargin == 1)
+  if (any_single)
+    {
+      if (nargin == 1)
+	{
+	  FloatNDArray gg = args(0).float_array_value ();
+
+	  int nel = dv.numel ();
+
+	  FloatNDArray v (dv);
+
+	  FloatRowVector x (3);
+	  FloatRowVector y (3);
+
+	  float g = std::abs (gg(0));
+
+	  if (! is_integer_value (g))
+	    {
+	      error ("gcd: all arguments must be integer");
+	      return retval;
+	    }
+
+	  v(0) = signum (gg(0));
+      
+	  for (int k = 1; k < nel; k++)
+	    {
+	      x(0) = g;
+	      x(1) = 1;
+	      x(2) = 0;
+
+	      y(0) = std::abs (gg(k));
+	      y(1) = 0;
+	      y(2) = 1;
+
+	      if (! is_integer_value (y(0)))
+		{
+		  error ("gcd: all arguments must be integer");
+		  return retval;
+		}
+
+	      while (y(0) > 0)
+		{
+		  FloatRowVector r = x - y * std::floor (x(0) / y(0));
+		  x = y;
+		  y = r;
+		}
+
+	      g = x(0);
+
+	      for (int i = 0; i < k; i++) 
+		v(i) *= x(1);
+
+	      v(k) = x(2) * signum (gg(k));
+	    }
+
+	  retval (1) = v;
+	  retval (0) = g;
+	}
+      else if (all_args_scalar && nargout < 3)
+	{
+	  float g = args(0).float_value ();
+
+	  if (error_state || ! is_integer_value (g))
+	    {
+	      error ("gcd: all arguments must be integer");
+	      return retval;
+	    }
+
+	  FloatRowVector v (nargin, 0);
+	  FloatRowVector x (3);
+	  FloatRowVector y (3);
+
+	  v(0) = signum (g);
+
+	  g = std::abs(g);
+      
+	  for (int k = 1; k < nargin; k++)
+	    {
+	      x(0) = g;
+	      x(1) = 1;
+	      x(2) = 0;
+
+	      y(0) = args(k).float_value ();
+	      y(1) = 0;
+	      y(2) = 1;
+
+	      float sgn = signum (y(0));
+
+	      y(0) = std::abs (y(0));
+
+	      if (error_state || ! is_integer_value (g))
+		{
+		  error ("gcd: all arguments must be integer");
+		  return retval;
+		}
+
+	      while (y(0) > 0)
+		{
+		  FloatRowVector r = x - y * std::floor (x(0) / y(0));
+		  x = y;
+		  y = r;
+		}
+
+	      g = x(0);
+
+	      for (int i = 0; i < k; i++) 
+		v(i) *= x(1);
+
+	      v(k) = x(2) * sgn;
+	    }
+
+	  retval (1) = v;
+	  retval (0) = g;
+	}
+      else
+	{
+	  // FIXME -- we need to handle a possible mixture of scalar and
+	  // array values here.
+
+	  FloatNDArray g = args(0).float_array_value ();
+
+	  OCTAVE_LOCAL_BUFFER (FloatNDArray, v, nargin);
+
+	  int nel = dv.numel ();
+
+	  v[0].resize(dv);
+
+	  for (int i = 0; i < nel; i++)
+	    {
+	      v[0](i) = signum (g(i));
+	      g(i) = std::abs (g(i));
+
+	      if (! is_integer_value (g(i)))
+		{
+		  error ("gcd: all arguments must be integer");
+		  return retval;
+		}
+	    }
+
+	  FloatRowVector x (3);
+	  FloatRowVector y (3);
+
+	  for (int k = 1; k < nargin; k++)
+	    {
+	      FloatNDArray gnew = args(k).float_array_value ();
+
+	      v[k].resize(dv);
+
+	      for (int n = 0; n < nel; n++)
+		{
+		  x(0) = g(n);
+		  x(1) = 1;
+		  x(2) = 0;
+
+		  y(0) = std::abs (gnew(n));
+		  y(1) = 0;
+		  y(2) = 1; 
+
+		  if (! is_integer_value (y(0)))
+		    {
+		      error ("gcd: all arguments must be integer");
+		      return retval;
+		    }
+
+		  while (y(0) > 0)
+		    {
+		      FloatRowVector r = x - y * std::floor (x(0) / y(0));
+		      x = y;
+		      y = r;
+		    }
+
+		  g(n) = x(0);
+
+		  for (int i = 0; i < k; i++) 
+		    v[i](n) *= x(1);
+
+		  v[k](n) = x(2) * signum (gnew(n));
+		}
+	    }
+
+	  for (int k = 0; k < nargin; k++)
+	    retval(1+k) = v[k];
+
+	  retval (0) = g;
+	}
+    }
+  else if (nargin == 1)
     {
       NDArray gg = args(0).array_value ();
 
@@ -315,6 +511,21 @@
 }
 
 /*
+
+%!assert(gcd (200, 300, 50, 35), gcd ([200, 300, 50, 35]))
+%!assert(gcd ([200, 300, 50, 35]), 5);
+%!assert(gcd (single(200), single(300), single(50), single(35)), gcd (single([200, 300, 50, 35])))
+%!assert(gcd (single([200, 300, 50, 35])), single(5));
+
+%!error <Invalid call to gcd.*> gcd ();
+
+%!test
+%! s.a = 1;
+%! fail("gcd (s)");
+
+ */
+
+/*
 ;;; Local Variables: ***
 ;;; mode: C++ ***
 ;;; End: ***
--- a/src/data.cc	Mon Jun 02 16:57:45 2008 +0200
+++ b/src/data.cc	Wed May 28 01:03:35 2008 +0200
@@ -702,8 +702,30 @@
 %!assert (size (atan2 (rand (2, 3, 4), 1)), [2, 3, 4])
 %!assert (size (atan2 (1, rand (2, 3, 4))), [2, 3, 4])
 %!assert (size (atan2 (1, 2)), [1, 1])
+
+%!test
+%! rt2 = sqrt (2);
+%! rt3 = sqrt (3);
+%! v = [0, pi/6, pi/4, pi/3, -pi/3, -pi/4, -pi/6, 0];
+%! y = [0, rt3, 1, rt3, -rt3, -1, -rt3, 0];
+%! x = [1, 3, 1, 1, 1, 1, 3, 1];
+%! assert(atan2 (y, x), v, sqrt (eps));
+
+%!test
+%! rt2 = sqrt (2);
+%! rt3 = sqrt (3);
+%! v = single([0, pi/6, pi/4, pi/3, -pi/3, -pi/4, -pi/6, 0]);
+%! y = single([0, rt3, 1, rt3, -rt3, -1, -rt3, 0]);
+%! x = single([1, 3, 1, 1, 1, 1, 3, 1]);
+%! assert(atan2 (y, x), v, sqrt (eps('single')));
+
+%!error <Invalid call to atan2.*> atan2 ();
+%!error <Invalid call to atan2.*> atan2 (1, 2, 3);
+
 */
 
+
+
 DEFUN (hypot, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} hypot (@var{x}, @var{y})\n\
@@ -1249,6 +1271,7 @@
   int nargin = args.length (); \
  \
   bool isnative = false; \
+  bool isdouble = false; \
   \
   if (nargin > 1 && args(nargin - 1).is_string ()) \
     { \
@@ -1258,7 +1281,9 @@
 	{ \
 	  if (str == "native") \
 	    isnative = true; \
-	  else if (str != "double") /* Ignore double as no single type */ \
+	  else if (str == "double") \
+            isdouble = true; \
+          else \
 	    error ("sum: unrecognized string argument"); \
           nargin --; \
 	} \
@@ -1308,7 +1333,7 @@
                         { \
 			  error (#FCN, ": invalid char type"); \
 			} \
-		      else if (arg.is_single_type ()) \
+		      else if (!isdouble && arg.is_single_type ()) \
                         { \
 	                  if (arg.is_complex_type ()) \
 		            { \
@@ -1346,7 +1371,7 @@
 		          return retval; \
 		        } \
                     } \
-		  else if (arg.is_single_type ()) \
+		  else if (!isdouble && arg.is_single_type ()) \
 		    { \
 	              if (arg.is_real_type ()) \
 		        { \
@@ -1489,6 +1514,28 @@
   DATA_REDUCTION (cumprod);
 }
 
+/*
+
+%!assert (cumprod ([1, 2, 3]), [1, 2, 6]);
+%!assert (cumprod ([-1; -2; -3]), [-1; 2; -6]);
+%!assert (cumprod ([i, 2+i, -3+2i, 4]), [i, -1+2i, -1-8i, -4-32i]);
+%!assert (cumprod ([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i]), [1, 2, 3; i, 4i, 9i; -1+i, -8+8i, -27+27i]);
+
+%!assert (cumprod (single([1, 2, 3])), single([1, 2, 6]));
+%!assert (cumprod (single([-1; -2; -3])), single([-1; 2; -6]));
+%!assert (cumprod (single([i, 2+i, -3+2i, 4])), single([i, -1+2i, -1-8i, -4-32i]));
+%!assert (cumprod (single([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i])), single([1, 2, 3; i, 4i, 9i; -1+i, -8+8i, -27+27i]));
+
+%!error <Invalid call to cumprod.*> cumprod ();
+
+%!assert (cumprod ([2, 3; 4, 5], 1), [2, 3; 8, 15]);
+%!assert (cumprod ([2, 3; 4, 5], 2), [2, 6; 4, 20]);
+
+%!assert (cumprod (single([2, 3; 4, 5]), 1), single([2, 3; 8, 15]));
+%!assert (cumprod (single([2, 3; 4, 5]), 2), single([2, 6; 4, 20]));
+
+ */
+
 DEFUN (cumsum, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} cumsum (@var{x}, @var{dim})\n\
@@ -1503,6 +1550,28 @@
   DATA_REDUCTION (cumsum);
 }
 
+/*
+
+%!assert (cumsum ([1, 2, 3]), [1, 3, 6]);
+%!assert (cumsum ([-1; -2; -3]), [-1; -3; -6]);
+%!assert (cumsum ([i, 2+i, -3+2i, 4]), [i, 2+2i, -1+4i, 3+4i]);
+%!assert (cumsum ([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i]), [1, 2, 3; 1+i, 2+2i, 3+3i; 2+2i, 4+4i, 6+6i]);
+
+%!assert (cumsum (single([1, 2, 3])), single([1, 3, 6]));
+%!assert (cumsum (single([-1; -2; -3])), single([-1; -3; -6]));
+%!assert (cumsum (single([i, 2+i, -3+2i, 4])), single([i, 2+2i, -1+4i, 3+4i]));
+%!assert (cumsum (single([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i])), single([1, 2, 3; 1+i, 2+2i, 3+3i; 2+2i, 4+4i, 6+6i]));
+
+%!error <Invalid call to cumsum.*> cumsum ();
+
+%!assert (cumsum ([1, 2; 3, 4], 1), [1, 2; 4, 6]);
+%!assert (cumsum ([1, 2; 3, 4], 2), [1, 3; 3, 7]);
+
+%!assert (cumsum (single([1, 2; 3, 4]), 1), single([1, 2; 4, 6]));
+%!assert (cumsum (single([1, 2; 3, 4]), 2), single([1, 3; 3, 7]));
+
+ */
+
 DEFUN (diag, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} diag (@var{v}, @var{k})\n\
@@ -1598,6 +1667,52 @@
   DATA_REDUCTION (prod);
 }
 
+/*
+
+%!assert (prod ([1, 2, 3]), 6);
+%!assert (prod ([-1; -2; -3]), -6);
+%!assert (prod ([i, 2+i, -3+2i, 4]), -4 - 32i);
+%!assert (prod ([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i]), [-1+i, -8+8i, -27+27i]);
+
+%!assert (prod (single([1, 2, 3])), single(6));
+%!assert (prod (single([-1; -2; -3])), single(-6));
+%!assert (prod (single([i, 2+i, -3+2i, 4])), single(-4 - 32i));
+%!assert (prod (single([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i])), single([-1+i, -8+8i, -27+27i]));
+
+%!error <Invalid call to prod.*> prod ();
+
+%!assert (prod ([1, 2; 3, 4], 1), [3, 8]);
+%!assert (prod ([1, 2; 3, 4], 2), [2; 12]);
+%!assert (prod (zeros (1, 0)), 1);
+%!assert (prod (zeros (1, 0), 1), zeros (1, 0));
+%!assert (prod (zeros (1, 0), 2), 1);
+%!assert (prod (zeros (0, 1)), 1);
+%!assert (prod (zeros (0, 1), 1), 1);
+%!assert (prod (zeros (0, 1), 2), zeros (0, 1));
+%!assert (prod (zeros (2, 0)), zeros (1, 0));
+%!assert (prod (zeros (2, 0), 1), zeros (1, 0));
+%!assert (prod (zeros (2, 0), 2), [1; 1]);
+%!assert (prod (zeros (0, 2)), [1, 1]);
+%!assert (prod (zeros (0, 2), 1), [1, 1]);
+%!assert (prod (zeros (0, 2), 2), zeros(0, 1));
+
+%!assert (prod (single([1, 2; 3, 4]), 1), single([3, 8]));
+%!assert (prod (single([1, 2; 3, 4]), 2), single([2; 12]));
+%!assert (prod (zeros (1, 0, 'single')), single(1));
+%!assert (prod (zeros (1, 0, 'single'), 1), zeros (1, 0, 'single'));
+%!assert (prod (zeros (1, 0, 'single'), 2), single(1));
+%!assert (prod (zeros (0, 1, 'single')), single(1));
+%!assert (prod (zeros (0, 1, 'single'), 1), single(1));
+%!assert (prod (zeros (0, 1, 'single'), 2), zeros (0, 1, 'single'));
+%!assert (prod (zeros (2, 0, 'single')), zeros (1, 0, 'single'));
+%!assert (prod (zeros (2, 0, 'single'), 1), zeros (1, 0, 'single'));
+%!assert (prod (zeros (2, 0, 'single'), 2), single([1; 1]));
+%!assert (prod (zeros (0, 2, 'single')), single([1, 1]));
+%!assert (prod (zeros (0, 2, 'single'), 1), single([1, 1]));
+%!assert (prod (zeros (0, 2, 'single'), 2), zeros(0, 1, 'single'));
+
+ */
+
 static octave_value
 do_cat (const octave_value_list& args, std::string fname)
 {
@@ -2280,6 +2395,58 @@
 %!assert (sum(int8([127,10,-20])), 117);
 %!assert (sum(int8([127,10,-20]),'native'), int8(107));
 
+%!assert(sum ([1, 2, 3]), 6)
+%!assert(sum ([-1; -2; -3]), -6);
+%!assert(sum ([i, 2+i, -3+2i, 4]), 3+4i);
+%!assert(sum ([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i]), [2+2i, 4+4i, 6+6i]);
+
+%!assert(sum (single([1, 2, 3])), single(6))
+%!assert(sum (single([-1; -2; -3])), single(-6));
+%!assert(sum (single([i, 2+i, -3+2i, 4])), single(3+4i));
+%!assert(sum (single([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i])), single([2+2i, 4+4i, 6+6i]));
+
+%!error <Invalid call to sum.*> sum ();
+
+%!assert (sum ([1, 2; 3, 4], 1), [4, 6]);
+%!assert (sum ([1, 2; 3, 4], 2), [3; 7]);
+%!assert (sum (zeros (1, 0)), 0);
+%!assert (sum (zeros (1, 0), 1), zeros(1, 0));
+%!assert (sum (zeros (1, 0), 2), 0);
+%!assert (sum (zeros (0, 1)), 0);
+%!assert (sum (zeros (0, 1), 1), 0);
+%!assert (sum (zeros (0, 1), 2), zeros(0, 1));
+%!assert (sum (zeros (2, 0)),  zeros(1, 0));
+%!assert (sum (zeros (2, 0), 1), zeros(1, 0));
+%!assert (sum (zeros (2, 0), 2),  [0; 0]);
+%!assert (sum (zeros (0, 2)), [0, 0]);
+%!assert (sum (zeros (0, 2), 1), [0, 0]);
+%!assert (sum (zeros (0, 2), 2), zeros(0, 1));
+%!assert (sum (zeros (2, 2, 0, 3)), zeros(1, 2, 0, 3));
+%!assert (sum (zeros (2, 2, 0, 3), 2), zeros(2, 1, 0, 3));
+%!assert (sum (zeros (2, 2, 0, 3), 3), zeros(2, 2, 1, 3));
+%!assert (sum (zeros (2, 2, 0, 3), 4), zeros(2, 2, 0));
+%!assert (sum (zeros (2, 2, 0, 3), 7), zeros(2, 2, 0, 3));
+
+%!assert (sum (single([1, 2; 3, 4]), 1), single([4, 6]));
+%!assert (sum (single([1, 2; 3, 4]), 2), single([3; 7]));
+%!assert (sum (zeros (1, 0, 'single')), single(0));
+%!assert (sum (zeros (1, 0, 'single'), 1), zeros(1, 0, 'single'));
+%!assert (sum (zeros (1, 0, 'single'), 2), single(0));
+%!assert (sum (zeros (0, 1, 'single')), single(0));
+%!assert (sum (zeros (0, 1, 'single'), 1), single(0));
+%!assert (sum (zeros (0, 1, 'single'), 2), zeros(0, 1, 'single'));
+%!assert (sum (zeros (2, 0, 'single')),  zeros(1, 0, 'single'));
+%!assert (sum (zeros (2, 0, 'single'), 1), zeros(1, 0, 'single'));
+%!assert (sum (zeros (2, 0, 'single'), 2),  single([0; 0]));
+%!assert (sum (zeros (0, 2, 'single')), single([0, 0]));
+%!assert (sum (zeros (0, 2, 'single'), 1), single([0, 0]));
+%!assert (sum (zeros (0, 2, 'single'), 2), zeros(0, 1, 'single'));
+%!assert (sum (zeros (2, 2, 0, 3, 'single')), zeros(1, 2, 0, 3, 'single'));
+%!assert (sum (zeros (2, 2, 0, 3, 'single'), 2), zeros(2, 1, 0, 3, 'single'));
+%!assert (sum (zeros (2, 2, 0, 3, 'single'), 3), zeros(2, 2, 1, 3, 'single'));
+%!assert (sum (zeros (2, 2, 0, 3, 'single'), 4), zeros(2, 2, 0, 'single'));
+%!assert (sum (zeros (2, 2, 0, 3, 'single'), 7), zeros(2, 2, 0, 3, 'single'));
+
 */
 
 DEFUN (sumsq, args, ,
@@ -2301,6 +2468,26 @@
   DATA_REDUCTION (sumsq);
 }
 
+/*
+
+%!assert(sumsq ([1, 2, 3]), 14)
+%!assert(sumsq ([-1; -2; 4i]), 21);
+%!assert(sumsq ([1, 2, 3; 2, 3, 4; 4i, 6i, 2]), [21, 49, 29]);
+
+%!assert(sumsq (single([1, 2, 3])), single(14))
+%!assert(sumsq (single([-1; -2; 4i])), single(21));
+%!assert(sumsq (single([1, 2, 3; 2, 3, 4; 4i, 6i, 2])), single([21, 49, 29]));
+
+%!error <Invalid call to sumsq.*> sumsq ();
+
+%!assert (sumsq ([1, 2; 3, 4], 1), [10, 20]);
+%!assert (sumsq ([1, 2; 3, 4], 2), [5; 25]);
+
+%!assert (sumsq (single([1, 2; 3, 4]), 1), single([10, 20]));
+%!assert (sumsq (single([1, 2; 3, 4]), 2), single([5; 25]));
+
+ */
+
 DEFUN (islogical, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} islogical (@var{x})\n\
@@ -2319,6 +2506,20 @@
 
 DEFALIAS (isbool, islogical);
 
+/*
+
+%!assert (islogical(true), true)
+%!assert (islogical(false), true)
+%!assert (islogical([true, false]), true)
+%!assert (islogical(1), false)
+%!assert (islogical(1i), false)
+%!assert (islogical([1,1]), false)
+%!assert (islogical(single(1)), false)
+%!assert (islogical(single(1i)), false)
+%!assert (islogical(single([1,1])), false)
+
+ */
+
 DEFUN (isinteger, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} isinteger (@var{x})\n\
--- a/src/mappers.cc	Mon Jun 02 16:57:45 2008 +0200
+++ b/src/mappers.cc	Wed May 28 01:03:35 2008 +0200
@@ -68,6 +68,25 @@
   return retval;
 }
 
+/*
+
+%!assert(abs (1), 1);
+%!assert(abs (-3.5), 3.5);
+%!assert(abs (3+4i), 5);
+%!assert(abs (3-4i), 5);
+%!assert(abs ([1.1, 3i; 3+4i, -3-4i]), [1.1, 3; 5, 5]);
+
+%!assert(abs (single(1)), single(1));
+%!assert(abs (single(-3.5)), single(3.5));
+%!assert(abs (single(3+4i)), single(5));
+%!assert(abs (single(3-4i)), single(5));
+%!assert(abs (single([1.1, 3i; 3+4i, -3-4i])), single([1.1, 3; 5, 5]));
+
+%!error abs ();
+%!error abs (1, 2);
+
+ */
+
 DEFUN (acos, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} acos (@var{x})\n\
@@ -83,6 +102,26 @@
   return retval;
 }
 
+/*
+
+%!test
+%! rt2 = sqrt (2);
+%! rt3 = sqrt (3);
+%! v = [0, pi/6, pi/4, pi/3, pi/2, 2*pi/3, 3*pi/4, 5*pi/6, pi];
+%! x = [1, rt3/2, rt2/2, 1/2, 0, -1/2, -rt2/2, -rt3/2, -1];
+%! assert(acos (x), v, sqrt(eps));
+
+%!test
+%! rt2 = sqrt (2);
+%! rt3 = sqrt (3);
+%! v = single ([0, pi/6, pi/4, pi/3, pi/2, 2*pi/3, 3*pi/4, 5*pi/6, pi]);
+%! x = single ([1, rt3/2, rt2/2, 1/2, 0, -1/2, -rt2/2, -rt3/2, -1]);
+%! assert(acos (x), v, sqrt(eps('single')));
+
+%!error acos ();
+%!error acos (1, 2);
+
+*/
 
 DEFUN (acosh, args, ,
     "-*- texinfo -*-\n\
@@ -99,6 +138,23 @@
   return retval;
 }
 
+/*
+
+%!test
+%! v = [0, pi/2*i, pi*i, pi/2*i];
+%! x = [1, 0, -1, 0];
+%! assert(acosh (x), v, sqrt(eps));
+
+%!test
+%! v = single([0, pi/2*i, pi*i, pi/2*i]);
+%! x = single([1, 0, -1, 0]);
+%! assert(acosh (x), v, sqrt (eps('single')));
+
+%!error acosh ();
+%!error acosh (1, 2);
+
+*/
+
 DEFUN (angle, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} angle (@var{z})\n\
@@ -149,6 +205,25 @@
   return retval;
 }
 
+/*
+
+%!assert(arg (1), 0);
+%!assert(arg (i), pi/2);
+%!assert(arg (-1), pi);
+%!assert(arg (-i), -pi/2);
+%!assert(arg ([1, i; -1, -i]), [0, pi/2; pi, -pi/2]);
+
+%!assert(arg (single(1)), single(0));
+%!assert(arg (single(i)), single(pi/2));
+%!assert(arg (single(-1)), single(pi));
+%!assert(arg (single(-i)), single(-pi/2));
+%!assert(arg (single([1, i; -1, -i])), single([0, pi/2; pi, -pi/2]));
+
+%!error arg ();
+%!error arg (1, 2);
+
+*/
+
 DEFUN (asin, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} asin (@var{x})\n\
@@ -190,6 +265,23 @@
   return retval;
 }
 
+/*
+
+%!test
+%! v = [0, pi/2*i, 0, -pi/2*i];
+%! x = [0, i, 0, -i];
+%! assert(asinh (x), v,  sqrt (eps));
+
+%!test
+%! v = single([0, pi/2*i, 0, -pi/2*i]);
+%! x = single([0, i, 0, -i]);
+%! assert(asinh (x), v,  sqrt (eps('single')));
+
+%!error asinh ();
+%!error asinh (1, 2);
+
+*/
+
 DEFUN (atan, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} atan (@var{x})\n\
@@ -205,6 +297,27 @@
   return retval;
 }
 
+/*
+
+%!test
+%! rt2 = sqrt (2);
+%! rt3 = sqrt (3);
+%! v = [0, pi/6, pi/4, pi/3, -pi/3, -pi/4, -pi/6, 0];
+%! x = [0, rt3/3, 1, rt3, -rt3, -1, -rt3/3, 0];
+%! assert(atan (x), v, sqrt (eps));
+
+%!test
+%! rt2 = sqrt (2);
+%! rt3 = sqrt (3);
+%! v = single([0, pi/6, pi/4, pi/3, -pi/3, -pi/4, -pi/6, 0]);
+%! x = single([0, rt3/3, 1, rt3, -rt3, -1, -rt3/3, 0]);
+%! assert(atan (x), v, sqrt (eps('single')));
+
+%!error atan ();
+%!error atan (1, 2);
+
+ */
+
 DEFUN (atanh, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} atanh (@var{x})\n\
@@ -220,6 +333,23 @@
   return retval;
 }
 
+/*
+
+%!test
+%! v = [0, 0];
+%! x = [0, 0];
+%! assert(atanh (x), v, sqrt (eps));
+
+%!test
+%! v = single([0, 0]);
+%! x = single([0, 0]);
+%! assert(atanh (x), v, sqrt (eps('single')));
+
+%!error atanh ();
+%!error atanh (1, 2);
+
+*/
+
 DEFUN (ceil, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} ceil (@var{x})\n\
@@ -236,6 +366,25 @@
   return retval;
 }
 
+/*
+
+%% double precision
+%!assert(ceil ([2, 1.1, -1.1, -1]), [2, 2, -1, -1]);
+
+%% compelx double precison 
+%!assert(ceil ([2+2i, 1.1+1.1i, -1.1-1.1i, -1-i]), [2+2i, 2+2i, -1-i, -1-i]);
+
+%% single precision
+%!assert(ceil (single([2, 1.1, -1.1, -1])), single([2, 2, -1, -1]));
+
+%% compelx single preci
+%!assert(ceil (single ([2+2i, 1.1+1.1i, -1.1-1.1i, -1-i])), single([2+2i, 2+2i, -1-i, -1-i]));
+
+%!error ceil ();
+%!error ceil (1, 2);
+
+*/
+
 DEFUN (conj, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} conj (@var{z})\n\
@@ -260,6 +409,25 @@
   return retval;
 }
 
+/*
+
+%!assert(conj (1), 1);
+%!assert(conj (i), -i)
+%!assert(conj (1+i), 1-i)
+%!assert(conj (1-i), 1+i)
+%!assert(conj ([-1, -i; -1+i, -1-i]), [-1, i; -1-i, -1+i]);
+
+%!assert(conj (single(1)), single(1));
+%!assert(conj (single(i)), single(-i))
+%!assert(conj (single(1+i)), single(1-i))
+%!assert(conj (single(1-i)), single(1+i))
+%!assert(conj (single([-1, -i; -1+i, -1-i])), single([-1, i; -1-i, -1+i]));
+
+%!error conj ();
+%!error conj (1, 2);
+
+*/
+
 DEFUN (cos, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} cos (@var{x})\n\
@@ -275,6 +443,27 @@
   return retval;
 }
 
+/*
+
+%!test
+%! rt2 = sqrt (2);
+%! rt3 = sqrt (3);
+%! x = [0, pi/6, pi/4, pi/3, pi/2, 2*pi/3, 3*pi/4, 5*pi/6, pi];
+%! v = [1, rt3/2, rt2/2, 1/2, 0, -1/2, -rt2/2, -rt3/2, -1];
+%! assert(cos (x), v, sqrt (eps));
+
+%!test
+%! rt2 = sqrt (2);
+%! rt3 = sqrt (3);
+%! x = single([0, pi/6, pi/4, pi/3, pi/2, 2*pi/3, 3*pi/4, 5*pi/6, pi]);
+%! v = single([1, rt3/2, rt2/2, 1/2, 0, -1/2, -rt2/2, -rt3/2, -1]);
+%! assert(cos (x), v, sqrt (eps('single')));
+
+%!error cos ();
+%!error cos (1, 2);
+
+ */
+
 DEFUN (cosh, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} cosh (@var{x})\n\
@@ -290,6 +479,23 @@
   return retval;
 }
 
+/*
+
+%!test
+%! x = [0, pi/2*i, pi*i, 3*pi/2*i];
+%! v = [1, 0, -1, 0];
+%! assert(cosh (x), v, sqrt (eps));
+
+%!test
+%! x = single([0, pi/2*i, pi*i, 3*pi/2*i]);
+%! v = single([1, 0, -1, 0]);
+%! assert(cosh (x), v, sqrt (eps ('single')));
+
+%!error cosh ();
+%!error cosh (1, 2);
+
+*/
+
 DEFUN (erf, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} erf (@var{z})\n\
@@ -329,6 +535,28 @@
 %! a = -1i*sqrt(-1/(6.4187*6.4187));
 %! assert (erf(a), erf(real(a)));
 
+%!test
+%! x=[0,.5,1];
+%! v=[0, .520499877813047, .842700792949715];
+%! assert(all(abs(erf(x)-v)<1.e-10) &&  all(abs(erf(-x)+v)<1.e-10) && all(abs(erfc(x)+v-1)<1.e-10) && all(abs(erfinv(v)-x)<1.e-10));
+
+%!test
+%! a = -1i*sqrt(single (-1/(6.4187*6.4187)));
+%! assert (erf(a), erf(real(a)));
+
+%!test
+%! x=single ([0,.5,1]);
+%! v=single ([0, .520499877813047, .842700792949715]);
+%! assert(all(abs(erf(x)-v)<1.e-6) &&  all(abs(erf(-x)+v)<1.e-6) && all(abs(erfc(x)+v-1)<1.e-6) && all(abs(erfinv(v)-x)<1.e-6));
+
+%% test/octave.test/arith/erf-2.m
+%!error erf();
+
+%% test/octave.test/arith/erf-3.m
+%!error erf(1,2);
+
+
+
 */
 
 DEFUN (erfc, args, ,
@@ -379,6 +607,21 @@
   return retval;
 }
 
+/*
+
+%!assert(exp ([0, 1, -1, -1000]), [1, e, 1/e, 0], sqrt (eps));
+%!assert(exp (1+i), e * (cos (1) + sin (1) * i), sqrt (eps));
+%!assert(exp (single([0, 1, -1, -1000])), single([1, e, 1/e, 0]), sqrt (eps('single')));
+%!assert(exp (single(1+i)), single (e * (cos (1) + sin (1) * i)), sqrt (eps('single')));
+
+%!error exp ();
+%!error exp (1, 2);
+
+%!assert(exp (Inf) == Inf && exp (-Inf) == 0 && isnan (exp (NaN)));
+%!assert(exp (Inf ('single')) == Inf('single') && exp (-Inf('single')) == 0 && isnan (exp (NaN('single'))));
+
+*/
+
 DEFUN (expm1, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} expm1 (@var{x})\n\
@@ -445,6 +688,17 @@
   return retval;
 }
 
+/*
+
+%!assert(fix ([1.1, 1, -1.1, -1]), [1, 1, -1, -1]);
+%!assert(fix ([1.1+1.1i, 1+i, -1.1-1.1i, -1-i]), [1+i, 1+i, -1-i, -1-i]);
+%!assert(fix (single([1.1, 1, -1.1, -1])), single([1, 1, -1, -1]));
+%!assert(fix (single([1.1+1.1i, 1+i, -1.1-1.1i, -1-i])), single([1+i, 1+i, -1-i, -1-i]));
+
+%!error fix ();
+%!error fix (1, 2);
+
+*/
 
 DEFUN (floor, args, ,
     "-*- texinfo -*-\n\
@@ -462,6 +716,18 @@
   return retval;
 }
 
+/*
+
+%!assert(floor ([2, 1.1, -1.1, -1]), [2, 1, -2, -1]);
+%!assert(floor ([2+2i, 1.1+1.1i, -1.1-1.1i, -1-i]), [2+2i, 1+i, -2-2i, -1-i]);
+%!assert(floor (single ([2, 1.1, -1.1, -1])), single ([2, 1, -2, -1]));
+%!assert(floor (single([2+2i, 1.1+1.1i, -1.1-1.1i, -1-i])), single([2+2i, 1+i, -2-2i, -1-i]));
+
+%!error floor ();
+%!error floor (1, 2);
+
+*/
+
 DEFUN (gamma, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} gamma (@var{z})\n\
@@ -501,6 +767,23 @@
 %! a = -1i*sqrt(-1/(6.4187*6.4187));
 %! assert (gamma(a), gamma(real(a)));
 
+%!test
+%! x = [.5, 1, 1.5, 2, 3, 4, 5];
+%! v = [sqrt(pi), 1, .5*sqrt(pi), 1, 2, 6, 24];
+%! assert(gamma(x), v, sqrt(eps))
+
+%!test
+%! a = single(-1i*sqrt(-1/(6.4187*6.4187)));
+%! assert (gamma(a), gamma(real(a)));
+
+%!test
+%! x = single([.5, 1, 1.5, 2, 3, 4, 5]);
+%! v = single([sqrt(pi), 1, .5*sqrt(pi), 1, 2, 6, 24]);
+%! assert(gamma(x), v, sqrt(eps('single')))
+
+%!error gamma();
+%!error gamma(1,2);
+
 */
 
 DEFUN (imag, args, ,
@@ -519,6 +802,23 @@
   return retval;
 }
 
+/*
+
+%!assert(imag (1), 0);
+%!assert(imag (i), 1);
+%!assert(imag (1+i), 1);
+%!assert(imag ([i, 1; 1, i]), eye (2));
+
+%!assert(imag (single(1)), single(0));
+%!assert(imag (single(i)), single(1));
+%!assert(imag (single(1+i)), single(1));
+%!assert(imag (single([i, 1; 1, i])), eye (2,'single'));
+
+%!error imag ();
+%!error imag (1, 2);
+
+ */
+
 DEFUNX ("isalnum", Fisalnum, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} isalnum (@var{s})\n\
@@ -843,6 +1143,23 @@
 %! a = -1i*sqrt(-1/(6.4187*6.4187));
 %! assert (lgamma(a), lgamma(real(a)));
 
+%!test
+%! x = [.5, 1, 1.5, 2, 3, 4, 5];
+%! v = [sqrt(pi), 1, .5*sqrt(pi), 1, 2, 6, 24];
+%! assert(lgamma(x), log(v), sqrt(eps))
+
+%!test
+%! a = single(-1i*sqrt(-1/(6.4187*6.4187)));
+%! assert (lgamma(a), lgamma(real(a)));
+
+%!test
+%! x = single([.5, 1, 1.5, 2, 3, 4, 5]);
+%! v = single([sqrt(pi), 1, .5*sqrt(pi), 1, 2, 6, 24]);
+%! assert(lgamma(x), log(v), sqrt(eps ('single')))
+
+%!error lgamma();
+%!error lgamma(1,2);
+
 */
 
 DEFUN (log, args, ,
@@ -862,6 +1179,19 @@
   return retval;
 }
 
+/*
+
+%!assert(log ([1, e, e^2]), [0, 1, 2], sqrt (eps));
+%!assert(log ([-0.5, -1.5, -2.5]), log([0.5, 1.5, 2.5]) + pi*1i, sqrt (eps));
+
+%!assert(log (single([1, e, e^2])), single([0, 1, 2]), sqrt (eps));
+%!assert(log (single([-0.5, -1.5, -2.5])), single(log([0.5, 1.5, 2.5]) + pi*1i), sqrt (eps));
+
+%!error log ();
+%!error log (1, 2);
+
+ */
+
 DEFUN (log10, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} log10 (@var{x})\n\
@@ -878,6 +1208,16 @@
   return retval;
 }
 
+/*
+
+%!assert(log10 ([0.01, 0.1, 1, 10, 100]), [-2, -1, 0, 1, 2], sqrt (eps));
+%!assert(log10 (single([0.01, 0.1, 1, 10, 100])), single([-2, -1, 0, 1, 2]), sqrt (eps ('single')));
+
+%!error log10 ();
+%!error log10 (1, 2);
+
+*/
+
 DEFUN (log1p, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} log1p (@var{x})\n\
@@ -909,6 +1249,23 @@
   return retval;
 }
 
+/*
+
+%!assert(real (1), 1);
+%!assert(real (i), 0);
+%!assert(real (1+i), 1);
+%!assert(real ([1, i; i, 1]), eye (2));
+
+%!assert(real (single(1)), single(1));
+%!assert(real (single(i)), single(0));
+%!assert(real (single(1+i)), single(1));
+%!assert(real (single([1, i; i, 1])), eye (2,'single'));
+
+%!error real ();
+%!error real (1, 2);
+
+*/
+
 DEFUN (round, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} round (@var{x})\n\
@@ -926,6 +1283,29 @@
   return retval;
 }
 
+/*
+
+%!assert(round (1), 1);
+%!assert(round (1.1), 1);
+%!assert(round (5.5), 6);
+%!assert(round (i), i);
+%!assert(round (2.5+3.5i), 3+4i);
+%!assert(round (-2.6), -3);
+%!assert(round ([1.1, -2.4; -3.7, 7.1]), [1, -2; -4, 7]);
+
+%!assert(round (single(1)), single(1));
+%!assert(round (single(1.1)), single(1));
+%!assert(round (single(5.5)), single(6));
+%!assert(round (single(i)), single(i));
+%!assert(round (single(2.5+3.5i)), single(3+4i));
+%!assert(round (single(-2.6)), single(-3));
+%!assert(round (single([1.1, -2.4; -3.7, 7.1])), single([1, -2; -4, 7]));
+
+%!error round ();
+%!error round (1, 2);
+
+*/
+
 DEFUN (roundb, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} roundb (@var{x})\n\
@@ -976,6 +1356,23 @@
   return retval;
 }
 
+/*
+
+%!assert(sign (-2) , -1);
+%!assert(sign (3), 1);
+%!assert(sign (0), 0);
+%!assert(sign ([1, -pi; e, 0]), [1, -1; 1, 0]);
+
+%!assert(sign (single(-2)) , single(-1));
+%!assert(sign (single(3)), single(1));
+%!assert(sign (single(0)), single(0));
+%!assert(sign (single([1, -pi; e, 0])), single([1, -1; 1, 0]));
+
+%!error sign ();
+%!error sign (1, 2);
+
+*/
+
 DEFUN (sin, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} sin (@var{x})\n\
@@ -991,6 +1388,27 @@
   return retval;
 }
 
+/*
+
+%!test
+%! rt2 = sqrt (2);
+%! rt3 = sqrt (3);
+%! x = [0, pi/6, pi/4, pi/3, pi/2, 2*pi/3, 3*pi/4, 5*pi/6, pi];
+%! v = [0, 1/2, rt2/2, rt3/2, 1, rt3/2, rt2/2, 1/2, 0];
+%! assert(sin (x), v, sqrt (eps));
+
+%!test
+%! rt2 = sqrt (2);
+%! rt3 = sqrt (3);
+%! x = single([0, pi/6, pi/4, pi/3, pi/2, 2*pi/3, 3*pi/4, 5*pi/6, pi]);
+%! v = single([0, 1/2, rt2/2, rt3/2, 1, rt3/2, rt2/2, 1/2, 0]);
+%! assert(sin (x), v, sqrt (eps('single')));
+
+%!error sin ();
+%!error sin (1, 2);
+
+*/
+
 DEFUN (sinh, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} sinh (@var{x})\n\
@@ -1006,6 +1424,23 @@
   return retval;
 }
 
+/*
+
+%!test
+%! x = [0, pi/2*i, pi*i, 3*pi/2*i];
+%! v = [0, i, 0, -i];
+%! assert(sinh (x), v, sqrt (eps));
+
+%!test
+%! x = single([0, pi/2*i, pi*i, 3*pi/2*i]);
+%! v = single([0, i, 0, -i]);
+%! assert(sinh (x), v, sqrt (eps('single')));
+
+%!error sinh ();
+%!error sinh (1, 2);
+
+ */
+
 DEFUN (sqrt, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} sqrt (@var{x})\n\
@@ -1023,6 +1458,23 @@
   return retval;
 }
 
+/*
+
+%!assert(sqrt (4), 2)
+%!assert(sqrt (-1), i)
+%!assert(sqrt (1+i), exp (0.5 * log (1+i)), sqrt (eps));
+%!assert(sqrt([4, -4; i, 1-i]), [2, 2i; exp(0.5 * log (i)), exp(0.5 * log (1-i))], sqrt(eps));
+
+%!assert(sqrt (single(4)), single(2))
+%!assert(sqrt (single(-1)), single(i))
+%!assert(sqrt (single(1+i)), single(exp (0.5 * log (1+i))), sqrt (eps('single')));
+%!assert(sqrt(single([4, -4; i, 1-i])), single([2, 2i; exp(0.5 * log (i)), exp(0.5 * log (1-i))]), sqrt(eps('single')));
+
+%!error sqrt ();
+%!error sqrt (1, 2);
+
+*/
+
 DEFUN (tan, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} tan (@var{z})\n\
@@ -1038,6 +1490,27 @@
   return retval;
 }
 
+/*
+
+%!test
+%! rt2 = sqrt (2);
+%! rt3 = sqrt (3);
+%! x = [0, pi/6, pi/4, pi/3, 2*pi/3, 3*pi/4, 5*pi/6, pi];
+%! v = [0, rt3/3, 1, rt3, -rt3, -1, -rt3/3, 0];
+%! assert(tan (x), v,  sqrt (eps));
+
+%!test
+%! rt2 = sqrt (2);
+%! rt3 = sqrt (3);
+%! x = single([0, pi/6, pi/4, pi/3, 2*pi/3, 3*pi/4, 5*pi/6, pi]);
+%! v = single([0, rt3/3, 1, rt3, -rt3, -1, -rt3/3, 0]);
+%! assert(tan (x), v,  sqrt (eps('single')));
+
+%!error tan ();
+%!error tan (1, 2);
+
+*/
+
 DEFUN (tanh, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} tanh (@var{x})\n\
@@ -1053,6 +1526,23 @@
   return retval;
 }
 
+/*
+
+%!test
+%! x = [0, pi*i];
+%! v = [0, 0];
+%! assert(tanh (x), v, sqrt (eps));
+
+%!test
+%! x = single([0, pi*i]);
+%! v = single([0, 0]);
+%! assert(tanh (x), v, sqrt (eps('single')));
+
+%!error tanh ();
+%!error tanh (1, 2);
+
+*/
+
 DEFUNX ("toascii", Ftoascii, args, ,
     "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} toascii (@var{s})\n\
--- a/src/ov-float.cc	Mon Jun 02 16:57:45 2008 +0200
+++ b/src/ov-float.cc	Wed May 28 01:03:35 2008 +0200
@@ -299,7 +299,7 @@
   octave_float_scalar::MAP (void) const \
   { \
     return (scalar < L1 || scalar > L2 \
-            ? octave_value (CFCN (Complex (scalar))) \
+            ? octave_value (CFCN (FloatComplex (scalar))) \
 	    : octave_value (RFCN (scalar))); \
   }
 
@@ -309,41 +309,41 @@
   return x;
 }
 
-SCALAR_MAPPER (erf, ::erf)
-SCALAR_MAPPER (erfc, ::erfc)
+SCALAR_MAPPER (erf, ::erff)
+SCALAR_MAPPER (erfc, ::erfcf)
 SCALAR_MAPPER (gamma, xgamma)
-CD_SCALAR_MAPPER (lgamma, xlgamma, xlgamma, 0.0, octave_Inf)
-SCALAR_MAPPER (abs, ::fabs)
-SCALAR_MAPPER (acos, ::acos)
-CD_SCALAR_MAPPER (acosh, ::acosh, ::acosh, 1.0, octave_Inf)
+CD_SCALAR_MAPPER (lgamma, xlgamma, xlgamma, 0.0, octave_Float_Inf)
+SCALAR_MAPPER (abs, ::fabsf)
+SCALAR_MAPPER (acos, ::acosf)
+CD_SCALAR_MAPPER (acosh, ::acoshf, ::acosh, 1.0, octave_Float_Inf)
 SCALAR_MAPPER (angle, ::arg)
 SCALAR_MAPPER (arg, ::arg)
-CD_SCALAR_MAPPER (asin, ::asin, ::asin, -1.0, 1.0)
-SCALAR_MAPPER (asinh, ::asinh)
-SCALAR_MAPPER (atan, ::atan)
-CD_SCALAR_MAPPER (atanh, ::atanh, ::atanh, -1.0, 1.0)
-SCALAR_MAPPER (ceil, ::ceil)
+CD_SCALAR_MAPPER (asin, ::asinf, ::asin, -1.0, 1.0)
+SCALAR_MAPPER (asinh, ::asinhf)
+SCALAR_MAPPER (atan, ::atanf)
+CD_SCALAR_MAPPER (atanh, ::atanhf, ::atanh, -1.0, 1.0)
+SCALAR_MAPPER (ceil, ::ceilf)
 SCALAR_MAPPER (conj, xconj)
-SCALAR_MAPPER (cos, ::cos)
-SCALAR_MAPPER (cosh, ::cosh)
-SCALAR_MAPPER (exp, ::exp)
-SCALAR_MAPPER (expm1, ::expm1)
+SCALAR_MAPPER (cos, ::cosf)
+SCALAR_MAPPER (cosh, ::coshf)
+SCALAR_MAPPER (exp, ::expf)
+SCALAR_MAPPER (expm1, ::expm1f)
 SCALAR_MAPPER (fix, ::fix)
-SCALAR_MAPPER (floor, ::floor)
+SCALAR_MAPPER (floor, ::floorf)
 SCALAR_MAPPER (imag, ::imag)
-CD_SCALAR_MAPPER (log, ::log, std::log, 0.0, octave_Inf)
-CD_SCALAR_MAPPER (log2, xlog2, xlog2, 0.0, octave_Inf)
-CD_SCALAR_MAPPER (log10, ::log10, std::log10, 0.0, octave_Inf)
-CD_SCALAR_MAPPER (log1p, ::log1p, ::log1p, -1.0, octave_Inf)
+CD_SCALAR_MAPPER (log, ::logf, std::log, 0.0, octave_Float_Inf)
+CD_SCALAR_MAPPER (log2, xlog2, xlog2, 0.0, octave_Float_Inf)
+CD_SCALAR_MAPPER (log10, ::log10f, std::log10, 0.0, octave_Float_Inf)
+CD_SCALAR_MAPPER (log1p, ::log1pf, ::log1p, -1.0, octave_Float_Inf)
 SCALAR_MAPPER (real, ::real)
 SCALAR_MAPPER (round, xround)
 SCALAR_MAPPER (roundb, xroundb)
 SCALAR_MAPPER (signum, ::signum)
-SCALAR_MAPPER (sin, ::sin)
-SCALAR_MAPPER (sinh, ::sinh)
-CD_SCALAR_MAPPER (sqrt, ::sqrt, std::sqrt, 0.0, octave_Inf)
-SCALAR_MAPPER (tan, ::tan)
-SCALAR_MAPPER (tanh, ::tanh)
+SCALAR_MAPPER (sin, ::sinf)
+SCALAR_MAPPER (sinh, ::sinhf)
+CD_SCALAR_MAPPER (sqrt, ::sqrtf, std::sqrt, 0.0, octave_Float_Inf)
+SCALAR_MAPPER (tan, ::tanf)
+SCALAR_MAPPER (tanh, ::tanhf)
 SCALAR_MAPPER (finite, xfinite)
 SCALAR_MAPPER (isinf, xisinf)
 SCALAR_MAPPER (isna, octave_is_NA)
--- a/src/ov-flt-complex.cc	Mon Jun 02 16:57:45 2008 +0200
+++ b/src/ov-flt-complex.cc	Wed May 28 01:03:35 2008 +0200
@@ -450,8 +450,8 @@
       } \
   }
 
-SCALAR_MAPPER (erf, ::erf)
-SCALAR_MAPPER (erfc, ::erfc)
+SCALAR_MAPPER (erf, ::erff)
+SCALAR_MAPPER (erfc, ::erfcf)
 SCALAR_MAPPER (gamma, xgamma)
 CD_SCALAR_MAPPER (lgamma, xlgamma, xlgamma, 0.0, octave_Inf)
 
@@ -469,14 +469,14 @@
 COMPLEX_MAPPER (cos, std::cos)
 COMPLEX_MAPPER (cosh, std::cosh)
 COMPLEX_MAPPER (exp, std::exp)
-COMPLEX_MAPPER (expm1, ::expm1)
+COMPLEX_MAPPER (expm1, ::expm1f)
 COMPLEX_MAPPER (fix, ::fix)
 COMPLEX_MAPPER (floor, ::floor)
 COMPLEX_MAPPER (imag, ximag)
 COMPLEX_MAPPER (log, std::log)
 COMPLEX_MAPPER (log2, xlog2)
 COMPLEX_MAPPER (log10, std::log10)
-COMPLEX_MAPPER (log1p, ::log1p)
+COMPLEX_MAPPER (log1p, ::log1pf)
 COMPLEX_MAPPER (real, xreal)
 COMPLEX_MAPPER (round, xround)
 COMPLEX_MAPPER (roundb, xroundb)
--- a/src/ov-flt-cx-mat.cc	Mon Jun 02 16:57:45 2008 +0200
+++ b/src/ov-flt-cx-mat.cc	Wed May 28 01:03:35 2008 +0200
@@ -768,7 +768,7 @@
   octave_float_complex_matrix::MAP (void) const \
   { \
     static FloatComplexNDArray::dmapper dmap = ximag; \
-    NDArray m = matrix.map (dmap); \
+    FloatNDArray m = matrix.map (dmap); \
     if (m.all_elements_are_zero ()) \
       { \
 	dmap = xreal; \
@@ -808,9 +808,9 @@
       } \
   }
 
-DARRAY_MAPPER (erf, NDArray::dmapper, ::erf)
-DARRAY_MAPPER (erfc, NDArray::dmapper, ::erfc)
-DARRAY_MAPPER (gamma, NDArray::dmapper, xgamma)
+DARRAY_MAPPER (erf, FloatNDArray::dmapper, ::erff)
+DARRAY_MAPPER (erfc, FloatNDArray::dmapper, ::erfcf)
+DARRAY_MAPPER (gamma, FloatNDArray::dmapper, xgamma)
 CD_ARRAY_MAPPER (lgamma, xlgamma, xlgamma, 0.0, octave_Inf)
 
 ARRAY_MAPPER (abs, FloatComplexNDArray::dmapper, xabs)
--- a/src/ov-flt-cx-mat.h	Mon Jun 02 16:57:45 2008 +0200
+++ b/src/ov-flt-cx-mat.h	Wed May 28 01:03:35 2008 +0200
@@ -96,7 +96,7 @@
 
   bool is_complex_type (void) const { return true; }
 
-  bool is_double_type (void) const { return true; }
+  bool is_single_type (void) const { return true; }
 
   bool is_float_type (void) const { return true; }
 
--- a/src/ov-flt-re-mat.cc	Mon Jun 02 16:57:45 2008 +0200
+++ b/src/ov-flt-re-mat.cc	Wed May 28 01:03:35 2008 +0200
@@ -762,10 +762,10 @@
 ARRAY_MAPPER (erf, FloatNDArray::dmapper, ::erff)
 ARRAY_MAPPER (erfc, FloatNDArray::dmapper, ::erfcf)
 ARRAY_MAPPER (gamma, FloatNDArray::dmapper, xgamma)
-CD_ARRAY_MAPPER (lgamma, xlgamma, xlgamma, 0.0, octave_Inf)
+CD_ARRAY_MAPPER (lgamma, xlgamma, xlgamma, 0.0, octave_Float_Inf)
 ARRAY_MAPPER (abs, FloatNDArray::dmapper, ::fabsf)
 ARRAY_MAPPER (acos, FloatNDArray::dmapper, ::acosf)
-CD_ARRAY_MAPPER (acosh, ::acoshf, ::acosh, 1.0, octave_Inf)
+CD_ARRAY_MAPPER (acosh, ::acoshf, ::acosh, 1.0, octave_Float_Inf)
 ARRAY_MAPPER (angle, FloatNDArray::dmapper, ::arg)
 ARRAY_MAPPER (arg, FloatNDArray::dmapper, ::arg)
 CD_ARRAY_MAPPER (asin, ::asinf, ::asin, -1.0, 1.0)
@@ -781,17 +781,17 @@
 ARRAY_MAPPER (fix, FloatNDArray::dmapper, ::fix)
 ARRAY_MAPPER (floor, FloatNDArray::dmapper, ::floorf)
 ARRAY_MAPPER (imag, FloatNDArray::dmapper, ::imag)
-CD_ARRAY_MAPPER (log, ::logf, std::log, 0.0, octave_Inf)
-CD_ARRAY_MAPPER (log2, xlog2, xlog2, 0.0, octave_Inf)
-CD_ARRAY_MAPPER (log10, ::log10f, std::log10, 0.0, octave_Inf)
-CD_ARRAY_MAPPER (log1p, ::log1pf, ::log1pf, -1.0, octave_Inf)
+CD_ARRAY_MAPPER (log, ::logf, std::log, 0.0, octave_Float_Inf)
+CD_ARRAY_MAPPER (log2, xlog2, xlog2, 0.0, octave_Float_Inf)
+CD_ARRAY_MAPPER (log10, ::log10f, std::log10, 0.0, octave_Float_Inf)
+CD_ARRAY_MAPPER (log1p, ::log1pf, ::log1pf, -1.0, octave_Float_Inf)
 ARRAY_MAPPER (real, FloatNDArray::dmapper, ::real)
 ARRAY_MAPPER (round, FloatNDArray::dmapper, xround)
 ARRAY_MAPPER (roundb, FloatNDArray::dmapper, xroundb)
 ARRAY_MAPPER (signum, FloatNDArray::dmapper, ::signum)
 ARRAY_MAPPER (sin, FloatNDArray::dmapper, ::sinf)
 ARRAY_MAPPER (sinh, FloatNDArray::dmapper, ::sinhf)
-CD_ARRAY_MAPPER (sqrt, ::sqrtf, std::sqrt, 0.0, octave_Inf)
+CD_ARRAY_MAPPER (sqrt, ::sqrtf, std::sqrt, 0.0, octave_Float_Inf)
 ARRAY_MAPPER (tan, FloatNDArray::dmapper, ::tanf)
 ARRAY_MAPPER (tanh, FloatNDArray::dmapper, ::tanhf)
 ARRAY_MAPPER (finite, FloatNDArray::bmapper, xfinite)
--- a/test/ChangeLog	Mon Jun 02 16:57:45 2008 +0200
+++ b/test/ChangeLog	Wed May 28 01:03:35 2008 +0200
@@ -1,5 +1,9 @@
 2008-06-02  David Bateman  <dbateman@free.fr>
 
+	* test_arith.m: Delete and move tests close to function
+	definitions.
+	* test_func.m: Also test for single precision return values.
+
 	* test_infnan.m, test_linalg.m, test_matrix.m, test_number.m):
 	Delet and move tests close to function definitions.
 	* test_range.m: Also test single precision examples.
--- a/test/test_arith.m	Mon Jun 02 16:57:45 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,525 +0,0 @@
-## Copyright (C) 2006, 2007 John W. Eaton
-##
-## This file is part of Octave.
-##
-## Octave is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or (at
-## your option) any later version.
-##
-## Octave is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Octave; see the file COPYING.  If not, see
-## <http://www.gnu.org/licenses/>.
-
-%% Automatically generated from DejaGNU files
-
-
-%% test/octave.test/arith/betainc-1.m
-%!test
-%! a=[1, 1.5, 2, 3];
-%! b=[4, 3, 2, 1];
-%! v1=betainc(1,a,b);
-%! v2=[1,1,1,1];
-%! x = [.2, .4, .6, .8];
-%! v3=betainc(x, a, b);
-%! v4 = 1-betainc(1.-x, b, a);
-%! assert(all(abs(v1-v2)<sqrt(eps)) && all(abs(v3-v4)<sqrt(eps)));
-
-%% test/octave.test/arith/betainc-2.m
-%!error <Invalid call to betainc.*> betainc();
-
-%% test/octave.test/arith/betainc-3.m
-%!error <Invalid call to betainc.*> betainc(1);
-
-%% test/octave.test/arith/betainc-4.m
-%!error <Invalid call to betainc.*> betainc(1,2);
-
-%% test/octave.test/arith/ceil-1.m
-%!assert(all (ceil ([2, 1.1, -1.1, -1]) == [2, 2, -1, -1]));
-
-%% test/octave.test/arith/ceil-2.m
-%!assert(all (ceil ([2+2i, 1.1+1.1i, -1.1-1.1i, -1-i]) == [2+2i, 2+2i, -1-i, -1-i]));
-
-%% test/octave.test/arith/ceil-3.m
-%!error ceil ();
-
-%% test/octave.test/arith/ceil-4.m
-%!error ceil (1, 2);
-
-%% test/octave.test/arith/erf-1.m
-%!test
-%! x=[0,.5,1];
-%! v=[0, .520499877813047, .842700792949715];
-%! assert(all(abs(erf(x)-v)<1.e-10) &&  all(abs(erf(-x)+v)<1.e-10) && all(abs(erfc(x)+v-1)<1.e-10) && all(abs(erfinv(v)-x)<1.e-10));
-
-%% test/octave.test/arith/erf-2.m
-%!error erf();
-
-%% test/octave.test/arith/erf-3.m
-%!error erf(1,2);
-
-%% test/octave.test/arith/exp-1.m
-%!assert(all (abs (exp ([0, 1, -1, -1000]) - [1, e, 1/e, 0]) < sqrt (eps)));
-
-%% test/octave.test/arith/exp-2.m
-%!assert(abs (exp (1+i) - e * (cos (1) + sin (1) * i)) < sqrt (eps));
-
-%% test/octave.test/arith/exp-3.m
-%!error exp ();
-
-%% test/octave.test/arith/exp-4.m
-%!error exp (1, 2);
-
-%% test/octave.test/arith/exp-5.m
-%!assert(exp (Inf) == Inf && exp (-Inf) == 0 && isnan (exp (NaN)));
-
-%% test/octave.test/arith/fix-1.m
-%!assert(all (fix ([1.1, 1, -1.1, -1]) == [1, 1, -1, -1]));
-
-%% test/octave.test/arith/fix-2.m
-%!assert(all (fix ([1.1+1.1i, 1+i, -1.1-1.1i, -1-i]) == [1+i, 1+i, -1-i, -1-i]));
-
-%% test/octave.test/arith/fix-3.m
-%!error fix ();
-
-%% test/octave.test/arith/fix-4.m
-%!error fix (1, 2);
-
-%% test/octave.test/arith/floor-1.m
-%!assert(all (floor ([2, 1.1, -1.1, -1]) == [2, 1, -2, -1]));
-
-%% test/octave.test/arith/floor-2.m
-%!assert(all (floor ([2+2i, 1.1+1.1i, -1.1-1.1i, -1-i]) == [2+2i, 1+i, -2-2i, -1-i]));
-
-%% test/octave.test/arith/floor-3.m
-%!error floor ();
-
-%% test/octave.test/arith/floor-4.m
-%!error floor (1, 2);
-
-%% test/octave.test/arith/gamma-1.m
-%!test
-%! x = [.5, 1, 1.5, 2, 3, 4, 5];
-%! v = [sqrt(pi), 1, .5*sqrt(pi), 1, 2, 6, 24];
-%! assert(all(abs(gamma(x) - v) < sqrt(eps)) && all(abs(lgamma(x) - log(v)) < sqrt(eps))
-%! );
-
-%% test/octave.test/arith/gamma-2.m
-%!error gamma();
-
-%% test/octave.test/arith/gamma-3.m
-%!error gamma(1,2);
-
-%% test/octave.test/arith/gammainc-1.m
-%!test
-%! a = [.5 .5 .5 .5 .5];
-%! x = [0 1 2 3 4];
-%! v1 = sqrt(pi)*erf(x)./gamma(a);
-%! v3 = gammainc(x.*x,a);
-%! assert(all (abs(v1 - v3) < sqrt(eps)));
-
-%% test/octave.test/arith/gcd-1.m
-%!assert((gcd (200, 300, 50, 35) == gcd ([200, 300, 50, 35])
-%! && gcd ([200, 300, 50, 35]) == 5));
-
-%% test/octave.test/arith/gcd-2.m
-%!error <Invalid call to gcd.*> gcd ();
-
-%% test/octave.test/arith/gcd-3.m
-%!test
-%! s.a = 1;
-%! fail("gcd (s)");
-
-%% test/octave.test/arith/round-1.m
-%!assert((round (1) == 1 && round (1.1) == 1 && round (5.5) == 6
-%! && round (i) == i && round (2.5+3.5i) == 3+4i && round (-2.6) == -3));
-
-%% test/octave.test/arith/round-2.m
-%!assert(all (all (round ([1.1, -2.4; -3.7, 7.1]) == [1, -2; -4, 7])));
-
-%% test/octave.test/arith/round-3.m
-%!error round ();
-
-%% test/octave.test/arith/round-4.m
-%!error round (1, 2);
-
-%% test/octave.test/arith/sign-1.m
-%!assert(sign (-2) == -1 && sign (3) == 1 && sign (0) == 0);
-
-%% test/octave.test/arith/sign-2.m
-%!assert(all (all (sign ([1, -pi; e, 0]) == [1, -1; 1, 0])));
-
-%% test/octave.test/arith/sign-3.m
-%!error sign ();
-
-%% test/octave.test/arith/sign-4.m
-%!error sign (1, 2);
-
-%% test/octave.test/arith/sqrt-1.m
-%!assert((sqrt (4) == 2 && sqrt (-1) == i
-%! && abs (sqrt (1+i) - exp (0.5 * log (1+i))) < sqrt (eps)));
-
-%% test/octave.test/arith/sqrt-2.m
-%!test
-%! t1 = exp (0.5 * log (i));
-%! t2 = exp (0.5 * log (1-i));
-%! assert(all (all (abs (sqrt ([4, -4; i, 1-i]) - [2, 2i; t1, t2]) < sqrt (eps))));
-
-%% test/octave.test/arith/sqrt-3.m
-%!error sqrt ();
-
-%% test/octave.test/arith/sqrt-4.m
-%!error sqrt (1, 2);
-
-%% test/octave.test/arith/abs-1.m
-%!assert(abs (1) == 1 && abs (-3.5) == 3.5 && abs (3+4i) == 5 && abs (3-4i) == 5);
-
-%% test/octave.test/arith/abs-2.m
-%!assert(all (all (abs ([1.1, 3i; 3+4i, -3-4i]) == [1.1, 3; 5, 5])));
-
-%% test/octave.test/arith/abs-3.m
-%!error abs ();
-
-%% test/octave.test/arith/abs-4.m
-%!error abs (1, 2);
-
-%% test/octave.test/arith/arg-1.m
-%!assert(arg (1) == 0 && arg (i) == pi/2 && arg (-1) == pi && arg (-i) == -pi/2);
-
-%% test/octave.test/arith/arg-2.m
-%!assert(all (all (arg ([1, i; -1, -i]) == [0, pi/2; pi, -pi/2])));
-
-%% test/octave.test/arith/arg-3.m
-%!error arg ();
-
-%% test/octave.test/arith/arg-4.m
-%!error arg (1, 2);
-
-%% test/octave.test/arith/conj-1.m
-%!assert(conj (1) == 1 && conj (i) == -i && conj (1+i) == 1-i && conj (1-i) == 1+i);
-
-%% test/octave.test/arith/conj-2.m
-%!assert(all (all (conj ([-1, -i; -1+i, -1-i]) == [-1, i; -1-i, -1+i])));
-
-%% test/octave.test/arith/conj-3.m
-%!error conj ();
-
-%% test/octave.test/arith/conj-4.m
-%!error conj (1, 2);
-
-%% test/octave.test/arith/imag-1.m
-%!assert(imag (1) == 0 && imag (i) == 1 && imag (1+i) == 1);
-
-%% test/octave.test/arith/imag-2.m
-%!assert(all (all (imag ([i, 1; 1, i]) == eye (2))));
-
-%% test/octave.test/arith/imag-3.m
-%!error imag ();
-
-%% test/octave.test/arith/imag-4.m
-%!error imag (1, 2);
-
-%% test/octave.test/arith/real-1.m
-%!assert(real (1) == 1 && real (i) == 0 && real (1+i) == 1);
-
-%% test/octave.test/arith/real-2.m
-%!assert(all (all (real ([1, i; i, 1]) == eye (2))));
-
-%% test/octave.test/arith/real-3.m
-%!error real ();
-
-%% test/octave.test/arith/real-4.m
-%!error real (1, 2);
-
-%% test/octave.test/arith/log-1.m
-%!assert(all (abs (log ([1, e, e^2]) - [0, 1, 2]) < sqrt (eps)));
-
-%% test/octave.test/arith/log-2.m
-%!error log ();
-
-%% test/octave.test/arith/log-3.m
-%!error log (1, 2);
-
-%% test/octave.test/arith/log10-1.m
-%!assert(all (abs (log10 ([0.01, 0.1, 1, 10, 100]) - [-2, -1, 0, 1, 2]) < sqrt (eps)));
-
-%% test/octave.test/arith/log10-2.m
-%!error log10 ();
-
-%% test/octave.test/arith/log10-3.m
-%!error log10 (1, 2);
-
-%% test/octave.test/arith/sin-1.m
-%!test
-%! rt2 = sqrt (2);
-%! rt3 = sqrt (3);
-%! x = [0, pi/6, pi/4, pi/3, pi/2, 2*pi/3, 3*pi/4, 5*pi/6, pi];
-%! v = [0, 1/2, rt2/2, rt3/2, 1, rt3/2, rt2/2, 1/2, 0];
-%! assert(all (abs (sin (x) - v) < sqrt (eps)));
-
-%% test/octave.test/arith/sin-2.m
-%!error sin ();
-
-%% test/octave.test/arith/sin-3.m
-%!error sin (1, 2);
-
-%% test/octave.test/arith/cos-1.m
-%!test
-%! rt2 = sqrt (2);
-%! rt3 = sqrt (3);
-%! x = [0, pi/6, pi/4, pi/3, pi/2, 2*pi/3, 3*pi/4, 5*pi/6, pi];
-%! v = [1, rt3/2, rt2/2, 1/2, 0, -1/2, -rt2/2, -rt3/2, -1];
-%! assert(all (abs (cos (x) - v) < sqrt (eps)));
-
-%% test/octave.test/arith/cos-2.m
-%!error cos ();
-
-%% test/octave.test/arith/cos-3.m
-%!error cos (1, 2);
-
-%% test/octave.test/arith/tan-1.m
-%!test
-%! rt2 = sqrt (2);
-%! rt3 = sqrt (3);
-%! x = [0, pi/6, pi/4, pi/3, 2*pi/3, 3*pi/4, 5*pi/6, pi];
-%! v = [0, rt3/3, 1, rt3, -rt3, -1, -rt3/3, 0];
-%! assert(all (abs (tan (x) - v) < sqrt (eps)));
-
-%% test/octave.test/arith/tan-2.m
-%!error tan ();
-
-%% test/octave.test/arith/tan-3.m
-%!error tan (1, 2);
-
-%% test/octave.test/arith/acos-1.m
-%!test
-%! rt2 = sqrt (2);
-%! rt3 = sqrt (3);
-%! v = [0, pi/6, pi/4, pi/3, pi/2, 2*pi/3, 3*pi/4, 5*pi/6, pi];
-%! x = [1, rt3/2, rt2/2, 1/2, 0, -1/2, -rt2/2, -rt3/2, -1];
-%! assert(all (abs (acos (x) - v) < sqrt (eps))
-%! 
-%! );
-
-%% test/octave.test/arith/acos-2.m
-%!error acos ();
-
-%% test/octave.test/arith/acos-3.m
-%!error acos (1, 2);
-
-%% test/octave.test/arith/atan-1.m
-%!test
-%! rt2 = sqrt (2);
-%! rt3 = sqrt (3);
-%! v = [0, pi/6, pi/4, pi/3, -pi/3, -pi/4, -pi/6, 0];
-%! x = [0, rt3/3, 1, rt3, -rt3, -1, -rt3/3, 0];
-%! assert(all (abs (atan (x) - v) < sqrt (eps))
-%! 
-%! );
-
-%% test/octave.test/arith/atan-2.m
-%!error atan ();
-
-%% test/octave.test/arith/atan-3.m
-%!error atan (1, 2);
-
-%% test/octave.test/arith/sinh-1.m
-%!test
-%! x = [0, pi/2*i, pi*i, 3*pi/2*i];
-%! v = [0, i, 0, -i];
-%! assert(all (abs (sinh (x) - v) < sqrt (eps)));
-
-%% test/octave.test/arith/sinh-2.m
-%!error sinh ();
-
-%% test/octave.test/arith/sinh-3.m
-%!error sinh (1, 2);
-
-%% test/octave.test/arith/cosh-1.m
-%!test
-%! x = [0, pi/2*i, pi*i, 3*pi/2*i];
-%! v = [1, 0, -1, 0];
-%! assert(all (abs (cosh (x) - v) < sqrt (eps)));
-
-%% test/octave.test/arith/cosh-2.m
-%!error cosh ();
-
-%% test/octave.test/arith/cosh-3.m
-%!error cosh (1, 2);
-
-%% test/octave.test/arith/tanh-1.m
-%!test
-%! x = [0, pi*i];
-%! v = [0, 0];
-%! assert(all (abs (tanh (x) - v) < sqrt (eps)));
-
-%% test/octave.test/arith/tanh-2.m
-%!error tanh ();
-
-%% test/octave.test/arith/tanh-3.m
-%!error tanh (1, 2);
-
-%% test/octave.test/arith/asinh-1.m
-%!test
-%! v = [0, pi/2*i, 0, -pi/2*i];
-%! x = [0, i, 0, -i];
-%! assert(all (abs (asinh (x) - v) < sqrt (eps))
-%! );
-
-%% test/octave.test/arith/asinh-2.m
-%!error asinh ();
-
-%% test/octave.test/arith/asinh-3.m
-%!error asinh (1, 2);
-
-%% test/octave.test/arith/acosh-1.m
-%!test
-%! v = [0, pi/2*i, pi*i, pi/2*i];
-%! x = [1, 0, -1, 0];
-%! assert(all (abs (acosh (x) - v) < sqrt (eps))
-%! );
-
-%% test/octave.test/arith/acosh-2.m
-%!error acosh ();
-
-%% test/octave.test/arith/acosh-3.m
-%!error acosh (1, 2);
-
-%% test/octave.test/arith/atanh-1.m
-%!test
-%! v = [0, 0];
-%! x = [0, 0];
-%! assert(all (abs (atanh (x) - v) < sqrt (eps))
-%! );
-
-%% test/octave.test/arith/atanh-2.m
-%!error atanh ();
-
-%% test/octave.test/arith/atanh-3.m
-%!error atanh (1, 2);
-
-%% test/octave.test/arith/atan2-1.m
-%!test
-%! rt2 = sqrt (2);
-%! rt3 = sqrt (3);
-%! v = [0, pi/6, pi/4, pi/3, -pi/3, -pi/4, -pi/6, 0];
-%! y = [0, rt3, 1, rt3, -rt3, -1, -rt3, 0];
-%! x = [1, 3, 1, 1, 1, 1, 3, 1];
-%! assert(all (abs (atan2 (y, x) - v) < sqrt (eps))
-%! );
-
-%% test/octave.test/arith/atan2-2.m
-%!error <Invalid call to atan2.*> atan2 ();
-
-%% test/octave.test/arith/atan2-3.m
-%!error <Invalid call to atan2.*> atan2 (1, 2, 3);
-
-%% test/octave.test/arith/sum-1.m
-%!assert((sum ([1, 2, 3]) == 6 && sum ([-1; -2; -3]) == -6
-%! && sum ([i, 2+i, -3+2i, 4]) == 3+4i));
-
-%% test/octave.test/arith/sum-2.m
-%!assert(all (all (sum ([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i]) == [2+2i, 4+4i, 6+6i])));
-
-%% test/octave.test/arith/sum-3.m
-%!error <Invalid call to sum.*> sum ();
-
-%% test/octave.test/arith/sum-4.m
-%!assert (all (sum ([1, 2; 3, 4], 1) == [4, 6]));
-%!assert (all (sum ([1, 2; 3, 4], 2) == [3; 7]));
-%!assert (sum (zeros (1, 0)) == 0);
-%!assert (all (size (sum (zeros (1, 0), 1)) == [1, 0]));
-%!assert (sum (zeros (1, 0), 2) == 0);
-%!assert (sum (zeros (0, 1)) == 0);
-%!assert (sum (zeros (0, 1), 1) == 0);
-%!assert (all (size (sum (zeros (0, 1), 2)) == [0, 1]));
-%!assert (all (size (sum (zeros (2, 0))) == [1, 0]));
-%!assert (all (size (sum (zeros (2, 0), 1)) == [1, 0]));
-%!assert (all (sum (zeros (2, 0), 2) == [0; 0]));
-%!assert (all (sum (zeros (0, 2)) == [0, 0]));
-%!assert (all (sum (zeros (0, 2), 1) == [0, 0]));
-%!assert (all (size (sum (zeros (0, 2), 2)) == [0, 1]));
-%!assert (all (size (sum (zeros (2, 2, 0, 3))) == [1, 2, 0, 3]));
-%!assert (all (size (sum (zeros (2, 2, 0, 3), 2)) == [2, 1, 0, 3]));
-%!assert (all (size (sum (zeros (2, 2, 0, 3), 3)) == [2, 2, 1, 3]));
-%!assert (all (size (sum (zeros (2, 2, 0, 3), 4)) == [2, 2, 0]));
-%!assert (all (size (sum (zeros (2, 2, 0, 3), 7)) == [2, 2, 0, 3]));
-
-%% test/octave.test/arith/prod-1.m
-%!assert (prod ([1, 2, 3]) == 6 && prod ([-1; -2; -3]) == -6);
-%!assert (prod ([i, 2+i, -3+2i, 4]) == -4-32i);
-
-%% test/octave.test/arith/prod-2.m
-%!assert(all (all (prod ([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i])
-%! == [-1+i, -8+8i, -27+27i])));
-
-%% test/octave.test/arith/prod-3.m
-%!error <Invalid call to prod.*> prod ();
-
-%% test/octave.test/arith/prod-4.m
-%!assert (all (prod ([1, 2; 3, 4], 1) == [3, 8]));
-%!assert (all (prod ([1, 2; 3, 4], 2) == [2; 12]));
-%!assert (prod (zeros (1, 0)) == 1);
-%!assert (all (size (prod (zeros (1, 0), 1)) == [1, 0]));
-%!assert (prod (zeros (1, 0), 2) == 1);
-%!assert (prod (zeros (0, 1)) == 1);
-%!assert (prod (zeros (0, 1), 1) == 1);
-%!assert (all (size (prod (zeros (0, 1), 2)) == [0, 1]));
-%!assert (all (size (prod (zeros (2, 0))) == [1, 0]));
-%!assert (all (size (prod (zeros (2, 0), 1)) == [1, 0]));
-%!assert (all (prod (zeros (2, 0), 2) == [1; 1]));
-%!assert (all (prod (zeros (0, 2)) == [1, 1]));
-%!assert (all (prod (zeros (0, 2), 1) == [1, 1]));
-%!assert (all (size (prod (zeros (0, 2), 2)) == [0, 1]));
-
-%% test/octave.test/arith/cumsum-1.m
-%!assert (cumsum ([1, 2, 3]) == [1, 3, 6]);
-%!assert (cumsum ([-1; -2; -3]) == [-1; -3; -6]);
-%!assert (cumsum ([i, 2+i, -3+2i, 4]) == [i, 2+2i, -1+4i, 3+4i]);
-
-%% test/octave.test/arith/cumsum-2.m
-%!assert(all (all (cumsum ([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i])
-%! == [1, 2, 3; 1+i, 2+2i, 3+3i; 2+2i, 4+4i, 6+6i])));
-
-%% test/octave.test/arith/cumsum-3.m
-%!error <Invalid call to cumsum.*> cumsum ();
-
-%% test/octave.test/arith/cumsum-4.m
-%!assert (all (cumsum ([1, 2; 3, 4], 1) == [1, 2; 4, 6]));
-%!assert (all (cumsum ([1, 2; 3, 4], 2) == [1, 3; 3, 7]));
-
-%% test/octave.test/arith/cumprod-1.m
-%!assert (cumprod ([1, 2, 3]) == [1, 2, 6]);
-%!assert (cumprod ([-1; -2; -3]) == [-1; 2; -6]);
-%!assert (cumprod ([i, 2+i, -3+2i, 4]) == [i, -1+2i, -1-8i, -4-32i]);
-
-%% test/octave.test/arith/cumprod-2.m
-%!assert(all (all (cumprod ([1, 2, 3; i, 2i, 3i; 1+i, 2+2i, 3+3i])
-%! == [1, 2, 3; i, 4i, 9i; -1+i, -8+8i, -27+27i])));
-
-%% test/octave.test/arith/cumprod-3.m
-%!error <Invalid call to cumprod.*> cumprod ();
-
-%% test/octave.test/arith/cumprod-4.m
-%!assert (all (cumprod ([2, 3; 4, 5], 1) == [2, 3; 8, 15]));
-%!assert (all (cumprod ([2, 3; 4, 5], 2) == [2, 6; 4, 20]));
-
-%% test/octave.test/arith/sumsq-1.m
-%!assert(sumsq ([1, 2, 3]) == 14 && sumsq ([-1; -2; 4i]) == 21);
-
-%% test/octave.test/arith/sumsq-2.m
-%!assert(all (all (sumsq ([1, 2, 3; 2, 3, 4; 4i, 6i, 2]) == [21, 49, 29])));
-
-%% test/octave.test/arith/sumsq-3.m
-%!error <Invalid call to sumsq.*> sumsq ();
-
-%% test/octave.test/arith/sumsq-4.m
-%!assert (all (sumsq ([1, 2; 3, 4], 1) == [10, 20]));
-%!assert (all (sumsq ([1, 2; 3, 4], 2) == [5; 25]));
-
-
--- a/test/test_func.m	Mon Jun 02 16:57:45 2008 +0200
+++ b/test/test_func.m	Wed May 28 01:03:35 2008 +0200
@@ -25,9 +25,10 @@
 %!function __fntestfunc__ (fn, mn, varargin)
 %!  typ = {'double', 'complex', 'logical', 'sparse', 'complex sparse', ...
 %!         'logical sparse', 'int8', 'int16', 'int32', 'int64', 'uint8', ...
-%!         'uint16', 'uint32', 'uint64', 'char', 'cell', 'struct'};
+%!         'uint16', 'uint32', 'uint64', 'char', 'cell', 'struct', ...
+%!         'single', 'single complex'};
 %!
-%!  cmplx = [2, 5];
+%!  cmplx = [2, 5, 18];
 %!  nlogical = [3, 6];
 %!  ninteger = [7, 8, 9, 10, 11, 12, 13, 14];
 %!  nsparse = [4, 5, 6];