diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2015-06-29 23:35:16 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2015-06-30 14:15:47 +0200 |
| commit | ab44ddd9ca7615fdbedbfc717e5f6764b80b2b5e (patch) | |
| tree | 9a46f02307b92152a6ed00fee4ee631d99ab8bf9 | |
| parent | c571800c6827d277e727a8f3d2b431f9100184b9 (diff) | |
Start to import or qualify functions from stats, utils et al.
| -rw-r--r-- | NAMESPACE | 3 | ||||
| -rw-r--r-- | R/mkin_wide_to_long.R | 2 | ||||
| -rw-r--r-- | R/mkinfit.R | 4 |
3 files changed, 5 insertions, 4 deletions
@@ -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 <http://www.gnu.org/licenses/>
-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 <http://www.gnu.org/licenses/>
-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(),
|