Merge ceb7b4c into 6525b82

src/common.jl

@@ -8,8 +8,6 @@ typealias AttributeDict Dict{UTF8String, Any}
 #
 ################################################
 
-vertex_index(v::Integer) = v
-
 immutable KeyVertex{K}
     index::Int
     key::K

src/graph.jl

@@ -55,7 +55,16 @@ vertices(g::GenericGraph) = g.vertices
 num_edges(g::GenericGraph) = length(g.edges)
 edges(g::GenericGraph) = g.edges
 
-vertex_index{V<:ProvidedVertexType}(v::V, g::GenericGraph{V}) = vertex_index(v)
+vertex_index(v::Integer, g::SimpleGraph) = (v <= g.vertices[end]? v: 0)
+
+function vertex_index{V<:ProvidedVertexType}(v::V, g::GenericGraph{V})
+    if applicable(vertex_index, v)  # use O(1) if possible
+        return vertex_index(v)
+    else                            # use O(n)
+        return vertex_index(v,vertices(g))
+    end
+end
+
 edge_index{V,E}(e::E, g::GenericGraph{V,E}) = edge_index(e)
 
 out_edges{V}(v::V, g::GenericGraph{V}) = g.finclist[vertex_index(v, g)]
@@ -69,6 +78,17 @@ in_neighbors{V}(v::V, g::GenericGraph{V}) = SourceIterator(g, in_edges(v, g))
 
 # mutation
 
+function add_vertex!(g::SimpleGraph)
+    # ensure SimpleGraph indices are consecutive, allowing O(1) indexing
+    v = g.vertices[end] + 1
+    g.vertices = 1:v
+    push!(g.finclist, Int[])
+    push!(g.binclist, Int[])
+    v
+end
+
+@deprecate add_vertex!(g::SimpleGraph,v) add_vertex!(g::SimpleGraph)
+
 function add_vertex!{V}(g::GenericGraph{V}, v::V)
     push!(g.vertices, v)
     push!(g.finclist, Int[])