You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2017/01/23 12:58:43 UTC
[6/6] flink git commit: [hotfix] [gelly] Fix TriangleListing EdgeOrder
[hotfix] [gelly] Fix TriangleListing EdgeOrder
The edge bitmask was swapped in ed09dba.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7d3bfa2f
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7d3bfa2f
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7d3bfa2f
Branch: refs/heads/release-1.2
Commit: 7d3bfa2fdfd9e3c30ce57309c12d5c2cff2a0f1c
Parents: feeb9d7
Author: Greg Hogan <co...@greghogan.com>
Authored: Fri Jan 20 13:33:01 2017 -0500
Committer: Stephan Ewen <se...@apache.org>
Committed: Mon Jan 23 13:56:06 2017 +0100
----------------------------------------------------------------------
.../clustering/directed/TriangleListing.java | 24 +++++++++-----------
1 file changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7d3bfa2f/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/clustering/directed/TriangleListing.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/clustering/directed/TriangleListing.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/clustering/directed/TriangleListing.java
index e1b3040..a1006c4 100644
--- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/clustering/directed/TriangleListing.java
+++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/clustering/directed/TriangleListing.java
@@ -443,19 +443,17 @@ extends GraphAlgorithmWrappingDataSet<K, VV, EV, Result<K>> {
}
private String maskToString(byte mask, int shift) {
- switch((mask >>> shift) & 0b000011) {
- case 0b01:
- // EdgeOrder.FORWARD
- return "->";
- case 0b10:
- // EdgeOrder.REVERSE
- return "<-";
- case 0b11:
- // EdgeOrder.MUTUAL
- return "<->";
- default:
- throw new IllegalArgumentException("Bitmask is missing an edge (mask = "
- + mask + ", shift = " + shift);
+ int edgeMask = (mask >>> shift) & 0b000011;
+
+ if (edgeMask == EdgeOrder.FORWARD.getBitmask()) {
+ return "->";
+ } else if (edgeMask == EdgeOrder.REVERSE.getBitmask()) {
+ return "<-";
+ } else if (edgeMask == EdgeOrder.MUTUAL.getBitmask()) {
+ return "<->";
+ } else {
+ throw new IllegalArgumentException("Bitmask is missing an edge (mask = "
+ + mask + ", shift = " + shift);
}
}
}