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

[<gg...@us...>]

Revision: 993
          http://svn.sourceforge.net/r-gregmisc/?rev=993&view=rev
Author:   ggorjan
Date:     2006-10-30 09:10:08 -0800 (Mon, 30 Oct 2006)

Log Message:
-----------
mapply keeps names in R 2.4; POSIX unit tests solved; $ should work now

Modified Paths:
--------------
    trunk/gdata/R/mapLevels.R
    trunk/gdata/R/unknown.R
    trunk/gdata/inst/unitTests/runit.unknown.R

Property Changed:
----------------
    trunk/gdata/R/c.factor.R
    trunk/gdata/R/mapLevels.R
    trunk/gdata/R/unknown.R
    trunk/gdata/inst/unitTests/runit.drop.levels.R
    trunk/gdata/inst/unitTests/runit.mapLevels.R
    trunk/gdata/inst/unitTests/runit.trim.R
    trunk/gdata/inst/unitTests/runit.unknown.R
    trunk/gdata/man/c.factor.Rd
    trunk/gdata/man/unknown.Rd
    trunk/gdata/tests/doRUnit.R


Property changes on: trunk/gdata/R/c.factor.R
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/gdata/R/mapLevels.R
===================================================================
--- trunk/gdata/R/mapLevels.R	2006-10-29 16:08:40 UTC (rev 992)
+++ trunk/gdata/R/mapLevels.R	2006-10-30 17:10:08 UTC (rev 993)
@@ -1,7 +1,7 @@
 ### mapLevels.R
 ###------------------------------------------------------------------------
 ### What: Mapping levels
-### $Id: mapLevels.R,v 1.1 2006/03/29 13:47:15 ggorjan Exp ggorjan $
+### $Id$
 ### Time-stamp: <2006-10-29 16:45:20 ggorjan>
 ###------------------------------------------------------------------------
 


Property changes on: trunk/gdata/R/mapLevels.R
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/gdata/R/unknown.R
===================================================================
--- trunk/gdata/R/unknown.R	2006-10-29 16:08:40 UTC (rev 992)
+++ trunk/gdata/R/unknown.R	2006-10-30 17:10:08 UTC (rev 993)
@@ -1,12 +1,11 @@
 ### unknown.R
 ###------------------------------------------------------------------------
 ### What: Change given unknown value to NA and vice versa
-### $Id$
-### Time-stamp: <2006-10-29 17:08:21 ggorjan>
+### $Id:$
+### Time-stamp: <2006-10-30 18:06:17 ggorjan>
 ###------------------------------------------------------------------------
 
 ### {{{ isUnknown
-
 ###------------------------------------------------------------------------
 
 isUnknown <- function(x, unknown=NA, ...)
@@ -34,10 +33,7 @@
 
 isUnknown.list <- function(x, unknown=NA, ...) {
   unknown <- gdata:::.unknownList(x=x, unknown=unknown)
-  ## FIXME - do I still need attributes here; R 2.4
-  ## attrX <- attributes(x)
   x <- mapply(FUN="isUnknown", x=x, unknown=unknown, ..., SIMPLIFY=FALSE)
-  ## attributes(x) <- attrX
   x
 }
 
@@ -53,7 +49,6 @@
 
 ### }}}
 ### {{{ unknownToNA
-
 ###------------------------------------------------------------------------
 
 unknownToNA <- function(x, unknown, warning=FALSE, ...)
@@ -87,11 +82,8 @@
 unknownToNA.list <- function(x, unknown, warning=FALSE, ...)
 {
   unknown <- gdata:::.unknownList(x=x, unknown=unknown)
-  ## FIXME - do I still need attributes here; R 2.4
-  ## attrX <- attributes(x)
   x <- mapply(FUN="unknownToNA", x=x, unknown=unknown, warning=warning,
               SIMPLIFY=FALSE)
-  ## attributes(x) <- attrX
   return(x)
 }
 
@@ -103,7 +95,6 @@
 
 ### }}}
 ### {{{ NAToUnknown
-
 ###------------------------------------------------------------------------
 
 NAToUnknown <- function(x, unknown, force=FALSE, call.=FALSE, ...)
@@ -148,11 +139,8 @@
 NAToUnknown.list <- function(x, unknown, force=FALSE, call.=FALSE, ...)
 {
   unknown <- gdata:::.unknownList(x=x, unknown=unknown)
-  ## FIXME - do I still need attributes here; R 2.4
-  ## attrX <- attributes(x)
   x <- mapply(FUN="NAToUnknown", x=x, unknown=unknown, force=force,
               call.=call., SIMPLIFY=FALSE)
-  ## attributes(x) <- attrX
   x
 }
 


Property changes on: trunk/gdata/R/unknown.R
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gdata/inst/unitTests/runit.drop.levels.R
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gdata/inst/unitTests/runit.mapLevels.R
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gdata/inst/unitTests/runit.trim.R
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/gdata/inst/unitTests/runit.unknown.R
===================================================================
--- trunk/gdata/inst/unitTests/runit.unknown.R	2006-10-29 16:08:40 UTC (rev 992)
+++ trunk/gdata/inst/unitTests/runit.unknown.R	2006-10-30 17:10:08 UTC (rev 993)
@@ -2,7 +2,7 @@
 ###------------------------------------------------------------------------
 ### What: Tests for Change given unknown value to NA and vice versa methods
 ### $Id$
-### Time-stamp: <2006-10-29 17:06:04 ggorjan>
+### Time-stamp: <2006-10-30 17:46:21 ggorjan>
 ###------------------------------------------------------------------------
 
 ### {{{ --- Test setup ---
@@ -48,28 +48,31 @@
 xFacUnkLevTest <-    c(1,    0,  0, 0,    0,    0,      0,      0,   1)
 xFacUnkLevTest <- as.logical(xFacUnkLevTest)
 
-dateUnk <- as.Date("1900-1-1")
-xDate     <- c(as.Date("2006-08-31"), NA)
-xDateUnk  <- c(as.Date("2006-08-31"), dateUnk)
-xDateTest <- c(FALSE,                 TRUE)
+dateUnk <- as.Date("2006-08-14")
+tmp <- as.Date("2006-08-15")
+xDate     <- c(tmp, NA)
+xDateUnk  <- c(tmp,   dateUnk)
+xDateTest <- c(FALSE, TRUE)
 
-xDate1Unk  <- c(as.Date("2006-08-31"), dateUnk, NA)
-xDate1Test <- c(FALSE,                 TRUE,    FALSE)
+xDate1Unk  <- c(tmp,   dateUnk, NA)
+xDate1Test <- c(FALSE, TRUE,    FALSE)
 
-POSIXltUnk <- strptime("1900-1-1", format="%Y-%m-%d")
-xPOSIXlt     <- c(strptime("2006-08-31", format="%Y-%m-%d"), NA)
-xPOSIXltUnk  <- c(strptime("2006-08-31", format="%Y-%m-%d"), POSIXltUnk)
-xPOSIXltTest <- c(FALSE,                                     TRUE)
+POSIXltUnk <- strptime("2006-08-14", format="%Y-%m-%d")
+tmp <- strptime("2006-08-15", format="%Y-%m-%d")
+xPOSIXlt     <- c(tmp, NA)
+xPOSIXltUnk  <- c(tmp,   POSIXltUnk)
+xPOSIXltTest <- c(FALSE, TRUE)
 
-xPOSIXlt1Unk  <- c(strptime("2006-08-31", format="%Y-%m-%d"), POSIXltUnk, NA)
-xPOSIXlt1Test <- c(FALSE,                                     TRUE,       FALSE)
+xPOSIXlt1Unk  <- c(tmp,   POSIXltUnk, NA)
+xPOSIXlt1Test <- c(FALSE, TRUE,       FALSE)
 
-POSIXctUnk <- as.POSIXct(strptime("1900-1-1 01:01:01", format="%Y-%m-%d %H:%M:%S"))
-xPOSIXct     <- c(as.POSIXct(strptime("2006-08-31 01:01:01", format="%Y-%m-%d %H:%M:%S")), NA)
-xPOSIXctUnk  <- c(as.POSIXct(strptime("2006-08-31 01:01:01", format="%Y-%m-%d %H:%M:%S")), POSIXctUnk)
+POSIXctUnk <- as.POSIXct(strptime("2006-08-14 01:01:01", format="%Y-%m-%d %H:%M:%S"))
+tmp <- as.POSIXct(strptime("2006-08-15 01:01:01", format="%Y-%m-%d %H:%M:%S"))
+xPOSIXct     <- c(tmp, NA)
+xPOSIXctUnk  <- c(tmp, POSIXctUnk)
 xPOSIXctTest <- xPOSIXltTest
 
-xPOSIXct1Unk  <- c(as.POSIXct(strptime("2006-08-31 01:01:01", format="%Y-%m-%d %H:%M:%S")), POSIXctUnk, NA)
+xPOSIXct1Unk  <- c(tmp, POSIXctUnk, NA)
 xPOSIXct1Test <- xPOSIXlt1Test
 
 ### }}}
@@ -427,8 +430,7 @@
 
   ## Date-time classes
   checkIdentical(NAToUnknown(xDate, unknown=dateUnk), xDateUnk)
-  ## FIXME
-  ## checkIdentical(NAToUnknown(xPOSIXlt, unknown=POSIXltUnk), xPOSIXltUnk)
+  checkIdentical(NAToUnknown(xPOSIXlt, unknown=POSIXltUnk), xPOSIXltUnk)
   checkIdentical(NAToUnknown(xPOSIXct, unknown=POSIXctUnk), xPOSIXctUnk)
 
   ## --- lists and data.frames ---


Property changes on: trunk/gdata/inst/unitTests/runit.unknown.R
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gdata/man/c.factor.Rd
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gdata/man/unknown.Rd
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gdata/tests/doRUnit.R
___________________________________________________________________
Name: svn:keywords
   + Id


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