Skip to content

Commit

Permalink
fix inference error for 3rd party packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Evizero committed Apr 10, 2016
1 parent 836b7bc commit 9179362
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 51 deletions.
4 changes: 0 additions & 4 deletions src/UnicodePlots.jl
Expand Up @@ -64,8 +64,4 @@ include("interface/densityplot.jl")
include("interface/spy.jl")
include("deprecated.jl")

if VERSION >= v"0.4.0-dev+5512"
include("precompile.jl")
end

end
31 changes: 4 additions & 27 deletions src/interface/scatterplot.jl
Expand Up @@ -97,8 +97,8 @@ function scatterplot{F<:Real,R<:Real}(
name::AbstractString = "",
canvas::Type = BrailleCanvas,
args...)
X = convert(Vector{Float64}, x)
Y = convert(Vector{Float64}, y)
X = convert(Vector{Float64}, collect(x))
Y = convert(Vector{Float64}, collect(y))
new_plot = Plot(X, Y, canvas; args...)
color = (color == :auto) ? next_color!(new_plot) : color
name == "" || annotate!(new_plot, :r, name, color)
Expand All @@ -110,25 +110,13 @@ function scatterplot!{T<:Canvas,F<:Real,R<:Real}(
color::Symbol = :auto,
name::AbstractString = "",
args...)
X = convert(Vector{Float64}, x)
Y = convert(Vector{Float64}, y)
X = convert(Vector{Float64}, collect(x))
Y = convert(Vector{Float64}, collect(y))
color = (color == :auto) ? next_color!(plot) : color
name == "" || annotate!(plot, :r, name, color)
points!(plot, X, Y, color)
end

function scatterplot{F<:Real,R<:Real}(X::Range{F}, Y::Range{R}; args...)
scatterplot(collect(X), collect(Y); args...)
end

function scatterplot{F<:Real}(X::Range, Y::AbstractVector{F}; args...)
scatterplot(collect(X), Y; args...)
end

function scatterplot{F<:Real}(X::AbstractVector{F}, Y::Range; args...)
scatterplot(X, collect(Y); args...)
end

function scatterplot(X::AbstractVector; args...)
scatterplot(1:length(X), X; args...)
end
Expand All @@ -137,14 +125,3 @@ function scatterplot!{T<:Canvas}(plot::Plot{T}, X::AbstractVector; args...)
scatterplot!(plot, 1:length(X), X; args...)
end

function scatterplot!{T<:Canvas,F<:Real,R<:Real}(plot::Plot{T}, X::Range{F}, Y::Range{R}; args...)
scatterplot!(plot, collect(X), collect(Y); args...)
end

function scatterplot!{T<:Canvas,F<:Real}(plot::Plot{T}, X::Range, Y::AbstractVector{F}; args...)
scatterplot!(plot, collect(X), Y; args...)
end

function scatterplot!{T<:Canvas,F<:Real}(plot::Plot{T}, X::AbstractVector{F}, Y::Range; args...)
scatterplot!(plot, X, collect(Y); args...)
end
2 changes: 1 addition & 1 deletion src/plot.jl
Expand Up @@ -338,7 +338,7 @@ function print_border_bottom(io::IO, padding::AbstractString, length::Int, borde
end

function Base.show(io::IO, p::Plot)
b = bordermap[p.border]
b = UnicodePlots.bordermap[p.border]
c = p.graphics
border_length = ncols(c)

Expand Down
19 changes: 0 additions & 19 deletions src/precompile.jl

This file was deleted.

0 comments on commit 9179362

Please sign in to comment.