- Added an S3 plot method for mkinfit models

- Fixed a bug in the mkinfit summary method which crashed on missing covariance matrices



git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@58 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

1 files changed, 2 insertions, 36 deletions

diff --git a/R/mkinplot.R b/R/mkinplot.R
index 546c506..b9becfd 100644
--- a/R/mkinplot.R
+++ b/R/mkinplot.R
@@ -1,38 +1,4 @@
-mkinplot <- function(fit, xlab = "Time", ylab = "Observed", xlim = range(fit$data$time), ylim = range(fit$data$observed, na.rm = TRUE), legend = TRUE, ...)
+mkinplot <- function(fit, ...)
 {
-  solution_type = fit$solution_type
-  fixed <- fit$fixed$value
-  names(fixed) <- rownames(fit$fixed)
-  parms.all <- c(fit$parms.all, fixed)
-  ininames <- c(
-    rownames(subset(fit$start, type == "state")),
-    rownames(subset(fit$fixed, type == "state")))
-  odeini <- parms.all[ininames]
-  names(odeini) <- names(fit$mkinmod$diffs)
-
-  outtimes <- seq(xlim[1], xlim[2], length.out=100)
-
-  odenames <- c(
-    rownames(subset(fit$start, type == "deparm")),
-    rownames(subset(fit$fixed, type == "deparm")))
-  odeparms <- parms.all[odenames]
-
-  out <- mkinpredict(fit$mkinmod, odeparms, odeini, outtimes, 
-          solution_type = solution_type, atol = fit$atol, rtol = fit$rtol, ...)
-
-  # Plot the data and model output
-  plot(0, type="n", 
-    xlim = xlim, ylim = ylim,
-    xlab = xlab, ylab = ylab, ...)
-  col_obs <- pch_obs <- lty_obs <- 1:length(fit$mkinmod$map)
-  names(col_obs) <- names(pch_obs) <- names(lty_obs) <- names(fit$mkinmod$map)
-  for (obs_var in names(fit$mkinmod$map)) {
-    points(subset(fit$data, variable == obs_var, c(time, observed)), 
-      pch = pch_obs[obs_var], col = col_obs[obs_var])
-  }
-  matlines(out$time, out[-1])
-  if (legend == TRUE) {
-    legend("topright", inset=c(0.05, 0.05), legend=names(fit$mkinmod$map),
-      col=col_obs, pch=pch_obs, lty=lty_obs)
-  }
+  plot(fit, ...)
 }