[Genabel-commits] r1129 - in pkg/DatABEL: . R

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

Author: lckarssen
Date: 2013-03-12 00:21:57 +0100 (Tue, 12 Mar 2013)
New Revision: 1129

Modified:
   pkg/DatABEL/DESCRIPTION
   pkg/DatABEL/R/apply2dfo.R
   pkg/DatABEL/R/matrix2databel.R
Log:
Fixed warnings when running R CMD check/build on DatABEL. Related to the commits in SVN r.1122. 


Modified: pkg/DatABEL/DESCRIPTION
===================================================================
--- pkg/DatABEL/DESCRIPTION	2013-03-11 15:25:47 UTC (rev 1128)
+++ pkg/DatABEL/DESCRIPTION	2013-03-11 23:21:57 UTC (rev 1129)
@@ -6,7 +6,7 @@
 Author: Yurii Aulchenko, Stepan Yakovenko, Erik Roos, Marcel Kempenaar
 Maintainer: Yurii Aulchenko <yurii.aulchenko at gmail.com>
 Depends: R (>= 2.4.0), methods
-Suggests: GenABEL
+Suggests: GenABEL, RUnit
 Description: a package providing an interface to the C++ FILEVECTOR
  library facilitating analysis of large (giga- to tera-bytes) matrices;
  matrix storage is organized in a way that either columns or rows are

Modified: pkg/DatABEL/R/apply2dfo.R
===================================================================
--- pkg/DatABEL/R/apply2dfo.R	2013-03-11 15:25:47 UTC (rev 1128)
+++ pkg/DatABEL/R/apply2dfo.R	2013-03-11 23:21:57 UTC (rev 1129)
@@ -103,9 +103,17 @@
 		if (missing(outfile)) stop("outfile argument must be provided with outcalss=='databel'")
 		# no good -- fast access in wrong direction
 		if (transpose)
-			res <- make_empty_fvf(outfile,nvar=dimout[2],nobs=(dimout[1])*(dim(dfodata)[MAR]),type=type, readonly=FALSE)
+			res <- make_empty_fvf(outfile,
+                                              nvariables=dimout[2],
+                                              nobservations=(dimout[1])*(dim(dfodata)[MAR]),
+                                              type=type,
+                                              readonly=FALSE)
 		else 
-			res <- make_empty_fvf(outfile,nobs=dimout[2],nvar=(dimout[1])*(dim(dfodata)[MAR]),type=type, readonly=FALSE)
+			res <- make_empty_fvf(outfile,
+                                              nobservations=dimout[2],
+                                              nvariables=(dimout[1])*(dim(dfodata)[MAR]),
+                                              type=type,
+                                              readonly=FALSE)
 	}
 	else stop("outclass must be 'matrix' or 'databel'")
 #print(c("aaA",dim(res),class(res)))

Modified: pkg/DatABEL/R/matrix2databel.R
===================================================================
--- pkg/DatABEL/R/matrix2databel.R	2013-03-11 15:25:47 UTC (rev 1128)
+++ pkg/DatABEL/R/matrix2databel.R	2013-03-11 23:21:57 UTC (rev 1129)
@@ -18,8 +18,12 @@
 
 matrix2databel <- function(from, filename, cachesizeMb = 64, type = "DOUBLE", readonly = FALSE) {
 # a bit dirty
-	to <- make_empty_fvf(as.character(filename),nvar=dim(from)[2],nobs=dim(from)[1],
-			type=type,readonly=FALSE,cachesizeMb=cachesizeMb)
+	to <- make_empty_fvf(as.character(filename),
+                             nvariables=dim(from)[2],
+                             nobservations=dim(from)[1],
+                             type=type,
+                             readonly=FALSE,
+                             cachesizeMb=cachesizeMb)
 	to[] <- from
 	matrix_dimnames <- dimnames(from)
 	if (!is.null(matrix_dimnames)) set_dimnames(to) <- matrix_dimnames