r-gregmisc-users Mailing List for R gregmisc package (Page 17)
Brought to you by:
warnes
Menu
▾
▴
r-gregmisc-users — Discussion list for R gregmisc packages (gplot, gmodels, gdata, gtools)
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(12) |
Apr
(5) |
May
(3) |
Jun
(5) |
Jul
(2) |
Aug
(5) |
Sep
(7) |
Oct
(15) |
Nov
(34) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(3) |
Feb
(16) |
Mar
(28) |
Apr
(5) |
May
|
Jun
(5) |
Jul
(9) |
Aug
(50) |
Sep
(29) |
Oct
(9) |
Nov
(25) |
Dec
(7) |
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(8) |
May
(26) |
Jun
(11) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(9) |
| 2009 |
Jan
|
Feb
(1) |
Mar
|
Apr
(2) |
May
(26) |
Jun
|
Jul
(10) |
Aug
(6) |
Sep
|
Oct
(7) |
Nov
(3) |
Dec
(2) |
| 2010 |
Jan
(45) |
Feb
(11) |
Mar
|
Apr
(1) |
May
(8) |
Jun
(7) |
Jul
(3) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(9) |
Dec
(1) |
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
(3) |
May
(1) |
Jun
|
Jul
|
Aug
(14) |
Sep
(29) |
Oct
(3) |
Nov
|
Dec
(3) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(7) |
May
(6) |
Jun
(59) |
Jul
|
Aug
(8) |
Sep
(21) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
|
Mar
(10) |
Apr
|
May
(18) |
Jun
(25) |
Jul
(18) |
Aug
(1) |
Sep
(6) |
Oct
(28) |
Nov
(4) |
Dec
(13) |
| 2014 |
Jan
(7) |
Feb
(5) |
Mar
(4) |
Apr
(36) |
May
(3) |
Jun
(7) |
Jul
(46) |
Aug
(14) |
Sep
(12) |
Oct
(2) |
Nov
|
Dec
(12) |
| 2015 |
Jan
(4) |
Feb
|
Mar
|
Apr
(80) |
May
(36) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <wa...@us...> - 2012-09-13 23:54:44
|
Revision: 1611
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1611&view=rev
Author: warnes
Date: 2012-09-13 23:54:38 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
Add examples to man page
Modified Paths:
--------------
trunk/namespace/man/namespace.Rd
Modified: trunk/namespace/man/namespace.Rd
===================================================================
--- trunk/namespace/man/namespace.Rd 2012-09-13 23:54:25 UTC (rev 1610)
+++ trunk/namespace/man/namespace.Rd 2012-09-13 23:54:38 UTC (rev 1611)
@@ -4,7 +4,7 @@
\alias{makeNamespace}
\alias{getRegisteredNamespace}
\title{
-Functions to obtain, create, register, and unregister namespaces
+Create, register, obtain a reference to, and unregister namespaces
}
\description{
User-level functions to manage namespaces not (yet) available in base R.
@@ -54,6 +54,30 @@
\code{\link[base]{ns-internal}}
}
\examples{
-## Examples needed! ##
+
+## Get a reference to the namespace for the 'base' package
+getRegisteredNamespace("base")
+
+## Create a namespace, and stuff something into it.
+ns <- makeNamespace("myNamespace")
+assign("test",7, env=ns)
+ls(env=ns)
+
+## Now grab a reference to the namespace we just defined
+ns2 <- getNamespace("myNamespace")
+
+\dontshow{
+stopifnot(identical(ns, ns2))
}
+
+## Now unregister the namespace
+unregisterNamespace("myNamespace")
+
+## Returns NULL if it is no longer defined
+getRegisteredNamespace("myNamespace")
+\dontshow{
+ stopifnot( is.null(getRegisteredNamespace("::no such package::")) )
+}
+
+}
\keyword{programming}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-09-13 23:54:31
|
Revision: 1610
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1610&view=rev
Author: warnes
Date: 2012-09-13 23:54:25 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
Fix bug in calling rm, needed to specify envir=
Modified Paths:
--------------
trunk/namespace/R/namespace.R
Modified: trunk/namespace/R/namespace.R
===================================================================
--- trunk/namespace/R/namespace.R 2012-09-13 23:41:32 UTC (rev 1609)
+++ trunk/namespace/R/namespace.R 2012-09-13 23:54:25 UTC (rev 1610)
@@ -35,7 +35,7 @@
stop(name, " is not a registered namespace.")
# Remove the item from the registry
- rm(name, .getNameSpaceRegistry())
+ rm(name, envir=.getNameSpaceRegistry())
invisible()
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-09-13 23:41:38
|
Revision: 1609
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1609&view=rev
Author: warnes
Date: 2012-09-13 23:41:32 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
Add .Rinstignore file to skip .svn and such
Added Paths:
-----------
trunk/namespace/.Rinstignore
Added: trunk/namespace/.Rinstignore
===================================================================
--- trunk/namespace/.Rinstignore (rev 0)
+++ trunk/namespace/.Rinstignore 2012-09-13 23:41:32 UTC (rev 1609)
@@ -0,0 +1,4 @@
+doc/.*\.tex$
+doc/.*\.sty$
+doc/.*\.dtx$
+\.svn
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-09-13 23:38:43
|
Revision: 1608
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1608&view=rev
Author: warnes
Date: 2012-09-13 23:38:37 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
Add NEWS and ChangeLog, change version number to 0.9.0
Modified Paths:
--------------
trunk/namespace/DESCRIPTION
Added Paths:
-----------
trunk/namespace/inst/
trunk/namespace/inst/doc/
trunk/namespace/inst/doc/NEWS
Modified: trunk/namespace/DESCRIPTION
===================================================================
--- trunk/namespace/DESCRIPTION 2012-09-13 23:36:10 UTC (rev 1607)
+++ trunk/namespace/DESCRIPTION 2012-09-13 23:38:37 UTC (rev 1608)
@@ -1,7 +1,7 @@
Package: namespace
Type: Package
Title: Provide namespace managment functions not (yet) present in base R
-Version: 1.0
+Version: 0.9.0
Date: 2012-09-13
Author: Winston Chang, Daniel Adler, Hadley Wickham, Gregory R. Warnes, some code from the R 'base' package.
Maintainer: Gregory R. Warnes <gr...@wa...>
Added: trunk/namespace/inst/doc/NEWS
===================================================================
--- trunk/namespace/inst/doc/NEWS (rev 0)
+++ trunk/namespace/inst/doc/NEWS 2012-09-13 23:38:37 UTC (rev 1608)
@@ -0,0 +1,4 @@
+namespace - 0.9.0 - 2012-10-13
+------------------------------
+
+Initial version.
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-09-13 23:36:16
|
Revision: 1607
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1607&view=rev
Author: warnes
Date: 2012-09-13 23:36:10 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
Create package containing namespace management functions (currently) missing from R base
Added Paths:
-----------
trunk/namespace/
trunk/namespace/DESCRIPTION
trunk/namespace/NAMESPACE
trunk/namespace/R/
trunk/namespace/R/namespace.R
trunk/namespace/man/
trunk/namespace/man/namespace-package.Rd
trunk/namespace/man/namespace.Rd
trunk/namespace/src/
trunk/namespace/src/namespace.c
trunk/namespace/src/symbols.rds
Added: trunk/namespace/DESCRIPTION
===================================================================
--- trunk/namespace/DESCRIPTION (rev 0)
+++ trunk/namespace/DESCRIPTION 2012-09-13 23:36:10 UTC (rev 1607)
@@ -0,0 +1,9 @@
+Package: namespace
+Type: Package
+Title: Provide namespace managment functions not (yet) present in base R
+Version: 1.0
+Date: 2012-09-13
+Author: Winston Chang, Daniel Adler, Hadley Wickham, Gregory R. Warnes, some code from the R 'base' package.
+Maintainer: Gregory R. Warnes <gr...@wa...>
+Description: More about what it does (maybe more than one line)
+License: GPL-2
Added: trunk/namespace/NAMESPACE
===================================================================
--- trunk/namespace/NAMESPACE (rev 0)
+++ trunk/namespace/NAMESPACE 2012-09-13 23:36:10 UTC (rev 1607)
@@ -0,0 +1,7 @@
+useDynLib(namespace)
+
+export(getRegisteredNamespace)
+export(makeNamespace)
+export(registerNamespace)
+export(unregisterNamespace)
+
Added: trunk/namespace/R/namespace.R
===================================================================
--- trunk/namespace/R/namespace.R (rev 0)
+++ trunk/namespace/R/namespace.R 2012-09-13 23:36:10 UTC (rev 1607)
@@ -0,0 +1,85 @@
+# Returns the namespace registry
+#' @useDynLib devtools nsreg
+.getNameSpaceRegistry <- function() {
+ .Call("nsreg", "namespace")
+}
+
+# Register a namespace
+registerNamespace <- function(name = NULL, env = NULL) {
+ # Be careful about what we allow
+ if (!is.character(name) || name == "" || length(name) != 1)
+ stop("'name' must be a non-empty character string.")
+
+ if (!is.environment(env))
+ stop("'env' must be an environment.")
+
+ if (name %in% loadedNamespaces())
+ stop("Namespace ", name, " is already registered.")
+
+ # Add the environment to the registry
+ nsr <- .getNameSpaceRegistry()
+ nsr[[name]] <- env
+
+ env
+}
+
+
+# Unregister a namespace - should be used only if unloadNamespace()
+# fails for some reason
+unregisterNamespace <- function(name = NULL) {
+ # Be careful about what we allow
+ if (!is.character(name) || name == "" || length(name) != 1)
+ stop("'name' must be a non-empty character string.")
+
+ if (!(name %in% loadedNamespaces()))
+ stop(name, " is not a registered namespace.")
+
+ # Remove the item from the registry
+ rm(name, .getNameSpaceRegistry())
+ invisible()
+}
+
+# This is similar to getNamespace(), except that getNamespace will load
+# the namespace if it's not already loaded. This function will not.
+# In R 2.16, a function called .getNamespace() will have the same effect
+# and this will no longer be necessary.
+if(exists(".getNamespace", where="package:base", mode="function")) {
+ getRegisteredNamespace <- function(name) base::.getNamespace(name)
+} else {
+ getRegisteredNamespace <- function(name)
+ {
+ ## Sometimes we'll be passed something like as.name(name), so make sure
+ ## it's a string for comparison
+ if (!(as.character(name) %in% loadedNamespaces()))
+ return(NULL)
+ else
+ return(getNamespace(name))
+ }
+}
+
+## Copy of function defined inside of base::loadNamespace
+makeNamespace <- function(name, version = NULL, lib = NULL) {
+ impenv <- new.env(parent = .BaseNamespaceEnv, hash = TRUE)
+ attr(impenv, "name") <- paste("imports", name, sep=":")
+ env <- new.env(parent = impenv, hash = TRUE)
+ name <- as.character(as.name(name))
+ version <- as.character(version)
+ info <- new.env(hash = TRUE, parent = baseenv())
+ assign(".__NAMESPACE__.", info, envir = env)
+ assign("spec", c(name = name,version = version), envir = info)
+ setNamespaceInfo(env, "exports", new.env(hash = TRUE, parent = baseenv()))
+ dimpenv <- new.env(parent = baseenv(), hash = TRUE)
+ attr(dimpenv, "name") <- paste("lazydata", name, sep=":")
+ setNamespaceInfo(env, "lazydata", dimpenv)
+ setNamespaceInfo(env, "imports", list("base" = TRUE))
+ ## this should be an absolute path
+ setNamespaceInfo(env, "path",
+ normalizePath(file.path(lib, name), "/", TRUE))
+ setNamespaceInfo(env, "dynlibs", NULL)
+ setNamespaceInfo(env, "S3methods", matrix(NA_character_, 0L, 3L))
+ assign(".__S3MethodsTable__.",
+ new.env(hash = TRUE, parent = baseenv()),
+ envir = env)
+ registerNamespace(name, env)
+ env
+}
Added: trunk/namespace/man/namespace-package.Rd
===================================================================
--- trunk/namespace/man/namespace-package.Rd (rev 0)
+++ trunk/namespace/man/namespace-package.Rd 2012-09-13 23:36:10 UTC (rev 1607)
@@ -0,0 +1,29 @@
+\name{namespace-package}
+\alias{namespace-package}
+\alias{namespace}
+\docType{package}
+\title{Namespace managment functions}
+\description{
+This package provides user-level functions to manage namespaces not
+(yet) available in base R.
+}
+\details{
+\tabular{ll}{
+Package: \tab namespace\cr
+Type: \tab Package\cr
+Version: \tab 1.0\cr
+Date: \tab 2012-09-13\cr
+License: \tab GPL-2\cr
+}
+}
+\author{
+Winston Chang, Daniel Adler, Hadley Wickham, Gregory R. Warnes, some
+code from the R 'base' package.
+
+Maintainer: Gregory R. Warnes <gr...@wa...>
+}
+\keyword{ package }
+\keyword{ programming }
+\seealso{
+ \code{\link[base]{ns-internal}}
+}
Added: trunk/namespace/man/namespace.Rd
===================================================================
--- trunk/namespace/man/namespace.Rd (rev 0)
+++ trunk/namespace/man/namespace.Rd 2012-09-13 23:36:10 UTC (rev 1607)
@@ -0,0 +1,59 @@
+\name{namespace}
+\alias{registerNamespace}
+\alias{unregisterNamespace}
+\alias{makeNamespace}
+\alias{getRegisteredNamespace}
+\title{
+Functions to obtain, create, register, and unregister namespaces
+}
+\description{
+User-level functions to manage namespaces not (yet) available in base R.
+}
+\usage{
+registerNamespace(name=NULL, env=NULL)
+unregisterNamespace(name=NULL)
+makeNamespace(name, version=NULL, lib=NULL)
+getRegisteredNamespace(name)
+}
+\arguments{
+ \item{name}{string}
+ \item{env}{namespace environment}
+ \item{version}{version}
+ \item{lib}{string naming the package/namespace to load}
+}
+\details{
+ \code{registerNamespace} creates a new namespace entry with the
+ provided environment.
+
+ \code{unregisterNamespace} removes an existing namespace.
+
+ \code{makeNamespace} creates a new namespace.
+
+ \code{getRegisteredNamespace} returns the specified namespace, or NULL if
+ it is not loaded. (In R 2.16.0 this is just a wrapper for \code{base::.getNamespace}).
+}
+\references{
+ R-devel mailing list topic "[Rd] makeNamespace and rdyncall",
+ Dec. 2011:
+ \url{https://stat.ethz.ch/pipermail/r-devel/2011-December/062838.html}
+
+ R-devel mailing list topic "[Rd] rdyncall fears removal from CRAN",
+ Aug 2012:
+ \url{https://stat.ethz.ch/pipermail/r-devel/2012-August/064659.html}
+}
+\author{
+ Winston Chang, Daniel Adler, Hadley Wickham, Gregory R. Warnes, and
+ code from the R 'base' package.
+}
+\note{
+ These functions provide support for namespaces needed by some
+ low-level packages (e.g. \code{devtools} and \code{rdynload})
+ requested by their respective authors.
+}
+\seealso{
+ \code{\link[base]{ns-internal}}
+}
+\examples{
+## Examples needed! ##
+}
+\keyword{programming}
Added: trunk/namespace/src/namespace.c
===================================================================
--- trunk/namespace/src/namespace.c (rev 0)
+++ trunk/namespace/src/namespace.c 2012-09-13 23:36:10 UTC (rev 1607)
@@ -0,0 +1,6 @@
+#include <R.h>
+#include <Rdefines.h>
+
+SEXP nsreg() {
+ return R_NamespaceRegistry;
+}
Added: trunk/namespace/src/symbols.rds
===================================================================
(Binary files differ)
Property changes on: trunk/namespace/src/symbols.rds
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-09-12 17:40:42
|
Revision: 1606
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1606&view=rev
Author: warnes
Date: 2012-09-12 17:40:36 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
Update for gdata 2.12.0
Modified Paths:
--------------
trunk/gdata/DESCRIPTION
trunk/gdata/inst/NEWS
Modified: trunk/gdata/DESCRIPTION
===================================================================
--- trunk/gdata/DESCRIPTION 2012-09-12 17:39:42 UTC (rev 1605)
+++ trunk/gdata/DESCRIPTION 2012-09-12 17:40:36 UTC (rev 1606)
@@ -4,8 +4,8 @@
Depends: R (>= 2.13.0)
SystemRequirements: perl
Imports: gtools
-Version: 2.11.1
-Date: 2012-09-22
+Version: 2.12.0
+Date: 2012-10-12
Author: Gregory R. Warnes, with contributions from Ben Bolker, Gregor Gorjanc,
Gabor Grothendieck, Ales Korosec, Thomas Lumley, Don MacQueen,
Arni Magnusson, Jim Rogers, and others
Modified: trunk/gdata/inst/NEWS
===================================================================
--- trunk/gdata/inst/NEWS 2012-09-12 17:39:42 UTC (rev 1605)
+++ trunk/gdata/inst/NEWS 2012-09-12 17:40:36 UTC (rev 1606)
@@ -1,3 +1,19 @@
+Changes in 2.12.0 (2012-10-12)
+------------------------------
+
+Other Changes:
+
+- 'stats::aggregate' was made into a generic on 27-Jan-2010, so that
+ attempting to call 'aggregate' on a 'table' object will now
+ incorrectly call 'aggregate.table'. Since 'aggregate.table' can be
+ replaced by a call to tapply using two index vectors, e.g.
+ aggregate.table(x, by1=a, by2=b, mean)
+ can be replaced by
+ tapply(x, INDEX=list(a, b), FUN=mean),
+ the 'aggregate.table' function will now display a warning that it
+ is depreciated and recommending the equivalent call to tapply. It
+ will be removed entirely in a future version of gdata.
+
Changes in 2.11.1 (2012-09-22)
------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-09-12 17:39:48
|
Revision: 1605
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1605&view=rev
Author: warnes
Date: 2012-09-12 17:39:42 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
'stats::aggregate' was made into a generic on 27-Jan-2010, so that
attempting to call 'aggregate' on a 'table' object will now
incorrectly call 'aggregate.table'. Since 'aggregate.table' can be
replaced by a call to tapply using two index vectors, e.g.
aggregate.table(x, by1=a, by2=b, mean)
can be replaced by
tapply(x, INDEX=list(a, b), FUN=mean),
the 'aggregate.table' function will now display a warning that it
is depreciated and recommending the equivalent call to tapply. It
will be removed entirely in a future version of gdata.
Modified Paths:
--------------
trunk/gdata/R/aggregate.table.R
trunk/gdata/man/aggregate.table.Rd
Modified: trunk/gdata/R/aggregate.table.R
===================================================================
--- trunk/gdata/R/aggregate.table.R 2012-09-12 17:29:38 UTC (rev 1604)
+++ trunk/gdata/R/aggregate.table.R 2012-09-12 17:39:42 UTC (rev 1605)
@@ -2,14 +2,36 @@
aggregate.table <- function(x, by1, by2, FUN=mean, ... )
{
- if(!is.factor(by1)) by1 <- as.factor(by1)
- if(!is.factor(by2)) by2 <- as.factor(by2)
+ warning("'aggregate.table' is depreciated.",
+ "Please use 'tapply(X=",
+ deparse(substitute(x)),
+ ", INDEX=list(",
+ deparse(substitute(by1)),
+ ", ",
+ deparse(substitute(by2)),
+ "), FUN=",
+ deparse(substitute(FUN)),
+ if(length(list(...))>0)
+ {
+ l <- list(...)
+ paste(", ",
+ paste(names(l),"=",
+ deparse(substitute(...)),
+ sep="",
+ collapse=", ")
+ )
+ },
+ ")' instead.")
+ tapply(X=x, INDEX=list(by1, by2), FUN=FUN, ...)
+ }
- ag <- aggregate(x, by=list(by1,by2), FUN=FUN, ... )
- tab <- matrix( nrow=nlevels(by1), ncol=nlevels(by2) )
- dimnames(tab) <- list(levels(by1),levels(by2))
-
- for(i in 1:nrow(ag))
- tab[ as.character(ag[i,1]), as.character(ag[i,2]) ] <- ag[i,3]
- tab
- }
+## aggregate.table <- function(x, by1, by2, FUN=mean, ... )
+## {
+##
+## tab <- matrix( nrow=nlevels(by1), ncol=nlevels(by2) )
+## dimnames(tab) <- list(levels(by1),levels(by2))
+##
+## for(i in 1:nrow(ag))
+## tab[ as.character(ag[i,1]), as.character(ag[i,2]) ] <- ag[i,3]
+## tab
+## }
Modified: trunk/gdata/man/aggregate.table.Rd
===================================================================
--- trunk/gdata/man/aggregate.table.Rd 2012-09-12 17:29:38 UTC (rev 1604)
+++ trunk/gdata/man/aggregate.table.Rd 2012-09-12 17:39:42 UTC (rev 1605)
@@ -53,21 +53,34 @@
\seealso{ \code{\link{aggregate}}, \code{\link{tapply}},
\code{\link{interleave}} }
-
+\note{This function is DEPRECIATED. Please use \code{tapply}
+ instead. See example for illustration.}
\examples{
# Useful example:
#
# Create a 2-way table of means, standard errors, and # obs
-
+set.seed(314159)
g1 <- sample(letters[1:5], 1000, replace=TRUE)
g2 <- sample(LETTERS[1:3], 1000, replace=TRUE )
dat <- rnorm(1000)
stderr <- function(x) sqrt( var(x,na.rm=TRUE) / nobs(x) )
+## Depreciated:
means <- aggregate.table( dat, g1, g2, mean )
+## Instead use:
+means <- tapply( dat, list(g1, g2), mean )
+
+## Depreciated
stderrs <- aggregate.table( dat, g1, g2, stderr )
+## Instead use:
+stderrs <- tapply( dat, list(g1, g2), stderr )
+
+## Depreciated
ns <- aggregate.table( dat, g1, g2, nobs )
+## Instead use:
+ns <- tapply( dat, list(g1, g2), nobs )
+
blanks <- matrix( " ", nrow=5, ncol=3)
tab <- interleave( "Mean"=round(means,2),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-09-12 17:29:44
|
Revision: 1604
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1604&view=rev
Author: warnes
Date: 2012-09-12 17:29:38 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
Don't ignore .Rnw files, but do ignore .svn files.
Modified Paths:
--------------
trunk/gdata/.Rinstignore
Modified: trunk/gdata/.Rinstignore
===================================================================
--- trunk/gdata/.Rinstignore 2012-09-11 20:41:43 UTC (rev 1603)
+++ trunk/gdata/.Rinstignore 2012-09-12 17:29:38 UTC (rev 1604)
@@ -1,4 +1,4 @@
doc/.*\.tex$
doc/.*\.sty$
doc/.*\.dtx$
-doc/.*\.Rnw$
\ No newline at end of file
+\.svn
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-09-11 20:41:50
|
Revision: 1603
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1603&view=rev
Author: warnes
Date: 2012-09-11 20:41:43 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
Clarify workding of DROP argument to interleave().
Modified Paths:
--------------
trunk/gdata/man/interleave.Rd
Modified: trunk/gdata/man/interleave.Rd
===================================================================
--- trunk/gdata/man/interleave.Rd 2012-09-11 20:37:52 UTC (rev 1602)
+++ trunk/gdata/man/interleave.Rd 2012-09-11 20:41:43 UTC (rev 1603)
@@ -52,8 +52,8 @@
argument name will be appended to the row names to show the source of
each row. }
\item{sep}{Separator between the original row name and the object name.}
- \item{drop}{logical - If the number of columns in output matrix is 1, whether
- matrix should be returned or a vector }
+ \item{drop}{boolean flag - When TRUE, matrices containing one column
+ will be converted to vectors.}
}
\details{
This function creates a new matrix or data frame from its arguments.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-09-11 20:37:58
|
Revision: 1602
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1602&view=rev
Author: warnes
Date: 2012-09-11 20:37:52 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
Replace call to aggregate.table() with equivalent tapply() call since aggregate.table() is being depreciated.
Modified Paths:
--------------
trunk/gdata/man/interleave.Rd
Modified: trunk/gdata/man/interleave.Rd
===================================================================
--- trunk/gdata/man/interleave.Rd 2012-08-22 16:47:28 UTC (rev 1601)
+++ trunk/gdata/man/interleave.Rd 2012-09-11 20:37:52 UTC (rev 1602)
@@ -88,9 +88,9 @@
stderr <- function(x) sqrt( var(x,na.rm=TRUE) / nobs(x) )
-means <- aggregate.table( dat, g1, g2, mean )
-stderrs <- aggregate.table( dat, g1, g2, stderr )
-ns <- aggregate.table( dat, g1, g2, nobs )
+means <- tapply(dat, list(g1, g2), mean )
+stderrs <- tapply(dat, list(g1, g2), stderr )
+ns <- tapply(dat, list(g1, g2), nobs )
blanks <- matrix( " ", nrow=5, ncol=3)
tab <- interleave( "Mean"=round(means,2),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-08-22 16:47:34
|
Revision: 1601
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1601&view=rev
Author: warnes
Date: 2012-08-22 16:47:28 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Update DESCRIPTION and NEWS for gdate 2.11.1.
Modified Paths:
--------------
trunk/gdata/DESCRIPTION
trunk/gdata/inst/NEWS
Modified: trunk/gdata/DESCRIPTION
===================================================================
--- trunk/gdata/DESCRIPTION 2012-08-22 16:42:48 UTC (rev 1600)
+++ trunk/gdata/DESCRIPTION 2012-08-22 16:47:28 UTC (rev 1601)
@@ -4,8 +4,8 @@
Depends: R (>= 2.13.0)
SystemRequirements: perl
Imports: gtools
-Version: 2.11.0
-Date: 2012-06-08
+Version: 2.11.1
+Date: 2012-09-22
Author: Gregory R. Warnes, with contributions from Ben Bolker, Gregor Gorjanc,
Gabor Grothendieck, Ales Korosec, Thomas Lumley, Don MacQueen,
Arni Magnusson, Jim Rogers, and others
Modified: trunk/gdata/inst/NEWS
===================================================================
--- trunk/gdata/inst/NEWS 2012-08-22 16:42:48 UTC (rev 1600)
+++ trunk/gdata/inst/NEWS 2012-08-22 16:47:28 UTC (rev 1601)
@@ -1,3 +1,18 @@
+Changes in 2.11.1 (2012-09-22)
+------------------------------
+
+Enhancements:
+
+- read.xls() now supports fileEncoding argument to allow non-ascii
+ encoded data to be handled. See the manual page for an example.
+
+Bug Fixes:
+
+- The perl script utilized by read.xls() was incorrectly appending a
+ space character at the end of each line, causing problems with
+ character and NA entries in the final column.
+
+
Changes in 2.11.0 (2012-06-18)
------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-08-22 16:42:54
|
Revision: 1600
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1600&view=rev
Author: warnes
Date: 2012-08-22 16:42:48 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Add example for read.xls() that shows how to use the fileEncoding
argument to read in latin-1 encoded data.
Modified Paths:
--------------
trunk/gdata/man/read.xls.Rd
Modified: trunk/gdata/man/read.xls.Rd
===================================================================
--- trunk/gdata/man/read.xls.Rd 2012-08-22 16:41:30 UTC (rev 1599)
+++ trunk/gdata/man/read.xls.Rd 2012-08-22 16:42:48 UTC (rev 1600)
@@ -87,64 +87,71 @@
\dontrun{
- # Example specifying exact Perl path for default MS-Windows install of
- # ActiveState perl
+ ## Example specifying exact Perl path for default MS-Windows install of
+ ## ActiveState perl
iris <- read.xls(xlsfile, perl="C:/perl/bin/perl.exe")
}
\dontrun{
- # Example specifying exact Perl path for Unix systems
+ ## Example specifying exact Perl path for Unix systems
iris <- read.xls(xlsfile, perl="/usr/bin/perl")
- # finding perl
- # (read.xls automatically calls findPerl so this is rarely needed)
+ ## finding perl
+ ## (read.xls automatically calls findPerl so this is rarely needed)
perl <- gdata:::findPerl("perl")
iris <- read.xls(xlsfile, perl=perl)
}
\dontrun{
- # read xls file from net
+ ## read xls file from net
nba.url <- "http://mgtclass.mgt.unm.edu/Bose/Excel/Tutorial.05/Cases/NBA.xls"
nba <- read.xls(nba.url)
}
\dontrun{
- # read xls file ignoring all lines prior to first containing State
+ ## read xls file ignoring all lines prior to first containing State
crime.url <- "http://www.jrsainfo.org/jabg/state_data2/Tribal_Data00.xls"
crime <- read.xls(crime.url, pattern = "State")
- # use of xls2csv - open con, print two lines, close con
+ ## use of xls2csv - open con, print two lines, close con
con <- xls2csv(crime.url)
print(readLines(con, 2))
file.remove(summary(con)$description)
}
- # Examples demonstrating selection of specific 'sheets'
- # from the example XLS file 'ExampleExcelFile.xls'
+ ## Examples demonstrating selection of specific 'sheets'
+ ## from the example XLS file 'ExampleExcelFile.xls'
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:
+ ## see the number and names of sheets:
sheetCount(exampleFile)
- if( 'XLSX' \%in\% xlsFormats() ) # if XLSX is supported..
+ if( 'XLSX' \%in\% xlsFormats() ) ## if XLSX is supported..
sheetCount(exampleFile2007)
- # show names of shets in the file
+ ## show names of shets in the file
sheetNames(exampleFile)
- if( 'XLSX' \%in\% xlsFormats() ) # if XLSX is supported..
+ if( 'XLSX' \%in\% xlsFormats() ) ## if XLSX is supported..
sheetNames(exampleFile2007)
- data <- read.xls(exampleFile) # default is first worksheet
- data <- read.xls(exampleFile, sheet=2) # second worksheet by number
- data <- read.xls(exampleFile, sheet="Sheet Second",v=TRUE) # and by name
+ data <- read.xls(exampleFile) ## default is first worksheet
+ data <- read.xls(exampleFile, sheet=2) ## second worksheet by number
+ data <- read.xls(exampleFile, sheet="Sheet Second",v=TRUE) ## and by name
- # load the third worksheet, skipping the first two non-data lines...
- if( 'XLSX' \%in\% xlsFormats() ) # if XLSX is supported..
+ ## load the third worksheet, skipping the first two non-data lines...
+ if( 'XLSX' \%in\% xlsFormats() ) ## if XLSX is supported..
data <- read.xls(exampleFile2007, sheet="Sheet with initial text", skip=2)
+ ## load a file containing data and column names using latin-1
+ ## characters
+ latinFile <- file.path(.path.package('gdata'),'xls','latin-1.xls')
+ latin1 <- read.xls(latinFile, fileEncoding="latin1")
+ colnames(latin1)
+
+
}
\author{
Gregory R. Warnes \email{gr...@wa...},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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...> - 2012-08-22 16:36:09
|
Revision: 1598
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1598&view=rev
Author: warnes
Date: 2012-08-22 16:35:59 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
add XLSX version of latin-1.xls
Added Paths:
-----------
trunk/gdata/inst/xls/latin-1.xls
trunk/gdata/inst/xls/latin-1.xlsx
Copied: trunk/gdata/inst/xls/latin-1.xls (from rev 1597, trunk/gdata/tests/latin-1.xls)
===================================================================
(Binary files differ)
Added: trunk/gdata/inst/xls/latin-1.xlsx
===================================================================
(Binary files differ)
Property changes on: trunk/gdata/inst/xls/latin-1.xlsx
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
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
-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.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 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 ...
[truncated message content] |
|
From: <wa...@us...> - 2012-08-22 15:45:29
|
Revision: 1596
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1596&view=rev
Author: warnes
Date: 2012-08-22 15:45:22 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Change code to have R read the csv/tab data from the file rather than
from the connetion we made, so that file encodings can be properly handled.
Modified Paths:
--------------
trunk/gdata/R/read.xls.R
Modified: trunk/gdata/R/read.xls.R
===================================================================
--- trunk/gdata/R/read.xls.R 2012-08-22 14:29:40 UTC (rev 1595)
+++ trunk/gdata/R/read.xls.R 2012-08-22 15:45:22 UTC (rev 1596)
@@ -28,19 +28,21 @@
findPerl(perl, verbose = verbose)
con <- xls2sep(xls, sheet, verbose=verbose, ..., method=method, perl = perl)
+ ## While xls2sep returns a connection, we are better off directly
+ ## opening the file, so that R can properly handle the encoding. So,
+ ## just grab the full file path to use later, and close the connection.
+ tfn <- summary(con)$description
+ close(con)
- ## load the csv file
- open(con)
- tfn <- summary(con)$description
if (missing(pattern))
{
if(verbose)
cat("Reading", method, "file ", dQuote(tfn), "...\n")
if(method=="csv")
- retval <- read.csv(con, na.strings=na.strings, ...)
+ retval <- read.csv(tfn, na.strings=na.strings, ...)
else if (method %in% c("tsv","tab") )
- retval <- read.delim(con, na.strings=na.strings, ...)
+ retval <- read.delim(tfn, na.strings=na.strings, ...)
else
stop("Unknown method", method)
@@ -49,8 +51,8 @@
}
else {
if(verbose)
- cat("Searching for lines containing pattern ", pattern, "... ")
- idx <- grep(pattern, readLines(con))
+ cat("Searching for lines tfntaining pattern ", pattern, "... ")
+ idx <- grep(pattern, readLines(tfn))
if (length(idx) == 0) {
warning("pattern not found")
return(NULL)
@@ -58,22 +60,19 @@
if(verbose)
cat("Done.\n")
- seek(con, 0)
-
if(verbose)
cat("Reading", method, "file ", dQuote(tfn), "...\n")
if(method=="csv")
- retval <- read.csv(con, skip = idx[1]-1, na.strings=na.strings, ...)
+ retval <- read.csv(tfn, skip = idx[1]-1, na.strings=na.strings, ...)
else if (method %in% c("tsv","tab") )
- retval <- read.delim(con, skip = idx[1]-1, na.strings=na.strings, ...)
+ retval <- read.delim(tfn, skip = idx[1]-1, na.strings=na.strings, ...)
else
stop("Unknown method", method)
if(verbose)
cat("Done.\n")
}
- close(con)
retval
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-08-22 14:29:51
|
Revision: 1595
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1595&view=rev
Author: warnes
Date: 2012-08-22 14:29:40 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Always close the connection.
Modified Paths:
--------------
trunk/gdata/R/read.xls.R
Modified: trunk/gdata/R/read.xls.R
===================================================================
--- trunk/gdata/R/read.xls.R 2012-08-13 22:13:40 UTC (rev 1594)
+++ trunk/gdata/R/read.xls.R 2012-08-22 14:29:40 UTC (rev 1595)
@@ -70,11 +70,11 @@
else
stop("Unknown method", method)
- close(con)
-
if(verbose)
cat("Done.\n")
}
+ close(con)
+
retval
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-08-13 22:13:47
|
Revision: 1594
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1594&view=rev
Author: warnes
Date: 2012-08-13 22:13:40 +0000 (Mon, 13 Aug 2012)
Log Message:
-----------
Remove trailing space from output line.
Modified Paths:
--------------
trunk/gdata/inst/perl/xls2csv.pl
Modified: trunk/gdata/inst/perl/xls2csv.pl
===================================================================
--- trunk/gdata/inst/perl/xls2csv.pl 2012-06-29 19:03:27 UTC (rev 1593)
+++ trunk/gdata/inst/perl/xls2csv.pl 2012-08-13 22:13:40 UTC (rev 1594)
@@ -267,7 +267,7 @@
}
else
{
- print OutFile "$outputLine \n"
+ print OutFile "$outputLine\n"
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-06-29 19:03:33
|
Revision: 1593
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1593&view=rev
Author: warnes
Date: 2012-06-29 19:03:27 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Create inst/extdata directory to hold example file Alfalfa.xpt.
Modified Paths:
--------------
trunk/SASxport/man/Alfalfa.Rd
trunk/SASxport/man/lookup.xport.Rd
Added Paths:
-----------
trunk/SASxport/inst/extdata/
trunk/SASxport/inst/extdata/Alfalfa.xpt
Added: trunk/SASxport/inst/extdata/Alfalfa.xpt
===================================================================
(Binary files differ)
Property changes on: trunk/SASxport/inst/extdata/Alfalfa.xpt
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/SASxport/man/Alfalfa.Rd
===================================================================
--- trunk/SASxport/man/Alfalfa.Rd 2012-06-29 19:02:14 UTC (rev 1592)
+++ trunk/SASxport/man/Alfalfa.Rd 2012-06-29 19:03:27 UTC (rev 1593)
@@ -30,7 +30,7 @@
# go were the data is...
here <- getwd()
-setwd(file.path(.path.package("SASxport"),"data"))
+setwd(file.path(.path.package("SASxport"),"extdata"))
# Description of the file contents
lookup.xport("Alfalfa.xpt")
Modified: trunk/SASxport/man/lookup.xport.Rd
===================================================================
--- trunk/SASxport/man/lookup.xport.Rd 2012-06-29 19:02:14 UTC (rev 1592)
+++ trunk/SASxport/man/lookup.xport.Rd 2012-06-29 19:03:27 UTC (rev 1593)
@@ -45,7 +45,7 @@
}
\examples{
\dontshow{
-setwd(file.path(.path.package("SASxport"),"data"))
+setwd(file.path(.path.package("SASxport"),"extData"))
}
## Get information on a local file
lookup.xport("Alfalfa.xpt")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-06-29 19:02:21
|
Revision: 1592
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1592&view=rev
Author: warnes
Date: 2012-06-29 19:02:14 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Update SASxport version number
Modified Paths:
--------------
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/tests/Alfalfa_Test.Rout.save
===================================================================
--- trunk/SASxport/tests/Alfalfa_Test.Rout.save 2012-06-29 18:51:34 UTC (rev 1591)
+++ trunk/SASxport/tests/Alfalfa_Test.Rout.save 2012-06-29 19:02:14 UTC (rev 1592)
@@ -21,7 +21,7 @@
>
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-21).
+Loaded SASxport version 1.3.0 (2012-06-29).
Type `?SASxport' for usage information.
Modified: trunk/SASxport/tests/Theoph.Rout.save
===================================================================
--- trunk/SASxport/tests/Theoph.Rout.save 2012-06-29 18:51:34 UTC (rev 1591)
+++ trunk/SASxport/tests/Theoph.Rout.save 2012-06-29 19:02:14 UTC (rev 1592)
@@ -23,7 +23,7 @@
>
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-21).
+Loaded SASxport version 1.3.0 (2012-06-29).
Type `?SASxport' for usage information.
Modified: trunk/SASxport/tests/cars.Rout.save
===================================================================
--- trunk/SASxport/tests/cars.Rout.save 2012-06-29 18:51:34 UTC (rev 1591)
+++ trunk/SASxport/tests/cars.Rout.save 2012-06-29 19:02:14 UTC (rev 1592)
@@ -18,7 +18,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-21).
+Loaded SASxport version 1.3.0 (2012-06-29).
Type `?SASxport' for usage information.
Modified: trunk/SASxport/tests/testDates.Rout.save
===================================================================
--- trunk/SASxport/tests/testDates.Rout.save 2012-06-29 18:51:34 UTC (rev 1591)
+++ trunk/SASxport/tests/testDates.Rout.save 2012-06-29 19:02:14 UTC (rev 1592)
@@ -18,7 +18,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-21).
+Loaded SASxport version 1.3.0 (2012-06-29).
Type `?SASxport' for usage information.
Modified: trunk/SASxport/tests/testDuplicateNames.Rout.save
===================================================================
--- trunk/SASxport/tests/testDuplicateNames.Rout.save 2012-06-29 18:51:34 UTC (rev 1591)
+++ trunk/SASxport/tests/testDuplicateNames.Rout.save 2012-06-29 19:02:14 UTC (rev 1592)
@@ -18,7 +18,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-21).
+Loaded SASxport version 1.3.0 (2012-06-29).
Type `?SASxport' for usage information.
Modified: trunk/SASxport/tests/testManyNames.Rout.save
===================================================================
--- trunk/SASxport/tests/testManyNames.Rout.save 2012-06-29 18:51:34 UTC (rev 1591)
+++ trunk/SASxport/tests/testManyNames.Rout.save 2012-06-29 19:02:14 UTC (rev 1592)
@@ -18,7 +18,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-21).
+Loaded SASxport version 1.3.0 (2012-06-29).
Type `?SASxport' for usage information.
Modified: trunk/SASxport/tests/testNegative.Rout.save
===================================================================
--- trunk/SASxport/tests/testNegative.Rout.save 2012-06-29 18:51:34 UTC (rev 1591)
+++ trunk/SASxport/tests/testNegative.Rout.save 2012-06-29 19:02:14 UTC (rev 1592)
@@ -18,7 +18,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-21).
+Loaded SASxport version 1.3.0 (2012-06-29).
Type `?SASxport' for usage information.
Modified: trunk/SASxport/tests/testNumeric.Rout.save
===================================================================
--- trunk/SASxport/tests/testNumeric.Rout.save 2012-06-29 18:51:34 UTC (rev 1591)
+++ trunk/SASxport/tests/testNumeric.Rout.save 2012-06-29 19:02:14 UTC (rev 1592)
@@ -18,7 +18,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-21).
+Loaded SASxport version 1.3.0 (2012-06-29).
Type `?SASxport' for usage information.
Modified: trunk/SASxport/tests/testUnnamedComponents.Rout.save
===================================================================
--- trunk/SASxport/tests/testUnnamedComponents.Rout.save 2012-06-29 18:51:34 UTC (rev 1591)
+++ trunk/SASxport/tests/testUnnamedComponents.Rout.save 2012-06-29 19:02:14 UTC (rev 1592)
@@ -18,7 +18,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-21).
+Loaded SASxport version 1.3.0 (2012-06-29).
Type `?SASxport' for usage information.
Modified: trunk/SASxport/tests/test_as_is.Rout.save
===================================================================
--- trunk/SASxport/tests/test_as_is.Rout.save 2012-06-29 18:51:34 UTC (rev 1591)
+++ trunk/SASxport/tests/test_as_is.Rout.save 2012-06-29 19:02:14 UTC (rev 1592)
@@ -18,7 +18,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-21).
+Loaded SASxport version 1.3.0 (2012-06-29).
Type `?SASxport' for usage information.
Modified: trunk/SASxport/tests/test_fields.Rout.save
===================================================================
--- trunk/SASxport/tests/test_fields.Rout.save 2012-06-29 18:51:34 UTC (rev 1591)
+++ trunk/SASxport/tests/test_fields.Rout.save 2012-06-29 19:02:14 UTC (rev 1592)
@@ -18,7 +18,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-21).
+Loaded SASxport version 1.3.0 (2012-06-29).
Type `?SASxport' for usage information.
Modified: trunk/SASxport/tests/xport.Rout.save
===================================================================
--- trunk/SASxport/tests/xport.Rout.save 2012-06-29 18:51:34 UTC (rev 1591)
+++ trunk/SASxport/tests/xport.Rout.save 2012-06-29 19:02:14 UTC (rev 1592)
@@ -18,7 +18,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-21).
+Loaded SASxport version 1.3.0 (2012-06-29).
Type `?SASxport' for usage information.
Modified: trunk/SASxport/tests/xxx.Rout.save
===================================================================
--- trunk/SASxport/tests/xxx.Rout.save 2012-06-29 18:51:34 UTC (rev 1591)
+++ trunk/SASxport/tests/xxx.Rout.save 2012-06-29 19:02:14 UTC (rev 1592)
@@ -18,7 +18,7 @@
> library(SASxport)
-Loaded SASxport version 1.3.0 (2012-06-21).
+Loaded SASxport version 1.3.0 (2012-06-29).
Type `?SASxport' for usage information.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-06-29 18:51:40
|
Revision: 1591
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1591&view=rev
Author: warnes
Date: 2012-06-29 18:51:34 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Fix capitalization of extension from .Rda to .rda
Added Paths:
-----------
trunk/SASxport/data/Alfalfa.rda
Removed Paths:
-------------
trunk/SASxport/data/Alfalfa.Rda
Deleted: trunk/SASxport/data/Alfalfa.Rda
===================================================================
(Binary files differ)
Copied: trunk/SASxport/data/Alfalfa.rda (from rev 1590, trunk/SASxport/data/Alfalfa.Rda)
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-06-29 18:36:01
|
Revision: 1590
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1590&view=rev
Author: warnes
Date: 2012-06-29 18:35:55 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Convert Alfalfa data set to an R data file instead of R code + xpt file
Added Paths:
-----------
trunk/SASxport/data/Alfalfa.Rda
Removed Paths:
-------------
trunk/SASxport/data/Alfalfa.R
trunk/SASxport/data/Alfalfa.xpt
Deleted: trunk/SASxport/data/Alfalfa.R
===================================================================
--- trunk/SASxport/data/Alfalfa.R 2012-06-29 18:13:17 UTC (rev 1589)
+++ trunk/SASxport/data/Alfalfa.R 2012-06-29 18:35:55 UTC (rev 1590)
@@ -1,3 +0,0 @@
-library(SASxport)
-
-Alfalfa <- read.xport("Alfalfa.xpt")
Added: trunk/SASxport/data/Alfalfa.Rda
===================================================================
(Binary files differ)
Property changes on: trunk/SASxport/data/Alfalfa.Rda
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/SASxport/data/Alfalfa.xpt
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-06-29 18:13:23
|
Revision: 1589
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1589&view=rev
Author: warnes
Date: 2012-06-29 18:13:17 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Add makeSASNames() to the package manual page.
Modified Paths:
--------------
trunk/SASxport/man/SASxport-package.Rd
Modified: trunk/SASxport/man/SASxport-package.Rd
===================================================================
--- trunk/SASxport/man/SASxport-package.Rd 2012-06-29 18:10:34 UTC (rev 1588)
+++ trunk/SASxport/man/SASxport-package.Rd 2012-06-29 18:13:17 UTC (rev 1589)
@@ -48,6 +48,7 @@
units Set or Retrieve the label, SASformat,
SASiformat, or units Attribute of a Vector
write.xport Write data to a SAS XPORT file
+makeSASNames Create valid SAS names from a character vector.
}
}
\author{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-06-29 18:10:40
|
Revision: 1588
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1588&view=rev
Author: warnes
Date: 2012-06-29 18:10:34 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Update DESCRIPTION and NEWS for SASxport 1.3.0
Modified Paths:
--------------
trunk/SASxport/DESCRIPTION
trunk/SASxport/inst/NEWS
Modified: trunk/SASxport/DESCRIPTION
===================================================================
--- trunk/SASxport/DESCRIPTION 2012-06-29 18:08:33 UTC (rev 1587)
+++ trunk/SASxport/DESCRIPTION 2012-06-29 18:10:34 UTC (rev 1588)
@@ -1,8 +1,8 @@
Package: SASxport
Type: Package
Title: Read and Write SAS XPORT Files
-Version: 1.2.4
-Date: 2010-11-11
+Version: 1.3.0
+Date: 2012-06-29
Description: This package provides functions for reading, listing
the contents of, and writing SAS xport format files.
The functions support reading and writing of either
Modified: trunk/SASxport/inst/NEWS
===================================================================
--- trunk/SASxport/inst/NEWS 2012-06-29 18:08:33 UTC (rev 1587)
+++ trunk/SASxport/inst/NEWS 2012-06-29 18:10:34 UTC (rev 1588)
@@ -1,3 +1,19 @@
+Version 1.3.0 2012-06-27
+------------------------
+
+New features:
+
+- New function makeSASNames() to create valid and unique SAS names
+ from character vectors.
+
+Bug fixes:
+
+- Improper handling of duplicates names in write.xport() was
+ generating names longer than 8 characters, resulting in invalid
+ files. Corrected by using the new makeSASNames() function instead
+ of the R make.names() function.
+
+
Version 1.2.4 2010-11-11
------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wa...@us...> - 2012-06-29 18:08:39
|
Revision: 1587
http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1587&view=rev
Author: warnes
Date: 2012-06-29 18:08:33 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Add makeSASNames() to exported functions.
Modified Paths:
--------------
trunk/SASxport/NAMESPACE
Modified: trunk/SASxport/NAMESPACE
===================================================================
--- trunk/SASxport/NAMESPACE 2012-06-29 18:07:56 UTC (rev 1586)
+++ trunk/SASxport/NAMESPACE 2012-06-29 18:08:33 UTC (rev 1587)
@@ -10,6 +10,8 @@
write.xport,
"label",
"label<-",
+
+ makeSASNames,
"SASformat",
"SASformat<-",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
3 messages has been excluded from this view by a project administrator.
