Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
swh-graph
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Antoine Lambert
swh-graph
Commits
97f7d693
Commit
97f7d693
authored
5 years ago
by
Antoine Pietri
Browse files
Options
Downloads
Patches
Plain Diff
java: traversal: use HashSet to reduce initialization time
parent
b4a0fe14
Branches
fix_java
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
java/server/src/main/java/org/softwareheritage/graph/algo/Traversal.java
+16
-17
16 additions, 17 deletions
.../main/java/org/softwareheritage/graph/algo/Traversal.java
with
16 additions
and
17 deletions
java/server/src/main/java/org/softwareheritage/graph/algo/Traversal.java
+
16
−
17
View file @
97f7d693
...
@@ -3,6 +3,7 @@ package org.softwareheritage.graph.algo;
...
@@ -3,6 +3,7 @@ package org.softwareheritage.graph.algo;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
java.util.LinkedList
;
import
java.util.LinkedList
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Queue
;
import
java.util.Queue
;
...
@@ -15,8 +16,6 @@ import org.softwareheritage.graph.Endpoint;
...
@@ -15,8 +16,6 @@ import org.softwareheritage.graph.Endpoint;
import
org.softwareheritage.graph.Graph
;
import
org.softwareheritage.graph.Graph
;
import
org.softwareheritage.graph.Neighbors
;
import
org.softwareheritage.graph.Neighbors
;
import
org.softwareheritage.graph.Node
;
import
org.softwareheritage.graph.Node
;
import
org.softwareheritage.graph.algo.NodeIdConsumer
;
import
org.softwareheritage.graph.algo.PathConsumer
;
/**
/**
* Traversal algorithms on the compressed graph.
* Traversal algorithms on the compressed graph.
...
@@ -37,8 +36,8 @@ public class Traversal {
...
@@ -37,8 +36,8 @@ public class Traversal {
/** Graph edge restriction */
/** Graph edge restriction */
AllowedEdges
edges
;
AllowedEdges
edges
;
/**
Bit array
storing if we have visited a node */
/**
Hash set
storing if we have visited a node */
LongArrayBitVector
visited
;
HashSet
<
Long
>
visited
;
/** Hash map storing parent node id for each nodes during a traversal */
/** Hash map storing parent node id for each nodes during a traversal */
Map
<
Long
,
Long
>
parentNode
;
Map
<
Long
,
Long
>
parentNode
;
/** Number of edges accessed during traversal */
/** Number of edges accessed during traversal */
...
@@ -62,7 +61,7 @@ public class Traversal {
...
@@ -62,7 +61,7 @@ public class Traversal {
this
.
edges
=
new
AllowedEdges
(
graph
,
edgesFmt
);
this
.
edges
=
new
AllowedEdges
(
graph
,
edgesFmt
);
long
nbNodes
=
graph
.
getNbNodes
();
long
nbNodes
=
graph
.
getNbNodes
();
this
.
visited
=
LongArrayBitVector
.
ofLength
(
nbNodes
);
this
.
visited
=
new
HashSet
<>(
);
this
.
parentNode
=
new
HashMap
<>();
this
.
parentNode
=
new
HashMap
<>();
this
.
nbEdgesAccessed
=
0
;
this
.
nbEdgesAccessed
=
0
;
}
}
...
@@ -84,7 +83,7 @@ public class Traversal {
...
@@ -84,7 +83,7 @@ public class Traversal {
this
.
nbEdgesAccessed
=
0
;
this
.
nbEdgesAccessed
=
0
;
stack
.
push
(
srcNodeId
);
stack
.
push
(
srcNodeId
);
visited
.
set
(
srcNodeId
);
visited
.
add
(
srcNodeId
);
while
(!
stack
.
isEmpty
())
{
while
(!
stack
.
isEmpty
())
{
long
currentNodeId
=
stack
.
pop
();
long
currentNodeId
=
stack
.
pop
();
...
@@ -93,9 +92,9 @@ public class Traversal {
...
@@ -93,9 +92,9 @@ public class Traversal {
nbEdgesAccessed
+=
graph
.
degree
(
currentNodeId
,
useTransposed
);
nbEdgesAccessed
+=
graph
.
degree
(
currentNodeId
,
useTransposed
);
for
(
long
neighborNodeId
:
new
Neighbors
(
graph
,
useTransposed
,
edges
,
currentNodeId
))
{
for
(
long
neighborNodeId
:
new
Neighbors
(
graph
,
useTransposed
,
edges
,
currentNodeId
))
{
neighborsCnt
++;
neighborsCnt
++;
if
(!
visited
.
getBoolean
(
neighborNodeId
))
{
if
(!
visited
.
contains
(
neighborNodeId
))
{
stack
.
push
(
neighborNodeId
);
stack
.
push
(
neighborNodeId
);
visited
.
set
(
neighborNodeId
);
visited
.
add
(
neighborNodeId
);
}
}
}
}
...
@@ -149,7 +148,7 @@ public class Traversal {
...
@@ -149,7 +148,7 @@ public class Traversal {
this
.
nbEdgesAccessed
=
0
;
this
.
nbEdgesAccessed
=
0
;
stack
.
push
(
srcNodeId
);
stack
.
push
(
srcNodeId
);
visited
.
set
(
srcNodeId
);
visited
.
add
(
srcNodeId
);
while
(!
stack
.
isEmpty
())
{
while
(!
stack
.
isEmpty
())
{
long
currentNodeId
=
stack
.
pop
();
long
currentNodeId
=
stack
.
pop
();
...
@@ -157,9 +156,9 @@ public class Traversal {
...
@@ -157,9 +156,9 @@ public class Traversal {
nbEdgesAccessed
+=
graph
.
degree
(
currentNodeId
,
useTransposed
);
nbEdgesAccessed
+=
graph
.
degree
(
currentNodeId
,
useTransposed
);
for
(
long
neighborNodeId
:
new
Neighbors
(
graph
,
useTransposed
,
edges
,
currentNodeId
))
{
for
(
long
neighborNodeId
:
new
Neighbors
(
graph
,
useTransposed
,
edges
,
currentNodeId
))
{
if
(!
visited
.
getBoolean
(
neighborNodeId
))
{
if
(!
visited
.
contains
(
neighborNodeId
))
{
stack
.
push
(
neighborNodeId
);
stack
.
push
(
neighborNodeId
);
visited
.
set
(
neighborNodeId
);
visited
.
add
(
neighborNodeId
);
}
}
}
}
}
}
...
@@ -259,7 +258,7 @@ public class Traversal {
...
@@ -259,7 +258,7 @@ public class Traversal {
this
.
nbEdgesAccessed
=
0
;
this
.
nbEdgesAccessed
=
0
;
stack
.
push
(
srcNodeId
);
stack
.
push
(
srcNodeId
);
visited
.
set
(
srcNodeId
);
visited
.
add
(
srcNodeId
);
while
(!
stack
.
isEmpty
())
{
while
(!
stack
.
isEmpty
())
{
long
currentNodeId
=
stack
.
pop
();
long
currentNodeId
=
stack
.
pop
();
...
@@ -269,9 +268,9 @@ public class Traversal {
...
@@ -269,9 +268,9 @@ public class Traversal {
nbEdgesAccessed
+=
graph
.
degree
(
currentNodeId
,
useTransposed
);
nbEdgesAccessed
+=
graph
.
degree
(
currentNodeId
,
useTransposed
);
for
(
long
neighborNodeId
:
new
Neighbors
(
graph
,
useTransposed
,
edges
,
currentNodeId
))
{
for
(
long
neighborNodeId
:
new
Neighbors
(
graph
,
useTransposed
,
edges
,
currentNodeId
))
{
if
(!
visited
.
getBoolean
(
neighborNodeId
))
{
if
(!
visited
.
contains
(
neighborNodeId
))
{
stack
.
push
(
neighborNodeId
);
stack
.
push
(
neighborNodeId
);
visited
.
set
(
neighborNodeId
);
visited
.
add
(
neighborNodeId
);
parentNode
.
put
(
neighborNodeId
,
currentNodeId
);
parentNode
.
put
(
neighborNodeId
,
currentNodeId
);
}
}
}
}
...
@@ -292,7 +291,7 @@ public class Traversal {
...
@@ -292,7 +291,7 @@ public class Traversal {
this
.
nbEdgesAccessed
=
0
;
this
.
nbEdgesAccessed
=
0
;
queue
.
add
(
srcNodeId
);
queue
.
add
(
srcNodeId
);
visited
.
set
(
srcNodeId
);
visited
.
add
(
srcNodeId
);
while
(!
queue
.
isEmpty
())
{
while
(!
queue
.
isEmpty
())
{
long
currentNodeId
=
queue
.
poll
();
long
currentNodeId
=
queue
.
poll
();
...
@@ -302,9 +301,9 @@ public class Traversal {
...
@@ -302,9 +301,9 @@ public class Traversal {
nbEdgesAccessed
+=
graph
.
degree
(
currentNodeId
,
useTransposed
);
nbEdgesAccessed
+=
graph
.
degree
(
currentNodeId
,
useTransposed
);
for
(
long
neighborNodeId
:
new
Neighbors
(
graph
,
useTransposed
,
edges
,
currentNodeId
))
{
for
(
long
neighborNodeId
:
new
Neighbors
(
graph
,
useTransposed
,
edges
,
currentNodeId
))
{
if
(!
visited
.
getBoolean
(
neighborNodeId
))
{
if
(!
visited
.
contains
(
neighborNodeId
))
{
queue
.
add
(
neighborNodeId
);
queue
.
add
(
neighborNodeId
);
visited
.
set
(
neighborNodeId
);
visited
.
add
(
neighborNodeId
);
parentNode
.
put
(
neighborNodeId
,
currentNodeId
);
parentNode
.
put
(
neighborNodeId
,
currentNodeId
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment