[R-gregmisc-users] SF.net SVN: r-gregmisc:[1660] trunk/SASxport
Brought to you by:
warnes
Menu
▾
▴
[R-gregmisc-users] SF.net SVN: r-gregmisc:[1660] trunk/SASxport
|
From: <wa...@us...> - 2013-05-12 01:48:53
|
Revision: 1660
http://sourceforge.net/p/r-gregmisc/code/1660
Author: warnes
Date: 2013-05-12 01:48:49 +0000 (Sun, 12 May 2013)
Log Message:
-----------
Update NEWS for release
Modified Paths:
--------------
trunk/SASxport/DESCRIPTION
trunk/SASxport/R/SAStype.R
trunk/SASxport/R/read.xport.R
trunk/SASxport/inst/NEWS
trunk/SASxport/man/SASxport-package.Rd
trunk/SASxport/man/label.Rd
trunk/SASxport/man/read.xport.Rd
trunk/SASxport/man/write.xport.Rd
trunk/SASxport/tests/Alfalfa_Test.Rout.save
trunk/SASxport/tests/Theoph.Rout.save
trunk/SASxport/tests/cars.Rout.save
trunk/SASxport/tests/testDates.Rout.save
trunk/SASxport/tests/testDuplicateNames.Rout.save
trunk/SASxport/tests/testManyNames.Rout.save
trunk/SASxport/tests/testNegative.Rout.save
trunk/SASxport/tests/testNumeric.Rout.save
trunk/SASxport/tests/testUnnamedComponents.Rout.save
trunk/SASxport/tests/test_as_is.Rout.save
trunk/SASxport/tests/test_fields.Rout.save
trunk/SASxport/tests/xport.Rout.save
trunk/SASxport/tests/xxx.Rout.save
Modified: trunk/SASxport/DESCRIPTION
===================================================================
--- trunk/SASxport/DESCRIPTION 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/DESCRIPTION 2013-05-12 01:48:49 UTC (rev 1660)
@@ -14,19 +14,26 @@
Gregory R. Warnes <gr...@wa...> and are provided under the
terms of the GNU General Public License, version 2.0 or later.
--
- The files 'ieee2ibm.c' and 'ibm2ieee.c' were extracted from BRL-CAD,
- file /brlcad/src/libbu/htond.c written by Michael John Muuss,
- Copyright (c) 2004-2007 United States Government as represented by
- the U.S. Army Research Laboratory, and is utilized and redistributed
- under the terms of the GNU Lesser General Public License, version 2.1.
+ The files 'src/ieee2ibm.c' and 'src/ibm2ieee.c' were extracted from
+ BRL-CAD file /brlcad/src/libbu/htond.c written by Michael John
+ Muuss, Copyright (c) 2004-2007 United States Government as
+ represented by the U.S. Army Research Laboratory, and is utilized
+ and redistributed under the terms of the GNU Lesser General Public
+ License, version 2.1.
--
- The files 'AFirst.lib.s', 'all.is.numeric.R',
- 'importConvertDateTime.R', 'in.opererator.R', 'makeNames.R',
- 'read.xport.R', and 'testDateTime.R' are copied or adapted from the
+ The files 'R/AFirst.lib.s', 'R/all.is.numeric.R',
+ 'R/importConvertDateTime.R', 'R/in.opererator.R', 'R/makeNames.R',
+ 'R/read.xport.R', and 'R/testDateTime.R' are copied or adapted from the
'Hmisc' package created by Frank E. Harrell, Jr.
<f.h...@va...>, and are utilized and redistributed under
the terms of the GNU General Public License, version 2.0 or later.
--
+ The files 'R/xport.R', 'src/SASxport.c', 'src/SASxport.h', and
+ 'src/foreign.h' are copied or adapted from the R 'foreign' package
+ created by Douglas M. Bates <ba...@st...> and Saikat DebRoy
+ <sa...@st...>, and are utilized and redistributed under the
+ terms of the GNU General Public License, version 2.0 or later.
+ --
The creation of this package was partially funded by Metrum Institute
<http://metruminstitute.org>.
Maintainer: Gregory R. Warnes <gr...@wa...>
Modified: trunk/SASxport/R/SAStype.R
===================================================================
--- trunk/SASxport/R/SAStype.R 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/R/SAStype.R 2013-05-12 01:48:49 UTC (rev 1660)
@@ -15,6 +15,6 @@
"SAStype<-.default" <- function(x, value)
{
- attr(x,'SAStype') <- value
+ attr(x,'SAStype') <- makeSASNames(value)
x
}
Modified: trunk/SASxport/R/read.xport.R
===================================================================
--- trunk/SASxport/R/read.xport.R 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/R/read.xport.R 2013-05-12 01:48:49 UTC (rev 1660)
@@ -127,7 +127,9 @@
}
label(w) <- dsLabels[k]
+ names(label(w)) <- NULL
SAStype(w) <- dsTypes[k]
+ names(SAStype(w)) <- NULL
nam <- names.tolower(makeNames(names(w), allow=name.chars))
names(w) <- nam
Modified: trunk/SASxport/inst/NEWS
===================================================================
--- trunk/SASxport/inst/NEWS 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/inst/NEWS 2013-05-12 01:48:49 UTC (rev 1660)
@@ -1,6 +1,11 @@
Version 1.3.2 2013-05-11
------------------------
+New features:
+
+- dataset label and type are now supported. See write.xport() and
+ read.xport() for examples.
+
Bug fixes:
- Integrate patch from foreign package to properly handle xport files
Modified: trunk/SASxport/man/SASxport-package.Rd
===================================================================
--- trunk/SASxport/man/SASxport-package.Rd 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/man/SASxport-package.Rd 2013-05-12 01:48:49 UTC (rev 1660)
@@ -12,7 +12,7 @@
\details{
The \code{read.xport} function reads SAS xport formatted files,
augmenting the functionality of the \code{\link[foreign]{read.xport}}
- function provided in the 'foreign' package with additional features
+ function provided in the 'foreign' package with additional features,
borrowed from \code{\link[Hmisc]{sasxport.get}} in Frank Harrell's
'Hmisc' package. Namely, variables are properly coerced into the
types specified by the format field. All standard numeric and string
@@ -21,7 +21,10 @@
in the xport file via:
\preformatted{
PROC FORMAT CNTLOUT=format;
-}
+ }
+ In addition, labels are supported for variable and data frames, as
+ are dataset 'types'.
+
The \code{write.xport} function writes one or more data sets into a
SAS xport formatted file. Standard R data types, including date and
time objects (e.g. \code{Date}, and \code{POSIX.t}) are stored with
@@ -57,19 +60,25 @@
are provided under the terms of the GNU General Public License,
version 2.0 or later.
- The file 'htond.c' is extracted from BRL-CAD
- \url{http://www.brlcad.org/}, written by Michael John Muuss, and is
- Copyright (c) 2004-2007 United States Government as represented by
- the U.S. Army Research Laboratory, and is utilized and redistributed
- under the terms of the GNU Lesser General Public License, version 2.1.
+ The files 'src/ieee2ibm.c' and 'src/ibm2ieee.c' were extracted from
+ BRL-CAD file /brlcad/src/libbu/htond.c written by Michael John Muuss,
+ Copyright (c) 2004-2007 United States Government as represented by the
+ U.S. Army Research Laboratory, and is utilized and redistributed under
+ the terms of the GNU Lesser General Public License, version 2.1.
- The files 'AFirst.lib.s', 'all.is.numeric.R',
- 'importConvertDateTime.R', 'in.opererator.R', 'makeNames.R',
- 'read.xport.R', and 'testDateTime.R' are copied or adapted from the
- 'Hmisc' package created by Frank E. Harrell, Jr.
- \email{f.h...@va...}, and are utilized and redistributed under
+ The files 'R/AFirst.lib.s', 'R/all.is.numeric.R',
+ 'R/importConvertDateTime.R', 'R/in.opererator.R', 'R/makeNames.R',
+ 'R/read.xport.R', and 'R/testDateTime.R' are copied or adapted from
+ the 'Hmisc' package created by Frank E. Harrell, Jr.
+ <f.h...@va...>, and are utilized and redistributed under
the terms of the GNU General Public License, version 2.0 or later.
- }
+
+ The files 'R/xport.R', 'src/SASxport.c', 'src/SASxport.h', and
+ 'src/foreign.h' are copied or adapted from the R 'foreign' package
+ created by Douglas M. Bates <ba...@st...> and Saikat DebRoy
+ <sa...@st...>, and are utilized and redistributed under the
+ terms of the GNU General Public License, version 2.0 or later.
+}
\section{Funding}{
This creation of this package was partially funded by Metrum Institute
\url{http://metruminstitute.org}.
Modified: trunk/SASxport/man/label.Rd
===================================================================
--- trunk/SASxport/man/label.Rd 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/man/label.Rd 2013-05-12 01:48:49 UTC (rev 1660)
@@ -30,6 +30,8 @@
More comprehensive support for object labels, and SASformat, are
available in Frank Harrell's \code{Hmisc} package.
+
+ Note that \code{SAStype} enforces the SAS 8-character naming convention.
}
\usage{
label(x, default)
Modified: trunk/SASxport/man/read.xport.Rd
===================================================================
--- trunk/SASxport/man/read.xport.Rd 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/man/read.xport.Rd 2013-05-12 01:48:49 UTC (rev 1660)
@@ -82,10 +82,15 @@
\item SAS date, time, and date/time variables are converted respectively to \code{Date},
POSIX, or \code{chron} objects
- \item SAS labels are stored in "label" attributes on each variable
+ \item SAS labels are stored in "label" attributes on each variable,
+ and are accessible using the \code{\link{label}} function.
- \item SAS formats are stored in "format" attributes on each variable
+ \item SAS formats are stored in "SASformat" attributes on each
+ variable, and are accessable using \code{\link{SASformat}}
+ \item SAS iformats are stored in "SASiformat" attributes on each
+ variable, and are accessable using \code{\link{SASiformat}}
+
\item SAS integer variables are stored as integers unless
\code{force.integer} is \code{FALSE}
}
@@ -93,6 +98,11 @@
If the file includes the output of \code{PROC FORMAT CNTLOUT=},
variables having customized label formats will be converted to \code{factor}
objects with appropriate labels.
+
+ If a datasets in the original file has a label or type, these will be
+ stored in the corresponding 'lable' and 'SAStype' attributes, which
+ can be accessed by the \code{\link{label}} and \code{\link{SAStype}}
+ functions.
}
\author{ Gregory R. Warnes \email{gr...@wa...}
based on \code{Hmisc:::sasxport.get} by Frank E. Harrell, Jr.}
@@ -110,7 +120,11 @@
\code{\link[chron]{chron}},
\code{\link[foreign]{lookup.xport}},
\code{\link[Hmisc]{contents}},
- \code{\link[Hmisc]{describe}}
+ \code{\link[Hmisc]{describe}},
+ \code{\link{label}},
+ \code{\link{SASformat}},
+ \code{\link{SASiformat}}, and
+ \code{\link{SAStype}}
}
\examples{
Modified: trunk/SASxport/man/write.xport.Rd
===================================================================
--- trunk/SASxport/man/write.xport.Rd 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/man/write.xport.Rd 2013-05-12 01:48:49 UTC (rev 1660)
@@ -39,9 +39,10 @@
converted to upper case. All characters outside of the set A-Z,
0-9, and '\_' are converted to '\_'.
\item Character variables are stored as characters.
- \item If \code{autogen.formats=TRUE} (the default), factor variables are stored as numeric with an appropriate SAS
- format specification. If \code{autogen.formats=FALSE}, factor
- variables are stored as characters.
+ \item If \code{autogen.formats=TRUE} (the default), factor variables
+ are stored as numeric with an appropriate SAS format
+ specification. If \code{autogen.formats=FALSE}, factor variables
+ are stored as characters.
\item All numeric variables are stored as double-precision floating
point values utilizing the IBM mainframe double precision floating
point format (see the reference).
@@ -52,13 +53,18 @@
'.'
}
- In addition, the SAS XPORT format allows each variable to have a
- corresponding label, display format, and input format. To set these
- values, add the attribute 'label', 'SASformat', or 'SASiformat' to
- individual data frame variables. (See the example section.)
+ The SAS XPORT format allows each dataset to have a label and a type
+ (set via the \code{\link{label}} and \code{\link{SAStype}} functions).
+ In addition, each variable may have a corresponding label, display
+ format, and input format. To set these values, add the attribute
+ 'label', 'SASformat', or 'SASiformat' to individual data frame. These
+ attributes may be set using the \code{\link{label}},
+ \code{\link{SASformat}}, and \code{\link{SASiformat}} functions. (See
+ examples provided below.)
The actual translation of R objects to objects appropriate for SAS is
- handled by the \code{\link{toSAS}} generic and associated methods.
+ handled by the \code{\link{toSAS}} generic and associated methods,
+ which can be (re)defined by the user to provide fine-grained control.
}
\value{
No return value
@@ -76,7 +82,11 @@
\seealso{
\code{\link{toSAS}},
\code{\link{lookup.xport}},
- \code{\link{read.xport}}
+ \code{\link{read.xport}},
+ \code{\link{label}},
+ \code{\link{SAStype}},
+ \code{\link{SASformat}},
+ and \code{\link{SASiformat}}
}
\examples{
@@ -85,23 +95,24 @@
#####
## manually create a data set
-temp <- data.frame( x=c(1, 2, NA, NA ), y=c('a', 'B', NA, '*' ) )
+abc <- data.frame( x=c(1, 2, NA, NA ), y=c('a', 'B', NA, '*' ) )
## look at it
-temp
+abc
## add a format specifier (not used by R)
-attr(temp$x, 'SASformat') <- 'date7.'
+SASformat(abc$x) <- 'date7.'
## add a variable label (not used by R)
-attr(temp$y, 'label') <- 'character variable'
+label(abc$y) <- 'character variable'
+## add a dataset label and type
+label(abc) <- 'Simple example'
+SAStype(abc) <- 'MYTYPE'
+
## verify the additions
-str(temp)
+str(abc)
-## rename the data set
-abc <- temp
-
# create a SAS XPORT file
write.xport( abc, file="xxx.dat" )
@@ -114,7 +125,12 @@
## and look at it
xxx.abc
-## Note that the variable names have been converted to uppercase
+## Check the label and type
+label(xxx.abc)
+SAStype(xxx.abc)
+## Note that the variable names and SAS dataset type have been converted
+## to uppercase
+
}
\keyword{file}
Modified: trunk/SASxport/tests/Alfalfa_Test.Rout.save
===================================================================
--- trunk/SASxport/tests/Alfalfa_Test.Rout.save 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/tests/Alfalfa_Test.Rout.save 2013-05-12 01:48:49 UTC (rev 1660)
@@ -1,8 +1,7 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+R version 3.0.0 (2013-04-03) -- "Masked Marvel"
+Copyright (C) 2013 The R Foundation for Statistical Computing
+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.
@@ -21,7 +20,7 @@
>
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-29).
+Loaded SASxport version 1.3.2 (2013-05-11).
Type `?SASxport' for usage information.
@@ -47,4 +46,4 @@
>
> proc.time()
user system elapsed
- 0.303 0.025 0.316
+ 0.940 0.052 0.985
Modified: trunk/SASxport/tests/Theoph.Rout.save
===================================================================
--- trunk/SASxport/tests/Theoph.Rout.save 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/tests/Theoph.Rout.save 2013-05-12 01:48:49 UTC (rev 1660)
@@ -1,8 +1,7 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+R version 3.0.0 (2013-04-03) -- "Masked Marvel"
+Copyright (C) 2013 The R Foundation for Statistical Computing
+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,7 +22,7 @@
>
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-29).
+Loaded SASxport version 1.3.2 (2013-05-11).
Type `?SASxport' for usage information.
@@ -43,4 +42,4 @@
>
> proc.time()
user system elapsed
- 0.539 0.026 0.555
+ 1.632 0.084 1.705
Modified: trunk/SASxport/tests/cars.Rout.save
===================================================================
--- trunk/SASxport/tests/cars.Rout.save 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/tests/cars.Rout.save 2013-05-12 01:48:49 UTC (rev 1660)
@@ -1,8 +1,7 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+R version 3.0.0 (2013-04-03) -- "Masked Marvel"
+Copyright (C) 2013 The R Foundation for Statistical Computing
+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.
@@ -18,7 +17,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-29).
+Loaded SASxport version 1.3.2 (2013-05-11).
Type `?SASxport' for usage information.
@@ -64,4 +63,4 @@
>
> proc.time()
user system elapsed
- 0.296 0.025 0.310
+ 0.904 0.096 0.998
Modified: trunk/SASxport/tests/testDates.Rout.save
===================================================================
--- trunk/SASxport/tests/testDates.Rout.save 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/tests/testDates.Rout.save 2013-05-12 01:48:49 UTC (rev 1660)
@@ -1,8 +1,7 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+R version 3.0.0 (2013-04-03) -- "Masked Marvel"
+Copyright (C) 2013 The R Foundation for Statistical Computing
+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.
@@ -18,7 +17,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-29).
+Loaded SASxport version 1.3.2 (2013-05-11).
Type `?SASxport' for usage information.
@@ -62,4 +61,4 @@
>
> proc.time()
user system elapsed
- 0.364 0.025 0.378
+ 1.112 0.084 1.183
Modified: trunk/SASxport/tests/testDuplicateNames.Rout.save
===================================================================
--- trunk/SASxport/tests/testDuplicateNames.Rout.save 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/tests/testDuplicateNames.Rout.save 2013-05-12 01:48:49 UTC (rev 1660)
@@ -1,8 +1,7 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+R version 3.0.0 (2013-04-03) -- "Masked Marvel"
+Copyright (C) 2013 The R Foundation for Statistical Computing
+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.
@@ -18,7 +17,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-29).
+Loaded SASxport version 1.3.2 (2013-05-11).
Type `?SASxport' for usage information.
@@ -156,4 +155,4 @@
>
> proc.time()
user system elapsed
- 0.430 0.031 2.232
+ 1.292 0.124 2.566
Modified: trunk/SASxport/tests/testManyNames.Rout.save
===================================================================
--- trunk/SASxport/tests/testManyNames.Rout.save 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/tests/testManyNames.Rout.save 2013-05-12 01:48:49 UTC (rev 1660)
@@ -1,8 +1,7 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+R version 3.0.0 (2013-04-03) -- "Masked Marvel"
+Copyright (C) 2013 The R Foundation for Statistical Computing
+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.
@@ -18,7 +17,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-29).
+Loaded SASxport version 1.3.2 (2013-05-11).
Type `?SASxport' for usage information.
@@ -95,4 +94,4 @@
>
> proc.time()
user system elapsed
- 6.985 0.068 7.099
+ 19.392 0.172 19.717
Modified: trunk/SASxport/tests/testNegative.Rout.save
===================================================================
--- trunk/SASxport/tests/testNegative.Rout.save 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/tests/testNegative.Rout.save 2013-05-12 01:48:49 UTC (rev 1660)
@@ -1,8 +1,7 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+R version 3.0.0 (2013-04-03) -- "Masked Marvel"
+Copyright (C) 2013 The R Foundation for Statistical Computing
+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.
@@ -18,7 +17,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-29).
+Loaded SASxport version 1.3.2 (2013-05-11).
Type `?SASxport' for usage information.
@@ -48,4 +47,4 @@
>
> proc.time()
user system elapsed
- 0.423 0.027 0.439
+ 1.260 0.072 1.321
Modified: trunk/SASxport/tests/testNumeric.Rout.save
===================================================================
--- trunk/SASxport/tests/testNumeric.Rout.save 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/tests/testNumeric.Rout.save 2013-05-12 01:48:49 UTC (rev 1660)
@@ -1,8 +1,7 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+R version 3.0.0 (2013-04-03) -- "Masked Marvel"
+Copyright (C) 2013 The R Foundation for Statistical Computing
+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.
@@ -18,7 +17,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-29).
+Loaded SASxport version 1.3.2 (2013-05-11).
Type `?SASxport' for usage information.
@@ -87,4 +86,4 @@
>
> proc.time()
user system elapsed
- 0.494 0.025 0.507
+ 1.584 0.096 1.673
Modified: trunk/SASxport/tests/testUnnamedComponents.Rout.save
===================================================================
--- trunk/SASxport/tests/testUnnamedComponents.Rout.save 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/tests/testUnnamedComponents.Rout.save 2013-05-12 01:48:49 UTC (rev 1660)
@@ -1,8 +1,7 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+R version 3.0.0 (2013-04-03) -- "Masked Marvel"
+Copyright (C) 2013 The R Foundation for Statistical Computing
+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.
@@ -18,7 +17,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-29).
+Loaded SASxport version 1.3.2 (2013-05-11).
Type `?SASxport' for usage information.
@@ -2164,4 +2163,4 @@
>
> proc.time()
user system elapsed
- 2.092 0.073 8.083
+ 6.024 1.684 14.087
Modified: trunk/SASxport/tests/test_as_is.Rout.save
===================================================================
--- trunk/SASxport/tests/test_as_is.Rout.save 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/tests/test_as_is.Rout.save 2013-05-12 01:48:49 UTC (rev 1660)
@@ -1,8 +1,7 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+R version 3.0.0 (2013-04-03) -- "Masked Marvel"
+Copyright (C) 2013 The R Foundation for Statistical Computing
+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.
@@ -18,7 +17,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-29).
+Loaded SASxport version 1.3.2 (2013-05-11).
Type `?SASxport' for usage information.
@@ -48,6 +47,8 @@
$ CONC : num 0.02 0.02 0.06 0.06 0.11 0.11 0.22 0.22 0.56 0.56 ...
$ RATE : int 76 47 97 107 123 139 159 152 191 201 ...
$ STATE: Factor w/ 2 levels "treated","untreated": 1 1 1 1 1 1 1 1 1 1 ...
+ - attr(*, "label")= chr " "
+ - attr(*, "SAStype")= chr " "
>
> SASxport:::assert( class(x$STATE)=="factor" )
>
@@ -60,6 +61,8 @@
$ CONC : num 0.02 0.02 0.06 0.06 0.11 0.11 0.22 0.22 0.56 0.56 ...
$ RATE : int 76 47 97 107 123 139 159 152 191 201 ...
$ STATE: chr "treated" "treated" "treated" "treated" ...
+ - attr(*, "label")= chr " "
+ - attr(*, "SAStype")= chr " "
>
> SASxport:::assert( class(x$STATE)=="character" )
>
@@ -67,4 +70,4 @@
>
> proc.time()
user system elapsed
- 0.269 0.024 0.282
+ 0.860 0.112 0.996
Modified: trunk/SASxport/tests/test_fields.Rout.save
===================================================================
--- trunk/SASxport/tests/test_fields.Rout.save 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/tests/test_fields.Rout.save 2013-05-12 01:48:49 UTC (rev 1660)
@@ -1,8 +1,7 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+R version 3.0.0 (2013-04-03) -- "Masked Marvel"
+Copyright (C) 2013 The R Foundation for Statistical Computing
+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.
@@ -18,7 +17,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-29).
+Loaded SASxport version 1.3.2 (2013-05-11).
Type `?SASxport' for usage information.
@@ -32,4 +31,4 @@
>
> proc.time()
user system elapsed
- 0.240 0.023 0.252
+ 0.756 0.056 0.820
Modified: trunk/SASxport/tests/xport.Rout.save
===================================================================
--- trunk/SASxport/tests/xport.Rout.save 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/tests/xport.Rout.save 2013-05-12 01:48:49 UTC (rev 1660)
@@ -1,8 +1,7 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+R version 3.0.0 (2013-04-03) -- "Masked Marvel"
+Copyright (C) 2013 The R Foundation for Statistical Computing
+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.
@@ -18,7 +17,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-29).
+Loaded SASxport version 1.3.2 (2013-05-11).
Type `?SASxport' for usage information.
@@ -106,4 +105,4 @@
> q()
> proc.time()
user system elapsed
- 0.286 0.025 0.300
+ 0.908 0.108 1.018
Modified: trunk/SASxport/tests/xxx.Rout.save
===================================================================
--- trunk/SASxport/tests/xxx.Rout.save 2013-05-12 00:55:24 UTC (rev 1659)
+++ trunk/SASxport/tests/xxx.Rout.save 2013-05-12 01:48:49 UTC (rev 1660)
@@ -1,8 +1,7 @@
-R version 2.15.0 (2012-03-30)
-Copyright (C) 2012 The R Foundation for Statistical Computing
-ISBN 3-900051-07-0
-Platform: i386-apple-darwin9.8.0/i386 (32-bit)
+R version 3.0.0 (2013-04-03) -- "Masked Marvel"
+Copyright (C) 2013 The R Foundation for Statistical Computing
+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.
@@ -18,7 +17,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-29).
+Loaded SASxport version 1.3.2 (2013-05-11).
Type `?SASxport' for usage information.
@@ -67,7 +66,7 @@
> ## R doesn't have multiple NA types, while SAS does. The original
> ## file contains a SAS '.A' missing value, while what we've created
> ## contains an ordinary '.' missing value, so mash this one byte to
-> ## avoid a comparison error for this know limitation.
+> ## avoid a comparison error for this known limitation.
>
> a.1[1089] <- as.raw("0x2e")
>
@@ -79,4 +78,4 @@
>
> proc.time()
user system elapsed
- 0.287 0.027 0.303
+ 0.908 0.092 0.991
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
