Skip to content

Commit

Permalink
Fix Bug
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeyT1994 committed Dec 18, 2024
1 parent 8da3920 commit 3fc60b2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
10 changes: 5 additions & 5 deletions src/lib/PartitionedGraphs/src/partitionedgraph.jl
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ function partitionedges(pg::PartitionedGraph)
end

function Graphs.edges(pg::PartitionedGraph, partitionedge::PartitionEdge)
psrc_vs = vertices(pg, PartitionVertex(src(partitionedge)))
pdst_vs = vertices(pg, PartitionVertex(dst(partitionedge)))
psrc_subgraph = subgraph(unpartitioned_graph(pg), psrc_vs)
pdst_subgraph = subgraph(pg, pdst_vs)
full_subgraph = subgraph(pg, vcat(psrc_vs, pdst_vs))
psrc_vs = vertices(pg, src(partitionedge))
pdst_vs = vertices(pg, dst(partitionedge))
psrc_subgraph, _ = induced_subgraph(unpartitioned_graph(pg), psrc_vs)
pdst_subgraph, _ = induced_subgraph(pg, pdst_vs)
full_subgraph, _ = induced_subgraph(pg, vcat(psrc_vs, pdst_vs))

return setdiff(edges(full_subgraph), vcat(edges(psrc_subgraph), edges(pdst_subgraph)))
end
Expand Down
6 changes: 4 additions & 2 deletions test/test_partitionedgraph.jl
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ using NamedGraphs.GraphsExtensions:
vertextype
using NamedGraphs.NamedGraphGenerators:
named_comb_tree, named_grid, named_triangular_lattice_graph
using NamedGraphs.OrderedDictionaries: OrderedDictionary
using NamedGraphs.PartitionedGraphs:
PartitionEdge,
PartitionedGraph,
Expand All @@ -52,7 +53,7 @@ using Test: @test, @testset
pg = PartitionedGraph(g, partitions)
@test vertextype(partitioned_graph(pg)) == Int64
@test vertextype(unpartitioned_graph(pg)) == vertextype(g)
@test isa(partitionvertices(pg), Dictionary{Int64,PartitionVertex{Int64}})
@test isa(partitionvertices(pg), OrderedDictionary{Int64,PartitionVertex{Int64}})
@test isa(partitionedges(pg), Vector{PartitionEdge{Int64,NamedEdge{Int64}}})
@test is_tree(partitioned_graph(pg))
@test nv(pg) == nx * ny
Expand All @@ -67,7 +68,7 @@ using Test: @test, @testset
@test vertextype(unpartitioned_graph(pg)) == vertextype(g)
@test isa(
partitionvertices(pg),
Dictionary{Tuple{Int64,Int64},PartitionVertex{Tuple{Int64,Int64}}},
OrderedDictionary{Tuple{Int64,Int64},PartitionVertex{Tuple{Int64,Int64}}},
)
@test isa(
partitionedges(pg),
Expand Down Expand Up @@ -103,6 +104,7 @@ end
@test !is_self_loop(partitionedge(pg, (1, 2, 1) => (1, 1, 1)))
@test partitionvertex(pg, (1, 1, 1)) == partitionvertex(pg, (1, 1, nz))
@test partitionvertex(pg, (2, 1, 1)) != partitionvertex(pg, (1, 1, nz))
@test all([length(edges(pg, pe)) == nz for pe in partitionedges(pg)])

@test partitionedge(pg, (1, 1, 1) => (2, 1, 1)) ==
partitionedge(pg, (1, 1, 2) => (2, 1, 2))
Expand Down

0 comments on commit 3fc60b2

Please sign in to comment.