X-Git-Url: https://git.auder.net/?p=epclust.git;a=blobdiff_plain;f=epclust%2Ftests%2Ftestthat%2Ftest.de_serialize.R;h=25f2c2bf21f2061ee6aa2968cc6bf3b7b1866f5d;hp=8403e6d1273597277513364fe8d524133a43f763;hb=37c82bbafbffc19e8b47a521952bac58f189e9ea;hpb=bccecb19b4faa20808dab761d30f2d2dd4dcf587

diff --git a/epclust/tests/testthat/test.de_serialize.R b/epclust/tests/testthat/test.de_serialize.R
index 8403e6d..25f2c2b 100644
--- a/epclust/tests/testthat/test.de_serialize.R
+++ b/epclust/tests/testthat/test.de_serialize.R
@@ -2,11 +2,11 @@ context("de_serialize")
 
 test_that("serialization + getDataInFile retrieve original data / from matrix",
 {
-	data_bin_file = "/tmp/epclust_test_m.bin"
+	data_bin_file = ".epclust_test_m.bin"
 	unlink(data_bin_file)
 
-	#dataset 200 lignes / 30 columns
-	data_ascii = matrix(runif(200*30,-10,10),ncol=30)
+	#dataset 200 cols / 30 rows
+	data_ascii = matrix(runif(200*30,-10,10),nrow=30)
 	nbytes = 4 #lead to a precision of 1e-7 / 1e-8
 	endian = "little"
 
@@ -16,7 +16,7 @@ test_that("serialization + getDataInFile retrieve original data / from matrix",
 	for (indices in list(c(1,3,5), 3:13, c(5,20,50), c(75,130:135), 196:200))
 	{
 		data_lines = getDataInFile(indices, data_bin_file, nbytes, endian)
-		expect_equal(data_lines, data_ascii[indices,], tolerance=1e-6)
+		expect_equal(data_lines, data_ascii[,indices], tolerance=1e-6)
 	}
 	unlink(data_bin_file)
 
@@ -27,44 +27,44 @@ test_that("serialization + getDataInFile retrieve original data / from matrix",
 	for (indices in list(c(1,3,5), 3:13, c(5,20,50), c(75,130:135), 196:200))
 	{
 		data_lines = getDataInFile(indices, data_bin_file, nbytes, endian)
-		expect_equal(data_lines, data_ascii[indices,], tolerance=1e-6)
+		expect_equal(data_lines, data_ascii[,indices], tolerance=1e-6)
 	}
 	unlink(data_bin_file)
 })
 
 test_that("serialization + transform + getDataInFile retrieve original transforms",
 {
-	data_bin_file = "/tmp/epclust_test_t.bin"
+	data_bin_file = ".epclust_test_t.bin"
 	unlink(data_bin_file)
 
-	#dataset 200 lignes / 30 columns
-	data_ascii = matrix(runif(200*30,-10,10),ncol=30)
+	#dataset 200 cols / 30 rows
+	data_ascii = matrix(runif(200*30,-10,10),nrow=30)
 	nbytes = 8
 	endian = "little"
 
 	binarize(data_ascii, data_bin_file, 500, ",", nbytes, endian)
 	# Serialize transformation (just compute range) into a new binary file
-	trans_bin_file = "/tmp/epclust_test_t_trans.bin"
+	trans_bin_file = ".epclust_test_t_trans.bin"
 	unlink(trans_bin_file)
 	getSeries = function(inds) getDataInFile(inds, data_bin_file, nbytes, endian)
-	binarizeTransform(getSeries, function(series) t(apply(series, 1, range)),
+	binarizeTransform(getSeries, function(series) apply(series, 2, range),
 		trans_bin_file, 250, nbytes, endian)
 	unlink(data_bin_file)
 	expect_equal(file.info(trans_bin_file)$size, 2*nrow(data_ascii)*nbytes+8)
 	for (indices in list(c(1,3,5), 3:13, c(5,20,50), c(75,130:135), 196:200))
 	{
-		trans_lines = getDataInFile(indices, trans_bin_file, nbytes, endian)
-		expect_equal(trans_lines, t(apply(data_ascii[indices,],1,range)), tolerance=1e-6)
+		trans_cols = getDataInFile(indices, trans_bin_file, nbytes, endian)
+		expect_equal(trans_cols, apply(data_ascii[indices,],2,range), tolerance=1e-6)
 	}
 	unlink(trans_bin_file)
 })
 
 test_that("serialization + getDataInFile retrieve original data / from connection",
 {
-	data_bin_file = "/tmp/epclust_test_c.bin"
+	data_bin_file = ".epclust_test_c.bin"
 	unlink(data_bin_file)
 
-	#dataset 300 lignes / 50 columns
+	#dataset 300 cols / 50 rows
 	data_csv = system.file("testdata","de_serialize.csv",package="epclust")
 	nbytes = 8
 	endian = "big"
@@ -76,8 +76,8 @@ test_that("serialization + getDataInFile retrieve original data / from connectio
 	for (indices in list(c(1,3,5), 3:13, c(5,20,50), c(75,130:135), 196:200))
 	{
 		#HACK: as.matrix(as.data.frame( )) required to match (ref) data structure
-		data_lines = as.matrix(as.data.frame( getDataInFile(indices,data_bin_file,nbytes,endian) ))
-		expect_equal(data_lines, data_ascii[indices,])
+		data_cols = as.matrix(as.data.frame( getDataInFile(indices,data_bin_file,nbytes,endian) ))
+		expect_equal(data_cols, data_ascii[,indices])
 	}
 	unlink(data_bin_file)
 
@@ -87,8 +87,8 @@ test_that("serialization + getDataInFile retrieve original data / from connectio
 	expect_equal(file.info(data_bin_file)$size, 300*50*8+8)
 	for (indices in list(c(1,3,5), 3:13, c(5,20,50), c(75,130:135), 196:200))
 	{
-		data_lines = as.matrix(as.data.frame( getDataInFile(indices,data_bin_file,nbytes,endian) ))
-		expect_equal(data_lines, data_ascii[indices,])
+		data_cols = as.matrix(as.data.frame( getDataInFile(indices,data_bin_file,nbytes,endian) ))
+		expect_equal(data_cols, data_ascii[,indices])
 	}
 	unlink(data_bin_file)
 	#close(data_con) --> done in binarize()