Return-Path: X-Original-To: apmail-incubator-hama-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-hama-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 067AD9998 for ; Wed, 22 Feb 2012 14:35:47 +0000 (UTC) Received: (qmail 92999 invoked by uid 500); 22 Feb 2012 14:35:47 -0000 Delivered-To: apmail-incubator-hama-commits-archive@incubator.apache.org Received: (qmail 92940 invoked by uid 500); 22 Feb 2012 14:35:46 -0000 Mailing-List: contact hama-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hama-dev@incubator.apache.org Delivered-To: mailing list hama-commits@incubator.apache.org Received: (qmail 92928 invoked by uid 99); 22 Feb 2012 14:35:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2012 14:35:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2012 14:35:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D5AD823889D7; Wed, 22 Feb 2012 14:35:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1292317 - in /incubator/hama/trunk: ./ examples/src/main/java/org/apache/hama/examples/ graph/src/main/java/org/apache/hama/graph/ Date: Wed, 22 Feb 2012 14:35:22 -0000 To: hama-commits@incubator.apache.org From: tjungblut@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120222143522.D5AD823889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tjungblut Date: Wed Feb 22 14:35:22 2012 New Revision: 1292317 URL: http://svn.apache.org/viewvc?rev=1292317&view=rev Log: [HAMA-510]: Add sendMessageToNeighbors() to Vertex Modified: incubator/hama/trunk/CHANGES.txt incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/InlinkCount.java incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/PageRank.java incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/Vertex.java incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/VertexInterface.java Modified: incubator/hama/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1292317&r1=1292316&r2=1292317&view=diff ============================================================================== --- incubator/hama/trunk/CHANGES.txt (original) +++ incubator/hama/trunk/CHANGES.txt Wed Feb 22 14:35:22 2012 @@ -11,7 +11,8 @@ Release 0.5 - Unreleased BUG FIXES IMPROVEMENTS - + + HAMA-510: Add sendMessageToNeighbors() to Vertex (tjungblut) HAMA-502: Message API Improvement (edwardyoon) Release 0.4 - February 5, 2012 Modified: incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/InlinkCount.java URL: http://svn.apache.org/viewvc/incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/InlinkCount.java?rev=1292317&r1=1292316&r2=1292317&view=diff ============================================================================== --- incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/InlinkCount.java (original) +++ incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/InlinkCount.java Wed Feb 22 14:35:22 2012 @@ -26,7 +26,6 @@ import org.apache.hama.HamaConfiguration import org.apache.hama.bsp.HashPartitioner; import org.apache.hama.bsp.SequenceFileInputFormat; import org.apache.hama.bsp.SequenceFileOutputFormat; -import org.apache.hama.graph.Edge; import org.apache.hama.graph.GraphJob; import org.apache.hama.graph.Vertex; import org.apache.hama.graph.VertexArrayWritable; @@ -38,9 +37,7 @@ public class InlinkCount extends Vertex< public void compute(Iterator messages) throws IOException { if (getSuperstepCount() == 0L) { - for (Edge e : getOutEdges()) { - sendMessage(e, new IntWritable(1)); - } + sendMessageToNeighbors(new IntWritable(1)); } else { while (messages.hasNext()) { IntWritable msg = messages.next(); Modified: incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/PageRank.java URL: http://svn.apache.org/viewvc/incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/PageRank.java?rev=1292317&r1=1292316&r2=1292317&view=diff ============================================================================== --- incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/PageRank.java (original) +++ incubator/hama/trunk/examples/src/main/java/org/apache/hama/examples/PageRank.java Wed Feb 22 14:35:22 2012 @@ -28,7 +28,6 @@ import org.apache.hama.HamaConfiguration import org.apache.hama.bsp.HashPartitioner; import org.apache.hama.bsp.SequenceFileInputFormat; import org.apache.hama.bsp.SequenceFileOutputFormat; -import org.apache.hama.graph.Edge; import org.apache.hama.graph.GraphJob; import org.apache.hama.graph.Vertex; @@ -55,10 +54,8 @@ public class PageRank { if (this.getSuperstepCount() < this.getMaxIteration()) { int numEdges = this.getOutEdges().size(); - for (Edge e : this.getOutEdges()) { - this.sendMessage(e, new DoubleWritable(this.getValue().get() - / numEdges)); - } + sendMessageToNeighbors(new DoubleWritable(this.getValue().get() + / numEdges)); } } } Modified: incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/Vertex.java URL: http://svn.apache.org/viewvc/incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/Vertex.java?rev=1292317&r1=1292316&r2=1292317&view=diff ============================================================================== --- incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/Vertex.java (original) +++ incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/Vertex.java Wed Feb 22 14:35:22 2012 @@ -26,8 +26,7 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; import org.apache.hama.bsp.BSPPeer; -public abstract class Vertex implements - VertexInterface { +public abstract class Vertex implements VertexInterface { private M value; private String vertexID; protected BSPPeer peer; @@ -52,6 +51,14 @@ public abstract class Vertex outEdges = this.getOutEdges(); + for (Edge e : outEdges) { + sendMessage(e, msg); + } + } + + @Override public long getSuperstepCount() { return peer.getSuperstepCount(); } Modified: incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/VertexInterface.java URL: http://svn.apache.org/viewvc/incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/VertexInterface.java?rev=1292317&r1=1292316&r2=1292317&view=diff ============================================================================== --- incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/VertexInterface.java (original) +++ incubator/hama/trunk/graph/src/main/java/org/apache/hama/graph/VertexInterface.java Wed Feb 22 14:35:22 2012 @@ -34,6 +34,8 @@ public interface VertexInterface