Merge branch 'master' into dev

Author: gdalle

src/graphs.jl

@@ -88,14 +88,17 @@ end
     add_vertex!(meta_graph, label, data)
 
 Add a vertex to MetaGraph `meta_graph` with label `label` having metadata `data`.
+If the `VertexData` type of `meta_graph` is `Nothing`, `data` can be omitted.
 
-Return true if the vertex has been added, false incase the label already exists or vertex was not added.
+Return true if the vertex has been added, false in case the label already exists or vertex was not added.
 """
 function Graphs.add_vertex!(meta_graph::MetaGraph, label, data)
     if haskey(meta_graph, label)
         return false
     end
-    added = add_vertex!(meta_graph.graph)
+    nvnum = nv(meta_graph.graph)
+    add_vertex!(meta_graph.graph)
+    added = nvnum + 1 == nv(meta_graph.graph)
     if added
         code = nv(meta_graph)
         meta_graph.vertex_labels[code] = label
@@ -104,10 +107,15 @@ function Graphs.add_vertex!(meta_graph::MetaGraph, label, data)
     return added
 end
 
+function Graphs.add_vertex!(meta_graph::MetaGraph{<:Any,<:Any,<:Any,Nothing}, label)
+    return Graphs.add_vertex!(meta_graph, label, nothing)
+end
+
 """
     add_edge!(meta_graph, label_1, label_2, data)
 
 Add an edge `(label_1, label_2)` to MetaGraph `meta_graph` with metadata `data`.
+If the `EdgeData` type of `meta_graph` is `Nothing`, `data` can be omitted.
 
 Return `true` if the edge has been added, `false` otherwise.
 """
@@ -120,6 +128,12 @@ function Graphs.add_edge!(meta_graph::MetaGraph, label_1, label_2, data)
     return added
 end
 
+function Graphs.add_edge!(
+    meta_graph::MetaGraph{<:Any,<:Any,<:Any,<:Any,Nothing}, label_1, label_2
+)
+    return Graphs.add_edge!(meta_graph, label_1, label_2, nothing)
+end
+
 ## Remove vertex
 
 function _rem_vertex!(meta_graph::MetaGraph, label, code)

test/misc.jl

@@ -0,0 +1,20 @@
+@testset verbose = true "Short-form add_vertex!/add_edge!" begin
+    # short-form
+    mg = MetaGraph(
+        Graph(); label_type=Symbol, vertex_data_type=Nothing, edge_data_type=Nothing
+    )
+    @test add_vertex!(mg, :A)
+    @test add_vertex!(mg, :B)
+    @test add_edge!(mg, :A, :B)
+
+    # long-form
+    mg2 = MetaGraph(
+        Graph(); label_type=Symbol, vertex_data_type=Nothing, edge_data_type=Nothing
+    )
+    @test add_vertex!(mg2, :A, nothing)
+    @test add_vertex!(mg2, :B, nothing)
+    @test add_edge!(mg2, :A, :B, nothing)
+
+    # compare
+    @test mg == mg2
+end

test/runtests.jl

@@ -32,4 +32,8 @@ DocMeta.setdocmeta!(MetaGraphsNext, :DocTestSetup, :(using MetaGraphsNext); recu
             include(joinpath("tutorial", "4_type_stability.jl"))
         end
     end
+
+    @testset verbose = true "Miscellaneous" begin
+        include("misc.jl")
+    end
 end