Skip to content

Commit ecc189b

Browse files
frankmcsherryfrankmcsherry
committed
Deploying to gh-pages from @ e0add72 🚀
1 parent 142fcab commit ecc189b

File tree

10 files changed

+54
-54
lines changed

10 files changed

+54
-54
lines changed

‎chapter_2/chapter_2_1.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ <h2 id="the-map-operator"><a class="header" href="#the-map-operator">The Map Ope
160160
</span><span class="boring">extern crate timely;
161161
</span><span class="boring">extern crate differential_dataflow;
162162
</span><span class="boring">use timely::dataflow::Scope;
163-
</span><span class="boring">use differential_dataflow::Collection;
163+
</span><span class="boring">use differential_dataflow::VecCollection;
164164
</span><span class="boring">use differential_dataflow::lattice::Lattice;
165165
</span><span class="boring">use differential_dataflow::operators::Join;
166-
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;Collection&lt;G, (u64, u64)&gt;)
166+
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;VecCollection&lt;G, (u64, u64)&gt;)
167167
</span><span class="boring">where G::Timestamp: Lattice
168168
</span><span class="boring">{
169169
</span> manages
@@ -178,9 +178,9 @@ <h2 id="the-map-operator"><a class="header" href="#the-map-operator">The Map Ope
178178
</span><span class="boring">extern crate timely;
179179
</span><span class="boring">extern crate differential_dataflow;
180180
</span><span class="boring">use timely::dataflow::Scope;
181-
</span><span class="boring">use differential_dataflow::Collection;
181+
</span><span class="boring">use differential_dataflow::VecCollection;
182182
</span><span class="boring">use differential_dataflow::lattice::Lattice;
183-
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;Collection&lt;G, (u64, u64)&gt;)
183+
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;VecCollection&lt;G, (u64, u64)&gt;)
184184
</span><span class="boring">where G::Timestamp: Lattice
185185
</span><span class="boring">{
186186
</span> manages

‎chapter_2/chapter_2_2.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ <h2 id="the-filter-operator"><a class="header" href="#the-filter-operator">The F
160160
</span><span class="boring">extern crate timely;
161161
</span><span class="boring">extern crate differential_dataflow;
162162
</span><span class="boring">use timely::dataflow::Scope;
163-
</span><span class="boring">use differential_dataflow::Collection;
163+
</span><span class="boring">use differential_dataflow::VecCollection;
164164
</span><span class="boring">use differential_dataflow::lattice::Lattice;
165-
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;Collection&lt;G, (u64, u64)&gt;)
165+
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;VecCollection&lt;G, (u64, u64)&gt;)
166166
</span><span class="boring">where G::Timestamp: Lattice
167167
</span><span class="boring">{
168168
</span> manages

‎chapter_2/chapter_2_3.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ <h2 id="the-concat-operator"><a class="header" href="#the-concat-operator">The C
160160
</span><span class="boring">extern crate timely;
161161
</span><span class="boring">extern crate differential_dataflow;
162162
</span><span class="boring">use timely::dataflow::Scope;
163-
</span><span class="boring">use differential_dataflow::Collection;
163+
</span><span class="boring">use differential_dataflow::VecCollection;
164164
</span><span class="boring">use differential_dataflow::lattice::Lattice;
165-
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;Collection&lt;G, (u64, u64)&gt;)
165+
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;VecCollection&lt;G, (u64, u64)&gt;)
166166
</span><span class="boring">where G::Timestamp: Lattice
167167
</span><span class="boring">{
168168
</span> manages

‎chapter_2/chapter_2_4.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ <h2 id="the-consolidate-operator"><a class="header" href="#the-consolidate-opera
161161
</span><span class="boring">extern crate timely;
162162
</span><span class="boring">extern crate differential_dataflow;
163163
</span><span class="boring">use timely::dataflow::Scope;
164-
</span><span class="boring">use differential_dataflow::Collection;
164+
</span><span class="boring">use differential_dataflow::VecCollection;
165165
</span><span class="boring">use differential_dataflow::lattice::Lattice;
166166
</span><span class="boring">use differential_dataflow::operators::Reduce;
167-
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;Collection&lt;G, (u64, u64)&gt;)
167+
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;VecCollection&lt;G, (u64, u64)&gt;)
168168
</span><span class="boring">where G::Timestamp: Lattice
169169
</span><span class="boring">{
170170
</span> manages
@@ -183,9 +183,9 @@ <h2 id="the-consolidate-operator"><a class="header" href="#the-consolidate-opera
183183
</span><span class="boring">extern crate timely;
184184
</span><span class="boring">extern crate differential_dataflow;
185185
</span><span class="boring">use timely::dataflow::Scope;
186-
</span><span class="boring">use differential_dataflow::Collection;
186+
</span><span class="boring">use differential_dataflow::VecCollection;
187187
</span><span class="boring">use differential_dataflow::lattice::Lattice;
188-
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;Collection&lt;G, (u64, u64)&gt;)
188+
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;VecCollection&lt;G, (u64, u64)&gt;)
189189
</span><span class="boring">where G::Timestamp: Lattice
190190
</span><span class="boring">{
191191
</span> manages

‎chapter_2/chapter_2_5.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ <h2 id="the-join-operator"><a class="header" href="#the-join-operator">The Join
160160
</span><span class="boring">extern crate timely;
161161
</span><span class="boring">extern crate differential_dataflow;
162162
</span><span class="boring">use timely::dataflow::Scope;
163-
</span><span class="boring">use differential_dataflow::Collection;
163+
</span><span class="boring">use differential_dataflow::VecCollection;
164164
</span><span class="boring">use differential_dataflow::operators::Join;
165165
</span><span class="boring">use differential_dataflow::lattice::Lattice;
166-
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;Collection&lt;G, (u64, u64)&gt;)
166+
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;VecCollection&lt;G, (u64, u64)&gt;)
167167
</span><span class="boring">where G::Timestamp: Lattice
168168
</span><span class="boring">{
169169
</span> manages

‎chapter_2/chapter_2_6.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ <h2 id="the-reduce-operator"><a class="header" href="#the-reduce-operator">The R
160160
</span><span class="boring">extern crate timely;
161161
</span><span class="boring">extern crate differential_dataflow;
162162
</span><span class="boring">use timely::dataflow::Scope;
163-
</span><span class="boring">use differential_dataflow::Collection;
163+
</span><span class="boring">use differential_dataflow::VecCollection;
164164
</span><span class="boring">use differential_dataflow::lattice::Lattice;
165165
</span><span class="boring">use differential_dataflow::operators::Reduce;
166-
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;Collection&lt;G, (u64, u64), i64&gt;)
166+
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;VecCollection&lt;G, (u64, u64), i64&gt;)
167167
</span><span class="boring">where G::Timestamp: Lattice
168168
</span><span class="boring">{
169169
</span> manages

‎chapter_2/chapter_2_7.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ <h2 id="the-iterate-operator"><a class="header" href="#the-iterate-operator">The
160160
</span><span class="boring">extern crate timely;
161161
</span><span class="boring">extern crate differential_dataflow;
162162
</span><span class="boring">use timely::dataflow::Scope;
163-
</span><span class="boring">use differential_dataflow::Collection;
163+
</span><span class="boring">use differential_dataflow::VecCollection;
164164
</span><span class="boring">use differential_dataflow::operators::{Join, Iterate, Threshold};
165165
</span><span class="boring">use differential_dataflow::lattice::Lattice;
166-
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;Collection&lt;G, (u64, u64)&gt;)
166+
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;VecCollection&lt;G, (u64, u64)&gt;)
167167
</span><span class="boring">where G::Timestamp: Lattice
168168
</span><span class="boring">{
169169
</span> manages // transitive contains (manager, person) for many hops.
@@ -197,11 +197,11 @@ <h3 id="enter"><a class="header" href="#enter">Enter</a></h3>
197197
</span><span class="boring">extern crate timely;
198198
</span><span class="boring">extern crate differential_dataflow;
199199
</span><span class="boring">use timely::dataflow::Scope;
200-
</span><span class="boring">use differential_dataflow::Collection;
200+
</span><span class="boring">use differential_dataflow::VecCollection;
201201
</span><span class="boring">use differential_dataflow::operators::{Join, Threshold};
202-
</span><span class="boring">use differential_dataflow::operators::{Iterate, iterate::Variable};
202+
</span><span class="boring">use differential_dataflow::operators::{Iterate, iterate::VecVariable};
203203
</span><span class="boring">use differential_dataflow::lattice::Lattice;
204-
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;Collection&lt;G, (u64, u64)&gt;)
204+
</span><span class="boring">fn example&lt;G: Scope&gt;(manages: &amp;VecCollection&lt;G, (u64, u64)&gt;)
205205
</span><span class="boring">where G::Timestamp: Lattice
206206
</span><span class="boring">{
207207
</span> manages // transitive contains (manager, person) for many hops.
@@ -232,19 +232,19 @@ <h3 id="variables"><a class="header" href="#variables">Variables</a></h3>
232232
</span><span class="boring">use timely::dataflow::Scope;
233233
</span><span class="boring">use timely::dataflow::scopes::Child;
234234
</span><span class="boring">use timely::progress::Antichain;
235-
</span><span class="boring">use differential_dataflow::Collection;
236-
</span><span class="boring">use differential_dataflow::operators::{Iterate, iterate::Variable};
235+
</span><span class="boring">use differential_dataflow::VecCollection;
236+
</span><span class="boring">use differential_dataflow::operators::{Iterate, iterate::VecVariable};
237237
</span><span class="boring">use differential_dataflow::lattice::Lattice;
238-
</span><span class="boring">fn logic&lt;'a, G: Scope&gt;(variable: &amp;Variable&lt;Child&lt;'a, G, G::Timestamp&gt;, (u64, u64), isize&gt;) -&gt; Collection&lt;Child&lt;'a, G, G::Timestamp&gt;, (u64, u64)&gt;
238+
</span><span class="boring">fn logic&lt;'a, G: Scope&gt;(variable: &amp;VecVariable&lt;Child&lt;'a, G, G::Timestamp&gt;, (u64, u64), isize&gt;) -&gt; VecCollection&lt;Child&lt;'a, G, G::Timestamp&gt;, (u64, u64)&gt;
239239
</span><span class="boring">where G::Timestamp: Lattice
240240
</span><span class="boring">{
241241
</span><span class="boring"> (*variable).clone()
242242
</span><span class="boring">}
243-
</span><span class="boring">fn example&lt;'a, G: Scope&lt;Timestamp=u64&gt;&gt;(collection: &amp;Collection&lt;G, (u64, u64)&gt;) //, logic: impl Fn(&amp;Variable&lt;Child&lt;'a, G, G::Timestamp&gt;, (u64, u64), isize&gt;) -&gt; Collection&lt;Child&lt;'a, G, G::Timestamp&gt;, (u64, u64)&gt;)
243+
</span><span class="boring">fn example&lt;'a, G: Scope&lt;Timestamp=u64&gt;&gt;(collection: &amp;VecCollection&lt;G, (u64, u64)&gt;) //, logic: impl Fn(&amp;VecVariable&lt;Child&lt;'a, G, G::Timestamp&gt;, (u64, u64), isize&gt;) -&gt; VecCollection&lt;Child&lt;'a, G, G::Timestamp&gt;, (u64, u64)&gt;)
244244
</span><span class="boring"> where G::Timestamp: Lattice
245245
</span><span class="boring">{
246246
</span> collection.scope().scoped("inner", |subgraph| {
247-
let variable = Variable::new_from(collection.enter(subgraph), 1);
247+
let variable = VecVariable::new_from(collection.enter(subgraph), 1);
248248
let result = logic(&amp;variable);
249249
variable.set(&amp;result);
250250
result.leave()

0 commit comments

Comments
 (0)