fix #13

Author: sbromberger

src/simpleweighteddigraph.jl

@@ -5,19 +5,20 @@ A type representing a directed graph with weights of type `U`.
 """
 mutable struct SimpleWeightedDiGraph{T<:Integer, U<:Real} <: AbstractSimpleWeightedGraph{T, U}
     weights::SparseMatrixCSC{U, T} # indexed by [dst, src]
-    function SimpleWeightedDiGraph{T, U}(adjmx::SparseMatrixCSC{U,T}, permute=true) where T <: Integer where U <: Real
+    function SimpleWeightedDiGraph{T, U}(adjmx::SparseMatrixCSC{U,T}; permute=true) where T <: Integer where U <: Real
         dima,dimb = size(adjmx)
         isequal(dima,dimb) || error("Adjacency / distance matrices must be square")
         permute ? new{T, U}(permutedims(adjmx)) : new{T, U}(adjmx)
     end
 
-    SimpleWeightedDiGraph{T}(adjmx::SparseMatrixCSC{U, T}, permute=true) where T<:Integer where U<:Real =
-        permute ? new{T, U}(permutedims(adjmx)) : new{T, U}(adjmx)
-    
-    SimpleWeightedDiGraph(adjmx::SparseMatrixCSC{U, T}, permute=true) where T<:Integer where U<:Real =
-        permute ? new{T, U}(permutedims(adjmx)) : new{T, U}(adjmx)
 end
 
+SimpleWeightedDiGraph{T}(adjmx::SparseMatrixCSC{U, T}; permute=true) where T<:Integer where U<:Real =
+    SimpleWeightedDiGraph{T, U}(adjmx; permute=permute)
+
+SimpleWeightedDiGraph(adjmx::SparseMatrixCSC{U, T}; permute=true) where T<:Integer where U<:Real =
+    SimpleWeightedDiGraph{T, U}(adjmx; permute=permute)
+
 SimpleWeightedDiGraph(m::AbstractMatrix{U}) where U <: Real = 
     SimpleWeightedDiGraph{Int, U}(SparseMatrixCSC{U, Int}(m))
 SimpleWeightedDiGraph{T}(m::AbstractMatrix{U}) where T<:Integer where U<:Real =
@@ -27,7 +28,7 @@ SimpleWeightedDiGraph{T, U}(m::AbstractMatrix) where T<:Integer where U<:Real =
 
 SimpleWeightedDiGraph(g::SimpleWeightedDiGraph) = SimpleWeightedDiGraph(g.weights, false)
 SimpleWeightedDiGraph{T,U}(g::SimpleWeightedDiGraph) where T<:Integer where U<:Real =
-    SimpleWeightedDiGraph(SparseMatrixCSC{U, T}(g.weights), false)
+    SimpleWeightedDiGraph(SparseMatrixCSC{U, T}(g.weights); permute=false)
 
 
 ne(g::SimpleWeightedDiGraph) = nnz(g.weights)
@@ -64,7 +65,7 @@ end
 # DiGraph(srcs, dsts, weights)
 function SimpleWeightedDiGraph(i::AbstractVector{T}, j::AbstractVector{T}, v::AbstractVector{U}; combine = +) where T<:Integer where U<:Real
     m = max(maximum(j), maximum(i))
-    SimpleWeightedDiGraph{T, U}(sparse(j, i, v, m, m, combine), false)
+    SimpleWeightedDiGraph{T, U}(sparse(j, i, v, m, m, combine); permute=false)
 end
 
 edgetype(::SimpleWeightedDiGraph{T, U}) where T<:Integer where U<:Real = SimpleWeightedGraphEdge{T,U}

src/simpleweightedgraph.jl

@@ -14,16 +14,16 @@ mutable struct SimpleWeightedGraph{T<:Integer, U<:Real} <: AbstractSimpleWeighte
         new{T, U}(adjmx)
     end
 
-    SimpleWeightedGraph{T}(adjmx::SparseMatrixCSC{U, T}) where T<:Integer where U<:Real =
-        new{T, U}(adjmx)
-
-    SimpleWeightedGraph(adjmx::SparseMatrixCSC{U, T}) where T<:Integer where U<:Real =
-        new{T, U}(adjmx)
-    
 end
 
 ne(g::SimpleWeightedGraph) = nnz(g.weights) ÷ 2
 
+SimpleWeightedGraph{T}(adjmx::SparseMatrixCSC{U, T}) where T<:Integer where U<:Real =
+    SimpleWeightedGraph{T, U}(adjmx)
+
+SimpleWeightedGraph(adjmx::SparseMatrixCSC{U, T}) where T<:Integer where U<:Real =
+    SimpleWeightedGraph{T, U}(adjmx)
+
 SimpleWeightedGraph(m::AbstractMatrix{U}) where U <: Real = 
     SimpleWeightedGraph{Int, U}(SparseMatrixCSC{U, Int}(m))
 SimpleWeightedGraph{T}(m::AbstractMatrix{U}) where T<:Integer where U<:Real =

test/simpleweightedgraph.jl

@@ -1,6 +1,7 @@
 using SimpleWeightedGraphs
 
 @testset "SimpleWeightedGraphs" begin
+    @info("Ignore warnings relating to adding and removing vertices and edges")
     adjmx1 = [0 1 0; 1 0 1; 0 1 0] # SimpleWeightedGraph
     adjmx2 = [0 1 0; 1 0 1; 1 1 0] # SimpleWeightedDiGraph
     # specific concrete generators - no need for loop