diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2014-02-27 16:36:11 +0100 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2014-02-27 16:36:11 +0100 |
commit | 6910e67398dbcb548dae179d361cb24404ad75a4 (patch) | |
tree | a6e0eaa8e0373c302a1c5b4e42620e42628e2ed4 /R | |
parent | 9ef8537149a37ebef8a2a18232644202872bbe55 (diff) |
Format of gmkin workspace files, copyright, updates
- Change the format of the workspace files of gmkin so they can be
distributed in the mkin package
- Add gmkin workspace datasets FOCUS_2006_gmkin and FOCUS_2006_Z_gmkin
- Restrict the unit test with the Schaefer data to parent and primary
metabolites as formation fraction and DT50 for A2 are higly correlated
and passing the test is platform dependent. For example, the test
fails in 1 out of 14 platforms on CRAN as of today
- Add Eurofins Regulatory AG copyright notices
- Import FME and deSolve instead of depending on them to have cleaner
startup
Diffstat (limited to 'R')
-rw-r--r-- | R/mkinfit.R | 1 | ||||
-rw-r--r-- | R/mkinpredict.R | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/R/mkinfit.R b/R/mkinfit.R index 6c976a37..326f4044 100644 --- a/R/mkinfit.R +++ b/R/mkinfit.R @@ -1,4 +1,5 @@ # Copyright (C) 2010-2014 Johannes Ranke
+# Portions of this code are copyright (C) 2013 Eurofins Regulatory AG
# 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
diff --git a/R/mkinpredict.R b/R/mkinpredict.R index 07c1a819..14efc568 100644 --- a/R/mkinpredict.R +++ b/R/mkinpredict.R @@ -1,4 +1,5 @@ -# Copyright (C) 2010-2013 Johannes Ranke +# Copyright (C) 2010-2014 Johannes Ranke +# Some lines in this code are copyright (C) 2013 Eurofins Regulatory AG # Contact: jranke@uni-bremen.de # This file is part of the R package mkin |