flt 1.3.4 → 1.4.0

data/test/helper.rb

@@ -2,6 +2,7 @@ require 'test/unit'
 $: << "." unless $:.include?(".") # for Ruby 1.9.2
 require File.expand_path(File.join(File.dirname(__FILE__),'/../lib/flt'))
 require 'enumerator'
+require 'yaml'
 include Flt
 
 def initialize_context
@@ -93,6 +94,40 @@ def float_split(x)
   [Math.ldexp(s,Float::MANT_DIG).to_i,e-Float::MANT_DIG]
 end
 
+def float_data
+  data_file = File.join(File.dirname(__FILE__) ,'data/float_data.yml')
+  if File.exists?(data_file)
+    YAML.load(File.read(data_file)).map{|x| [x].pack('H*').unpack('E')[0]}
+  else
+    srand 349842
+    data = []
+    100.times do
+      x = rand
+      x *= rand(1000) if rand<0.5
+      x /= rand(1000) if rand<0.5
+      x *= rand(9999) if rand<0.5
+      x /= rand(9999) if rand<0.5
+      data << x
+    end
+    data << 1.0/3
+    data << 10.0/3
+    data << 100.0/3
+    data << 1.0/30
+    data << 1.0/300
+    data << 0.1
+    data << 0.01
+    data << 0.001
+    50.times do
+      data << random_num(Float)
+    end
+    data += data.map{|x| -x}
+    data += special_nums(Float)
+    data += singular_nums(Float)
+    File.open(data_file,'w') { |out| out << data.map{|x| [x].pack('E').unpack('H*')[0].upcase }.to_yaml }
+    data
+  end
+end
+
 def each_pair(array, &blk)
   if RUBY_VERSION>="1.9"
     array.each_slice(2,&blk)

data/test/test_base_digits.rb

@@ -25,25 +25,25 @@ class TestBaseDigits < Test::Unit::TestCase
 
 
     [10,15,20,100].each do |precision|
-      DecNum.context(precision: precision) do
+      DecNum.context(:precision => precision) do
         assert_equal precision, DecNum.context.representable_digits(10)
         assert_equal precision, DecNum.context.necessary_digits(10)
       end
 
-      BinNum.context(precision: precision) do
+      BinNum.context(:precision => precision) do
         assert_equal precision, BinNum.context.representable_digits(2)
         assert_equal precision, BinNum.context.necessary_digits(2)
       end
     end
 
-    DecNum.context(exact: true) do
+    DecNum.context(:exact => true) do
       assert_nil DecNum.context.representable_digits(10)
       assert_nil DecNum.context.necessary_digits(10)
       assert_nil DecNum.context.representable_digits(2)
       assert_nil DecNum.context.necessary_digits(2)
     end
 
-    BinNum.context(exact: true) do
+    BinNum.context(:exact => true) do
       assert_nil BinNum.context.representable_digits(10)
       assert_nil BinNum.context.necessary_digits(10)
       assert_nil BinNum.context.representable_digits(2)

data/test/test_dectest.rb

@@ -112,9 +112,9 @@ class TestBasic < Test::Unit::TestCase
 
   def test_dec
     missing = []
-    dir = File.join(File.dirname(__FILE__), 'dectest')
+    dir = File.join(File.dirname(__FILE__), 'data/dectest')
     if !File.exists?(dir)
-      skip "No dectest data present. Get it from http://speleotrove.com/decimal/dectest.zip and put it in test/dectest"
+      skip "No dectest data present. Get it from http://speleotrove.com/decimal/dectest.zip and put it in test/data/dectest"
       return
     end
     Dir[File.join(dir, '*.decTest')].each do |fn|

data/test/test_exact.rb

@@ -148,13 +148,13 @@ class TestExact < Test::Unit::TestCase
     DecNum.context.precision = 10
     refute DecNum.context.exact?
     assert_equal 10, DecNum.context.precision
-    DecNum.context(exact: true) do
+    DecNum.context(:exact => true) do
       assert DecNum.context.exact?
       assert_equal 0, DecNum.context.precision
     end
     refute DecNum.context.exact?
     assert_equal 10, DecNum.context.precision
-    DecNum.context(precision: :exact) do
+    DecNum.context(:precision => :exact) do
       assert DecNum.context.exact?
       assert_equal 0, DecNum.context.precision
     end

data/test/test_formatter.rb

@@ -60,7 +60,7 @@ class TestExact < Test::Unit::TestCase
 
 def test_binary_to_repeating_decimal_formatter
     Flt::BinNum.context = Flt::BinNum::IEEEDoubleContext
-    formatter = Flt::Support::Formatter.new(BinNum.radix, BinNum.context.etiny, 10, raise_on_repeat: false)
+    formatter = Flt::Support::Formatter.new(BinNum.radix, BinNum.context.etiny, 10, :raise_on_repeat => false)
 
     x = BinNum(0.1)
     s, f, e = x.split
@@ -154,7 +154,7 @@ def test_binary_to_repeating_decimal_formatter
 
   def test_decimal_to_repeating_binary_formatter
     Flt::DecNum.context.precision = 8
-    formatter = Flt::Support::Formatter.new(DecNum.radix, DecNum.context.etiny, 2, raise_on_repeat: false)
+    formatter = Flt::Support::Formatter.new(DecNum.radix, DecNum.context.etiny, 2, :raise_on_repeat => false)
 
     x = DecNum('0.1')
     s, f, e = x.split

data/test/test_rationalizer.rb

@@ -0,0 +1,141 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
+
+require 'flt/math'
+require 'bigdecimal/math'
+
+if RUBY_VERSION>="1.9.2"
+  BgMth = BigMath
+else
+  module BgMth
+    extend BigMath
+  end
+end
+
+class TestRationalizer < Test::Unit::TestCase
+
+  def setup
+    initialize_context
+    Flt::DecNum.context = Flt::DecNum::DefaultContext
+    @data = float_data
+  end
+
+  R = Flt::Support::Rationalizer
+
+  def test_basic_rationalizer
+    # basic Rationalizer tests
+    r = R.new
+    assert_equal [13,10], r.rationalize(1.3)
+    assert_equal [13,10], R.max_denominator(1.3,10)
+    assert_equal [13,10], R.max_denominator(BigDecimal('1.3'),10)
+    assert_equal [1,3], R.max_denominator(1.0/3,10)
+    assert_equal [1,3], R.max_denominator(BigDecimal('1')/3,10)
+    assert_equal [13,10], R.max_denominator(Flt.DecNum('1.3'),10)
+    assert_equal [1,3], R.max_denominator(Flt.DecNum('1')/3,10)
+
+    # basic tests of Float.context.rationalize
+    assert_equal Rational(1,3), Float.context.rationalize(1.0/3.0)
+    assert_equal Rational(2,3), Float.context.rationalize(2.0/3.0)
+    assert_equal Rational(1237,1234), Float.context.rationalize(1237.0/1234.0)
+    assert_equal Rational(89,217), Float.context.rationalize(89.0/217.0)
+
+    # rationalization of Floats using a tolerance
+    t = Flt.Tolerance(1e-15/2,:floating)
+    assert_equal Rational(540429, 12500), Float.context.rationalize(43.23432, t, :strict)
+    assert_equal Rational(6636649, 206596193), Float.context.rationalize(0.032123772, t, :strict)
+    assert_equal Rational(280943, 2500000), Float.context.rationalize(0.1123772, t, :strict)
+    assert_equal Rational(39152929, 12500), Float.context.rationalize(3132.23432, t, :strict)
+    assert_equal Rational(24166771439, 104063), Float.context.rationalize(232232.123223432, t, :strict)
+    assert_equal Rational(792766404965, 637), Float.context.rationalize(1244531247.98273123, t, :strict)
+
+    # @data.each do |x|
+    #  assert t.eq?(x, Float.context.rationalize(x,t).to_f), "out of tolerance: #{x.inspect}"
+    # end
+
+    # rationalization with maximum denominator
+    assert_equal Rational(9441014047197, 7586), Float.context.rationalize(1244531247.98273123, 10000)
+    assert_equal Rational(11747130449709, 9439), BigDecimal.context.rationalize(BigDecimal('1244531247.982731230'), 10000)
+
+    assert_equal Rational(11747130449709, 9439), Flt::DecNum.context.rationalize(Flt::DecNum('1244531247.982731230'), 10000)
+
+    # approximate a value in [0.671,0.672];
+    #  Float
+    assert_equal [43,64], R[Flt.Tolerance(0.0005)].rationalize(0.6715)
+    assert_equal [43,64], R[Rational(5,10000)].rationalize(0.6715)
+    # BinNum
+    assert_equal [43,64], R[Flt.Tolerance(Flt.BinNum('0.0005'))].rationalize(Flt::BinNum('0.6715'))
+    assert_equal [43,64], R[Flt.Tolerance(Rational(5,10000))].rationalize(Flt::BinNum('0.6715'))
+    #  BigDecimal
+    assert_equal [43,64], R[Flt.Tolerance('0.0005')].rationalize(BigDecimal('0.6715'))
+    assert_equal [43,64], R[Rational(5,10000)].rationalize(BigDecimal('0.6715'))
+    # DecNum
+    assert_equal [43,64], R[Flt.Tolerance(Flt.DecNum('0.0005'))].rationalize(Flt::DecNum('0.6715'))
+    assert_equal [43,64], R[Flt.Tolerance(Rational(5,10000))].rationalize(Flt::DecNum('0.6715'))
+    #
+    assert_equal Rational(43,64), Float.context.rationalize(0.6715, 0.0005)
+    assert_equal Rational(43,64), Float.context.rationalize(0.6715, Rational(5,10000))
+    assert_equal Rational(47,70), Float.context.rationalize(0.6715, 70)
+    assert_equal Rational(45,67), Float.context.rationalize(0.6715, 69)
+    assert_equal Rational(2,3), Float.context.rationalize(0.6715, 10)
+
+    # some PI tests
+    assert_equal Rational(899125804609,286200632530), BigDecimal.context.rationalize(BgMth.PI(64), Flt.Tolerance(Flt.DecNum('261E-24')))
+    assert_equal Rational(899125804609,286200632530), BigDecimal.context.rationalize(BgMth.PI(64), Flt.Tolerance(Flt.DecNum('261E-24')))
+    assert_equal Rational(899125804609,286200632530), BigDecimal.context.rationalize(BgMth.PI(64), Flt.DecNum('261E-24'))
+    assert_equal Rational(899125804609,286200632530), BigDecimal.context.rationalize(BgMth.PI(64), 261E-24)
+
+    assert_equal Rational(899125804609,286200632530), Flt::DecNum.context.rationalize(Flt::DecNum::Math.pi(64), Flt.Tolerance(Flt.DecNum('261E-24')))
+    assert_equal Rational(899125804609,286200632530), Flt::DecNum.context.rationalize(Flt::DecNum::Math.pi(64), Flt.Tolerance(Flt.DecNum('261E-24')))
+    assert_equal Rational(899125804609,286200632530), Flt::DecNum.context.rationalize(Flt::DecNum::Math.pi(64), Flt.DecNum('261E-24'))
+    assert_equal Rational(899125804609,286200632530), Flt::DecNum.context.rationalize(Flt::DecNum::Math.pi(64), 261E-24)
+
+    # DecNum tests
+    #t = Flt.Tolerance(Flt.DecNum('1e-15'),:floating)
+    t = Flt.Tolerance(20, :sig_decimals)
+    @data.each do |x|
+      x = Flt.BinNum(x).to_decimal_exact
+      next if x.special?
+      q = x.rationalize(t)
+      assert t.eq?(x, Flt.DecNum(q)), "out of tolerance: #{x.inspect} #{Flt.DecNum(q)}"
+    end
+
+    # Flt tests
+    #t = Flt.Tolerance(Flt.DecNum('1e-15'),:floating)
+    t = Flt.Tolerance(20,:sig_decimals)
+    @data.each do |x|
+      x = Flt.BinNum(x)
+      next if x.special?
+      q = x.rationalize(t)
+      assert t.eq?(x, Flt.BinNum(q)), "out of tolerance: #{x.inspect} #{Flt.BinNum(q)}"
+    end
+  end
+
+  def test_compare_algorithms
+    r = R[Flt.Tolerance(1e-5,:floating)]
+    @data.each do |x|
+      q1 = r.rationalize_Knuth(x)
+      q2 = r.rationalize_Horn(x)
+      q3 = r.rationalize_HornHutchins(x)
+      #q4 = r.rationalize_KnuthB(x)
+      q1 = [-q1[0],-q1[1]] if q1[1] < 0
+      q2 = [-q2[0],-q2[1]] if q2[1] < 0
+      q3 = [-q3[0],-q3[1]] if q3[1] < 0
+      assert_equal q1, q2
+      assert_equal q1, q3
+      #assert_equal q1, q4
+    end
+    r = R[Flt.Tolerance(:epsilon)]
+    @data.each do |x|
+      q1 = r.rationalize_Knuth(x)
+      q2 = r.rationalize_Horn(x)
+      q3 = r.rationalize_HornHutchins(x)
+      q1 = [-q1[0],-q1[1]] if q1[1] < 0
+      q2 = [-q2[0],-q2[1]] if q2[1] < 0
+      q3 = [-q3[0],-q3[1]] if q3[1] < 0
+      #q4 = r.rationalize_KnuthB(x)
+      assert_equal q1, q2
+      assert_equal q1, q3
+      #assert_equal q1, q4
+    end
+  end
+
+end

data/test/test_trig.rb

@@ -6,7 +6,7 @@ class TestTrig < Test::Unit::TestCase
 
   def setup
     @data = {}
-    Dir[File.join(File.dirname(__FILE__), "trigtest/*.txt")].each do |fn|
+    Dir[File.join(File.dirname(__FILE__), "data/trigtest/*.txt")].each do |fn|
       if File.basename(fn) =~ /\A([a-z]+)(\d+)_(\d+)_([a-z]+)\.txt\Z/
         method = $1.to_sym
         radix = $2.to_i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flt
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Javier Goizueta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,12 +67,18 @@ files:
 - lib/flt/num.rb
 - lib/flt/sugar.rb
 - lib/flt/support.rb
+- lib/flt/support/flag_values.rb
+- lib/flt/support/formatter.rb
+- lib/flt/support/rationalizer.rb
+- lib/flt/support/rationalizer_extra.rb
+- lib/flt/support/reader.rb
 - lib/flt/tolerance.rb
 - lib/flt/tolerance/sugar.rb
 - lib/flt/trigonometry.rb
 - lib/flt/version.rb
 - setup.rb
 - test/all_tests.rb
+- test/data/.gitignore
 - test/generate_trig_data.rb
 - test/helper.rb
 - test/reader.rb
@@ -93,6 +99,7 @@ files:
 - test/test_multithreading.rb
 - test/test_num_constructor.rb
 - test/test_odd_even.rb
+- test/test_rationalizer.rb
 - test/test_round.rb
 - test/test_sugar.rb
 - test/test_to_int.rb
@@ -126,6 +133,7 @@ specification_version: 4
 summary: Floating Point Numbers
 test_files:
 - test/all_tests.rb
+- test/data/.gitignore
 - test/generate_trig_data.rb
 - test/helper.rb
 - test/reader.rb
@@ -146,6 +154,7 @@ test_files:
 - test/test_multithreading.rb
 - test/test_num_constructor.rb
 - test/test_odd_even.rb
+- test/test_rationalizer.rb
 - test/test_round.rb
 - test/test_sugar.rb
 - test/test_to_int.rb