Fix warnings in Julia v0.6 (#41)

* Fix warnings in Julia v0.6

* Fix warnings in Julia v0.6 (part II)

Author: juliohm

src/GraphPlot.jl

@@ -9,9 +9,7 @@ const gadflyjs = joinpath(dirname(Base.source_path()), "gadfly.js")
 
 export
     gplot,
-    gplot1,
     gplothtml,
-    gplothtml1,
     random_layout,
     circular_layout,
     spring_layout,
@@ -29,16 +27,15 @@ include("stress.jl")
 include("shape.jl")
 include("lines.jl")
 include("plot.jl")
-include("plot_test.jl")
 
 # read graph
 include("graphio.jl")
 
 function test()
-	include(joinpath(Pkg.dir("GraphPlot"), "test", "runtests.jl"))
+    include(joinpath(Pkg.dir("GraphPlot"), "test", "runtests.jl"))
 end
 
-    
+
 # These functions are mappings to various graph packages.
 # Currently only LightGraphs is supported.
 _nv(g::LightGraphs.AbstractGraph) = LightGraphs.nv(g)

src/layout.jl

@@ -155,8 +155,8 @@ function spring_layout(G, locs_x=2*rand(_nv(G)).-1.0, locs_y=2*rand(_nv(G)).-1.0
     function scaler(z, a, b)
         2.0*((z - a)/(b - a)) - 1.0
     end
-    map!(z -> scaler(z, min_x, max_x), locs_x)
-    map!(z -> scaler(z, min_y, max_y), locs_y)
+    map!(z -> scaler(z, min_x, max_x), locs_x, locs_x)
+    map!(z -> scaler(z, min_y, max_y), locs_y, locs_y)
 
     return locs_x,locs_y
 end

src/lines.jl

@@ -23,8 +23,8 @@ function graphline{T<:Real}(g, locs_x, locs_y, nodesize::Vector{T}, arrowlength,
 end
 
 function graphline{T<:Real}(g, locs_x, locs_y, nodesize::T, arrowlength, angleoffset)
-    lines = Array(Vector{Tuple{Float64,Float64}}, _ne(g))
-    arrows = Array(Vector{Tuple{Float64,Float64}}, _ne(g))
+    lines = Array{Vector{Tuple{Float64,Float64}}}(_ne(g))
+    arrows = Array{Vector{Tuple{Float64,Float64}}}(_ne(g))
     for (e_idx, e) in enumerate(_edges(g))
         i = _src_index(e, g)
         j = _dst_index(e, g)
@@ -44,7 +44,7 @@ function graphline{T<:Real}(g, locs_x, locs_y, nodesize::T, arrowlength, angleof
 end
 
 function graphline{T<:Real}(g, locs_x, locs_y, nodesize::Vector{T})
-    lines = Array(Vector{Tuple{Float64,Float64}}, _ne(g))
+    lines = Array{Vector{Tuple{Float64,Float64}}}(_ne(g))
     for (e_idx, e) in enumerate(_edges(g))
         i = _src_index(e, g)
         j = _dst_index(e, g)
@@ -62,7 +62,7 @@ function graphline{T<:Real}(g, locs_x, locs_y, nodesize::Vector{T})
 end
 
 function graphline{T<:Real}(g, locs_x, locs_y, nodesize::T)
-    lines = Array(Vector{Tuple{Float64,Float64}}, _ne(g))
+    lines = Array{Vector{Tuple{Float64,Float64}}}(_ne(g))
     for (e_idx, e) in enumerate(_edges(g))
         i = _src_index(e, g)
         j = _dst_index(e, g)
@@ -80,8 +80,8 @@ function graphline{T<:Real}(g, locs_x, locs_y, nodesize::T)
 end
 
 function graphcurve{T<:Real}(g, locs_x, locs_y, nodesize::Vector{T}, arrowlength, angleoffset, outangle=pi/5)
-    lines = Array(Vector, _ne(g))
-    arrows = Array(Vector{Tuple{Float64,Float64}}, _ne(g))
+    lines = Array{Vector}(_ne(g))
+    arrows = Array{Vector{Tuple{Float64,Float64}}}(_ne(g))
     for (e_idx, e) in enumerate(_edges(g))
         i = _src_index(e, g)
         j = _dst_index(e, g)
@@ -106,8 +106,8 @@ function graphcurve{T<:Real}(g, locs_x, locs_y, nodesize::Vector{T}, arrowlength
 end
 
 function graphcurve{T<:Real}(g, locs_x, locs_y, nodesize::T, arrowlength, angleoffset, outangle=pi/5)
-    lines = Array(Vector, _ne(g))
-    arrows = Array(Vector{Tuple{Float64,Float64}}, _ne(g))
+    lines = Array{Vector}(_ne(g))
+    arrows = Array{Vector{Tuple{Float64,Float64}}}(_ne(g))
     for (e_idx, e) in enumerate(_edges(g))
         i = _src_index(e, g)
         j = _dst_index(e, g)
@@ -132,7 +132,7 @@ function graphcurve{T<:Real}(g, locs_x, locs_y, nodesize::T, arrowlength, angleo
 end
 
 function graphcurve{T<:Real}(g, locs_x, locs_y, nodesize::T, outangle)
-    lines = Array(Vector, _ne(g))
+    lines = Array{Vector}(_ne(g))
     for (e_idx, e) in enumerate(_edges(g))
         i = _src_index(e, g)
         j = _dst_index(e, g)
@@ -150,7 +150,7 @@ function graphcurve{T<:Real}(g, locs_x, locs_y, nodesize::T, outangle)
 end
 
 function graphcurve{T<:Real}(g, locs_x, locs_y, nodesize::Vector{T}, outangle)
-    lines = Array(Vector, _ne(g))
+    lines = Array{Vector}(_ne(g))
     for (e_idx, e) in enumerate(_edges(g))
         i = _src_index(e, g)
         j = _dst_index(e, g)

src/plot.jl

@@ -131,8 +131,8 @@ function gplot{T<:Real}(G,
     function scaler(z, a, b)
         2.0*((z - a)/(b - a)) - 1.0
     end
-    map!(z -> scaler(z, min_x, max_x), locs_x)
-    map!(z -> scaler(z, min_y, max_y), locs_y)
+    map!(z -> scaler(z, min_x, max_x), locs_x, locs_x)
+    map!(z -> scaler(z, min_y, max_y), locs_y, locs_y)
 
     # Determine sizes
     #const NODESIZE    = 0.25/sqrt(N)