code seems OK; still wavelets test to write

[epclust.git] / epclust / R / de_serialize.R

diff --git a/epclust/R/de_serialize.R b/epclust/R/de_serialize.R
index 5a9dd1f..a49990b 100644 (file)
--- a/epclust/R/de_serialize.R
+++ b/epclust/R/de_serialize.R
@@ -120,7 +120,7 @@ binarizeTransform = function(getData, transform, data_bin_file, nb_per_chunk,
                binarize(transformed_chunk, data_bin_file, nb_per_chunk, ",", nbytes, endian)
 
                index = index + nb_per_chunk
-               nb_items = nb_items + nrow(data_chunk)
+               nb_items = nb_items + ncol(data_chunk)
        }
        nb_items #number of transformed items
 }
@@ -139,7 +139,7 @@ getDataInFile = function(indices, data_bin_file, nbytes=4, endian=.Platform$endi
        # to compute the offset ( index i at 8 + i*data_length*nbytes )
        data_ascii = do.call( cbind, lapply( indices, function(i) {
                offset = 8+(i-1)*data_length*nbytes
-               if (offset > data_size)
+               if (offset >= data_size)
                        return (NULL)
                ignored = seek(data_bin, offset) #position cursor at computed offset
                readBin(data_bin, "double", n=data_length, size=nbytes, endian=endian)