Merge pull request #6 from odow/fixrounding

Fix round off error

Author: lindahua

REQUIRE

@@ -1 +1,2 @@
-julia 0.2-
+julia 0.3-
+Compat

src/fmtcore.jl

@@ -148,6 +148,11 @@ function _pfmt_float(out::IO, sch::Char, zs::Integer, intv::Real, decv::Real, pr
     if zs > 0
         _repwrite(out, '0', zs)
     end
+    idecv = round(Integer, decv * exp10(prec))
+    if idecv == exp10(prec)
+        intv += 1
+        idecv = 0
+    end
     # print integer part
     if intv == 0
         write(out, '0')
@@ -158,7 +163,6 @@ function _pfmt_float(out::IO, sch::Char, zs::Integer, intv::Real, decv::Real, pr
     write(out, '.')
     # print decimal part
     if prec > 0
-        idecv = round(Integer, decv * exp10(prec))
         nd = _ndigits(idecv, _Dec())
         if nd < prec
             _repwrite(out, '0', prec - nd)
@@ -201,6 +205,14 @@ end
 function _pfmt_floate(out::IO, sch::Char, zs::Integer, u::Real, prec::Int, e::Int, ec::Char)
     intv = trunc(Integer,u)
     decv = u - intv
+    if round(Integer, decv * exp10(prec)) == exp10(prec)
+        intv += 1
+        if intv == 10
+            intv = 1
+            e += 1
+        end
+        decv = 0.
+    end
     _pfmt_float(out, sch, zs, intv, decv, prec)
     write(out, ec)
     if e >= 0

src/fmtspec.jl

@@ -121,10 +121,10 @@ function FormatSpec(s::String)
             if a4[1] == '0'
                 _zpad = true
                 if length(a4) > 1
-                    _width = parseint(Int,a4[2:end])
+                    _width = parse(Int,a4[2:end])
                 end
             else
-                _width = parseint(Int,a4)
+                _width = parse(Int,a4)
             end
         end
 
@@ -135,7 +135,7 @@ function FormatSpec(s::String)
 
         # a6 [.prec]
         if a6 != nothing
-            _prec = parseint(Int,a6[2:end])
+            _prec = parse(Int,a6[2:end])
         end
 
         # a7: [type]

src/formatexpr.jl

@@ -28,9 +28,9 @@ function make_argspec(s::String, pos::Int)
     if !isempty(s)
         ifil = searchindex(s, "|>")
         if ifil == 0
-            iarg = parseint(Int,s)
+            iarg = parse(Int,s)
         else
-            iarg = ifil > 1 ? parseint(Int,s[1:ifil-1]) : -1
+            iarg = ifil > 1 ? parse(Int,s[1:ifil-1]) : -1
             hasfil = true
             ff = eval(symbol(s[ifil+2:end]))
         end

test/fmtspec.jl

@@ -121,6 +121,12 @@ fs = FormatSpec("d")
 @test fmt("*<8.2f", -8.376) == "-8.38***"
 @test fmt("*>8.2f", -8.376) == "***-8.38"
 
+@test fmt(".2f", 0.999) == "1.00"
+@test fmt(".2f", 0.996) == "1.00"
+# Floating point error can upset this one (i.e. 0.99500000 or 0.994999999)
+@test (fmt(".2f", 0.995) == "1.00" || fmt(".2f", 0.995) == "0.99")
+@test fmt(".2f", 0.994) == "0.99"
+
 # format floating point (e)
 
 @test fmt("E", 0.0) == "0.000000E+00"
@@ -141,6 +147,14 @@ fs = FormatSpec("d")
 @test fmt("012.2e", -13.89) == "-0001.39e+01"
 @test fmt("+012.2e", 13.89) == "+0001.39e+01"
 
+@test fmt(".1e", 0.999) == "1.0e+00"
+@test fmt(".1e", 0.996) == "1.0e+00"
+# Floating point error can upset this one (i.e. 0.99500000 or 0.994999999)
+@test (fmt(".1e", 0.995) == "1.0e+00" || fmt(".1e", 0.995) == "9.9e-01")
+@test fmt(".1e", 0.994) == "9.9e-01"
+@test fmt(".1e", 0.6) == "6.0e-01"
+@test fmt(".1e", 0.9) == "9.0e-01"
+
 # format special floating point value
 
 @test fmt("f", NaN) == "NaN"