aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DESCRIPTION5
-rw-r--r--R/mkinfit.R2
-rw-r--r--TODO1
-rw-r--r--vignettes/FOCUS_Z.Rnw1
-rw-r--r--vignettes/FOCUS_Z.pdfbin214013 -> 220196 bytes
5 files changed, 5 insertions, 4 deletions
diff --git a/DESCRIPTION b/DESCRIPTION
index 02480e56..3898f69a 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -3,7 +3,7 @@ Type: Package
Title: Routines for fitting kinetic models with one or more state
variables to chemical degradation data
Version: 0.9-33
-Date: 2014-07-25
+Date: 2014-08-19
Authors@R: c(person("Johannes", "Ranke", role = c("aut", "cre", "cph"),
email = "jranke@uni-bremen.de"),
person("Katrin", "Lindenberger", role = "ctb"),
@@ -24,5 +24,6 @@ LazyData: yes
Encoding: UTF-8
VignetteBuilder: knitr
BugReports: http://github.com/jranke/mkin/issues
-URL: http://kinfit.r-forge.r-project.org, http://cran.r-project.org/package=mkin,
+URL: http://cran.r-project.org/package=mkin,
+ http://kinfit.r-forge.r-project.org/mkin_static,
http://github.com/jranke/mkin
diff --git a/R/mkinfit.R b/R/mkinfit.R
index c98c7586..92c8f8bf 100644
--- a/R/mkinfit.R
+++ b/R/mkinfit.R
@@ -567,7 +567,7 @@ print.summary.mkinfit <- function(x, digits = max(3, getOption("digits") - 3), .
if (!is.null(x$warning)) cat("\n\nWarning:", x$warning, "\n\n")
cat("\nEquations:\n")
- print(noquote(as.character(x[["diffs"]])))
+ cat(noquote(strwrap(x[["diffs"]], exdent = 11)), fill = TRUE)
df <- x$df
rdf <- df[2]
diff --git a/TODO b/TODO
index 2617bf2c..4b73063f 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,6 @@
TODO for version 1.0
- Think about what a user would expect from version 1.0
- Complete the main package vignette named mkin to include a method description
-- Improve formatting of differential equations in the summary
- Improve order of parameters in output
- Write unit tests for mkinerrmin
- Calculate confidence intervals for more than one formation fraction using Monte Carlo simulations
diff --git a/vignettes/FOCUS_Z.Rnw b/vignettes/FOCUS_Z.Rnw
index 5b0ee79e..e2a2473e 100644
--- a/vignettes/FOCUS_Z.Rnw
+++ b/vignettes/FOCUS_Z.Rnw
@@ -20,6 +20,7 @@
<<include=FALSE>>=
require(knitr)
opts_chunk$set(engine='R', tidy=FALSE)
+options(width=70)
@
\title{Example evaluation of FOCUS dataset Z}
diff --git a/vignettes/FOCUS_Z.pdf b/vignettes/FOCUS_Z.pdf
index f7b0a65a..210ce099 100644
--- a/vignettes/FOCUS_Z.pdf
+++ b/vignettes/FOCUS_Z.pdf
Binary files differ

Contact - Imprint