X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=epclust%2FR%2Fde_serialize.R;h=fd3a5dbaaf55ba929909e7ffa6b11974d65cc3ed;hb=0486fbadb122cb4d78c5d9f248c29800a59eb24e;hp=b6684d2abfbf35b6e99ccfd5d529e2b8f3d50688;hpb=492cd9e74a79cbcc0ecde55fa3071a44b7e463dc;p=epclust.git

diff --git a/epclust/R/de_serialize.R b/epclust/R/de_serialize.R
index b6684d2..fd3a5db 100644
--- a/epclust/R/de_serialize.R
+++ b/epclust/R/de_serialize.R
@@ -44,8 +44,8 @@ binarize = function(data_ascii, data_bin_file, nb_per_chunk,
 	{
 		#number of items always on 8 bytes
 		writeBin(0L, data_bin, size=8, endian=endian)
-		if ( is_matrix )
-			data_length = ncol(data_ascii)
+		if (is_matrix)
+			data_length = nrow(data_ascii)
 		else #connection
 		{
 			data_line = scan(data_ascii, double(), sep=sep, nlines=1, quiet=TRUE)
@@ -58,11 +58,11 @@ binarize = function(data_ascii, data_bin_file, nb_per_chunk,
 		index = 1
 	repeat
 	{
-		if ( is_matrix )
+		if (is_matrix)
 		{
 			data_chunk =
-				if (index <= nrow(data_ascii))
-					as.double(t(data_ascii[index:min(nrow(data_ascii),index+nb_per_chunk-1),]))
+				if (index <= ncol(data_ascii))
+					as.double(data_ascii[,index:min(ncol(data_ascii),index+nb_per_chunk-1)])
 				else
 					double(0)
 			index = index + nb_per_chunk
@@ -113,14 +113,13 @@ getDataInFile = function(indices, data_bin_file, nbytes=4, endian=.Platform$endi
 	data_bin = file(data_bin_file, "rb")
 	data_size = file.info(data_bin_file)$size
 	data_length = readBin(data_bin, "integer", n=1, size=8, endian=endian)
-	#Ou t(sapply(...)) (+ rapide ?)
-	data_ascii = do.call( rbind, lapply( indices, function(i) {
+	data_ascii = do.call( cbind, lapply( indices, function(i) {
 		offset = 8+(i-1)*data_length*nbytes
 		if (offset > data_size)
-			return (vector("double",0))
+			return (NULL)
 		ignored = seek(data_bin, offset)
 		readBin(data_bin, "double", n=data_length, size=nbytes, endian=endian)
 	} ) )
 	close(data_bin)
-	if (ncol(data_ascii)>0) data_ascii else NULL
+	data_ascii
 }