Merge pull request #1065 from metrumresearchgroup/fix/generics

Fix generic signature problems identified with new R-devel

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: mrgsolve
 Title: Simulate from ODE-Based Models
-Version: 1.0.8.9000
+Version: 1.0.8.9001
 Authors@R: 
     c(person(given = "Kyle T", family = "Baron",
              role = c("aut", "cre"),

NEWS.md

@@ -1,5 +1,8 @@
 # mrgsolve (development version)
 
+- Fix signatures for `compiled.mrgmod()` and `as_tibble.mrgsims()` based on new
+  R-devel check findings (#1065).
+
 # mrgsolve 1.0.8
 
 - `SIGMA()` is a new model macro which allows users to access on-diagonal

R/compile.R

@@ -1,4 +1,4 @@
-# Copyright (C) 2013 - 2019  Metrum Research Group, LLC
+# Copyright (C) 2013 - 2023  Metrum Research Group
 #
 # This file is part of mrgsolve.
 #
@@ -130,7 +130,7 @@ compiled <- function(x,...) UseMethod("compiled")
 #' @export
 compiled.default <- function(x,...) return(FALSE)
 #' @export
-compiled.mrgmod <- function(x,status=NULL) {
+compiled.mrgmod <- function(x, status = NULL, ...) {
     if(is.null(status)) return(x@shlib$compiled)
     x@shlib$compiled <- status
     return(x)

R/mrgsims.R

@@ -235,16 +235,18 @@ slice.mrgsims <- function(.data,...) {
 }
 
 ##' @rdname mrgsims_dplyr
-##' @param .data_ mrgsims object
 ##' @export
-as_data_frame.mrgsims <- function(.data_,...) {
-  as_tibble(as.data.frame(.data_),...)
+as_data_frame.mrgsims <- function(x,...) {
+  as_tibble(as.data.frame(x),...)
 }
 
-##' @rdname mrgsims_dplyr
-##' @export
-as_tibble.mrgsims <- function(.data_,...) {
-  as_tibble(as.data.frame(.data_),...)  
+
+#' @param x mrgsims object.
+#' 
+#' @rdname mrgsims_dplyr
+#' @export
+as_tibble.mrgsims <- function(x, ...) {
+  as_tibble(as.data.frame(x), ...)  
 }
 
 #' @rdname mrgsims_dplyr