Skip to content

Commit

Permalink
Update based on Kurt's email.
Browse files Browse the repository at this point in the history
  • Loading branch information
kaneplusplus committed Dec 20, 2019
1 parent 50d4472 commit 3158f5f
Show file tree
Hide file tree
Showing 26 changed files with 311 additions and 1,144 deletions.
6 changes: 2 additions & 4 deletions DESCRIPTION
@@ -1,5 +1,5 @@
Package: bigmemory
Version: 4.5.33
Version: 4.5.35
Title: Manage Massive Matrices with Shared Memory and Memory-Mapped Files
Author: Michael J. Kane <kaneplusplus@gmail.com>, John W. Emerson
<jayemerson@gmail.com>, Peter Haverty <haverty.peter@gene.com>, and Charles
Expand All @@ -24,9 +24,7 @@ URL: https://github.com/kaneplusplus/bigmemory
BugReports: https://github.com/kaneplusplus/bigmemory/issues
LazyLoad: yes
Biarch: yes
VignetteBuilder: knitr
Suggests:
knitr,
testthat
RoxygenNote: 6.0.1
RoxygenNote: 7.0.2
Roxygen: list(markdown = TRUE)
8 changes: 4 additions & 4 deletions R/bigmemory.R
Expand Up @@ -1941,7 +1941,7 @@ morder <- function(x, cols, na.last=TRUE, decreasing = FALSE) {
stop("Bad column indices.")
}

switch(class(x),
switch(class(x)[1],
"big.matrix"=OrderBigMatrix(x@address, as.double(cols),
as.integer(na.last), as.logical(decreasing) ),
"matrix" = switch(typeof(x),
Expand All @@ -1965,7 +1965,7 @@ morderCols <- function(x, rows, na.last=TRUE, decreasing = FALSE) {
stop("Bad row indices.")
}

switch(class(x),
switch(class(x)[1],
"big.matrix"=OrderBigMatrixCols(x@address, as.double(rows),
as.integer(na.last),
as.logical(decreasing) ),
Expand Down Expand Up @@ -2012,7 +2012,7 @@ mpermute <- function(x, order=NULL, cols=NULL, allow.duplicates=FALSE, ...)
order <- morder(x, cols, ...)
}

switch(class(x),
switch(class(x)[1],
"big.matrix" = ReorderBigMatrix(x@address, order),
"matrix" = switch(typeof(x),
'integer' = ReorderRIntMatrix(x, nrow(x), ncol(x), order),
Expand Down Expand Up @@ -2053,7 +2053,7 @@ mpermuteCols <- function(x, order=NULL, rows=NULL,
order <- morderCols(x, rows, ...)
}

switch(class(x),
switch(class(x)[1],
"big.matrix" = {
ReorderBigMatrixCols(x@address, order)
SetColumnNames(x@address, colnames(x)[order])
Expand Down
78 changes: 0 additions & 78 deletions inst/doc/Overview.R

This file was deleted.

0 comments on commit 3158f5f

Please sign in to comment.