X-Git-Url: https://git.auder.net/?p=epclust.git;a=blobdiff_plain;f=epclust%2Ftests%2Ftestthat%2Ftest-de_serialize.R;h=14618a27c94f34dee7ca96db5f1bbec7ce873544;hp=8fb78edbae791f1d908a87877049942a6ac61f20;hb=282342bafdc9ff65c5df98c6e2304d63b33b9fb2;hpb=3c5a4b0880db63367a474a568e1322b3999932fe

diff --git a/epclust/tests/testthat/test-de_serialize.R b/epclust/tests/testthat/test-de_serialize.R
index 8fb78ed..14618a2 100644
--- a/epclust/tests/testthat/test-de_serialize.R
+++ b/epclust/tests/testthat/test-de_serialize.R
@@ -2,20 +2,20 @@ context("de_serialize")
 
 test_that("serialization + getDataInFile retrieve original data / from matrix",
 {
-	data_bin_file = ".epclust_test_m.bin"
+	data_bin_file <- ".epclust_test_m.bin"
 	unlink(data_bin_file)
 
 	# 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"
+	data_ascii <- matrix(runif(200*30,-10,10),nrow=30)
+	nbytes <- 4 #lead to a precision of 1e-7 / 1e-8
+	endian <- "little"
 
 	# Simulate serialization in one single call
 	binarize(data_ascii, data_bin_file, 500, ",", nbytes, endian)
 	expect_equal(file.info(data_bin_file)$size, length(data_ascii)*nbytes+8)
 	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)
+		data_lines <- getDataInFile(indices, data_bin_file, nbytes, endian)
 		expect_equal(data_lines, data_ascii[,indices], tolerance=1e-6)
 	}
 	unlink(data_bin_file)
@@ -26,7 +26,7 @@ test_that("serialization + getDataInFile retrieve original data / from matrix",
 	expect_equal(file.info(data_bin_file)$size, length(data_ascii)*nbytes+8)
 	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)
+		data_lines <- getDataInFile(indices, data_bin_file, nbytes, endian)
 		expect_equal(data_lines, data_ascii[,indices], tolerance=1e-6)
 	}
 	unlink(data_bin_file)
@@ -34,26 +34,26 @@ test_that("serialization + getDataInFile retrieve original data / from matrix",
 
 test_that("serialization + transform + getDataInFile retrieve original transforms",
 {
-	data_bin_file = ".epclust_test_t.bin"
+	data_bin_file <- ".epclust_test_t.bin"
 	unlink(data_bin_file)
 
 	# Dataset 200 cols / 30 rows
-	data_ascii = matrix(runif(200*30,-10,10),nrow=30)
-	nbytes = 8
-	endian = "little"
+	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 = ".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)
+	getSeries <- function(inds) getDataInFile(inds, data_bin_file, nbytes, endian)
 	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*ncol(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_cols = getDataInFile(indices, trans_bin_file, nbytes, endian)
+		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)
@@ -61,35 +61,32 @@ test_that("serialization + transform + getDataInFile retrieve original transform
 
 test_that("serialization + getDataInFile retrieve original data / from connection",
 {
-	data_bin_file = ".epclust_test_c.bin"
+	data_bin_file <- ".epclust_test_c.bin"
 	unlink(data_bin_file)
 
 	# Dataset 300 cols / 50 rows
-	data_csv = system.file("testdata","de_serialize.csv",package="epclust")
-	nbytes = 8
-	endian = "big"
-	data_ascii = t( as.matrix(read.table(data_csv, sep=";", header=FALSE)) ) #for ref
+	data_csv <- system.file("testdata","de_serialize.csv",package="epclust")
+	nbytes <- 8
+	endian <- "big"
+	data_ascii <- unname( t( as.matrix(read.table(data_csv,sep=";",header=FALSE)) ) ) #ref
 
 	# Simulate serialization in one single call
 	binarize(data_csv, data_bin_file, 350, ";", nbytes, endian)
 	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_cols = getDataInFile(indices,data_bin_file,nbytes,endian)
-		#HACK: rows naming required to match (ref) data structure
-		rownames(data_cols) <- paste("V",seq_len(nrow(data_ascii)), sep="")
+		data_cols <- getDataInFile(indices,data_bin_file,nbytes,endian)
 		expect_equal(data_cols, data_ascii[,indices])
 	}
 	unlink(data_bin_file)
 
 	# Serialization in several calls / chunks of 29 --> 29*10 + 10, incomplete last
-	data_con = file(data_csv, "r")
+	data_con <- file(data_csv, "r")
 	binarize(data_con, data_bin_file, 29, ";", nbytes, endian)
 	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_cols = getDataInFile(indices,data_bin_file,nbytes,endian)
-		rownames(data_cols) <- paste("V",seq_len(nrow(data_ascii)), sep="")
+		data_cols <- getDataInFile(indices,data_bin_file,nbytes,endian)
 		expect_equal(data_cols, data_ascii[,indices])
 	}
 	unlink(data_bin_file)