[R-gregmisc-users] SF.net SVN: r-gregmisc:[1968] trunk/gdata/tests
Brought to you by:
warnes
Menu
▾
▴
[R-gregmisc-users] SF.net SVN: r-gregmisc:[1968] trunk/gdata/tests
|
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.
|
