Author: apalumbo
Date: Thu Apr 16 00:49:29 2015
New Revision: 1673982

URL: http://svn.apache.org/r1673982
Log:
revise out-of-core DSL reference

Modified:
    
mahout/site/mahout_cms/trunk/content/users/environment/out-of-core-reference.mdtext
    mahout/site/mahout_cms/trunk/templates/standard.html

Modified: 
mahout/site/mahout_cms/trunk/content/users/environment/out-of-core-reference.mdtext
URL: 
http://svn.apache.org/viewvc/mahout/site/mahout_cms/trunk/content/users/environment/out-of-core-reference.mdtext?rev=1673982&r1=1673981&r2=1673982&view=diff
==============================================================================
--- 
mahout/site/mahout_cms/trunk/content/users/environment/out-of-core-reference.mdtext
 (original)
+++ 
mahout/site/mahout_cms/trunk/content/users/environment/out-of-core-reference.mdtext
 Thu Apr 16 00:49:29 2015
@@ -8,7 +8,7 @@ In this reference, DRMs will be denoted
 
 #### Imports 
 
-The following imports are used for to enable seamless in-core and distributed 
algebraic DSL operations:
+The following imports are used to enable seamless in-core and distributed 
algebraic DSL operations:
 
     import org.apache.mahout.math._
     import scalabindings._
@@ -25,7 +25,7 @@ If you are working with Mahout-Samsara's
 
     import org.apache.mahout.sparkbindings._
     
-The Mahout shell does all of these import automatically.
+The Mahout shell does all of these imports automatically.
 
 
 #### DRM Persistence operators
@@ -56,23 +56,23 @@ Collecting to driver's jvm in-core:
     val drmB: DrmLike[Int] =...
     val inCoreC: Matrix = inCoreA %*% drmB
     
-**implies (incoreA %*% demb).collect**
+**implies (incoreA %*% drmB).collect**
 
 Collecting to (HD)FS as a Mahout's DRM formatted file:
 
     A.dfsWrite(path = hdfsPath)
     
-#### Logical algebraic opertors on DRM matrices:
+#### Logical algebraic operators on DRM matrices:
 
-A logical set of operators are defined for distributed matrices as as a subset 
of those defined for in-core matrices.  In particular, since all distributed 
matrices are immutable, there are no assignment opertors (e.g. **A += B**)
-*Note: please see: [Mahout Scala Bindings and Mahout Spark Bindings for Linear 
Algebra 
Subroutines](http://mahout.apache.org/users/sparkbindings/ScalaSparkBindings.pdf).
 For information on Mahout-Samsars's Algebraic Optimizer, and translation from 
logical operations to a physical plan for the back-end.*
+A logical set of operators are defined for distributed matrices as a subset of 
those defined for in-core matrices.  In particular, since all distributed 
matrices are immutable, there are no assignment operators (e.g. **A += B**)
+*Note: please see: [Mahout Scala Bindings and Mahout Spark Bindings for Linear 
Algebra 
Subroutines](http://mahout.apache.org/users/sparkbindings/ScalaSparkBindings.pdf)
 for information on Mahout-Samsars's Algebraic Optimizer, and translation from 
logical operations to a physical plan for the back end.*
  
     
 Cache a DRM and trigger an optimized physical plan: 
 
     drmA.checkpoint(CacheHint.MEMORY_AND_DISK)
    
-other valid caching Instructions:
+Other valid caching Instructions:
 
     drmA.checkpoint(CacheHint.NONE)
     drmA.checkpoint(CacheHint.DISK_ONLY)
@@ -109,7 +109,7 @@ Elementwise division *(Matrices of ident
 
     A / B
     
-**Elementwise operations involving one in-core argument (int-keyd DRMs only)**:
+**Elementwise operations involving one in-core argument (int-keyed DRMs 
only)**:
 
     A + inCoreB
     A - inCoreB
@@ -121,11 +121,11 @@ Elementwise division *(Matrices of ident
     A :/ inCoreB
     inCoreA +: B
     inCoreA -: B
-    inCoreA +: B
+    inCoreA *: B
     inCoreA /: B
-    
-*Note: Spark associativity change (e.g. A :+ inCoreB means B.leftMultiply(A), 
same as when both arguments are in core).  Whenever operator arguments include 
both in-core and out-of-core arguments, the operator can only be associated 
with the out-of-core (DRM) argument to support the distributed implementation.*
 
+Note: Spark associativity change (e.g. A +: inCoreB means B.leftMultiply(A), 
same as when both arguments are in core). Whenever operator arguments include 
both in-core and out-of-core arguments, the operator can only be associated 
with the out-of-core (DRM) argument to support the distributed implementation.
+    
 **Matrix-matrix multiplication %*%**:
 
 `\(\mathbf{M}=\mathbf{AB}\)`
@@ -153,7 +153,7 @@ Elementwise operations of every matrix e
     A :- 5.0
     5.0 -: A
     A * 5.0
-    A /5.0
+    A / 5.0
     5.0 /: a
     
 Note that `5.0 -: A` means `\(m_{ij} = 5 - a_{ij}\)` and `5.0 :/ A` means 
`\(m_{ij} = \frac{5}{a{ij}}\)` for all elements of the result.
@@ -182,18 +182,18 @@ Stitch side by side (cbind R semantics):
 
     val drmAnextToB = drmA cbind drmB
     
-Stiching side by side (Scala):
+Stitch side by side (Scala):
 
     val drmAnextToB = drmA.cbind(drmB)
     
-Analgously, vertical concatenation is avialable via **rbind**
+Analogously, vertical concatenation is available via **rbind**
 
 #### Custom pipelines on blocks
-Internaly, Mahout-Samsara's DRM is represented as a distributed set of 
vertical (Key, Block) tuples.
+Internally, Mahout-Samsara's DRM is represented as a distributed set of 
vertical (Key, Block) tuples.
 
 **drm.mapBlock(...)**:
 
-The DRM operator `mapBlock` provides transformational to the distributed 
vertical blockified tuples of a matrix (Row-Keys, Vertical-Matrix-Block).
+The DRM operator `mapBlock` provides transformational access to the 
distributed vertical blockified tuples of a matrix (Row-Keys, 
Vertical-Matrix-Block).
 
 Using `mapBlock` to add 1.0 to a DRM:
 
@@ -232,7 +232,7 @@ Matrix cardinality:
     drmA.nrow
     drmA.ncol
 
-*Note: depending on the stage of optimization, These may trigger a 
computational action.  I.e. if one calls `nrow()` n times, then the back end 
will actually recompute `nrow` n times.*
+*Note: depending on the stage of optimization, these may trigger a 
computational action.  I.e. if one calls `nrow()` n times, then the back end 
will actually recompute `nrow` n times.*
     
 Means and sums:
 

Modified: mahout/site/mahout_cms/trunk/templates/standard.html
URL: 
http://svn.apache.org/viewvc/mahout/site/mahout_cms/trunk/templates/standard.html?rev=1673982&r1=1673981&r2=1673982&view=diff
==============================================================================
--- mahout/site/mahout_cms/trunk/templates/standard.html (original)
+++ mahout/site/mahout_cms/trunk/templates/standard.html Thu Apr 16 00:49:29 
2015
@@ -147,6 +147,7 @@
                   <li><a 
href="/users/environment/h2o-internals.html">H2O</a></li>
                   <li class="nav-header">References</li>
                   <li><a 
href="/users/environment/in-core-reference.html">In-Core Algebraic DSL 
Reference</a></li>
+                  <li><a 
href="/users/environment/out-of-core-reference.html">Out-Of-Core Algebraic DSL 
Reference</a></li>
                   <li class="nav-header">Tutorials</li>
                   <li><a 
href="/users/sparkbindings/play-with-shell.html">Playing with Mahout's Spark 
Shell</a></li>
                 </ul>


Reply via email to