Skip to content

Commit

Permalink
Changes in R package formatting.
Browse files Browse the repository at this point in the history
  • Loading branch information
kaneplusplus committed Jan 2, 2024
1 parent 177c761 commit facefae
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
8 changes: 4 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: bigmemory
Version: 4.6.1
Version: 4.6.2
Title: Manage Massive Matrices with Shared Memory and Memory-Mapped Files
Authors@R:
c(person(given = "Michael J.",
Authors@R: c(
person(given = "Michael J.",
family = "Kane",
role = c("aut", "cre"),
email = "bigmemoryauthors@gmail.com",
Expand Down Expand Up @@ -47,5 +47,5 @@ LazyLoad: yes
Suggests:
testthat,
remotes
RoxygenNote: 7.1.2
RoxygenNote: 7.2.3
Roxygen: list(markdown = TRUE)
2 changes: 1 addition & 1 deletion R/bigmemory.R
Original file line number Diff line number Diff line change
Expand Up @@ -2084,7 +2084,7 @@ setMethod('is.readonly', signature(x='big.matrix'),
#' @rdname big.matrix
#' @export
is.nil <- function(address) {
if (class(address)!="externalptr") {
if (!inherits(address, "externalptr")) {
stop("address is not an externalptr.")
}
isnil(address)
Expand Down
9 changes: 5 additions & 4 deletions inst/CITATION
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
citHeader("To cite bigmemory in publications use:")

citEntry(entry = "Article",
bibentry(
bibtype = "Article",
title = "Scalable Strategies for Computing with Massive Data",
author = personList(as.person("Michael J. Kane"),
as.person("John Emerson"),
as.person("Stephen Weston")),
author = c(person(given = "Michael J.", family = "Kane"),
person(given = "John W.", family = "Emerson"),
person(given = "Stephen", family = "Weston")),
journal = "Journal of Statistical Software",
year = "2013",
volume = "55",
Expand Down
4 changes: 2 additions & 2 deletions src/bigmemory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -894,8 +894,8 @@ SEXP ReadMatrix(SEXP fileName, BigMatrix *pMat,
}
else
{
Rf_warning(
(string("Incorrect number of entries in row ")+ttos(j)).c_str());
string ws = string("Incorrect number of entries in row ") + ttos(j);
Rf_warning(ws.c_str());
}
}
first = last+1;
Expand Down

0 comments on commit facefae

Please sign in to comment.