[Genabel-commits] r2066 - in pkg/DatABEL: R inst/unitTests

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

Author: lckarssen
Date: 2017-03-08 15:52:47 +0100 (Wed, 08 Mar 2017)
New Revision: 2066

Modified:
   pkg/DatABEL/R/text2databel.R
   pkg/DatABEL/inst/unitTests/mytest_iterator.R
Log:
Fix function call syntax in DatABEL at Kurt Hornik's request

Some functions used .Call(... package="DatABEL") instead of .Call(...
PACKAGE="DatABEL"). This commit fixes those occurrences. This was
requested by Kurt Hornik from CRAN via e-mail.




Modified: pkg/DatABEL/R/text2databel.R
===================================================================
--- pkg/DatABEL/R/text2databel.R	2017-03-08 10:15:39 UTC (rev 2065)
+++ pkg/DatABEL/R/text2databel.R	2017-03-08 14:52:47 UTC (rev 2066)
@@ -187,7 +187,7 @@
                              transpose, R_matrix, intype))
     #print(charnames)
     #print(intnames)
-    tmp <- .Call("text2fvf_R", charnames, intnames, package="DatABEL")
+    tmp <- .Call("text2fvf_R", charnames, intnames, PACKAGE="DatABEL")
 
     if (unlinkTmpTransposeFiles==TRUE) {
         unlink(paste0(outfile, "_fvtmp.fvi"))

Modified: pkg/DatABEL/inst/unitTests/mytest_iterator.R
===================================================================
--- pkg/DatABEL/inst/unitTests/mytest_iterator.R	2017-03-08 10:15:39 UTC (rev 2065)
+++ pkg/DatABEL/inst/unitTests/mytest_iterator.R	2017-03-08 14:52:47 UTC (rev 2066)
@@ -13,7 +13,7 @@
 	
 		if (FUN == "sum" || FUN == "prod") {
 			out <- .Call("iterator", testdata at data, as.integer(0), as.integer(0), as.character(FUN), 
-						as.character(OUT), as.integer(MAR), as.integer(0), package="DatABEL")
+						as.character(OUT), as.integer(MAR), as.integer(0), PACKAGE="DatABEL")
 			return(out)
 		}
 		
@@ -22,7 +22,7 @@
 				stop("Exponent should be a numeric value")
 			out <- .Call("iterator", testdata at data, as.integer(0), as.integer(0), as.character(FUN),
 						as.character(OUT), as.integer(MAR), as.integer(1), as.double(POW), 
-						package="DatABEL")
+						PACKAGE="DatABEL")
 			return(out)
 		}
 	
@@ -34,7 +34,7 @@
 		if (FUN == "sum" || FUN == "prod") {
 			out <- .Call("iterator", as.raw(testdata at gtdata@gtps), as.integer(nids), as.integer(nsnps),
 						as.character(FUN), as.character(OUT), as.integer(MAR), as.integer(0), 
-						package="DatABEL")
+						PACKAGE="DatABEL")
 			return(out)
 		}
 		
@@ -43,7 +43,7 @@
 				stop("Exponent should be a numeric value")
 			out <- .Call("iterator", as.raw(testdata at gtdata@gtps), as.integer(nids), as.integer(nsnps),
 						as.character(FUN), as.character(OUT), as.integer(MAR), as.integer(1),
-						as.double(POW), package="DatABEL")
+						as.double(POW), PACKAGE="DatABEL")
 			return(out)
 		}