From 6910e67398dbcb548dae179d361cb24404ad75a4 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 27 Feb 2014 16:36:11 +0100 Subject: 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 --- R/mkinfit.R | 1 + R/mkinpredict.R | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'R') diff --git a/R/mkinfit.R b/R/mkinfit.R index 6c976a3..326f404 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 07c1a81..14efc56 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 -- cgit v1.2.1