Thread: [R-gregmisc-users] SF.net SVN: r-gregmisc:[1405] trunk/gdata/tests
Brought to you by:
warnes
Menu
▾
▴
r-gregmisc-users
|
From: <wa...@us...> - 2010-01-24 19:12:20
|
Revision: 1405
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1405&view=rev
Author: warnes
Date: 2010-01-24 19:12:07 +0000 (Sun, 24 Jan 2010)
Log Message:
-----------
Add tests for read.xls, sheetCount, and sheetNames
Added Paths:
-----------
trunk/gdata/tests/test.read.xls.R
trunk/gdata/tests/test.read.xls.Rout.save
Added: trunk/gdata/tests/test.read.xls.R
===================================================================
--- trunk/gdata/tests/test.read.xls.R (rev 0)
+++ trunk/gdata/tests/test.read.xls.R 2010-01-24 19:12:07 UTC (rev 1405)
@@ -0,0 +1,61 @@
+library(gdata)
+
+
+# iris.xls is included in the gregmisc package for use as an example
+xlsfile <- file.path(.path.package('gdata'),'xls','iris.xls')
+
+iris.1 <- read.xls(xlsfile) # defaults to csv format
+iris.1
+
+iris.2 <- read.xls(xlsfile,method="csv") # specify csv format
+iris.2
+
+iris.3 <- read.xls(xlsfile,method="tab") # specify tab format
+iris.3
+
+stopifnot(all.equal(iris.1, iris.2))
+stopifnot(all.equal(iris.1, iris.3))
+
+exampleFile <- file.path(.path.package('gdata'),'xls',
+ 'ExampleExcelFile.xls')
+
+exampleFile2007 <- file.path(.path.package('gdata'),'xls',
+ 'ExampleExcelFile.xlsx')
+
+# see the number and names of sheets:
+sheetCount(exampleFile)
+sheetCount(exampleFile2007)
+
+sheetNames(exampleFile)
+sheetNames(exampleFile2007)
+
+example.1 <- read.xls(exampleFile, sheet=1) # default is first worksheet
+example.1
+
+example.2 <- read.xls(exampleFile, sheet=2) # second worksheet by number
+example.2
+
+example.3 <- read.xls(exampleFile, sheet=3) # second worksheet by number
+example.3
+
+example.4 <- read.xls(exampleFile, sheet=3) # second worksheet by number
+example.4
+
+example.x.1 <- read.xls(exampleFile2007, sheet=1) # default is first worksheet
+example.x.1
+
+example.x.2 <- read.xls(exampleFile2007, sheet=2) # second worksheet by number
+example.x.2
+
+example.x.3 <- read.xls(exampleFile2007, sheet=3) # second worksheet by number
+example.x.3
+
+example.x.4 <- read.xls(exampleFile2007, sheet=3) # second worksheet by number
+example.x.4
+
+data <- read.xls(exampleFile2007, sheet="Sheet Second") # and by name
+data
+
+# load the third worksheet, skipping the first two non-data lines...
+data <- read.xls(exampleFile2007, sheet="Sheet with initial text", skip=2)
+data
Added: trunk/gdata/tests/test.read.xls.Rout.save
===================================================================
--- trunk/gdata/tests/test.read.xls.Rout.save (rev 0)
+++ trunk/gdata/tests/test.read.xls.Rout.save 2010-01-24 19:12:07 UTC (rev 1405)
@@ -0,0 +1,627 @@
+
+R version 2.10.1 (2009-12-14)
+Copyright (C) 2009 The R Foundation for Statistical Computing
+ISBN 3-900051-07-0
+
+R is free software and comes with ABSOLUTELY NO WARRANTY.
+You are welcome to redistribute it under certain conditions.
+Type 'license()' or 'licence()' for distribution details.
+
+ Natural language support but running in an English locale
+
+R is a collaborative project with many contributors.
+Type 'contributors()' for more information and
+'citation()' on how to cite R or R packages in publications.
+
+Type 'demo()' for some demos, 'help()' for on-line help, or
+'help.start()' for an HTML browser interface to help.
+Type 'q()' to quit R.
+
+> library(gdata)
+
+Attaching package: 'gdata'
+
+
+ The following object(s) are masked from package:utils :
+
+ object.size
+
+>
+>
+> # iris.xls is included in the gregmisc package for use as an example
+> xlsfile <- file.path(.path.package('gdata'),'xls','iris.xls')
+>
+> iris.1 <- read.xls(xlsfile) # defaults to csv format
+> iris.1
+ Sepal.Length Sepal.Width Petal.Length Petal.Width Species
+1 5.1 3.5 1.4 0.2 setosa
+2 4.9 3.0 1.4 0.2 setosa
+3 4.7 3.2 1.3 0.2 setosa
+4 4.6 3.1 1.5 0.2 setosa
+5 5.0 3.6 1.4 0.2 setosa
+6 5.4 3.9 1.7 0.4 setosa
+7 4.6 3.4 1.4 0.3 setosa
+8 5.0 3.4 1.5 0.2 setosa
+9 4.4 2.9 1.4 0.2 setosa
+10 4.9 3.1 1.5 0.1 setosa
+11 5.4 3.7 1.5 0.2 setosa
+12 4.8 3.4 1.6 0.2 setosa
+13 4.8 3.0 1.4 0.1 setosa
+14 4.3 3.0 1.1 0.1 setosa
+15 5.8 4.0 1.2 0.2 setosa
+16 5.7 4.4 1.5 0.4 setosa
+17 5.4 3.9 1.3 0.4 setosa
+18 5.1 3.5 1.4 0.3 setosa
+19 5.7 3.8 1.7 0.3 setosa
+20 5.1 3.8 1.5 0.3 setosa
+21 5.4 3.4 1.7 0.2 setosa
+22 5.1 3.7 1.5 0.4 setosa
+23 4.6 3.6 1.0 0.2 setosa
+24 5.1 3.3 1.7 0.5 setosa
+25 4.8 3.4 1.9 0.2 setosa
+26 5.0 3.0 1.6 0.2 setosa
+27 5.0 3.4 1.6 0.4 setosa
+28 5.2 3.5 1.5 0.2 setosa
+29 5.2 3.4 1.4 0.2 setosa
+30 4.7 3.2 1.6 0.2 setosa
+31 4.8 3.1 1.6 0.2 setosa
+32 5.4 3.4 1.5 0.4 setosa
+33 5.2 4.1 1.5 0.1 setosa
+34 5.5 4.2 1.4 0.2 setosa
+35 4.9 3.1 1.5 0.2 setosa
+36 5.0 3.2 1.2 0.2 setosa
+37 5.5 3.5 1.3 0.2 setosa
+38 4.9 3.6 1.4 0.1 setosa
+39 4.4 3.0 1.3 0.2 setosa
+40 5.1 3.4 1.5 0.2 setosa
+41 5.0 3.5 1.3 0.3 setosa
+42 4.5 2.3 1.3 0.3 setosa
+43 4.4 3.2 1.3 0.2 setosa
+44 5.0 3.5 1.6 0.6 setosa
+45 5.1 3.8 1.9 0.4 setosa
+46 4.8 3.0 1.4 0.3 setosa
+47 5.1 3.8 1.6 0.2 setosa
+48 4.6 3.2 1.4 0.2 setosa
+49 5.3 3.7 1.5 0.2 setosa
+50 5.0 3.3 1.4 0.2 setosa
+51 7.0 3.2 4.7 1.4 versicolor
+52 6.4 3.2 4.5 1.5 versicolor
+53 6.9 3.1 4.9 1.5 versicolor
+54 5.5 2.3 4.0 1.3 versicolor
+55 6.5 2.8 4.6 1.5 versicolor
+56 5.7 2.8 4.5 1.3 versicolor
+57 6.3 3.3 4.7 1.6 versicolor
+58 4.9 2.4 3.3 1.0 versicolor
+59 6.6 2.9 4.6 1.3 versicolor
+60 5.2 2.7 3.9 1.4 versicolor
+61 5.0 2.0 3.5 1.0 versicolor
+62 5.9 3.0 4.2 1.5 versicolor
+63 6.0 2.2 4.0 1.0 versicolor
+64 6.1 2.9 4.7 1.4 versicolor
+65 5.6 2.9 3.6 1.3 versicolor
+66 6.7 3.1 4.4 1.4 versicolor
+67 5.6 3.0 4.5 1.5 versicolor
+68 5.8 2.7 4.1 1.0 versicolor
+69 6.2 2.2 4.5 1.5 versicolor
+70 5.6 2.5 3.9 1.1 versicolor
+71 5.9 3.2 4.8 1.8 versicolor
+72 6.1 2.8 4.0 1.3 versicolor
+73 6.3 2.5 4.9 1.5 versicolor
+74 6.1 2.8 4.7 1.2 versicolor
+75 6.4 2.9 4.3 1.3 versicolor
+76 6.6 3.0 4.4 1.4 versicolor
+77 6.8 2.8 4.8 1.4 versicolor
+78 6.7 3.0 5.0 1.7 versicolor
+79 6.0 2.9 4.5 1.5 versicolor
+80 5.7 2.6 3.5 1.0 versicolor
+81 5.5 2.4 3.8 1.1 versicolor
+82 5.5 2.4 3.7 1.0 versicolor
+83 5.8 2.7 3.9 1.2 versicolor
+84 6.0 2.7 5.1 1.6 versicolor
+85 5.4 3.0 4.5 1.5 versicolor
+86 6.0 3.4 4.5 1.6 versicolor
+87 6.7 3.1 4.7 1.5 versicolor
+88 6.3 2.3 4.4 1.3 versicolor
+89 5.6 3.0 4.1 1.3 versicolor
+90 5.5 2.5 4.0 1.3 versicolor
+91 5.5 2.6 4.4 1.2 versicolor
+92 6.1 3.0 4.6 1.4 versicolor
+93 5.8 2.6 4.0 1.2 versicolor
+94 5.0 2.3 3.3 1.0 versicolor
+95 5.6 2.7 4.2 1.3 versicolor
+96 5.7 3.0 4.2 1.2 versicolor
+97 5.7 2.9 4.2 1.3 versicolor
+98 6.2 2.9 4.3 1.3 versicolor
+99 5.1 2.5 3.0 1.1 versicolor
+100 5.7 2.8 4.1 1.3 versicolor
+101 6.3 3.3 6.0 2.5 virginica
+102 5.8 2.7 5.1 1.9 virginica
+103 7.1 3.0 5.9 2.1 virginica
+104 6.3 2.9 5.6 1.8 virginica
+105 6.5 3.0 5.8 2.2 virginica
+106 7.6 3.0 6.6 2.1 virginica
+107 4.9 2.5 4.5 1.7 virginica
+108 7.3 2.9 6.3 1.8 virginica
+109 6.7 2.5 5.8 1.8 virginica
+110 7.2 3.6 6.1 2.5 virginica
+111 6.5 3.2 5.1 2.0 virginica
+112 6.4 2.7 5.3 1.9 virginica
+113 6.8 3.0 5.5 2.1 virginica
+114 5.7 2.5 5.0 2.0 virginica
+115 5.8 2.8 5.1 2.4 virginica
+116 6.4 3.2 5.3 2.3 virginica
+117 6.5 3.0 5.5 1.8 virginica
+118 7.7 3.8 6.7 2.2 virginica
+119 7.7 2.6 6.9 2.3 virginica
+120 6.0 2.2 5.0 1.5 virginica
+121 6.9 3.2 5.7 2.3 virginica
+122 5.6 2.8 4.9 2.0 virginica
+123 7.7 2.8 6.7 2.0 virginica
+124 6.3 2.7 4.9 1.8 virginica
+125 6.7 3.3 5.7 2.1 virginica
+126 7.2 3.2 6.0 1.8 virginica
+127 6.2 2.8 4.8 1.8 virginica
+128 6.1 3.0 4.9 1.8 virginica
+129 6.4 2.8 5.6 2.1 virginica
+130 7.2 3.0 5.8 1.6 virginica
+131 7.4 2.8 6.1 1.9 virginica
+132 7.9 3.8 6.4 2.0 virginica
+133 6.4 2.8 5.6 2.2 virginica
+134 6.3 2.8 5.1 1.5 virginica
+135 6.1 2.6 5.6 1.4 virginica
+136 7.7 3.0 6.1 2.3 virginica
+137 6.3 3.4 5.6 2.4 virginica
+138 6.4 3.1 5.5 1.8 virginica
+139 6.0 3.0 4.8 1.8 virginica
+140 6.9 3.1 5.4 2.1 virginica
+141 6.7 3.1 5.6 2.4 virginica
+142 6.9 3.1 5.1 2.3 virginica
+143 5.8 2.7 5.1 1.9 virginica
+144 6.8 3.2 5.9 2.3 virginica
+145 6.7 3.3 5.7 2.5 virginica
+146 6.7 3.0 5.2 2.3 virginica
+147 6.3 2.5 5.0 1.9 virginica
+148 6.5 3.0 5.2 2.0 virginica
+149 6.2 3.4 5.4 2.3 virginica
+150 5.9 3.0 5.1 1.8 virginica
+>
+> iris.2 <- read.xls(xlsfile,method="csv") # specify csv format
+> iris.2
+ Sepal.Length Sepal.Width Petal.Length Petal.Width Species
+1 5.1 3.5 1.4 0.2 setosa
+2 4.9 3.0 1.4 0.2 setosa
+3 4.7 3.2 1.3 0.2 setosa
+4 4.6 3.1 1.5 0.2 setosa
+5 5.0 3.6 1.4 0.2 setosa
+6 5.4 3.9 1.7 0.4 setosa
+7 4.6 3.4 1.4 0.3 setosa
+8 5.0 3.4 1.5 0.2 setosa
+9 4.4 2.9 1.4 0.2 setosa
+10 4.9 3.1 1.5 0.1 setosa
+11 5.4 3.7 1.5 0.2 setosa
+12 4.8 3.4 1.6 0.2 setosa
+13 4.8 3.0 1.4 0.1 setosa
+14 4.3 3.0 1.1 0.1 setosa
+15 5.8 4.0 1.2 0.2 setosa
+16 5.7 4.4 1.5 0.4 setosa
+17 5.4 3.9 1.3 0.4 setosa
+18 5.1 3.5 1.4 0.3 setosa
+19 5.7 3.8 1.7 0.3 setosa
+20 5.1 3.8 1.5 0.3 setosa
+21 5.4 3.4 1.7 0.2 setosa
+22 5.1 3.7 1.5 0.4 setosa
+23 4.6 3.6 1.0 0.2 setosa
+24 5.1 3.3 1.7 0.5 setosa
+25 4.8 3.4 1.9 0.2 setosa
+26 5.0 3.0 1.6 0.2 setosa
+27 5.0 3.4 1.6 0.4 setosa
+28 5.2 3.5 1.5 0.2 setosa
+29 5.2 3.4 1.4 0.2 setosa
+30 4.7 3.2 1.6 0.2 setosa
+31 4.8 3.1 1.6 0.2 setosa
+32 5.4 3.4 1.5 0.4 setosa
+33 5.2 4.1 1.5 0.1 setosa
+34 5.5 4.2 1.4 0.2 setosa
+35 4.9 3.1 1.5 0.2 setosa
+36 5.0 3.2 1.2 0.2 setosa
+37 5.5 3.5 1.3 0.2 setosa
+38 4.9 3.6 1.4 0.1 setosa
+39 4.4 3.0 1.3 0.2 setosa
+40 5.1 3.4 1.5 0.2 setosa
+41 5.0 3.5 1.3 0.3 setosa
+42 4.5 2.3 1.3 0.3 setosa
+43 4.4 3.2 1.3 0.2 setosa
+44 5.0 3.5 1.6 0.6 setosa
+45 5.1 3.8 1.9 0.4 setosa
+46 4.8 3.0 1.4 0.3 setosa
+47 5.1 3.8 1.6 0.2 setosa
+48 4.6 3.2 1.4 0.2 setosa
+49 5.3 3.7 1.5 0.2 setosa
+50 5.0 3.3 1.4 0.2 setosa
+51 7.0 3.2 4.7 1.4 versicolor
+52 6.4 3.2 4.5 1.5 versicolor
+53 6.9 3.1 4.9 1.5 versicolor
+54 5.5 2.3 4.0 1.3 versicolor
+55 6.5 2.8 4.6 1.5 versicolor
+56 5.7 2.8 4.5 1.3 versicolor
+57 6.3 3.3 4.7 1.6 versicolor
+58 4.9 2.4 3.3 1.0 versicolor
+59 6.6 2.9 4.6 1.3 versicolor
+60 5.2 2.7 3.9 1.4 versicolor
+61 5.0 2.0 3.5 1.0 versicolor
+62 5.9 3.0 4.2 1.5 versicolor
+63 6.0 2.2 4.0 1.0 versicolor
+64 6.1 2.9 4.7 1.4 versicolor
+65 5.6 2.9 3.6 1.3 versicolor
+66 6.7 3.1 4.4 1.4 versicolor
+67 5.6 3.0 4.5 1.5 versicolor
+68 5.8 2.7 4.1 1.0 versicolor
+69 6.2 2.2 4.5 1.5 versicolor
+70 5.6 2.5 3.9 1.1 versicolor
+71 5.9 3.2 4.8 1.8 versicolor
+72 6.1 2.8 4.0 1.3 versicolor
+73 6.3 2.5 4.9 1.5 versicolor
+74 6.1 2.8 4.7 1.2 versicolor
+75 6.4 2.9 4.3 1.3 versicolor
+76 6.6 3.0 4.4 1.4 versicolor
+77 6.8 2.8 4.8 1.4 versicolor
+78 6.7 3.0 5.0 1.7 versicolor
+79 6.0 2.9 4.5 1.5 versicolor
+80 5.7 2.6 3.5 1.0 versicolor
+81 5.5 2.4 3.8 1.1 versicolor
+82 5.5 2.4 3.7 1.0 versicolor
+83 5.8 2.7 3.9 1.2 versicolor
+84 6.0 2.7 5.1 1.6 versicolor
+85 5.4 3.0 4.5 1.5 versicolor
+86 6.0 3.4 4.5 1.6 versicolor
+87 6.7 3.1 4.7 1.5 versicolor
+88 6.3 2.3 4.4 1.3 versicolor
+89 5.6 3.0 4.1 1.3 versicolor
+90 5.5 2.5 4.0 1.3 versicolor
+91 5.5 2.6 4.4 1.2 versicolor
+92 6.1 3.0 4.6 1.4 versicolor
+93 5.8 2.6 4.0 1.2 versicolor
+94 5.0 2.3 3.3 1.0 versicolor
+95 5.6 2.7 4.2 1.3 versicolor
+96 5.7 3.0 4.2 1.2 versicolor
+97 5.7 2.9 4.2 1.3 versicolor
+98 6.2 2.9 4.3 1.3 versicolor
+99 5.1 2.5 3.0 1.1 versicolor
+100 5.7 2.8 4.1 1.3 versicolor
+101 6.3 3.3 6.0 2.5 virginica
+102 5.8 2.7 5.1 1.9 virginica
+103 7.1 3.0 5.9 2.1 virginica
+104 6.3 2.9 5.6 1.8 virginica
+105 6.5 3.0 5.8 2.2 virginica
+106 7.6 3.0 6.6 2.1 virginica
+107 4.9 2.5 4.5 1.7 virginica
+108 7.3 2.9 6.3 1.8 virginica
+109 6.7 2.5 5.8 1.8 virginica
+110 7.2 3.6 6.1 2.5 virginica
+111 6.5 3.2 5.1 2.0 virginica
+112 6.4 2.7 5.3 1.9 virginica
+113 6.8 3.0 5.5 2.1 virginica
+114 5.7 2.5 5.0 2.0 virginica
+115 5.8 2.8 5.1 2.4 virginica
+116 6.4 3.2 5.3 2.3 virginica
+117 6.5 3.0 5.5 1.8 virginica
+118 7.7 3.8 6.7 2.2 virginica
+119 7.7 2.6 6.9 2.3 virginica
+120 6.0 2.2 5.0 1.5 virginica
+121 6.9 3.2 5.7 2.3 virginica
+122 5.6 2.8 4.9 2.0 virginica
+123 7.7 2.8 6.7 2.0 virginica
+124 6.3 2.7 4.9 1.8 virginica
+125 6.7 3.3 5.7 2.1 virginica
+126 7.2 3.2 6.0 1.8 virginica
+127 6.2 2.8 4.8 1.8 virginica
+128 6.1 3.0 4.9 1.8 virginica
+129 6.4 2.8 5.6 2.1 virginica
+130 7.2 3.0 5.8 1.6 virginica
+131 7.4 2.8 6.1 1.9 virginica
+132 7.9 3.8 6.4 2.0 virginica
+133 6.4 2.8 5.6 2.2 virginica
+134 6.3 2.8 5.1 1.5 virginica
+135 6.1 2.6 5.6 1.4 virginica
+136 7.7 3.0 6.1 2.3 virginica
+137 6.3 3.4 5.6 2.4 virginica
+138 6.4 3.1 5.5 1.8 virginica
+139 6.0 3.0 4.8 1.8 virginica
+140 6.9 3.1 5.4 2.1 virginica
+141 6.7 3.1 5.6 2.4 virginica
+142 6.9 3.1 5.1 2.3 virginica
+143 5.8 2.7 5.1 1.9 virginica
+144 6.8 3.2 5.9 2.3 virginica
+145 6.7 3.3 5.7 2.5 virginica
+146 6.7 3.0 5.2 2.3 virginica
+147 6.3 2.5 5.0 1.9 virginica
+148 6.5 3.0 5.2 2.0 virginica
+149 6.2 3.4 5.4 2.3 virginica
+150 5.9 3.0 5.1 1.8 virginica
+>
+> iris.3 <- read.xls(xlsfile,method="tab") # specify tab format
+> iris.3
+ Sepal.Length Sepal.Width Petal.Length Petal.Width Species
+1 5.1 3.5 1.4 0.2 setosa
+2 4.9 3.0 1.4 0.2 setosa
+3 4.7 3.2 1.3 0.2 setosa
+4 4.6 3.1 1.5 0.2 setosa
+5 5.0 3.6 1.4 0.2 setosa
+6 5.4 3.9 1.7 0.4 setosa
+7 4.6 3.4 1.4 0.3 setosa
+8 5.0 3.4 1.5 0.2 setosa
+9 4.4 2.9 1.4 0.2 setosa
+10 4.9 3.1 1.5 0.1 setosa
+11 5.4 3.7 1.5 0.2 setosa
+12 4.8 3.4 1.6 0.2 setosa
+13 4.8 3.0 1.4 0.1 setosa
+14 4.3 3.0 1.1 0.1 setosa
+15 5.8 4.0 1.2 0.2 setosa
+16 5.7 4.4 1.5 0.4 setosa
+17 5.4 3.9 1.3 0.4 setosa
+18 5.1 3.5 1.4 0.3 setosa
+19 5.7 3.8 1.7 0.3 setosa
+20 5.1 3.8 1.5 0.3 setosa
+21 5.4 3.4 1.7 0.2 setosa
+22 5.1 3.7 1.5 0.4 setosa
+23 4.6 3.6 1.0 0.2 setosa
+24 5.1 3.3 1.7 0.5 setosa
+25 4.8 3.4 1.9 0.2 setosa
+26 5.0 3.0 1.6 0.2 setosa
+27 5.0 3.4 1.6 0.4 setosa
+28 5.2 3.5 1.5 0.2 setosa
+29 5.2 3.4 1.4 0.2 setosa
+30 4.7 3.2 1.6 0.2 setosa
+31 4.8 3.1 1.6 0.2 setosa
+32 5.4 3.4 1.5 0.4 setosa
+33 5.2 4.1 1.5 0.1 setosa
+34 5.5 4.2 1.4 0.2 setosa
+35 4.9 3.1 1.5 0.2 setosa
+36 5.0 3.2 1.2 0.2 setosa
+37 5.5 3.5 1.3 0.2 setosa
+38 4.9 3.6 1.4 0.1 setosa
+39 4.4 3.0 1.3 0.2 setosa
+40 5.1 3.4 1.5 0.2 setosa
+41 5.0 3.5 1.3 0.3 setosa
+42 4.5 2.3 1.3 0.3 setosa
+43 4.4 3.2 1.3 0.2 setosa
+44 5.0 3.5 1.6 0.6 setosa
+45 5.1 3.8 1.9 0.4 setosa
+46 4.8 3.0 1.4 0.3 setosa
+47 5.1 3.8 1.6 0.2 setosa
+48 4.6 3.2 1.4 0.2 setosa
+49 5.3 3.7 1.5 0.2 setosa
+50 5.0 3.3 1.4 0.2 setosa
+51 7.0 3.2 4.7 1.4 versicolor
+52 6.4 3.2 4.5 1.5 versicolor
+53 6.9 3.1 4.9 1.5 versicolor
+54 5.5 2.3 4.0 1.3 versicolor
+55 6.5 2.8 4.6 1.5 versicolor
+56 5.7 2.8 4.5 1.3 versicolor
+57 6.3 3.3 4.7 1.6 versicolor
+58 4.9 2.4 3.3 1.0 versicolor
+59 6.6 2.9 4.6 1.3 versicolor
+60 5.2 2.7 3.9 1.4 versicolor
+61 5.0 2.0 3.5 1.0 versicolor
+62 5.9 3.0 4.2 1.5 versicolor
+63 6.0 2.2 4.0 1.0 versicolor
+64 6.1 2.9 4.7 1.4 versicolor
+65 5.6 2.9 3.6 1.3 versicolor
+66 6.7 3.1 4.4 1.4 versicolor
+67 5.6 3.0 4.5 1.5 versicolor
+68 5.8 2.7 4.1 1.0 versicolor
+69 6.2 2.2 4.5 1.5 versicolor
+70 5.6 2.5 3.9 1.1 versicolor
+71 5.9 3.2 4.8 1.8 versicolor
+72 6.1 2.8 4.0 1.3 versicolor
+73 6.3 2.5 4.9 1.5 versicolor
+74 6.1 2.8 4.7 1.2 versicolor
+75 6.4 2.9 4.3 1.3 versicolor
+76 6.6 3.0 4.4 1.4 versicolor
+77 6.8 2.8 4.8 1.4 versicolor
+78 6.7 3.0 5.0 1.7 versicolor
+79 6.0 2.9 4.5 1.5 versicolor
+80 5.7 2.6 3.5 1.0 versicolor
+81 5.5 2.4 3.8 1.1 versicolor
+82 5.5 2.4 3.7 1.0 versicolor
+83 5.8 2.7 3.9 1.2 versicolor
+84 6.0 2.7 5.1 1.6 versicolor
+85 5.4 3.0 4.5 1.5 versicolor
+86 6.0 3.4 4.5 1.6 versicolor
+87 6.7 3.1 4.7 1.5 versicolor
+88 6.3 2.3 4.4 1.3 versicolor
+89 5.6 3.0 4.1 1.3 versicolor
+90 5.5 2.5 4.0 1.3 versicolor
+91 5.5 2.6 4.4 1.2 versicolor
+92 6.1 3.0 4.6 1.4 versicolor
+93 5.8 2.6 ...
[truncated message content] |
|
From: <wa...@us...> - 2010-11-12 19:08:45
|
Revision: 1460
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1460&view=rev
Author: warnes
Date: 2010-11-12 19:08:39 +0000 (Fri, 12 Nov 2010)
Log Message:
-----------
Update test output to match latest code
Modified Paths:
--------------
trunk/gdata/tests/test.read.xls.Rout.save
trunk/gdata/tests/tests.write.fwf.Rout.save
Modified: trunk/gdata/tests/test.read.xls.Rout.save
===================================================================
--- trunk/gdata/tests/test.read.xls.Rout.save 2010-11-12 19:08:12 UTC (rev 1459)
+++ trunk/gdata/tests/test.read.xls.Rout.save 2010-11-12 19:08:39 UTC (rev 1460)
@@ -1,14 +1,13 @@
-R version 2.11.0 (2010-04-22)
+R version 2.12.0 (2010-10-15)
Copyright (C) 2010 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
+Platform: x86_64-apple-darwin9.8.0/x86_64 (64-bit)
R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
Type 'license()' or 'licence()' for distribution details.
- Natural language support but running in an English locale
-
R is a collaborative project with many contributors.
Type 'contributors()' for more information and
'citation()' on how to cite R or R packages in publications.
@@ -18,7 +17,10 @@
Type 'q()' to quit R.
> library(gdata)
+gdata: read.xls support for 'XLS' (Excel 97-2004) files ENABLED.
+gdata: read.xls support for 'XLSX' (Excel 2007+) files ENABLED.
+
Attaching package: 'gdata'
The following object(s) are masked from 'package:utils':
@@ -26,14 +28,15 @@
object.size
>
+> if ( ! 'XLSX' %in% xlsFormats() )
++ {
++ try( installXLSXModules() )
++ }
>
> # iris.xls is included in the gregmisc package for use as an example
> xlsfile <- file.path(.path.package('gdata'),'xls','iris.xls')
>
> iris.1 <- read.xls(xlsfile) # defaults to csv format
-WARNING: Perl module Compress::Raw::Zlib cannot be loaded.
-WARNING: Perl module Spreadsheet::XLSX cannot be loaded.
-WARNING: Microsoft Excel 2007 'XLSX' formatted files will not be processed.
> iris.1
Sepal.Length Sepal.Width Petal.Length Petal.Width Species
1 5.1 3.5 1.4 0.2 setosa
@@ -188,9 +191,6 @@
150 5.9 3.0 5.1 1.8 virginica
>
> iris.2 <- read.xls(xlsfile,method="csv") # specify csv format
-WARNING: Perl module Compress::Raw::Zlib cannot be loaded.
-WARNING: Perl module Spreadsheet::XLSX cannot be loaded.
-WARNING: Microsoft Excel 2007 'XLSX' formatted files will not be processed.
> iris.2
Sepal.Length Sepal.Width Petal.Length Petal.Width Species
1 5.1 3.5 1.4 0.2 setosa
@@ -345,9 +345,6 @@
150 5.9 3.0 5.1 1.8 virginica
>
> iris.3 <- read.xls(xlsfile,method="tab") # specify tab format
-WARNING: Perl module Compress::Raw::Zlib cannot be loaded.
-WARNING: Perl module Spreadsheet::XLSX cannot be loaded.
-WARNING: Microsoft Excel 2007 'XLSX' formatted files will not be processed.
> iris.3
Sepal.Length Sepal.Width Petal.Length Petal.Width Species
1 5.1 3.5 1.4 0.2 setosa
@@ -512,28 +509,22 @@
>
> # see the number and names of sheets:
> sheetCount(exampleFile)
-WARNING: Perl module Compress::Raw::Zlib cannot be loaded.
-WARNING: Perl module Spreadsheet::XLSX cannot be loaded.
-WARNING: Microsoft Excel 2007 'XLSX' formatted files will not be processed.
[1] 4
>
> if( 'XLSX' %in% xlsFormats() )
+ sheetCount(exampleFile2007)
+[1] 4
>
> sheetNames(exampleFile)
-WARNING: Perl module Compress::Raw::Zlib cannot be loaded.
-WARNING: Perl module Spreadsheet::XLSX cannot be loaded.
-WARNING: Microsoft Excel 2007 'XLSX' formatted files will not be processed.
[1] "Sheet First" "Sheet Second"
[3] "Sheet with a very long name!" "Sheet with initial text"
>
> if( 'XLSX' %in% xlsFormats() )
+ sheetNames(exampleFile2007)
+[1] "Sheet First" "Sheet Second"
+[3] "Sheet with a very long name!" "Sheet with initial text"
>
> example.1 <- read.xls(exampleFile, sheet=1) # default is first worksheet
-WARNING: Perl module Compress::Raw::Zlib cannot be loaded.
-WARNING: Perl module Spreadsheet::XLSX cannot be loaded.
-WARNING: Microsoft Excel 2007 'XLSX' formatted files will not be processed.
> example.1
A B C
1 1 1 1
@@ -545,9 +536,6 @@
7 7 49 343
>
> example.2 <- read.xls(exampleFile, sheet=2) # second worksheet by number
-WARNING: Perl module Compress::Raw::Zlib cannot be loaded.
-WARNING: Perl module Spreadsheet::XLSX cannot be loaded.
-WARNING: Microsoft Excel 2007 'XLSX' formatted files will not be processed.
> example.2
X D E F G Factor
1 FirstRow 1 NA NA NA Red
@@ -556,9 +544,6 @@
4 FourthRow 4 3 2 1 Black
>
> example.3 <- read.xls(exampleFile, sheet=3) # second worksheet by number
-WARNING: Perl module Compress::Raw::Zlib cannot be loaded.
-WARNING: Perl module Spreadsheet::XLSX cannot be loaded.
-WARNING: Microsoft Excel 2007 'XLSX' formatted files will not be processed.
> example.3
X1 X2001.01.01 X1.01 X0.205818150587141 X.DIV.0. A
1 2 2002-02-02 2:02 0.2910708 NA B
@@ -572,9 +557,6 @@
9 10 2010-10-10 10:10 0.6508541 0.0000000 A
>
> example.4 <- read.xls(exampleFile, sheet=3) # second worksheet by number
-WARNING: Perl module Compress::Raw::Zlib cannot be loaded.
-WARNING: Perl module Spreadsheet::XLSX cannot be loaded.
-WARNING: Microsoft Excel 2007 'XLSX' formatted files will not be processed.
> example.4
X1 X2001.01.01 X1.01 X0.205818150587141 X.DIV.0. A
1 2 2002-02-02 2:02 0.2910708 NA B
@@ -608,7 +590,47 @@
+ data <- read.xls(exampleFile2007, sheet="Sheet with initial text", skip=2)
+ print(data)
+ }
+ A B C
+1 1 1 1
+2 2 4 8
+3 3 9 27
+4 4 16 64
+5 5 25 125
+6 6 36 216
+7 7 49 343
+ X D E F G Factor
+1 FirstRow 1 NA NA NA Red
+2 SecondRow 2 1 NA NA Green
+3 ThirdRow 3 2 1 NA Red
+4 FourthRow 4 3 2 1 Black
+ X1 X2001.01.01 X1.01 X0.205818150587141 X.DIV.0. A
+1 2 2002-02-02 2:02 0.2910708 NA B
+2 3 2003-03-03 3:03 0.3564875 -0.8414710 C
+3 4 2004-04-04 4:04 0.4116363 0.7080734
+4 5 2005-05-05 5:05 0.4602234 0.5013680 A
+5 6 2006-06-06 6:06 NA 0.2513698 B
+6 7 2007-07-07 7:07 0.5445436 0.0631868 B
+7 8 2008-08-08 8:08 0.5821416 NA C
+8 9 2009-09-09 9:09 0.6174545 0.0000000 A
+9 10 2010-10-10 10:10 0.6508541 0.0000000 A
+ X1 X2001.01.01 X1.01 X0.205818150587141 X.DIV.0. A
+1 2 2002-02-02 2:02 0.2910708 NA B
+2 3 2003-03-03 3:03 0.3564875 -0.8414710 C
+3 4 2004-04-04 4:04 0.4116363 0.7080734
+4 5 2005-05-05 5:05 0.4602234 0.5013680 A
+5 6 2006-06-06 6:06 NA 0.2513698 B
+6 7 2007-07-07 7:07 0.5445436 0.0631868 B
+7 8 2008-08-08 8:08 0.5821416 NA C
+8 9 2009-09-09 9:09 0.6174545 0.0000000 A
+9 10 2010-10-10 10:10 0.6508541 0.0000000 A
+ X D E F G Factor
+1 FirstRow 1 NA NA NA Red
+2 SecondRow 2 1 NA NA Green
+3 ThirdRow 3 2 1 NA Red
+4 FourthRow 4 3 2 1 Black
+ X X.1 D E F G Factor
+1 NA FirstRow 1 NA NA NA Red
+2 NA SecondRow 2 1 NA NA Green
+3 NA ThirdRow 3 2 1 NA Red
+4 NA FourthRow 4 3 2 1 Black
>
-> proc.time()
- user system elapsed
- 1.350 0.285 1.659
Modified: trunk/gdata/tests/tests.write.fwf.Rout.save
===================================================================
--- trunk/gdata/tests/tests.write.fwf.Rout.save 2010-11-12 19:08:12 UTC (rev 1459)
+++ trunk/gdata/tests/tests.write.fwf.Rout.save 2010-11-12 19:08:39 UTC (rev 1460)
@@ -1,7 +1,8 @@
-R version 2.9.0 (2009-04-17)
-Copyright (C) 2009 The R Foundation for Statistical Computing
+R version 2.12.0 (2010-10-15)
+Copyright (C) 2010 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
+Platform: x86_64-apple-darwin9.8.0/x86_64 (64-bit)
R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
@@ -23,14 +24,16 @@
> ###------------------------------------------------------------------------
>
> library(gdata)
+gdata: read.xls support for 'XLS' (Excel 97-2004) files ENABLED.
+gdata: read.xls support for 'XLSX' (Excel 2007+) files ENABLED.
+
Attaching package: 'gdata'
+The following object(s) are masked from 'package:utils':
-The following object(s) are masked from package:utils :
+ object.size
- object.size
-
>
> ## --- Test data ---
>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-06-06 21:12:05
|
Revision: 1550
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1550&view=rev
Author: warnes
Date: 2012-06-06 21:11:59 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
Update to reflect warning on startup that 'nobs' hides 'stats::nobs'.
Modified Paths:
--------------
trunk/gdata/tests/test.read.xls.Rout.save
trunk/gdata/tests/tests.write.fwf.Rout.save
Modified: trunk/gdata/tests/test.read.xls.Rout.save
===================================================================
--- trunk/gdata/tests/test.read.xls.Rout.save 2012-06-06 21:11:07 UTC (rev 1549)
+++ trunk/gdata/tests/test.read.xls.Rout.save 2012-06-06 21:11:59 UTC (rev 1550)
@@ -23,6 +23,10 @@
Attaching package: 'gdata'
+The following object(s) are masked from 'package:stats':
+
+ nobs
+
The following object(s) are masked from 'package:utils':
object.size
@@ -640,4 +644,4 @@
>
> proc.time()
user system elapsed
- 2.950 0.357 3.509
+ 3.054 0.376 3.563
Modified: trunk/gdata/tests/tests.write.fwf.Rout.save
===================================================================
--- trunk/gdata/tests/tests.write.fwf.Rout.save 2012-06-06 21:11:07 UTC (rev 1549)
+++ trunk/gdata/tests/tests.write.fwf.Rout.save 2012-06-06 21:11:59 UTC (rev 1550)
@@ -1,6 +1,6 @@
-R version 2.12.0 (2010-10-15)
-Copyright (C) 2010 The R Foundation for Statistical Computing
+R version 2.15.0 (2012-03-30)
+Copyright (C) 2012 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
Platform: x86_64-apple-darwin9.8.0/x86_64 (64-bit)
@@ -30,6 +30,10 @@
Attaching package: 'gdata'
+The following object(s) are masked from 'package:stats':
+
+ nobs
+
The following object(s) are masked from 'package:utils':
object.size
@@ -226,3 +230,6 @@
> ###------------------------------------------------------------------------
> ### tests.write.fwf.R ends
>
+> proc.time()
+ user system elapsed
+ 0.430 0.041 0.465
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-08-22 15:48:54
|
Revision: 1597
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1597&view=rev
Author: warnes
Date: 2012-08-22 15:48:42 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Add test file and code to ensure that read.xls() can properly handle
files with alternative encodings. latin-1.xls contains each of the
non-ascii latin-1 special characters in both the column headings and
the body of the file.
Modified Paths:
--------------
trunk/gdata/tests/test.read.xls.R
trunk/gdata/tests/test.read.xls.Rout.save
Added Paths:
-----------
trunk/gdata/tests/latin-1.xls
Added: trunk/gdata/tests/latin-1.xls
===================================================================
(Binary files differ)
Property changes on: trunk/gdata/tests/latin-1.xls
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/gdata/tests/test.read.xls.R
===================================================================
--- trunk/gdata/tests/test.read.xls.R 2012-08-22 15:45:22 UTC (rev 1596)
+++ trunk/gdata/tests/test.read.xls.R 2012-08-22 15:48:42 UTC (rev 1597)
@@ -84,7 +84,9 @@
}
+## Check handing of fileEncoding for latin-1 characters
+example.latin1 <- read.xls('latin-1.xls', fileEncoding='latin1')
Modified: trunk/gdata/tests/test.read.xls.Rout.save
===================================================================
--- trunk/gdata/tests/test.read.xls.Rout.save 2012-08-22 15:45:22 UTC (rev 1596)
+++ trunk/gdata/tests/test.read.xls.Rout.save 2012-08-22 15:48:42 UTC (rev 1597)
@@ -42,465 +42,465 @@
>
> iris.1 <- read.xls(xlsfile) # defaults to csv format
> iris.1
- Sepal.Length Sepal.Width Petal.Length Petal.Width Species
-1 5.1 3.5 1.4 0.2 setosa
-2 4.9 3.0 1.4 0.2 setosa
-3 4.7 3.2 1.3 0.2 setosa
-4 4.6 3.1 1.5 0.2 setosa
-5 5.0 3.6 1.4 0.2 setosa
-6 5.4 3.9 1.7 0.4 setosa
-7 4.6 3.4 1.4 0.3 setosa
-8 5.0 3.4 1.5 0.2 setosa
-9 4.4 2.9 1.4 0.2 setosa
-10 4.9 3.1 1.5 0.1 setosa
-11 5.4 3.7 1.5 0.2 setosa
-12 4.8 3.4 1.6 0.2 setosa
-13 4.8 3.0 1.4 0.1 setosa
-14 4.3 3.0 1.1 0.1 setosa
-15 5.8 4.0 1.2 0.2 setosa
-16 5.7 4.4 1.5 0.4 setosa
-17 5.4 3.9 1.3 0.4 setosa
-18 5.1 3.5 1.4 0.3 setosa
-19 5.7 3.8 1.7 0.3 setosa
-20 5.1 3.8 1.5 0.3 setosa
-21 5.4 3.4 1.7 0.2 setosa
-22 5.1 3.7 1.5 0.4 setosa
-23 4.6 3.6 1.0 0.2 setosa
-24 5.1 3.3 1.7 0.5 setosa
-25 4.8 3.4 1.9 0.2 setosa
-26 5.0 3.0 1.6 0.2 setosa
-27 5.0 3.4 1.6 0.4 setosa
-28 5.2 3.5 1.5 0.2 setosa
-29 5.2 3.4 1.4 0.2 setosa
-30 4.7 3.2 1.6 0.2 setosa
-31 4.8 3.1 1.6 0.2 setosa
-32 5.4 3.4 1.5 0.4 setosa
-33 5.2 4.1 1.5 0.1 setosa
-34 5.5 4.2 1.4 0.2 setosa
-35 4.9 3.1 1.5 0.2 setosa
-36 5.0 3.2 1.2 0.2 setosa
-37 5.5 3.5 1.3 0.2 setosa
-38 4.9 3.6 1.4 0.1 setosa
-39 4.4 3.0 1.3 0.2 setosa
-40 5.1 3.4 1.5 0.2 setosa
-41 5.0 3.5 1.3 0.3 setosa
-42 4.5 2.3 1.3 0.3 setosa
-43 4.4 3.2 1.3 0.2 setosa
-44 5.0 3.5 1.6 0.6 setosa
-45 5.1 3.8 1.9 0.4 setosa
-46 4.8 3.0 1.4 0.3 setosa
-47 5.1 3.8 1.6 0.2 setosa
-48 4.6 3.2 1.4 0.2 setosa
-49 5.3 3.7 1.5 0.2 setosa
-50 5.0 3.3 1.4 0.2 setosa
-51 7.0 3.2 4.7 1.4 versicolor
-52 6.4 3.2 4.5 1.5 versicolor
-53 6.9 3.1 4.9 1.5 versicolor
-54 5.5 2.3 4.0 1.3 versicolor
-55 6.5 2.8 4.6 1.5 versicolor
-56 5.7 2.8 4.5 1.3 versicolor
-57 6.3 3.3 4.7 1.6 versicolor
-58 4.9 2.4 3.3 1.0 versicolor
-59 6.6 2.9 4.6 1.3 versicolor
-60 5.2 2.7 3.9 1.4 versicolor
-61 5.0 2.0 3.5 1.0 versicolor
-62 5.9 3.0 4.2 1.5 versicolor
-63 6.0 2.2 4.0 1.0 versicolor
-64 6.1 2.9 4.7 1.4 versicolor
-65 5.6 2.9 3.6 1.3 versicolor
-66 6.7 3.1 4.4 1.4 versicolor
-67 5.6 3.0 4.5 1.5 versicolor
-68 5.8 2.7 4.1 1.0 versicolor
-69 6.2 2.2 4.5 1.5 versicolor
-70 5.6 2.5 3.9 1.1 versicolor
-71 5.9 3.2 4.8 1.8 versicolor
-72 6.1 2.8 4.0 1.3 versicolor
-73 6.3 2.5 4.9 1.5 versicolor
-74 6.1 2.8 4.7 1.2 versicolor
-75 6.4 2.9 4.3 1.3 versicolor
-76 6.6 3.0 4.4 1.4 versicolor
-77 6.8 2.8 4.8 1.4 versicolor
-78 6.7 3.0 5.0 1.7 versicolor
-79 6.0 2.9 4.5 1.5 versicolor
-80 5.7 2.6 3.5 1.0 versicolor
-81 5.5 2.4 3.8 1.1 versicolor
-82 5.5 2.4 3.7 1.0 versicolor
-83 5.8 2.7 3.9 1.2 versicolor
-84 6.0 2.7 5.1 1.6 versicolor
-85 5.4 3.0 4.5 1.5 versicolor
-86 6.0 3.4 4.5 1.6 versicolor
-87 6.7 3.1 4.7 1.5 versicolor
-88 6.3 2.3 4.4 1.3 versicolor
-89 5.6 3.0 4.1 1.3 versicolor
-90 5.5 2.5 4.0 1.3 versicolor
-91 5.5 2.6 4.4 1.2 versicolor
-92 6.1 3.0 4.6 1.4 versicolor
-93 5.8 2.6 4.0 1.2 versicolor
-94 5.0 2.3 3.3 1.0 versicolor
-95 5.6 2.7 4.2 1.3 versicolor
-96 5.7 3.0 4.2 1.2 versicolor
-97 5.7 2.9 4.2 1.3 versicolor
-98 6.2 2.9 4.3 1.3 versicolor
-99 5.1 2.5 3.0 1.1 versicolor
-100 5.7 2.8 4.1 1.3 versicolor
-101 6.3 3.3 6.0 2.5 virginica
-102 5.8 2.7 5.1 1.9 virginica
-103 7.1 3.0 5.9 2.1 virginica
-104 6.3 2.9 5.6 1.8 virginica
-105 6.5 3.0 5.8 2.2 virginica
-106 7.6 3.0 6.6 2.1 virginica
-107 4.9 2.5 4.5 1.7 virginica
-108 7.3 2.9 6.3 1.8 virginica
-109 6.7 2.5 5.8 1.8 virginica
-110 7.2 3.6 6.1 2.5 virginica
-111 6.5 3.2 5.1 2.0 virginica
-112 6.4 2.7 5.3 1.9 virginica
-113 6.8 3.0 5.5 2.1 virginica
-114 5.7 2.5 5.0 2.0 virginica
-115 5.8 2.8 5.1 2.4 virginica
-116 6.4 3.2 5.3 2.3 virginica
-117 6.5 3.0 5.5 1.8 virginica
-118 7.7 3.8 6.7 2.2 virginica
-119 7.7 2.6 6.9 2.3 virginica
-120 6.0 2.2 5.0 1.5 virginica
-121 6.9 3.2 5.7 2.3 virginica
-122 5.6 2.8 4.9 2.0 virginica
-123 7.7 2.8 6.7 2.0 virginica
-124 6.3 2.7 4.9 1.8 virginica
-125 6.7 3.3 5.7 2.1 virginica
-126 7.2 3.2 6.0 1.8 virginica
-127 6.2 2.8 4.8 1.8 virginica
-128 6.1 3.0 4.9 1.8 virginica
-129 6.4 2.8 5.6 2.1 virginica
-130 7.2 3.0 5.8 1.6 virginica
-131 7.4 2.8 6.1 1.9 virginica
-132 7.9 3.8 6.4 2.0 virginica
-133 6.4 2.8 5.6 2.2 virginica
-134 6.3 2.8 5.1 1.5 virginica
-135 6.1 2.6 5.6 1.4 virginica
-136 7.7 3.0 6.1 2.3 virginica
-137 6.3 3.4 5.6 2.4 virginica
-138 6.4 3.1 5.5 1.8 virginica
-139 6.0 3.0 4.8 1.8 virginica
-140 6.9 3.1 5.4 2.1 virginica
-141 6.7 3.1 5.6 2.4 virginica
-142 6.9 3.1 5.1 2.3 virginica
-143 5.8 2.7 5.1 1.9 virginica
-144 6.8 3.2 5.9 2.3 virginica
-145 6.7 3.3 5.7 2.5 virginica
-146 6.7 3.0 5.2 2.3 virginica
-147 6.3 2.5 5.0 1.9 virginica
-148 6.5 3.0 5.2 2.0 virginica
-149 6.2 3.4 5.4 2.3 virginica
-150 5.9 3.0 5.1 1.8 virginica
+ Sepal.Length Sepal.Width Petal.Length Petal.Width Species
+1 5.1 3.5 1.4 0.2 setosa
+2 4.9 3.0 1.4 0.2 setosa
+3 4.7 3.2 1.3 0.2 setosa
+4 4.6 3.1 1.5 0.2 setosa
+5 5.0 3.6 1.4 0.2 setosa
+6 5.4 3.9 1.7 0.4 setosa
+7 4.6 3.4 1.4 0.3 setosa
+8 5.0 3.4 1.5 0.2 setosa
+9 4.4 2.9 1.4 0.2 setosa
+10 4.9 3.1 1.5 0.1 setosa
+11 5.4 3.7 1.5 0.2 setosa
+12 4.8 3.4 1.6 0.2 setosa
+13 4.8 3.0 1.4 0.1 setosa
+14 4.3 3.0 1.1 0.1 setosa
+15 5.8 4.0 1.2 0.2 setosa
+16 5.7 4.4 1.5 0.4 setosa
+17 5.4 3.9 1.3 0.4 setosa
+18 5.1 3.5 1.4 0.3 setosa
+19 5.7 3.8 1.7 0.3 setosa
+20 5.1 3.8 1.5 0.3 setosa
+21 5.4 3.4 1.7 0.2 setosa
+22 5.1 3.7 1.5 0.4 setosa
+23 4.6 3.6 1.0 0.2 setosa
+24 5.1 3.3 1.7 0.5 setosa
+25 4.8 3.4 1.9 0.2 setosa
+26 5.0 3.0 1.6 0.2 setosa
+27 5.0 3.4 1.6 0.4 setosa
+28 5.2 3.5 1.5 0.2 setosa
+29 5.2 3.4 1.4 0.2 setosa
+30 4.7 3.2 1.6 0.2 setosa
+31 4.8 3.1 1.6 0.2 setosa
+32 5.4 3.4 1.5 0.4 setosa
+33 5.2 4.1 1.5 0.1 setosa
+34 5.5 4.2 1.4 0.2 setosa
+35 4.9 3.1 1.5 0.2 setosa
+36 5.0 3.2 1.2 0.2 setosa
+37 5.5 3.5 1.3 0.2 setosa
+38 4.9 3.6 1.4 0.1 setosa
+39 4.4 3.0 1.3 0.2 setosa
+40 5.1 3.4 1.5 0.2 setosa
+41 5.0 3.5 1.3 0.3 setosa
+42 4.5 2.3 1.3 0.3 setosa
+43 4.4 3.2 1.3 0.2 setosa
+44 5.0 3.5 1.6 0.6 setosa
+45 5.1 3.8 1.9 0.4 setosa
+46 4.8 3.0 1.4 0.3 setosa
+47 5.1 3.8 1.6 0.2 setosa
+48 4.6 3.2 1.4 0.2 setosa
+49 5.3 3.7 1.5 0.2 setosa
+50 5.0 3.3 1.4 0.2 setosa
+51 7.0 3.2 4.7 1.4 versicolor
+52 6.4 3.2 4.5 1.5 versicolor
+53 6.9 3.1 4.9 1.5 versicolor
+54 5.5 2.3 4.0 1.3 versicolor
+55 6.5 2.8 4.6 1.5 versicolor
+56 5.7 2.8 4.5 1.3 versicolor
+57 6.3 3.3 4.7 1.6 versicolor
+58 4.9 2.4 3.3 1.0 versicolor
+59 6.6 2.9 4.6 1.3 versicolor
+60 5.2 2.7 3.9 1.4 versicolor
+61 5.0 2.0 3.5 1.0 versicolor
+62 5.9 3.0 4.2 1.5 versicolor
+63 6.0 2.2 4.0 1.0 versicolor
+64 6.1 2.9 4.7 1.4 versicolor
+65 5.6 2.9 3.6 1.3 versicolor
+66 6.7 3.1 4.4 1.4 versicolor
+67 5.6 3.0 4.5 1.5 versicolor
+68 5.8 2.7 4.1 1.0 versicolor
+69 6.2 2.2 4.5 1.5 versicolor
+70 5.6 2.5 3.9 1.1 versicolor
+71 5.9 3.2 4.8 1.8 versicolor
+72 6.1 2.8 4.0 1.3 versicolor
+73 6.3 2.5 4.9 1.5 versicolor
+74 6.1 2.8 4.7 1.2 versicolor
+75 6.4 2.9 4.3 1.3 versicolor
+76 6.6 3.0 4.4 1.4 versicolor
+77 6.8 2.8 4.8 1.4 versicolor
+78 6.7 3.0 5.0 1.7 versicolor
+79 6.0 2.9 4.5 1.5 versicolor
+80 5.7 2.6 3.5 1.0 versicolor
+81 5.5 2.4 3.8 1.1 versicolor
+82 5.5 2.4 3.7 1.0 versicolor
+83 5.8 2.7 3.9 1.2 versicolor
+84 6.0 2.7 5.1 1.6 versicolor
+85 5.4 3.0 4.5 1.5 versicolor
+86 6.0 3.4 4.5 1.6 versicolor
+87 6.7 3.1 4.7 1.5 versicolor
+88 6.3 2.3 4.4 1.3 versicolor
+89 5.6 3.0 4.1 1.3 versicolor
+90 5.5 2.5 4.0 1.3 versicolor
+91 5.5 2.6 4.4 1.2 versicolor
+92 6.1 3.0 4.6 1.4 versicolor
+93 5.8 2.6 4.0 1.2 versicolor
+94 5.0 2.3 3.3 1.0 versicolor
+95 5.6 2.7 4.2 1.3 versicolor
+96 5.7 3.0 4.2 1.2 versicolor
+97 5.7 2.9 4.2 1.3 versicolor
+98 6.2 2.9 4.3 1.3 versicolor
+99 5.1 2.5 3.0 1.1 versicolor
+100 5.7 2.8 4.1 1.3 versicolor
+101 6.3 3.3 6.0 2.5 virginica
+102 5.8 2.7 5.1 1.9 virginica
+103 7.1 3.0 5.9 2.1 virginica
+104 6.3 2.9 5.6 1.8 virginica
+105 6.5 3.0 5.8 2.2 virginica
+106 7.6 3.0 6.6 2.1 virginica
+107 4.9 2.5 4.5 1.7 virginica
+108 7.3 2.9 6.3 1.8 virginica
+109 6.7 2.5 5.8 1.8 virginica
+110 7.2 3.6 6.1 2.5 virginica
+111 6.5 3.2 5.1 2.0 virginica
+112 6.4 2.7 5.3 1.9 virginica
+113 6.8 3.0 5.5 2.1 virginica
+114 5.7 2.5 5.0 2.0 virginica
+115 5.8 2.8 5.1 2.4 virginica
+116 6.4 3.2 5.3 2.3 virginica
+117 6.5 3.0 5.5 1.8 virginica
+118 7.7 3.8 6.7 2.2 virginica
+119 7.7 2.6 6.9 2.3 virginica
+120 6.0 2.2 5.0 1.5 virginica
+121 6.9 3.2 5.7 2.3 virginica
+122 5.6 2.8 4.9 2.0 virginica
+123 7.7 2.8 6.7 2.0 virginica
+124 6.3 2.7 4.9 1.8 virginica
+125 6.7 3.3 5.7 2.1 virginica
+126 7.2 3.2 6.0 1.8 virginica
+127 6.2 2.8 4.8 1.8 virginica
+128 6.1 3.0 4.9 1.8 virginica
+129 6.4 2.8 5.6 2.1 virginica
+130 7.2 3.0 5.8 1.6 virginica
+131 7.4 2.8 6.1 1.9 virginica
+132 7.9 3.8 6.4 2.0 virginica
+133 6.4 2.8 5.6 2.2 virginica
+134 6.3 2.8 5.1 1.5 virginica
+135 6.1 2.6 5.6 1.4 virginica
+136 7.7 3.0 6.1 2.3 virginica
+137 6.3 3.4 5.6 2.4 virginica
+138 6.4 3.1 5.5 1.8 virginica
+139 6.0 3.0 4.8 1.8 virginica
+140 6.9 3.1 5.4 2.1 virginica
+141 6.7 3.1 5.6 2.4 virginica
+142 6.9 3.1 5.1 2.3 virginica
+143 5.8 2.7 5.1 1.9 virginica
+144 6.8 3.2 5.9 2.3 virginica
+145 6.7 3.3 5.7 2.5 virginica
+146 6.7 3.0 5.2 2.3 virginica
+147 6.3 2.5 5.0 1.9 virginica
+148 6.5 3.0 5.2 2.0 virginica
+149 6.2 3.4 5.4 2.3 virginica
+150 5.9 3.0 5.1 1.8 virginica
>
> iris.2 <- read.xls(xlsfile,method="csv") # specify csv format
> iris.2
- Sepal.Length Sepal.Width Petal.Length Petal.Width Species
-1 5.1 3.5 1.4 0.2 setosa
-2 4.9 3.0 1.4 0.2 setosa
-3 4.7 3.2 1.3 0.2 setosa
-4 4.6 3.1 1.5 0.2 setosa
-5 5.0 3.6 1.4 0.2 setosa
-6 5.4 3.9 1.7 0.4 setosa
-7 4.6 3.4 1.4 0.3 setosa
-8 5.0 3.4 1.5 0.2 setosa
-9 4.4 2.9 1.4 0.2 setosa
-10 4.9 3.1 1.5 0.1 setosa
-11 5.4 3.7 1.5 0.2 setosa
-12 4.8 3.4 1.6 0.2 setosa
-13 4.8 3.0 1.4 0.1 setosa
-14 4.3 3.0 1.1 0.1 setosa
-15 5.8 4.0 1.2 0.2 setosa
-16 5.7 4.4 1.5 0.4 setosa
-17 5.4 3.9 1.3 0.4 setosa
-18 5.1 3.5 1.4 0.3 setosa
-19 5.7 3.8 1.7 0.3 setosa
-20 5.1 3.8 1.5 0.3 setosa
-21 5.4 3.4 1.7 0.2 setosa
-22 5.1 3.7 1.5 0.4 setosa
-23 4.6 3.6 1.0 0.2 setosa
-24 5.1 3.3 1.7 0.5 setosa
-25 4.8 3.4 1.9 0.2 setosa
-26 5.0 3.0 1.6 0.2 setosa
-27 5.0 3.4 1.6 0.4 setosa
-28 5.2 3.5 1.5 0.2 setosa
-29 5.2 3.4 1.4 0.2 setosa
-30 4.7 3.2 1.6 0.2 setosa
-31 4.8 3.1 1.6 0.2 setosa
-32 5.4 3.4 1.5 0.4 setosa
-33 5.2 4.1 1.5 0.1 setosa
-34 5.5 4.2 1.4 0.2 setosa
-35 4.9 3.1 1.5 0.2 setosa
-36 5.0 3.2 1.2 0.2 setosa
-37 5.5 3.5 1.3 0.2 setosa
-38 4.9 3.6 1.4 0.1 setosa
-39 4.4 3.0 1.3 0.2 setosa
-40 5.1 3.4 1.5 0.2 setosa
-41 5.0 3.5 1.3 0.3 setosa
-42 4.5 2.3 1.3 0.3 setosa
-43 4.4 3.2 1.3 0.2 setosa
-44 5.0 3.5 1.6 0.6 setosa
-45 5.1 3.8 1.9 0.4 setosa
-46 4.8 3.0 1.4 0.3 setosa
-47 5.1 3.8 1.6 0.2 setosa
-48 4.6 3.2 1.4 0.2 setosa
-49 5.3 3.7 1.5 0.2 setosa
-50 5.0 3.3 1.4 0.2 setosa
-51 7.0 3.2 4.7 1.4 versicolor
-52 6.4 3.2 4.5 1.5 versicolor
-53 6.9 3.1 4.9 1.5 versicolor
-54 5.5 2.3 4.0 1.3 versicolor
-55 6.5 2.8 4.6 1.5 versicolor
-56 5.7 2.8 4.5 1.3 versicolor
-57 6.3 3.3 4.7 1.6 versicolor
-58 4.9 2.4 3.3 1.0 versicolor
-59 6.6 2.9 4.6 1.3 versicolor
-60 5.2 2.7 3.9 1.4 versicolor
-61 5.0 2.0 3.5 1.0 versicolor
-62 5.9 3.0 4.2 1.5 versicolor
-63 6.0 2.2 4.0 1.0 versicolor
-64 6.1 2.9 4.7 1.4 versicolor
-65 5.6 2.9 3.6 1.3 versicolor
-66 6.7 3.1 4.4 1.4 versicolor
-67 5.6 3.0 4.5 1.5 versicolor
-68 5.8 2.7 4.1 1.0 versicolor
-69 6.2 2.2 4.5 1.5 versicolor
-70 5.6 2.5 3.9 1.1 versicolor
-71 5.9 3.2 4.8 1.8 versicolor
-72 6.1 2.8 4.0 1.3 versicolor
-73 6.3 2.5 4.9 1.5 versicolor
-74 6.1 2.8 4.7 1.2 versicolor
-75 6.4 2.9 4.3 1.3 versicolor
-76 6.6 3.0 4.4 1.4 versicolor
-77 6.8 2.8 4.8 1.4 versicolor
-78 6.7 3.0 5.0 1.7 versicolor
-79 6.0 2.9 4.5 1.5 versicolor
-80 5.7 2.6 3.5 1.0 versicolor
-81 5.5 2.4 3.8 1.1 versicolor
-82 5.5 2.4 3.7 1.0 versicolor
-83 5.8 2.7 3.9 1.2 versicolor
-84 6.0 2.7 5.1 1.6 versicolor
-85 5.4 3.0 4.5 1.5 versicolor
-86 6.0 3.4 4.5 1.6 versicolor
-87 6.7 3.1 4.7 1.5 versicolor
-88 6.3 2.3 4.4 1.3 versicolor
-89 5.6 3.0 4.1 1.3 versicolor
-90 5.5 2.5 4.0 1.3 versicolor
-91 5.5 2.6 4.4 1.2 versicolor
-92 6.1 3.0 4.6 1.4 versicolor
-93 5.8 2.6 4.0 1.2 versicolor
-94 5.0 2.3 3.3 1.0 versicolor
-95 5.6 2.7 4.2 1.3 versicolor
-96 5.7 3.0 4.2 1.2 versicolor
-97 5.7 2.9 4.2 1.3 versicolor
-98 6.2 2.9 4.3 1.3 versicolor
-99 5.1 2.5 3.0 1.1 versicolor
-100 5.7 2.8 4.1 1.3 versicolor
-101 6.3 3.3 6.0 2.5 virginica
-102 5.8 2.7 5.1 1.9 virginica
-103 7.1 3.0 5.9 2.1 virginica
-104 6.3 2.9 5.6 1.8 virginica
-105 6.5 3.0 5.8 2.2 virginica
-106 7.6 3.0 6.6 2.1 virginica
-107 4.9 2.5 4.5 1.7 virginica
-108 7.3 2.9 6.3 1.8 virginica
-109 6.7 2.5 5.8 1.8 virginica
-110 7.2 3.6 6.1 2.5 virginica
-111 6.5 3.2 5.1 2.0 virginica
-112 6.4 2.7 5.3 1.9 virginica
-113 6.8 3.0 5.5 2.1 virginica
-114 5.7 2.5 5.0 2.0 virginica
-115 5.8 2.8 5.1 2.4 virginica
-116 6.4 3.2 5.3 2.3 virginica
-117 6.5 3.0 5.5 1.8 virginica
-118 7.7 3.8 6.7 2.2 virginica
-119 7.7 2.6 6.9 2.3 virginica
-120 6.0 2.2 5.0 1.5 virginica
-121 6.9 3.2 5.7 2.3 virginica
-122 5.6 2.8 4.9 2.0 virginica
-123 7.7 2.8 6.7 2.0 virginica
-124 6.3 2.7 4.9 1.8 virginica
-125 6.7 3.3 5.7 2.1 virginica
-126 7.2 3.2 6.0 1.8 virginica
-12...
[truncated message content] |
|
From: <wa...@us...> - 2012-08-22 16:41:37
|
Revision: 1599
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1599&view=rev
Author: warnes
Date: 2012-08-22 16:41:30 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Add XLSX test for latin-1 characters, and look for them in their new
location in inst/xls/.
Modified Paths:
--------------
trunk/gdata/tests/test.read.xls.R
trunk/gdata/tests/test.read.xls.Rout.save
Removed Paths:
-------------
trunk/gdata/tests/latin-1.xls
Deleted: trunk/gdata/tests/latin-1.xls
===================================================================
(Binary files differ)
Modified: trunk/gdata/tests/test.read.xls.R
===================================================================
--- trunk/gdata/tests/test.read.xls.R 2012-08-22 16:35:59 UTC (rev 1598)
+++ trunk/gdata/tests/test.read.xls.R 2012-08-22 16:41:30 UTC (rev 1599)
@@ -86,7 +86,14 @@
## Check handing of fileEncoding for latin-1 characters
-example.latin1 <- read.xls('latin-1.xls', fileEncoding='latin1')
+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')
+if( 'XLSX' %in% xlsFormats() )
+ {
+ example.latin1.x <- read.xls(latin1FileX, fileEncoding='latin1')
+ }
+
Modified: trunk/gdata/tests/test.read.xls.Rout.save
===================================================================
--- trunk/gdata/tests/test.read.xls.Rout.save 2012-08-22 16:35:59 UTC (rev 1598)
+++ trunk/gdata/tests/test.read.xls.Rout.save 2012-08-22 16:41:30 UTC (rev 1599)
@@ -669,11 +669,18 @@
>
> ## Check handing of fileEncoding for latin-1 characters
>
-> example.latin1 <- read.xls('latin-1.xls', fileEncoding='latin1')
+> 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')
>
+> if( 'XLSX' %in% xlsFormats() )
++ {
++ example.latin1.x <- read.xls(latin1FileX, fileEncoding='latin1')
++ }
>
>
+>
> proc.time()
user system elapsed
- 3.256 0.392 3.788
+ 3.564 0.436 4.186
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2013-03-24 04:50:25
|
Revision: 1645
http://sourceforge.net/p/r-gregmisc/code/1645
Author: warnes
Date: 2013-03-24 04:50:22 +0000 (Sun, 24 Mar 2013)
Log Message:
-----------
Update test files for code changes
Modified Paths:
--------------
trunk/gdata/tests/test.read.xls.Rout.save
trunk/gdata/tests/tests.write.fwf.Rout.save
Modified: trunk/gdata/tests/test.read.xls.Rout.save
===================================================================
--- trunk/gdata/tests/test.read.xls.Rout.save 2013-03-24 04:36:45 UTC (rev 1644)
+++ trunk/gdata/tests/test.read.xls.Rout.save 2013-03-24 04:50:22 UTC (rev 1645)
@@ -1,8 +1,8 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
+R version 2.15.3 Patched (2013-03-13 r62287) -- "Security Blanket"
+Copyright (C) 2013 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
-Platform: x86_64-apple-darwin9.8.0/x86_64 (64-bit)
+Platform: i386-apple-darwin9.8.0/i386 (32-bit)
R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
@@ -38,7 +38,7 @@
+ }
>
> # iris.xls is included in the gregmisc package for use as an example
-> xlsfile <- file.path(.path.package('gdata'),'xls','iris.xls')
+> xlsfile <- file.path(path.package('gdata'),'xls','iris.xls')
>
> iris.1 <- read.xls(xlsfile) # defaults to csv format
> iris.1
@@ -505,10 +505,10 @@
> stopifnot(all.equal(iris.1, iris.2))
> stopifnot(all.equal(iris.1, iris.3))
>
-> exampleFile <- file.path(.path.package('gdata'),'xls',
+> exampleFile <- file.path(path.package('gdata'),'xls',
+ 'ExampleExcelFile.xls')
>
-> exampleFile2007 <- file.path(.path.package('gdata'),'xls',
+> exampleFile2007 <- file.path(path.package('gdata'),'xls',
+ 'ExampleExcelFile.xlsx')
>
> # see the number and names of sheets:
@@ -669,18 +669,28 @@
>
> ## Check handing of fileEncoding for latin-1 characters
>
-> latin1File <- file.path(.path.package('gdata'),'xls', 'latin-1.xls')
-> latin1FileX <- file.path(.path.package('gdata'),'xls', 'latin-1.xlsx')
+> 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')
+Warning messages:
+1: In read.table(file = file, header = header, sep = sep, quote = quote, :
+ invalid input found on input connection '/var/folders/dG/dGl84jhkHAe+alfrBBIYKE+++TQ/-Tmp-//RtmpGQaXAS/file4640360d0390.csv'
+2: In read.table(file = file, header = header, sep = sep, quote = quote, :
+ incomplete final line found by readTableHeader on '/var/folders/dG/dGl84jhkHAe+alfrBBIYKE+++TQ/-Tmp-//RtmpGQaXAS/file4640360d0390.csv'
>
> if( 'XLSX' %in% xlsFormats() )
+ {
+ example.latin1.x <- read.xls(latin1FileX, fileEncoding='latin1')
+ }
+Warning messages:
+1: In read.table(file = file, header = header, sep = sep, quote = quote, :
+ invalid input found on input connection '/var/folders/dG/dGl84jhkHAe+alfrBBIYKE+++TQ/-Tmp-//RtmpGQaXAS/file46401064fea9.csv'
+2: In read.table(file = file, header = header, sep = sep, quote = quote, :
+ incomplete final line found by readTableHeader on '/var/folders/dG/dGl84jhkHAe+alfrBBIYKE+++TQ/-Tmp-//RtmpGQaXAS/file46401064fea9.csv'
>
>
>
> proc.time()
user system elapsed
- 3.564 0.436 4.186
+ 6.693 0.979 7.921
Modified: trunk/gdata/tests/tests.write.fwf.Rout.save
===================================================================
--- trunk/gdata/tests/tests.write.fwf.Rout.save 2013-03-24 04:36:45 UTC (rev 1644)
+++ trunk/gdata/tests/tests.write.fwf.Rout.save 2013-03-24 04:50:22 UTC (rev 1645)
@@ -1,8 +1,8 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
+R version 2.15.3 Patched (2013-03-13 r62287) -- "Security Blanket"
+Copyright (C) 2013 The R Foundation for Statistical Computing
ISBN 3-900051-07-0
-Platform: x86_64-apple-darwin9.8.0/x86_64 (64-bit)
+Platform: i386-apple-darwin9.8.0/i386 (32-bit)
R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
@@ -232,4 +232,4 @@
>
> proc.time()
user system elapsed
- 0.430 0.041 0.465
+ 0.830 0.090 0.906
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2013-06-28 21:24:55
|
Revision: 1684
http://sourceforge.net/p/r-gregmisc/code/1684
Author: warnes
Date: 2013-06-28 21:24:52 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
Minor update to tests/*.Rout.save
Modified Paths:
--------------
trunk/gdata/tests/test.read.xls.Rout.save
trunk/gdata/tests/tests.write.fwf.Rout.save
Modified: trunk/gdata/tests/test.read.xls.Rout.save
===================================================================
--- trunk/gdata/tests/test.read.xls.Rout.save 2013-06-28 21:22:40 UTC (rev 1683)
+++ trunk/gdata/tests/test.read.xls.Rout.save 2013-06-28 21:24:52 UTC (rev 1684)
@@ -1,8 +1,7 @@
-R version 2.15.3 Patched (2013-03-13 r62287) -- "Security Blanket"
+R version 3.0.1 (2013-05-16) -- "Good Sport"
Copyright (C) 2013 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+Platform: i686-pc-linux-gnu (32-bit)
R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
@@ -23,11 +22,11 @@
Attaching package: 'gdata'
-The following object(s) are masked from 'package:stats':
+The following object is masked from 'package:stats':
nobs
-The following object(s) are masked from 'package:utils':
+The following object is masked from 'package:utils':
object.size
@@ -591,7 +590,7 @@
+
+ data <- read.xls(exampleFile2007, sheet="Sheet Second") # and by name
+ print(data)
-+
++
+ # load the third worksheet, skipping the first two non-data lines...
+ data <- read.xls(exampleFile2007, sheet="Sheet with initial text", skip=2)
+ print(data)
@@ -673,24 +672,14 @@
> latin1FileX <- file.path(path.package('gdata'),'xls', 'latin-1.xlsx')
>
> example.latin1 <- read.xls(latin1File, fileEncoding='latin1')
-Warning messages:
-1: In read.table(file = file, header = header, sep = sep, quote = quote, :
- invalid input found on input connection '/var/folders/dG/dGl84jhkHAe+alfrBBIYKE+++TQ/-Tmp-//RtmpGQaXAS/file4640360d0390.csv'
-2: In read.table(file = file, header = header, sep = sep, quote = quote, :
- incomplete final line found by readTableHeader on '/var/folders/dG/dGl84jhkHAe+alfrBBIYKE+++TQ/-Tmp-//RtmpGQaXAS/file4640360d0390.csv'
>
> if( 'XLSX' %in% xlsFormats() )
+ {
+ example.latin1.x <- read.xls(latin1FileX, fileEncoding='latin1')
+ }
-Warning messages:
-1: In read.table(file = file, header = header, sep = sep, quote = quote, :
- invalid input found on input connection '/var/folders/dG/dGl84jhkHAe+alfrBBIYKE+++TQ/-Tmp-//RtmpGQaXAS/file46401064fea9.csv'
-2: In read.table(file = file, header = header, sep = sep, quote = quote, :
- incomplete final line found by readTableHeader on '/var/folders/dG/dGl84jhkHAe+alfrBBIYKE+++TQ/-Tmp-//RtmpGQaXAS/file46401064fea9.csv'
>
>
>
> proc.time()
user system elapsed
- 6.693 0.979 7.921
+ 10.072 1.468 12.094
Modified: trunk/gdata/tests/tests.write.fwf.Rout.save
===================================================================
--- trunk/gdata/tests/tests.write.fwf.Rout.save 2013-06-28 21:22:40 UTC (rev 1683)
+++ trunk/gdata/tests/tests.write.fwf.Rout.save 2013-06-28 21:24:52 UTC (rev 1684)
@@ -1,8 +1,7 @@
-R version 2.15.3 Patched (2013-03-13 r62287) -- "Security Blanket"
+R version 3.0.1 (2013-05-16) -- "Good Sport"
Copyright (C) 2013 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+Platform: i686-pc-linux-gnu (32-bit)
R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
@@ -30,11 +29,11 @@
Attaching package: 'gdata'
-The following object(s) are masked from 'package:stats':
+The following object is masked from 'package:stats':
nobs
-The following object(s) are masked from 'package:utils':
+The following object is masked from 'package:utils':
object.size
@@ -232,4 +231,4 @@
>
> proc.time()
user system elapsed
- 0.830 0.090 0.906
+ 1.464 0.152 1.631
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2015-04-25 16:37:08
|
Revision: 1968
http://sourceforge.net/p/r-gregmisc/code/1968
Author: warnes
Date: 2015-04-25 16:37:00 +0000 (Sat, 25 Apr 2015)
Log Message:
-----------
Update .save files
Modified Paths:
--------------
trunk/gdata/tests/test.humanReadable.Rout.save
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-25 16:24:41 UTC (rev 1967)
+++ trunk/gdata/tests/test.humanReadable.Rout.save 2015-04-25 16:37:00 UTC (rev 1968)
@@ -18,13 +18,8 @@
> library(gdata)
gdata: read.xls support for 'XLS' (Excel 97-2004) files ENABLED.
-gdata: Unable to load perl libaries needed by read.xls()
-gdata: to support 'XLSX' (Excel 2007+) files.
+gdata: read.xls support for 'XLSX' (Excel 2007+) files ENABLED.
-gdata: Run the function 'installXLSXsupport()'
-gdata: to automatically download and install the perl
-gdata: libaries needed to support Excel XLS and XLSX formats.
-
Attaching package: 'gdata'
The following object is masked from 'package:stats':
@@ -63,26 +58,26 @@
+ humanReadable(x=IEC2, standard="Unix", width=3))
[,1] [,2] [,3] [,4] [,5] [,6]
[1,] " 2 B " " 2 B " " 2 B " " 2 B " " 2 B " " 2 B "
- [2,] "1.19855 kB" "1.199 kB" " 1.2 kB" "1.23404 KiB" "1.234 KiB" " 1.2 KiB"
- [3,] "1.20686 MB" "1.207 MB" " 1.2 MB" "1.24529 MiB" "1.245 MiB" " 1.2 MiB"
- [4,] "1.24218 GB" "1.242 GB" " 1.2 GB" "1.19621 GiB" "1.196 GiB" " 1.2 GiB"
- [5,] "1.20157 TB" "1.202 TB" " 1.2 TB" "1.21737 TiB" "1.217 TiB" " 1.2 TiB"
- [6,] "1.26255 PB" "1.263 PB" " 1.3 PB" "1.57268 PiB" "1.573 PiB" " 1.6 PiB"
- [7,] "1.35911 EB" "1.359 EB" " 1.4 EB" "1.18177 EiB" "1.182 EiB" " 1.2 EiB"
- [8,] " 1.2033 ZB" "1.203 ZB" " 1.2 ZB" "1.49049 ZiB" " 1.49 ZiB" " 1.5 ZiB"
- [9,] "1.35332 YB" "1.353 YB" " 1.4 YB" "1.84401 YiB" "1.844 YiB" " 1.8 YiB"
-[10,] " 1723.7 YB" " 1724 YB" "1724 YB" "1216.27 YiB" " 1216 YiB" "1216 YiB"
+ [2,] " 1.2793 kB" "1.279 kB" " 1.3 kB" " 1.2233 KiB" "1.223 KiB" " 1.2 KiB"
+ [3,] "1.20319 MB" "1.203 MB" " 1.2 MB" "1.29885 MiB" "1.299 MiB" " 1.3 MiB"
+ [4,] "1.16832 GB" "1.168 GB" " 1.2 GB" "1.22854 GiB" "1.229 GiB" " 1.2 GiB"
+ [5,] "1.68539 TB" "1.685 TB" " 1.7 TB" "1.49459 TiB" "1.495 TiB" " 1.5 TiB"
+ [6,] "1.20409 PB" "1.204 PB" " 1.2 PB" "1.30007 PiB" " 1.3 PiB" " 1.3 PiB"
+ [7,] " 1.4313 EB" "1.431 EB" " 1.4 EB" " 1.3716 EiB" "1.372 EiB" " 1.4 EiB"
+ [8,] "1.19649 ZB" "1.196 ZB" " 1.2 ZB" "1.26321 ZiB" "1.263 ZiB" " 1.3 ZiB"
+ [9,] "1.17615 YB" "1.176 YB" " 1.2 YB" "1.30608 YiB" "1.306 YiB" " 1.3 YiB"
+[10,] "1270.14 YB" " 1270 YB" "1270 YB" " 1373.7 YiB" " 1374 YiB" "1374 YiB"
[,7] [,8] [,9]
[1,] " 2 B" " 2 B" " 2 B"
- [2,] "1.23404 K" "1.234 K" " 1.2 K"
- [3,] "1.24529 M" "1.245 M" " 1.2 M"
- [4,] "1.19621 G" "1.196 G" " 1.2 G"
- [5,] "1.21737 T" "1.217 T" " 1.2 T"
- [6,] "1.57268 P" "1.573 P" " 1.6 P"
- [7,] "1.18177 E" "1.182 E" " 1.2 E"
- [8,] "1.49049 Z" " 1.49 Z" " 1.5 Z"
- [9,] "1.84401 Y" "1.844 Y" " 1.8 Y"
-[10,] "1216.27 Y" " 1216 Y" "1216 Y"
+ [2,] " 1.2233 K" "1.223 K" " 1.2 K"
+ [3,] "1.29885 M" "1.299 M" " 1.3 M"
+ [4,] "1.22854 G" "1.229 G" " 1.2 G"
+ [5,] "1.49459 T" "1.495 T" " 1.5 T"
+ [6,] "1.30007 P" " 1.3 P" " 1.3 P"
+ [7,] " 1.3716 E" "1.372 E" " 1.4 E"
+ [8,] "1.26321 Z" "1.263 Z" " 1.3 Z"
+ [9,] "1.30608 Y" "1.306 Y" " 1.3 Y"
+[10,] " 1373.7 Y" " 1374 Y" "1374 Y"
>
> # Auto units, specify digits
> cbind(humanReadable(x=SI2, standard="SI", width=NULL, digits=7),
@@ -99,37 +94,37 @@
+ humanReadable(x=IEC2, standard="Unix", width=NULL, digits=1))
[,1] [,2] [,3] [,4]
[1,] " 1.5000000 B " " 1.500 B " " 1.50 B " " 1.5 B "
- [2,] " 1.1985486 kB" " 1.199 kB" " 1.20 kB" " 1.2 kB"
- [3,] " 1.2068563 MB" " 1.207 MB" " 1.21 MB" " 1.2 MB"
- [4,] " 1.2421751 GB" " 1.242 GB" " 1.24 GB" " 1.2 GB"
- [5,] " 1.2015680 TB" " 1.202 TB" " 1.20 TB" " 1.2 TB"
- [6,] " 1.2625549 PB" " 1.263 PB" " 1.26 PB" " 1.3 PB"
- [7,] " 1.3591145 EB" " 1.359 EB" " 1.36 EB" " 1.4 EB"
- [8,] " 1.2033002 ZB" " 1.203 ZB" " 1.20 ZB" " 1.2 ZB"
- [9,] " 1.3533151 YB" " 1.353 YB" " 1.35 YB" " 1.4 YB"
-[10,] "1723.7026620 YB" "1723.703 YB" "1723.70 YB" "1723.7 YB"
+ [2,] " 1.2793050 kB" " 1.279 kB" " 1.28 kB" " 1.3 kB"
+ [3,] " 1.2031896 MB" " 1.203 MB" " 1.20 MB" " 1.2 MB"
+ [4,] " 1.1683216 GB" " 1.168 GB" " 1.17 GB" " 1.2 GB"
+ [5,] " 1.6853920 TB" " 1.685 TB" " 1.69 TB" " 1.7 TB"
+ [6,] " 1.2040855 PB" " 1.204 PB" " 1.20 PB" " 1.2 PB"
+ [7,] " 1.4313005 EB" " 1.431 EB" " 1.43 EB" " 1.4 EB"
+ [8,] " 1.1964931 ZB" " 1.196 ZB" " 1.20 ZB" " 1.2 ZB"
+ [9,] " 1.1761521 YB" " 1.176 YB" " 1.18 YB" " 1.2 YB"
+[10,] "1270.1414519 YB" "1270.141 YB" "1270.14 YB" "1270.1 YB"
[,5] [,6] [,7] [,8]
[1,] " 1.5000000 B " " 1.500 B " " 1.50 B " " 1.5 B "
- [2,] " 1.2340441 KiB" " 1.234 KiB" " 1.23 KiB" " 1.2 KiB"
- [3,] " 1.2452876 MiB" " 1.245 MiB" " 1.25 MiB" " 1.2 MiB"
- [4,] " 1.1962114 GiB" " 1.196 GiB" " 1.20 GiB" " 1.2 GiB"
- [5,] " 1.2173697 TiB" " 1.217 TiB" " 1.22 TiB" " 1.2 TiB"
- [6,] " 1.5726781 PiB" " 1.573 PiB" " 1.57 PiB" " 1.6 PiB"
- [7,] " 1.1817693 EiB" " 1.182 EiB" " 1.18 EiB" " 1.2 EiB"
- [8,] " 1.4904906 ZiB" " 1.490 ZiB" " 1.49 ZiB" " 1.5 ZiB"
- [9,] " 1.8440055 YiB" " 1.844 YiB" " 1.84 YiB" " 1.8 YiB"
-[10,] "1216.2741325 YiB" "1216.274 YiB" "1216.27 YiB" "1216.3 YiB"
+ [2,] " 1.2232984 KiB" " 1.223 KiB" " 1.22 KiB" " 1.2 KiB"
+ [3,] " 1.2988465 MiB" " 1.299 MiB" " 1.30 MiB" " 1.3 MiB"
+ [4,] " 1.2285433 GiB" " 1.229 GiB" " 1.23 GiB" " 1.2 GiB"
+ [5,] " 1.4945944 TiB" " 1.495 TiB" " 1.49 TiB" " 1.5 TiB"
+ [6,] " 1.3000707 PiB" " 1.300 PiB" " 1.30 PiB" " 1.3 PiB"
+ [7,] " 1.3716001 EiB" " 1.372 EiB" " 1.37 EiB" " 1.4 EiB"
+ [8,] " 1.2632150 ZiB" " 1.263 ZiB" " 1.26 ZiB" " 1.3 ZiB"
+ [9,] " 1.3060808 YiB" " 1.306 YiB" " 1.31 YiB" " 1.3 YiB"
+[10,] "1373.6975294 YiB" "1373.698 YiB" "1373.70 YiB" "1373.7 YiB"
[,9] [,10] [,11] [,12]
[1,] " 1.5000000 B" " 1.500 B" " 1.50 B" " 1.5 B"
- [2,] " 1.2340441 K" " 1.234 K" " 1.23 K" " 1.2 K"
- [3,] " 1.2452876 M" " 1.245 M" " 1.25 M" " 1.2 M"
- [4,] " 1.1962114 G" " 1.196 G" " 1.20 G" " 1.2 G"
- [5,] " 1.2173697 T" " 1.217 T" " 1.22 T" " 1.2 T"
- [6,] " 1.5726781 P" " 1.573 P" " 1.57 P" " 1.6 P"
- [7,] " 1.1817693 E" " 1.182 E" " 1.18 E" " 1.2 E"
- [8,] " 1.4904906 Z" " 1.490 Z" " 1.49 Z" " 1.5 Z"
- [9,] " 1.8440055 Y" " 1.844 Y" " 1.84 Y" " 1.8 Y"
-[10,] "1216.2741325 Y" "1216.274 Y" "1216.27 Y" "1216.3 Y"
+ [2,] " 1.2232984 K" " 1.223 K" " 1.22 K" " 1.2 K"
+ [3,] " 1.2988465 M" " 1.299 M" " 1.30 M" " 1.3 M"
+ [4,] " 1.2285433 G" " 1.229 G" " 1.23 G" " 1.2 G"
+ [5,] " 1.4945944 T" " 1.495 T" " 1.49 T" " 1.5 T"
+ [6,] " 1.3000707 P" " 1.300 P" " 1.30 P" " 1.3 P"
+ [7,] " 1.3716001 E" " 1.372 E" " 1.37 E" " 1.4 E"
+ [8,] " 1.2632150 Z" " 1.263 Z" " 1.26 Z" " 1.3 Z"
+ [9,] " 1.3060808 Y" " 1.306 Y" " 1.31 Y" " 1.3 Y"
+[10,] "1373.6975294 Y" "1373.698 Y" "1373.70 Y" "1373.7 Y"
>
> # Single unit, specify width
> cbind(humanReadable(x=SI1, units="GB", standard="SI", width=7),
@@ -144,26 +139,26 @@
+ )
[,1] [,2] [,3] [,4] [,5] [,6]
[1,] "5e-10 GB" "5e-10 GB" "5e-10 GB" "5e-10 GiB" "5e-10 GiB" "5e-10 GiB"
- [2,] "8e-07 GB" "8e-07 GB" "8e-07 GB" "7e-07 GiB" "7e-07 GiB" "7e-07 GiB"
- [3,] "8e-04 GB" "8e-04 GB" "8e-04 GB" "8e-04 GiB" "8e-04 GiB" "8e-04 GiB"
- [4,] "8e-01 GB" "8e-01 GB" "8e-01 GB" "8e-01 GiB" "8e-01 GiB" "8e-01 GiB"
- [5,] "8e+02 GB" "8e+02 GB" "8e+02 GB" "6e+02 GiB" "6e+02 GiB" "6e+02 GiB"
- [6,] "8e+05 GB" "8e+05 GB" "8e+05 GB" "6e+05 GiB" "6e+05 GiB" "6e+05 GiB"
- [7,] "8e+08 GB" "8e+08 GB" "8e+08 GB" "8e+08 GiB" "8e+08 GiB" "8e+08 GiB"
- [8,] "8e+11 GB" "8e+11 GB" "8e+11 GB" "9e+11 GiB" "9e+11 GiB" "9e+11 GiB"
- [9,] "8e+14 GB" "8e+14 GB" "8e+14 GB" "4e+14 GiB" "4e+14 GiB" "4e+14 GiB"
-[10,] "7e+17 GB" "7e+17 GB" "7e+17 GB" "8e+17 GiB" "8e+17 GiB" "8e+17 GiB"
+ [2,] "7e-07 GB" "7e-07 GB" "7e-07 GB" "7e-07 GiB" "7e-07 GiB" "7e-07 GiB"
+ [3,] "7e-04 GB" "7e-04 GB" "7e-04 GB" "8e-04 GiB" "8e-04 GiB" "8e-04 GiB"
+ [4,] "4e-01 GB" "4e-01 GB" "4e-01 GB" "7e-01 GiB" "7e-01 GiB" "7e-01 GiB"
+ [5,] "7e+02 GB" "7e+02 GB" "7e+02 GB" "7e+02 GiB" "7e+02 GiB" "7e+02 GiB"
+ [6,] "7e+05 GB" "7e+05 GB" "7e+05 GB" "4e+05 GiB" "4e+05 GiB" "4e+05 GiB"
+ [7,] "8e+08 GB" "8e+08 GB" "8e+08 GB" "6e+08 GiB" "6e+08 GiB" "6e+08 GiB"
+ [8,] "7e+11 GB" "7e+11 GB" "7e+11 GB" "8e+11 GiB" "8e+11 GiB" "8e+11 GiB"
+ [9,] "4e+14 GB" "4e+14 GB" "4e+14 GB" "8e+14 GiB" "8e+14 GiB" "8e+14 GiB"
+[10,] "7e+17 GB" "7e+17 GB" "7e+17 GB" "9e+17 GiB" "9e+17 GiB" "9e+17 GiB"
[,7] [,8] [,9]
[1,] "5e-10 G" "5e-10 G" "5e-10 G"
[2,] "7e-07 G" "7e-07 G" "7e-07 G"
[3,] "8e-04 G" "8e-04 G" "8e-04 G"
- [4,] "8e-01 G" "8e-01 G" "8e-01 G"
- [5,] "6e+02 G" "6e+02 G" "6e+02 G"
- [6,] "6e+05 G" "6e+05 G" "6e+05 G"
- [7,] "8e+08 G" "8e+08 G" "8e+08 G"
- [8,] "9e+11 G" "9e+11 G" "9e+11 G"
- [9,] "4e+14 G" "4e+14 G" "4e+14 G"
-[10,] "8e+17 G" "8e+17 G" "8e+17 G"
+ [4,] "7e-01 G" "7e-01 G" "7e-01 G"
+ [5,] "7e+02 G" "7e+02 G" "7e+02 G"
+ [6,] "4e+05 G" "4e+05 G" "4e+05 G"
+ [7,] "6e+08 G" "6e+08 G" "6e+08 G"
+ [8,] "8e+11 G" "8e+11 G" "8e+11 G"
+ [9,] "8e+14 G" "8e+14 G" "8e+14 G"
+[10,] "9e+17 G" "9e+17 G" "9e+17 G"
>
> # Single unit, specify digits
> cbind(humanReadable(x=SI1, units="GB", standard="SI", width=NULL, digits=7),
@@ -181,37 +176,37 @@
+ )
[,1] [,2] [,3] [,4]
[1,] "5.000000e-10 GB" "5.00e-10 GB" "5.0e-10 GB" "5e-10 GB"
- [2,] "7.792994e-07 GB" "7.79e-07 GB" "7.8e-07 GB" "8e-07 GB"
- [3,] "7.796269e-04 GB" "7.80e-04 GB" "7.8e-04 GB" "8e-04 GB"
- [4,] "8.033561e-01 GB" "8.03e-01 GB" "8.0e-01 GB" "8e-01 GB"
- [5,] "8.314840e+02 GB" "8.31e+02 GB" "8.3e+02 GB" "8e+02 GB"
- [6,] "8.018065e+05 GB" "8.02e+05 GB" "8.0e+05 GB" "8e+05 GB"
- [7,] "8.032533e+08 GB" "8.03e+08 GB" "8.0e+08 GB" "8e+08 GB"
- [8,] "7.736007e+11 GB" "7.74e+11 GB" "7.7e+11 GB" "8e+11 GB"
- [9,] "8.033881e+14 GB" "8.03e+14 GB" "8.0e+14 GB" "8e+14 GB"
-[10,] "6.856332e+17 GB" "6.86e+17 GB" "6.9e+17 GB" "7e+17 GB"
+ [2,] "7.414207e-07 GB" "7.41e-07 GB" "7.4e-07 GB" "7e-07 GB"
+ [3,] "7.460970e-04 GB" "7.46e-04 GB" "7.5e-04 GB" "7e-04 GB"
+ [4,] "3.990084e-01 GB" "3.99e-01 GB" "4.0e-01 GB" "4e-01 GB"
+ [5,] "7.334410e+02 GB" "7.33e+02 GB" "7.3e+02 GB" "7e+02 GB"
+ [6,] "6.745084e+05 GB" "6.75e+05 GB" "6.7e+05 GB" "7e+05 GB"
+ [7,] "7.885941e+08 GB" "7.89e+08 GB" "7.9e+08 GB" "8e+08 GB"
+ [8,] "7.496193e+11 GB" "7.50e+11 GB" "7.5e+11 GB" "7e+11 GB"
+ [9,] "3.579472e+14 GB" "3.58e+14 GB" "3.6e+14 GB" "4e+14 GB"
+[10,] "7.498742e+17 GB" "7.50e+17 GB" "7.5e+17 GB" "7e+17 GB"
[,5] [,6] [,7] [,8]
[1,] "4.656613e-10 GiB" "4.66e-10 GiB" "4.7e-10 GiB" "5e-10 GiB"
- [2,] "7.138398e-07 GiB" "7.14e-07 GiB" "7.1e-07 GiB" "7e-07 GiB"
- [3,] "7.600841e-04 GiB" "7.60e-04 GiB" "7.6e-04 GiB" "8e-04 GiB"
- [4,] "8.231780e-01 GiB" "8.23e-01 GiB" "8.2e-01 GiB" "8e-01 GiB"
- [5,] "5.678312e+02 GiB" "5.68e+02 GiB" "5.7e+02 GiB" "6e+02 GiB"
- [6,] "5.506880e+05 GiB" "5.51e+05 GiB" "5.5e+05 GiB" "6e+05 GiB"
- [7,] "8.221636e+08 GiB" "8.22e+08 GiB" "8.2e+08 GiB" "8e+08 GiB"
- [8,] "8.721612e+11 GiB" "8.72e+11 GiB" "8.7e+11 GiB" "9e+11 GiB"
- [9,] "4.356026e+14 GiB" "4.36e+14 GiB" "4.4e+14 GiB" "4e+14 GiB"
-[10,] "8.080586e+17 GiB" "8.08e+17 GiB" "8.1e+17 GiB" "8e+17 GiB"
+ [2,] "7.237764e-07 GiB" "7.24e-07 GiB" "7.2e-07 GiB" "7e-07 GiB"
+ [3,] "7.979097e-04 GiB" "7.98e-04 GiB" "8.0e-04 GiB" "8e-04 GiB"
+ [4,] "6.742969e-01 GiB" "6.74e-01 GiB" "6.7e-01 GiB" "7e-01 GiB"
+ [5,] "7.149879e+02 GiB" "7.15e+02 GiB" "7.1e+02 GiB" "7e+02 GiB"
+ [6,] "4.269769e+05 GiB" "4.27e+05 GiB" "4.3e+05 GiB" "4e+05 GiB"
+ [7,] "6.355649e+08 GiB" "6.36e+08 GiB" "6.4e+08 GiB" "6e+08 GiB"
+ [8,] "7.956378e+11 GiB" "7.96e+11 GiB" "8.0e+11 GiB" "8e+11 GiB"
+ [9,] "7.665900e+14 GiB" "7.67e+14 GiB" "7.7e+14 GiB" "8e+14 GiB"
+[10,] "8.561693e+17 GiB" "8.56e+17 GiB" "8.6e+17 GiB" "9e+17 GiB"
[,9] [,10] [,11] [,12]
[1,] "4.656613e-10 G" "4.66e-10 G" "4.7e-10 G" "5e-10 G"
- [2,] "7.138398e-07 G" "7.14e-07 G" "7.1e-07 G" "7e-07 G"
- [3,] "7.600841e-04 G" "7.60e-04 G" "7.6e-04 G" "8e-04 G"
- [4,] "8.231780e-01 G" "8.23e-01 G" "8.2e-01 G" "8e-01 G"
- [5,] "5.678312e+02 G" "5.68e+02 G" "5.7e+02 G" "6e+02 G"
- [6,] "5.506880e+05 G" "5.51e+05 G" "5.5e+05 G" "6e+05 G"
- [7,] "8.221636e+08 G" "8.22e+08 G" "8.2e+08 G" "8e+08 G"
- [8,] "8.721612e+11 G" "8.72e+11 G" "8.7e+11 G" "9e+11 G"
- [9,] "4.356026e+14 G" "4.36e+14 G" "4.4e+14 G" "4e+14 G"
-[10,] "8.080586e+17 G" "8.08e+17 G" "8.1e+17 G" "8e+17 G"
+ [2,] "7.237764e-07 G" "7.24e-07 G" "7.2e-07 G" "7e-07 G"
+ [3,] "7.979097e-04 G" "7.98e-04 G" "8.0e-04 G" "8e-04 G"
+ [4,] "6.742969e-01 G" "6.74e-01 G" "6.7e-01 G" "7e-01 G"
+ [5,] "7.149879e+02 G" "7.15e+02 G" "7.1e+02 G" "7e+02 G"
+ [6,] "4.269769e+05 G" "4.27e+05 G" "4.3e+05 G" "4e+05 G"
+ [7,] "6.355649e+08 G" "6.36e+08 G" "6.4e+08 G" "6e+08 G"
+ [8,] "7.956378e+11 G" "7.96e+11 G" "8.0e+11 G" "8e+11 G"
+ [9,] "7.665900e+14 G" "7.67e+14 G" "7.7e+14 G" "8e+14 G"
+[10,] "8.561693e+17 G" "8.56e+17 G" "8.6e+17 G" "9e+17 G"
>
>
> stopifnot( is.object_sizes(as.object_sizes( 2^(1:30) ) ) )
@@ -238,4 +233,4 @@
>
> proc.time()
user system elapsed
- 0.368 0.047 0.415
+ 0.427 0.050 0.472
Modified: trunk/gdata/tests/test.read.xls.Rout.save
===================================================================
--- trunk/gdata/tests/test.read.xls.Rout.save 2015-04-25 16:24:41 UTC (rev 1967)
+++ trunk/gdata/tests/test.read.xls.Rout.save 2015-04-25 16:37:00 UTC (rev 1968)
@@ -1,7 +1,7 @@
-R version 3.1.0 Patched (2014-05-26 r65771) -- "Spring Dance"
-Copyright (C) 2014 The R Foundation for Statistical Computing
-Platform: x86_64-apple-darwin13.1.0 (64-bit)
+R version 3.2.0 (2015-04-16) -- "Full of Ingredients"
+Copyright (C) 2015 The R Foundation for Statistical Computing
+Platform: x86_64-apple-darwin13.4.0 (64-bit)
R is free software and comes with ABSOLUTELY NO WARRANTY.
You are welcome to redistribute it under certain conditions.
@@ -846,4 +846,4 @@
>
> proc.time()
user system elapsed
- 12.406 0.727 13.299
+ 14.409 0.863 15.497
Modified: trunk/gdata/tests/test.reorder.factor.Rout.save
===================================================================
--- trunk/gdata/tests/test.reorder.factor.Rout.save 2015-04-25 16:24:41 UTC (rev 1967)
+++ trunk/gdata/tests/test.reorder.factor.Rout.save 2015-04-25 16:37:00 UTC (rev 1968)
@@ -29,13 +29,8 @@
> library(gdata)
gdata: read.xls support for 'XLS' (Excel 97-2004) files ENABLED.
-gdata: Unable to load perl libaries needed by read.xls()
-gdata: to support 'XLSX' (Excel 2007+) files.
+gdata: read.xls support for 'XLSX' (Excel 2007+) files ENABLED.
-gdata: Run the function 'installXLSXsupport()'
-gdata: to automatically download and install the perl
-gdata: libaries needed to support Excel XLS and XLSX formats.
-
Attaching package: 'gdata'
The following object is masked from 'package:stats':
@@ -58,4 +53,4 @@
>
> proc.time()
user system elapsed
- 0.300 0.049 0.345
+ 0.357 0.048 0.401
Modified: trunk/gdata/tests/tests.write.fwf.Rout.save
===================================================================
--- trunk/gdata/tests/tests.write.fwf.Rout.save 2015-04-25 16:24:41 UTC (rev 1967)
+++ trunk/gdata/tests/tests.write.fwf.Rout.save 2015-04-25 16:37:00 UTC (rev 1968)
@@ -25,13 +25,8 @@
> library(gdata)
gdata: read.xls support for 'XLS' (Excel 97-2004) files ENABLED.
-gdata: Unable to load perl libaries needed by read.xls()
-gdata: to support 'XLSX' (Excel 2007+) files.
+gdata: read.xls support for 'XLSX' (Excel 2007+) files ENABLED.
-gdata: Run the function 'installXLSXsupport()'
-gdata: to automatically download and install the perl
-gdata: libaries needed to support Excel XLS and XLSX formats.
-
Attaching package: 'gdata'
The following object is masked from 'package:stats':
@@ -85,7 +80,7 @@
> ## NA should be -
> write.fwf(x=testData, na="-")
num1 num2 num3 int1 fac1 fac2 cha1 cha2 Date POSIXt
- 1 - - 1 - f q - 1900-01-01 1900-01-01 01:01:01
+ 1 - - 1 - f q - 1900-01-01 1900-01-01 01:01:01
2 1.0 733070.3 2 a g r longer - 1900-01-01 01:01:01
3 1.5 1214213.8 3 b h s y 1900-01-01 1900-01-01 01:01:01
4 2.0 553823.8 4 c i t x 1900-01-01 1900-01-01 01:01:01
@@ -95,21 +90,21 @@
8 4.0 1053686.6 6 g m x t 1900-01-01 1900-01-01 01:01:01
9 4.5 971024.2 7 h n y s 1900-01-01 1900-01-01 01:01:01
10 5.0 631193.4 8 i o z r 1900-01-01 1900-01-01 01:01:01
-- 5.5 879431.1 9 hjh - - q 1900-01-01 1900-01-01 01:01:01
+ - 5.5 879431.1 9 hjh - - q 1900-01-01 1900-01-01 01:01:01
> ## NA should be -NA-
> write.fwf(x=testData, na="-NA-")
num1 num2 num3 int1 fac1 fac2 cha1 cha2 Date POSIXt
- 1 -NA- -NA- 1 -NA- f q -NA- 1900-01-01 1900-01-01 01:01:01
- 2 1.0 733070.3 2 a g r longer -NA- 1900-01-01 01:01:01
- 3 1.5 1214213.8 3 b h s y 1900-01-01 1900-01-01 01:01:01
- 4 2.0 553823.8 4 c i t x 1900-01-01 1900-01-01 01:01:01
- 5 2.5 1085022.9 -NA- d j u w 1900-01-01 -NA-
- 6 3.0 571063.9 4 e k v v 1900-01-01 1900-01-01 01:01:01
- 7 3.5 606718.4 5 f l w u 1900-01-01 1900-01-01 01:01:01
- 8 4.0 1053686.6 6 g m x t 1900-01-01 1900-01-01 01:01:01
- 9 4.5 971024.2 7 h n y s 1900-01-01 1900-01-01 01:01:01
-10 5.0 631193.4 8 i o z r 1900-01-01 1900-01-01 01:01:01
--NA- 5.5 879431.1 9 hjh -NA- -NA- q 1900-01-01 1900-01-01 01:01:01
+ 1 -NA- -NA- 1 -NA- f q -NA- 1900-01-01 1900-01-01 01:01:01
+ 2 1.0 733070.3 2 a g r longer -NA- 1900-01-01 01:01:01
+ 3 1.5 1214213.8 3 b h s y 1900-01-01 1900-01-01 01:01:01
+ 4 2.0 553823.8 4 c i t x 1900-01-01 1900-01-01 01:01:01
+ 5 2.5 1085022.9 -NA- d j u w 1900-01-01 -NA-
+ 6 3.0 571063.9 4 e k v v 1900-01-01 1900-01-01 01:01:01
+ 7 3.5 606718.4 5 f l w u 1900-01-01 1900-01-01 01:01:01
+ 8 4.0 1053686.6 6 g m x t 1900-01-01 1900-01-01 01:01:01
+ 9 4.5 971024.2 7 h n y s 1900-01-01 1900-01-01 01:01:01
+ 10 5.0 631193.4 8 i o z r 1900-01-01 1900-01-01 01:01:01
+-NA- 5.5 879431.1 9 hjh -NA- -NA- q 1900-01-01 1900-01-01 01:01:01
>
> ## Some other separator than space
> write.fwf(testData[, 1:4], sep="-mySep-")
@@ -236,4 +231,4 @@
>
> proc.time()
user system elapsed
- 0.413 0.044 0.448
+ 0.476 0.053 0.524
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2015-04-25 16:46:19
|
Revision: 1969
http://sourceforge.net/p/r-gregmisc/code/1969
Author: warnes
Date: 2015-04-25 16:46:12 +0000 (Sat, 25 Apr 2015)
Log Message:
-----------
'test.humanReadable.R' needed set.seed() to make the results consistent.
Modified Paths:
--------------
trunk/gdata/tests/test.humanReadable.R
trunk/gdata/tests/test.humanReadable.Rout.save
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.R
===================================================================
--- trunk/gdata/tests/test.humanReadable.R 2015-04-25 16:37:00 UTC (rev 1968)
+++ trunk/gdata/tests/test.humanReadable.R 2015-04-25 16:46:12 UTC (rev 1969)
@@ -2,6 +2,8 @@
options(humanReadable=FALSE)
+set.seed(123456)
+
baseSI <- 10
powerSI <- seq(from=0, to=27, by=3)
SI0 <- (baseSI)^powerSI
Modified: trunk/gdata/tests/test.humanReadable.Rout.save
===================================================================
--- trunk/gdata/tests/test.humanReadable.Rout.save 2015-04-25 16:37:00 UTC (rev 1968)
+++ trunk/gdata/tests/test.humanReadable.Rout.save 2015-04-25 16:46:12 UTC (rev 1969)
@@ -33,6 +33,8 @@
>
> options(humanReadable=FALSE)
>
+> set.seed(123456)
+>
> baseSI <- 10
> powerSI <- seq(from=0, to=27, by=3)
> SI0 <- (baseSI)^powerSI
@@ -58,26 +60,26 @@
+ humanReadable(x=IEC2, standard="Unix", width=3))
[,1] [,2] [,3] [,4] [,5] [,6]
[1,] " 2 B " " 2 B " " 2 B " " 2 B " " 2 B " " 2 B "
- [2,] " 1.2793 kB" "1.279 kB" " 1.3 kB" " 1.2233 KiB" "1.223 KiB" " 1.2 KiB"
- [3,] "1.20319 MB" "1.203 MB" " 1.2 MB" "1.29885 MiB" "1.299 MiB" " 1.3 MiB"
- [4,] "1.16832 GB" "1.168 GB" " 1.2 GB" "1.22854 GiB" "1.229 GiB" " 1.2 GiB"
- [5,] "1.68539 TB" "1.685 TB" " 1.7 TB" "1.49459 TiB" "1.495 TiB" " 1.5 TiB"
- [6,] "1.20409 PB" "1.204 PB" " 1.2 PB" "1.30007 PiB" " 1.3 PiB" " 1.3 PiB"
- [7,] " 1.4313 EB" "1.431 EB" " 1.4 EB" " 1.3716 EiB" "1.372 EiB" " 1.4 EiB"
- [8,] "1.19649 ZB" "1.196 ZB" " 1.2 ZB" "1.26321 ZiB" "1.263 ZiB" " 1.3 ZiB"
- [9,] "1.17615 YB" "1.176 YB" " 1.2 YB" "1.30608 YiB" "1.306 YiB" " 1.3 YiB"
-[10,] "1270.14 YB" " 1270 YB" "1270 YB" " 1373.7 YiB" " 1374 YiB" "1374 YiB"
+ [2,] "1.54215 kB" "1.542 kB" " 1.5 kB" "1.18582 KiB" "1.186 KiB" " 1.2 KiB"
+ [3,] "1.20064 MB" "1.201 MB" " 1.2 MB" "1.19003 MiB" " 1.19 MiB" " 1.2 MiB"
+ [4,] "1.25207 GB" "1.252 GB" " 1.3 GB" "1.54448 GiB" "1.544 GiB" " 1.5 GiB"
+ [5,] "1.18121 TB" "1.181 TB" " 1.2 TB" "1.27667 TiB" "1.277 TiB" " 1.3 TiB"
+ [6,] " 1.1853 PB" "1.185 PB" " 1.2 PB" "1.18733 PiB" "1.187 PiB" " 1.2 PiB"
+ [7,] " 1.1678 EB" "1.168 EB" " 1.2 EB" "1.46271 EiB" "1.463 EiB" " 1.5 EiB"
+ [8,] "1.18275 ZB" "1.183 ZB" " 1.2 ZB" "1.62382 ZiB" "1.624 ZiB" " 1.6 ZiB"
+ [9,] "1.18568 YB" "1.186 YB" " 1.2 YB" "1.19557 YiB" "1.196 YiB" " 1.2 YiB"
+[10,] "1501.49 YB" " 1501 YB" "1501 YB" "1750.35 YiB" " 1750 YiB" "1750 YiB"
[,7] [,8] [,9]
[1,] " 2 B" " 2 B" " 2 B"
- [2,] " 1.2233 K" "1.223 K" " 1.2 K"
- [3,] "1.29885 M" "1.299 M" " 1.3 M"
- [4,] "1.22854 G" "1.229 G" " 1.2 G"
- [5,] "1.49459 T" "1.495 T" " 1.5 T"
- [6,] "1.30007 P" " 1.3 P" " 1.3 P"
- [7,] " 1.3716 E" "1.372 E" " 1.4 E"
- [8,] "1.26321 Z" "1.263 Z" " 1.3 Z"
- [9,] "1.30608 Y" "1.306 Y" " 1.3 Y"
-[10,] " 1373.7 Y" " 1374 Y" "1374 Y"
+ [2,] "1.18582 K" "1.186 K" " 1.2 K"
+ [3,] "1.19003 M" " 1.19 M" " 1.2 M"
+ [4,] "1.54448 G" "1.544 G" " 1.5 G"
+ [5,] "1.27667 T" "1.277 T" " 1.3 T"
+ [6,] "1.18733 P" "1.187 P" " 1.2 P"
+ [7,] "1.46271 E" "1.463 E" " 1.5 E"
+ [8,] "1.62382 Z" "1.624 Z" " 1.6 Z"
+ [9,] "1.19557 Y" "1.196 Y" " 1.2 Y"
+[10,] "1750.35 Y" " 1750 Y" "1750 Y"
>
> # Auto units, specify digits
> cbind(humanReadable(x=SI2, standard="SI", width=NULL, digits=7),
@@ -94,37 +96,37 @@
+ humanReadable(x=IEC2, standard="Unix", width=NULL, digits=1))
[,1] [,2] [,3] [,4]
[1,] " 1.5000000 B " " 1.500 B " " 1.50 B " " 1.5 B "
- [2,] " 1.2793050 kB" " 1.279 kB" " 1.28 kB" " 1.3 kB"
- [3,] " 1.2031896 MB" " 1.203 MB" " 1.20 MB" " 1.2 MB"
- [4,] " 1.1683216 GB" " 1.168 GB" " 1.17 GB" " 1.2 GB"
- [5,] " 1.6853920 TB" " 1.685 TB" " 1.69 TB" " 1.7 TB"
- [6,] " 1.2040855 PB" " 1.204 PB" " 1.20 PB" " 1.2 PB"
- [7,] " 1.4313005 EB" " 1.431 EB" " 1.43 EB" " 1.4 EB"
- [8,] " 1.1964931 ZB" " 1.196 ZB" " 1.20 ZB" " 1.2 ZB"
- [9,] " 1.1761521 YB" " 1.176 YB" " 1.18 YB" " 1.2 YB"
-[10,] "1270.1414519 YB" "1270.141 YB" "1270.14 YB" "1270.1 YB"
+ [2,] " 1.5421535 kB" " 1.542 kB" " 1.54 kB" " 1.5 kB"
+ [3,] " 1.2006426 MB" " 1.201 MB" " 1.20 MB" " 1.2 MB"
+ [4,] " 1.2520737 GB" " 1.252 GB" " 1.25 GB" " 1.3 GB"
+ [5,] " 1.1812105 TB" " 1.181 TB" " 1.18 TB" " 1.2 TB"
+ [6,] " 1.1853010 PB" " 1.185 PB" " 1.19 PB" " 1.2 PB"
+ [7,] " 1.1678048 EB" " 1.168 EB" " 1.17 EB" " 1.2 EB"
+ [8,] " 1.1827531 ZB" " 1.183 ZB" " 1.18 ZB" " 1.2 ZB"
+ [9,] " 1.1856788 YB" " 1.186 YB" " 1.19 YB" " 1.2 YB"
+[10,] "1501.4852409 YB" "1501.485 YB" "1501.49 YB" "1501.5 YB"
[,5] [,6] [,7] [,8]
[1,] " 1.5000000 B " " 1.500 B " " 1.50 B " " 1.5 B "
- [2,] " 1.2232984 KiB" " 1.223 KiB" " 1.22 KiB" " 1.2 KiB"
- [3,] " 1.2988465 MiB" " 1.299 MiB" " 1.30 MiB" " 1.3 MiB"
- [4,] " 1.2285433 GiB" " 1.229 GiB" " 1.23 GiB" " 1.2 GiB"
- [5,] " 1.4945944 TiB" " 1.495 TiB" " 1.49 TiB" " 1.5 TiB"
- [6,] " 1.3000707 PiB" " 1.300 PiB" " 1.30 PiB" " 1.3 PiB"
- [7,] " 1.3716001 EiB" " 1.372 EiB" " 1.37 EiB" " 1.4 EiB"
- [8,] " 1.2632150 ZiB" " 1.263 ZiB" " 1.26 ZiB" " 1.3 ZiB"
- [9,] " 1.3060808 YiB" " 1.306 YiB" " 1.31 YiB" " 1.3 YiB"
-[10,] "1373.6975294 YiB" "1373.698 YiB" "1373.70 YiB" "1373.7 YiB"
+ [2,] " 1.1858248 KiB" " 1.186 KiB" " 1.19 KiB" " 1.2 KiB"
+ [3,] " 1.1900302 MiB" " 1.190 MiB" " 1.19 MiB" " 1.2 MiB"
+ [4,] " 1.5444791 GiB" " 1.544 GiB" " 1.54 GiB" " 1.5 GiB"
+ [5,] " 1.2766723 TiB" " 1.277 TiB" " 1.28 TiB" " 1.3 TiB"
+ [6,] " 1.1873270 PiB" " 1.187 PiB" " 1.19 PiB" " 1.2 PiB"
+ [7,] " 1.4627144 EiB" " 1.463 EiB" " 1.46 EiB" " 1.5 EiB"
+ [8,] " 1.6238214 ZiB" " 1.624 ZiB" " 1.62 ZiB" " 1.6 ZiB"
+ [9,] " 1.1955693 YiB" " 1.196 YiB" " 1.20 YiB" " 1.2 YiB"
+[10,] "1750.3547972 YiB" "1750.355 YiB" "1750.35 YiB" "1750.4 YiB"
[,9] [,10] [,11] [,12]
[1,] " 1.5000000 B" " 1.500 B" " 1.50 B" " 1.5 B"
- [2,] " 1.2232984 K" " 1.223 K" " 1.22 K" " 1.2 K"
- [3,] " 1.2988465 M" " 1.299 M" " 1.30 M" " 1.3 M"
- [4,] " 1.2285433 G" " 1.229 G" " 1.23 G" " 1.2 G"
- [5,] " 1.4945944 T" " 1.495 T" " 1.49 T" " 1.5 T"
- [6,] " 1.3000707 P" " 1.300 P" " 1.30 P" " 1.3 P"
- [7,] " 1.3716001 E" " 1.372 E" " 1.37 E" " 1.4 E"
- [8,] " 1.2632150 Z" " 1.263 Z" " 1.26 Z" " 1.3 Z"
- [9,] " 1.3060808 Y" " 1.306 Y" " 1.31 Y" " 1.3 Y"
-[10,] "1373.6975294 Y" "1373.698 Y" "1373.70 Y" "1373.7 Y"
+ [2,] " 1.1858248 K" " 1.186 K" " 1.19 K" " 1.2 K"
+ [3,] " 1.1900302 M" " 1.190 M" " 1.19 M" " 1.2 M"
+ [4,] " 1.5444791 G" " 1.544 G" " 1.54 G" " 1.5 G"
+ [5,] " 1.2766723 T" " 1.277 T" " 1.28 T" " 1.3 T"
+ [6,] " 1.1873270 P" " 1.187 P" " 1.19 P" " 1.2 P"
+ [7,] " 1.4627144 E" " 1.463 E" " 1.46 E" " 1.5 E"
+ [8,] " 1.6238214 Z" " 1.624 Z" " 1.62 Z" " 1.6 Z"
+ [9,] " 1.1955693 Y" " 1.196 Y" " 1.20 Y" " 1.2 Y"
+[10,] "1750.3547972 Y" "1750.355 Y" "1750.35 Y" "1750.4 Y"
>
> # Single unit, specify width
> cbind(humanReadable(x=SI1, units="GB", standard="SI", width=7),
@@ -139,25 +141,25 @@
+ )
[,1] [,2] [,3] [,4] [,5] [,6]
[1,] "5e-10 GB" "5e-10 GB" "5e-10 GB" "5e-10 GiB" "5e-10 GiB" "5e-10 GiB"
- [2,] "7e-07 GB" "7e-07 GB" "7e-07 GB" "7e-07 GiB" "7e-07 GiB" "7e-07 GiB"
- [3,] "7e-04 GB" "7e-04 GB" "7e-04 GB" "8e-04 GiB" "8e-04 GiB" "8e-04 GiB"
- [4,] "4e-01 GB" "4e-01 GB" "4e-01 GB" "7e-01 GiB" "7e-01 GiB" "7e-01 GiB"
- [5,] "7e+02 GB" "7e+02 GB" "7e+02 GB" "7e+02 GiB" "7e+02 GiB" "7e+02 GiB"
- [6,] "7e+05 GB" "7e+05 GB" "7e+05 GB" "4e+05 GiB" "4e+05 GiB" "4e+05 GiB"
- [7,] "8e+08 GB" "8e+08 GB" "8e+08 GB" "6e+08 GiB" "6e+08 GiB" "6e+08 GiB"
+ [2,] "8e-07 GB" "8e-07 GB" "8e-07 GB" "6e-07 GiB" "6e-07 GiB" "6e-07 GiB"
+ [3,] "8e-04 GB" "8e-04 GB" "8e-04 GB" "8e-04 GiB" "8e-04 GiB" "8e-04 GiB"
+ [4,] "7e-01 GB" "7e-01 GB" "7e-01 GB" "4e-01 GiB" "4e-01 GiB" "4e-01 GiB"
+ [5,] "6e+02 GB" "6e+02 GB" "6e+02 GB" "3e+02 GiB" "3e+02 GiB" "3e+02 GiB"
+ [6,] "6e+05 GB" "6e+05 GB" "6e+05 GB" "4e+05 GiB" "4e+05 GiB" "4e+05 GiB"
+ [7,] "5e+08 GB" "5e+08 GB" "5e+08 GB" "5e+08 GiB" "5e+08 GiB" "5e+08 GiB"
[8,] "7e+11 GB" "7e+11 GB" "7e+11 GB" "8e+11 GiB" "8e+11 GiB" "8e+11 GiB"
- [9,] "4e+14 GB" "4e+14 GB" "4e+14 GB" "8e+14 GiB" "8e+14 GiB" "8e+14 GiB"
-[10,] "7e+17 GB" "7e+17 GB" "7e+17 GB" "9e+17 GiB" "9e+17 GiB" "9e+17 GiB"
+ [9,] "3e+14 GB" "3e+14 GB" "3e+14 GB" "9e+14 GiB" "9e+14 GiB" "9e+14 GiB"
+[10,] "8e+17 GB" "8e+17 GB" "8e+17 GB" "9e+17 GiB" "9e+17 GiB" "9e+17 GiB"
[,7] [,8] [,9]
[1,] "5e-10 G" "5e-10 G" "5e-10 G"
- [2,] "7e-07 G" "7e-07 G" "7e-07 G"
+ [2,] "6e-07 G" "6e-07 G" "6e-07 G"
[3,] "8e-04 G" "8e-04 G" "8e-04 G"
- [4,] "7e-01 G" "7e-01 G" "7e-01 G"
- [5,] "7e+02 G" "7e+02 G" "7e+02 G"
+ [4,] "4e-01 G" "4e-01 G" "4e-01 G"
+ [5,] "3e+02 G" "3e+02 G" "3e+02 G"
[6,] "4e+05 G" "4e+05 G" "4e+05 G"
- [7,] "6e+08 G" "6e+08 G" "6e+08 G"
+ [7,] "5e+08 G" "5e+08 G" "5e+08 G"
[8,] "8e+11 G" "8e+11 G" "8e+11 G"
- [9,] "8e+14 G" "8e+14 G" "8e+14 G"
+ [9,] "9e+14 G" "9e+14 G" "9e+14 G"
[10,] "9e+17 G" "9e+17 G" "9e+17 G"
>
> # Single unit, specify digits
@@ -176,37 +178,37 @@
+ )
[,1] [,2] [,3] [,4]
[1,] "5.000000e-10 GB" "5.00e-10 GB" "5.0e-10 GB" "5e-10 GB"
- [2,] "7.414207e-07 GB" "7.41e-07 GB" "7.4e-07 GB" "7e-07 GB"
- [3,] "7.460970e-04 GB" "7.46e-04 GB" "7.5e-04 GB" "7e-04 GB"
- [4,] "3.990084e-01 GB" "3.99e-01 GB" "4.0e-01 GB" "4e-01 GB"
- [5,] "7.334410e+02 GB" "7.33e+02 GB" "7.3e+02 GB" "7e+02 GB"
- [6,] "6.745084e+05 GB" "6.75e+05 GB" "6.7e+05 GB" "7e+05 GB"
- [7,] "7.885941e+08 GB" "7.89e+08 GB" "7.9e+08 GB" "8e+08 GB"
- [8,] "7.496193e+11 GB" "7.50e+11 GB" "7.5e+11 GB" "7e+11 GB"
- [9,] "3.579472e+14 GB" "3.58e+14 GB" "3.6e+14 GB" "4e+14 GB"
-[10,] "7.498742e+17 GB" "7.50e+17 GB" "7.5e+17 GB" "7e+17 GB"
+ [2,] "7.993163e-07 GB" "7.99e-07 GB" "8.0e-07 GB" "8e-07 GB"
+ [3,] "7.900375e-04 GB" "7.90e-04 GB" "7.9e-04 GB" "8e-04 GB"
+ [4,] "6.619855e-01 GB" "6.62e-01 GB" "6.6e-01 GB" "7e-01 GB"
+ [5,] "6.311259e+02 GB" "6.31e+02 GB" "6.3e+02 GB" "6e+02 GB"
+ [6,] "6.440324e+05 GB" "6.44e+05 GB" "6.4e+05 GB" "6e+05 GB"
+ [7,] "4.994386e+08 GB" "4.99e+08 GB" "5.0e+08 GB" "5e+08 GB"
+ [8,] "7.277869e+11 GB" "7.28e+11 GB" "7.3e+11 GB" "7e+11 GB"
+ [9,] "3.291745e+14 GB" "3.29e+14 GB" "3.3e+14 GB" "3e+14 GB"
+[10,] "8.313511e+17 GB" "8.31e+17 GB" "8.3e+17 GB" "8e+17 GB"
[,5] [,6] [,7] [,8]
[1,] "4.656613e-10 GiB" "4.66e-10 GiB" "4.7e-10 GiB" "5e-10 GiB"
- [2,] "7.237764e-07 GiB" "7.24e-07 GiB" "7.2e-07 GiB" "7e-07 GiB"
- [3,] "7.979097e-04 GiB" "7.98e-04 GiB" "8.0e-04 GiB" "8e-04 GiB"
- [4,] "6.742969e-01 GiB" "6.74e-01 GiB" "6.7e-01 GiB" "7e-01 GiB"
- [5,] "7.149879e+02 GiB" "7.15e+02 GiB" "7.1e+02 GiB" "7e+02 GiB"
- [6,] "4.269769e+05 GiB" "4.27e+05 GiB" "4.3e+05 GiB" "4e+05 GiB"
- [7,] "6.355649e+08 GiB" "6.36e+08 GiB" "6.4e+08 GiB" "6e+08 GiB"
- [8,] "7.956378e+11 GiB" "7.96e+11 GiB" "8.0e+11 GiB" "8e+11 GiB"
- [9,] "7.665900e+14 GiB" "7.67e+14 GiB" "7.7e+14 GiB" "8e+14 GiB"
-[10,] "8.561693e+17 GiB" "8.56e+17 GiB" "8.6e+17 GiB" "9e+17 GiB"
+ [2,] "5.975956e-07 GiB" "5.98e-07 GiB" "6.0e-07 GiB" "6e-07 GiB"
+ [3,] "7.764672e-04 GiB" "7.76e-04 GiB" "7.8e-04 GiB" "8e-04 GiB"
+ [4,] "4.459146e-01 GiB" "4.46e-01 GiB" "4.5e-01 GiB" "4e-01 GiB"
+ [5,] "2.985889e+02 GiB" "2.99e+02 GiB" "3.0e+02 GiB" "3e+02 GiB"
+ [6,] "4.209112e+05 GiB" "4.21e+05 GiB" "4.2e+05 GiB" "4e+05 GiB"
+ [7,] "4.983449e+08 GiB" "4.98e+08 GiB" "5.0e+08 GiB" "5e+08 GiB"
+ [8,] "7.751081e+11 GiB" "7.75e+11 GiB" "7.8e+11 GiB" "8e+11 GiB"
+ [9,] "8.756173e+14 GiB" "8.76e+14 GiB" "8.8e+14 GiB" "9e+14 GiB"
+[10,] "9.390947e+17 GiB" "9.39e+17 GiB" "9.4e+17 GiB" "9e+17 GiB"
[,9] [,10] [,11] [,12]
[1,] "4.656613e-10 G" "4.66e-10 G" "4.7e-10 G" "5e-10 G"
- [2,] "7.237764e-07 G" "7.24e-07 G" "7.2e-07 G" "7e-07 G"
- [3,] "7.979097e-04 G" "7.98e-04 G" "8.0e-04 G" "8e-04 G"
- [4,] "6.742969e-01 G" "6.74e-01 G" "6.7e-01 G" "7e-01 G"
- [5,] "7.149879e+02 G" "7.15e+02 G" "7.1e+02 G" "7e+02 G"
- [6,] "4.269769e+05 G" "4.27e+05 G" "4.3e+05 G" "4e+05 G"
- [7,] "6.355649e+08 G" "6.36e+08 G" "6.4e+08 G" "6e+08 G"
- [8,] "7.956378e+11 G" "7.96e+11 G" "8.0e+11 G" "8e+11 G"
- [9,] "7.665900e+14 G" "7.67e+14 G" "7.7e+14 G" "8e+14 G"
-[10,] "8.561693e+17 G" "8.56e+17 G" "8.6e+17 G" "9e+17 G"
+ [2,] "5.975956e-07 G" "5.98e-07 G" "6.0e-07 G" "6e-07 G"
+ [3,] "7.764672e-04 G" "7.76e-04 G" "7.8e-04 G" "8e-04 G"
+ [4,] "4.459146e-01 G" "4.46e-01 G" "4.5e-01 G" "4e-01 G"
+ [5,] "2.985889e+02 G" "2.99e+02 G" "3.0e+02 G" "3e+02 G"
+ [6,] "4.209112e+05 G" "4.21e+05 G" "4.2e+05 G" "4e+05 G"
+ [7,] "4.983449e+08 G" "4.98e+08 G" "5.0e+08 G" "5e+08 G"
+ [8,] "7.751081e+11 G" "7.75e+11 G" "7.8e+11 G" "8e+11 G"
+ [9,] "8.756173e+14 G" "8.76e+14 G" "8.8e+14 G" "9e+14 G"
+[10,] "9.390947e+17 G" "9.39e+17 G" "9.4e+17 G" "9e+17 G"
>
>
> stopifnot( is.object_sizes(as.object_sizes( 2^(1:30) ) ) )
@@ -233,4 +235,4 @@
>
> proc.time()
user system elapsed
- 0.427 0.050 0.472
+ 0.410 0.050 0.451
Modified: trunk/gdata/tests/test.read.xls.Rout.save
===================================================================
--- trunk/gdata/tests/test.read.xls.Rout.save 2015-04-25 16:37:00 UTC (rev 1968)
+++ trunk/gdata/tests/test.read.xls.Rout.save 2015-04-25 16:46:12 UTC (rev 1969)
@@ -846,4 +846,4 @@
>
> proc.time()
user system elapsed
- 14.409 0.863 15.497
+ 14.104 0.888 15.221
Modified: trunk/gdata/tests/test.reorder.factor.Rout.save
===================================================================
--- trunk/gdata/tests/test.reorder.factor.Rout.save 2015-04-25 16:37:00 UTC (rev 1968)
+++ trunk/gdata/tests/test.reorder.factor.Rout.save 2015-04-25 16:46:12 UTC (rev 1969)
@@ -53,4 +53,4 @@
>
> proc.time()
user system elapsed
- 0.357 0.048 0.401
+ 0.339 0.046 0.379
Modified: trunk/gdata/tests/tests.write.fwf.Rout.save
===================================================================
--- trunk/gdata/tests/tests.write.fwf.Rout.save 2015-04-25 16:37:00 UTC (rev 1968)
+++ trunk/gdata/tests/tests.write.fwf.Rout.save 2015-04-25 16:46:12 UTC (rev 1969)
@@ -231,4 +231,4 @@
>
> proc.time()
user system elapsed
- 0.476 0.053 0.524
+ 0.434 0.049 0.475
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2015-04-29 02:00:23
|
Revision: 1990
http://sourceforge.net/p/r-gregmisc/code/1990
Author: warnes
Date: 2015-04-29 02:00:21 +0000 (Wed, 29 Apr 2015)
Log Message:
-----------
Displaying all the latin1 characters for diff isn't reliable across platforms. Simply summarize the latin1 data instead.
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 01:29:30 UTC (rev 1989)
+++ trunk/gdata/tests/test.humanReadable.Rout.save 2015-04-29 02:00:21 UTC (rev 1990)
@@ -235,4 +235,4 @@
>
> proc.time()
user system elapsed
- 0.384 0.045 0.421
+ 0.392 0.049 0.433
Modified: trunk/gdata/tests/test.read.xls.R
===================================================================
--- trunk/gdata/tests/test.read.xls.R 2015-04-29 01:29:30 UTC (rev 1989)
+++ trunk/gdata/tests/test.read.xls.R 2015-04-29 02:00:21 UTC (rev 1990)
@@ -84,8 +84,10 @@
example.x.skip <- read.xls(exampleFileX, sheet=2, blank.lines.skip=FALSE)
example.x.skip
} else {
- cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
- cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
+ cat("************************************************************\n")
+ cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
+ cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
+ cat("************************************************************\n")
}
@@ -95,16 +97,24 @@
latin1FileX <- file.path(path.package('gdata'),'xls', 'latin-1.xlsx')
example.latin1 <- read.xls(latin1File, fileEncoding='latin1')
-example.latin1
+charTab <- function(x) {
+ x <- as.matrix(x)
+ x <- x[!is.na(x)]
+ table( nchar(x, 'bytes' ) )
+}
+charTab(example.latin1)
+
if( 'XLSX' %in% xlsFormats() )
{
example.latin1.x <- read.xls(latin1FileX, fileEncoding='latin1')
- example.latin1.x
+ charTab(example.latin1)
} else {
+ cat("************************************************************\n")
cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
- cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
- }
+ cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
+ cat("************************************************************\n")
+}
## Check handling of very wide file
Modified: trunk/gdata/tests/test.read.xls.Rout.save
===================================================================
--- trunk/gdata/tests/test.read.xls.Rout.save 2015-04-29 01:29:30 UTC (rev 1989)
+++ trunk/gdata/tests/test.read.xls.Rout.save 2015-04-29 02:00:21 UTC (rev 1990)
@@ -692,8 +692,10 @@
+ example.x.skip <- read.xls(exampleFileX, sheet=2, blank.lines.skip=FALSE)
+ example.x.skip
+ } else {
-+ cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
-+ cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
++ cat("************************************************************\n")
++ cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
++ cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
++ cat("************************************************************\n")
+ }
X D E. F G Factor
1 FirstRow 1 NA NA NA Red
@@ -709,646 +711,30 @@
> latin1FileX <- file.path(path.package('gdata'),'xls', 'latin-1.xlsx')
>
> example.latin1 <- read.xls(latin1File, fileEncoding='latin1')
-> example.latin1
- X.á. X.Á. X.â. X.Â. X.à. X.À. X.å. X.Å.
-1 aacute á small a, acute accent NA NA NA NA NA
-2 Aacute Á capital A, acute accent NA NA NA NA NA
-3 acirc â small a, circumflex accent NA NA NA NA NA
-4 Acirc  capital A, circumflex accent NA NA NA NA NA
-5 agrave à small a, grave accent NA NA NA NA NA
-6 Agrave À capital A, grave accent NA NA NA NA NA
-7 aring å small a, ring NA NA NA NA NA
-8 Aring Å capital A, ring NA NA NA NA NA
-9 atilde ã small a, tilde NA NA NA NA NA
-10 Atilde à capital A, tilde NA NA NA NA NA
-11 auml ä small a, dieresis or umlautmark NA NA NA NA NA
-12 Auml Ä capital A, dieresis or umlautmark NA NA NA NA NA
-13 aelig æ small ae diphthong (ligature) NA NA NA NA NA
-14 AElig Æ capital AE diphthong(ligature) NA NA NA NA NA
-15 ccedil ç small c, cedilla NA NA NA NA NA
-16 Ccedil Ç capital C, cedilla NA NA NA NA NA
-17 eth ð small eth, Icelandic NA NA NA NA NA
-18 ETH Ð capital Eth, Icelandic NA NA NA NA NA
-19 eacute é small e, acute accent NA NA NA NA NA
-20 Eacute É capital E, acute accent NA NA NA NA NA
-21 ecirc ê small e, circumflex accent NA NA NA NA NA
-22 Ecirc Ê capital E, circumflex accent NA NA NA NA NA
-23 egrave è small e, grave accent NA NA NA NA NA
-24 Egrave È capital E, grave accent NA NA NA NA NA
-25 euml ë small e, dieresis or umlautmark NA NA NA NA NA
-26 Euml Ë capital E, dieresis or umlautmark NA NA NA NA NA
-27 iacute í small i, acute accent NA NA NA NA NA
-28 Iacute Í capital I, acute accent NA NA NA NA NA
-29 icirc î small i, circumflex accent NA NA NA NA NA
-30 Icirc Î capital I, circumflex accent NA NA NA NA NA
-31 igrave ì small i, grave accent NA NA NA NA NA
-32 Igrave Ì capital I, grave accent NA NA NA NA NA
-33 iuml ï small i, dieresis or umlautmark NA NA NA NA NA
-34 Iuml Ï capital I, dieresis or umlautmark NA NA NA NA NA
-35 ntilde ñ small n, tilde NA NA NA NA NA
-36 Ntilde Ñ capital N, tilde NA NA NA NA NA
-37 oacute ó small o, acute accent NA NA NA NA NA
-38 Oacute Ó capital O, acute accent NA NA NA NA NA
-39 ocirc ô small o, circumflex accent NA NA NA NA NA
-40 Ocirc Ô capital O, circumflex accent NA NA NA NA NA
-41 ograve ò small o, grave accent NA NA NA NA NA
-42 Ograve Ò capital O, grave accent NA NA NA NA NA
-43 oslash ø small o, slash NA NA NA NA NA
-44 Oslash Ø capital O, slash NA NA NA NA NA
-45 otilde õ small o, tilde NA NA NA NA NA
-46 Otilde Õ capital O, tilde NA NA NA NA NA
-47 ouml ö small o, dieresis or umlautmark NA NA NA NA NA
-48 Ouml Ö capital O, dieresis or umlautmark NA NA NA NA NA
-49 szlig ß small sharp s, German (szligature NA NA NA NA NA
-50 thorn þ small thorn, Icelandic NA NA NA NA NA
-51 THORN Þ capital THORN, Icelandic NA NA NA NA NA
-52 uacute ú small u, acute accent NA NA NA NA NA
-53 Uacute Ú capital U, acute accent NA NA NA NA NA
-54 ucirc û small u, circumflex accent NA NA NA NA NA
-55 Ucirc Û capital U, circumflex accent NA NA NA NA NA
-56 ugrave ù small u, grave accent NA NA NA NA NA
-57 Ugrave Ù capital U, grave accent NA NA NA NA NA
-58 uuml ü small u, dieresis or umlautmark NA NA NA NA NA
-59 Uuml Ü capital U, dieresis or umlautmark NA NA NA NA NA
-60 yacute ý small y, acute accent NA NA NA NA NA
-61 Yacute Ý capital Y, acute accent NA NA NA NA NA
-62 yuml ÿ small y, dieresis or umlautmark NA NA NA NA NA
- X.ã. X.Ã. X.ä. X.Ä. X.æ. X.Æ. X.ç. X.Ç. X.ð. X.Ð. X.é. X.É. X.ê. X.Ê. X.è.
-1 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-2 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-3 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-4 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-5 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-6 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-7 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-8 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-9 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-10 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-11 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-12 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-13 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-14 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-15 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-16 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-17 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-18 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-19 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-20 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-21 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-22 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-23 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-24 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-25 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-26 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-27 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-28 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-29 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-30 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-31 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-32 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-33 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-34 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-35 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-36 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-37 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-38 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-39 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-40 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-41 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-42 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-43 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-44 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-45 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-46 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-47 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-48 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-49 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-50 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-51 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-52 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-53 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-54 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-55 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-56 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-57 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-58 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-59 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-60 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-61 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-62 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
- X.È. X.ë. X.Ë. X.í. X.Í. X.î. X.Î. X.ì. X.Ì. X.ï. X.Ï. X.ñ. X.Ñ. X.ó. X.Ó.
-1 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-2 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-3 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-4 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-5 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-6 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-7 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-8 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-9 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-10 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-11 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-12 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-13 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-14 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-15 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-16 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-17 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-18 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-19 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-20 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-21 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-22 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-23 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-24 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-25 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-26 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-27 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-28 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-29 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-30 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-31 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-32 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-33 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-34 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-35 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-36 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-37 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-38 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-39 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-40 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-41 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-42 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-43 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-44 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-45 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-46 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-47 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-48 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-49 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-50 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-51 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-52 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-53 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-54 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-55 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-56 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-57 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-58 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-59 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-60 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-61 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-62 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
- X.ô. X.Ô. X.ò. X.Ò. X.ø. X.Ø. X.õ. X.Õ. X.ö. X.Ö. X.ß. X.þ. X.Þ. X.ú. X.Ú.
-1 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-2 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-3 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-4 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-5 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-6 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-7 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-8 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-9 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-10 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-11 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-12 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-13 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-14 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-15 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-16 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-17 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-18 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-19 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-20 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-21 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-22 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-23 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-24 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-25 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-26 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-27 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-28 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-29 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-30 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-31 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-32 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-33 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-34 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-35 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-36 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-37 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-38 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-39 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-40 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-41 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-42 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-43 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-44 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-45 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-46 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-47 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-48 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-49 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-50 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-51 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-52 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-53 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-54 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-55 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-56 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-57 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-58 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-59 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-60 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-61 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
-62 NA NA NA NA NA NA NA NA NA NA NA NA NA NA NA
- X.û. X.Û. X.ù. X.Ù. X.ü. X.Ü. X.ý. X.Ý. X.ÿ.
-1 NA NA NA NA NA NA NA NA NA
-2 NA NA NA NA NA NA NA NA NA
-3 NA NA NA NA NA NA NA NA NA
-4 NA NA NA NA NA NA NA NA NA
-5 NA NA NA NA NA NA NA NA NA
-6 NA NA NA NA NA NA NA NA NA
-7 NA NA NA NA NA NA NA NA NA
-8 NA NA NA NA NA NA NA NA NA
-9 NA NA NA NA NA NA NA NA NA
-10 NA NA NA NA NA NA NA NA NA
-11 NA NA NA NA NA NA NA NA NA
-12 NA NA NA NA NA NA NA NA NA
-13 NA NA NA NA NA NA NA NA NA
-14 NA NA NA NA NA NA NA NA NA
-15 NA NA NA NA NA NA NA NA NA
-16 NA NA NA NA NA NA NA NA NA
-17 NA NA NA NA NA NA NA NA NA
-18 NA NA NA NA NA NA NA NA NA
-19 NA NA NA NA NA NA NA NA NA
-20 NA NA NA NA NA NA NA NA NA
-21 NA NA NA NA NA NA NA NA NA
-22 NA NA NA NA NA NA NA NA NA
-23 NA NA NA NA NA NA NA NA NA
-24 NA NA NA NA NA NA NA NA NA
-25 NA NA NA NA NA NA NA NA NA
-26 NA NA NA NA NA NA NA NA NA
-27 NA NA NA NA NA NA NA NA NA
-28 NA NA NA NA NA NA NA NA NA
-29 NA NA NA NA NA NA NA NA NA
-30 NA NA NA NA NA NA NA NA NA
-31 NA NA NA NA NA NA NA NA NA
-32 NA NA NA NA NA NA NA NA NA
-33 NA NA NA NA NA NA NA NA NA
-34 NA NA NA NA NA NA NA NA NA
-35 NA NA NA NA NA NA NA NA NA
-36 NA NA NA NA NA NA NA NA NA
-37 NA NA NA NA NA NA NA NA NA
-38 NA NA NA NA NA NA NA NA NA
-39 NA NA NA NA NA NA NA NA NA
-40 NA NA NA NA NA NA NA NA NA
-41 NA NA NA NA NA NA NA NA NA
-42 NA NA NA NA NA NA NA NA NA
-43 NA NA NA NA NA NA NA NA NA
-44 NA NA NA NA NA NA NA NA NA
-45 NA NA NA NA NA NA NA NA NA
-46 NA NA NA NA NA NA NA NA NA
-47 NA NA NA NA NA NA NA NA NA
-48 NA NA NA NA NA NA NA NA NA
-49 NA NA NA NA NA NA NA NA NA
-50 NA NA NA NA NA NA NA NA NA
-51 NA NA NA NA NA NA NA NA NA
-52 NA NA NA NA NA NA NA NA NA
-53 NA NA NA NA NA NA NA NA NA
-54 NA NA NA NA NA NA NA NA NA
-55 NA NA NA NA NA NA NA NA NA
-56 NA NA NA NA NA NA NA NA NA
-57 NA NA NA NA NA NA NA NA NA
-58 NA NA NA NA NA NA NA NA NA
-59 NA NA NA NA NA NA NA NA NA
-60 NA NA NA NA NA NA NA NA NA
-61 NA NA NA NA NA NA NA NA NA
-62 NA NA NA NA NA NA NA NA NA
+> 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( 'XLSX' %in% xlsFormats() )
+ {
+ example.latin1.x <- read.xls(latin1FileX, fileEncoding='latin1')
-+ example.latin1.x
++ charTab(example.latin1)
+ } else {
++ cat("************************************************************\n")
+ cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
-+ cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
-+ }
- X.á. X.Á. X.â. X.Â. X.à. X.À. X.å. X.Å.
-1 aacute á small a, acute accent NA NA NA NA NA
-2 Aacute Á capital A, acute accent NA NA NA NA NA
-3 acirc â small a, circumflex accent NA NA NA NA NA
-4 Acirc  capital A, circumflex accent NA NA NA NA NA
-5 agrave à small a, grave accent NA NA NA NA NA
-6 Agrave À capital A, grave accent NA NA NA NA NA
-7 aring å small a, ring NA NA NA NA NA
-8 Aring Å capital A, ring NA NA NA NA NA
-9 atilde ã small a, tilde NA NA NA NA NA
-10 Atilde à capital A, tilde NA NA NA NA NA
-11 auml ä small a, dieresis or umlautmark NA NA NA NA NA
-12 Auml Ä capital A, dieresis or umlautmark NA NA NA NA NA
-13 aelig æ small ae diphthong (ligature) NA NA NA NA NA
-14 AElig Æ capital AE diphthong(ligature) NA NA NA NA NA
-15 ccedil ç small c, cedilla NA NA NA NA NA
-16 Ccedil Ç capital C, cedilla NA NA NA NA NA
-17 eth ð small eth, Icelandic NA NA NA NA NA
-18 ETH Ð capital Eth, Icelandic NA NA NA NA NA
-19 eacute é small e, acute accent NA NA NA NA NA
-20 Eacute É capital E, acute accent NA NA NA NA NA
-21 ecirc ê small e, circumflex accent NA NA NA NA NA
-22 Ecirc Ê capital E, circumflex accent NA NA NA NA NA
-23 egrave è small e, grave accent NA NA NA NA NA
-24 Egrave È capital E, grave accent NA NA NA NA NA
-25 euml ë small e, dieresis or umlautmark NA NA NA NA NA
-26 Euml Ë capital E, dieresis or umlautmark NA NA NA NA NA
-27 iacute í small i, acute accent NA NA NA NA NA
-28 Iacute Í capital I, acute accent NA NA NA NA NA
-29 icirc î small i, circumflex accent NA NA NA NA NA
-30 Icirc Î capital I, circumflex accent NA NA NA NA NA
-31 igrave ì small i, grave accent NA NA NA NA NA
-32 Igrave Ì capital I, grave accent NA NA NA NA NA
-33 iuml ï small i, dieresis or umlautmark NA NA NA NA NA
-34 Iuml Ï capital I, dieresis or umlautmark NA NA NA NA NA
-35 ntilde ñ small n, tilde NA NA NA NA NA
-36 Ntilde Ñ capital N, tilde NA NA NA NA NA
-37 oacute ó small o, acute accent NA NA NA NA NA
-38 Oacute Ó capital O, acute a...
[truncated message content] |
|
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.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X