fix: histogram bugfix #14

JuliaPlots · Aug 21, 2015 · 466f157 · 466f157
1 parent 2276718
commit 466f157
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/common.jl b/src/common.jl
@@ -23,8 +23,10 @@ function safeCeil(num)
   end
 end
 
+# these are all hacks
 magnitude{F<:FloatingPoint}(x::F) = safeRound(-log10(x))
-floatround{F<:FloatingPoint,R<:Real}(x::F,m::R) = x > 0 ? round(x, magnitude(m)+1) : -round(-x, magnitude(m)+1)
+ceilgnitude{F<:FloatingPoint}(x::F) = safeCeil(-log10(x))
+floatround{F<:FloatingPoint,R<:Real}(x::F,m::R) = x==0.?0.: (x > 0 ? round(x, ceilgnitude(m)+1) : -round(-x, ceilgnitude(m)+1))
 floatfloor{F<:FloatingPoint,R<:Real}(x::F,m::R) = x > 0 ? floor(x, magnitude(m)) : -ceil(-x, magnitude(m))
 floatceil{F<:FloatingPoint,R<:Real}(x::F,m::R) = x > 0 ? ceil(x, magnitude(m)) : -floor(-x, magnitude(m))
 floatround{F<:FloatingPoint}(x::F) = x > 0 ? floatround(x,x): floatround(x,-x)

diff --git a/src/histogram.jl b/src/histogram.jl
@@ -3,9 +3,10 @@
 function histogram(x, n::Int=5; args...)
   edges, counts = hist(x,n)
   labels = String[]
-  binwidth = (edges.step - edges.start) / edges.divisor
+  binwidth = edges.step / edges.divisor
   for i in 1:length(counts)
-    push!(labels, string("(",edges[i],",",floatround(edges[i]+binwidth),"]"))
+		val = floatround(edges[i])
+    push!(labels, string("(",val,",",floatround(val+binwidth),"]"))
   end
   barplot(labels, counts; symb="▇", args...)
 end