frac 0.9.2 → 0.9.3

data/README.rdoc

@@ -0,0 +1,33 @@
+= Find rational approximation to given real number
+
+Convert Float to Rational with given denominator maximum
+
+  Math.frac(0.2, 100)  # => (1/5)
+  Math.frac(0.33, 10)  # => (1/3)
+  Math.frac(0.33, 100) # => (33/100)
+
+== Differe from ruby 1.9 build-in Float#to_r
+
+                                # Build-in
+  1.1.to_r                      # => (2476979795053773/2251799813685248)
+                                # Math#frac with big max denominator
+  Math.frac(1.1, 1_000_000_000) # => (11/10)  
+
+== Source
+
+Idea and most implementation from http://www.ics.uci.edu/~eppstein/numth/frap.c
+
+Based on the theory of continued fractions
+
+  if x = a1 + 1/(a2 + 1/(a3 + 1/(a4 + ...)))
+
+then best approximation is found by truncating this series
+(with some adjustments in the last term).
+
+Note the fraction can be recovered as the first column of the matrix
+
+  ( a1 1 ) ( a2 1 ) ( a3 1 ) ...
+  ( 1  0 ) ( 1  0 ) ( 1  0 )
+  
+Instead of keeping the sequence of continued fraction terms,
+we just keep the last partial product of these matrices.

data/ext/frac_ext.c

@@ -35,6 +35,9 @@ static VALUE find_fracs(VALUE mod, VALUE rv, VALUE dv)
   double startx, x = RFLOAT_VALUE(rv);
   long ai, maxden = NUM2LONG(dv);
 
+  if (maxden <= 0) 
+    rb_raise(rb_eArgError, "maximum denominator should be > 0");
+
   startx = x;
 
   /* initialize matrix */

data/lib/frac.rb

@@ -1,10 +1,15 @@
 
+require 'rational'
 require 'frac_ext'
 
 module Math
-  # Find rational approximation to given real number.
-  def self.frac(float, prec)
-    arr = find_fracs(float, prec)
-    arr[2].abs > arr[5].abs ? Rational(arr[3], arr[4]) : Rational(arr[0], arr[1])
+  class << self
+    private :find_fracs
+
+    # Find rational approximation to given real number.
+    def frac(float, maxden)
+      arr = find_fracs(Float(float), Integer(maxden))
+      arr[2].abs > arr[5].abs ? Rational(arr[3], arr[4]) : Rational(arr[0], arr[1])
+    end
   end
 end

data/test/frac_test.rb

@@ -0,0 +1,33 @@
+require 'test/unit'
+require File.join(File.dirname(__FILE__), %w{.. lib frac})
+
+class TC_Frac < Test::Unit::TestCase
+  def test_frac
+    [[ 0.333, 1,   3, 0x100],
+     [ 0.77, 77, 100, 0x100],
+     [ 0.2,   1,   5, 0x100],
+     [ 2,     2,   1, 0x100],
+     [-0.5,  -1,   2, 0x100],
+     [ 0,     0,   1, 0x100],
+     ["0.85",17,  20, 0x100],
+     [ 0.5,   1,   2, '1000'],
+     [ 0.001, 0,   1, 2]
+    ].each{|float, num, den, prec|
+      assert_equal Rational(num, den), Math.frac(float, prec), "#{float.inspect} -> #{num} / #{den}"
+    }
+  end
+	
+  def test_access
+    assert_raise NoMethodError do
+      Math.find_fracs 0.1, 0x100
+    end
+  end
+	
+  def test_validation
+    [[1.1, ''], [nil, 0x100], [1.1, 0], [1.5, -100]].each{|params|
+      assert_raise ArgumentError, TypeError do
+        Math.frac(*params)
+      end
+    }
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Pavel Valodzka
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 +03:00
+date: 2010-05-26 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,8 @@ files:
 - ext/frac_ext.c
 - ext/extconf.rb
 - lib/frac.rb
+- test/frac_test.rb
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/valodzka/frac
 licenses: []
@@ -59,6 +61,6 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
-summary: Find rational approximation to given real number.  based on the theory of continued fractions if x = a1 + 1/(a2 + 1/(a3 + 1/(a4 + ...))) then best approximation is found by truncating this series (with some adjustments in the last term). Note the fraction can be recovered as the first column of the matrix ( a1 1 ) ( a2 1 ) ( a3 1 ) ... ( 1  0 ) ( 1  0 ) ( 1  0 )  Instead of keeping the sequence of continued fraction terms, we just keep the last partial product of these matrices.
+summary: Find rational approximation to given real number.  Based on the theory of continued fractions  if x = a1 + 1/(a2 + 1/(a3 + 1/(a4 + ...)))  then best approximation is found by truncating this series (with some adjustments in the last term). Note the fraction can be recovered as the first column of the matrix  ( a1 1 ) ( a2 1 ) ( a3 1 ) ... ( 1  0 ) ( 1  0 ) ( 1  0 )  Instead of keeping the sequence of continued fraction terms, we just keep the last partial product of these matrices.
 test_files: []