flt 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4361f2aa54884af4cc140d8caa5e7575b57faded
-  data.tar.gz: 98b581886ff91b9ba8be1ca2cf0030f4d0a6878b
+  metadata.gz: 64bc0f97cc0f1ece8bdc24b6ff7dd03bb1d2e171
+  data.tar.gz: 6c897e66afe636591ab5e79073e612d9518a6ddf
 SHA512:
-  metadata.gz: d600399045683b9ac8b7db526f3c7f4065bc98f869076b829ea165dece35a6c630b723d694c2bf642af148ca19efe624af68a3749f24a011ca501462aa3ac111
-  data.tar.gz: ca163347091dbb34ec079438b54583b759cf6e334a0d4305f668d1de4838e13fceb53726bad9b41fdedb435f0856686df9a62815fccf23af2c9170d7f804d011
+  metadata.gz: 3b180c058fe8c16f9815b1add0af0078e25a2e91021088580729e7789ddf4b658104db3feeef2dd454d228b06a24fd051f94b73b88584cba8f8dbd1c2239d28a
+  data.tar.gz: a41979f3f15dc331e3361c0407e54f96d36825d9c4b67ee3133dcdf6b439905f52e540854956a1258db9db6800368773c7cfd3d1f1380377bdf4f4afe2ecfe40

data/History.txt

@@ -1,3 +1,7 @@
+== 1.3.2 2014-10-07
+
+  logb now complies with the context precision
+
 == 1.3.1 2014-05-19
 
   Removed dependencies: Jeweler, Shoulda; using Gemfile

data/README.rdoc

@@ -10,7 +10,7 @@ could be improved in the future by using a C extension based on the decNumber li
 The Flt::Tolerance classes and the Flt.Tolerance() constructor handle floating point
 tolerances defined in flexible ways.
 
-Context classes are define in the files
+Context classes are defined in the files
 flt/float.rb[link:lib/flt/float_rb.html] and
 flt/bigdecimal.rb[link:lib/flt/bigdecimal_rb.html]
 for Float and BigDecimal numbers that aid to the interchangeability of floating point types. This

data/Rakefile

@@ -17,3 +17,5 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task default: :test

data/lib/flt/num.rb

@@ -2347,7 +2347,7 @@ class Num < Numeric
     return ans if ans
     return num_class.infinity if infinite?
     return context.exception(DivisionByZero,'logb(0)',-1) if zero?
-    Num(adjusted_exponent)
+    Num(adjusted_exponent)._fix(context)
   end
 
   # Adds a value to the exponent.
@@ -2993,7 +2993,7 @@ class Num < Numeric
   #   :precision  1   2   3   4     5    6    7    8
   #   :power    1E3 1E2  10   1   0.1 1E-2 1E-3 1E-4
   #   :index      0   1   2   3     4    5    6    7
-  #   :index      7   6   5   4     3    2    1    0
+  #   :rindex     7   6   5   4     3    2    1    0
   def round(opt={})
     opt = { :places=>opt } if opt.kind_of?(Integer)
     r = opt[:rounding] || :half_up

data/lib/flt/version.rb

@@ -1,3 +1,3 @@
 module Flt
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/test/test_dectest.rb

@@ -63,6 +63,7 @@ PENDING = %w{
   minmag
   comparetotal
   comparetotmag
+  comparesig
 }
 IGNORED = PENDING + %w{
   copy
@@ -110,97 +111,98 @@ end
 class TestBasic < Test::Unit::TestCase
 
   def test_dec
-   missing = []
+    missing = []
     dir = File.join(File.dirname(__FILE__), 'dectest')
-    dir = nil unless File.exists?(dir)
-    if dir
-      Dir[File.join(dir, '*.decTest')].each do |fn|
-
-        name = File.basename(fn,'.decTest').downcase
-        next if %w{ds dd dq}.include?(name[0,2]) ||
-                 %w{decsingle decdouble decquad testall}.include?(name)
-
-        initialize_context
-
-
-        File.open(fn,'r') do |file|
-          file.each_line do |line|
-            line = line.split('--').first.strip if line.include?('--')
-            next if line.strip.empty?
-
-            if line.include?(' -> ')
-              # test
-              # to do :remove inline comments --... on the right of ->
-              sides = line.split('->')
-              # now split by whitespace but avoid breaking quoted strings (and take care or repeated quotes!)
-              lhs = sides.first.strip.scan(/"(?:[^"]|"")*"|'(?:[^']|'')*'|\S+/)
-              id = lhs.first
-              funct = lhs[1].downcase
-              valstemp = lhs[2..-1]
-              rhs = sides.last.strip.split
-              ans = rhs.first
-              flags = rhs[1..-1].map{|f| DecNum.class_eval(FLAG_NAMES[f.downcase].to_s)}.compact
-
-              next unless valstemp.grep(/#/).empty?
-
-              $test_id = id
-              funct = FUNCTIONS[original_funct=funct]
-              next if EXCEPTIONS.include?(id)
-              if funct
-                # do test
-                msg = "  Test #{id}: #{funct}(#{valstemp.join(',')}) = #{ans}"
-                #File.open('dectests.txt','a'){|f| f.puts msg}
-                expected = result = result_flags = nil
-                DecNum.local_context do |context|
-                  context.flags.clear!
-                  exact_input = !['apply','to_sci_string', 'to_eng_string'].include?(funct)
-                  if exact_input
-                    p = context.precision
-                    context.exact = true
-                  end
-                  valstemp.map!{|v| DecNum(unquote(v))}
-                  context.precision = p if exact_input
-                  result = context.send(funct, *valstemp)
-                  result_flags = context.flags.dup
-                  expected = unquote(ans)
+    if !File.exists?(dir)
+      skip "No dectest data present. Get it from http://speleotrove.com/decimal/dectest.zip and put it in test/dectest"
+      return
+    end
+    Dir[File.join(dir, '*.decTest')].each do |fn|
+
+      name = File.basename(fn,'.decTest').downcase
+      next if %w{ds dd dq}.include?(name[0,2]) ||
+               %w{decsingle decdouble decquad testall}.include?(name)
+
+      initialize_context
+
+
+      File.open(fn,'r') do |file|
+        file.each_line do |line|
+          line = line.split('--').first.strip if line.include?('--')
+          next if line.strip.empty?
+
+          if line.include?(' -> ')
+            # test
+            # to do :remove inline comments --... on the right of ->
+            sides = line.split('->')
+            # now split by whitespace but avoid breaking quoted strings (and take care or repeated quotes!)
+            lhs = sides.first.strip.scan(/"(?:[^"]|"")*"|'(?:[^']|'')*'|\S+/)
+            id = lhs.first
+            funct = lhs[1].downcase
+            valstemp = lhs[2..-1]
+            rhs = sides.last.strip.split
+            ans = rhs.first
+            flags = rhs[1..-1].map{|f| DecNum.class_eval(FLAG_NAMES[f.downcase].to_s)}.compact
+
+            next unless valstemp.grep(/#/).empty?
+
+            $test_id = id
+            funct = FUNCTIONS[original_funct=funct]
+            next if EXCEPTIONS.include?(id)
+            if funct
+              # do test
+              msg = "  Test #{id}: #{funct}(#{valstemp.join(',')}) = #{ans} : #{name} [#{line}]"
+              #File.open('dectests.txt','a'){|f| f.puts msg}
+              expected = result = result_flags = nil
+              DecNum.local_context do |context|
+                context.flags.clear!
+                exact_input = !['apply','to_sci_string', 'to_eng_string'].include?(funct)
+                if exact_input
+                  p = context.precision
                   context.exact = true
-                  expected = DecNum(expected) unless result.is_a?(String)
-                end
-                result = 1 if result==true
-                result = 0 if result==false
-                expected_flags = DecNum::Flags(*flags)
-                if ans!='?'
-                  assert_equal expected.to_s, result.to_s, msg
                 end
-                assert_equal expected_flags, result_flags, msg
-
-              else
-                missing << original_funct unless IGNORED.include?(original_funct) || missing.include?(original_funct)
+                valstemp.map!{|v| DecNum(unquote(v))}
+                context.precision = p if exact_input
+                result = context.send(funct, *valstemp)
+                result_flags = context.flags.dup
+                expected = unquote(ans)
+                context.exact = true
+                expected = DecNum(expected) unless result.is_a?(String)
               end
-
-            elsif line.include?(':')
-              # directive
-              funct,value = line.split(':').map{|x| x.strip.downcase}
-              case funct
-                when 'rounding'
-                  value = ROUNDINGS[value]
-                else
-                  value = value.to_i
+              result = 1 if result==true
+              result = 0 if result==false
+              expected_flags = DecNum::Flags(*flags)
+              if ans!='?'
+                assert_equal expected.to_s, result.to_s, msg
               end
-              if value.nil?
-                #raise "error"
-                # to do: skip untill next valid value of same funct
+              assert_equal expected_flags, result_flags, msg
+
+            else
+              missing << original_funct unless IGNORED.include?(original_funct) || missing.include?(original_funct)
+            end
+
+          elsif line.include?(':')
+            # directive
+            funct,value = line.split(':').map{|x| x.strip.downcase}
+            case funct
+              when 'rounding'
+                value = ROUNDINGS[value]
               else
-                case funct
-                  when 'rounding','precision'
-                    DecNum.context.send "#{funct}=", value
-                  when 'maxexponent'
-                    DecNum.context.emax = value
-                  when 'minexponent'
-                    DecNum.context.emin = value
-                  when 'clamp'
-                    DecNum.context.clamp = (value==0 ? false : true)
-                end
+                value = value.to_i
+            end
+            if value.nil?
+              #raise "error"
+              # to do: skip untill next valid value of same funct
+            else
+              case funct
+                when 'rounding','precision'
+                  DecNum.context.send "#{funct}=", value
+                when 'maxexponent'
+                  DecNum.context.emax = value
+                when 'minexponent'
+                  DecNum.context.emin = value
+                when 'clamp'
+                  DecNum.context.clamp = (value==0 ? false : true)
               end
             end
           end

data/test/test_trig.rb

@@ -24,57 +24,77 @@ class TestTrig < Test::Unit::TestCase
     BinNum.context = BinNum::IEEEDoubleContext
   end
 
+  def trig_test_data_present?(radix, angle)
+    present = @data && @data[radix] && @data[radix][angle]
+    skip unless present
+    present
+  end
+
   def check(f, radix=10, angle=:rad)
-    class_num = Num[radix]
-    @data[radix][angle].keys.each do |prec|
-      class_num.context(:precision=>prec, :angle=>angle) do
-        class_num.context.traps[DecNum::DivisionByZero] = false
-        data = @data[radix][angle][prec][f]
-        data.each do |x, result|
-          assert_equal result, class_num::Math.send(f, x), "#{f}(#{x})==#{result}\ninput: #{x.to_int_scale.inspect} [#{radix} #{angle} #{prec}]"
+    if trig_test_data_present?(radix, angle)
+      class_num = Num[radix]
+      @data[radix][angle].keys.each do |prec|
+        class_num.context(:precision=>prec, :angle=>angle) do
+          class_num.context.traps[DecNum::DivisionByZero] = false
+          data = @data[radix][angle][prec][f]
+          data.each do |x, result|
+            msg = "#{f}(#{x})==#{result}\ninput: #{x.to_int_scale.inspect} [#{radix} #{angle} #{prec}]"
+            assert_equal result, class_num::Math.send(f, x), msg
+          end
         end
       end
     end
   end
 
   def check_relaxed(f, radix=10, angle=:rad, ulps=1)
-    class_num = Num[radix]
-    @data[radix][angle].keys.each do |prec|
-      class_num.context(:precision=>prec, :angle=>angle) do
-        class_num.context.traps[DecNum::DivisionByZero] = false
-        data = @data[radix][angle][prec][f]
-        unless data.nil?
-          data.each do |x, result|
-            y = class_num::Math.send(f, x)
-            if result.special?
-              assert_equal result, y, "#{f}(#{x})==#{result} [#{radix} #{angle} #{prec}]"
-            else
-              err_ulps = (y-result).abs/result.ulp
-              assert err_ulps<=ulps, "#{f}(#{x})==#{result} to within #{ulps} ulps; error: #{err_ulps} ulps (#{y})\ninput: #{x.to_int_scale.inspect} [#{radix} #{angle} #{prec}]"
+    if trig_test_data_present?(radix, angle)
+      class_num = Num[radix]
+      @data[radix][angle].keys.each do |prec|
+        class_num.context(:precision=>prec, :angle=>angle) do
+          class_num.context.traps[DecNum::DivisionByZero] = false
+          data = @data[radix][angle][prec][f]
+          unless data.nil?
+            data.each do |x, result|
+              y = class_num::Math.send(f, x)
+              if result.special?
+                assert_equal result, y, "#{f}(#{x})==#{result} [#{radix} #{angle} #{prec}]"
+              else
+                err_ulps = (y-result).abs/result.ulp
+                msg = "#{f}(#{x})==#{result} to within #{ulps} ulps; error: #{err_ulps} ulps (#{y})\ninput: #{x.to_int_scale.inspect} [#{radix} #{angle} #{prec}]"
+                assert err_ulps<=ulps, msg
+              end
             end
+          else
+            skip "Missing data for radix #{radix.inspect} angle #{angle.inspect} prec #{prec.inspect} #{f.inspect}"
           end
-        else
-          STDERR.puts "Missing data for radix #{radix.inspect} angle #{angle.inspect} prec #{prec.inspect} #{f.inspect}"
         end
       end
     end
   end
 
   def check_bin(f)
-    class_num = BinNum
-    @data[2][:rad].keys.each do |prec|
-      class_num.context do
-        #class_num.context.traps[DecNum::DivisionByZero] = false
-        data = @data[2][:rad][53][f]
-        data.each do |x, result|
-          x = class_num.Num(x)
-          result = ::Math.send(f, x.to_f)
-          assert_equal result, class_num::Math.send(f, x), "#{f}(#{x})==#{result} [bin]"
+    if trig_test_data_present?(2, :rad)
+      class_num = BinNum
+      @data[2][:rad].keys.each do |prec|
+        class_num.context do
+          #class_num.context.traps[DecNum::DivisionByZero] = false
+          data = @data[2][:rad][53][f]
+          data.each do |x, result|
+            x = class_num.Num(x)
+            result = ::Math.send(f, x.to_f)
+            assert_equal result, class_num::Math.send(f, x), "#{f}(#{x})==#{result} [bin]"
+          end
         end
       end
     end
   end
 
+  def test_data_present
+    if @data.empty?
+      skip "No data for trigonometry tests. Generate it with tst/generate_trig_data.rb"
+    end
+  end
+
   def test_sin
     check :sin, 10, :rad
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flt
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Javier Goizueta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler