You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/02/18 22:26:12 UTC
incubator-tinkerpop git commit: random nothings. found a clone issue.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1154 cb4df815a -> 506d799f9
random nothings. found a clone issue.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/506d799f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/506d799f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/506d799f
Branch: refs/heads/TINKERPOP-1154
Commit: 506d799f98088ecee66c4ede7a8b6d09324b28a6
Parents: cb4df81
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Feb 18 14:26:06 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Feb 18 14:26:06 2016 -0700
----------------------------------------------------------------------
.../ranking/pagerank/PageRankVertexProgram.java | 18 +++++++++++-------
.../step/map/PageRankVertexProgramStep.java | 2 +-
.../step/map/PeerPressureVertexProgramStep.java | 2 +-
3 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/506d799f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java
index cb64a3c..15f4996 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java
@@ -140,9 +140,9 @@ public class PageRankVertexProgram extends StaticVertexProgram<Double> {
if (memory.isInitialIteration()) {
messenger.sendMessage(this.countMessageScope, 1.0d);
} else if (1 == memory.getIteration()) {
- double initialPageRank = null == this.initialRankTraversal ?
+ double initialPageRank = (null == this.initialRankTraversal ?
1.0d :
- TraversalUtil.apply(vertex, this.initialRankTraversal.get()).doubleValue() / this.vertexCountAsDouble;
+ TraversalUtil.apply(vertex, this.initialRankTraversal.get()).doubleValue()) / this.vertexCountAsDouble;
double edgeCount = IteratorUtils.reduce(messenger.receiveMessages(), 0.0d, (a, b) -> a + b);
vertex.property(VertexProperty.Cardinality.single, this.property, initialPageRank);
vertex.property(VertexProperty.Cardinality.single, EDGE_COUNT, edgeCount);
@@ -194,11 +194,6 @@ public class PageRankVertexProgram extends StaticVertexProgram<Double> {
return this;
}
- public Builder vertexCount(final long vertexCount) {
- this.configuration.setProperty(VERTEX_COUNT, (double) vertexCount);
- return this;
- }
-
public Builder edges(final Traversal.Admin<Vertex, Edge> edgeTraversal) {
PureTraversal.storeState(this.configuration, EDGE_TRAVERSAL, edgeTraversal);
return this;
@@ -210,6 +205,15 @@ public class PageRankVertexProgram extends StaticVertexProgram<Double> {
}
/**
+ * @deprecated As of release 3.2.0, replaced by {@link org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram.Builder#initialRank(Traversal.Admin)}
+ */
+ @Deprecated
+ public Builder vertexCount(final long vertexCount) {
+ this.configuration.setProperty(VERTEX_COUNT, (double) vertexCount);
+ return this;
+ }
+
+ /**
* @deprecated As of release 3.2.0, replaced by {@link org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram.Builder#edges(Traversal.Admin)}
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/506d799f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java
index bbbe968..b3e1023 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PageRankVertexProgramStep.java
@@ -117,7 +117,7 @@ public final class PageRankVertexProgramStep extends VertexProgramStep implement
public PageRankVertexProgramStep clone() {
final PageRankVertexProgramStep clone = (PageRankVertexProgramStep) super.clone();
clone.edgeTraversal = this.edgeTraversal.clone();
- this.integrateChild(this.edgeTraversal.get());
+ clone.integrateChild(clone.edgeTraversal.get());
return clone;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/506d799f/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PeerPressureVertexProgramStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PeerPressureVertexProgramStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PeerPressureVertexProgramStep.java
index 7de23a4..c18385f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PeerPressureVertexProgramStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/PeerPressureVertexProgramStep.java
@@ -111,7 +111,7 @@ public final class PeerPressureVertexProgramStep extends VertexProgramStep imple
public PeerPressureVertexProgramStep clone() {
final PeerPressureVertexProgramStep clone = (PeerPressureVertexProgramStep) super.clone();
clone.edgeTraversal = this.edgeTraversal.clone();
- this.integrateChild(this.edgeTraversal.get());
+ clone.integrateChild(clone.edgeTraversal.get());
return clone;
}
}