You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gr...@apache.org on 2016/10/14 18:34:53 UTC
[1/2] flink-web git commit: [FLINK-4593] Fix PageRank algorithm
example
Repository: flink-web
Updated Branches:
refs/heads/asf-site a283d1701 -> 7491f2a53
[FLINK-4593] Fix PageRank algorithm example
This closes #35
Project: http://git-wip-us.apache.org/repos/asf/flink-web/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink-web/commit/86d7ae0d
Tree: http://git-wip-us.apache.org/repos/asf/flink-web/tree/86d7ae0d
Diff: http://git-wip-us.apache.org/repos/asf/flink-web/diff/86d7ae0d
Branch: refs/heads/asf-site
Commit: 86d7ae0de1369fa75f17e84db62cf1f2f859d1c9
Parents: a283d17
Author: Alexander Pivovarov <ap...@gmail.com>
Authored: Wed Sep 7 11:52:04 2016 -0700
Committer: Greg Hogan <gr...@apache.org>
Committed: Fri Oct 14 14:17:52 2016 -0400
----------------------------------------------------------------------
features.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink-web/blob/86d7ae0d/features.md
----------------------------------------------------------------------
diff --git a/features.md b/features.md
index a990a77..e4b2516 100644
--- a/features.md
+++ b/features.md
@@ -244,7 +244,7 @@ case class Word(word: String, freq: Long)
val texts: DataStream[String] = ...
val counts = text
- .flatMap { line => line.split("\\W+") }
+ .flatMap { line => line.split("\\W+") }
.map { token => Word(token, 1) }
.keyBy("word")
.timeWindow(Time.seconds(5), Time.seconds(1))
@@ -272,13 +272,14 @@ case class Page(pageId: Long, rank: Double)
case class Adjacency(id: Long, neighbors: Array[Long])
val result = initialRanks.iterate(30) { pages =>
- pages.join(adjacency).where("pageId").equalTo("pageId") {
+ pages.join(adjacency).where("pageId").equalTo("id") {
- (page, adj, out : Collector[Page]) => {
- out.collect(Page(page.id, 0.15 / numPages))
-
+ (page, adj, out: Collector[Page]) => {
+ out.collect(Page(page.pageId, 0.15 / numPages))
+
+ val nLen = adj.neighbors.length
for (n <- adj.neighbors) {
- out.collect(Page(n, 0.85*page.rank/adj.neighbors.length))
+ out.collect(Page(n, 0.85 * page.rank / nLen))
}
}
}
@@ -335,4 +336,3 @@ val result = initialRanks.iterate(30) { pages =>
<img src="{{ site.baseurl }}/img/features/ecosystem_logos.png" alt="Other projects that Flink is integrated with" style="width:75%" />
</div>
</div>
-
[2/2] flink-web git commit: Rebuild website
Posted by gr...@apache.org.
Rebuild website
Project: http://git-wip-us.apache.org/repos/asf/flink-web/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink-web/commit/7491f2a5
Tree: http://git-wip-us.apache.org/repos/asf/flink-web/tree/7491f2a5
Diff: http://git-wip-us.apache.org/repos/asf/flink-web/diff/7491f2a5
Branch: refs/heads/asf-site
Commit: 7491f2a53c696e9cdb701437519c1246d6c1decc
Parents: 86d7ae0
Author: Greg Hogan <gr...@apache.org>
Authored: Fri Oct 14 18:33:35 2016 +0000
Committer: Greg Hogan <gr...@apache.org>
Committed: Fri Oct 14 18:33:59 2016 +0000
----------------------------------------------------------------------
content/features.html | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink-web/blob/7491f2a5/content/features.html
----------------------------------------------------------------------
diff --git a/content/features.html b/content/features.html
index 7fd2e4d..c419534 100644
--- a/content/features.html
+++ b/content/features.html
@@ -394,7 +394,7 @@
<span class="k">val</span> <span class="n">texts</span><span class="k">:</span> <span class="kt">DataStream</span><span class="o">[</span><span class="kt">String</span><span class="o">]</span> <span class="k">=</span> <span class="o">...</span>
<span class="k">val</span> <span class="n">counts</span> <span class="k">=</span> <span class="n">text</span>
- <span class="o">.</span><span class="n">flatMap</span> <span class="o">{</span> <span class="n">line</span> <span class="k">=></span> <span class="n">line</span><span class="o">.</span><span class="n">split</span><span class="o">(</span><span class="s">"\\W+"</span><span class="o">)</span> <span class="o">}</span>
+ <span class="o">.</span><span class="n">flatMap</span> <span class="o">{</span> <span class="n">line</span> <span class="k">=></span> <span class="n">line</span><span class="o">.</span><span class="n">split</span><span class="o">(</span><span class="s">"\\W+"</span><span class="o">)</span> <span class="o">}</span>
<span class="o">.</span><span class="n">map</span> <span class="o">{</span> <span class="n">token</span> <span class="k">=></span> <span class="nc">Word</span><span class="o">(</span><span class="n">token</span><span class="o">,</span> <span class="mi">1</span><span class="o">)</span> <span class="o">}</span>
<span class="o">.</span><span class="n">keyBy</span><span class="o">(</span><span class="s">"word"</span><span class="o">)</span>
<span class="o">.</span><span class="n">timeWindow</span><span class="o">(</span><span class="nc">Time</span><span class="o">.</span><span class="n">seconds</span><span class="o">(</span><span class="mi">5</span><span class="o">),</span> <span class="nc">Time</span><span class="o">.</span><span class="n">seconds</span><span class="o">(</span><span class="mi">1</span><span class="o">))</span>
@@ -422,13 +422,14 @@
<span class="k">case</span> <span class="k">class</span> <span class="nc">Adjacency</span><span class="o">(</span><span class="n">id</span><span class="k">:</span> <span class="kt">Long</span><span class="o">,</span> <span class="n">neighbors</span><span class="k">:</span> <span class="kt">Array</span><span class="o">[</span><span class="kt">Long</span><span class="o">])</span>
<span class="k">val</span> <span class="n">result</span> <span class="k">=</span> <span class="n">initialRanks</span><span class="o">.</span><span class="n">iterate</span><span class="o">(</span><span class="mi">30</span><span class="o">)</span> <span class="o">{</span> <span class="n">pages</span> <span class="k">=></span>
- <span class="n">pages</span><span class="o">.</span><span class="n">join</span><span class="o">(</span><span class="n">adjacency</span><span class="o">).</span><span class="n">where</span><span class="o">(</span><span class="s">"pageId"</span><span class="o">).</span><span class="n">equalTo</span><span class="o">(</span><span class="s">"pageId"</span><span class="o">)</span> <span class="o">{</span>
+ <span class="n">pages</span><span class="o">.</span><span class="n">join</span><span class="o">(</span><span class="n">adjacency</span><span class="o">).</span><span class="n">where</span><span class="o">(</span><span class="s">"pageId"</span><span class="o">).</span><span class="n">equalTo</span><span class="o">(</span><span class="s">"id"</span><span class="o">)</span> <span class="o">{</span>
- <span class="o">(</span><span class="n">page</span><span class="o">,</span> <span class="n">adj</span><span class="o">,</span> <span class="n">out</span> <span class="k">:</span> <span class="kt">Collector</span><span class="o">[</span><span class="kt">Page</span><span class="o">])</span> <span class="k">=></span> <span class="o">{</span>
- <span class="n">out</span><span class="o">.</span><span class="n">collect</span><span class="o">(</span><span class="nc">Page</span><span class="o">(</span><span class="n">page</span><span class="o">.</span><span class="n">id</span><span class="o">,</span> <span class="mf">0.15</span> <span class="o">/</span> <span class="n">numPages</span><span class="o">))</span>
-
+ <span class="o">(</span><span class="n">page</span><span class="o">,</span> <span class="n">adj</span><span class="o">,</span> <span class="n">out</span><span class="k">:</span> <span class="kt">Collector</span><span class="o">[</span><span class="kt">Page</span><span class="o">])</span> <span class="k">=></span> <span class="o">{</span>
+ <span class="n">out</span><span class="o">.</span><span class="n">collect</span><span class="o">(</span><span class="nc">Page</span><span class="o">(</span><span class="n">page</span><span class="o">.</span><span class="n">pageId</span><span class="o">,</span> <span class="mf">0.15</span> <span class="o">/</span> <span class="n">numPages</span><span class="o">))</span>
+
+ <span class="k">val</span> <span class="n">nLen</span> <span class="k">=</span> <span class="n">adj</span><span class="o">.</span><span class="n">neighbors</span><span class="o">.</span><span class="n">length</span>
<span class="k">for</span> <span class="o">(</span><span class="n">n</span> <span class="k"><-</span> <span class="n">adj</span><span class="o">.</span><span class="n">neighbors</span><span class="o">)</span> <span class="o">{</span>
- <span class="n">out</span><span class="o">.</span><span class="n">collect</span><span class="o">(</span><span class="nc">Page</span><span class="o">(</span><span class="n">n</span><span class="o">,</span> <span class="mf">0.85</span><span class="o">*</span><span class="n">page</span><span class="o">.</span><span class="n">rank</span><span class="o">/</span><span class="n">adj</span><span class="o">.</span><span class="n">neighbors</span><span class="o">.</span><span class="n">length</span><span class="o">))</span>
+ <span class="n">out</span><span class="o">.</span><span class="n">collect</span><span class="o">(</span><span class="nc">Page</span><span class="o">(</span><span class="n">n</span><span class="o">,</span> <span class="mf">0.85</span> <span class="o">*</span> <span class="n">page</span><span class="o">.</span><span class="n">rank</span> <span class="o">/</span> <span class="n">nLen</span><span class="o">))</span>
<span class="o">}</span>
<span class="o">}</span>
<span class="o">}</span>
@@ -487,7 +488,6 @@
</div>
-
</div>
</div>