Browse files

Forgot my charger again

  • Loading branch information...
1 parent 053fbf6 commit 6989840713270dd5ff016b710d7bc2199215d3ca @noobii committed Apr 17, 2012
Showing with 81 additions and 25 deletions.
  1. BIN .cache
  2. BIN plot.png
  3. +9 −7 src/main/scala/ch/epfl/em/Gaussian.scala
  4. +15 −0 src/main/scala/ch/epfl/em/Kmean.scala
  5. +4 −0 src/test/scala/ch/epfl/em/GaussianTest.scala
  6. +20 −3 src/test/scala/ch/epfl/em/KmeanSuite.scala
  7. +1 −0 target/.history
  8. BIN target/scala-2.9.0/cache/compile/compile
  9. BIN target/scala-2.9.0/cache/compile/test/compile
  10. BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$1.class
  11. BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$2.class
  12. BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$3$$anonfun$4.class
  13. BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$3.class
  14. BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$5$$anonfun$apply$1.class
  15. BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$5.class
  16. BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$6.class
  17. BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$7.class
  18. BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$8$$anonfun$apply$2.class
  19. BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$8.class
  20. BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$9.class
  21. BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$expectation$1.class
  22. BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$.class
  23. BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian.class
  24. BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$1.class
  25. BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$2.class
  26. BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$3.class
  27. BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$4.class
  28. BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$5.class
  29. BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$6.class
  30. BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$7.class
  31. BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$8.class
  32. BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$9.class
  33. BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$closestClusterIndex$1.class
  34. BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$initializeClusters$1.class
  35. BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$.class
  36. BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean.class
  37. BIN target/scala-2.9.0/test-classes/ch/epfl/em/GaussianTest.class
  38. BIN target/scala-2.9.0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$randomVect$1.class
  39. BIN ...cala-2.9.0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1$$anonfun$apply$mcVI$sp$1.class
  40. BIN ...cala-2.9.0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1$$anonfun$apply$mcVI$sp$2.class
  41. BIN ...cala-2.9.0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1$$anonfun$apply$mcVI$sp$3.class
  42. BIN ...cala-2.9.0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1$$anonfun$apply$mcVI$sp$5.class
  43. BIN ...cala-2.9.0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1$$anonfun$apply$mcVI$sp$6.class
  44. BIN ...cala-2.9.0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1$$anonfun$apply$mcVI$sp$7.class
  45. BIN target/scala-2.9.0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1.class
  46. BIN target/scala-2.9.0/test-classes/ch/epfl/em/KmeanSuite.class
  47. +1 −0 target/streams/$global/compilers/$global/out
  48. +17 −3 target/streams/compile/compile/$global/out
  49. +6 −6 target/streams/test/compile/$global/out
  50. +2 −2 target/streams/test/defined-tests/$global/out
  51. +2 −2 target/streams/test/test-only/$global/out
  52. +2 −1 target/streams/test/test-only/is-module=false name=ch.epfl.em.GaussianTest/out
  53. +2 −1 target/streams/test/test-only/is-module=false name=ch.epfl.em.KmeanSuite/out
View
BIN .cache
Binary file not shown.
View
BIN plot.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
16 src/main/scala/ch/epfl/em/Gaussian.scala
@@ -20,11 +20,13 @@ object Gaussian {
def initEm(
data: DenseMatrix[Double],
gaussianComp: Int
- ): (DenseVector[Double], DenseMatrix[Double], Array[DenseMatrix[Double]]) = {
+ ): (DenseVector[Double], DenseMatrix[Double], Seq[DenseMatrix[Double]]) = {
- val toto = Kmean.kmeans(data, gaussianComp, Int.MaxValue)
- // TODO must rewrite kmeans to finish the function
- null
+ val (initialMeans, clusters) = Kmean.kmeans(data, gaussianComp, Int.MaxValue)
+ val initialCovariances = Kmean.covarianceOfClusters(clusters)
+ val initialWeights = Kmean.weightOfClusters(clusters)
+
+ (initialWeights, initialMeans, initialCovariances)
}
/**
@@ -159,7 +161,7 @@ object Gaussian {
val estCWithIndex = estC zipWithIndex
- val L = estCWithIndex.map {
+ val elements = estCWithIndex.map {
case (matrix, index) => {
val invEstC = inv(matrix)
@@ -168,9 +170,9 @@ object Gaussian {
estW(index) * (-0.5 * measurements * lg - 0.5 * (measurements - 1) * tr)
}
- }.sum
+ }
- L
+ elements.sum
}
}
View
15 src/main/scala/ch/epfl/em/Kmean.scala
@@ -67,6 +67,21 @@ object Kmean {
covariances.toSeq
}
+
+ /**
+ * Warning, crappy code ahead, but must test if it works first
+ */
+ def weightOfClusters(clusters: Seq[(Int, DenseVector[Double])]): DenseVector[Double] = {
+ val groupedClusters = clusters groupBy(_._1) toSeq
+ val orderedClusters = groupedClusters sortBy(_._1)
+
+ val n = clusters.size.toDouble
+ val k = orderedClusters.size
+
+ val vector = DenseVector.tabulate[Double](k)(x => orderedClusters(x)._2.size / n)
+
+ vector
+ }
/**
* Initial step of the algorithm. It "randomly" assign a cluster to each mesurement.
View
4 src/test/scala/ch/epfl/em/GaussianTest.scala
@@ -25,6 +25,10 @@ class GaussianTest extends AssertionsForJUnit {
(X, k, W, M, V)
}
+ @Test def testInitEm() {
+
+ }
+
@Test def testEM() {
}
View
23 src/test/scala/ch/epfl/em/KmeanSuite.scala
@@ -113,16 +113,33 @@ class KmeanSuite extends AssertionsForJUnit {
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 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)
+ val matlabVal1 = DenseMatrix((2.0, 0.0, -2.0), (0.0, 0.0, 0.0), (-2.0, 0.0, 2.0))
assert(areEqual(cov(1), matlabVal1))
assert(areEqual(cov(0), matlabVal0))
}
+ @Test def testWeightOfClusters() {
+
+ val vects = Seq(
+ (1, DenseVector(1.0, 2.0, 3.0)),
+ (0, DenseVector(3.0, 2.0, 1.0)),
+ (1, DenseVector(3.0, 2.0, 1.0)),
+ (0, DenseVector(3.0, 2.0, 1.0)),
+ (0, DenseVector(6.0, 4.0, 2.0)),
+ (2, DenseVector(1.0, 1.0, 1.0))
+ )
+
+ val output = Kmean.weightOfClusters(vects)
+
+ val matlabVal = DenseVector(3.0/6.0, 2.0/6.0, 1.0/6.0)
+ println(output)
+ println(matlabVal)
+
+ assert(output == matlabVal)
+ }
/*
@Test def testHugeKmean() {
View
1 target/.history
@@ -39,3 +39,4 @@ test-only
compile
compile --force
test-only
+exit
View
BIN target/scala-2.9.0/cache/compile/compile
Binary file not shown.
View
BIN target/scala-2.9.0/cache/compile/test/compile
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$1.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$2.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$3$$anonfun$4.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$3.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$5$$anonfun$apply$1.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$5.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$6.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$7.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$8$$anonfun$apply$2.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$8.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$9.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$$anonfun$expectation$1.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian$.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Gaussian.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$1.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$2.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$3.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$4.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$5.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$6.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$7.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$8.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$9.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$closestClusterIndex$1.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$$anonfun$initializeClusters$1.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean$.class
Binary file not shown.
View
BIN target/scala-2.9.0/classes/ch/epfl/em/Kmean.class
Binary file not shown.
View
BIN target/scala-2.9.0/test-classes/ch/epfl/em/GaussianTest.class
Binary file not shown.
View
BIN target/scala-2.9.0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$randomVect$1.class
Binary file not shown.
View
BIN ....0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1$$anonfun$apply$mcVI$sp$1.class
Binary file not shown.
View
BIN ....0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1$$anonfun$apply$mcVI$sp$2.class
Binary file not shown.
View
BIN ....0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1$$anonfun$apply$mcVI$sp$3.class
Binary file not shown.
View
BIN ....0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1$$anonfun$apply$mcVI$sp$5.class
Binary file not shown.
View
BIN ....0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1$$anonfun$apply$mcVI$sp$6.class
Binary file not shown.
View
BIN ....0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1$$anonfun$apply$mcVI$sp$7.class
Binary file not shown.
View
BIN target/scala-2.9.0/test-classes/ch/epfl/em/KmeanSuite$$anonfun$testKmean$1.class
Binary file not shown.
View
BIN target/scala-2.9.0/test-classes/ch/epfl/em/KmeanSuite.class
Binary file not shown.
View
1 target/streams/$global/compilers/$global/out
@@ -1 +1,2 @@
[debug] Getting compiler-interface from component compiler for Scala 2.9.0
+[debug] Getting compiler-interface from component compiler for Scala 2.9.0
View
20 target/streams/compile/compile/$global/out
@@ -2,14 +2,28 @@
[debug] Initial source changes: 
[debug]  removed:Set()
[debug]  added: Set()
-[debug]  modified: Set()
+[debug]  modified: Set(C:\Users\a-pigryd\workspace\em\src\main\scala\ch\epfl\em\Gaussian.scala)
[debug] Removed products: Set()
[debug] Modified external sources: Set()
[debug] Modified binary dependencies: Set()
-[debug] Initial directly invalidated sources: Set()
+[debug] Initial directly invalidated sources: Set(C:\Users\a-pigryd\workspace\em\src\main\scala\ch\epfl\em\Gaussian.scala)
[debug] 
[debug] Sources indirectly invalidated by:
[debug]  product: Set()
[debug]  binary dep: Set()
[debug]  external source: Set()
-[debug] Initially invalidated: Set()
+[debug] Initially invalidated: Set(C:\Users\a-pigryd\workspace\em\src\main\scala\ch\epfl\em\Gaussian.scala)
+[info] Compiling 1 Scala source to C:\Users\a-pigryd\workspace\em\target\scala-2.9.0\classes...
+[debug] Interfacing (CompilerInterface) with Scala compiler version 2.9.0.final
+[debug] Calling Scala compiler with arguments (CompilerInterface):
+[debug]  -d
+[debug]  C:\Users\a-pigryd\workspace\em\target\scala-2.9.0\classes
+[debug]  -bootclasspath
+[debug]  C:\Program Files\Java\jre7\lib\resources.jar;C:\Program Files\Java\jre7\lib\rt.jar;C:\Program Files\Java\jre7\lib\sunrsasign.jar;C:\Program Files\Java\jre7\lib\jsse.jar;C:\Program Files\Java\jre7\lib\jce.jar;C:\Program Files\Java\jre7\lib\charsets.jar;C:\Program Files\Java\jre7\classes;C:\Users\a-pigryd\.sbt\boot\scala-2.9.0\lib\scala-library.jar
+[debug]  -classpath
+[debug]  C:\Users\a-pigryd\workspace\em\target\scala-2.9.0\classes;C:\Users\a-pigryd\.ivy2\cache\org.scalala\scalala_2.9.0\jars\scalala_2.9.0-1.0.0.RC2-SNAPSHOT.jar;C:\Users\a-pigryd\.ivy2\cache\jline\jline\jars\jline-0.9.94.jar;C:\Users\a-pigryd\.ivy2\cache\junit\junit\jars\junit-3.8.1.jar;C:\Users\a-pigryd\.ivy2\cache\org.apache.xmlgraphics\xmlgraphics-commons\jars\xmlgraphics-commons-1.3.1.jar;C:\Users\a-pigryd\.ivy2\cache\commons-io\commons-io\jars\commons-io-1.3.1.jar;C:\Users\a-pigryd\.ivy2\cache\commons-logging\commons-logging\jars\commons-logging-1.0.4.jar;C:\Users\a-pigryd\.ivy2\cache\jfree\jfreechart\jars\jfreechart-1.0.13.jar;C:\Users\a-pigryd\.ivy2\cache\jfree\jcommon\jars\jcommon-1.0.16.jar;C:\Users\a-pigryd\.ivy2\cache\netlib\netlib-java\jars\netlib-java-0.9.3.jar;C:\Users\a-pigryd\.ivy2\cache\netlib\arpack-combo\jars\arpack-combo-0.1.jar;C:\Users\a-pigryd\.ivy2\cache\com.lowagie\itext\jars\itext-2.1.5.jar;C:\Users\a-pigryd\.ivy2\cache\bouncycastle\bcmail-jdk14\jars\bcmail-jdk14-138.jar;C:\Users\a-pigryd\.ivy2\cache\bouncycastle\bcprov-jdk14\jars\bcprov-jdk14-138.jar
+[debug]  C:\Users\a-pigryd\workspace\em\src\main\scala\ch\epfl\em\Gaussian.scala
+[warn] there were 2 deprecation warnings; re-run with -deprecation for details
+[warn] one warning found
+[debug]  Invalidated direct: Set()
+[debug] Incrementally invalidated: Set()
View
12 target/streams/test/compile/$global/out
@@ -2,17 +2,17 @@
[debug] Initial source changes: 
[debug]  removed:Set()
[debug]  added: Set()
-[debug]  modified: Set(C:\Users\a-pigryd\workspace\em\src\test\scala\ch\epfl\em\KmeanSuite.scala)
+[debug]  modified: Set(C:\Users\a-pigryd\workspace\em\src\test\scala\ch\epfl\em\GaussianTest.scala)
[debug] Removed products: Set()
-[debug] Modified external sources: Set()
+[debug] Modified external sources: Set(ch.epfl.em.Gaussian$)
[debug] Modified binary dependencies: Set()
-[debug] Initial directly invalidated sources: Set(C:\Users\a-pigryd\workspace\em\src\test\scala\ch\epfl\em\KmeanSuite.scala)
+[debug] Initial directly invalidated sources: Set(C:\Users\a-pigryd\workspace\em\src\test\scala\ch\epfl\em\GaussianTest.scala)
[debug] 
[debug] Sources indirectly invalidated by:
[debug]  product: Set()
[debug]  binary dep: Set()
-[debug]  external source: Set()
-[debug] Initially invalidated: Set(C:\Users\a-pigryd\workspace\em\src\test\scala\ch\epfl\em\KmeanSuite.scala)
+[debug]  external source: Set(C:\Users\a-pigryd\workspace\em\src\test\scala\ch\epfl\em\GaussianTest.scala)
+[debug] Initially invalidated: Set(C:\Users\a-pigryd\workspace\em\src\test\scala\ch\epfl\em\GaussianTest.scala)
[info] Compiling 1 Scala source to C:\Users\a-pigryd\workspace\em\target\scala-2.9.0\test-classes...
[debug] Interfacing (CompilerInterface) with Scala compiler version 2.9.0.final
[debug] Calling Scala compiler with arguments (CompilerInterface):
@@ -22,6 +22,6 @@
[debug]  C:\Program Files\Java\jre7\lib\resources.jar;C:\Program Files\Java\jre7\lib\rt.jar;C:\Program Files\Java\jre7\lib\sunrsasign.jar;C:\Program Files\Java\jre7\lib\jsse.jar;C:\Program Files\Java\jre7\lib\jce.jar;C:\Program Files\Java\jre7\lib\charsets.jar;C:\Program Files\Java\jre7\classes;C:\Users\a-pigryd\.sbt\boot\scala-2.9.0\lib\scala-library.jar
[debug]  -classpath
[debug]  C:\Users\a-pigryd\workspace\em\target\scala-2.9.0\test-classes;C:\Users\a-pigryd\workspace\em\target\scala-2.9.0\classes;C:\Users\a-pigryd\.ivy2\cache\org.scalala\scalala_2.9.0\jars\scalala_2.9.0-1.0.0.RC2-SNAPSHOT.jar;C:\Users\a-pigryd\.ivy2\cache\jline\jline\jars\jline-0.9.94.jar;C:\Users\a-pigryd\.ivy2\cache\org.apache.xmlgraphics\xmlgraphics-commons\jars\xmlgraphics-commons-1.3.1.jar;C:\Users\a-pigryd\.ivy2\cache\commons-io\commons-io\jars\commons-io-1.3.1.jar;C:\Users\a-pigryd\.ivy2\cache\commons-logging\commons-logging\jars\commons-logging-1.0.4.jar;C:\Users\a-pigryd\.ivy2\cache\jfree\jfreechart\jars\jfreechart-1.0.13.jar;C:\Users\a-pigryd\.ivy2\cache\jfree\jcommon\jars\jcommon-1.0.16.jar;C:\Users\a-pigryd\.ivy2\cache\netlib\netlib-java\jars\netlib-java-0.9.3.jar;C:\Users\a-pigryd\.ivy2\cache\netlib\arpack-combo\jars\arpack-combo-0.1.jar;C:\Users\a-pigryd\.ivy2\cache\com.lowagie\itext\jars\itext-2.1.5.jar;C:\Users\a-pigryd\.ivy2\cache\bouncycastle\bcmail-jdk14\jars\bcmail-jdk14-138.jar;C:\Users\a-pigryd\.ivy2\cache\bouncycastle\bcprov-jdk14\jars\bcprov-jdk14-138.jar;C:\Users\a-pigryd\.ivy2\cache\org.scalatest\scalatest_2.9.0\jars\scalatest_2.9.0-1.7.1.jar;C:\Users\a-pigryd\.ivy2\cache\com.novocode\junit-interface\jars\junit-interface-0.8.jar;C:\Users\a-pigryd\.ivy2\cache\junit\junit\jars\junit-4.8.2.jar;C:\Users\a-pigryd\.ivy2\cache\org.scala-tools.testing\test-interface\jars\test-interface-0.5.jar
-[debug]  C:\Users\a-pigryd\workspace\em\src\test\scala\ch\epfl\em\KmeanSuite.scala
+[debug]  C:\Users\a-pigryd\workspace\em\src\test\scala\ch\epfl\em\GaussianTest.scala
[debug]  Invalidated direct: Set()
[debug] Incrementally invalidated: Set()
View
4 target/streams/test/defined-tests/$global/out
@@ -1,2 +1,2 @@
-[debug] Subclass fingerprints: Stream((org.scalatest.Suite,false,org.scalatest.tools.ScalaTestFramework$$anon$1@1259c133), ?)
-[debug] Annotation fingerprints: Stream((org.scalatest.WrapWith,false,org.scalatest.tools.ScalaTestFramework$$anon$2@429b04ae), ?)
+[debug] Subclass fingerprints: Stream((org.scalatest.Suite,false,org.scalatest.tools.ScalaTestFramework$$anon$1@9aeb743), ?)
+[debug] Annotation fingerprints: Stream((org.scalatest.WrapWith,false,org.scalatest.tools.ScalaTestFramework$$anon$2@2d8194ac), ?)
View
4 target/streams/test/test-only/$global/out
@@ -1,6 +1,6 @@
[debug] Running Test ch.epfl.em.GaussianTest : annotation(false, org.junit.Test) with arguments -q, -v
[debug] Running Test ch.epfl.em.KmeanSuite : annotation(false, org.junit.Test) with arguments -q, -v
-[info] Passed: : Total 11, Failed 0, Errors 0, Passed 11, Skipped 0
+[info] Passed: : Total 13, Failed 0, Errors 0, Passed 13, Skipped 0
[debug] Passed tests:
-[debug]  ch.epfl.em.GaussianTest
[debug]  ch.epfl.em.KmeanSuite
+[debug]  ch.epfl.em.GaussianTest
View
3 target/streams/test/test-only/is-module=false name=ch.epfl.em.GaussianTest/out
@@ -1,6 +1,7 @@
[info] Test run started
+[info] Test ch.epfl.em.GaussianTest.testInitEm started
[info] Test ch.epfl.em.GaussianTest.testEM started
[info] Test ch.epfl.em.GaussianTest.testExpectation started
[info] Test ch.epfl.em.GaussianTest.testMaximization started
[info] Test ch.epfl.em.GaussianTest.testLoglikelihood started
-[info] Test run finished: 0 failed, 0 ignored, 4 total, 0.25s
+[info] Test run finished: 0 failed, 0 ignored, 5 total, 0.44s
View
3 target/streams/test/test-only/is-module=false name=ch.epfl.em.KmeanSuite/out
@@ -4,6 +4,7 @@
[info] Test ch.epfl.em.KmeanSuite.testComputeCentroids started
[info] Test ch.epfl.em.KmeanSuite.testClosestCluster started
[info] Test ch.epfl.em.KmeanSuite.testInitializeClusters started
+[info] Test ch.epfl.em.KmeanSuite.testWeightOfClusters started
[info] Test ch.epfl.em.KmeanSuite.testCovarianceOfClusters started
[info] Test ch.epfl.em.KmeanSuite.testKmean started
-[info] Test run finished: 0 failed, 0 ignored, 7 total, 0.74s
+[info] Test run finished: 0 failed, 0 ignored, 8 total, 1.17s

0 comments on commit 6989840

Please sign in to comment.