updating fourGaussians data set, updating tests

Author: azureblue

data/fourGaussians.rda

@@ -1,18 +1,18 @@
 testname <- "Clustering"
 setup <- function()
-{
-    M <- as.matrix(read.table(system.file("cec_tests", "mouse1.data", package="CEC")))
-    C <- as.matrix(read.table(system.file("cec_tests", "centers1.data", package="CEC")))
-    expected <- dget(system.file("cec_tests", "cec1.dp", package="CEC"))  
+{ 
+    data("fourGaussians", package = "CEC")
+    centers <- as.matrix(read.table(system.file("cec_tests", "four.gaussians.centers.data", package="CEC")))
+    expected <- dget(system.file("cec_tests", "four.gaussians.result.dp", package="CEC"))  
 }
 
-test.clustering.mouse1 <- function()
+test.clustering.four.gaussians <- function()
 {  
-    CEC <- cec(M, C)
+    CEC <- cec(fourGaussians, centers)
     CEC:::checkNumericVectorEquals(expected$cluster, CEC$cluster, msg="Clustering vector")
     CEC:::checkNumericVectorEquals(expected$cost, CEC$cost, msg="Energy")
     CEC:::checkNumericMatrixEquals(expected$centers, CEC$centers, msg="Centers")
-    CEC:::checkNumericMatrixEquals(M, CEC$data, msg="Data")
+    CEC:::checkNumericMatrixEquals(fourGaussians, CEC$data, msg="Data")
     CEC:::checkNumericVectorEquals(expected$probability, CEC$probability, msg="Probability")
     CEC:::checkNumericVectorEquals(expected$nclusters, CEC$nclusters, msg="Number of clusters")
     CEC:::checkNumericVectorEquals(expected$iterations, CEC$iterations, msg="Iterations")

inst/cec_tests/cec1.dp

@@ -0,0 +1,4 @@
+1.01907725638331 2.35490540074148
+-3.02767008221039 -2.86906071414027
+-0.0242720163788669 -0.648301422440495
+2.55004588700554 0.0810649917238939