Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions src/abstractdatagraph.jl
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,10 @@ function Base.get(graph::AbstractDataGraph, vertex, default)
return get(vertex_data(graph), vertex, default)
end

function Base.get!(graph::AbstractDataGraph, vertex, default)
return get!(vertex_data(graph), vertex, default)
end

function Base.getindex(graph::AbstractDataGraph, edge::AbstractEdge)
is_edge_arranged_ = is_edge_arranged(graph, edge)
data = edge_data(graph)[arrange(is_edge_arranged_, edge)]
Expand All @@ -327,6 +331,16 @@ function Base.get(graph::AbstractDataGraph, edge::Pair, default)
return get(graph, edgetype(graph)(edge), default)
end

function Base.get!(graph::AbstractDataGraph, edge::AbstractEdge, default)
is_edge_arranged_ = is_edge_arranged(graph, edge)
data = get!(edge_data(graph), arrange(is_edge_arranged_, edge), default)
return reverse_data_direction(is_edge_arranged_, graph, data)
end

function Base.get!(graph::AbstractDataGraph, edge::Pair, default)
return get!(graph, edgetype(graph)(edge), default)
end

# Support syntax `g[1, 2] = g[(1, 2)]`
function Base.getindex(graph::AbstractDataGraph, i1, i2, i...)
return graph[(i1, i2, i...)]
Expand Down
21 changes: 21 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,27 @@ using DataGraphs: is_arranged
@test dg["Y" => 2] == "edge_Y2"
end

@testset "get and get! functions" begin
g = grid((4,))
dg = DataGraph(g; vertex_data_eltype=String, edge_data_eltype=Symbol)

# Test for vertices
@test get(dg, 1, "default") == "default"
@test !isassigned(dg, 1)

@test get!(dg, 2, "default") == "default"
@test isassigned(dg, 2)
@test dg[2] == "default"

# Test for edges
@test get(dg, 1 => 2, :default) == :default
@test !isassigned(dg, 1 => 2)

@test get!(dg, 1 => 2, :default) == :default
@test isassigned(dg, 1 => 2)
@test dg[1 => 2] == :default
end

@testset "Constructors specifying vertex type" begin
dg = DataGraph{Float64}(
named_path_graph(4); vertex_data_eltype=String, edge_data_eltype=Symbol
Expand Down