[H5r-commits] r15 - R

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

Author: extemporaneousb
Date: 2010-04-23 20:51:04 +0200 (Fri, 23 Apr 2010)
New Revision: 15

Modified:
   R/h5R.R
Log:
changed the default to still be in memory for instanteating datasets.



Modified: R/h5R.R
===================================================================
--- R/h5R.R	2010-04-23 18:31:58 UTC (rev 14)
+++ R/h5R.R	2010-04-23 18:51:04 UTC (rev 15)
@@ -98,7 +98,7 @@
   return(.Object)
 })
 
-.initH5DataContainer <- function(o, name, inMemory = TRUE) {
+.initH5DataContainer <- function(o, name, inMemory) {
   o at name <- name
   o at h5Type <- getH5Type(o)
   o at dims <- getH5Dim(o)
@@ -112,7 +112,7 @@
   return(o)
 }
 
-setMethod("getH5Dataset", c("H5Obj", "character"), function(h5Obj, datasetName, inMemory = FALSE) {
+setMethod("getH5Dataset", c("H5Obj", "character"), function(h5Obj, datasetName, inMemory = TRUE) {
   o <- new("H5Dataset")
   o at ePtr <- .Call("h5R_get_dataset", .ePtr(h5Obj), datasetName, PACKAGE = 'h5r')
   return(.initH5DataContainer(o, datasetName, inMemory))
@@ -121,7 +121,7 @@
 setMethod("getH5Attribute", c("H5Obj", "character"), function(h5Obj, attrName) {
   o <- new("H5Attribute")
   o at ePtr <- .Call("h5R_get_attr", .ePtr(h5Obj), attrName, PACKAGE = 'h5r')
-  return(.initH5DataContainer(o, attrName))
+  return(.initH5DataContainer(o, attrName, inMemory = TRUE))
 })
 
 .internalSlice <- function(x, i, j, ..., drop = TRUE) {