Last commit introduced a bug in the Kmean test class

noobii · Apr 17, 2012 · 053fbf6 · 053fbf6
1 parent 62e205a
commit 053fbf6
Show file tree

Hide file tree

Showing 28 changed files with 18 additions and 15 deletions.
diff --git a/.cache b/.cache
diff --git a/plot.png b/plot.png
diff --git a/src/main/scala/ch/epfl/em/Kmean.scala b/src/main/scala/ch/epfl/em/Kmean.scala
@@ -47,17 +47,20 @@ object Kmean {
    * WARNING ! crapy code ahead, will rewrite it but must test if it works first
    */
   def covarianceOfClusters(clusters: Seq[(Int, DenseVector[Double])]): Seq[DenseMatrix[Double]] = {
+
     def agregatedMatrix(vects: Seq[(Int, DenseVector[Double])]): DenseMatrix[Double] = {
-      val matrix = DenseMatrix.zeros[Double](vects.length, vects(0)._2.size) // not verry pretty
+      val matrix = DenseMatrix.zeros[Double](vects.length, vects(0)._2.size) // not very pretty
 
       for(i <- 0 until vects.length) matrix(i, ::) := vects(i)._2
 
       matrix
     }
 
-    val groupedClusters = clusters groupBy(_._1) 
+    val groupedClusters = clusters groupBy(_._1) toSeq
+
+    val orderedClusters = groupedClusters sortBy(_._1)
 
-    val matrixClusters = groupedClusters map (x => agregatedMatrix(x._2))
+    val matrixClusters = orderedClusters map (x => agregatedMatrix(x._2))
 
     val covariances = matrixClusters map (covariance(_, Axis.Vertical)._1)
 

diff --git a/src/test/scala/ch/epfl/em/KmeanSuite.scala b/src/test/scala/ch/epfl/em/KmeanSuite.scala
@@ -105,21 +105,21 @@ class KmeanSuite extends AssertionsForJUnit {
 
     val vects = Seq(
       (1, DenseVector(1.0, 2.0, 3.0)),
-      (2, DenseVector(3.0, 2.0, 1.0)),
+      (0, DenseVector(3.0, 2.0, 1.0)),
       (1, DenseVector(3.0, 2.0, 1.0)),
-      (2, DenseVector(3.0, 2.0, 1.0)),
-      (2, DenseVector(6.0, 4.0, 2.0))
+      (0, DenseVector(3.0, 2.0, 1.0)),
+      (0, DenseVector(6.0, 4.0, 2.0))
     )
 
     val cov = Kmean.covarianceOfClusters(vects)
 
     val matlabVal1 = DenseMatrix((2.0, 0.0, -2.0), (0.0, 0.0, 0.0), (-2.0, 0.0, 2.0))
-    val matlabVal2 = DenseMatrix((3.0, 2.0, 1.0), (2.0, 4.0/3.0, 2.0/3.0), (1.0, 2.0/3.0, 1.0/3.0))
+    val matlabVal0 = DenseMatrix((3.0, 2.0, 1.0), (2.0, 4.0/3.0, 2.0/3.0), (1.0, 2.0/3.0, 1.0/3.0))
 
     val deltaMatrix = DenseMatrix.fill(3, 3)(0.01)
 
-    assert(cov.exists(areEqual(_, matlabVal1)))
-    assert(cov.exists(areEqual(_, matlabVal2)))
+    assert(areEqual(cov(1), matlabVal1))
+    assert(areEqual(cov(0), matlabVal0))
 
   }
 
@@ -177,7 +177,7 @@ class KmeanSuite extends AssertionsForJUnit {
   }
 
   def areEqual(matA: DenseMatrix[Double], matB: DenseMatrix[Double]): Boolean = {
-    val delta = 0.001
+    val delta = 0.00001
 
     if(matA.numCols != matB.numCols || matA.numRows != matB.numRows) return false
 

diff --git a/target/scala-2.9.0/cache/compile/compile b/target/scala-2.9.0/cache/compile/compile
diff --git a/target/scala-2.9.0/cache/compile/test/compile b/target/scala-2.9.0/cache/compile/test/compile
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$1.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$1.class
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$2.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$2.class
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$3.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$3.class
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$4.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$4.class
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$5$$anonfun$apply$1.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$5$$anonfun$apply$1.class
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$5.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$5.class
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$6.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$6.class
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$7.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$7.class
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$8.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$8.class
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$9.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$9.class
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$agregatedMatrix$1$1.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$agregatedMatrix$1$1.class
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$closestClusterIndex$1.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$closestClusterIndex$1.class
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$initializeClusters$1.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$initializeClusters$1.class
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean$.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean$.class
diff --git a/target/scala-2.9.0/classes/ch/epfl/em/Kmean.class b/target/scala-2.9.0/classes/ch/epfl/em/Kmean.class
diff --git a/...et/scala-2.9.0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testInitializeClusters$2.class b/...et/scala-2.9.0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testInitializeClusters$2.class
diff --git a/target/scala-2.9.0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1.class b/target/scala-2.9.0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1.class
diff --git a/target/scala-2.9.0/test-classes/ch/epfl/em/KmeanSuite.class b/target/scala-2.9.0/test-classes/ch/epfl/em/KmeanSuite.class
diff --git a/target/streams/test/defined-tests/$global/out b/target/streams/test/defined-tests/$global/out
@@ -1,2 +1,2 @@
-[0m[[0mdebug[0m] [0mSubclass fingerprints: Stream((org.scalatest.Suite,false,org.scalatest.tools.ScalaTestFramework$$anon$1@58adc70d), ?)[0m
-[0m[[0mdebug[0m] [0mAnnotation fingerprints: Stream((org.scalatest.WrapWith,false,org.scalatest.tools.ScalaTestFramework$$anon$2@78e753f6), ?)[0m
+[0m[[0mdebug[0m] [0mSubclass fingerprints: Stream((org.scalatest.Suite,false,org.scalatest.tools.ScalaTestFramework$$anon$1@1259c133), ?)[0m
+[0m[[0mdebug[0m] [0mAnnotation fingerprints: Stream((org.scalatest.WrapWith,false,org.scalatest.tools.ScalaTestFramework$$anon$2@429b04ae), ?)[0m
diff --git a/target/streams/test/test-only/$global/out b/target/streams/test/test-only/$global/out
@@ -1,5 +1,5 @@
-[0m[[0mdebug[0m] [0mRunning Test ch.epfl.em.KmeanSuite : annotation(false, org.junit.Test) with arguments -q, -v[0m
 [0m[[0mdebug[0m] [0mRunning Test ch.epfl.em.GaussianTest : annotation(false, org.junit.Test) with arguments -q, -v[0m
+[0m[[0mdebug[0m] [0mRunning Test ch.epfl.em.KmeanSuite : annotation(false, org.junit.Test) with arguments -q, -v[0m
 [0m[[0minfo[0m] [0mPassed: : Total 11, Failed 0, Errors 0, Passed 11, Skipped 0[0m
 [0m[[0mdebug[0m] [0mPassed tests:[0m
 [0m[[0mdebug[0m] [0m	ch.epfl.em.GaussianTest[0m

diff --git a/target/streams/test/test-only/is-module=false name=ch.epfl.em.GaussianTest/out b/target/streams/test/test-only/is-module=false name=ch.epfl.em.GaussianTest/out
@@ -3,4 +3,4 @@
 [0m[[0minfo[0m] [0mTest ch.epfl.em.[33mGaussianTest[0m.[36mtestExpectation[0m started[0m
 [0m[[0minfo[0m] [0mTest ch.epfl.em.[33mGaussianTest[0m.[36mtestMaximization[0m started[0m
 [0m[[0minfo[0m] [0mTest ch.epfl.em.[33mGaussianTest[0m.[36mtestLoglikelihood[0m started[0m
-[0m[[0minfo[0m] [0m[34mTest run finished: [0m[34m0 failed[0m[34m, [0m[34m0 ignored[0m[34m, 4 total, 0.37s[0m[0m
+[0m[[0minfo[0m] [0m[34mTest run finished: [0m[34m0 failed[0m[34m, [0m[34m0 ignored[0m[34m, 4 total, 0.25s[0m[0m
diff --git a/target/streams/test/test-only/is-module=false name=ch.epfl.em.KmeanSuite/out b/target/streams/test/test-only/is-module=false name=ch.epfl.em.KmeanSuite/out
@@ -6,4 +6,4 @@
 [0m[[0minfo[0m] [0mTest ch.epfl.em.[33mKmeanSuite[0m.[36mtestInitializeClusters[0m started[0m
 [0m[[0minfo[0m] [0mTest ch.epfl.em.[33mKmeanSuite[0m.[36mtestCovarianceOfClusters[0m started[0m
 [0m[[0minfo[0m] [0mTest ch.epfl.em.[33mKmeanSuite[0m.[36mtestKmean[0m started[0m
-[0m[[0minfo[0m] [0m[34mTest run finished: [0m[34m0 failed[0m[34m, [0m[34m0 ignored[0m[34m, 7 total, 0.98s[0m[0m
+[0m[[0minfo[0m] [0m[34mTest run finished: [0m[34m0 failed[0m[34m, [0m[34m0 ignored[0m[34m, 7 total, 0.74s[0m[0m