PartitionedGraphs extension for DataGraphs and interface overhaul.

Project.toml

@@ -1,7 +1,7 @@
 name = "DataGraphs"
 uuid = "b5a273c3-7e6c-41f6-98bd-8d7f1525a36a"
 authors = ["Matthew Fishman <mfishman@flatironinstitute.org> and contributors"]
-version = "0.2.13"
+version = "0.3.0"
 
 [deps]
 Dictionaries = "85a47980-9c8c-11e8-2b9f-f7ca1fa99fb4"
@@ -19,7 +19,7 @@ DataGraphsGraphsFlowsExt = "GraphsFlows"
 Dictionaries = "0.4"
 Graphs = "1"
 GraphsFlows = "0.1.1"
-NamedGraphs = "0.8.2"
+NamedGraphs = "0.9.0"
 SimpleTraits = "0.9"
 julia = "1.7"
 

docs/Project.toml

@@ -4,6 +4,6 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
 
 [compat]
-DataGraphs = "0.2.6"
+DataGraphs = "0.3.0"
 Documenter = "1.10.0"
 Literate = "2.20.1"

examples/Project.toml

@@ -4,6 +4,6 @@ Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 NamedGraphs = "678767b0-92e7-4007-89e4-4527a8725b19"
 
 [compat]
-DataGraphs = "0.2.6"
+DataGraphs = "0.3.0"
 Graphs = "1.12"
-NamedGraphs = "0.6.5, 0.7, 0.8"
+NamedGraphs = "0.9.0"

examples/datagraph.jl

@@ -1,11 +1,13 @@
 using DataGraphs: DataGraph
-using Graphs: Edge, grid, has_edge, has_vertex
+using Graphs: has_edge, has_vertex
+using NamedGraphs: NamedEdge
+using NamedGraphs.NamedGraphGenerators: named_grid
 
-g = grid((4,))
-dg = DataGraph(g; vertex_data_eltype = String, edge_data_eltype = Symbol)
-@show !isassigned(dg, Edge(1, 2))
+g = named_grid((4))
+dg = DataGraph(g; vertex_data_type = String, edge_data_type = Symbol)
+@show !isassigned(dg, NamedEdge(1, 2))
 @show !isassigned(dg, 1 => 2)
-@show !isassigned(dg, Edge(1 => 2))
+@show !isassigned(dg, NamedEdge(1 => 2))
 @show !isassigned(dg, 1 => 3)
 @show !isassigned(dg, 1)
 @show !isassigned(dg, 2)
@@ -33,10 +35,10 @@ dg[4] = "V4"
 
 dg[1 => 2] = :E12
 dg[2 => 3] = :E23
-dg[Edge(3, 4)] = :E34
+dg[NamedEdge(3, 4)] = :E34
 #@show isassigned(dg, (1, 2))
-@show isassigned(dg, Edge(2, 3))
+@show isassigned(dg, NamedEdge(2, 3))
 @show isassigned(dg, 3 => 4)
-@show dg[Edge(1, 2)] == :E12
+@show dg[NamedEdge(1, 2)] == :E12
 @show dg[2 => 3] == :E23
 @show dg[3 => 4] == :E34

examples/disjoint_union.jl

@@ -3,7 +3,7 @@ using NamedGraphs.GraphsExtensions: ⊔
 using NamedGraphs.NamedGraphGenerators: named_grid
 using DataGraphs: DataGraph
 
-g = DataGraph(named_grid((2, 2)); vertex_data_eltype = String, edge_data_eltype = String)
+g = DataGraph(named_grid((2, 2)); vertex_data_type = String, edge_data_type = String)
 
 for v in vertices(g)
     g[v] = "V$v"

examples/multidimdatagraph_1d.jl

@@ -3,7 +3,7 @@ using Graphs: grid, has_edge, has_vertex
 using NamedGraphs: NamedGraph, NamedEdge
 
 g = NamedGraph(grid((4,)), ["A", "B", "C", "D"])
-dg = DataGraph(g; vertex_data_eltype = String, edge_data_eltype = Symbol)
+dg = DataGraph(g; vertex_data_type = String, edge_data_type = Symbol)
 
 @show has_vertex(dg, "A")
 @show has_vertex(dg, "D")

examples/multidimdatagraph_2d.jl

@@ -3,7 +3,7 @@ using NamedGraphs: NamedEdge
 using NamedGraphs.NamedGraphGenerators: named_grid
 
 g = named_grid((2, 2))
-dg = DataGraph(g; vertex_data_eltype = String, edge_data_eltype = String)
+dg = DataGraph(g; vertex_data_type = String, edge_data_type = String)
 
 dg[1, 1] = "X11"
 

examples/slicing.jl

@@ -4,7 +4,7 @@ using NamedGraphs.NamedGraphGenerators: named_grid
 using Graphs: ne, nv
 
 g = named_grid((2, 2))
-dg = DataGraph(g; vertex_data_eltype = String, edge_data_eltype = String)
+dg = DataGraph(g; vertex_data_type = String, edge_data_type = String)
 
 dg[1, 1] = "V11"
 dg[1, 2] = "V12"

src/DataGraphs.jl

@@ -2,11 +2,12 @@ module DataGraphs
 
 include("utils.jl")
 include("traits/isunderlyinggraph.jl")
+include("dataview.jl")
 include("abstractdatagraph.jl")
+include("indexing.jl")
 include("datagraph.jl")
-# TODO: Turn into a weak dependency once `GraphsExtensions`
-# is split off from `NamedGraphs`.
-include("../ext/DataGraphsNamedGraphsExt/DataGraphsNamedGraphsExt.jl")
+# TODO: Turn into an extension once `PartitionedGraphs` is excised.
+include("lib/DataGraphsPartitionedGraphsExt/src/DataGraphsPartitionedGraphsExt.jl")
 
 export AbstractDataGraph, DataGraph