nio 0.2.0 → 0.2.1

data/History.txt

@@ -1,5 +1,17 @@
-== 0.2.0 2007-09-22
-
-* Initial release
+== 0.2.1 2007-12-15
+
+* Minor enhancements
+  - The RepDec maximum number of digits can now be changed, and the default
+    value has been incremented to 5000 digits (was 2048). With the new value
+    the minimum value of a IEEE 754 extended number can now be shown as
+    different from zero.
+  - Performance optimizations in RepDec#setQ
+* Bug corrections
+  - Fixed a problem in the formatted output of BigDecimals which affected large numbers.
+  - Fix minor problem with nextfloat
+
+== 0.2.0 2007-09-22
+
+* Initial release
   - The Nio library has been extracted from and old project
-    and packages as a Gem.
+    and packaged as a Gem.

data/lib/nio/flttol.rb

@@ -26,10 +26,13 @@ class Float
     
     x = 1.0
     _bits_ = 0
-    begin 
+    while 1!=x+1
       _bits_ += 1
       x /= 2
-    end while 1!=x+1
+    end
+    if ((1.0+2*x)-1.0)>2*x
+      _bits_ -= 1
+    end
               
     # Number of RADIX-base digits of precision in a Float
     MANT_DIG = _bits_

data/lib/nio/fmt.rb

@@ -522,11 +522,14 @@ module Nio
     # - <tt>:round</tt> rounding mode applied to conversions
     #   (this is relevant for both input and output). It must be one of:
     #   [<tt>:inf</tt>]
-    #     rounds towards infinite; 1.5 is rounded to 2, -1.5 to -2
+    #     rounds to nearest with ties toward infinite; 
+    #       1.5 is rounded to 2, -1.5 to -2
     #   [<tt>:zero</tt>]
-    #     rounds towards zero; 1.5 is rounded to 1, -1.5 to 2
+    #     rounds to nearest with ties toward zero; 
+    #       1.5 is rounded to 1, -1.5 to 2
     #   [<tt>:even</tt>]
-    #     rounds to the nearest even digit 1.5 rounds to 2, 2.5 to 2
+    #     rounds to the nearest with ties toward an even digit;
+    #       1.5 rounds to 2, 2.5 to 2
     # - <tt>:approx</tt> approximate mode
     #   [<tt>:only_sig</tt>]
     #     (the default) treats the value as an approximation and only
@@ -1263,8 +1266,7 @@ module Nio
   end
   
   def ratio_float(u,v,k,round_mode,beta=Float::RADIX,n=Float::MANT_DIG)
-    q = u.div v
-    r = u-q*v
+    q,r = u.divmod(v)
     v_r = v-r
     z = Math.ldexp(q,k)
     if r<v_r
@@ -1278,14 +1280,20 @@ module Nio
     end
   end
   
+  # valid only for non-negative x
   def nextfloat(x)
     f,e = Math.frexp(x)  
     e = Float::MIN_EXP if f==0
     e = [Float::MIN_EXP,e].max
     dx = Math.ldexp(1,e-Float::MANT_DIG) #Math.ldexp(Math.ldexp(1.0,-Float::MANT_DIG),e)  
-    x + dx
+    if f==(1.0 - Math.ldexp(1,-Float::MANT_DIG))
+      x + dx*2
+    else
+      x + dx
+    end
   end
 
+  # valid only for non-negative x
   def prevfloat(x)
     f,e = Math.frexp(x)  
     e = Float::MIN_EXP if f==0
@@ -1316,7 +1324,8 @@ module Nio
        roundh = true
      else
        # here we don't assume any rounding in the floating point numbers
-       # the result is valid for any rounding
+       # the result is valid for any rounding but may produce more digits
+       # than stricly necessary for specifica rounding modes.
        roundl = false
        roundh = false
    end
@@ -1444,7 +1453,8 @@ module Nio
        roundh = true
      else
        # here we don't assume any rounding in the floating point numbers
-       # the result is valid for any rounding
+       # the result is valid for any rounding but may produce more digits
+       # than stricly necessary for specifica rounding modes.
        roundl = false
        roundh = false
    end
@@ -1831,6 +1841,7 @@ class BigDecimal
           dec_pos += exp
           neutral.set sign, txt, dec_pos, nil, fmt.get_base_digits(10), true, fmt.get_round
           
+          converted = true
         end
       end  
       if !converted

data/lib/nio/repdec.rb

@@ -74,7 +74,7 @@ module Nio
         @digits = DigitsDef.new
         @digits_defined = false
         
-        @max_d = 2048
+        @max_d = 5000
         
       end  
       attr_accessor :begin_rep, :end_rep, :auto_rep, :dec_sep, :grp_sep, :grp, :max_d
@@ -379,6 +379,17 @@ module Nio
     #  return !(self==c);
     #end
     
+    # Change the maximum number of digits that RepDec objects
+    # can handle.
+    def RepDec.maximum_number_of_digits=(n)
+      @max_d = [n,2048].max
+    end
+    # Return the maximum number of digits that RepDec objects
+    # can handle.
+    def RepDec.maximum_number_of_digits
+      @max_d
+    end
+    
     def setQ(x,y, opt=DEF_OPT)
       @radix = opt.digits.radix if opt.digits_defined?
       xy_sign = x==0 ? 0 : x<0 ? -1 : +1;
@@ -399,7 +410,7 @@ module Nio
         return self
       end
       
-      k = [];
+      k = {};
       @ip = x.div(y) #x/y;
       x -= @ip*y;
       i = 0;
@@ -407,12 +418,12 @@ module Nio
 
       max_d = opt.max_d
       while x>0 && @rep_i==nil && (max_d<=0 || i<max_d)
-        @rep_i = k.index(x)
+        @rep_i = k[x]
         if @rep_i.nil? then
-          k.push x;
+          k[x] = i;
           x *= @radix
-          @d.push x.div(y) # x/y;
-          x-= @d[i]*y;
+          d,x = x.divmod(y)
+          @d.push d
           i += 1;  
         end
       end

data/lib/nio/version.rb

@@ -2,7 +2,7 @@ module Nio #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_fmt.rb

@@ -152,7 +152,10 @@ class TestFmt < Test::Unit::TestCase
         x = BigDecimal(x.to_s)
         assert_equal x,BigDecimal.nio_read(x.nio_write(fmt),fmt)
       end
-      
+      assert_equal "1E500",BigDec('1E500').nio_write        
+      assert_equal "1E-500",BigDec('1E-500').nio_write        
+      assert_equal "-1E500",BigDec('-1E500').nio_write        
+      assert_equal "-1E-500",BigDec('-1E-500').nio_write            
     end
   
     def test_Rational

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: nio
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-09-23 00:00:00 +02:00
+  version: 0.2.1
+date: 2007-12-15 00:00:00 +01:00
 summary: Numeric input/output
 require_paths: 
 - lib