# HG changeset patch
# User jwe
# Date 1106848257 0
# Node ID 8bf86c0fad1b0f2e2b68b234eddfc99ff0e44db0
# Parent  2d03212b76b4de13c51537e617024869fd48f103
[project @ 2005-01-27 17:50:57 by jwe]

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-27  David Bateman  <dbateman@free.fr>
+
+	* strings/dec2base.m: Be even more careful about handling all digits.
+
+2005-01-27  Paul Kienzle  <pkienzle@users.sf.net>
+
+	* strings/dec2base.m: Use integer arithmetic to count number of digits.
+
 2005-01-27  Benjamin Hall  <benjamin.hall@pw.utc.com>
 
 	* statistics/base/median.m: Make it work for the scalar case too.
diff --git a/scripts/strings/dec2base.m b/scripts/strings/dec2base.m
--- a/scripts/strings/dec2base.m
+++ b/scripts/strings/dec2base.m
@@ -73,8 +73,9 @@
     error ("dec2base: base must be between 2 and 36 or a string of symbols");
   endif
   
-  ## determine number of digits required to handle all numbers
-  max_len = floor (log (max (max (n), 1)) ./ log (base)) + 1;
+  ## determine number of digits required to handle all numbers, can overflow
+  ## by 1 digit
+  max_len = round (log (max (max (n), 1)) ./ log (base)) + 1;
 
   if (nargin == 3)
     max_len = max (max_len, len);
@@ -88,4 +89,39 @@
   ## convert digits to symbols
   retval = reshape (symbols (digits+1), size (digits));
 
+  ## Check if the first element is the zero symbol
+  if (all (retval(:,1) == symbols(1)))
+    retval = retval(:,2:end);
+  endif
+
 endfunction
+
+%!test
+%! s0='';
+%! for n=1:13
+%!   for b=2:16
+%!     pp=dec2base(b^n+1,b);
+%!     assert(dec2base(b^n,b),['1',s0,'0']);
+%!     assert(dec2base(b^n+1,b),['1',s0,'1']);
+%!   end
+%!   s0=[s0,'0'];
+%! end
+
+%!test
+%! digits='0123456789ABCDEF';
+%! for n=1:13
+%!   for b=2:16
+%!     pm=dec2base(b^n-1,b);
+%!     assert(length(pm),n);
+%!     assert(all(pm==digits(b)));
+%!   end
+%! end
+
+%!test
+%! for b=2:16
+%!   assert(dec2base(0,b),'0');
+%! end
+
+%!test
+%!   assert(dec2base(2^51-1,2),
+%!          '111111111111111111111111111111111111111111111111111');