[H5r-commits] r31 - R man tests

[noreply at r-forge.r-project.org]

Author: extemporaneousb
Date: 2010-06-08 01:59:33 +0200 (Tue, 08 Jun 2010)
New Revision: 31

Modified:
   R/h5R.R
   man/H5Obj-class.Rd
   tests/.Rhistory
   tests/testall.R
Log:
Pass R CMD check. Modified test code.



Modified: R/h5R.R
===================================================================
--- R/h5R.R	2010-06-04 17:58:23 UTC (rev 30)
+++ R/h5R.R	2010-06-07 23:59:33 UTC (rev 31)
@@ -329,13 +329,18 @@
       ## to their selection.
       dta <- eval(as.call(lst))
     }
-    if (drop) drop(dta) else dta
+    dta <- if (drop) drop(dta) else dta
+
+    ## This is so dim(x[]) matches dim(x).
+    if (is.null(dim(x)))
+      as.vector(dta)
+    else
+      dta
   }
 })
 
 ## This function is written to leverage the possibility of fast contiguous
-## range access. Here matrix is a two-column matrix with start, stop.
-## Other options will be IRanges.
+## range access.
 setMethod("[", c("H5Dataset", "hSlab", "missing", "missing"), function(x, i) {
   if (.inMemory(x))
     stop("Not implemented for inMemory datasets.")

Modified: man/H5Obj-class.Rd
===================================================================
--- man/H5Obj-class.Rd	2010-06-04 17:58:23 UTC (rev 30)
+++ man/H5Obj-class.Rd	2010-06-07 23:59:33 UTC (rev 31)
@@ -26,7 +26,23 @@
 \alias{readSlab}
 \alias{listH5Contents}
 \alias{print.H5ContentList}
+\alias{h5Exists}
+\alias{hSlab}
+\alias{start}
+\alias{width}
+\alias{[,H5DataContainer,ANY,ANY,ANY-method}
+\alias{[,H5Dataset,ANY,ANY,ANY-method}
+\alias{[,H5Dataset,hSlab,missing,missing-method}
+\alias{length,hSlab-method}
+\alias{show,H5DataContainer-method}
+\alias{show,H5File-method}
+\alias{show,H5Group-method}
+\alias{show,H5Obj-method}
+\alias{start,hSlab-method}
+\alias{width,hSlab-method}
 
+
+
 \title{Class "H5Obj"}
 \description{Classes for objects originating from HDF5 files.}
 \section{Objects from the Class}{

Modified: tests/.Rhistory
===================================================================
--- tests/.Rhistory	2010-06-04 17:58:23 UTC (rev 30)
+++ tests/.Rhistory	2010-06-07 23:59:33 UTC (rev 31)
@@ -1,59 +1,4 @@
-x = ds9[,1:2,,1]
-x
-dim(ds9[,1:2,,1])
-x = ds9[,1:2,,1]
-n
-kall
-n
-kall
-names(kall)
-length(kall)
-kall
-as.list(kall)
-Q
-x = ds9[,1:2,,1]
-n
-kall
-names(kall)
-j
-i
-d
-kall
-Q
-x = ds9[,1:2,,1]
-n
-kall
-n
-x = ds9[,1:2,,1]
-c
-dim(x)
-x = ds9[,1:2,,1,drop=FALSE]
-c
-dim(x)
-all(id9[c(7, 10), c(3, 4), , , ]        == ds9[ c(7, 10), c(3, 4), , , ])
-ds9[ c(7, 10), c(3, 4), , , ]
-dim(ds9[ c(7, 10), c(3, 4), , , ])
-dim(ds9[ c(7, 10), c(3, 4), , , ])
-n
-Q
-dim(ds9[ c(7, 10), c(3, 4), , , ])
-TH(action='print')
-TH(action='print')
- )
-id9[ , , , 1:2, 1:2 ]
-dim(id9[ , , , 1:2, 1:2 ])
-dim(ds9[ , , , 1:2, 1:2])
-dim(ds9[ , , , 1:2, 1:2])
-dim(ds9[ , , , 1:2, 1:2])
-dim(ds9[ , , , 1:2, 1:2])
-TH(action='print')
-ds9[ , , 2:1, 2:1, , ])
 ds9[ , , 2:1, 2:1, , ]
-traceback()
-ds9[ , , 2:1, 2:1, , ]
-extras
-Q
-ds9[ , , 2:1, 2:1, , ]
 n
 kall
 dims
@@ -150,3 +95,56 @@
 TH(action='print')
 TH(action='print')
 TH(action='print')
+ds2
+ds2[]
+dim(ds2[])
+ds3[]
+ds4
+ds5
+ds6
+ds6[]
+class(ds6[])
+ds2
+class(ds2[])
+ds2[]
+drop(ds2[])
+class(drop(ds2[]))
+unclass(drop(ds2[]))
+class(unclass(drop(ds2[])))
+class(drop(ds2[]))
+class(ds2[1:10])
+aperm(ds2[1:10])
+class(aperm(ds2[1:10]))
+class(aperm(ds1[1:10,1]))
+ds1[1:10,1]
+class(ds1[1:10,1])
+ds1[1:10,1]
+ds1[1:10]
+ds2
+ds2[]
+class(ds2[])
+class(ds2[1:10])
+class(aperm(ds2[1:10]))
+ds1[1:10]
+ds1[1:10,1]
+class(ds1[1:10,])
+ds7
+ds7[1:2,1:2,1:2]
+class(ds7[1:2,1:2,1:2])
+?arrau
+?array
+dim(ds2)
+ds2
+dim(ds2[])
+dim(ds2[1:10])
+dim(drop(ds2[1:10]))
+dim(as.vector(ds2[]))
+as.vector(ds2[])
+dim(ds1[])
+dim(ds3[])
+class(ds3[])
+TH(action='print')
+ds2
+ds2[]
+dim(ds2[])
+dim(ds2)

Modified: tests/testall.R
===================================================================
--- tests/testall.R	2010-06-04 17:58:23 UTC (rev 30)
+++ tests/testall.R	2010-06-07 23:59:33 UTC (rev 31)
@@ -271,9 +271,13 @@
     return(TRUE)
   }))
 })
-   
 
 
+dim(ds2)
+
+
+
+
 TH(action = "print")
 TH(action = "throw")