Revert "Trying to add sub.big.matrix for a non-shared big.matrix"

kaneplusplus · Jan 7, 2017 · 5e29dd9 · 5e29dd9
1 parent 8c01e05
commit 5e29dd9
Show file tree

Hide file tree

Showing 12 changed files with 440 additions and 525 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -25,6 +25,7 @@ export(mwhich)
 export(read.big.matrix)
 export(shared.name)
 export(sub.big.matrix)
+export(transpose)
 export(write.big.matrix)
 exportClasses(big.matrix)
 exportClasses(big.matrix.descriptor)

diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -77,6 +77,14 @@ GetIndexColNames <- function(address, indices_) {
     .Call('bigmemory_GetIndexColNames', PACKAGE = 'bigmemory', address, indices_)
 }
 
+GetColumnNamesBM <- function(address) {
+    .Call('bigmemory_GetColumnNamesBM', PACKAGE = 'bigmemory', address)
+}
+
+GetRowNamesBM <- function(address) {
+    .Call('bigmemory_GetRowNamesBM', PACKAGE = 'bigmemory', address)
+}
+
 SetColumnNames <- function(address, columnNames) {
     invisible(.Call('bigmemory_SetColumnNames', PACKAGE = 'bigmemory', address, columnNames))
 }
@@ -117,6 +125,22 @@ IsSeparated <- function(bigMatAddr) {
     .Call('bigmemory_IsSeparated', PACKAGE = 'bigmemory', bigMatAddr)
 }
 
+SetRowOffsetInfo <- function(bigMatAddr, rowOffset, numRows) {
+    invisible(.Call('bigmemory_SetRowOffsetInfo', PACKAGE = 'bigmemory', bigMatAddr, rowOffset, numRows))
+}
+
+SetColumnOffsetInfo <- function(bigMatAddr, colOffset, numCols) {
+    invisible(.Call('bigmemory_SetColumnOffsetInfo', PACKAGE = 'bigmemory', bigMatAddr, colOffset, numCols))
+}
+
+GetRowOffset <- function(bigMatAddr) {
+    .Call('bigmemory_GetRowOffset', PACKAGE = 'bigmemory', bigMatAddr)
+}
+
+GetColOffset <- function(bigMatAddr) {
+    .Call('bigmemory_GetColOffset', PACKAGE = 'bigmemory', bigMatAddr)
+}
+
 GetTotalColumns <- function(bigMatAddr) {
     .Call('bigmemory_GetTotalColumns', PACKAGE = 'bigmemory', bigMatAddr)
 }
@@ -125,6 +149,10 @@ GetTotalRows <- function(bigMatAddr) {
     .Call('bigmemory_GetTotalRows', PACKAGE = 'bigmemory', bigMatAddr)
 }
 
+GetTypeString <- function(bigMatAddr) {
+    .Call('bigmemory_GetTypeString', PACKAGE = 'bigmemory', bigMatAddr)
+}
+
 #' @title big.matrix size
 #' @description Returns the size of the created matrix in bytes
 #' @param bigMat a \code{big.matrix} object
@@ -209,10 +237,6 @@ CreateFileBackedBigMatrix <- function(fileName, filePath, row, col, colnames, ro
     .Call('bigmemory_CreateFileBackedBigMatrix', PACKAGE = 'bigmemory', fileName, filePath, row, col, colnames, rownames, typeLength, ini, separated)
 }
 
-CAttachLocalBigMatrix <- function(pMat, rowOffset, colOffset, numRows, numCols) {
-    .Call('bigmemory_CAttachLocalBigMatrix', PACKAGE = 'bigmemory', pMat, rowOffset, colOffset, numRows, numCols)
-}
-
 CAttachSharedBigMatrix <- function(sharedName, rows, cols, rowNames, colNames, typeLength, separated, readOnly) {
     .Call('bigmemory_CAttachSharedBigMatrix', PACKAGE = 'bigmemory', sharedName, rows, cols, rowNames, colNames, typeLength, separated, readOnly)
 }
@@ -237,47 +261,19 @@ Flush <- function(address) {
     .Call('bigmemory_Flush', PACKAGE = 'bigmemory', address)
 }
 
-isnil <- function(address) {
-    .Call('bigmemory_isnil', PACKAGE = 'bigmemory', address)
-}
-
-IsShared <- function(pMat) {
-    .Call('bigmemory_IsShared', PACKAGE = 'bigmemory', pMat)
-}
-
-GetTypeString <- function(pMat) {
-    .Call('bigmemory_GetTypeString', PACKAGE = 'bigmemory', pMat)
-}
-
-GetColumnNamesBM <- function(pMat) {
-    .Call('bigmemory_GetColumnNamesBM', PACKAGE = 'bigmemory', pMat)
+IsShared <- function(address) {
+    .Call('bigmemory_IsShared', PACKAGE = 'bigmemory', address)
 }
 
-GetRowNamesBM <- function(pMat) {
-    .Call('bigmemory_GetRowNamesBM', PACKAGE = 'bigmemory', pMat)
-}
-
-GetInfos <- function(pMat) {
-    .Call('bigmemory_GetInfos', PACKAGE = 'bigmemory', pMat)
-}
-
-SetRowOffsetInfo <- function(pMat, rowOffset, numRows) {
-    invisible(.Call('bigmemory_SetRowOffsetInfo', PACKAGE = 'bigmemory', pMat, rowOffset, numRows))
-}
-
-SetColumnOffsetInfo <- function(pMat, colOffset, numCols) {
-    invisible(.Call('bigmemory_SetColumnOffsetInfo', PACKAGE = 'bigmemory', pMat, colOffset, numCols))
-}
-
-GetRowOffset <- function(pMat) {
-    .Call('bigmemory_GetRowOffset', PACKAGE = 'bigmemory', pMat)
-}
-
-GetColOffset <- function(pMat) {
-    .Call('bigmemory_GetColOffset', PACKAGE = 'bigmemory', pMat)
+isnil <- function(address) {
+    .Call('bigmemory_isnil', PACKAGE = 'bigmemory', address)
 }
 
 CDeepCopy <- function(inAddr, outAddr, rowInds, colInds, typecast_warning) {
     .Call('bigmemory_CDeepCopy', PACKAGE = 'bigmemory', inAddr, outAddr, rowInds, colInds, typecast_warning)
 }
 
+transpose3 <- function(pBigMat, pBigMat2) {
+    invisible(.Call('bigmemory_transpose3', PACKAGE = 'bigmemory', pBigMat, pBigMat2))
+}
+