Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add verification to ValGraphCollection constructor #1

Merged
merged 1 commit into from
Feb 10, 2021
+60 −10
Merged

Add verification to ValGraphCollection constructor #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 60 additions & 10 deletions src/valgraphcollection.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,73 @@ struct ValGraphCollection{V <: Integer, V_VALS <: AbstractTuple, E_VALS <: Abstr

function ValGraphCollection(graph_ids, vertex_ids, edge_ids, vertexvals, edgevals, graphvals)

@assert length(graph_ids) == length(graphvals) + 1
@assert length(vertex_ids) == length(vertexvals) + 1
@assert length(edge_ids) == length(edgevals)

# TODO more invariant checks should be done here

V = eltype(edge_ids)
V_VALS = eltype(vertexvals)
E_VALS = eltype(edgevals)
G_VALS = eltype(graphvals)

return new{V, V_VALS, E_VALS, G_VALS}(graph_ids, vertex_ids, edge_ids, vertexvals, edgevals, graphvals)
result = new{V, V_VALS, E_VALS, G_VALS}(graph_ids, vertex_ids, edge_ids, vertexvals, edgevals, graphvals)
_verify(result)
return result
end
end

function _verify(coll::ValGraphCollection{V, V_VALS, E_VALS, G_VALS}) where {V, V_VALS, E_VALS, G_VALS}

graph_ids = coll.graph_ids
vertex_ids = coll.vertex_ids
edge_ids = coll.edge_ids
vertexvals = coll.vertexvals
edgevals = coll.edgevals
graphvals = coll.graphvals

# when there is no edge
if length(coll.graph_ids) <= 1
@assert length(vertex_ids) == 0
@assert length(edge_ids) == 0
@assert length(vertevals) == 0
@assert length(edgevals) == 0
@assert length(graphvals) == 0

return nothing
end

@assert length(graph_ids) == length(graphvals) + 1
@assert length(vertex_ids) == length(vertexvals) + 1
@assert length(edge_ids) == length(edgevals)

@assert length(graph_ids) >= 1
@assert graph_ids[begin] >= 1
@assert graph_ids[end] == length(vertex_ids)
@assert issorted(graph_ids)

@assert issorted(vertex_ids)

N = length(graph_ids) - 1
for k in 1:N
v1 = graph_ids[k]
v2 = graph_ids[k + 1]

nvg = v2 - v1

edges = Vector{@NamedTuple{src::Int, dst::Int, edge_index::Int}}()

for v in v1:v2-1

for e_id in vertex_ids[v]:vertex_ids[v+1]-1
@assert edge_ids[e_id] ∈ 1:nvg
end

# TODO we should also verify here that the graph contains reverse edges
# and that the weights of the reverse edges are the same
end

end

return nothing
end


## ----------------------------------------------
## ng
## ----------------------------------------------
Expand Down Expand Up @@ -197,7 +247,7 @@ function outneighbors(g::ValGraphCollectionView, u::Integer)
v_id1 = g.collection.vertex_ids[graph_id + (u - 1)]
v_id2 = g.collection.vertex_ids[graph_id + u]

# TODO maybe we should return an immutable view
# TODO maybe return an immutable view
return @view g.collection.edge_ids[v_id1:v_id2-1]
end

Expand All @@ -208,7 +258,7 @@ function outedgevals(g::ValGraphCollectionView, u::Integer, ::Colon)
v_id1 = g.collection.vertex_ids[graph_id + (u - 1)]
v_id2 = g.collection.vertex_ids[graph_id + u]

# TODO maybe we should return an immutable view
# TODO maybe return an immutable view
return @view g.collection.edgevals[v_id1:v_id2-1]
end

Expand Down Expand Up @@ -241,7 +291,7 @@ function SimpleGraph{T}(gv::ValGraphCollectionView) where {T}
end

ValGraph(gv::ValGraphCollectionView) = ValGraph{eltype(gv)}(gv)
# TODO this ugly constructor should probably be moved to SimpleValueGraphs.jl
# TODO this ugly constructor should be moved to SimpleValueGraphs.jl
function ValGraph{V}(gv::ValGraphCollectionView) where {V}

nvg = Int(nv(gv))
Expand Down