Skip to content

Commit 11b2d50

Browse files
authored
Changed kernel2 to use bfs_parents (#7)
1 parent 78263e9 commit 11b2d50

File tree

4 files changed

+4
-24
lines changed

4 files changed

+4
-24
lines changed

src/driver.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ function driver(
3535

3636
for (k, key) in enumerate(search_key)
3737
tic()
38-
parent_ = zeros(T,nv(g))
39-
kernel_2(g, key, parent_)
38+
parent_ = kernel_2(g, key)
4039
kernel_2_time[k] = toq()
4140
err = validate(g, parent_, ij, key)
4241
err <= 0 && error("BFS ",k ," from search key ",key," failed to validate: ",err)

src/kernel_2.jl

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,4 @@ function key_sampling(
2121
end
2222

2323

24-
function kernel_2(g::Graph{T}, s::T, parents::Vector{T}) where T<:Integer
25-
Q=Vector{T}()
26-
seen = falses(nv(g))
27-
parents[s] = s
28-
seen[s] = true
29-
push!(Q, s)
30-
while !isempty(Q)
31-
src = shift!(Q)
32-
for vertex in out_neighbors(g, src)
33-
if !seen[vertex]
34-
push!(Q, vertex) #Push onto queue
35-
parents[vertex] = src
36-
seen[vertex] = true
37-
end
38-
end
39-
end
40-
return parents
41-
end
24+
kernel_2(g::Graph{T}, s::T) where T<:Integer = bfs_parents(g,s)

test/kernel_2.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
keys_ = @inferred key_sampling(g)
1010
@test length(keys_) <= 64
1111
T = eltype(g)
12-
parent_ = zeros(T,nv(g))
13-
@inferred kernel_2(g,0x01,parent_)
12+
parent_ = @inferred kernel_2(g,0x01)
1413
@test length(parent_) <= 2^2
1514
end

test/validation.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
using LightGraphs
33
ij = kronecker_generator(2,2;replicate=true,seed=[10,4,78,12,5,72])
44
g = kernel_1(ij)
5-
parent_ = zeros(eltype(g),nv(g))
6-
kernel_2(g,0x01,parent_)
5+
parent_ = kernel_2(g,0x01)
76

87
# check that parent of search key is itself
98
parent_[1] = 0x05

0 commit comments

Comments
 (0)