nio 0.2.3 → 0.2.4

data/lib/nio/repdec.rb

@@ -48,8 +48,8 @@ module Nio
       ch_code = ch_code.chr if ch_code.kind_of?(Numeric)
       @dncase ? ch_code.downcase[0] : ch_code.upcase[0]
     end
-  end  
-    
+  end
+  
   
   # RepDec handles repeating decimals (repeating numerals actually)
   class RepDec
@@ -76,7 +76,7 @@ module Nio
         
         @max_d = 5000
         
-      end  
+      end
       attr_accessor :begin_rep, :end_rep, :auto_rep, :dec_sep, :grp_sep, :grp, :max_d
       attr_accessor :nan_txt, :inf_txt
       
@@ -105,7 +105,7 @@ module Nio
       end
       
       def set_digits(ds, dncase=false, casesens=false)
-        if ds  
+        if ds
           @digits_defined = true
           if ds.kind_of?(DigitsDef)
             @digits = ds
@@ -144,7 +144,7 @@ module Nio
        self
     end
     
-    def setS(str, opt=DEF_OPT) 
+    def setS(str, opt=DEF_OPT)
       setZ(opt.digits_defined? ? opt.digits.radix : @radix);
       sgn,i_str,f_str,ri,detect_rep = RepDec.parse(str,opt)
       if i_str.kind_of?(Symbol)
@@ -155,7 +155,7 @@ module Nio
       @sign = sgn
       @rep_i = ri if ri
       f_str.each_byte{|b| @d.push opt.digits.digit_value(b)} unless f_str.nil?
-      
+
       if detect_rep then
         
         for l in 1..(@d.length/2)
@@ -169,30 +169,30 @@ module Nio
                   if @d[-m..-1]!=@d[-i*m...-i*m+m] then
                      reduce_l = false;
                      break;
-                   end
+                  end
                 end
                 if reduce_l then
                    l = m
                    break
-                end 
+                end
               end
             end
-                     
+            
             
             @rep_i = @d.length - 2*l;
             l.times { @d.pop }
             
             
-            while @d.length >= 2*l && @d[-l..-1]==@d[-2*l...-l] 
+            while @d.length >= 2*l && @d[-l..-1]==@d[-2*l...-l]
               
               @rep_i = @d.length - 2*l;
               l.times { @d.pop }
               
             end
-                
+            
             break
           end
-        end 
+        end
         
       end
 
@@ -201,10 +201,10 @@ module Nio
         if @d.length==@rep_i+1 && @d[@rep_i]==0 then
           @rep_i = nil;
           @d.pop;
-        end  
+        end
       end
       @d.pop while @d[@d.length-1]==0
-        
+      
       self
     end
     
@@ -248,7 +248,7 @@ module Nio
       end
       
       unless i_str.kind_of?(Symbol)
-        j = 0;  
+        j = 0;
         f_str = ''
         while i<l
           ch = str[i,1];
@@ -301,9 +301,9 @@ module Nio
             check.setS s+opt.auto_rep, opt;
             #print " s=",s,"\n"
             #print " self=",self.to_s,"\n"
-             while check!=self
+            while check!=self
               for i in @rep_i...@d.length
-               s << opt.digits.digit_char(@d[i])
+                s << opt.digits.digit_char(@d[i])
               end
               check.setS s+opt.auto_rep, opt;
             end
@@ -311,7 +311,7 @@ module Nio
             s += opt.auto_rep;
          end
        else
-         s += opt.end_rep if @rep_i!=nil;         
+         s += opt.end_rep if @rep_i!=nil;
        end
        return s;
     end
@@ -337,7 +337,7 @@ module Nio
               @d.pop if i==@d.length;
             end
             i -= 1;
-          end 
+          end
           @ip += carry;
           
         end
@@ -424,10 +424,10 @@ module Nio
           x *= @radix
           d,x = x.divmod(y)
           @d.push d
-          i += 1;  
+          i += 1;
         end
       end
-      self  
+      self
     end
     
     def getQ(opt=DEF_OPT)
@@ -442,7 +442,7 @@ module Nio
       end if
 
       
-      n = @d.length 
+      n = @d.length
       a = @ip
       b = a
       for i in 0...n
@@ -463,25 +463,25 @@ module Nio
       d = Nio.gcd(x,y)
       x /= d
       y /= d
-     
+
       x = -x if @sign<0
-     
-      return x,y;    
+
+      return x,y;
     end
     
     #protected
     
     attr_reader :d, :ip, :rep_i, :sign;
     attr_writer :d, :ip, :rep_i, :sign;
-      
-  end
     
+  end
+  
   
   def RepDec.group_digits(digits, opt)
     if opt.grp_sep!=nil && opt.grp_sep!='' && opt.grp.length>0
-      grouped = ''      
+      grouped = ''
       i = 0
-      while digits.length>0  
+      while digits.length>0
         l = opt.grp[i]
         l = digits.length if l>digits.length
         grouped = opt.grp_sep + grouped if grouped.length>0
@@ -492,7 +492,7 @@ module Nio
       grouped
     else
      digits
-    end    
+    end
   end
   
   module_function
@@ -501,7 +501,7 @@ module Nio
     while b!=0 do
       a,b = b, a.modulo(b)
     end
-    return a.abs;  
+    return a.abs;
   end
   
 end

data/lib/nio/rtnlzr.rb

@@ -1,11 +1,6 @@
 # Rationalization of floating point numbers.
 #--
-# Copyright (C) 2003-2005, Javier Goizueta <javier@goizueta.info>
-#
-# This program 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 2
-# of the License, or (at your option) any later version.
+
 #++
 #
 # Author::    Javier Goizueta (mailto:javier@goizueta.info)
@@ -27,12 +22,14 @@
 
 require 'nio/tools'
 
-require 'nio/flttol'
+require 'flt/tolerance'
 
 require 'rational'
 
 require 'bigdecimal'
 
+require 'flt'
+
 
 class Float
   # Conversion to Rational preserving the exact value of the number.
@@ -42,15 +39,15 @@ class Float
       return Rational(0,0) if self.nan?
       return self<0 ? Rational(-1,0) : Rational(1,0)
     end
-    
+
     f,e = Math.frexp(self)
-        
+
     if e < Float::MIN_EXP
        bits = e+Float::MANT_DIG-Float::MIN_EXP
     else
-       bits = [Float::MANT_DIG,e].max  
+       bits = [Float::MANT_DIG,e].max
        #return Rational(self.to_i,1) if bits<e
-    end      
+    end
       p = Math.ldexp(f,bits)
       e = bits - e
       if e<Float::MAX_EXP
@@ -78,6 +75,13 @@ class BigDecimal
   end
 end
 
+class Flt::Num
+  
+  def nio_xr
+    to_r
+  end
+end
+
 class Integer
   
   def nio_xr
@@ -90,7 +94,7 @@ class Rational
   def nio_xr
     return self
   end
-  
+
   # helper method to return both the numerator and denominator
   def nio_num_den
     return [numerator,denominator]
@@ -99,40 +103,39 @@ end
 
 
 class Float
-  # Conversion to Rational. The optional argument must be one of:
-  # - a Nio::Tolerance that defines the admisible tolerance;
-  #   in that case, the smallest denominator rational within the
-  #   tolerance will be found (which may take a long time for
-  #   small tolerances.)
-  # - an integer that defines a maximum value for the denominator.
-  #   in which case, the best approximation with that maximum 
-  #   denominator will be returned.
-  def nio_r(tol = Nio::Tolerance.big_epsilon)
+  
+  def nio_r(tol = Flt.Tolerance(:big_epsilon))
     case tol
       when Integer
         Rational(*Nio::Rtnlzr.max_denominator(self,tol,Float))
       else
-        Rational(*Nio::Rtnlzr.new(Nio::Tol(tol)).rationalize(self))      
+        Rational(*Nio::Rtnlzr.new(tol).rationalize(self))
     end
   end
 end
 
 class BigDecimal
-  # Conversion to Rational. The optional argument must be one of:
-  # - a Nio::BigTolerance that defines the admisible tolerance;
-  #   in that case, the smallest denominator rational within the
-  #   tolerance will be found (which may take a long time for
-  #   small tolerances.)
-  # - an integer that defines a maximum value for the denominator.
-  #   in which case, the best approximation with that maximum 
-  #   denominator will be returned.
+  
   def nio_r(tol = nil)
-    tol ||= BigTolerance.decimals([precs[0],Float::DIG].max,:sig)
+    tol ||= Flt.Tolerance([precs[0],Float::DIG].max,:sig_decimals)
     case tol
       when Integer
         Rational(*Nio::Rtnlzr.max_denominator(self,tol,BigDecimal))
       else
-        Rational(*Nio::Rtnlzr.new(Nio::BigTol(tol)).rationalize(self))
+        Rational(*Nio::Rtnlzr.new(tol).rationalize(self))
+    end
+  end
+end
+
+class Flt::Num
+  
+  def nio_r(tol = nil)
+    tol ||= Flt.Tolerance(Rational(1,2),:ulps)
+    case tol
+      when Integer
+        Rational(*Nio::Rtnlzr.max_denominator(self,tol,num_class))
+      else
+        Rational(*Nio::Rtnlzr.new(tol).rationalize(self))
     end
   end
 end
@@ -140,14 +143,14 @@ end
 module Nio
   
   
-  # This class provides conversion of fractions 
+  # This class provides conversion of fractions
   # (as approximate floating point numbers)
   # to rational numbers.
   class Rtnlzr
     include StateEquivalent
 
     # Create Rationalizator with given tolerance.
-    def initialize(tol=Tolerance.new)
+    def initialize(tol=Flt.Tolerance(:epsilon))
       @tol = tol
     end
 
@@ -159,8 +162,8 @@ module Nio
     def rationalize(x)
       rationalize_Knuth(x)
     end
-    
-    # This algorithm is derived from exercise 39 of 4.5.3 in 
+
+    # This algorithm is derived from exercise 39 of 4.5.3 in
     # "The Art of Computer Programming", by Donald E. Knuth.
     def rationalize_Knuth(x)
       
@@ -175,14 +178,14 @@ module Nio
           negans = true
           x = -x
         end
-        dx = num_tol ? @tol : @tol.get_value(x)
-        
+        dx = num_tol ? @tol : @tol.value(x)
+
         
           x = x.nio_xr
           dx = dx.nio_xr
           xp,xq = (x-dx).nio_num_den
           yp,yq = (x+dx).nio_num_den
-          
+
             a = []
             fin,odd = false,false
             while !fin && xp!=0 && yp!=0
@@ -205,13 +208,13 @@ module Nio
             p,q = 1,0
             (1..a.size).each{|i| p,q=q+p*a[-i],p}
             num,den = q,p
-         
         
+
         num = -num if negans
       end
       return num,den
       
-             
+      
     end
     # This is algorithm PDQ2 by Joe Horn.
     def rationalize_Horn(x)
@@ -227,8 +230,8 @@ module Nio
           negans = true
           x = -x
         end
-        dx = num_tol ? @tol : @tol.get_value(x)
-        
+        dx = num_tol ? @tol : @tol.value(x)
+
         
         z,t = x,dx # renaming
 
@@ -257,19 +260,19 @@ module Nio
             else
               hi = mid
             end
-          end until hi-lo <= 1 
+          end until hi-lo <= 1
           x = cn - pn*lo
-          y = cd - pd*lo    
-        end 
-         
+          y = cd - pd*lo
+        end
+        
         num,den = x,y # renaming
-         
         
+
         num = -num if negans
       end
       return num,den
       
-             
+      
     end
     # This is from a RPL program by Tony Hutchins (PDR6).
     def rationalize_HornHutchins(x)
@@ -285,8 +288,8 @@ module Nio
           negans = true
           x = -x
         end
-        dx = num_tol ? @tol : @tol.get_value(x)
-        
+        dx = num_tol ? @tol : @tol.value(x)
+
         
         z,t = x,dx # renaming
 
@@ -315,19 +318,19 @@ module Nio
             else
               hi = mid
             end
-          end until hi-lo <= 1 
+          end until hi-lo <= 1
           x = cn - pn*lo
-          y = cd - pd*lo    
-        end 
-         
+          y = cd - pd*lo
+        end
+        
         num,den = x,y # renaming
-         
         
+
         num = -num if negans
       end
       return num,den
       
-             
+      
     end
   end
   
@@ -340,33 +343,36 @@ module Nio
   def Rtnlzr.max_denominator(f, max_den=1000000000, num_class=nil)
     return nil if max_den<1
     num_class ||= f.class
+    context = num_class.context
     return mth.ip(f),1 if mth.fp(f)==0
 
-    one = Nio.numeric_cast(1, num_class)
-    
-      sign = f<0
-      f = -f if sign
+    cast = lambda{|x| context.Num(x)}
 
-      a,b,c = 0,1,f
-      while b<max_den and c!=0
-        cc = one/c
-        a,b,c = b, mth.ip(cc)*b+a, mth.fp(cc)
-      end
+    one = cast.call(1)
 
-    
-      if b>max_den
-        b -= a*mth.ceil((b-max_den)/Float(a))
-      end
-      
+     sign = f<0
+     f = -f if sign
 
-      f1,f2 = [a,b].collect{|x| mth.abs(mth.rnd(x*f)/Nio.numeric_cast(x, num_class)-f)}
+     a,b,c = 0,1,f
+     while b<max_den and c!=0
+       cc = one/c
+       a,b,c = b, mth.ip(cc)*b+a, mth.fp(cc)
+     end
 
-      a = f1>f2 ? b : a
 
-      num,den = mth.rnd(a*f).to_i,a
-      den = 1 if mth.abs(den)<1
-      
-      num = -num if sign
+     if b>max_den
+       b -= a*mth.ceil(cast.call(b-max_den)/a)
+     end
+
+
+     f1,f2 = [a,b].collect{|x| mth.abs(cast.call(mth.rnd(x*f))/x-f)}
+
+     a = f1>f2 ? b : a
+
+     num,den = mth.rnd(a*f).to_i,a
+     den = 1 if mth.abs(den)<1
+
+     num = -num if sign
 
     return num,den
   end
@@ -381,13 +387,13 @@ module Nio
       end
 
       def self.ip(x)
-        # x.to_i.to_f
+        # Note that ceil, floor return an Integer for Float and Flt::Num, but not for BigDecimal
         (x<0 ? x.ceil : x.floor).to_i
       end
 
       def self.rnd(x)
-        #x.round.to_i
-        x.round
+        # Note that round returns an Integer for Float and Flt::Num, but not for BigDecimal
+        x.round.to_i
       end
 
       def self.abs(x)
@@ -395,8 +401,9 @@ module Nio
       end
 
       def self.ceil(x)
+        # Note that ceil returns an Integer for Float and Flt::Num, but not for BigDecimal
         x.ceil.to_i
-      end    
+      end
     end
     def self.mth; Mth; end
   end