flt 1.4.7 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a82d3975aca56adcdeefe93da5fed92f8adb4159
-  data.tar.gz: 2155cf086a59dc59ce6f01e19b00b546c58a77e0
+  metadata.gz: 84bc5146381ff127868320f22bb421bc8d1ad16a
+  data.tar.gz: 66f6fc689cb2297638127a1217fe4ee3e19b8aa7
 SHA512:
-  metadata.gz: d1b9044b8b0deafd52eac4f3b481bbd360e9fd70ed7fb70f7489ed7744cf40fce81218275b402c7547d57d7fabc4bc2cde078ed5faebcb21a814be559edd7ed8
-  data.tar.gz: 07196b48dcb47e16a745f0488b2cddb8b60e91056de66d020a12bfb9e5cbd27a57c5f36b21b9a7f8cc69815caa04a8708c999df6cca70a5f337642c32000a0aa
+  metadata.gz: 10bc77b0f1ab349a36abcf4512aa9a16aecc886e4da95ec2c6edc180c1c00b74113f98d2673f1c2aaae3cf7856b1be8291be0e59f2e9082f541cceae8c5f2130
+  data.tar.gz: 1279653a5e9471834c3f48819db261bcb5cbf4e749ded3cc0d039a3e4bb3572eb20323b90fb0058739630b6bf8cd6eb36a6132713960da8f7b6c2919fca79122

data/History.txt

@@ -1,3 +1,8 @@
+== 1.5.0 2015-04-06
+
+* New feature
+  - normalized attribute of context applies normalization to all results
+
 == 1.4.7 2015-04-05
 
 * Bugfix

data/lib/flt/num.rb

@@ -422,6 +422,7 @@ class Num < Numeric
     #   taken as emin and emax=1-emin. Such limits comply with IEEE 754-2008
     # * :capitals : (true or false) to use capitals in text representations
     # * :clamp : (true or false) enables clamping
+    # * :normalized : (true or false) normalizes all results
     #
     # See also the context constructor method Flt::Num.Context().
     def initialize(num_class, *options)
@@ -441,6 +442,7 @@ class Num < Numeric
         @coercible_type_handlers = num_class.base_coercible_types.dup
         @conversions = num_class.base_conversions.dup
         @angle = :rad # angular units: :rad (radians) / :deg (degrees) / :grad (gradians)
+        @normalized = false
       end
       assign options.first
 
@@ -515,7 +517,11 @@ class Num < Numeric
       @num_class.int_div_radix_power(x,n)
     end
 
-    attr_accessor :rounding, :emin, :emax, :flags, :traps, :ignored_flags, :capitals, :clamp, :angle
+    attr_accessor :rounding, :emin, :emax, :flags, :traps, :ignored_flags, :capitals, :clamp, :angle, :normalized
+
+    def normalized?
+      normalized
+    end
 
     # TODO: consider the convenience of adding accessors of this kind:
     # def rounding(new_rounding=nil)
@@ -630,9 +636,10 @@ class Num < Numeric
         @emin = options[:emin] unless options[:emin].nil?
         @emax = options[:emax] unless options[:emax].nil?
         @capitals = options[:capitals ] unless options[:capitals ].nil?
-        @clamp = options[:clamp ] unless options[:clamp ].nil?
-        @exact = options[:exact ] unless options[:exact ].nil?
-        @angle = options[:angle ] unless options[:angle ].nil?
+        @clamp = options[:clamp] unless options[:clamp].nil?
+        @exact = options[:exact] unless options[:exact].nil?
+        @angle = options[:angle] unless options[:angle].nil?
+        @normalized = options[:normalized] unless options[:normalized].nil?
         update_precision
         if options[:extra_precision] && !@exact
           @precision += options[:extra_precision]
@@ -660,6 +667,7 @@ class Num < Numeric
       @coercible_type_handlers = other.coercible_type_handlers.dup
       @conversions = other.conversions.dup
       @angle = other.angle
+      @normalized = other.normalized
     end
 
     def dup
@@ -1477,18 +1485,19 @@ class Num < Numeric
   # * :base is the numeric base of the input, 10 by default.
   def initialize(*args)
     options = args.pop if args.last.is_a?(Hash)
-    context = args.pop if args.size>0 && (args.last.kind_of?(ContextBase) || args.last.nil?)
-    context ||= options && options.delete(:context)
+    options ||= {}
+    context = args.pop if args.size > 0 && (args.last.kind_of?(ContextBase) || args.last.nil?)
+    context ||= options.delete(:context)
     mode = args.pop if args.last.is_a?(Symbol) && ![:inf, :nan, :snan].include?(args.last)
     args = args.first if args.size==1 && args.first.is_a?(Array)
-    if args.empty? && options
+    if args.empty? && !options.empty?
       args = [options.delete(:sign)||+1,
               options.delete(:coefficient) || 0,
               options.delete(:exponent) || 0]
     end
-    mode ||= options && options.delete(:mode)
-    base = (options && options.delete(:base))
-    context = options if context.nil? && options && !options.empty?
+    mode ||= options.delete(:mode)
+    base = options.delete(:base)
+    context = options if context.nil? && !options.empty?
     context = define_context(context)
 
     case args.size
@@ -3593,6 +3602,26 @@ class Num < Numeric
       return ans
     end
 
+    if context.normalized?
+      exp = @exp
+      coeff = @coeff
+      if self_is_subnormal
+        if exp > context.etiny
+          coeff = num_class.int_mult_radix_power(coeff, exp - context.etiny)
+          exp = context.etiny
+        end
+      else
+        min_normal_coeff = context.minimum_normalized_coefficient
+        while coeff < min_normal_coeff
+          coeff = num_class.int_mult_radix_power(coeff, 1)
+          exp -= 1
+        end
+      end
+      if exp != @exp || coeff != @coeff
+        return Num(@sign, coeff, exp)
+      end
+    end
+
     if context.clamp? &&  @exp>etop
       context.exception Clamped
       self_padded = num_class.int_mult_radix_power(@coeff, @exp-etop)
@@ -3600,7 +3629,6 @@ class Num < Numeric
     end
 
     return Num(self)
-
   end
 
   # adjust payload of a NaN to the context

data/lib/flt/version.rb

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

data/test/test_normalized.rb

@@ -0,0 +1,67 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
+
+
+class TestNormalized < Test::Unit::TestCase
+
+  include Flt
+
+  def setup
+    initialize_context
+  end
+
+  def test_giac_floating_point
+    BinNum.context.precision = 48
+    BinNum.context.rounding = :down
+    BinNum.context.normalized = true
+    x = (BinNum(4)/3-1)*3 - 1
+    assert_equal [-1, 140737488355328, -93], x.split
+
+    x = BinNum(11)/15
+    assert_equal [1, 206414982921147, -48], x.split
+    x *= BinNum('1E308')
+    assert_equal [1, 229644291251027, 975], x.split
+  end
+
+  def test_normalized_context
+    refute DecNum.context.normalized?
+    DecNum.context(normalized: true) do
+      assert DecNum.context.normalized?
+      assert_equal [1, 1, -1], DecNum('0.1').split
+      assert_equal [1, 100000000, -9], (+DecNum('0.1')).split
+      assert_equal [1, 100000000, -9], (DecNum('0.1')+0).split
+      assert_equal [1, 100000000, -9], (DecNum('0.1')/1).split
+    end
+    refute DecNum.context.normalized?
+    assert_equal [1, 1, -1], DecNum('0.1').split
+    assert_equal [1, 1, -1], (+DecNum('0.1')).split
+    assert_equal [1, 1, -1], (DecNum('0.1')+0).split
+    assert_equal [1, 1, -1], (DecNum('0.1')/1).split
+    context = DecNum.context(normalized: true)
+    assert context.normalized?
+    assert_equal [1, 100000000, -9], context.plus(DecNum('0.1')).split
+    assert_equal [1, 100000000, -9], context.add(DecNum('0.1'), 0).split
+    assert_equal [1, 100000000, -9], context.divide(DecNum('0.1'), 1).split
+    refute DecNum.context.normalized?
+    assert_equal [1, 1, -1], DecNum('0.1').split
+    assert_equal [1, 1, -1], (+DecNum('0.1')).split
+    assert_equal [1, 1, -1], (DecNum('0.1')+0).split
+    assert_equal [1, 1, -1], (DecNum('0.1')/1).split
+  end
+
+  def test_precision
+    x = (DecNum(4)/3 - 1)*3 - 1       # -1e-8
+    assert_equal [-1, 1, -8], x.split
+
+    DecNum.context.normalized = true
+    x = (DecNum(4)/3 - 1)*3 - 1       # -1.00000000e-8
+    assert_equal [-1, 100000000, -16], x.split
+
+    x = (BinNum(4)/3 - 1)*3 - 1       # -0x1p-52
+    assert_equal [-1, 1, -52], x.split
+
+    BinNum.context.normalized = true
+    x = (BinNum(4)/3 - 1)*3 - 1       # -0x1.0000000000000p-52
+    assert_equal [-1, 4503599627370496, -104], x.split
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flt
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.5.0
 platform: ruby
 authors:
 - Javier Goizueta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,6 +99,7 @@ files:
 - test/test_formatter.rb
 - test/test_hex_format.rb
 - test/test_multithreading.rb
+- test/test_normalized.rb
 - test/test_num_constructor.rb
 - test/test_odd_even.rb
 - test/test_rationalizer.rb
@@ -157,6 +158,7 @@ test_files:
 - test/test_formatter.rb
 - test/test_hex_format.rb
 - test/test_multithreading.rb
+- test/test_normalized.rb
 - test/test_num_constructor.rb
 - test/test_odd_even.rb
 - test/test_rationalizer.rb