diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2020-10-15 13:17:45 +0200 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2020-10-15 13:17:45 +0200 |
commit | f4f6cc84d32e135b03300bf78578f1981c489bfe (patch) | |
tree | 8402d290158a1d5bd12614fa591dea5db1cc63c0 | |
parent | 204bff8546cbd52533e36853b10b181d46fb2767 (diff) |
Get current nlme version from CRAN on Travis
Also commit the dontrun instruction for saemix I had wanted to commit
and switch back to devel mode for pkgdown
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | _pkgdown.yml | 4 | ||||
-rw-r--r-- | man/saemix.Rd | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index c598c869..b6982328 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,8 @@ addons: apt: packages: - gcc +r_packages: + - nlme r_github_packages: - jranke/saemixextension script: diff --git a/_pkgdown.yml b/_pkgdown.yml index e8fa6567..74abeeba 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -3,8 +3,8 @@ url: https://pkgdown.jrwb.de/mkin title: mkin development: - mode: release - version_label: default + mode: devel + version_label: info template: bootswatch: spacelab diff --git a/man/saemix.Rd b/man/saemix.Rd index 5f96e84f..e18610c9 100644 --- a/man/saemix.Rd +++ b/man/saemix.Rd @@ -69,10 +69,11 @@ ds_sfo_syn <- lapply(ds_sfo_mean, function(ds) { add_err(ds, sdfunc = function(value) sqrt(1^2 + value^2 * 0.07^2), n = 1)[[1]] }) +\dontrun{ f_mmkin_syn <- mmkin("SFO", ds_sfo_syn, error_model = "tc", quiet = TRUE) m_saemix_tc <- saemix_model(f_mmkin_syn, cores = 1) d_saemix_tc <- saemix_data(f_mmkin_syn) f_saemix_tc <- saemix(m_saemix_tc, d_saemix_tc, saemix_options) plot(f_saemix_tc, plot.type = "convergence") - +} } |