[Genabel-commits] r801 - pkg/DatABEL/R

[noreply at r-forge.r-project.org]

Author: yurii
Date: 2011-11-11 17:14:36 +0100 (Fri, 11 Nov 2011)
New Revision: 801

Modified:
   pkg/DatABEL/R/DatABEL-package.R
   pkg/DatABEL/R/databel2matrix.R
Log:
fix the check for limits; some minor doc addition

Modified: pkg/DatABEL/R/DatABEL-package.R
===================================================================
--- pkg/DatABEL/R/DatABEL-package.R	2011-10-20 16:26:09 UTC (rev 800)
+++ pkg/DatABEL/R/DatABEL-package.R	2011-11-11 16:14:36 UTC (rev 801)
@@ -15,6 +15,8 @@
 #' \code{\link{text2databel}},
 #' \code{\linkS4class{databel}}
 #' 
+#' @aliases DatABEL-package DatABEL
+#' 
 #' @author Yurii Aulchenko (R code), Stepan Yakovenko (R and C++ code), Andrey Chernyh (C++ code)
 #' 
 

Modified: pkg/DatABEL/R/databel2matrix.R
===================================================================
--- pkg/DatABEL/R/databel2matrix.R	2011-10-20 16:26:09 UTC (rev 800)
+++ pkg/DatABEL/R/databel2matrix.R	2011-11-11 16:14:36 UTC (rev 801)
@@ -17,7 +17,7 @@
     newi <- convert_intlogcha_index_to_int(rows,from,1)
     newj <- convert_intlogcha_index_to_int(cols,from,2)
 
-    if (newi * newj > (2^31 -1))
+    if (length(newi) * length(newj) > (2^31 -1))
       stop("The matrix has too many elements for R, see ?'Memory-limits'.")
 
     ret <- matrix(1.2345678912345, length(newi),length(newj));