[R-gregmisc-users] SF.net SVN: r-gregmisc:[1992] trunk/gdata/tests
Brought to you by:
warnes
Menu
▾
▴
[R-gregmisc-users] SF.net SVN: r-gregmisc:[1992] trunk/gdata/tests
|
From: <wa...@us...> - 2015-04-29 03:30:12
|
Revision: 1992
http://sourceforge.net/p/r-gregmisc/code/1992
Author: warnes
Date: 2015-04-29 03:30:10 +0000 (Wed, 29 Apr 2015)
Log Message:
-----------
Apparentely read.csv() needs different combination of "fileEncoding=`latin1`" and "encoding=`latin1`" on unix and windows platforms.
Modified Paths:
--------------
trunk/gdata/tests/test.humanReadable.Rout.save
trunk/gdata/tests/test.read.xls.R
trunk/gdata/tests/test.read.xls.Rout.save
trunk/gdata/tests/test.reorder.factor.Rout.save
trunk/gdata/tests/tests.write.fwf.Rout.save
Modified: trunk/gdata/tests/test.humanReadable.Rout.save
===================================================================
--- trunk/gdata/tests/test.humanReadable.Rout.save 2015-04-29 03:27:50 UTC (rev 1991)
+++ trunk/gdata/tests/test.humanReadable.Rout.save 2015-04-29 03:30:10 UTC (rev 1992)
@@ -235,4 +235,4 @@
>
> proc.time()
user system elapsed
- 0.392 0.049 0.433
+ 0.390 0.049 0.431
Modified: trunk/gdata/tests/test.read.xls.R
===================================================================
--- trunk/gdata/tests/test.read.xls.R 2015-04-29 03:27:50 UTC (rev 1991)
+++ trunk/gdata/tests/test.read.xls.R 2015-04-29 03:30:10 UTC (rev 1992)
@@ -96,19 +96,33 @@
latin1File <- file.path(path.package('gdata'),'xls', 'latin-1.xls' )
latin1FileX <- file.path(path.package('gdata'),'xls', 'latin-1.xlsx')
-example.latin1 <- read.xls(latin1File, fileEncoding='latin1')
-charTab <- function(x) {
- x <- as.matrix(x)
- x <- x[!is.na(x)]
- table( nchar(x, 'bytes' ) )
-}
-charTab(example.latin1)
+if(.Platform$OS.type=="unix")
+ {
+ example.latin1 <- read.xls(latin1File,
+ fileEncoding='latin1',
+ encoding='latin1',
+ stringsAsFactors=FALSE)
+ } else {
+ example.latin1 <- read.xls(latin1File,
+ #fileEncoding='latin1',
+ encoding='latin1',
+ stringsAsFactors=FALSE)
+ }
-
if( 'XLSX' %in% xlsFormats() )
{
- example.latin1.x <- read.xls(latin1FileX, fileEncoding='latin1')
- charTab(example.latin1)
+ if(.Platform$OS.type=="unix")
+ {
+ example.latin1.x <- read.xls(latin1FileX,
+ fileEncoding='latin1',
+ encoding='latin1',
+ stringsAsFactors=FALSE)
+ } else {
+ example.latin1.x <- read.xls(latin1FileX,
+ #fileEncoding='latin1',
+ encoding='latin1',
+ stringsAsFactors=FALSE)
+ }
} else {
cat("************************************************************\n")
cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
Modified: trunk/gdata/tests/test.read.xls.Rout.save
===================================================================
--- trunk/gdata/tests/test.read.xls.Rout.save 2015-04-29 03:27:50 UTC (rev 1991)
+++ trunk/gdata/tests/test.read.xls.Rout.save 2015-04-29 03:30:10 UTC (rev 1992)
@@ -710,31 +710,39 @@
> latin1File <- file.path(path.package('gdata'),'xls', 'latin-1.xls' )
> latin1FileX <- file.path(path.package('gdata'),'xls', 'latin-1.xlsx')
>
-> example.latin1 <- read.xls(latin1File, fileEncoding='latin1')
-> charTab <- function(x) {
-+ x <- as.matrix(x)
-+ x <- x[!is.na(x)]
-+ table( nchar(x, 'bytes' ) )
-+ }
-> charTab(example.latin1)
-
- 4 5 6 7 14 15 16 17 19 21 22 23 24 25 27 29 30 31 32 34
-64 11 17 32 1 4 1 5 1 1 11 2 11 1 5 5 1 1 6 6
+> if(.Platform$OS.type=="unix")
++ {
++ example.latin1 <- read.xls(latin1File,
++ fileEncoding='latin1',
++ encoding='latin1',
++ stringsAsFactors=FALSE)
++ } else {
++ example.latin1 <- read.xls(latin1File,
++ #fileEncoding='latin1',
++ encoding='latin1',
++ stringsAsFactors=FALSE)
++ }
>
->
> if( 'XLSX' %in% xlsFormats() )
+ {
-+ example.latin1.x <- read.xls(latin1FileX, fileEncoding='latin1')
-+ charTab(example.latin1)
++ if(.Platform$OS.type=="unix")
++ {
++ example.latin1.x <- read.xls(latin1FileX,
++ fileEncoding='latin1',
++ encoding='latin1',
++ stringsAsFactors=FALSE)
++ } else {
++ example.latin1.x <- read.xls(latin1FileX,
++ #fileEncoding='latin1',
++ encoding='latin1',
++ stringsAsFactors=FALSE)
++ }
+ } else {
+ cat("************************************************************\n")
+ cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
+ cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
+ cat("************************************************************\n")
+ }
-
- 4 5 6 7 14 15 16 17 19 21 22 23 24 25 27 29 30 31 32 34
-64 11 17 32 1 4 1 5 1 1 11 2 11 1 5 5 1 1 6 6
>
>
> ## Check handling of very wide file
@@ -875,4 +883,4 @@
>
> proc.time()
user system elapsed
- 13.230 0.833 14.261
+ 13.275 0.831 14.313
Modified: trunk/gdata/tests/test.reorder.factor.Rout.save
===================================================================
--- trunk/gdata/tests/test.reorder.factor.Rout.save 2015-04-29 03:27:50 UTC (rev 1991)
+++ trunk/gdata/tests/test.reorder.factor.Rout.save 2015-04-29 03:30:10 UTC (rev 1992)
@@ -53,4 +53,4 @@
>
> proc.time()
user system elapsed
- 0.331 0.045 0.368
+ 0.338 0.050 0.380
Modified: trunk/gdata/tests/tests.write.fwf.Rout.save
===================================================================
--- trunk/gdata/tests/tests.write.fwf.Rout.save 2015-04-29 03:27:50 UTC (rev 1991)
+++ trunk/gdata/tests/tests.write.fwf.Rout.save 2015-04-29 03:30:10 UTC (rev 1992)
@@ -231,4 +231,4 @@
>
> proc.time()
user system elapsed
- 0.425 0.047 0.462
+ 0.423 0.048 0.462
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
