From ab44ddd9ca7615fdbedbfc717e5f6764b80b2b5e Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 29 Jun 2015 23:35:16 +0200 Subject: Start to import or qualify functions from stats, utils et al. --- NAMESPACE | 3 ++- R/mkin_wide_to_long.R | 2 +- R/mkinfit.R | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index abbbc658..d232331a 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -6,8 +6,9 @@ S3method(print, summary.mkinfit) S3method(plot, mmkin) S3method("[", mmkin) -# Import packages listed as Imports or Depends import( + stats, + graphics, FME, deSolve, minpack.lm, diff --git a/R/mkin_wide_to_long.R b/R/mkin_wide_to_long.R index f1814fcb..21a7cbe9 100644 --- a/R/mkin_wide_to_long.R +++ b/R/mkin_wide_to_long.R @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License along with # this program. If not, see -if(getRversion() >= '2.15.1') utils::globalVariables(c("name", "value")) +if(getRversion() >= '2.15.1') utils::globalVariables(c("name", "time", "value")) mkin_wide_to_long <- function(wide_data, time = "t") { diff --git a/R/mkinfit.R b/R/mkinfit.R index cfd87829..e2fd2951 100644 --- a/R/mkinfit.R +++ b/R/mkinfit.R @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License along with # this program. If not, see -if(getRversion() >= '2.15.1') utils::globalVariables(c("name", "value")) +if(getRversion() >= '2.15.1') utils::globalVariables(c("name", "time", "value")) mkinfit <- function(mkinmod, observed, parms.ini = "auto", @@ -589,7 +589,7 @@ summary.mkinfit <- function(object, data = TRUE, distimes = TRUE, alpha = 0.05, } ans <- list( - version = as.character(packageVersion("mkin")), + version = as.character(utils::packageVersion("mkin")), Rversion = paste(R.version$major, R.version$minor, sep="."), date.fit = object$date, date.summary = date(), -- cgit v1.2.1