[R-gregmisc-users] SF.net SVN: r-gregmisc: [980] trunk/gdata

[<wa...@us...>]

Revision: 980
          http://svn.sourceforge.net/r-gregmisc/?rev=980&view=rev
Author:   warnes
Date:     2006-09-13 11:15:55 -0700 (Wed, 13 Sep 2006)

Log Message:
-----------
More fixes from Gregor Gorjanc

Modified Paths:
--------------
    trunk/gdata/NAMESPACE
    trunk/gdata/R/drop.levels.R
    trunk/gdata/R/mapLevels.R
    trunk/gdata/R/trim.R

Modified: trunk/gdata/NAMESPACE
===================================================================
--- trunk/gdata/NAMESPACE	2006-09-13 14:55:37 UTC (rev 979)
+++ trunk/gdata/NAMESPACE	2006-09-13 18:15:55 UTC (rev 980)
@@ -32,8 +32,13 @@
        as.listLevelsMap,
        is.levelsMap,
        is.listLevelsMap,
-       sort.levelsMap, ## remove in R 2.4
-       "mapLevels<-"
+       sort.levelsMap, ## FIXME remove in R 2.4
+       "mapLevels<-",
+
+       ## unknown stuff
+       isUnknown,
+       unknownToNA,
+       NAToUnknown
 )
 
 importFrom(stats, reorder, na.omit)
@@ -70,8 +75,23 @@
 S3method(c, listLevelsMap)
 
 S3method(unique, levelsMap)
-## S3method(sort, levelsMap) ## uncomment in R 2.4
+## S3method(sort, levelsMap) ## FIXME uncomment in R 2.4
 
 S3method("mapLevels<-", default)
 S3method("mapLevels<-", list)
 S3method("mapLevels<-", data.frame)
+
+S3method(isUnknown, default)
+S3method(isUnknown, POSIXlt)
+S3method(isUnknown, list)
+S3method(isUnknown, data.frame)
+
+S3method(unknownToNA, default)
+S3method(unknownToNA, factor)
+S3method(unknownToNA, list)
+S3method(unknownToNA, data.frame)
+
+S3method(NAToUnknown, default)
+S3method(NAToUnknown, factor)
+S3method(NAToUnknown, list)
+S3method(NAToUnknown, data.frame)

Modified: trunk/gdata/R/drop.levels.R
===================================================================
--- trunk/gdata/R/drop.levels.R	2006-09-13 14:55:37 UTC (rev 979)
+++ trunk/gdata/R/drop.levels.R	2006-09-13 18:15:55 UTC (rev 980)
@@ -3,22 +3,22 @@
   UseMethod("drop.levels")
 
 drop.levels.default <- function(x, reorder=TRUE, ...)
-  return(x)
+  x
 
 drop.levels.factor <- function(x, reorder=TRUE, ...)
 {
   x <- factor(x)
   if(reorder) x <- reorder(x, ...)
-  return(x)
+  x
 }
 
 drop.levels.list <- function(x, reorder=TRUE, ...)
 {
-  return(lapply(x, drop.levels, reorder=reorder, ...))
+  lapply(x, drop.levels, reorder=reorder, ...)
 }
 
 drop.levels.data.frame <- function(x, reorder=TRUE, ...)
 {
   x[] <- drop.levels.list(x, reorder=reorder, ...)
-  return(x)
+  x
 }

Modified: trunk/gdata/R/mapLevels.R
===================================================================
--- trunk/gdata/R/mapLevels.R	2006-09-13 14:55:37 UTC (rev 979)
+++ trunk/gdata/R/mapLevels.R	2006-09-13 18:15:55 UTC (rev 980)
@@ -2,7 +2,7 @@
 ###------------------------------------------------------------------------
 ### What: Mapping levels
 ### $Id: mapLevels.R,v 1.1 2006/03/29 13:47:15 ggorjan Exp ggorjan $
-### Time-stamp: <2006-08-31 02:24:45 ggorjan>
+### Time-stamp: <2006-09-10 03:54:56 ggorjan>
 ###------------------------------------------------------------------------
 
 ### {{{ mapLevels
@@ -25,7 +25,7 @@
 mapLevels.character <- function(x, codes=TRUE, sort=TRUE, drop=FALSE,
                                 combine=FALSE, ...)
 {
-  return(mapLevels.factor(x=x, codes=codes, sort=sort, drop=drop, ...))
+  mapLevels.factor(x=x, codes=codes, sort=sort, drop=drop, ...)
 }
 
 ## Could coerce character to factor and then use factor method, but that
@@ -57,7 +57,7 @@
     map[1:nlevs] <- levs
   }
   class(map) <- "levelsMap"
-  return(map)
+  map
 }
 
 mapLevels.list <- function(x, codes=TRUE, sort=TRUE, drop=FALSE,
@@ -72,14 +72,13 @@
       stop(sprintf("can not combine integer %s", dQuote("levelsMaps")))
     }
   }
-  return(map)
+  map
 }
 
 mapLevels.data.frame <- function(x, codes=TRUE, sort=TRUE, drop=FALSE,
                                  combine=FALSE, ...)
 {
-  return(mapLevels.list(x, codes=codes, sort=sort, drop=drop,
-                        combine=combine, ...))
+  mapLevels.list(x, codes=codes, sort=sort, drop=drop, combine=combine, ...)
 }
 
 ### }}}
@@ -122,7 +121,7 @@
   class(x) <- "list"
   x <- x[i]
   class(x) <- classX
-  return(x)
+  x
 }
 
 "[.listLevelsMap" <- function(x, i)
@@ -131,7 +130,7 @@
   class(x) <- "list"
   x <- x[i]
   class(x) <- classX
-  return(x)
+  x
 }
 
 ### }}}
@@ -162,7 +161,7 @@
   if(check)
     gdata:::.checkLevelsMap(x, method="raw")
   class(x) <- "levelsMap"
-  return(unique(x, ...))
+  unique(x, ...)
 }
 
 as.listLevelsMap <- function(x, check=TRUE)
@@ -170,7 +169,7 @@
   if(check)
     gdata:::.checkListLevelsMap(x, method="raw")
   class(x) <- "listLevelsMap"
-  return(x)
+  x
 }
 
 ### }}}
@@ -215,7 +214,7 @@
 {
   x <- list(...)
   class(x) <- "listLevelsMap"
-  return(c(x, sort=sort, recursive=TRUE))
+  c(x, sort=sort, recursive=TRUE)
 }
 
 c.listLevelsMap <- function(..., sort=TRUE, recursive=FALSE)
@@ -235,7 +234,7 @@
     if(sort) x <- sort.levelsMap(x)
     x <- unique(x)
   }
-  return(x)
+  x
 }
 
 ### }}}
@@ -243,7 +242,7 @@
 ###------------------------------------------------------------------------
 
 sort.levelsMap <- function(x, decreasing=FALSE, na.last=TRUE, ...)
-  return(x[order(names(x), na.last=na.last, decreasing=decreasing)])
+  x[order(names(x), na.last=na.last, decreasing=decreasing)]
 
 ### }}}
 ### {{{ unique
@@ -277,7 +276,7 @@
       x <- x[!test]
     }
   }
-  return(x)
+  x
 }
 
 ### }}}
@@ -317,8 +316,7 @@
       stop(sprintf("can not apply character %s to %s",
                    dQuote("levelsMap"), dQuote("integer")))
   }
-
-  return(x)
+  x
 }
 
 "mapLevels<-.list" <- function(x, value)
@@ -339,13 +337,13 @@
   }
   x <- mapply(FUN="mapLevels<-", x=x, value=value, SIMPLIFY=FALSE)
   if(isNamed) names(x) <- namesX
-  return(x)
+  x
 }
 
 "mapLevels<-.data.frame" <- function(x, value)
 {
   x[] <- "mapLevels<-.list"(x, value)
-  return(x)
+  x
 }
 
 ### }}}

Modified: trunk/gdata/R/trim.R
===================================================================
--- trunk/gdata/R/trim.R	2006-09-13 14:55:37 UTC (rev 979)
+++ trunk/gdata/R/trim.R	2006-09-13 18:15:55 UTC (rev 980)
@@ -4,26 +4,26 @@
   UseMethod("trim", s)
 
 trim.default <- function(s)
-  return(s)
+  s
 
 trim.character <- function(s)
 {
   s <- sub(pattern="^ +", replacement="", x=s)
   s <- sub(pattern=" +$", replacement="", x=s)
-  return(s)
+  s
 }
 
 trim.factor <- function(s)
 {
   levels(s) <- trim(levels(s))
-  return(s)
+  s
 }
 
 trim.list <- function(s)
-  return(lapply(s, trim))
+  lapply(s, trim)
 
 trim.data.frame <- function(s)
 {
   s[] <- trim.list(s)
-  return(s)
+  s
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.