Repository: giraph Updated Branches: refs/heads/trunk 4968416aa -> 17fac7292
GIRAPH-867 Fix comments in PageRankComputation Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/17fac729 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/17fac729 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/17fac729 Branch: refs/heads/trunk Commit: 17fac729227197a3577d2a1c179c6cc5368165d3 Parents: 4968416 Author: ssc <[email protected]> Authored: Fri Feb 28 08:32:09 2014 +0100 Committer: ssc <[email protected]> Committed: Fri Feb 28 08:32:09 2014 +0100 ---------------------------------------------------------------------- CHANGELOG | 3 +++ .../giraph/examples/LongDoubleNullTextInputFormat.java | 2 +- .../org/apache/giraph/examples/PageRankComputation.java | 8 +++++--- .../org/apache/giraph/examples/RandomWalkComputation.java | 10 +++++----- .../apache/giraph/examples/RandomWalkWorkerContext.java | 4 ++-- .../apache/giraph/examples/PageRankComputationTest.java | 6 ++++-- 6 files changed, 20 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/17fac729/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 4d9f510..fa93d13 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ Giraph Change Log Release 1.1.0 - unreleased + + GIRAPH-867: Fix comments in PageRankComputation (ssc) + GIRAPH-866: Fix checkstyle error from GIRAPH-865 (majakabiljo) GIRAPH-865: Job client shouldn't crash when JobProgressTracker gets http://git-wip-us.apache.org/repos/asf/giraph/blob/17fac729/giraph-examples/src/main/java/org/apache/giraph/examples/LongDoubleNullTextInputFormat.java ---------------------------------------------------------------------- diff --git a/giraph-examples/src/main/java/org/apache/giraph/examples/LongDoubleNullTextInputFormat.java b/giraph-examples/src/main/java/org/apache/giraph/examples/LongDoubleNullTextInputFormat.java index b05a978..4305456 100644 --- a/giraph-examples/src/main/java/org/apache/giraph/examples/LongDoubleNullTextInputFormat.java +++ b/giraph-examples/src/main/java/org/apache/giraph/examples/LongDoubleNullTextInputFormat.java @@ -37,7 +37,7 @@ import java.util.List; import java.util.regex.Pattern; /** - * Input format for unweighted graphs with long ids and double vertex values + * Input format for unweighted graphs with long ids. */ public class LongDoubleNullTextInputFormat extends TextVertexInputFormat<LongWritable, DoubleWritable, NullWritable> http://git-wip-us.apache.org/repos/asf/giraph/blob/17fac729/giraph-examples/src/main/java/org/apache/giraph/examples/PageRankComputation.java ---------------------------------------------------------------------- diff --git a/giraph-examples/src/main/java/org/apache/giraph/examples/PageRankComputation.java b/giraph-examples/src/main/java/org/apache/giraph/examples/PageRankComputation.java index 9ac90d9..0eda894 100644 --- a/giraph-examples/src/main/java/org/apache/giraph/examples/PageRankComputation.java +++ b/giraph-examples/src/main/java/org/apache/giraph/examples/PageRankComputation.java @@ -30,10 +30,12 @@ import org.apache.hadoop.io.NullWritable; * http://en.wikipedia.org/wiki/PageRank */ public class PageRankComputation extends RandomWalkComputation<NullWritable> { + @Override protected double transitionProbability( Vertex<LongWritable, DoubleWritable, NullWritable> vertex, double stateProbability, Edge<LongWritable, NullWritable> edge) { + // Uniform transition probability return stateProbability / vertex.getNumEdges(); } @@ -41,13 +43,13 @@ public class PageRankComputation extends RandomWalkComputation<NullWritable> { protected double recompute( Vertex<LongWritable, DoubleWritable, NullWritable> vertex, Iterable<DoubleWritable> partialRanks, double teleportationProbability) { - // rank contribution from incident neighbors + // Rank contribution from incident neighbors double rankFromNeighbors = MathUtils.sum(partialRanks); - // rank contribution from dangling vertices + // Rank contribution from dangling vertices double danglingContribution = getDanglingProbability() / getTotalNumVertices(); - // recompute rank + // Recompute rank return (1d - teleportationProbability) * (rankFromNeighbors + danglingContribution) + teleportationProbability / getTotalNumVertices(); http://git-wip-us.apache.org/repos/asf/giraph/blob/17fac729/giraph-examples/src/main/java/org/apache/giraph/examples/RandomWalkComputation.java ---------------------------------------------------------------------- diff --git a/giraph-examples/src/main/java/org/apache/giraph/examples/RandomWalkComputation.java b/giraph-examples/src/main/java/org/apache/giraph/examples/RandomWalkComputation.java index ed95aae..182c632 100644 --- a/giraph-examples/src/main/java/org/apache/giraph/examples/RandomWalkComputation.java +++ b/giraph-examples/src/main/java/org/apache/giraph/examples/RandomWalkComputation.java @@ -40,17 +40,17 @@ public abstract class RandomWalkComputation<E extends Writable> /** Configuration parameter for the teleportation probability */ static final String TELEPORTATION_PROBABILITY = RandomWalkComputation.class .getName() + ".teleportationProbability"; - /** Name of aggregator for the probability of dangling vertices */ + /** Name of aggregator for the probability assigned to dangling vertices */ static final String CUMULATIVE_DANGLING_PROBABILITY = RandomWalkComputation.class.getName() + ".cumulativeDanglingProbability"; - /** Name of aggregator for the probability of all vertices */ + /** Name of aggregator for the probability assigned to all vertices */ static final String CUMULATIVE_PROBABILITY = RandomWalkComputation.class .getName() + ".cumulativeProbability"; - /** Name of aggregator for the probability of dangling vertices */ + /** Name of aggregator for the number of dangling vertices */ static final String NUM_DANGLING_VERTICES = RandomWalkComputation.class .getName() + ".numDanglingVertices"; /** Name of aggregator for the L1 norm of the probability difference, used - * for covergence detection */ + * for convergence detection */ static final String L1_NORM_OF_PROBABILITY_DIFFERENCE = RandomWalkComputation.class.getName() + ".l1NormOfProbabilityDifference"; /** Reusable {@link DoubleWritable} instance to avoid object instantiation */ @@ -85,7 +85,7 @@ public abstract class RandomWalkComputation<E extends Writable> * @param messages Messages received in the previous step. * @param teleportationProbability Probability of teleporting to another * vertex. - * @return The new probability distribution value. + * @return The new probability value. */ protected abstract double recompute( Vertex<LongWritable, DoubleWritable, E> vertex, http://git-wip-us.apache.org/repos/asf/giraph/blob/17fac729/giraph-examples/src/main/java/org/apache/giraph/examples/RandomWalkWorkerContext.java ---------------------------------------------------------------------- diff --git a/giraph-examples/src/main/java/org/apache/giraph/examples/RandomWalkWorkerContext.java b/giraph-examples/src/main/java/org/apache/giraph/examples/RandomWalkWorkerContext.java index 0c16120..75b9896 100644 --- a/giraph-examples/src/main/java/org/apache/giraph/examples/RandomWalkWorkerContext.java +++ b/giraph-examples/src/main/java/org/apache/giraph/examples/RandomWalkWorkerContext.java @@ -63,7 +63,7 @@ public class RandomWalkWorkerContext extends WorkerContext { if (MAX_SUPERSTEPS == 0) { throw new IllegalStateException( RandomWalkWorkerContext.class.getSimpleName() + - " was not initialized. Realunch your job " + + " was not initialized. Relaunch your job " + "by setting the appropriate WorkerContext"); } return MAX_SUPERSTEPS; @@ -76,7 +76,7 @@ public class RandomWalkWorkerContext extends WorkerContext { if (TELEPORTATION_PROBABILITY == 0) { throw new IllegalStateException( RandomWalkWorkerContext.class.getSimpleName() + - " was not initialized. Realunch your job " + + " was not initialized. Relaunch your job " + "by setting the appropriate WorkerContext"); } return TELEPORTATION_PROBABILITY; http://git-wip-us.apache.org/repos/asf/giraph/blob/17fac729/giraph-examples/src/test/java/org/apache/giraph/examples/PageRankComputationTest.java ---------------------------------------------------------------------- diff --git a/giraph-examples/src/test/java/org/apache/giraph/examples/PageRankComputationTest.java b/giraph-examples/src/test/java/org/apache/giraph/examples/PageRankComputationTest.java index dcdef19..ece8de7 100644 --- a/giraph-examples/src/test/java/org/apache/giraph/examples/PageRankComputationTest.java +++ b/giraph-examples/src/test/java/org/apache/giraph/examples/PageRankComputationTest.java @@ -18,8 +18,9 @@ package org.apache.giraph.examples; +import org.apache.giraph.combiner.DoubleSumMessageCombiner; import org.apache.giraph.conf.GiraphConfiguration; -import org.apache.giraph.edge.ByteArrayEdges; +import org.apache.giraph.edge.LongNullArrayEdges; import org.apache.giraph.utils.InternalVertexRunner; import org.junit.Test; @@ -52,7 +53,8 @@ public class PageRankComputationTest { conf.setFloat( RandomWalkWithRestartComputation.TELEPORTATION_PROBABILITY, 0.15f); conf.setComputationClass(PageRankComputation.class); - conf.setOutEdgesClass(ByteArrayEdges.class); + conf.setMessageCombinerClass(DoubleSumMessageCombiner.class); + conf.setOutEdgesClass(LongNullArrayEdges.class); conf.setVertexInputFormatClass(LongDoubleNullTextInputFormat.class); conf.setVertexOutputFormatClass( VertexWithDoubleValueNullEdgeTextOutputFormat.class);
