Merge pull request #28 from JuliaGraphs/sbromberger/julia-1.0

Fixes to work with Julia 1.0 / LG 1.0.0

Author: sbromberger

REQUIRE

@@ -1,2 +1,2 @@
-julia 0.7
-LightGraphs 0.13
+julia 1.0
+LightGraphs 1.0

src/SimpleWeightedGraphs.jl

@@ -6,7 +6,7 @@ using Markdown
 using SparseArrays
 
 import Base:
-    convert, eltype, show, ==, Pair, Tuple, copy, length, start, next, done, issubset, zero
+    convert, eltype, show, ==, Pair, Tuple, copy, length, issubset, zero
 
 import LightGraphs:
     _NI, AbstractGraph, AbstractEdge, AbstractEdgeIter,

src/persistence.jl

@@ -86,9 +86,7 @@ function loadswg_mult(io::IO)
     graphs = Dict{String,AbstractGraph}()
     while !eof(io)
         line = strip(chomp(readline(io)))
-        if startswith(line, "#") || line == ""
-            next
-        else
+        if !(startswith(line, "#") || line == "")
             header = _parse_header(line)
             g = _swg_read_one_graph(io, header)
             graphs[header.name] = g

test/runtests.jl

@@ -7,6 +7,9 @@ testdir = dirname(@__FILE__)
 testgraphs(g) = [g, SimpleWeightedGraph{UInt8,Float64}(g), SimpleWeightedGraph{Int16,Float32}(g)]
 testdigraphs(g) = [g, SimpleWeightedDiGraph{UInt8,Float64}(g), SimpleWeightedDiGraph{Int16,Float32}(g)]
 
+testsimplegraphs(g) = [g, LightGraphs.SimpleGraph{UInt8}(g), LightGraphs.SimpleGraph{Int16}(g)]
+testsimpledigraphs(g) = [g, LightGraphs.SimpleDiGraph{UInt8}(g), LightGraphs.SimpleDiGraph{Int16}(g)]
+
 tests = [
     "simpleweightededge",
     "simpleweightedgraph",

test/simpleweightedgraph.jl

@@ -185,12 +185,12 @@ using SimpleWeightedGraphs
     @test sum(weights(g)) == ne(g) * 4.0
 
     gx = Graph(4,3)
-    for g in testgraphs(gx)
+    for g in testsimplegraphs(gx)
         @test eltype(SimpleWeightedGraph(g)) == eltype(g)
     end
 
     gx = DiGraph(4,3)
-    for g in testdigraphs(gx)
+    for g in testsimpledigraphs(gx)
         @test eltype(SimpleWeightedGraph(g)) == eltype(g)
     end