Readme + bump dependency versions

Author: ochafik

README.md

@@ -42,30 +42,40 @@ resolvers += Resolver.sonatypeRepo("snapshots")
 
 # Examples
 
-The following will eventually work:
+The following example currently works:
 
 ```scala
 import scalacl._
 
-case class Matrix(data: CLArray[Float], rows: Int, columns: Int)(implicit context: Context) {
-  def this(rows: Int, columns: Int) =
+case class Matrix(data: CLArray[Float],
+                  rows: Int,
+                  columns: Int)
+                 (implicit context: Context)
+{
+  def this(rows: Int, columns: Int)
+          (implicit context: Context) =
     this(new CLArray[Float](rows * columns), rows, columns)
-  def this(n: Int) =
+
+  def this(n: Int)
+          (implicit context: Context) =
     this(n, n)
-    
+
   def putProduct(a: Matrix, b: Matrix): Unit = {
     assert(a.columns == b.rows)
     assert(a.rows == rows)
     assert(b.columns == columns)
 
     kernel {
       // This block will either be converted to an OpenCL kernel or cause compilation error
-  for (i <- 0 until rows; j <- 0 until columns) {
-    data(i * columns + j) = (0 until a.columns).map(k => {
-      a.data(i * a.columns + k) * b.data(k * b.columns + j)
-    }).sum
-  }
-  }
+      for (i <- 0 until rows;
+           j <- 0 until columns) {
+        // c(i, j) = sum(k, a(i, k) * b(k, j))
+        data(i * columns + j) = (
+          for (k <- 0 until a.columns) yield
+            a.data(i * a.columns + k) * b.data(k * b.columns + j)
+        ).sum
+      }
+    }
   }
 
   def putSum(a: Matrix, b: Matrix): Unit = {
@@ -75,12 +85,12 @@ case class Matrix(data: CLArray[Float], rows: Int, columns: Int)(implicit contex
     kernel {
       for (i <- 0 until rows; j <- 0 until columns) {
       	val offset = i * columns + j
-    data(offset) = a.data(offset) + b.data(offset)
-  }
-  }
+        data(offset) = a.data(offset) + b.data(offset)
+      }
+    }
   }
 }
-        
+
 implicit val context = Context.best
 
 val n = 10

project/ScalaCLBuild.scala

@@ -80,8 +80,9 @@ object ScalaCLBuild extends Build {
       libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _),
       libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _),
       libraryDependencies ++= Seq(
-        "junit" % "junit" % "4.10" % "test",
-        "com.novocode" % "junit-interface" % "0.8" % "test"
+        "org.scalatest" % "scalatest_2.11" % "2.2.3" % "test",
+        "junit" % "junit" % "4.12" % "test",
+        "com.novocode" % "junit-interface" % "0.11" % "test"
       )
     )
 

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
 
 addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")