add 5 TP algorithm #919

zhoney · 2020-03-30T13:54:09Z

same neighbors
jaccard similarity
all shortest paths
weighted shortest path
single source shortest paths

Change-Id: I13a04267c6c91cc8bb00ca2aed1ef54c8e6eeeb6

1. same neighbors 2. jaccard similarity 3. all shortest paths 4. weighted shortest path 5. single source shortest paths Change-Id: I13a04267c6c91cc8bb00ca2aed1ef54c8e6eeeb6

codecov · 2020-03-30T14:07:22Z

Codecov Report

Merging #919 into master will increase coverage by 0.26%.
The diff coverage is 1.38%.

@@             Coverage Diff              @@
##             master     #919      +/-   ##
============================================
+ Coverage     71.76%   72.02%   +0.26%     
- Complexity     4455     4568     +113     
============================================
  Files           287      295       +8     
  Lines         21430    21809     +379     
  Branches       3022     3081      +59     
============================================
+ Hits          15380    15709     +329     
- Misses         4544     4565      +21     
- Partials       1506     1535      +29

Impacted Files	Coverage Δ	Complexity Δ
.../hugegraph/api/traversers/AllShortestPathsAPI.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`
...baidu/hugegraph/api/traversers/CrosspointsAPI.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (ø)`
...hugegraph/api/traversers/JaccardSimilarityAPI.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`
...a/com/baidu/hugegraph/api/traversers/PathsAPI.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (ø)`
...va/com/baidu/hugegraph/api/traversers/RaysAPI.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (ø)`
...a/com/baidu/hugegraph/api/traversers/RingsAPI.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (ø)`
...idu/hugegraph/api/traversers/SameNeighborsAPI.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`
...ph/api/traversers/SingleSourceShortestPathAPI.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`
...egraph/api/traversers/WeightedShortestPathAPI.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`
...com/baidu/hugegraph/serializer/JsonSerializer.java	`50.00% <0.00%> (-1.29%)`	`0.00 <0.00> (ø)`
... and 61 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ca9ee32...0a8c81d. Read the comment docs.

javeme · 2020-03-31T11:24:41Z

hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/JaccardSimilarityAPI.java

+    public String get(@Context GraphManager manager,
+                      @PathParam("graph") String graph,
+                      @QueryParam("v1") String v1,
+                      @QueryParam("v2") String v2,


improve var name

javeme · 2020-03-31T11:26:32Z

hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/SameNeighborsAPI.java

+                  graph, v1, v2, direction, edgeLabel, degree, limit);
+
+        Id sourceId = VertexAPI.checkAndParseVertexId(v1);
+        Id targetId = VertexAPI.checkAndParseVertexId(v2);


javeme · 2020-03-31T11:27:31Z

hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/HugeTraverser.java

+
+        Id labelId = this.getEdgeLabelId(label);
+
+        List<Id> sourceNeighbors = IteratorUtils.toList(this.adjacentVertices(


javeme · 2020-03-31T11:28:00Z

hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/HugeTraverser.java

+
+        List<Id> sourceNeighbors = IteratorUtils.toList(this.adjacentVertices(
+                                   v1, direction, labelId, degree));
+        List<Id> targetNeighbors = IteratorUtils.toList(this.adjacentVertices(


javeme · 2020-03-31T11:28:39Z

hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/HugeTraverser.java

+                                   v1, direction, labelId, degree));
+        List<Id> targetNeighbors = IteratorUtils.toList(this.adjacentVertices(
+                                   v2, direction, labelId, degree));
+        Set<Id> sameNeighbors = new HashSet<>(CollectionUtils.intersection(


convert via "(Set)"

javeme · 2020-03-31T11:32:17Z

...src/main/java/com/baidu/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java

+            double edgeWeight;
+            if (this.weight == null ||
+                !edge.property(this.weight).isPresent()) {
+                edgeWeight = 1;


javeme · 2020-03-31T11:33:26Z

hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/HugeTraverser.java

+
+        Id labelId = this.getEdgeLabelId(label);
+
+        List<Id> sourceNeighbors = IteratorUtils.toList(this.adjacentVertices(


javeme · 2020-03-31T11:36:09Z

...src/main/java/com/baidu/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java

+            }
+
+            List<NodeWithWeight> sorted = this.findingNodes.values().stream()
+                                          .sorted(Comparator.comparing


call method HugeTraverser.topN or CollectionUtil.sortByValue

Change-Id: I25709ed8af68fba565f1c6d3d3ed16376644b48e

javeme

please fix fusiform issue

javeme · 2020-04-03T18:23:11Z

...src/main/java/com/baidu/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java

+                                               String weight, long degree,
+                                               long skipDegree, long capacity) {
+        E.checkNotNull(sourceV, "source vertex id");
+        E.checkNotNull(dir, "direction");


check weight must be set

javeme · 2020-04-03T18:25:53Z

...src/main/java/com/baidu/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java

+        }
+
+        @Override
+        public int compareTo(NodeWithWeight o) {


javeme · 2020-04-03T18:29:45Z

hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/SubGraphTraverser.java

+
+        @Override
+        public int hashCode() {
+            return new HashSet<>(this.vertices()).hashCode();


don't new HashSet in hashCode(), prefer use for-loop: elem1 hash ^ elem2 hash ^ ...

javeme · 2020-04-03T18:34:39Z

hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/SubGraphTraverser.java

+                return false;
+            }
+            List<Id> reverse = new ArrayList<>(this.vertices());
+            Collections.reverse(reverse);


don't copy and reverse, use for-loop instead

javeme · 2020-04-03T18:36:50Z

hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/SubGraphTraverser.java

-    public List<Path> rings(Id sourceV, Directions dir, String label, int depth,
-                            boolean sourceInRing, long degree, long capacity,
-                            long limit) {
+    public Set<Path> rings(Id sourceV, Directions dir, String label, int depth,


define PathSet class, let it extends HashSet, and add vertices() method to PathSet

javeme · 2020-04-03T18:40:28Z

...src/main/java/com/baidu/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java

+            Set<NodeWithWeight> newSources = new HashSet<>();
+            for (Map.Entry<Id, NodeWithWeight> entry : sorted.entrySet()) {
+                Id id = entry.getKey();
+                NodeWithWeight nw = entry.getValue();


rename to node or wn

javeme · 2020-04-03T18:41:45Z

...src/main/java/com/baidu/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java

+                    NodeWithWeight nw = new NodeWithWeight(weight, target, node);
+                    if (!this.findingNodes.containsKey(target) ||
+                        weight < this.findingNodes.get(target).weight()) {
+                        /*


node = this.findingNodes.get(target);
node == null || weight < node.weight()

javeme · 2020-04-03T18:42:56Z

...src/main/java/com/baidu/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java

+        if (skipDegree > 0L) {
+            E.checkArgument(degree != NO_LIMIT && skipDegree >= degree,
+                            "The skipped degree must be >= degree, " +
+                                    "but got skipped degree '%s' and degree '%s'",


javeme · 2020-04-03T18:46:18Z

hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/ShortestPathTraverser.java

+
+            if (!(paths = traverser.backward(false)).isEmpty() ||
+                --depth <= 0) {
+                Collections.reverse(paths.iterator().next());


add var for paths.iterator().next()

javeme · 2020-04-03T18:50:02Z

hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/HugeTraverser.java

+                                  vertex, dir, labelId, degree));
+        Set<Id> targetNeighbors = IteratorUtils.set(this.adjacentVertices(
+                                  other, dir, labelId, degree));
+        int interNum = CollectionUtils.intersection(sourceNeighbors,


don't convert to set at line 207, we support CollectionUtils.intersect(list,list):
intersect(Collection<T> first, Collection<T> second)

adjacentVertices() returns Iterator. Convert to list or set is necessary

Change-Id: Ib232cedf775eca8b7dee333c1db5c4cfa8912e12

javeme · 2020-04-04T19:20:32Z

...src/main/java/com/baidu/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java

@@ -76,6 +76,7 @@ public NodeWithWeight weightedShortestPath(Id sourceV, Id targetV,
                                               long skipDegree, long capacity) {
        E.checkNotNull(sourceV, "source vertex id");
        E.checkNotNull(dir, "direction");
+        E.checkNotNull(weight, "weight property");


seems it's not checked at upper layer

javeme · 2020-04-04T19:23:46Z

hugegraph-api/src/main/java/com/baidu/hugegraph/api/traversers/WeightedShortestPathAPI.java

+
+        Id sourceId = VertexAPI.checkAndParseVertexId(source);
+        Id targetId = VertexAPI.checkAndParseVertexId(target);
+        Directions dir = Directions.convert(EdgeAPI.parseDirection(direction));


check weight

javeme · 2020-04-04T19:24:30Z

hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/algorithm/SubGraphTraverser.java

+        }
+    }
+
+    public static class PathSet extends HashSet<Path> {


prefer move to HugeTraverser.java

Change-Id: I84788b5145fadb91b8b0d97c66c2f62e12c8294e

add 5 TP algorithm

87662b1

1. same neighbors 2. jaccard similarity 3. all shortest paths 4. weighted shortest path 5. single source shortest paths Change-Id: I13a04267c6c91cc8bb00ca2aed1ef54c8e6eeeb6

javeme requested changes Mar 31, 2020

View reviewed changes

improve

f075c39

Change-Id: I25709ed8af68fba565f1c6d3d3ed16376644b48e

javeme reviewed Apr 3, 2020

View reviewed changes

improve

de92311

Change-Id: Ib232cedf775eca8b7dee333c1db5c4cfa8912e12

javeme reviewed Apr 4, 2020

View reviewed changes

tiny improve

0a8c81d

Change-Id: I84788b5145fadb91b8b0d97c66c2f62e12c8294e

javeme approved these changes Apr 5, 2020

View reviewed changes

Linary approved these changes Apr 5, 2020

View reviewed changes

Linary merged commit 04607d0 into master Apr 5, 2020

Linary deleted the 5-tp-algorithm branch April 5, 2020 11:05

zhoney mentioned this pull request Jul 2, 2021

add 5 TP RESTful API #929

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add 5 TP algorithm #919

add 5 TP algorithm #919

zhoney commented Mar 30, 2020

codecov bot commented Mar 30, 2020 •

edited

javeme Mar 31, 2020

javeme Mar 31, 2020

javeme Mar 31, 2020

javeme Mar 31, 2020

javeme Mar 31, 2020

javeme Mar 31, 2020

javeme Mar 31, 2020

javeme Mar 31, 2020

javeme left a comment

javeme Apr 3, 2020

javeme Apr 3, 2020

javeme Apr 3, 2020

javeme Apr 3, 2020

javeme Apr 3, 2020

javeme Apr 3, 2020

javeme Apr 3, 2020

javeme Apr 3, 2020

javeme Apr 3, 2020

javeme Apr 3, 2020

zhoney Apr 4, 2020

javeme Apr 4, 2020

javeme Apr 4, 2020

javeme Apr 4, 2020


		Id labelId = this.getEdgeLabelId(label);

		List<Id> sourceNeighbors = IteratorUtils.toList(this.adjacentVertices(

add 5 TP algorithm #919

add 5 TP algorithm #919

Conversation

zhoney commented Mar 30, 2020

codecov bot commented Mar 30, 2020 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

javeme left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Mar 30, 2020 •

edited