diff options
Diffstat (limited to 'R')
-rw-r--r-- | R/mkin_wide_to_long.R | 4 | ||||
-rw-r--r-- | R/mkinerrmin.R | 4 | ||||
-rw-r--r-- | R/mkinfit.R | 3 | ||||
-rw-r--r-- | R/mkinresplot.R | 1 | ||||
-rw-r--r-- | R/plot.mkinfit.R | 23 | ||||
-rw-r--r-- | R/transform_odeparms.R | 20 |
6 files changed, 50 insertions, 5 deletions
diff --git a/R/mkin_wide_to_long.R b/R/mkin_wide_to_long.R index 8ec05ef2..8e4ec604 100644 --- a/R/mkin_wide_to_long.R +++ b/R/mkin_wide_to_long.R @@ -1,6 +1,6 @@ # $Id$
-# Copyright (C) 2010 Johannes Ranke
+# Copyright (C) 2010-2013 Johannes Ranke
# Contact: mkin-devel@lists.berlios.de
# This file is part of the R package mkin
@@ -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/>
-
+utils::globalVariables(c("name", "value"))
mkin_wide_to_long <- function(wide_data, time = "t")
{
colnames <- names(wide_data)
diff --git a/R/mkinerrmin.R b/R/mkinerrmin.R index c2786476..49538e37 100644 --- a/R/mkinerrmin.R +++ b/R/mkinerrmin.R @@ -1,6 +1,6 @@ # $Id$
-# Copyright (C) 2010-2012 Johannes Ranke
+# Copyright (C) 2010-2013 Johannes Ranke
# Contact: jranke@uni-bremen.de
# This file is part of the R package mkin
@@ -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/>
-
+utils::globalVariables(c("name"))
mkinerrmin <- function(fit, alpha = 0.05)
{
parms.optim <- fit$parms.all
diff --git a/R/mkinfit.R b/R/mkinfit.R index 411cb40c..e084cf1a 100644 --- a/R/mkinfit.R +++ b/R/mkinfit.R @@ -1,6 +1,6 @@ # $Id$
-# Copyright (C) 2010-2012 Johannes Ranke
+# Copyright (C) 2010-2013 Johannes Ranke
# Contact: jranke@uni-bremen.de
# The summary function is an adapted and extended version of summary.modFit
# from the FME package, v 1.1 by Soetart and Petzoldt, which was in turn
@@ -20,6 +20,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/>
+utils::globalVariables(c("name", "value"))
mkinfit <- function(mkinmod, observed,
parms.ini = "auto",
diff --git a/R/mkinresplot.R b/R/mkinresplot.R index b3482789..b45b26fe 100644 --- a/R/mkinresplot.R +++ b/R/mkinresplot.R @@ -17,6 +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/>
+utils::globalVariables(c("variable", "residual"))
mkinresplot <- function (object, obs_vars = vector(),
xlab = "Time", ylab = "Residual",
diff --git a/R/plot.mkinfit.R b/R/plot.mkinfit.R index b47678ba..fa1d805c 100644 --- a/R/plot.mkinfit.R +++ b/R/plot.mkinfit.R @@ -1,3 +1,26 @@ +# $Id: $ + +# Copyright (C) 2010-2013 Johannes Ranke +# Contact: jranke@uni-bremen.de +# The summary function is an adapted and extended version of summary.modFit +# from the FME package, v 1.1 by Soetart and Petzoldt, which was in turn +# inspired by summary.nls.lm + +# This file is part of the R package mkin + +# mkin is free software: you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation, either version 3 of the License, or (at your option) any later +# version. + +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. + +# You should have received a copy of the GNU General Public License along with +# this program. If not, see <http://www.gnu.org/licenses/> +utils::globalVariables(c("type", "variable", "observed")) plot.mkinfit <- function(x, fit = x, xlab = "Time", ylab = "Observed", xlim = range(fit$data$time), ylim = c(0, max(fit$data$observed, na.rm = TRUE)), diff --git a/R/transform_odeparms.R b/R/transform_odeparms.R index 8b39874e..f56478f1 100644 --- a/R/transform_odeparms.R +++ b/R/transform_odeparms.R @@ -1,3 +1,23 @@ +# $Id$
+
+# Copyright (C) 2010-2013 Johannes Ranke
+# Contact: jranke@uni-bremen.de
+
+# This file is part of the R package mkin
+
+# mkin is free software: you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <http://www.gnu.org/licenses/>
+
transform_odeparms <- function(parms, mod_vars) {
# Set up container for transformed parameters
transparms <- parms
|