flt 1.5.0 → 1.5.1

data/lib/flt/support/reader.rb

@@ -74,7 +74,7 @@ module Flt
           # for free mode, (any) :nearest rounding is used by default
           Num.convert(Num[eb].Num(sign, f, e), context.num_class, :rounding=>round_mode||:nearest, :all_digits=>all_digits)
         when :fixed
-          if exact_mode = context.exact?
+          if context.exact?
             a,b = [eb, context.radix].sort
             m = (Math.log(b)/Math.log(a)).round
             if b == a**m

data/lib/flt/tolerance.rb

@@ -85,10 +85,6 @@
 #   tol = Tolerance(1, :percent)
 #   puts tol.equal_to?(3.14159, Math::PI)                 # -> true#
 
-require 'flt/num'
-require 'flt/float'
-require 'flt/bigdecimal'
-
 module Flt
 
   # The Tolerance class is a base class for all tolerances.
@@ -398,17 +394,16 @@ module Flt
       when BigDecimal
         if @radix == :native || @radix == 10
           exp = xs.map do |x|
-            sign,digits,base,exp = x.split
+            _sign,digits,_base,exp = x.split
             exp -= 1
             exp -= 1 if digits=="1" # if :low mode
             exp -= FloatingTolerance.ref_adjusted_exp
             exp
           end.send(mode)
-          sign, digits, base, vexp = v.split
+          _sign, digits, _base, vexp = v.split
           BigDecimal.new("0.#{digits}E#{vexp+exp}")
         else
           # assert num_class==BigDecimal && @radix==2
-          prec = 10
           exp = xs.map do |x|
             exp = (Flt::DecNum(x.to_s).ln/Flt::DecNum(2).ln).ceil - 1 # ... if :high mode
             exp -= FloatingTolerance.ref_adjusted_exp

data/lib/flt/trigonometry.rb

@@ -1,5 +1,3 @@
-require 'flt/dec_num'
-
 module Flt
 
   # Trigonometry functions. The angular units used by these functions can be specified

data/lib/flt/version.rb

@@ -1,3 +1,3 @@
 module Flt
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/setup.rb

@@ -104,7 +104,7 @@ class ConfigTable
   def remove(name)
     item = lookup(name)
     @items.delete_if {|i| i.name == name }
-    @table.delete_if {|name, i| i.name == name }
+    @table.delete_if {|iname, i| i.name == name }
     item
   end
 
@@ -281,7 +281,6 @@ class ConfigTable
     'site-ruby-common' => 'siteruby',     # For backward compatibility
     'site-ruby'        => 'siterubyver',  # For backward compatibility
     'bin-dir'          => 'bindir',
-    'bin-dir'          => 'bindir',
     'rb-dir'           => 'rbdir',
     'so-dir'           => 'sodir',
     'data-dir'         => 'datadir',

data/test/generate_trig_data.rb

@@ -23,12 +23,12 @@ end
 # random angles in radians for sin,cos,tan
 def angle_data(num_class)
   xs = []
-  pi = num_class::Math.send(:half_cycle)
+  pi = num_class.math { half_cycle }
   (-8..8).each do |k|
     x = k*pi/4
     xs += near(x)
   end
-  pi2 = num_class::Math.send(:quarter_cycle)
+  pi2 = num_class.math { quarter_cycle }
   50.times{ xs << random_num_one(num_class)*pi2}
   base = xs.dup
   (2...10).each do |k|
@@ -55,7 +55,7 @@ def random_num_one(num_class=DecNum)
     e = context.etiny
   elsif rand(20)==0
     # and some singular values too
-    if rand(1) == 0
+    if rand(2) == 0
       f = context.radix**context.precision - 1
       f -= rand(3)
     else
@@ -63,7 +63,7 @@ def random_num_one(num_class=DecNum)
       f += rand(3)
     end
     # e = random_integer(context.etiny, context.etop)
-    if rand(1)==0
+    if rand(2) == 0
       e = random_integer(-context.precision-1,-context.precision)
      else
       e = random_integer(-context.precision-10,-context.precision)
@@ -71,13 +71,13 @@ def random_num_one(num_class=DecNum)
   else
     f = rand(context.radix**context.precision)
     # e = random_integer(context.etiny, context.etop)
-    if rand(1)==0
+    if rand(2) == 0
       e = random_integer(-context.precision-1,-context.precision)
      else
       e = random_integer(-context.precision-10,-context.precision)
     end
   end
-  # f = -f if rand(1)==0
+  # f = -f if rand(2) == 0
   context.Num(f, e)
 end
 

data/test/helper.rb

@@ -1,10 +1,16 @@
-require 'test/unit'
+require 'minitest/autorun'
 $: << "." unless $:.include?(".") # for Ruby 1.9.2
 require File.expand_path(File.join(File.dirname(__FILE__),'/../lib/flt'))
 require 'enumerator'
 require 'yaml'
 include Flt
 
+module Minitest::Assertions
+  def assert_nothing_raised(*)
+    yield
+  end
+end
+
 def initialize_context
   DecNum.context = DecNum::ExtendedContext
   BinNum.context = BinNum::ExtendedContext
@@ -46,9 +52,9 @@ def random_num(num_class)
     # generate 5% of subnormals
     f = rand(context.radix**(context.precision-1))
     e = context.etiny
-  elsif rand(20)==0
+  elsif rand(20) == 0
     # and some singular values too
-    if rand(1) == 0
+    if rand(2) == 0
       f = context.radix**context.precision - 1
       f -= rand(3)
     else
@@ -60,7 +66,7 @@ def random_num(num_class)
     f = rand(context.radix**context.precision)
     e = random_integer(context.etiny, context.etop)
   end
-  f = -f if rand(1)==0
+  f = -f if rand(2) == 0
   context.Num(f, e)
 end
 
@@ -96,7 +102,7 @@ end
 
 def float_data
   data_file = File.join(File.dirname(__FILE__) ,'data/float_data.yml')
-  if File.exists?(data_file)
+  if File.exist?(data_file)
     YAML.load(File.read(data_file)).map{|x| [x].pack('H*').unpack('E')[0]}
   else
     srand 349842

data/test/reader.rb

@@ -4,7 +4,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 
-class TestReader < Test::Unit::TestCase
+class TestReader < Minitest::Test
 
 
   def setup

data/test/test_base_digits.rb

@@ -1,8 +1,10 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 
 
-class TestBaseDigits < Test::Unit::TestCase
-
+class TestBaseDigits < Minitest::Test
+  def setup
+    initialize_context
+  end
 
   def test_number_of_digits_in_other_base
 

data/test/test_basic.rb

@@ -63,7 +63,7 @@ def return_from_local_context
   end
 end
 
-class TestBasic < Test::Unit::TestCase
+class TestBasic < Minitest::Test
 
 
   def setup
@@ -394,17 +394,17 @@ class TestBasic < Test::Unit::TestCase
       context = num_class.context
       assert context.nan.nan?
       assert context.zero.zero?
-      assert_equal +1, context.sign(context.zero)
+      assert_equal(+1, context.sign(context.zero))
       assert context.zero(+1).zero?
-      assert_equal +1, context.sign(context.zero(+1))
+      assert_equal(+1, context.sign(context.zero(+1)))
       assert context.zero(-1).zero?
-      assert_equal -1, context.sign(context.zero(-1))
+      assert_equal(-1, context.sign(context.zero(-1)))
       assert context.infinity.infinite?
-      assert_equal +1, context.sign(context.infinity)
+      assert_equal(+1, context.sign(context.infinity))
       assert context.infinity(+1).infinite?
-      assert_equal +1, context.sign(context.infinity(+1))
+      assert_equal(+1, context.sign(context.infinity(+1)))
       assert context.infinity(-1).infinite?
-      assert_equal -1, context.sign(context.infinity(-1))
+      assert_equal(-1, context.sign(context.infinity(-1)))
       assert_equal context.Num(1)/2, context.one_half
     end
   end

data/test/test_big_decimal.rb

@@ -1,38 +1,38 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 
-class TestBigDecimal < Test::Unit::TestCase
+class TestBigDecimal < Minitest::Test
 
   def setup
     initialize_context
   end
 
   def test_sign
-    assert_equal -1, BigDecimal.context.sign(BigDecimal('-1.0'))
-    assert_equal -1, BigDecimal.context.sign(BigDecimal('-10.0'))
-    assert_equal -1, BigDecimal.context.sign(BigDecimal('-10E50'))
-    assert_equal -1, BigDecimal.context.sign(BigDecimal('-10E-50'))
-    assert_equal -1, BigDecimal.context.sign(BigDecimal('-723'))
-    assert_equal -1, BigDecimal.context.sign(BigDecimal('-0.0'))
+    assert_equal(-1, BigDecimal.context.sign(BigDecimal('-1.0')))
+    assert_equal(-1, BigDecimal.context.sign(BigDecimal('-10.0')))
+    assert_equal(-1, BigDecimal.context.sign(BigDecimal('-10E50')))
+    assert_equal(-1, BigDecimal.context.sign(BigDecimal('-10E-50')))
+    assert_equal(-1, BigDecimal.context.sign(BigDecimal('-723')))
+    assert_equal(-1, BigDecimal.context.sign(BigDecimal('-0.0')))
 
-    assert_equal +1, BigDecimal.context.sign(BigDecimal('+1.0'))
-    assert_equal +1, BigDecimal.context.sign(BigDecimal('+10.0'))
-    assert_equal +1, BigDecimal.context.sign(BigDecimal('+10E50'))
-    assert_equal +1, BigDecimal.context.sign(BigDecimal('+10E-50'))
-    assert_equal +1, BigDecimal.context.sign(BigDecimal('+723'))
-    assert_equal +1, BigDecimal.context.sign(BigDecimal('0.0'))
+    assert_equal(+1, BigDecimal.context.sign(BigDecimal('+1.0')))
+    assert_equal(+1, BigDecimal.context.sign(BigDecimal('+10.0')))
+    assert_equal(+1, BigDecimal.context.sign(BigDecimal('+10E50')))
+    assert_equal(+1, BigDecimal.context.sign(BigDecimal('+10E-50')))
+    assert_equal(+1, BigDecimal.context.sign(BigDecimal('+723')))
+    assert_equal(+1, BigDecimal.context.sign(BigDecimal('0.0')))
 
     assert_nil BigDecimal.context.sign(BigDecimal.context.nan)
   end
 
   def copy_sign
-    assert_equal -BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('1.23'), -1)
-    assert_equal -BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('1.23'), BigDecimal('-10'))
-    assert_equal -BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('-1.23'), -1)
-    assert_equal -BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('-1.23'), BigDecimal('-10'))
-    assert_equal BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('-1.23'), +1)
-    assert_equal BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('-1.23'), BigDecimal('+10'))
-    assert_equal BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('1.23'), +1)
-    assert_equal BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('1.23'), BigDecimal('+10'))
+    assert_equal(-BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('1.23'), -1))
+    assert_equal(-BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('1.23'), BigDecimal('-10')))
+    assert_equal(-BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('-1.23'), -1))
+    assert_equal(-BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('-1.23'), BigDecimal('-10')))
+    assert_equal(BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('-1.23'), +1))
+    assert_equal(BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('-1.23'), BigDecimal('+10')))
+    assert_equal(BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('1.23'), +1))
+    assert_equal(BigDecimal('1.23'), BigDecimal.context.copy_sign(BigDecimal('1.23'), BigDecimal('+10')))
   end
 
 end

data/test/test_bin.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 
-class TestBin < Test::Unit::TestCase
+class TestBin < Minitest::Test
 
 
   def setup

data/test/test_bin_arithmetic.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 
 # These tests assume that Float arithmetic is correctly rounded
 # Random tests using Float as a reference
-class TestBinArithmetic < Test::Unit::TestCase
+class TestBinArithmetic < Minitest::Test
 
   def setup
     initialize_context

data/test/test_binfloat_conversion.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 
 
-class TestBinfloatConversion < Test::Unit::TestCase
+class TestBinfloatConversion < Minitest::Test
 
   def setup
     initialize_context

data/test/test_coercion.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 
-class TestCoercion < Test::Unit::TestCase
+class TestCoercion < Minitest::Test
 
 
   def setup

data/test/test_comparisons.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 
-class TestComparisons < Test::Unit::TestCase
+class TestComparisons < Minitest::Test
 
 
   def setup
@@ -11,9 +11,9 @@ class TestComparisons < Test::Unit::TestCase
     assert_equal DecNum('1.1').hash, DecNum('1.1').hash
     assert_equal DecNum('1.1').hash, (DecNum('1.0')+DecNum('0.1')).hash
     assert_equal DecNum('1.1',:precision=>10).hash, DecNum('1.1',:precision=>3).hash
-    assert_not_equal DecNum('1.0').hash, DecNum('1.1').hash
-    assert_not_equal DecNum('1.0').hash, 1.0.hash
-    assert_not_equal DecNum('1.0').hash, 1.hash
+    refute_equal DecNum('1.0').hash, DecNum('1.1').hash
+    refute_equal DecNum('1.0').hash, 1.0.hash
+    refute_equal DecNum('1.0').hash, 1.hash
 
     assert DecNum('1.1').eql?(DecNum('1.1'))
     assert DecNum('1.1').eql?(DecNum('1.0')+DecNum('0.1'))

data/test/test_dectest.rb

@@ -108,12 +108,12 @@ def unquote(txt)
   txt
 end
 
-class TestBasic < Test::Unit::TestCase
+class TestBasic < Minitest::Test
 
   def test_dec
     missing = []
     dir = File.join(File.dirname(__FILE__), 'data/dectest')
-    if !File.exists?(dir)
+    if !File.exist?(dir)
       skip "No dectest data present. Get it from http://speleotrove.com/decimal/dectest.zip and put it in test/data/dectest"
       return
     end

data/test/test_define_conversions.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 
-class TestDefineConversions < Test::Unit::TestCase
+class TestDefineConversions < Minitest::Test
 
 
   def setup
@@ -55,20 +55,20 @@ class TestDefineConversions < Test::Unit::TestCase
       end
     end
 
-    assert_raise(TypeError, RuntimeError) { DecNum('0') == BigDecimal.new('0') }
+    assert_raises(TypeError, RuntimeError) { DecNum('0') == BigDecimal.new('0') }
     unless Num < Numeric
       # BigDecimal#eql? is weird
-      assert_not_equal BigDecimal.new('0'), DecNum('0')
-      assert_not_equal BigDecimal.new('1.2345'), DecNum('1.2345')
-      assert_not_equal BigDecimal.new('-1.2345'), DecNum('-1.2345')
-      assert_not_equal BigDecimal.new('1.2345'), DecNum('0.0012345000E3')
-      assert_raise(TypeError) { BigDecimal.new('7')+DecNum('0.1') }
+      refute_equal BigDecimal.new('0'), DecNum('0')
+      refute_equal BigDecimal.new('1.2345'), DecNum('1.2345')
+      refute_equal BigDecimal.new('-1.2345'), DecNum('-1.2345')
+      refute_equal BigDecimal.new('1.2345'), DecNum('0.0012345000E3')
+      assert_raises(TypeError) { BigDecimal.new('7')+DecNum('0.1') }
     end
-    assert_raise(TypeError, RuntimeError) { DecNum('7')+BigDecimal.new('0.1') }
-    assert_raise(TypeError, RuntimeError) { DecNum(BigDecimal.new('1.1')) }
+    assert_raises(TypeError, RuntimeError) { DecNum('7')+BigDecimal.new('0.1') }
+    assert_raises(TypeError, RuntimeError) { DecNum(BigDecimal.new('1.1')) }
 
     ['0.1', '-0.1', '0.0', '1234567.1234567', '-1234567.1234567', '1.234E7', '1.234E-7'].each do |n|
-      assert_raise(TypeError, RuntimeError) { DecNum(n).convert_to(BigDecimal) }
+      assert_raises(TypeError, RuntimeError) { DecNum(n).convert_to(BigDecimal) }
     end
 
   end

data/test/test_epsilon.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 
-class TestEpsilon < Test::Unit::TestCase
+class TestEpsilon < Minitest::Test
 
 
   def setup

data/test/test_exact.rb

@@ -1,13 +1,14 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 
 
-class TestExact < Test::Unit::TestCase
-
-
+class TestExact < Minitest::Test
   def setup
     initialize_context
   end
 
+  def teardown
+    initialize_context
+  end
 
   def test_exact_no_traps
 
@@ -133,14 +134,14 @@ class TestExact < Test::Unit::TestCase
     assert_equal DecNum(0), DecNum(1).ln
     assert !DecNum.context.flags[DecNum::Inexact]
 
-    assert_raise(DecNum::Inexact){ DecNum(2).sqrt }
-    assert_raise(DecNum::Inexact){ DecNum(1)/DecNum(3) }
-    assert_raise(DecNum::Inexact){ DecNum(18).power(DecNum('0.5')) }
-    assert_raise(DecNum::Inexact){ DecNum(18).power(DecNum('1.5')) }
-    assert_raise(DecNum::Inexact){ DecNum(18).log10 }
-    assert_raise(DecNum::Inexact){ DecNum(1).exp }
-    assert_raise(DecNum::Inexact){ DecNum('1.2').exp }
-    assert_raise(DecNum::Inexact){ DecNum('1.2').ln }
+    assert_raises(DecNum::Inexact){ DecNum(2).sqrt }
+    assert_raises(DecNum::Inexact){ DecNum(1)/DecNum(3) }
+    assert_raises(DecNum::Inexact){ DecNum(18).power(DecNum('0.5')) }
+    assert_raises(DecNum::Inexact){ DecNum(18).power(DecNum('1.5')) }
+    assert_raises(DecNum::Inexact){ DecNum(18).log10 }
+    assert_raises(DecNum::Inexact){ DecNum(1).exp }
+    assert_raises(DecNum::Inexact){ DecNum('1.2').exp }
+    assert_raises(DecNum::Inexact){ DecNum('1.2').ln }
 
   end
 

data/test/test_flags.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 
 
-class TestFlags < Test::Unit::TestCase
+class TestFlags < Minitest::Test
 
   def test_flags
     f = Flt::Support::Flags(:flag_one, :flag_three)