Skip to content

Commit 94155f9

Browse files
jack-dunhammtfishman
jack-dunham
and
mtfishman
authored
PartitionedGraphs extension for DataGraphs and interface overhaul. (#55)
Co-authored-by: Matt Fishman <mtfishman@users.noreply.github.com>
1 parent b3b61bc commit 94155f9

File tree

18 files changed

+1297
-326
lines changed

18 files changed

+1297
-326
lines changed

‎Project.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "DataGraphs"
22
uuid = "b5a273c3-7e6c-41f6-98bd-8d7f1525a36a"
3-
version = "0.2.14"
3+
version = "0.3.0"
44
authors = ["Matthew Fishman <mfishman@flatironinstitute.org> and contributors"]
55

66
[deps]
@@ -19,7 +19,7 @@ DataGraphsGraphsFlowsExt = "GraphsFlows"
1919
Dictionaries = "0.4"
2020
Graphs = "1"
2121
GraphsFlows = "0.1.1"
22-
NamedGraphs = "0.8.2"
22+
NamedGraphs = "0.10"
2323
SimpleTraits = "0.9"
2424
julia = "1.7"
2525

‎docs/Project.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
44
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
55

66
[compat]
7-
DataGraphs = "0.2.6"
8-
Documenter = "1.10.0"
7+
DataGraphs = "0.3"
8+
Documenter = "1.10"
99
Literate = "2.20.1"

‎examples/Project.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
44
NamedGraphs = "678767b0-92e7-4007-89e4-4527a8725b19"
55

66
[compat]
7-
DataGraphs = "0.2.6"
7+
DataGraphs = "0.3"
88
Graphs = "1.12"
9-
NamedGraphs = "0.6.5, 0.7, 0.8"
9+
NamedGraphs = "0.10"

‎examples/datagraph.jl‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
using DataGraphs: DataGraph
2-
using Graphs: Edge, grid, has_edge, has_vertex
2+
using Graphs: has_edge, has_vertex
3+
using NamedGraphs: NamedEdge
4+
using NamedGraphs.NamedGraphGenerators: named_grid
35

4-
g = grid((4,))
5-
dg = DataGraph(g; vertex_data_eltype = String, edge_data_eltype = Symbol)
6-
@show !isassigned(dg, Edge(1, 2))
6+
g = named_grid((4))
7+
dg = DataGraph(g; vertex_data_type = String, edge_data_type = Symbol)
8+
@show !isassigned(dg, NamedEdge(1, 2))
79
@show !isassigned(dg, 1 => 2)
8-
@show !isassigned(dg, Edge(1 => 2))
10+
@show !isassigned(dg, NamedEdge(1 => 2))
911
@show !isassigned(dg, 1 => 3)
1012
@show !isassigned(dg, 1)
1113
@show !isassigned(dg, 2)
@@ -33,10 +35,10 @@ dg[4] = "V4"
3335

3436
dg[1 => 2] = :E12
3537
dg[2 => 3] = :E23
36-
dg[Edge(3, 4)] = :E34
38+
dg[NamedEdge(3, 4)] = :E34
3739
#@show isassigned(dg, (1, 2))
38-
@show isassigned(dg, Edge(2, 3))
40+
@show isassigned(dg, NamedEdge(2, 3))
3941
@show isassigned(dg, 3 => 4)
40-
@show dg[Edge(1, 2)] == :E12
42+
@show dg[NamedEdge(1, 2)] == :E12
4143
@show dg[2 => 3] == :E23
4244
@show dg[3 => 4] == :E34

‎examples/disjoint_union.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ using NamedGraphs.GraphsExtensions: ⊔
33
using NamedGraphs.NamedGraphGenerators: named_grid
44
using DataGraphs: DataGraph
55

6-
g = DataGraph(named_grid((2, 2)); vertex_data_eltype = String, edge_data_eltype = String)
6+
g = DataGraph(named_grid((2, 2)); vertex_data_type = String, edge_data_type = String)
77

88
for v in vertices(g)
99
g[v] = "V$v"

‎examples/multidimdatagraph_1d.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ using Graphs: grid, has_edge, has_vertex
33
using NamedGraphs: NamedGraph, NamedEdge
44

55
g = NamedGraph(grid((4,)), ["A", "B", "C", "D"])
6-
dg = DataGraph(g; vertex_data_eltype = String, edge_data_eltype = Symbol)
6+
dg = DataGraph(g; vertex_data_type = String, edge_data_type = Symbol)
77

88
@show has_vertex(dg, "A")
99
@show has_vertex(dg, "D")

‎examples/multidimdatagraph_2d.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ using NamedGraphs: NamedEdge
33
using NamedGraphs.NamedGraphGenerators: named_grid
44

55
g = named_grid((2, 2))
6-
dg = DataGraph(g; vertex_data_eltype = String, edge_data_eltype = String)
6+
dg = DataGraph(g; vertex_data_type = String, edge_data_type = String)
77

88
dg[1, 1] = "X11"
99

‎examples/slicing.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ using NamedGraphs.NamedGraphGenerators: named_grid
44
using Graphs: ne, nv
55

66
g = named_grid((2, 2))
7-
dg = DataGraph(g; vertex_data_eltype = String, edge_data_eltype = String)
7+
dg = DataGraph(g; vertex_data_type = String, edge_data_type = String)
88

99
dg[1, 1] = "V11"
1010
dg[1, 2] = "V12"

‎ext/DataGraphsNamedGraphsExt/DataGraphsNamedGraphsExt.jl‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎src/DataGraphs.jl‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ module DataGraphs
22

33
include("utils.jl")
44
include("traits/isunderlyinggraph.jl")
5+
include("dataview.jl")
56
include("abstractdatagraph.jl")
7+
include("indexing.jl")
68
include("datagraph.jl")
7-
# TODO: Turn into a weak dependency once `GraphsExtensions`
8-
# is split off from `NamedGraphs`.
9-
include("../ext/DataGraphsNamedGraphsExt/DataGraphsNamedGraphsExt.jl")
9+
# TODO: Turn into an extension once `PartitionedGraphs` is excised.
10+
include("lib/DataGraphsPartitionedGraphsExt/src/DataGraphsPartitionedGraphsExt.jl")
1011

1112
export AbstractDataGraph, DataGraph
1213

0 commit comments

Comments
 (0)