Revert back to vertex properties

Author: gdalle

src/dict_utils.jl

@@ -10,7 +10,7 @@ Base.getindex(g::MetaGraph) = g.graph_data
 
 Return vertex metadata for `label`.
 """
-Base.getindex(g::MetaGraph, label) = g.vertex_data[label]
+Base.getindex(g::MetaGraph, label) = g.vertex_properties[label][2]
 
 """
     getindex(g, label_1, label_2)
@@ -24,7 +24,7 @@ Base.getindex(g::MetaGraph, label_1, label_2) = g.edge_data[arrange(g, label_1,
 
 Determine whether a graph `g` contains the vertex `label`.
 """
-Base.haskey(g::MetaGraph, label) = haskey(g.vertex_data, label)
+Base.haskey(g::MetaGraph, label) = haskey(g.vertex_properties, label)
 
 """
     haskey(g, label_1, label_2)
@@ -101,10 +101,9 @@ Copy properties from `oldg` to `newg` following vertex map `vmap`.
 function _copy_props!(oldg::G, newg::G, vmap) where {G<:MetaGraph}
     for (newv, oldv) in enumerate(vmap)
         oldl = oldg.vertex_labels[oldv]
-        data = oldg.vertex_data[oldl]
+        _, data = oldg.vertex_properties[oldl]
         newg.vertex_labels[newv] = oldl
-        newg.vertex_codes[oldl] = newv
-        newg.vertex_data[oldl] = data
+        newg.vertex_properties[oldl] = (newv, data)
     end
     for newe in edges(newg.graph)
         vertex_labels = newg.vertex_labels

src/graphs.jl

@@ -24,7 +24,7 @@ Find the vertex code (or index) associated with label `label`.
 
 This can be useful to pass to methods inherited from `Graphs`. Note, however, that vertex codes can be reassigned after vertex deletion.
 """
-code_for(g::MetaGraph, label) = g.vertex_codes[label]
+code_for(g::MetaGraph, label) = g.vertex_properties[label][1]
 
 """
     label_for(g::MetaGraph, v)
@@ -45,8 +45,9 @@ Set vertex metadata for `label` to `data`.
 Return `true` if the operation succeeds, and `false` if `g` has no such vertex.
 """
 function set_data!(g::MetaGraph, label, data)
-    if haskey(g.vertex_data, label)
-        g.vertex_data[label] = data
+    if haskey(g.vertex_properties, label)
+        code, old_data = g.vertex_properties[label]
+        g.vertex_properties[label] = (code, data)
         return true
     else
         return false
@@ -84,8 +85,7 @@ function Graphs.add_vertex!(g::MetaGraph, label, data)
     if added
         v = nv(g)
         g.vertex_labels[v] = label
-        g.vertex_codes[label] = v
-        g.vertex_data[label] = data
+        g.vertex_properties[label] = (v, data)
     end
     return added
 end
@@ -110,8 +110,7 @@ end
 
 function _rem_vertex!(g::MetaGraph, label, v)
     vertex_labels = g.vertex_labels
-    vertex_codes = g.vertex_codes
-    vertex_data = g.vertex_data
+    vertex_properties = g.vertex_properties
     edge_data = g.edge_data
     lastv = nv(g)
     for n in outneighbors(g, v)
@@ -124,13 +123,12 @@ function _rem_vertex!(g::MetaGraph, label, v)
     if removed
         if v != lastv # ignore if we're removing the last vertex.
             lastl = vertex_labels[lastv]
-            lastvprop = vertex_data[lastl]
+            lastvprop = vertex_properties[lastl]
             vertex_labels[v] = lastl
-            vertex_codes[lastl] = v
-            vertex_data[lastl] = lastvprop
+            vertex_properties[lastl] = lastvprop
         end
-        delete!(vertex_data, label)
         delete!(vertex_labels, lastv)
+        delete!(vertex_properties, label)
     end
     return removed
 end
@@ -164,8 +162,7 @@ function Graphs.induced_subgraph(
     newg = MetaGraph(
         inducedgraph,
         empty(g.vertex_labels),
-        empty(g.vertex_codes),
-        empty(g.vertex_data),
+        empty(g.vertex_properties),
         empty(g.edge_data),
         g.graph_data,
         g.weight_function,
@@ -178,8 +175,7 @@ end
 function Graphs.reverse(g::MetaDiGraph)
     rg = reverse(g.graph)
     rvertex_labels = copy(g.vertex_labels)
-    rvertex_codes = copy(g.vertex_codes)
-    rvertex_data = copy(g.vertex_data)
+    rvertex_properties = copy(g.vertex_properties)
     redge_data = empty(g.edge_data)
     rgraph_data = g.graph_data
     rweight_function = g.weight_function
@@ -192,8 +188,7 @@ function Graphs.reverse(g::MetaDiGraph)
     rg = MetaGraph(
         rg,
         rvertex_labels,
-        rvertex_codes,
-        rvertex_data,
+        rvertex_properties,
         redge_data,
         rgraph_data,
         rweight_function,

src/metagraph.jl

@@ -9,8 +9,7 @@ It is recommended not to set `Label` to an integer type, so as to avoid confusio
 # Fields
 - `g::Graph`: underlying, data-less graph with vertex indices of type `T`
 - `vertex_labels::Dict{T,Label}`: dictionary mapping vertex codes to vertex labels
-- `vertex_codes::Dict{Label,T}`: dictionary mapping vertex labels to vertex codes
-- `vertex_data::Dict{Label,VertexData}`: dictionary mapping vertex labels to vertex metadata
+- `vertex_properties::Dict{Label,Tuple{T,VertexData}}`: dictionary mapping vertex labels to vertex codes & data
 - `edge_data::Dict{Tuple{Label,Label},EdgeData}`: dictionary mapping edge labels such as `(label_u, label_v)` to edge metadata
 - `graph_data::GraphData`: graph metadata
 - `weight_function::WeightFunction`: function defining edge weight from edge metadata
@@ -21,8 +20,7 @@ struct MetaGraph{
 } <: AbstractGraph{T}
     graph::Graph
     vertex_labels::Dict{T,Label}
-    vertex_codes::Dict{Label,T}
-    vertex_data::Dict{Label,VertexData}
+    vertex_properties::Dict{Label,Tuple{T,VertexData}}
     edge_data::Dict{Tuple{Label,Label},EdgeData}
     graph_data::GraphData
     weight_function::WeightFunction
@@ -53,12 +51,13 @@ function MetaGraph(
 ) where {T}
     if Label <: Integer
         @warn "Constructing a MetaGraph with integer labels is not advised."
+    elseif nv(graph) > 0
+        @warn "Constructing a MetaGraph with a nonempty underlying graph is not advised."
     end
     return MetaGraph(
         graph,
         Dict{T,Label}(),
-        Dict{Label,T}(),
-        Dict{Label,VertexData}(),
+        Dict{Label,Tuple{T,VertexData}}(),
         Dict{Tuple{Label,Label},EdgeData}(),
         graph_data,
         weight_function,

src/persistence.jl

@@ -67,7 +67,7 @@ function savedot(io::IO, g::MetaGraph)
         end
     end
 
-    for label in keys(g.vertex_data)
+    for label in keys(g.vertex_properties)
         write(io, "    ")
         write(io, label)
         show_meta_list(io, g[label])