From 074a4002c00610834de1a234c60f82352a444307 Mon Sep 17 00:00:00 2001 From: "Michael K. Borregaard" Date: Thu, 8 Jun 2017 15:10:35 +0200 Subject: [PATCH] resolved conflicts --- src/axes.jl | 4 ++-- src/recipes.jl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/axes.jl b/src/axes.jl index 56dc7ccb..318e3fb5 100644 --- a/src/axes.jl +++ b/src/axes.jl @@ -370,8 +370,8 @@ function widen(lmin, lmax, scale) sf = scalefunc(scale) isf = invscalefunc(scale) span = sf(lmax) - sf(lmin) - # eps = max(1e-16, min(1e-2span, 1e-10)) - eps = max(1e-16, 0.03span) + # eps = NaNMath.max(1e-16, min(1e-2span, 1e-10)) + eps = NaNMath.max(1e-16, 0.03span) isf(lmin-eps), isf(lmax+eps) end diff --git a/src/recipes.jl b/src/recipes.jl index 775c3632..457e1c8f 100644 --- a/src/recipes.jl +++ b/src/recipes.jl @@ -367,7 +367,7 @@ end # widen limits out a bit if !(axis[:scale] in _logScales && extrema(xseg.pts)[1] <= 0) - expand_extrema!(axis, widen(extrema(xseg.pts)..., axis[:scale])) + expand_extrema!(axis, widen(ignorenan_extrema(xseg.pts)..., axis[:scale])) end # switch back