Merge branch 'master' of github.com:lrsjohnson/scheme-mapreduce

Author: lrsjohnson

examples/demo.scm code/examples/demo.scm

@@ -1,9 +1,9 @@
 ;;; Flow computation demo
 (define (demo)
-  (define 2d-vectors (create-data-set))
-  (define 3d-vectors (create-data-set))
-  (define magnitudes (create-data-set))
-  (define in-out-flow (create-data-set))
+  (define 2d-vectors (mrs:create-data-set))
+  (define 3d-vectors (mrs:create-data-set))
+  (define magnitudes (mrs:create-data-set))
+  (define in-out-flow (mrs:create-output-data-set))
   (mrs:map
    (lambda (key 2d-vec)
      (let ((x (car 2d-vec)) (y (cadr 2d-vec)))
@@ -25,6 +25,5 @@
                                         (in (3 3))
                                         (out (5 0))))
   (mrs:feed-key-value-list 3d-vectors '((in (1 1 1))
-                                        (out (5 0 0))))
-  (mrs:print-streaming in-out-flow 'flows))
+                                        (out (5 0 0)))))
 (mrs:run-computation demo)

examples/word-count.scm code/examples/word-count.scm

@@ -1,7 +1,7 @@
 (define (word-count)
-  (define documents (create-data-set))
-  (define words (create-data-set))
-  (define word-counts (create-data-set))
+  (define documents (mrs:create-data-set))
+  (define words (mrs:create-data-set))
+  (define word-counts (mrs:create-output-data-set))
   (mrs:map
    (lambda (key document)
      (for-each (lambda (word) (mrs:emit word 1)) document))
@@ -12,6 +12,5 @@
    words word-counts)
   (mrs:feed-value-list documents '((hello world this is a document)))
   (mrs:feed-value-list documents '((another document) (and another)))
-  (mrs:feed-value-list documents '((this document is somewhat long) (a short document)))
-  (mrs:print-streaming word-counts 'count))
+  (mrs:feed-value-list documents '((this document is somewhat long) (a short document))))
 (mrs:run-computation word-count)

writeup.tex

@@ -198,7 +198,7 @@ \subsubsection{Pipes}
 
 For the inter-process communication, we pass data between our
 distributors and workers via simple queued pipes. However, our data
-abstraction of ``send message to worker'' and ``Get message from
+abstraction of ``send message to worker'' and ``get message from
 worker'' could easily be reimplemented to use network / TCP
 communications to communicate with an actual distributed system of computers.